diff --git a/common/activities/activity_types/coronation.txt b/common/activities/activity_types/coronation.txt index 50fc944c2..67c9e266e 100644 --- a/common/activities/activity_types/coronation.txt +++ b/common/activities/activity_types/coronation.txt @@ -518,10 +518,7 @@ limit = { highest_held_title_tier >= tier_empire faith = { - OR = { - has_doctrine = doctrine_holy_order_head - has_doctrine = doctrine_spiritual_head - } + has_doctrine = doctrine_spiritual_head } } NOT = { @@ -545,10 +542,7 @@ limit = { highest_held_title_tier >= tier_empire faith = { - OR = { - has_doctrine = doctrine_holy_order_head - has_doctrine = doctrine_spiritual_head - } + has_doctrine = doctrine_spiritual_head } } NOT = { @@ -564,10 +558,7 @@ limit = { highest_held_title_tier > tier_kingdom faith = { - OR = { - has_doctrine = doctrine_holy_order_head - has_doctrine = doctrine_spiritual_head - } + has_doctrine = doctrine_spiritual_head OR = { has_doctrine = doctrine_imperial_anointment has_doctrine = doctrine_anointment_permitted @@ -607,10 +598,7 @@ is_valid = { #trigger_ifs are to make player-facing triggers look nice faith = { - OR = { - has_doctrine = doctrine_holy_order_head - has_doctrine = doctrine_spiritual_head - } + has_doctrine = doctrine_spiritual_head trigger_if = { limit = { NOT = { diff --git a/common/character_interactions/00_grant_titles_interaction.txt b/common/character_interactions/00_grant_titles_interaction.txt index 5f345baba..e9d993792 100644 --- a/common/character_interactions/00_grant_titles_interaction.txt +++ b/common/character_interactions/00_grant_titles_interaction.txt @@ -28,8 +28,7 @@ grant_titles_interaction = { is_pool_guest_of = scope:actor AND = { scope:actor.faith.religious_head = scope:recipient - is_independent_ruler = yes - scope:actor.faith = { NOT = { has_doctrine = doctrine_holy_order_head } } + top_liege = this } } } diff --git a/common/character_interactions/00_vassal_interactions.txt b/common/character_interactions/00_vassal_interactions.txt index 9103ce077..35141ab0d 100644 --- a/common/character_interactions/00_vassal_interactions.txt +++ b/common/character_interactions/00_vassal_interactions.txt @@ -39,8 +39,9 @@ grant_vassal_interaction = { } AND = { scope:actor.faith.religious_head = scope:recipient - scope:recipient = { is_independent_ruler = yes } - scope:actor.faith = { NOT = { has_doctrine = doctrine_holy_order_head } } + scope:recipient = { + top_liege = this + } } } scope:recipient.highest_held_title_tier > tier_barony diff --git a/common/character_interactions/10_ach_interactions.txt b/common/character_interactions/10_ach_interactions.txt deleted file mode 100644 index 411f13d2d..000000000 --- a/common/character_interactions/10_ach_interactions.txt +++ /dev/null @@ -1,847 +0,0 @@ -coronation_anointment_request = { - category = interaction_category_religion - icon = coronation_icon - - desc = coronation_anointment_request_desc - - ai_targets = { - ai_recipients = head_of_faith - } - ai_target_quick_trigger = { - adult = yes - } - ai_frequency = 12 - popup_on_receive = yes - pause_on_receive = yes - - cooldown_against_recipient = { years = 5 } - - is_shown = { - NOT = { scope:actor = scope:recipient } - scope:actor = { - NOT = { has_realm_law = crowned_emperor } - coronation_trigger = yes - highest_held_title_tier >= tier_empire - faith = { - OR = { - has_doctrine = doctrine_anointment_permitted - has_doctrine = doctrine_imperial_anointment - } - } - } - scope:recipient = { - this = scope:actor.faith.religious_head - } - } - - is_valid_showing_failures_only = { - scope:actor = { - faith = { - OR = { - has_doctrine = doctrine_spiritual_head - has_doctrine = doctrine_holy_order_head - } - } - is_imprisoned = no - NOT = { has_trait = excommunicated } - age >= 10 - } - scope:recipient = { - is_imprisoned = no - custom_tooltip = { - text = anointment_request_already_supported - NOT = { - is_target_in_variable_list = { - name = supported_anointments - target = scope:actor - } - } - } - } - } - - cost = { - piety = { - value = 500 - if = { - limit = { - scope:actor = { is_ai = yes } - } - subtract = 500 - } - if = { - limit = { scope:piety_send_option = yes } - add = scope:actor.monumental_piety_value - desc = PIETY_INTERACTION_ACCEPTANCE_SEND_OPTION - } - if = { - limit = { scope:hook = yes } - value = 0 - } - } - gold = { - value = 0 - if = { - limit = { scope:gold_send_option = yes } - add = scope:actor.major_gold_value - desc = GOLD_INTERACTION_ACCEPTANCE_SEND_OPTION - } - } - } - - greeting = positive - notification_text = CORONATION_ANOINTMENT_REQUEST_INTERACTION_NOTIFICATION - - ai_accept = { - base = -60 - modifier = { - add = 80 - scope:actor = { - is_ai = yes - } - } - opinion_modifier = { - opinion_target = scope:actor - who = scope:recipient - multiplier = 0.5 - } - - modifier = { # Same language - add = 5 - desc = speaks_same_language_interaction_reason - trigger = { - scope:actor = { - knows_language_of_culture = scope:recipient.culture - } - } - } - - modifier = { - add = -40 - desc = I_AM_SODOMITE - scope:actor = { - has_trait = sodomite - trait_is_criminal_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = sodomite - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -20 - desc = I_AM_SODOMITE - scope:actor = { - has_trait = sodomite - trait_is_shunned_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = sodomite - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -40 - desc = I_AM_DEVIANT - scope:actor = { - has_trait = deviant - trait_is_criminal_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = deviant - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -20 - desc = I_AM_DEVIANT - scope:actor = { - has_trait = deviant - trait_is_shunned_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = deviant - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -40 - desc = I_AM_ADULTERER - scope:actor = { - has_trait = adulterer - trait_is_criminal_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = adulterer - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -20 - desc = I_AM_ADULTERER - scope:actor = { - has_trait = adulterer - trait_is_shunned_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = adulterer - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -20 - desc = I_AM_ADULTERER - scope:actor = { - has_trait = fornicator - trait_is_criminal_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = fornicator - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -10 - desc = I_AM_ADULTERER - scope:actor = { - has_trait = fornicator - trait_is_shunned_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = fornicator - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -40 - desc = I_AM_WITCH - scope:actor = { - has_trait = witch - trait_is_criminal_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = witch - GENDER_CHARACTER = scope:actor - } - } - } - modifier = { - add = -20 - desc = I_AM_WITCH - scope:actor = { - has_trait = witch - trait_is_shunned_in_faith_trigger = { - FAITH = scope:actor.faith - TRAIT = witch - GENDER_CHARACTER = scope:actor - } - } - } - - modifier = { # I am a Murderer - add = -50 - desc = I_AM_MURDERER - scope:actor = { - has_trait = murderer - } - } - - modifier = { # I am Incestous - add = -50 - desc = I_AM_INCESTOUS - scope:actor = { - NOT = { scope:recipient = { faith = { has_doctrine = doctrine_consanguinity_unrestricted } } } - has_trait = incestuous - } - } - - modifier = { # I am a Kinslayer - add = -30 - desc = I_AM_A_KINSLAYER - scope:actor = { - OR = { - AND = { - has_trait = kinslayer_1 - trait_is_criminal_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_1 GENDER_CHARACTER = scope:actor } - } - AND = { - has_trait = kinslayer_2 - trait_is_criminal_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_2 GENDER_CHARACTER = scope:actor } - } - AND = { - has_trait = kinslayer_3 - trait_is_criminal_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_3 GENDER_CHARACTER = scope:actor } - } - } - } - } - modifier = { # I am a Kinslayer - add = -15 - desc = I_AM_A_KINSLAYER - scope:actor = { - OR = { - AND = { - has_trait = kinslayer_1 - trait_is_shunned_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_1 GENDER_CHARACTER = scope:actor } - } - AND = { - has_trait = kinslayer_2 - trait_is_shunned_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_2 GENDER_CHARACTER = scope:actor } - } - AND = { - has_trait = kinslayer_3 - trait_is_shunned_in_faith_trigger = { FAITH = faith TRAIT = kinslayer_3 GENDER_CHARACTER = scope:actor } - } - } - } - } - modifier = { - add = 10 - scope:actor = { - has_trait = zealous - } - desc = ai_acceptance_trait_zealous - } - modifier = { - add = 10 - scope:actor = { - has_trait = pilgrim - } - desc = ai_acceptance_trait_pilgrim - } - modifier = { - add = 5 - scope:actor = { - has_trait = holy_warrior - } - desc = ai_acceptance_trait_holy_warrior - } - modifier = { - add = 25 - scope:recipient = { - is_landed = no - } - OR = { - scope:recipient.liege ?= scope:actor - scope:recipient.top_liege ?= scope:actor - } - desc = I_AM_LIEGE_TOP_LIEGE - } - modifier = { - add = 15 - scope:recipient = { - is_landed = yes - } - OR = { - scope:recipient.liege ?= scope:actor - scope:recipient.top_liege ?= scope:actor - } - desc = I_AM_LIEGE_TOP_LIEGE - } - - modifier = { - desc = RELIGIOUS_HEAD_INTERACTION_SAVIOR - add = 15 - scope:actor = { - has_trait = savior - } - } - modifier = { - desc = RELIGIOUS_HEAD_INTERACTION_DIVINE_BLOOD - add = 5 - scope:actor = { - has_trait = divine_blood - } - } - modifier = { - desc = RELIGIOUS_HEAD_INTERACTION_PARAGON - add = 15 - scope:actor = { - has_trait = paragon - } - } - modifier = { - desc = RELIGIOUS_HEAD_INTERACTION_CONSECRATED_BLOOD - add = 5 - scope:actor = { - has_trait = consecrated_blood - } - } - - modifier = { # You are of the same dynasty as the Head of Faith - add = 5 - desc = YOU_ARE_MY_DYNASTY_MEMBER - scope:recipient = { - is_lowborn = no - dynasty = scope:actor.dynasty - NOR = { - is_close_or_extended_family_of = scope:actor - is_cousin_of = scope:actor - is_child_of = scope:actor - scope:recipient.dynasty = scope:secondary_recipient.dynasty - } - } - } - - modifier = { # You are of the same house as the Head of Faith - add = 10 - desc = YOU_ARE_MY_HOUSE_MEMBER - scope:recipient = { - is_lowborn = no - house = scope:actor.house - NOR = { - is_close_or_extended_family_of = scope:actor - is_cousin_of = scope:actor - is_child_of = scope:actor - scope:recipient.house = scope:secondary_recipient.house - } - } - } - - modifier = { # Related to the Head of Faith - add = 10 - desc = YOU_ARE_MY_RELATIVE - scope:recipient = { - OR = { - is_close_or_extended_family_of = scope:actor - is_cousin_of = scope:actor - } - NOT = { is_child_of = scope:actor } - } - } - - modifier = { # Parent of the Head of Faith - add = 25 - desc = YOU_ARE_MY_PARENT - scope:recipient = { - is_child_of = scope:actor - } - } - - modifier = { # Friend of the Head of Faith - add = 25 - desc = WE_ARE_FRIENDS - scope:recipient = { - has_relation_friend = scope:actor - } - } - - modifier = { # Best Friend of the Head of Faith - add = 50 - desc = WE_ARE_BEST_FRIENDS - scope:recipient = { - has_relation_best_friend = scope:actor - } - } - - modifier = { # Lover of the Head of Faith - add = 10 - desc = WE_ARE_LOVERS - scope:recipient = { - has_relation_lover = scope:actor - } - } - - modifier = { # Rival of the Head of Faith - add = -100 - desc = WE_ARE_RIVALS - scope:recipient = { - has_relation_rival = scope:actor - } - } - - modifier = { # Nemesis of the Head of Faith - add = -500 - desc = WE_ARE_NEMESES - scope:recipient = { - has_relation_nemesis = scope:actor - } - } - - modifier = { - add = { - add = 10 - multiply = scope:actor.num_virtuous_traits - } - scope:actor.num_virtuous_traits > 0 - desc = I_AM_VIRTUOUS - } - - modifier = { - add = { - add = 5 - multiply = scope:actor.piety_level - } - scope:actor.piety_level > 1 - desc = I_AM_PIOUS - } - - modifier = { - add = -30 - scope:actor.piety_level = 0 - desc = I_HAVE_LOW_PIETY - } - - modifier = { - add = { - add = 5 - multiply = scope:actor.piety_level - } - scope:actor.piety_level > 2 - scope:actor.gold < 0 - desc = I_AM_PIOUS_AND_BROKE - } - - modifier = { - add = { - add = -10 - multiply = scope:actor.num_sinful_traits - } - scope:actor.num_sinful_traits > 0 - desc = I_AM_SINFUL - } - - modifier = { - add = 20 - scope:actor = { - has_trait = crusader_king - } - desc = I_HAVE_CRUSADER_KING_TRAIT - } - - modifier = { - add = 20 - scope:actor = { - has_trait = saint - } - desc = I_HAVE_SAINT_TRAIT - } - - modifier = { - add = 30 - scope:actor = { - has_trait = saoshyant - } - desc = I_HAVE_SAOSHYANT_TRAIT - } - - modifier = { - add = 10 - scope:actor = { - has_trait = saoshyant_descendant - } - desc = I_HAVE_SAOSHYANT_DESCENDANT_TRAIT - } - - modifier = { - add = 10 - scope:actor = { - has_trait = sayyid - } - desc = I_HAVE_SAYYID_TRAIT - } - - modifier = { - add = 10 - scope:actor = { - has_trait = order_member - } - desc = I_HAVE_ORDER_MEMBER_TRAIT - } - - modifier = { - add = 10 - scope:actor = { - has_trait = faith_warrior - } - desc = I_HAVE_FAITH_WARRIOR_TRAIT - } - - modifier = { - add = 10 - scope:actor = { - has_trait = theologian - } - desc = I_HAVE_THEOLOGIAN_TRAIT - } - - modifier = { - add = -25 - scope:actor = { - has_trait = despoiler_of_byzantium - } - desc = I_HAVE_DESPOILER_OF_BYZANTIUM_TRAIT - } - - modifier = { - add = -25 - scope:actor = { - has_trait = gallowsbait - } - desc = I_HAVE_GALLOWSBAIT_TRAIT - } - - modifier = { - add = -25 - scope:actor = { - has_trait = decadent - } - desc = I_HAVE_DECADENT_TRAIT - } - - modifier = { - add = -25 - desc = BASE_RELUCTANCE - trigger = { - has_game_rule = hard_difficulty - scope:actor = { - is_ai = no - } - } - } - - modifier = { - add = -75 - desc = BASE_RELUCTANCE - trigger = { - has_game_rule = very_hard_difficulty - scope:actor = { - is_ai = no - } - } - } - - modifier = { - add = 60 - desc = TRADE_GOLD_FOR_BETTER_AI_ACCEPTANCE_TT - scope:gold_send_option = yes - } - - modifier = { - add = 40 - desc = PIETY_INTERACTION_ACCEPTANCE_SEND_OPTION - scope:piety_send_option = yes - } - - modifier = { - add = { - value = 0 - scope:recipient = { - every_held_title = { - limit = { - is_head_of_faith = no - } - every_de_jure_county = { - limit = { - holder = scope:actor - } - add = 20 - } - } - } - } - desc = TRADE_LAND_ACCEPTANCE_SEND_OPTION - scope:land_send_option = yes - } - modifier = { - add = -20 - scope:recipient = { - faith_dominant_gender_female_or_equal = no - } - scope:actor = { - is_female = yes - } - desc = I_AM_FEMALE_WHEN_MALE_IS_PREFERRED - } - modifier = { - add = -20 - scope:recipient = { - faith_dominant_gender_male_or_equal = no - } - scope:actor = { - is_male = yes - } - desc = I_AM_MALE_WHEN_FEMALE_IS_PREFERRED - } - modifier = { - desc = "LOW_LEGITIMACY_REASON" - scope:actor = { - is_ai = no - legitimacy_level <= 0 - } - add = -15 - } - modifier = { - desc = "LOW_LEGITIMACY_REASON" - scope:actor = { - is_ai = no - legitimacy_level = 1 - } - add = -10 - } - modifier = { - desc = "LOW_LEGITIMACY_REASON" - scope:actor = { - is_ai = no - legitimacy_level = 2 - } - add = -5 - } - modifier = { - desc = "HIGH_LEGITIMACY_REASON" - scope:actor = { - legitimacy_level = 4 - } - add = 10 - } - modifier = { - desc = "HIGH_LEGITIMACY_REASON" - scope:actor = { - legitimacy_level >= 5 - } - add = 15 - } - } - - auto_accept = { - custom_description = { - text = "spending_hook" - subject = scope:actor - object = scope:recipient - scope:hook = yes - } - } - - send_option = { # Hook - flag = hook - is_valid = { - scope:actor = { - has_usable_hook = scope:recipient - } - } - localization = GENERIC_SPEND_A_HOOK - } - - should_use_extra_icon = { - scope:actor = { has_usable_hook = scope:recipient } - } - extra_icon = "gfx/interface/icons/character_interactions/hook_icon.dds" - - send_option = { # Piety - is_shown = { - always = yes - } - is_valid = { - scope:actor = { piety >= monumental_piety_value } - custom_tooltip = { - text = already_using_hook - NOT = { scope:hook = yes } - } - } - flag = piety_send_option - localization = TRADE_PIETY_FOR_BETTER_AI_ACCEPTANCE - } - - send_option = { # Gold - is_shown = { - always = yes - } - is_valid = { - scope:actor = { gold >= major_gold_value } - custom_tooltip = { - text = already_using_hook - NOT = { scope:hook = yes } - } - } - flag = gold_send_option - localization = TRADE_GOLD_FOR_BETTER_AI_ACCEPTANCE - } - - send_option = { # Return land - is_shown = { - always = yes - } - is_valid = { - custom_tooltip = { - text = coronation_request_return_land_trigger - scope:recipient = { - any_held_title = { - is_head_of_faith = no - any_de_jure_county = { - holder = scope:actor - } - } - } - } - } - flag = land_send_option - localization = TRADE_LAND_FOR_BETTER_AI_ACCEPTANCE - } - - send_options_exclusive = no - - on_accept = { - scope:recipient = { - custom_tooltip = anoinment_request_accepted_tt - add_to_variable_list = { - name = supported_anointments - target = scope:actor - } - } - if = { - limit = { - scope:gold_send_option = yes - } - scope:recipient = { - add_short_term_gold = scope:actor.major_gold_value - } - } - if = { - limit = { - scope:land_send_option = yes - } - create_title_and_vassal_change = { - type = returned - save_scope_as = change - } - scope:recipient = { - every_held_title = { - limit = { - is_head_of_faith = no - } - every_de_jure_county = { - limit = { - holder = scope:actor - } - change_title_holder_include_vassals = { - holder = scope:recipient - change = scope:change - } - } - } - } - resolve_title_and_vassal_change = scope:change - } - scope:actor = { - trigger_event = coronation_events.0400 - } - } - - on_decline = { - scope:actor = { - trigger_event = religious_interaction.32 - } - } - - ai_potential = { - age >= 16 - coronation_trigger = yes - } - - ai_will_do = { - base = 50 - modifier = { - has_game_rule = coronation_laws_off - add = -25 - } - } -} diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 7956295e6..c62874bdb 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1052,7 +1052,6 @@ boatswain_dynasty = { } avril_dynasty = { - prefix = dynnp_d_ name = dynn_avril culture = portuguese motto = dynn_avril_motto @@ -2430,8 +2429,3 @@ fifor_dynasty = { name = dynn_fifor culture = wallachian } - -kinýraou_dynasty = { - name = dynn_kinýraou - culture = NEOW_cypriot -} diff --git a/common/dynasty_houses/NEOW_dynasty_houses.txt b/common/dynasty_houses/NEOW_dynasty_houses.txt index b017ab2b4..c3433a43b 100644 --- a/common/dynasty_houses/NEOW_dynasty_houses.txt +++ b/common/dynasty_houses/NEOW_dynasty_houses.txt @@ -41,7 +41,7 @@ house_bourbon_naundorff = { dynasty = borbon_dynasty } house_bourbon_anjou = { - prefix = "dynnp_de" + #prefix = "dynnp_de" name = dynn_Bourbon_Anjou dynasty = borbon_dynasty } diff --git a/common/religion/religion_types/NEOW_pantheonic.txt b/common/religion/religion_types/NEOW_pantheonic.txt index e54183ee0..ecf2d4e34 100644 --- a/common/religion/religion_types/NEOW_pantheonic.txt +++ b/common/religion/religion_types/NEOW_pantheonic.txt @@ -270,7 +270,6 @@ #Special Tolerance | placeholder #doctrine = special_doctrine_ecumenical_christian doctrine = special_doctrine_populares - doctrine = doctrine_funeral_stoic #Tenets | placeholder doctrine = tenet_righteous_fury @@ -308,7 +307,6 @@ doctrine = tenet_vows_of_poverty doctrine = tenet_communal_possessions doctrine = tenet_pursuit_of_power - doctrine = doctrine_funeral_stoic #Special/virtue | placeholder doctrine = special_doctrine_equality @@ -341,8 +339,7 @@ doctrine = tenet_legalism doctrine = doctrine_temporal_head #Coronation tradition - #doctrine = doctrine_imperial_anointment - doctrine = doctrine_funeral_stoic + doctrine = doctrine_imperial_anointment localization = { # placeholder #FertilityGod @@ -415,15 +412,14 @@ doctrine = tenet_armed_resistance doctrine = tenet_armed_pilgrimages doctrine = tenet_chivalric_ideals - doctrine = doctrine_monotheist - doctrine = doctrine_anointment_permitted - doctrine = doctrine_funeral_cremation doctrine = doctrine_spiritual_head holy_order_names = { #placeholder name = "holy_order_order_of_sainte_jeanne_d'arc" } + doctrine = doctrine_anointment_permitted + doctrine = doctrine_funeral_cremation localization = { # placeholder #FertilityGod FertilityGodName = west_christian_fertility_god_name diff --git a/history/characters/NEOW_e_britannia.txt b/history/characters/NEOW_e_britannia.txt index 2f6cd6e01..c1232171e 100644 --- a/history/characters/NEOW_e_britannia.txt +++ b/history/characters/NEOW_e_britannia.txt @@ -2868,12 +2868,11 @@ britannia_arthur_crowtemple = { dna = dna_arthur_crowtemple_i religion=old_thelema culture=souflander - trait=education_martial_5 + trait=education_martial_4 trait=brave trait=ambitious trait=strong trait=diligent - trait=strategist 2182.7.9={ birth=yes add_character_flag = no_beard #Not working, fix eventually @@ -2907,13 +2906,12 @@ britannia_mordred_crowtemple = { dynasty_house = house_britannia_crowtemple religion=old_thelema culture=souflander - trait=education_intrigue_1 - trait=wrathful - trait=arbitrary + trait=education_martial_2 + trait=temperate + trait=ambitious trait=sadistic trait=torturer - trait=seducer - give_nickname = nick_the_cruel + trait=deceitful mother = britannia_kate_crowtemple 2225.2.28={ birth=yes diff --git a/history/characters/NEOW_e_greece.txt b/history/characters/NEOW_e_greece.txt index 437106c8a..e0b418117 100644 --- a/history/characters/NEOW_e_greece.txt +++ b/history/characters/NEOW_e_greece.txt @@ -802,66 +802,3 @@ albania0005 = { #Kastriota } } -cyprus0001 = { # Kinýras named for a cypriot greek thing - name = "Kinýras" - dynasty = kinýraou_dynasty - religion = "orthodox" - culture = NEOW_cypriot - trait = education_learning_3 - trait = zealous - trait = deceitful - trait = fickle - trait = fecund - trait = beauty_good_3 - trait = lifestyle_poet - sexuality = heterosexual - 2535.1.1 = { - birth = yes - } - 2554.1.1 = { - add_spouse = cyprus0002 - } - 2600.1.1 = { - death = yes - } -} - -cyprus0002 = { # the wife - name = "Kenchríis" - religion = "orthodox" - culture = NEOW_cypriot - trait = education_stewardship_2 - trait = ambitious - #trait = raider - trait = arrogant - trait = wrathful - trait = diligent - sexuality = heterosexual - female = yes - 2538.1.1 = { - birth = yes - } - 2554.1.1 = { - add_spouse = cyprus0001 - } - 2600.1.1 = { - death = yes - } -} - -cyprus0003 = { # Child - name = "Kýpros" - dynasty = kinýraou_dynasty - religion = "orthodox" - culture = NEOW_cypriot - trait = fecund - trait = beauty_good_2 - father = cyprus0001 - mother = cyprus0002 - 2554.10.10 = { - birth = yes - } - 2600.1.1 = { - death = yes - } -} \ No newline at end of file diff --git a/history/characters/NEOW_e_nistrenia.txt b/history/characters/NEOW_e_nistrenia.txt index 1edcac354..626fabc66 100644 --- a/history/characters/NEOW_e_nistrenia.txt +++ b/history/characters/NEOW_e_nistrenia.txt @@ -325,7 +325,7 @@ nistria0017 = { religion = orthodox culture = NEOW_minskian trait = education_martial_1 - trait = holy_warrior + trait = faithful_blade trait = diligent trait = zealous trait = stubborn @@ -504,7 +504,7 @@ nistria0027 = { culture = moldavian female = yes trait = education_intrigue_1 - trait = lifestyle_poet + trait = poet trait = diligent trait = calm trait = fickle @@ -540,7 +540,7 @@ nistria0029 = { culture = NEOW_vohlynian female = yes trait = education_martial_2 - trait =unyielding + trait = defender trait = trusting trait = compassionate trait = fickle @@ -697,7 +697,7 @@ nistria0038 = { religion = "orthodox" culture = wallachian trait = education_martial_1 - trait =unyielding + trait = defender trait = arrogant trait = content trait = lazy @@ -842,7 +842,7 @@ nistria0046 = { culture = NEOW_polessian female = yes trait = education_diplomacy_3 - trait = lifestyle_traveller + trait = traveller trait = vengeful trait = temperate trait = just @@ -1021,7 +1021,7 @@ nistria0056 = { trait = just trait = callous trait = humble - trait = physique_bad_1 + trait = delicate 2525.10.21 = { birth = yes } @@ -1039,7 +1039,7 @@ nistria0057 = { trait = just trait = callous trait = humble - trait = physique_bad_1 + trait = delicate 2528.5.3 = { birth = yes } @@ -1231,7 +1231,6 @@ nistria1007 = { dynasty = ganzbitte_dynasty religion = "orthodox" culture = hungarian - trait = eunuch_1 trait = education_martial_5 trait = strategist trait = gallant @@ -1239,6 +1238,7 @@ nistria1007 = { trait = cynical trait = ambitious trait = brave + trait = eunuch 2324.8.5 = { birth = yes } diff --git a/history/titles/NEOW_other_titles.txt b/history/titles/NEOW_other_titles.txt index 3069d81ca..45aed5c47 100644 --- a/history/titles/NEOW_other_titles.txt +++ b/history/titles/NEOW_other_titles.txt @@ -2,7 +2,6 @@ e_britannia = { 2212.1.1={ holder = britannia_arthur_crowtemple # Arthwr Crowtemple - government = administrative_government } 2236.8.4={ holder = britannia_kate_crowtemple # Kate Crowtemple @@ -10,9 +9,6 @@ e_britannia = { 2251.7.16={ holder = britannia_mordred_crowtemple # Mordred "the Cruel" Crowtemple, end of the Crowtemple dynasty } - 2269.2.9 = { - holder = 0 - } 2498.1.1 = { holder = britannia_cyflymarhyan_elyan #Elyan Cyflymarhyan } @@ -89,7 +85,6 @@ e_france = { e_nistrenia = { 2282.1.11={ holder = nistria1000 - government = administrative_government } 2304.4.15 = { holder = nistria1001 @@ -179,11 +174,12 @@ e_nistrenia = { holder = nistria1028 } 2532.5.8 = { - holder = nistria1029 + holder = nistria1029 } 2554.1.1 = { - holder = nistria0002 - change_development_level = 6 + holder = nistria0002 + change_development_level = 6 + government = administrative_government } } diff --git a/history/titles/k_cyprus.txt b/history/titles/k_cyprus.txt index 6e6aacba1..157db537b 100644 --- a/history/titles/k_cyprus.txt +++ b/history/titles/k_cyprus.txt @@ -2,7 +2,4 @@ k_cyprus = { 2547.1.1 = { change_development_level = 10 } - 2550.1.1 = { - holder = cyprus0001 - } } \ No newline at end of file diff --git a/history/titles/k_moldavia.txt b/history/titles/k_moldavia.txt index d245c5ec5..9087cb873 100644 --- a/history/titles/k_moldavia.txt +++ b/history/titles/k_moldavia.txt @@ -197,7 +197,7 @@ d_bessarabia = { 2554.1.1 = { holder = nistria0002 change_development_level = 6 - government = administrative_government + government = administrative_government } } @@ -211,21 +211,21 @@ b_hotin= { b_balti= { 2554.1.1 = { - holder = nistria0002 + holder = nistria1029 government = administrative_government } } b_chisinau= { 2554.1.1 = { - holder = nistria0002 + holder = nistria1029 government = administrative_government } } b_tighina= { 2554.1.1 = { - holder = nistria0002 + holder = nistria1029 government = administrative_government } } diff --git a/history/wars/00_wars.txt b/history/wars/00_wars.txt index 8d0eb0129..68c1919be 100644 --- a/history/wars/00_wars.txt +++ b/history/wars/00_wars.txt @@ -29,7 +29,7 @@ war = { # Ukraian independance war war = { name = "Ukranian Independance War" - start_date = 2554.12.1 # Originally 853.1.1, but it caused the AI to auto-truce the conflict on game start + start_date = 2554.1.1 # Originally 853.1.1, but it caused the AI to auto-truce the conflict on game start end_date = 2557.1.1 targeted_titles = { k_ruthenia @@ -39,12 +39,12 @@ war = { defenders = { nistria0002 } nistr0003= { - 2554.12.12 = { + 2554.1.1 = { location = 547 } } nistria0002 = { - 2554.12.12= { + 2554.1.1= { location = 5021 } }