diff --git a/N3OW/common/culture/cultures/NEOW_anglo_frisian.txt b/N3OW/common/culture/cultures/NEOW_anglo_frisian.txt index d641aa94..a0679ed8 100644 --- a/N3OW/common/culture/cultures/NEOW_anglo_frisian.txt +++ b/N3OW/common/culture/cultures/NEOW_anglo_frisian.txt @@ -161,7 +161,7 @@ souflander = { language = language_english martial_custom = martial_custom_equal traditions = { - tradition_fp3_beacon_of_learning + tradition_british_meritocracy #tradition_british_armoires tradition_seafaring tradition_ep3_cultivated_sophistication diff --git a/N3OW/common/culture/cultures/NEOW_brythonic.txt b/N3OW/common/culture/cultures/NEOW_brythonic.txt index b0288aa2..f5e89f8a 100644 --- a/N3OW/common/culture/cultures/NEOW_brythonic.txt +++ b/N3OW/common/culture/cultures/NEOW_brythonic.txt @@ -109,7 +109,7 @@ soueyrneg = { #Soufyrneg martial_custom = martial_custom_equal traditions = { tradition_british_palace_politics - tradition_fp3_beacon_of_learning + tradition_british_meritocracy #tradition_british_armoires tradition_seafaring tradition_ep3_cultivated_sophistication @@ -153,7 +153,7 @@ strafclideg = { tradition_british_palace_politics tradition_parochialism tradition_hard_working - tradition_fp3_beacon_of_learning + tradition_british_meritocracy tradition_strong_kinship } diff --git a/N3OW/common/culture/cultures/NEOW_scottish.txt b/N3OW/common/culture/cultures/NEOW_scottish.txt index 34a0b200..4a8866ac 100644 --- a/N3OW/common/culture/cultures/NEOW_scottish.txt +++ b/N3OW/common/culture/cultures/NEOW_scottish.txt @@ -66,7 +66,7 @@ scottish = { martial_custom = martial_custom_male_only traditions = { tradition_parochialism - tradition_fp3_beacon_of_learning + tradition_british_meritocracy tradition_strong_kinship tradition_maritime_mercantilism tradition_staunch_traditionalists diff --git a/N3OW/common/culture/traditions/00_realm_traditions.txt b/N3OW/common/culture/traditions/00_realm_traditions.txt index ed71f0cf..51685916 100644 --- a/N3OW/common/culture/traditions/00_realm_traditions.txt +++ b/N3OW/common/culture/traditions/00_realm_traditions.txt @@ -344,7 +344,7 @@ tradition_republican_legacy = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_republic + government_has_flag = government_is_special_republic } } } @@ -2280,7 +2280,7 @@ tradition_parochialism = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_republic + government_has_flag = government_is_special_republic } } } diff --git a/N3OW/common/culture/traditions/NEOW_traditions.txt b/N3OW/common/culture/traditions/NEOW_traditions.txt index a7bd9ef2..47445dd4 100644 --- a/N3OW/common/culture/traditions/NEOW_traditions.txt +++ b/N3OW/common/culture/traditions/NEOW_traditions.txt @@ -326,4 +326,141 @@ tradition_swords_of_freedom = { multiply = 4 } } +} + + +tradition_british_meritocracy = { # Offshoot of tradition_philosopher_culture + category = societal + + layers = { + 0 = learning + 1 = western + 4 = beacon_of_learning.dds + } + + is_shown = { + has_fp3_dlc_trigger = yes + OR = { + has_cultural_pillar = heritage_anglo_frisian + has_cultural_pillar = heritage_brythonic + } + NOT = { has_cultural_tradition = tradition_philosopher_culture } # Replaces Philosopher Culture + } + + can_pick = { + custom_description = { + text = culture_not_bellicose + NOT = { + culture_pillar:ethos_bellicose = { is_in_list = traits } + } + } + OR = { + has_cultural_pillar = heritage_anglo_frisian + has_cultural_pillar = heritage_brythonic + } + NOT = { has_cultural_tradition = tradition_warrior_culture } + NOT = { has_cultural_tradition = tradition_philosopher_culture } + } + can_pick_for_hybridization = { + custom_tooltip = { + text = no_warrior_culture + NOT = { # Only blocks polygamous to avoid duplicate warnings, but is blocked by concubines + culture_tradition:tradition_warrior_culture = { is_in_list = traits } + } + } + custom_tooltip = { + text = no_philosopher_culture + NOT = { # Only blocks polygamous to avoid duplicate warnings, but is blocked by concubines + culture_tradition:tradition_philosopher_culture = { is_in_list = traits } + } + } + } + + parameters = { + #pensive_trait_more_common = yes + #rowdy_trait_less_common = yes + innovation_from_learning_traits = yes + can_appoint_court_scholar = yes + guardian_education_better_outcomes = yes + } + + character_modifier = { + monthly_learning_lifestyle_xp_gain_mult = 0.2 + learning_per_piety_level = 1 + } + + cost = { + prestige = { + add = { + value = tradition_base_cost + desc = BASE + format = "BASE_VALUE_FORMAT" + } + if = { + limit = { + NOR = { + culture_pillar:ethos_courtly = { is_in_list = traits } + culture_pillar:ethos_communal = { is_in_list = traits } + culture_pillar:ethos_spiritual = { is_in_list = traits } + } + } + add = { + value = tradition_incompatible_ethos_penalty + desc = not_courtly_communal_or_spiritual_desc + } + } + if = { + limit = { + trigger_if = { + limit = { + scope:character = { + is_ai = no + } + } + NOT = { + any_ruler = { + count >= 5 + culture = prev + primary_title.tier >= tier_county + has_trait = scholar + } + } + } + trigger_else = { + always = no + } + } + add = { + value = tradition_unfulfilled_criteria_penalty + desc = rulers_with_scholar_desc + } + } + + if = { + limit = { + culture_tradition_reduction_trigger = { TRADITION = tradition_fp3_beacon_of_learning } + } + multiply = { + value = 0.5 + desc = inspired_by_culture_desc + } + } + + multiply = tradition_replacement_cost_if_relevant + } + } + + ai_will_do = { + value = 200 + if = { + limit = { + NOR = { + culture_pillar:ethos_courtly = { is_in_list = traits } + culture_pillar:ethos_communal = { is_in_list = traits } + culture_pillar:ethos_spiritual = { is_in_list = traits } + } + } + multiply = 0 + } + } } \ No newline at end of file diff --git a/N3OW/common/landed_titles/britannia.txt b/N3OW/common/landed_titles/britannia.txt index 7d1eb749..c14bed39 100644 --- a/N3OW/common/landed_titles/britannia.txt +++ b/N3OW/common/landed_titles/britannia.txt @@ -195,7 +195,7 @@ e_britannia = { d_norfolk = { #East Anglia color = { 177 78 79 } - capital = c_norfolk # Norwich + capital = c_cambridgeshire # Norwich cultural_names = { name_list_norse = cn_jarnamoda @@ -307,7 +307,7 @@ e_britannia = { } d_leicester = { color = { 211 1 40 } - + capital = c_northamptonshire c_leicestershire = { color = { 185 1 15 } @@ -960,7 +960,7 @@ e_britannia = { d_lancaster = { color = { 250 1 1 } - capital = c_liverpool # Lancaster + capital = c_cheshire# Lancaster cultural_names = { name_list_breton = cn_rheged @@ -969,7 +969,25 @@ e_britannia = { name_list_welsh = cn_rheged name_list_pictish = cn_rheged } + c_liverpool = { + color = { 253 1 26 } + b_liverpool = { + province = 9720 + + color = { 253 1 26 } + } + b_chester = { + province = 1643 + + color = { 255 152 50 } + } + b_macclesfield = { + province = 1644 + + color = { 255 127 15 } + } + } c_lancashire = { color = { 242 73 29 } @@ -1008,25 +1026,6 @@ e_britannia = { color = { 250 55 5 } } } - c_liverpool = { - color = { 253 1 26 } - - b_liverpool = { - province = 9720 - - color = { 253 1 26 } - } - b_chester = { - province = 1643 - - color = { 255 152 50 } - } - b_macclesfield = { - province = 1644 - - color = { 255 127 15 } - } - } } d_cumbria = { color = { 254 1 73 } @@ -1325,8 +1324,11 @@ e_britannia = { } } } - d_nottingham= { + d_nottingham = { color = { 211 1 40 } + + capital = c_nottinghamshire + c_nottinghamshire = { color = { 206 1 36 } @@ -1679,7 +1681,11 @@ e_britannia = { } c_warwickshire = { color = { 1 164 119 } + b_birmingham = { + province = 1605 + color = { 190 30 30 } + } b_warwick = { province = 1603 @@ -1690,11 +1696,6 @@ e_britannia = { color = { 190 30 30 } } - b_birmingham = { - province = 1605 - - color = { 190 30 30 } - } b_stratford_on_avon = { province = 9727 @@ -1882,7 +1883,7 @@ e_britannia = { d_gwent = { color = { 1 146 1 } - capital = c_monmouthshire # Gwent + capital = c_glamorgan # Gwent c_monmouthshire = { #Gwent color = { 73 151 1 } diff --git a/N3OW/common/landed_titles/italy.txt b/N3OW/common/landed_titles/italy.txt index 5a54a918..cea1cdb9 100644 --- a/N3OW/common/landed_titles/italy.txt +++ b/N3OW/common/landed_titles/italy.txt @@ -899,67 +899,14 @@ e_italy = { } } - d_pisa = { - color = { 180 186 30 } - can_be_named_after_dynasty = no - - capital = c_pisa #Pisa - - c_pisa = { - color = { 180 186 30 } - can_be_named_after_dynasty = no - - b_pisa = { - province = 2536 - - color = { 180 186 30 } - } - b_luni = { - province = 2531 - - color = { 215 120 130 } - } - } - c_livorno = { - color = { 232 190 25 } - can_be_named_after_dynasty = no - b_livorno = { - province = 2557 - - color = { 180 186 30 } - } - b_piombino = { - province = 2561 - - color = { 180 186 30 } - } - b_volterra = { - province = 2558 - - color = { 232 190 25 } - } - } - c_orbetello = { - color = { 250 210 5 } - can_be_named_after_dynasty = no - - b_orbetello = { - province = 2569 - - color = { 250 210 5 } - } - b_soana = { - province = 2570 - - color = { 250 210 5 } - } - b_grosseto = { - province = 2562 - - color = { 250 210 5 } - } - } - } +# d_pisa = { +# color = { 180 186 30 } +# can_be_named_after_dynasty = no +# +# capital = c_pisa #Pisa +# +# +# } d_abruzzo = { color = { 227 152 133 } @@ -1114,6 +1061,60 @@ e_italy = { color = { 205 175 25 } } } + c_pisa = { + color = { 180 186 30 } + can_be_named_after_dynasty = no + + b_pisa = { + province = 2536 + + color = { 180 186 30 } + } + b_luni = { + province = 2531 + + color = { 215 120 130 } + } + } + c_livorno = { + color = { 232 190 25 } + can_be_named_after_dynasty = no + b_livorno = { + province = 2557 + + color = { 180 186 30 } + } + b_piombino = { + province = 2561 + + color = { 180 186 30 } + } + b_volterra = { + province = 2558 + + color = { 232 190 25 } + } + } + c_orbetello = { + color = { 250 210 5 } + can_be_named_after_dynasty = no + + b_orbetello = { + province = 2569 + + color = { 250 210 5 } + } + b_soana = { + province = 2570 + + color = { 250 210 5 } + } + b_grosseto = { + province = 2562 + + color = { 250 210 5 } + } + } } d_ancona = { color = { 240 240 190 } diff --git a/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt b/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt index 5abe499e..c334ca93 100644 --- a/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt +++ b/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt @@ -13,7 +13,10 @@ ### Esoterics #Wiccans religion_tag = wicca_religion - + #Thelema + religion_tag = thelema_religion + #Britanic + religion_tag = brittanic_religion ### Pagans #Druidics religion_tag = druidic_religion @@ -500,6 +503,7 @@ hostility_override_special_doctrine_fae_and_folklore = 1 hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 + hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 1 hostility_override_special_doctrine_academic_kinship = 1 hostility_override_special_doctrine_fantastical_kinship = 1 @@ -643,6 +647,183 @@ } } + ####Britanic and Thelema Doctrine#### + + special_doctrine_loyal_servants_of_the_queen_thelema = { + is_shown = { + OR = { + religion_tag = thelema_religion + } + } + piety_cost = { + value = faith_doctrine_cost_low + if = { + limit = { has_doctrine = special_doctrine_loyal_servants_of_the_queen_thelema } + multiply = faith_unchanged_tolerance_doctrine_cost_mult + } + } + parameters = { + hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 + #hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 0 + hostility_override_special_doctrine_true_servants_of_the_queen = 2 + hostility_override_special_doctrine_regicidal = 3 + hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 + #hostility_override_special_doctrine_academic_kinship = 0 + #hostility_override_special_doctrine_christian_kinship = 0 + #hostility_override_special_doctrine_islamic_kinship = 0 + + #hostility_override_special_doctrine_people_of_the_book = 1 + hostility_override_special_doctrine_might_and_magick = 1 + hostility_override_special_doctrine_goddesses_and_glory = 1 + hostility_override_special_doctrine_fae_and_folklore = 2 + + #hostility_override_special_doctrine_singular_interpretation = 3 + + #loc_parameter_novelist_kinship = yes + #loc_parameter_fantastical_kinship_astray = 1 + } + } + + special_doctrine_loyal_servants_of_the_queen = { + is_shown = { + OR = { + religion_tag = brittanic_religion + } + } + piety_cost = { + value = faith_doctrine_cost_low + if = { + limit = { has_doctrine = special_doctrine_loyal_servants_of_the_queen } + multiply = faith_unchanged_tolerance_doctrine_cost_mult + } + } + parameters = { + hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 + hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 0 + hostility_override_special_doctrine_true_servants_of_the_queen = 0 + hostility_override_special_doctrine_regicidal = 3 + hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 + #hostility_override_special_doctrine_academic_kinship = 0 + #hostility_override_special_doctrine_christian_kinship = 0 + #hostility_override_special_doctrine_islamic_kinship = 0 + + #hostility_override_special_doctrine_people_of_the_book = 1 + hostility_override_special_doctrine_might_and_magick = 1 + hostility_override_special_doctrine_goddesses_and_glory = 1 + hostility_override_special_doctrine_fae_and_folklore = 2 + + #hostility_override_special_doctrine_singular_interpretation = 3 + + #loc_parameter_novelist_kinship = yes + #loc_parameter_fantastical_kinship_astray = 1 + } + } + + special_doctrine_true_servants_of_the_queen = { + is_shown = { + OR = { + religion_tag = brittanic_religion + religion_tag = thelema_religion + } + } + piety_cost = { + value = faith_doctrine_cost_low + if = { + limit = { has_doctrine = special_doctrine_true_servants_of_the_queen } + multiply = faith_unchanged_tolerance_doctrine_cost_mult + } + } + parameters = { + hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 + hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 2 + hostility_override_special_doctrine_true_servants_of_the_queen = 0 + hostility_override_special_doctrine_regicidal = 3 + hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 + #hostility_override_special_doctrine_academic_kinship = 0 + #hostility_override_special_doctrine_christian_kinship = 0 + #hostility_override_special_doctrine_islamic_kinship = 0 + + #hostility_override_special_doctrine_people_of_the_book = 1 + hostility_override_special_doctrine_might_and_magick = 1 + hostility_override_special_doctrine_goddesses_and_glory = 1 + hostility_override_special_doctrine_fae_and_folklore = 2 + + #hostility_override_special_doctrine_singular_interpretation = 3 + + #loc_parameter_novelist_kinship = yes + #loc_parameter_fantastical_kinship_astray = 1 + } + } + + special_doctrine_true_servants_of_the_queen_regents = { + is_shown = { + OR = { + religion_tag = brittanic_religion + } + } + piety_cost = { + value = faith_doctrine_cost_low + if = { + limit = { has_doctrine = special_doctrine_true_servants_of_the_queen_regents } + multiply = faith_unchanged_tolerance_doctrine_cost_mult + } + } + parameters = { + hostility_override_special_doctrine_loyal_servants_of_the_queen = 3 + hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 3 + hostility_override_special_doctrine_true_servants_of_the_queen = 3 + hostility_override_special_doctrine_regicidal = 3 + hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 + #hostility_override_special_doctrine_academic_kinship = 0 + #hostility_override_special_doctrine_christian_kinship = 0 + #hostility_override_special_doctrine_islamic_kinship = 0 + + #hostility_override_special_doctrine_people_of_the_book = 1 + hostility_override_special_doctrine_might_and_magick = 1 + hostility_override_special_doctrine_goddesses_and_glory = 1 + hostility_override_special_doctrine_fae_and_folklore = 2 + + #hostility_override_special_doctrine_singular_interpretation = 3 + + #loc_parameter_novelist_kinship = yes + #loc_parameter_fantastical_kinship_astray = 1 + } + } + + special_doctrine_regicidal = { + is_shown = { + OR = { + religion_tag = brittanic_religion + } + } + piety_cost = { + value = faith_doctrine_cost_low + if = { + limit = { has_doctrine = special_doctrine_regicidal } + multiply = faith_unchanged_tolerance_doctrine_cost_mult + } + } + parameters = { + hostility_override_special_doctrine_loyal_servants_of_the_queen = 3 + hostility_override_special_doctrine_regicidal = 0 + hostility_override_special_doctrine_true_servants_of_the_queen = 3 + hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 + #hostility_override_special_doctrine_academic_kinship = 0 + #hostility_override_special_doctrine_christian_kinship = 0 + #hostility_override_special_doctrine_islamic_kinship = 0 + + #hostility_override_special_doctrine_people_of_the_book = 1 + #hostility_override_special_doctrine_might_and_magick = 1 + #hostility_override_special_doctrine_goddesses_and_glory = 1 + #hostility_override_special_doctrine_fae_and_folklore = 2 + + #hostility_override_special_doctrine_singular_interpretation = 3 + + #loc_parameter_novelist_kinship = yes + #loc_parameter_fantastical_kinship_astray = 1 + } + } + #Fallback Doctrine special_doctrine_religion_fallback = { @@ -683,4 +864,5 @@ same_faith_opinion = 5 } } + } \ No newline at end of file diff --git a/N3OW/common/religion/doctrines/30_core_tenets.txt b/N3OW/common/religion/doctrines/30_core_tenets.txt index fbdfca16..6db7513c 100644 --- a/N3OW/common/religion/doctrines/30_core_tenets.txt +++ b/N3OW/common/religion/doctrines/30_core_tenets.txt @@ -33,6 +33,7 @@ forest_attrition_mult = -0.25 build_gold_cost = 0.1 county_opinion_add = 15 + fertility = 0.15 } } @@ -211,6 +212,10 @@ naval_movement_speed_mult = 0.25 sea_travel_danger = medium_sea_danger_reduction } + traits = { + virtues = { brave loyal } + sins = { craven disloyal } + } } @@ -243,9 +248,17 @@ liege_opinion = -10 } - parameters = { - natural_primitivism_law_cost_increase = yes - } + #parameters = { + # natural_primitivism_law_cost_increase = yes + #} + traits = { + virtues = { + disloyal + } + sins = { + loyal + } + } character_modifier = { tyranny_gain_mult = 1 @@ -279,6 +292,16 @@ parameters = { no_unfaithfulness_penalty_active = yes } + traits = { + virtues = { + lustful = { scale = 2 weight = 2 } + compassionate + } + sins = { + callous = { scale = 2 weight = 2 } + murderer + } + } } tenet_do_what_thou_wilt = { icon = core_tenet_literalism @@ -300,7 +323,15 @@ has_access_to_runestones = yes divine_the_stars_active = yes can_build_pyramids = yes - } + } + traits = { + virtues = { + brave + } + sins = { + content + } + } } diff --git a/N3OW/common/religion/doctrines/NEOW_virtue_doctrines.txt b/N3OW/common/religion/doctrines/NEOW_virtue_doctrines.txt index 39cc2e58..bd989c67 100644 --- a/N3OW/common/religion/doctrines/NEOW_virtue_doctrines.txt +++ b/N3OW/common/religion/doctrines/NEOW_virtue_doctrines.txt @@ -28,15 +28,15 @@ britannic_virtues = { special_doctrine_british_royalty = { traits = { - virtues = { vengeful arrogant stubborn } - sins = { forgiving humble fickle } + virtues = { just stubborn } + sins = { arbitrary fickle } } } special_doctrine_british_admiralty = { traits = { - virtues = { brave humble stubborn } - sins = { craven arrogant fickle } + virtues = { brave stubborn } + sins = { craven fickle } } } special_doctrine_british_unity = { @@ -162,14 +162,15 @@ thelema_virtues = { special_doctrine_base_thelema = { traits = { - virtues = { loyal } + virtues = { just stubborn } + sins = { arbitrary fickle } } } special_doctrine_old_thelema = { traits = { - virtues = { ambitious } - sins = { content } + virtues = { ambitious disloyal } + sins = { content loyal } } } } diff --git a/N3OW/common/religion/religions/NEOW_britannic.txt b/N3OW/common/religion/religions/NEOW_britannic.txt index 9324421c..f69215fd 100644 --- a/N3OW/common/religion/religions/NEOW_britannic.txt +++ b/N3OW/common/religion/religions/NEOW_britannic.txt @@ -41,8 +41,8 @@ doctrine = doctrine_no_anointment traits = { - virtues = { loyal } - sins = { disloyal } + #virtues = { loyal } + #sins = { disloyal } } reserved_male_names = { #put larp names here later @@ -262,6 +262,7 @@ #Special/virtue | placeholder doctrine = special_doctrine_british_royalty + doctrine = special_doctrine_true_servants_of_the_queen_regents } @@ -289,6 +290,7 @@ doctrine = tenet_sacred_shadows doctrine = special_doctrine_british_royalty + doctrine = special_doctrine_loyal_servants_of_the_queen #Special/virtue | placeholder @@ -313,6 +315,7 @@ doctrine = tenet_rule_the_waves doctrine = special_doctrine_british_admiralty + doctrine = special_doctrine_loyal_servants_of_the_queen localization = { #HealthGod | @@ -423,7 +426,9 @@ #Coronation tradition doctrine = doctrine_no_anointment - + + #tolerance - lmao + doctrine = special_doctrine_regicidal holy_order_names = { { name = "holy_order_national_union_of_paleontologists" } { name = "holy_order_national_union_of_diggers" } diff --git a/N3OW/common/religion/religions/NEOW_druidic.txt b/N3OW/common/religion/religions/NEOW_druidic.txt index d2e8ec5d..384ca11b 100644 --- a/N3OW/common/religion/religions/NEOW_druidic.txt +++ b/N3OW/common/religion/religions/NEOW_druidic.txt @@ -279,7 +279,7 @@ doctrine = tenet_ancestor_worship doctrine = tenet_ritual_celebrations - doctrine = special_doctrine_goddesses_and_glory + doctrine = special_doctrine_fae_and_folklore } } } diff --git a/N3OW/common/religion/religions/NEOW_protestant.txt b/N3OW/common/religion/religions/NEOW_protestant.txt index 89333654..c3767ba4 100644 --- a/N3OW/common/religion/religions/NEOW_protestant.txt +++ b/N3OW/common/religion/religions/NEOW_protestant.txt @@ -271,6 +271,7 @@ #Special/virtue | placeholder doctrine = special_doctrine_english_anglican + doctrine = doctrine_pluralism_righteous holy_order_names = { #placeholder } diff --git a/N3OW/common/religion/religions/NEOW_thelema.txt b/N3OW/common/religion/religions/NEOW_thelema.txt index fe0c4a33..7c12b023 100644 --- a/N3OW/common/religion/religions/NEOW_thelema.txt +++ b/N3OW/common/religion/religions/NEOW_thelema.txt @@ -39,8 +39,8 @@ doctrine = doctrine_no_anointment traits = { - virtues = { gregarious lustful lifestyle_mystic hashishiyah } - sins = { sadistic fickle lazy } + virtues = { lustful lifestyle_mystic hashishiyah } + sins = { craven content } } reserved_male_names = { #put larp names here later @@ -241,12 +241,14 @@ #doctrine = special_doctrine_esoteric_witchcraft #Tenets | WIP - doctrine = tenet_love_under_will + doctrine = the_queen_of_summer doctrine = tenet_do_what_thou_wilt doctrine = tenet_rule_the_waves #Special/virtue | placeholder doctrine = special_doctrine_base_thelema + doctrine = doctrine_pluralism_pluralistic + doctrine = special_doctrine_loyal_servants_of_the_queen_thelema holy_order_names = { #placeholder } @@ -326,7 +328,7 @@ icon = royal_thelema doctrine_background_icon = core_tenet_banner_britannic.dds - religious_head = d_united_grand_lodge + #religious_head = d_united_grand_lodge #placeholder holy sites holy_site = lochness @@ -346,6 +348,8 @@ #Special/virtue | placeholder doctrine = special_doctrine_base_thelema + doctrine = special_doctrine_true_servants_of_the_queen + doctrine = doctrine_no_head holy_order_names = { #placeholder } diff --git a/N3OW/common/religion/religions/NEOW_wicca.txt b/N3OW/common/religion/religions/NEOW_wicca.txt index 1e83085c..0136a95f 100644 --- a/N3OW/common/religion/religions/NEOW_wicca.txt +++ b/N3OW/common/religion/religions/NEOW_wicca.txt @@ -18,8 +18,8 @@ #Crimes | placeholder doctrine = doctrine_homosexuality_accepted - doctrine = doctrine_adultery_men_crime - doctrine = doctrine_adultery_women_crime + doctrine = doctrine_adultery_men_shunned + doctrine = doctrine_adultery_women_shunned doctrine = doctrine_kinslaying_close_kin_crime doctrine = doctrine_deviancy_accepted doctrine = doctrine_witchcraft_virtuous @@ -326,7 +326,7 @@ color = { 22 198 229 } icon = arcane - # religious_head = k_papal_state + #religious_head = d_united_grand_lodge #placeholder holy sites holy_site = london @@ -341,7 +341,7 @@ doctrine = special_doctrine_might_and_magick doctrine = special_doctrine_horned_lords_law - doctrine = doctrine_spiritual_head + doctrine = doctrine_no_head doctrine = doctrine_pluralism_righteous doctrine = doctrine_theocracy_temporal diff --git a/N3OW/history/characters/NEOW_e_britannia.txt b/N3OW/history/characters/NEOW_e_britannia.txt index 91034c59..487b5a4b 100644 --- a/N3OW/history/characters/NEOW_e_britannia.txt +++ b/N3OW/history/characters/NEOW_e_britannia.txt @@ -180,7 +180,7 @@ britannia_cyflymarhyan_elyan = { britannia_said_palamedes = { name = "Palamedes" dynasty = dynn_britannia_said - religion = "avalonian" + religion = "victorian" culture = souflander trait = education_learning_2 trait = scarred @@ -194,6 +194,39 @@ britannia_said_palamedes = { death = yes } } + +britannia_said_barry = { + name = "Barry" + dynasty = dynn_britannia_said + religion = "victorian" + culture = souflander + trait = education_diplomacy_3 + trait = gregarious + trait = shrewd + trait = diligent + trait = compassionate + 2531.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_said_edward = { + name = "Edward" + dynasty = dynn_britannia_said + religion = "victorian" + culture = souflander + trait = education_diplomacy_1 + 2531.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + #dynn_britannia_starr I also replace like 90% of the starr family as they aren't real britannia_starr_cory = { name = "Cory" @@ -377,10 +410,11 @@ britannia_giray_basenzhabu = { dna = dna_giray_basenzhabu religion = "victorian" culture = soueyrneg - trait = education_diplomacy_4 - trait = gregarious - trait = just - trait = ambitious + trait = education_diplomacy_1 + trait = compassionate + trait = cynical + trait = diligent + trait = beauty_good_1 trait = lifestyle_poet portrait_override={ portrait_modifier_overrides={ @@ -396,6 +430,54 @@ britannia_giray_basenzhabu = { } } +britannia_giray_selim = { + name = "Selim" + dynasty = dynn_britannia_giray + #dna = dna_giray_basenzhabu + religion = "victorian" + culture = soueyrneg + trait = education_martial_1 + trait = brave + trait = lazy + trait = fickle + portrait_override={ + portrait_modifier_overrides={ + custom_beards=male_empty + custom_hair=m_hair_ep3_byzantine_03 + } + } + 2535.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_giray_qirim = { + name = "Qirim" + dynasty = dynn_britannia_giray + #dna = dna_giray_basenzhabu + religion = "victorian" + culture = soueyrneg + trait = education_martial_3 + trait = wrathful + trait = generous + trait = callous + portrait_override={ + portrait_modifier_overrides={ + custom_beards=male_empty + custom_hair=m_hair_ep3_byzantine_03 + } + } + 2534.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + britannia_flamank_tristan = { name = "Tristan" dynasty = dynn_britannia_flamank @@ -418,9 +500,9 @@ britannia_tudorh_hynrhy = { dynasty = dynn_britannia_tudorh religion = "victorian" culture = prytoneg - trait = education_martial_4 - trait = military_engineer - trait = ambitious + trait = education_diplomacy_4 + #trait = military_engineer + trait = diligent trait = stubborn trait = brave 2530.1.1 = { @@ -473,10 +555,11 @@ britannia_elgarh_robyrt = { dynasty = dynn_britannia_elgarh religion = "victorian" culture = prytoneg - trait = education_stewardship_1 - trait = paranoid - trait = chaste - trait = content + trait = education_learning_3 + trait = shy + trait = eccentric + trait = fickle + trait = port 2500.1.1 = { birth = yes } @@ -491,9 +574,11 @@ britannia_wall_williaim = { religion = "victorian" culture = strafclideg trait = education_martial_3 - trait = ambitious + trait = stubborn trait = brave - trait = gregarious + trait = callous + trait = giant + trait = physique_good_2 trait = flexible_leader 2510.1.1 = { birth = yes @@ -532,7 +617,6 @@ britannia_wall_symwny = { #fix the windsor and waillaice families from abenner d trait = diligent trait = honest trait = gregarious - trait = lustful trait = intellect_good_1 trait = beauty_good_2 female = yes @@ -635,7 +719,7 @@ britannia_nelson_hwrws_1 = { dynasty = dynn_britannia_nelson religion = "victorian" culture = soueyrneg - trait = bossy + trait = rowdy mother = britannia_nelson_boudica father = britannia_nelson_hwrws 2547.1.1 = { @@ -674,7 +758,7 @@ britannia_solomonid_arthur = { religion = "victorian" dna = dna_solomonid_arthur culture = soueyrneg - trait = education_diplomacy_4 + trait = education_martial_3 trait = physique_good_3 trait = strong portrait_override={ @@ -683,10 +767,11 @@ britannia_solomonid_arthur = { custom_beards=m_beard_tgp_chinese_01 } } - trait = gregarious - trait = lustful - trait = compassionate - trait = lifestyle_poet + trait = arrogant + trait = wrathful + trait = vengeful + trait = irritable + #trait = lifestyle_poet #trait = lifestyle_blademaster 2486.1.1 = { birth = yes @@ -696,6 +781,144 @@ britannia_solomonid_arthur = { } } +britannia_solomonid_jhwhn = { + name = "Jhwn" + dynasty = dynn_britannia_solomonid + religion = "victorian" + #dna = dna_solomonid_arthur + culture = soueyrneg + trait = education_learning_2 + trait = physique_good_3 + trait = strong + portrait_override={ + portrait_modifier_overrides={ + custom_hair=m_hair_ep3_byzantine_03 + custom_beards=m_beard_tgp_chinese_01 + } + } + trait = just + trait = zealous + trait = forgiving + #trait = lifestyle_poet + #trait = lifestyle_blademaster + 2506.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_solomonid_jhwhn = { + name = "Jhwn" + dynasty = dynn_britannia_solomonid + religion = "victorian" + #dna = dna_solomonid_arthur + culture = soueyrneg + trait = education_learning_3 + portrait_override={ + portrait_modifier_overrides={ + custom_hair=m_hair_ep3_byzantine_03 + custom_beards=m_beard_tgp_chinese_01 + } + } + trait = just + trait = zealous + trait = forgiving + trait = intellect_good_1 + #trait = lifestyle_poet + #trait = lifestyle_blademaster + 2513.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_solomonid_alfryd = { + name = "Alfryd" + dynasty = dynn_britannia_solomonid + religion = "victorian" + #dna = dna_solomonid_arthur + culture = soueyrneg + trait = education_martial_4 + portrait_override={ + portrait_modifier_overrides={ + custom_hair=m_hair_ep3_byzantine_03 + custom_beards=m_beard_tgp_chinese_01 + } + } + trait = gregarious + trait = ambitious + trait = calm + trait = intellect_good_2 + trait = shrewd + #trait = lifestyle_poet + #trait = lifestyle_blademaster + 2521.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_solomonid_alyystyr= { + name = "Alyystyr" + dynasty = dynn_britannia_solomonid + religion = "victorian" + #dna = dna_solomonid_arthur + culture = soueyrneg + trait = education_stewardship_1 + portrait_override={ + portrait_modifier_overrides={ + custom_hair=m_hair_ep3_byzantine_03 + custom_beards=m_beard_tgp_chinese_01 + } + } + trait = vengeful + trait = fickle + trait = eccentric + trait = hashishiyah + #trait = lifestyle_poet + #trait = lifestyle_blademaster + 2538.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_solomonid_marhy = { + name = "Marhy" + dynasty = dynn_britannia_solomonid + religion = "victorian" + #dna = dna_solomonid_arthur + culture = soueyrneg + trait = education_diplomacy_1 + portrait_override={ + portrait_modifier_overrides={ + custom_hair=m_hair_ep3_byzantine_03 + custom_beards=m_beard_tgp_chinese_01 + } + } + trait = forgiving + trait = zealous + trait = compassionate + trait = depressed_1 + female = yes + #trait = lifestyle_poet + #trait = lifestyle_blademaster + 2526.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + britannia_colbrugha_michael = { name = "Mícheál" dynasty = dynn_britannia_colbrugha @@ -1339,7 +1562,7 @@ britannia_windsor_edward = { trait = education_martial_4 trait = brave trait = ambitious - trait = forgiving + trait = gregarious trait = lifestyle_reveler trait = beauty_good_1 trait = intellect_good_2 @@ -1503,8 +1726,8 @@ britannia_jacob_colin = { trait = education_diplomacy_3 trait = brave trait = gregarious - trait = lazy - trait = lifestyle_reveler + trait = generous + #trait = lifestyle_reveler 2479.1.1 = { birth = yes } @@ -1918,6 +2141,9 @@ britannia_wellesley_oliver = { #Duke of Wellington family 2520.1.1 = { birth = yes } + 2536.1.1 = { + add_spouse = britannia_kafyry_duleep + } 2600.1.1 = { death = yes } @@ -1928,12 +2154,16 @@ britannia_wellesley_charles = { #Duke of Wellington family dynasty = dynn_britannia_wellesley religion = "victorian" culture = soueyrneg - trait = education_martial_4 + #trait = education_martial_4 trait = wrathful trait = honest trait = temperate + trait = bossy + trait = wild_oat + disallow_random_traits = yes father = britannia_wellesley_oliver - 2540.1.1 = { + mother = britannia_kafyry_duleep + 2543.1.1 = { birth = yes } 2600.1.1 = { @@ -1946,12 +2176,15 @@ britannia_wellesley_arfur = { #Duke of Wellington family dynasty = dynn_britannia_wellesley religion = "victorian" culture = soueyrneg - trait = education_martial_4 - trait = wrathful - trait = honest + #trait = education_martial_4 + trait = eccentric trait = temperate + trait = rowdy + disallow_random_traits = yes + trait = intellect_good_3 father = britannia_wellesley_oliver - 2542.1.1 = { + mother = britannia_kafyry_duleep + 2544.1.1 = { birth = yes } 2600.1.1 = { @@ -1965,12 +2198,14 @@ britannia_adam_duleep = { #Claims to be relative of the last Maharaja, ruler of religion = "victorian" #dna = dna_duleep_singh culture = prytoneg - trait = education_stewardship_4 - trait = trusting - trait = vengeful + trait = education_stewardship_3 + trait = beauty_good_3 + trait = lustful + trait = gregarious trait = just trait = physique_bad_1 trait = shrewd + trait = hunter father = britannia_alex_duleep mother = britannia_banda_duleep portrait_override={ @@ -1993,8 +2228,11 @@ britannia_victor_duleep = { #Claims to be relative of the last Maharaja, ruler o religion = "victorian" #dna = dna_duleep_singh culture = prytoneg + trait = gluttonous + trait = arbitrary + trait = education_stewardship_1 + trait = gregarious trait = physique_bad_1 - trait = shrewd father = britannia_alex_duleep mother = britannia_banda_duleep portrait_override={ @@ -2017,7 +2255,12 @@ britannia_ffryddyryk_duleep = { #Claims to be relative of the last Maharaja, rul religion = "victorian" #dna = dna_duleep_singh culture = prytoneg - trait = twin + trait = twin + trait = brave + trait = loyal + trait = education_martial_2 + trait = zealous + trait = diligent father = britannia_alex_duleep mother = britannia_banda_duleep portrait_override={ @@ -2042,7 +2285,11 @@ britannia_bamba_duleep = { #Claims to be relative of the last Maharaja, ruler of culture = prytoneg father = britannia_alex_duleep mother = britannia_banda_duleep + trait = education_diplomacy_3 trait = twin + trait = gregarious + trait = diligent + trait = cynical female = yes 2530.7.1 = { birth = yes @@ -2060,10 +2307,20 @@ britannia_kafyry_duleep = { #Claims to be relative of the last Maharaja, ruler o culture = prytoneg father = britannia_alex_duleep mother = britannia_banda_duleep + trait = education_intrigue_4 + trait = beauty_good_2 + trait = compassionate + trait = strong + trait = deceitful + trait = generous + sexuality = homosexual female = yes - 2532.4.11 = { + 2525.4.11 = { birth = yes } + 2536.1.1 = { + add_spouse = britannia_wellesley_oliver + } 2600.1.1 = { death = yes } @@ -2074,6 +2331,14 @@ britannia_sophiai_duleep = { #Claims to be relative of the last Maharaja, ruler dynasty = dynn_britannia_duleep_singh religion = "victorian" culture = prytoneg + father = britannia_alex_duleep + mother = britannia_banda_duleep + trait = education_diplomacy_3 + trait = shy + trait = strong + trait = disloyal + trait = stubborn + trait = generous female = yes 2534.9.21 = { birth = yes @@ -2127,9 +2392,9 @@ britannia_ada_duleep = { #Claims to be relative of the last Maharaja, ruler of b #dna = dna_duleep_singh culture = prytoneg trait = gregarious - trait = compassionate trait = lustful trait = charming + disallow_random_traits = yes father = britannia_alex_duleep mother = britannia_mary_duleep_1 female = yes diff --git a/N3OW/history/provinces/e_britannia.txt b/N3OW/history/provinces/e_britannia.txt index 98a952b8..1165a8c1 100644 --- a/N3OW/history/provinces/e_britannia.txt +++ b/N3OW/history/provinces/e_britannia.txt @@ -921,7 +921,9 @@ holding = church_holding } 1605 = { - holding = none + culture = prytoneg + religion = victorian + holding = city_holding } 9727 = { holding = none diff --git a/N3OW/history/titles/admin_titles.txt b/N3OW/history/titles/admin_titles.txt index 8847da80..9618a092 100644 --- a/N3OW/history/titles/admin_titles.txt +++ b/N3OW/history/titles/admin_titles.txt @@ -1,12 +1,5 @@ -c_nf_barabino = { # Barabino - 2554.1.1 = { - liege = c_genoa - holder = italy0021 - government = republic_government - succession_laws = { noble_family_succession_law } - } -} + c_nf_cyflymarhyan = { # Cyflymarhyan (Quicksilver) 2530.1.1 = { liege = e_britannia @@ -97,14 +90,14 @@ c_nf_rholls_rhoycy = { # Rolls-Rhoycy } } -c_nf_nelson = { # Nelson - 2547.1.1 = { - liege = e_britannia - holder = britannia_nelson_boudica #Boudica Nelson - government = administrative_government - succession_laws = { noble_family_succession_law } - } -} +#c_nf_nelson = { # Nelson +# 2547.1.1 = { +# liege = e_britannia +# holder = britannia_nelson_boudica #Boudica Nelson +# government = administrative_government +# succession_laws = { noble_family_succession_law } +# } +#} c_nf_solomonid = { # Solomonid 2540.1.1 = { @@ -124,23 +117,23 @@ c_nf_windsor = { # Windsor } } -c_nf_gibb = { # Gibb - 2544.1.1 = { - liege = e_britannia - holder = britannia_gibb_illiam #Illiam Gibb - government = administrative_government - succession_laws = { noble_family_succession_law } - } -} +#c_nf_gibb = { # Gibb +# 2544.1.1 = { +# liege = e_britannia +# holder = britannia_gibb_illiam #Illiam Gibb +# government = administrative_government +# succession_laws = { noble_family_succession_law } +# } +#} -c_nf_newton = { # Newton - 2544.1.1 = { - liege = e_britannia - holder = britannia_newton_margaret #Magaret Newton - government = administrative_government - succession_laws = { noble_family_succession_law } - } -} +#c_nf_newton = { # Newton +# 2544.1.1 = { +# liege = e_britannia +# holder = britannia_newton_margaret #Magaret Newton +# government = administrative_government +# succession_laws = { noble_family_succession_law } +# } +#} c_nf_hendderswn= { # Newton 2544.1.1 = { diff --git a/N3OW/history/titles/k_england.txt b/N3OW/history/titles/k_england.txt index 3ba9209c..4a773063 100644 --- a/N3OW/history/titles/k_england.txt +++ b/N3OW/history/titles/k_england.txt @@ -209,6 +209,18 @@ d_channel_islands = { } } + +c_cambridgeshire = { + 2547.1.1 = { + holder = britannia_nelson_boudica #Boudica Nelson + } + 2555.1.1 = { + holder = britannia_cyflymarhyan_pytyr #Pytyr Cyflymarhyan + government = administrative_government + liege = e_britannia + } +} + b_gore = { 2547.1.1 = { liege = e_britannia diff --git a/N3OW/history/titles/k_northumberland.txt b/N3OW/history/titles/k_northumberland.txt index 828d4f12..e2aeedb1 100644 --- a/N3OW/history/titles/k_northumberland.txt +++ b/N3OW/history/titles/k_northumberland.txt @@ -84,6 +84,13 @@ c_west_riding = { } } +c_cheshire = { + 2520.1.1 = { + holder = britannia_wood_richard + liege = d_york + } +} + c_richmond = { 2533.1.1 = { holder = britannia_richards_james @@ -91,6 +98,12 @@ c_richmond = { } } +c_nottinghamshire = { + 2533.1.1 = { + holder = britannia_newton_margaret # Margaret Newton + } +} + #c_derby = { # 2553.1.1 = { # holder = britannia_starr_thwmys diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 12a04fd7..9fdea831 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -24413,8 +24413,18 @@ c_nf_spatstony_article: "$DEFAULT_TITLE_NAME_ARTICLE$" c_nf_cyflymarhyan: "$dynn_cyflymarhyan$ Family" c_nf_cyflymarhyan_article: "$DEFAULT_TITLE_NAME_ARTICLE$" - c_nf_barabino: "$dynn_barabino$ Family" - c_nf_barabino_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_hendderswn: "$dynn_henderswn$ Family" + c_nf_hendderswn_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_wellesley: "$dynn_wellesley$ Family" + c_nf_wellesley_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_squyhys: "$dynn_squyhys$ Family" + c_nf_squyhys_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_duleep_singh: "$dynn_duleep_singh$ Family" + c_nf_duleep_singh_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_lawrence: "$dynn_duleep_singh$ Family" + c_nf_lawrence_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + c_nf_cartney: "$dynn_duleep_singh$ Family" + c_nf_cartney_article: "$DEFAULT_TITLE_NAME_ARTICLE$" d_nf_ampelas: "$dynn_Ampelas$ Family" d_nf_ampelas_article: "$DEFAULT_TITLE_NAME_ARTICLE$" d_nf_aplakes: "$dynn_Aplakes$ Family"