diff --git a/CleanSlate/common/cb_types/adventurer_cbs.txt b/CleanSlate/common/cb_types/adventurer_cbs.txt index bfbb2212f..eee3c5d33 100644 --- a/CleanSlate/common/cb_types/adventurer_cbs.txt +++ b/CleanSlate/common/cb_types/adventurer_cbs.txt @@ -28,7 +28,12 @@ duchy_adventure = { hidden_effect = { clr_character_flag = duchy_adventurer - give_nickname = nick_the_conqueror + if = { + limit = { + can_apply_average_nickname_trigger = yes + } + give_nickname = nick_the_conqueror + } } } diff --git a/CleanSlate/common/combat_tactics/00_combat_tactics.txt b/CleanSlate/common/combat_tactics/00_combat_tactics.txt index 317a835e2..4cbdb4d90 100644 --- a/CleanSlate/common/combat_tactics/00_combat_tactics.txt +++ b/CleanSlate/common/combat_tactics/00_combat_tactics.txt @@ -439,13 +439,15 @@ swarm_volley_tactic = { flank_has_leader = yes leader = { martial >= 8 } - light_troops = { - who = archers - value >= 0.7 - } - light_troops = { - who = horse_archers - value >= 0.3 + OR = { + light_troops = { + who = archers + value >= 0.7 + } + light_troops = { + who = horse_archers + value >= 0.3 + } } } @@ -455,13 +457,15 @@ swarm_volley_tactic = { flank_has_leader = yes leader = { martial >= 12 } - light_troops = { - who = archers - value >= 0.6 - } - light_troops = { - who = horse_archers - value >= 0.3 + OR = { + light_troops = { + who = archers + value >= 0.6 + } + light_troops = { + who = horse_archers + value >= 0.3 + } } } @@ -471,13 +475,15 @@ swarm_volley_tactic = { flank_has_leader = yes leader = { martial >= 16 } - light_troops = { - who = archers - value >= 0.5 - } - light_troops = { - who = horse_archers - value >= 0.3 + OR = { + light_troops = { + who = archers + value >= 0.5 + } + light_troops = { + who = horse_archers + value >= 0.3 + } } } } @@ -1223,13 +1229,15 @@ awesome_advance_tactic = { flank_has_leader = yes leader = { martial >= 9 } - heavy_troops = { - who = heavy_infantry - value >= 0.7 - } - heavy_troops = { - who = knights - value >= 0.3 + OR = { + heavy_troops = { + who = heavy_infantry + value >= 0.7 + } + heavy_troops = { + who = knights + value >= 0.3 + } } } @@ -1239,13 +1247,15 @@ awesome_advance_tactic = { flank_has_leader = yes leader = { martial >= 13 } - heavy_troops = { - who = heavy_infantry - value >= 0.6 - } - heavy_troops = { - who = knights - value >= 0.3 + OR = { + heavy_troops = { + who = heavy_infantry + value >= 0.6 + } + heavy_troops = { + who = knights + value >= 0.3 + } } } @@ -1255,13 +1265,15 @@ awesome_advance_tactic = { flank_has_leader = yes leader = { martial >= 17 } - heavy_troops = { - who = heavy_infantry - value >= 0.5 - } - heavy_troops = { - who = knights - value >= 0.3 + OR = { + heavy_troops = { + who = heavy_infantry + value >= 0.6 + } + heavy_troops = { + who = knights + value >= 0.3 + } } } } @@ -1357,13 +1369,15 @@ slow_advance_tactic = { flank_has_leader = yes leader = { martial >= 8 } - heavy_troops = { - who = pikemen - value >= 0.7 - } - heavy_troops = { - who = heavy_infantry - value >= 0.3 + OR = { + heavy_troops = { + who = pikemen + value >= 0.7 + } + heavy_troops = { + who = heavy_infantry + value >= 0.3 + } } } @@ -1373,13 +1387,15 @@ slow_advance_tactic = { flank_has_leader = yes leader = { martial >= 12 } - heavy_troops = { - who = pikemen - value >= 0.6 - } - heavy_troops = { - who = heavy_infantry - value >= 0.3 + OR = { + heavy_troops = { + who = pikemen + value >= 0.6 + } + heavy_troops = { + who = heavy_infantry + value >= 0.3 + } } } @@ -1389,13 +1405,15 @@ slow_advance_tactic = { flank_has_leader = yes leader = { martial >= 16 } - heavy_troops = { - who = pikemen - value >= 0.5 - } - heavy_troops = { - who = heavy_infantry - value >= 0.3 + OR = { + heavy_troops = { + who = pikemen + value >= 0.5 + } + heavy_troops = { + who = heavy_infantry + value >= 0.3 + } } } } @@ -1490,13 +1508,15 @@ awesomer_charge_tactic = { flank_has_leader = yes leader = { martial >= 9 } - heavy_troops = { - who = knights - value >= 0.7 - } - heavy_troops = { - who = pikemen - value >= 0.3 + OR = { + heavy_troops = { + who = knights + value >= 0.7 + } + heavy_troops = { + who = pikemen + value >= 0.3 + } } } @@ -1506,13 +1526,15 @@ awesomer_charge_tactic = { flank_has_leader = yes leader = { martial >= 13 } - heavy_troops = { - who = knights - value >= 0.6 - } - heavy_troops = { - who = pikemen - value >= 0.3 + OR = { + heavy_troops = { + who = knights + value >= 0.6 + } + heavy_troops = { + who = pikemen + value >= 0.3 + } } } @@ -1522,13 +1544,15 @@ awesomer_charge_tactic = { flank_has_leader = yes leader = { martial >= 17 } - heavy_troops = { - who = knights - value >= 0.5 - } - heavy_troops = { - who = pikemen - value >= 0.3 + OR = { + heavy_troops = { + who = knights + value >= 0.5 + } + heavy_troops = { + who = pikemen + value >= 0.3 + } } } } @@ -2721,11 +2745,11 @@ clever_ambush_tactic = { trigger = { phase = melee - light_cavalry = 0.1 + light_infantry = 0.1 flank_has_leader = yes OR = { - light_infantry = 0.1 + light_cavalry = 0.1 camel_cavalry = 0.1 } diff --git a/CleanSlate/common/cultures/00_chinese_group.txt b/CleanSlate/common/cultures/00_chinese_group.txt index ce239843f..48530d5ea 100644 --- a/CleanSlate/common/cultures/00_chinese_group.txt +++ b/CleanSlate/common/cultures/00_chinese_group.txt @@ -67,6 +67,14 @@ chinese_group = { } from_dynasty_prefix = "" + + pat_grf_name_chance = 0 + mat_grf_name_chance = 0 + father_name_chance = 0 + + pat_grm_name_chance = 0 + mat_grm_name_chance = 0 + mother_name_chance = 0 dynasty_name_first = yes dynasty_title_names = no diff --git a/CleanSlate/common/death_text/00_death_text.txt b/CleanSlate/common/death_text/00_death_text.txt index 4f4a26c50..a9331910a 100644 --- a/CleanSlate/common/death_text/00_death_text.txt +++ b/CleanSlate/common/death_text/00_death_text.txt @@ -82,7 +82,7 @@ death_text_sponsor_king = { factor = 60 trigger = { - has_character_flag = flag_sponsored_baptist + has_character_flag = flag_sponsored_baptism } } } diff --git a/CleanSlate/common/event_modifiers/00_event_modifiers.txt b/CleanSlate/common/event_modifiers/00_event_modifiers.txt index adf6efa1a..478fd4d22 100644 --- a/CleanSlate/common/event_modifiers/00_event_modifiers.txt +++ b/CleanSlate/common/event_modifiers/00_event_modifiers.txt @@ -1315,7 +1315,7 @@ religious_tract = { rats_in_cell = { health = -3 - icon = 38 + icon = 90 } # Drunkard events @@ -1519,11 +1519,17 @@ marshal_improves_capital = { } lovers_retreat = { + is_visible = { + character = FROM + } fertility = 0.1 icon = 13 } lovers_entertainment = { + is_visible = { + character = FROM + } fertility = 0.2 icon = 15 } @@ -3509,6 +3515,9 @@ guide_dog = { } lovers_memento = { + is_visible = { + character = FROM + } health = 0.5 icon = 59 } diff --git a/CleanSlate/common/execution_methods/00_execution_methods.txt b/CleanSlate/common/execution_methods/00_execution_methods.txt index 3cbb05f71..c1c4832c3 100644 --- a/CleanSlate/common/execution_methods/00_execution_methods.txt +++ b/CleanSlate/common/execution_methods/00_execution_methods.txt @@ -107,7 +107,10 @@ execution_method = { trigger = { FROM = { - NOT = { is_nomadic = yes } + NOR = { + is_nomadic = yes + religion = zoroastrian + } } } } diff --git a/CleanSlate/common/landed_titles/01_holy_orders.txt b/CleanSlate/common/landed_titles/01_holy_orders.txt index 8a81a90ad..7fcb9452d 100644 --- a/CleanSlate/common/landed_titles/01_holy_orders.txt +++ b/CleanSlate/common/landed_titles/01_holy_orders.txt @@ -575,6 +575,8 @@ d_myrmidons = { holy_order = yes + short_name = yes + culture = greek # Parent Religion diff --git a/CleanSlate/common/landed_titles/01_special.txt b/CleanSlate/common/landed_titles/01_special.txt index 3ccc15ca1..f1bae4da9 100644 --- a/CleanSlate/common/landed_titles/01_special.txt +++ b/CleanSlate/common/landed_titles/01_special.txt @@ -283,6 +283,8 @@ e_roman_empire = { culture = roman #religion = orthodox + + dynasty_title_names = no allow = { always = no # Only created through special event diff --git a/CleanSlate/common/laws/ze_crown_laws.txt b/CleanSlate/common/laws/ze_crown_laws.txt index f84d6dadb..3cde12fe4 100644 --- a/CleanSlate/common/laws/ze_crown_laws.txt +++ b/CleanSlate/common/laws/ze_crown_laws.txt @@ -120,7 +120,7 @@ de_jure_laws = { vassal_wars_law_1 = { group = vassal_wars_law - feudal_opinion = -5 + vassal_opinion = -5 potential = { is_law_potential = vassal_wars_law_0 } @@ -153,7 +153,7 @@ de_jure_laws = { vassal_wars_law_2 = { group = vassal_wars_law - feudal_opinion = -10 + vassal_opinion = -10 potential = { is_law_potential = vassal_wars_law_0 } diff --git a/CleanSlate/common/nicknames/00_nicknames.txt b/CleanSlate/common/nicknames/00_nicknames.txt index 554603081..010e423a2 100644 --- a/CleanSlate/common/nicknames/00_nicknames.txt +++ b/CleanSlate/common/nicknames/00_nicknames.txt @@ -1302,7 +1302,7 @@ nick_of_a_thousand_faces = { nick_the_cannibal = { allow = { is_adult = yes - has_character_modifier = crazy_cannibal + trait = cannibal } chance = { diff --git a/CleanSlate/common/objectives/00_ambitions.txt b/CleanSlate/common/objectives/00_ambitions.txt index 900dade14..a8b3e2901 100644 --- a/CleanSlate/common/objectives/00_ambitions.txt +++ b/CleanSlate/common/objectives/00_ambitions.txt @@ -799,7 +799,6 @@ obj_become_paragon_of_virtue = { religion_group = indian_group is_incapable = yes has_impious_trait_trigger = yes - has_pious_trait_trigger = no } } diff --git a/CleanSlate/common/religions/00_indian_group.txt b/CleanSlate/common/religions/00_indian_group.txt index b82239b64..fc244678e 100644 --- a/CleanSlate/common/religions/00_indian_group.txt +++ b/CleanSlate/common/religions/00_indian_group.txt @@ -34,6 +34,8 @@ indian_group = { religious_clothing_priest = 10 piety_name = KARMA + + crusade_name = GREAT_HOLY_WAR priest_title = BHIKKHU scripture_name = THE_BUDDHACAVANA @@ -87,6 +89,8 @@ indian_group = { religious_clothing_priest = 8 piety_name = KARMA + + crusade_name = GREAT_HOLY_WAR priest_title = PUJARI scripture_name = THE_MAHABHARATA @@ -139,6 +143,8 @@ indian_group = { religious_clothing_priest = 9 piety_name = PURITY + + crusade_name = GREAT_HOLY_WAR priest_title = NIRGRANTHA scripture_name = THE_ANGAS_SUTRAS @@ -193,6 +199,8 @@ indian_group = { } piety_name = TE + + crusade_name = GREAT_HOLY_WAR priest_title = DAOSHI scripture_name = TAO_TE_CHING diff --git a/CleanSlate/common/scripted_effects/00_society_effects.txt b/CleanSlate/common/scripted_effects/00_society_effects.txt index e7ab60954..9561adbac 100644 --- a/CleanSlate/common/scripted_effects/00_society_effects.txt +++ b/CleanSlate/common/scripted_effects/00_society_effects.txt @@ -235,9 +235,9 @@ clean_up_after_leaving_society_effect = { clr_character_flag = holy_seclusion_struggled_with_loneliness clr_character_flag = holy_seclusion_scripture_reading clr_character_flag = holy_seclusion_interrupting_child - clr_character_flag = success_seculison_desc_A - clr_character_flag = success_seculison_desc_B - clr_character_flag = success_seculison_desc_C + clr_character_flag = success_seclusion_desc_A + clr_character_flag = success_seclusion_desc_B + clr_character_flag = success_seclusion_desc_C # Powers, Missions and Interactions: Hermetics clr_character_flag = power_hungry_scrying_flag diff --git a/CleanSlate/common/scripted_triggers/00_nickname_triggers.txt b/CleanSlate/common/scripted_triggers/00_nickname_triggers.txt index a8ee4e0d1..f3f541891 100644 --- a/CleanSlate/common/scripted_triggers/00_nickname_triggers.txt +++ b/CleanSlate/common/scripted_triggers/00_nickname_triggers.txt @@ -56,7 +56,6 @@ this_has_lame_nickname_trigger = { has_nickname = nick_the_absolved has_nickname = nick_the_affable has_nickname = nick_the_armorsmith - has_nickname = nick_the_avenger has_nickname = nick_the_bastard has_nickname = nick_the_beguiling has_nickname = nick_the_bewitched @@ -96,7 +95,6 @@ this_has_lame_nickname_trigger = { has_nickname = nick_the_gentle has_nickname = nick_the_german has_nickname = nick_the_girls_arm - has_nickname = nick_the_glorious has_nickname = nick_the_goldsmith has_nickname = nick_the_good has_nickname = nick_the_gouty @@ -127,7 +125,6 @@ this_has_lame_nickname_trigger = { has_nickname = nick_the_lucky has_nickname = nick_the_mad has_nickname = nick_the_magnanimous - has_nickname = nick_the_magnificent has_nickname = nick_the_merciful has_nickname = nick_the_merry has_nickname = nick_the_messy @@ -207,6 +204,7 @@ this_has_average_nickname_trigger = { has_nickname = nick_the_accursed has_nickname = nick_the_apostle has_nickname = nick_the_astrologer + has_nickname = nick_the_avenger has_nickname = nick_the_bard has_nickname = nick_the_beanstalk has_nickname = nick_the_beef_thrasher @@ -354,6 +352,7 @@ this_has_cool_nickname_trigger = { has_nickname = nick_the_flail_of has_nickname = nick_the_fool_for_christ has_nickname = nick_the_generous + has_nickname = nick_the_glorious has_nickname = nick_the_gods_champion has_nickname = nick_the_goliath has_nickname = nick_the_great_beast @@ -472,6 +471,7 @@ this_has_super_cool_nickname_trigger = { has_nickname = nick_the_leechlord has_nickname = nick_the_little_nightmare has_nickname = nick_the_little_spider + has_nickname = nick_the_magnificent has_nickname = nick_the_maid_of_virgin has_nickname = nick_the_messenger_of_christ has_nickname = nick_the_missionary diff --git a/CleanSlate/common/societies/00_devil_worshippers.txt b/CleanSlate/common/societies/00_devil_worshippers.txt index f40d08469..ae388220f 100644 --- a/CleanSlate/common/societies/00_devil_worshippers.txt +++ b/CleanSlate/common/societies/00_devil_worshippers.txt @@ -546,7 +546,7 @@ the_trollcrafters = { # Looks like Odin has_trait = { trait = one_eyed - value = 3 + value = -3 } has_trait = { @@ -590,7 +590,7 @@ the_trollcrafters = { # Looks like Odin mult_modifier = { - factor = 1.3 + factor = 0.67 trait = one_eyed } } diff --git a/CleanSlate/decisions/LT_936_decisions.txt b/CleanSlate/decisions/LT_936_decisions.txt index 1897c41dd..4e6baa52a 100644 --- a/CleanSlate/decisions/LT_936_decisions.txt +++ b/CleanSlate/decisions/LT_936_decisions.txt @@ -257,6 +257,24 @@ decisions = { capital_scope = { province_id = c_kiev + OR = { + AND = { + religion = slavic_pagan + ROOT = { + NOT = { + religion = slavic_pagan + } + } + } + AND = { + culture = russian + ROOT = { + NOT = { + culture = russian + } + } + } + } } } @@ -264,7 +282,12 @@ decisions = { prestige = -300 if = { - limit = { religion = norse_pagan } + limit = { + religion = norse_pagan + capital_scope = { + religion = slavic_pagan + } + } tooltip = { religion = slavic_pagan @@ -281,7 +304,13 @@ decisions = { } if = { - limit = { culture = norse } + limit = { + culture = norse + capital_scope = { + culture = russian + } + } + culture = russian } @@ -289,7 +318,14 @@ decisions = { show_scope_change = no if = { - limit = { religion = norse_pagan } + limit = { + religion = norse_pagan + ROOT = { + capital_scope = { + religion = slavic_pagan + } + } + } tooltip = { religion = slavic_pagan @@ -306,7 +342,14 @@ decisions = { } if = { - limit = { culture = norse } + limit = { + culture = norse + ROOT = { + capital_scope = { + culture = russian + } + } + } culture = russian } } diff --git a/CleanSlate/decisions/dynasty_decisions.txt b/CleanSlate/decisions/dynasty_decisions.txt index 2f5d6ce56..2f10129f3 100644 --- a/CleanSlate/decisions/dynasty_decisions.txt +++ b/CleanSlate/decisions/dynasty_decisions.txt @@ -409,14 +409,24 @@ targeted_decisions = { remove_spouse = ROOT } } + + # No betrothal + if = { + limit = { is_betrothed = yes } + + break_betrothal = yes + } # And no consorts if = { - limit = { is_senior_consort_party = yes } - + limit = { + any_consort = { + always = yes + } + } + any_consort = { show_scope_change = no - remove_consort = ROOT } } diff --git a/CleanSlate/decisions/plot_decisions.txt b/CleanSlate/decisions/plot_decisions.txt index 929fb2736..51d8c2b2d 100644 --- a/CleanSlate/decisions/plot_decisions.txt +++ b/CleanSlate/decisions/plot_decisions.txt @@ -448,6 +448,8 @@ plot_decisions = { } activate_plot = yes + + set_character_flag = plot_seize_trade_post_decision_taken } ai_will_do = { diff --git a/CleanSlate/decisions/wonder_decisions.txt b/CleanSlate/decisions/wonder_decisions.txt index e9b9364fb..60bbec468 100644 --- a/CleanSlate/decisions/wonder_decisions.txt +++ b/CleanSlate/decisions/wonder_decisions.txt @@ -349,15 +349,20 @@ targeted_decisions = { } allow = { - prisoner = no + allow = { + is_inaccessible_or_incapable_trigger = no custom_tooltip = { text = not_recently_sent_alcohol_tooltip - + FROM = { NOT = { has_character_modifier = recently_sent_alcohol_gift } } } + + FROM = { + is_inaccessible_or_incapable_trigger = no + } } effect = { diff --git a/CleanSlate/events/HF_warrior_lodge_mission_events.txt b/CleanSlate/events/HF_warrior_lodge_mission_events.txt index ab1cf0196..4aa449e7a 100644 --- a/CleanSlate/events/HF_warrior_lodge_mission_events.txt +++ b/CleanSlate/events/HF_warrior_lodge_mission_events.txt @@ -30,6 +30,7 @@ character_event = { is_in_society = yes only_capable = yes + prisoner = no trigger = { is_member_of_any_warrior_lodge_trigger = yes diff --git a/CleanSlate/events/LT_court_maintenance_events.txt b/CleanSlate/events/LT_court_maintenance_events.txt index 096ab536b..10f27edcb 100644 --- a/CleanSlate/events/LT_court_maintenance_events.txt +++ b/CleanSlate/events/LT_court_maintenance_events.txt @@ -22,7 +22,7 @@ character_event = { any_courtier = { # Mediocre!! is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no stewardship >= 4 stewardship < 10 @@ -45,7 +45,7 @@ character_event = { limit = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no stewardship >= 4 stewardship < 10 @@ -72,7 +72,7 @@ character_event = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no OR = { stewardship >= 10 @@ -122,7 +122,7 @@ character_event = { count >= 2 is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no OR = { stewardship < 2 @@ -229,7 +229,7 @@ character_event = { count >= 2 is_adult = yes - is_landed = no + is_inaccessible_or_incapable_trigger = no prisoner = no has_lover = no num_of_rivals < 1 @@ -249,7 +249,7 @@ character_event = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no has_lover = no num_of_rivals < 1 num_of_friends < 1 @@ -260,7 +260,7 @@ character_event = { limit = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no has_lover = no num_of_rivals < 1 num_of_friends < 1 @@ -297,7 +297,7 @@ character_event = { NOT = { character = event_target:courtier_1 } is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no has_lover = no num_of_rivals < 1 @@ -391,7 +391,7 @@ character_event = { any_courtier = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no } } @@ -403,7 +403,7 @@ character_event = { limit = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no } give_random_character_modifier_effect = yes @@ -425,7 +425,7 @@ character_event = { any_courtier = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no has_nickname = no } } @@ -438,7 +438,7 @@ character_event = { limit = { is_adult = yes is_landed = no - prisoner = no + is_inaccessible_or_incapable_trigger = no has_nickname = no } diff --git a/CleanSlate/events/hf_african_flavor_events.txt b/CleanSlate/events/hf_african_flavor_events.txt index 41e4609b3..36e8c5402 100644 --- a/CleanSlate/events/hf_african_flavor_events.txt +++ b/CleanSlate/events/hf_african_flavor_events.txt @@ -427,6 +427,7 @@ character_event = { any_artifact = { has_artifact_flag = book + is_indestructible = no } } @@ -468,6 +469,7 @@ character_event = { has_artifact_flag = armor has_artifact_flag = combat_weapon } + is_indestructible = no } } @@ -1878,7 +1880,10 @@ character_event = { } random_artifact = { - limit = { has_artifact_flag = book } + limit = { + has_artifact_flag = book + is_indestructible = no + } preferred_limit = { is_artifact_equipped = yes } # Means it reads as in your "Library" in the Treasury UI save_event_target_as = target_artifact @@ -1950,6 +1955,7 @@ character_event = { has_artifact_flag = armor has_artifact_flag = combat_weapon } + is_indestructible = no } preferred_limit = { diff --git a/CleanSlate/events/hl_wolf_events.txt b/CleanSlate/events/hl_wolf_events.txt index f810a7513..683cf9bd3 100644 --- a/CleanSlate/events/hl_wolf_events.txt +++ b/CleanSlate/events/hl_wolf_events.txt @@ -181,7 +181,7 @@ narrative_event = { NOR = { culture = khitan - religion = jain + pacifist = yes any_close_relative = { OR = { diff --git a/CleanSlate/events/mnm_artifacts_events.txt b/CleanSlate/events/mnm_artifacts_events.txt index 8a1ae203a..eacaf2803 100644 --- a/CleanSlate/events/mnm_artifacts_events.txt +++ b/CleanSlate/events/mnm_artifacts_events.txt @@ -2538,7 +2538,7 @@ character_event = { } desc = { text = EVTDESC_MNM_9845 - trigger = { has_character_flag = remains_of_st_cessanius } + trigger = { has_character_flag = remains_of_st_cessianus } } desc = { text = EVTDESC_MNM_9846 @@ -2657,7 +2657,7 @@ character_event = { chains_of_st_peter = { add_artifact = chains_of_st_peter } right_hand_st_demetrius = { add_artifact = right_hand_st_demetrius } veil_of_veronica = { add_artifact = veil_of_veronica } - remains_of_st_cessanius = { add_artifact = remains_of_st_cessianus } + remains_of_st_cessianus = { add_artifact = remains_of_st_cessianus } weeping_statue = { add_artifact = weeping_statue } image_of_edessa = { add_artifact = image_of_edessa } seal_of_solomon = { add_artifact = seal_of_solomon } @@ -2824,7 +2824,7 @@ character_event = { clr_character_flag = chains_of_st_peter clr_character_flag = right_hand_st_demetrius clr_character_flag = veil_of_veronica - clr_character_flag = remains_of_st_cessanius + clr_character_flag = remains_of_st_cessianus clr_character_flag = weeping_statue clr_character_flag = image_of_edessa clr_character_flag = seal_of_solomon diff --git a/CleanSlate/events/mnm_hermetics_events.txt b/CleanSlate/events/mnm_hermetics_events.txt index fe6227531..4f7287a3b 100644 --- a/CleanSlate/events/mnm_hermetics_events.txt +++ b/CleanSlate/events/mnm_hermetics_events.txt @@ -9704,25 +9704,25 @@ character_event = { clr_character_flag = brilliant_insight event_target:great_minds_guest_1 = { - clr_character_flag = war_invetion + clr_character_flag = war_invention clr_character_flag = prosperity_invention clr_character_flag = knowledge_invention } event_target:great_minds_guest_2 = { - clr_character_flag = war_invetion + clr_character_flag = war_invention clr_character_flag = prosperity_invention clr_character_flag = knowledge_invention } event_target:great_minds_guest_3 = { - clr_character_flag = war_invetion + clr_character_flag = war_invention clr_character_flag = prosperity_invention clr_character_flag = knowledge_invention } event_target:great_minds_guest_4 = { - clr_character_flag = war_invetion + clr_character_flag = war_invention clr_character_flag = prosperity_invention clr_character_flag = knowledge_invention } diff --git a/CleanSlate/events/mnm_smith_events.txt b/CleanSlate/events/mnm_smith_events.txt index 82aac6423..f5e622b59 100644 --- a/CleanSlate/events/mnm_smith_events.txt +++ b/CleanSlate/events/mnm_smith_events.txt @@ -739,6 +739,7 @@ character_event = { random_neighbor_province = { limit = { + has_owner = yes NOT = { owned_by = ROOT } } diff --git a/CleanSlate/events/oldgods_blot_events.txt b/CleanSlate/events/oldgods_blot_events.txt index ee874233e..e5f897d94 100644 --- a/CleanSlate/events/oldgods_blot_events.txt +++ b/CleanSlate/events/oldgods_blot_events.txt @@ -1033,8 +1033,10 @@ character_event = { random_vassal = { limit = { + has_character_flag = blot_feast_vassal liege = { any_vassal = { + has_character_flag = blot_feast_vassal opinion = { who = PREVPREV value >= 20 diff --git a/CleanSlate/events/oldgods_pagan_feasts.txt b/CleanSlate/events/oldgods_pagan_feasts.txt index 40e133ff5..6bf820462 100644 --- a/CleanSlate/events/oldgods_pagan_feasts.txt +++ b/CleanSlate/events/oldgods_pagan_feasts.txt @@ -328,8 +328,10 @@ character_event = { random_vassal = { limit = { + has_character_flag = ukon_juhla_feast_vassal liege = { any_vassal = { + has_character_flag = ukon_juhla_feast_vassal opinion = { who = PREVPREV value >= 20 @@ -1600,8 +1602,10 @@ character_event = { random_vassal = { limit = { + has_character_flag = uzgavenes_feast_vassal liege = { any_vassal = { + has_character_flag = uzgavenes_feast_vassal opinion = { who = PREVPREV value >= 20 @@ -3095,8 +3099,10 @@ character_event = { random_vassal = { limit = { + has_character_flag = jarilo_feast_vassal liege = { any_vassal = { + has_character_flag = jarilo_feast_vassal opinion = { who = PREVPREV value >= 20 diff --git a/CleanSlate/events/republic_dynastic_feuds.txt b/CleanSlate/events/republic_dynastic_feuds.txt index a9b390e7f..7e703da23 100644 --- a/CleanSlate/events/republic_dynastic_feuds.txt +++ b/CleanSlate/events/republic_dynastic_feuds.txt @@ -722,7 +722,7 @@ narrative_event = { any_child = { is_married = no - practical_age >= 15 + is_adult = yes practical_age < 30 is_inaccessible_or_incapable_trigger = no @@ -746,7 +746,7 @@ narrative_event = { is_opposite_sex = PREVPREVPREV is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -771,7 +771,7 @@ narrative_event = { is_opposite_sex = PREVPREVPREVPREV is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -795,7 +795,7 @@ narrative_event = { random_child = { limit = { is_married = no - practical_age >= 15 + is_adult = yes practical_age < 30 is_inaccessible_or_incapable_trigger = no @@ -819,7 +819,7 @@ narrative_event = { is_opposite_sex = PREVPREVPREV is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -844,7 +844,7 @@ narrative_event = { is_opposite_sex = PREVPREVPREVPREV is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -886,7 +886,7 @@ narrative_event = { is_opposite_sex = event_target:my_kid is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -904,7 +904,7 @@ narrative_event = { is_opposite_sex = event_target:my_kid is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -941,7 +941,7 @@ narrative_event = { is_opposite_sex = event_target:my_kid is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no @@ -959,7 +959,7 @@ narrative_event = { is_opposite_sex = event_target:my_kid is_married = no has_dynasty_flag = the_feuders - practical_age >= 15 + is_adult = yes practical_age < 30 in_command = no is_inaccessible_or_incapable_trigger = no diff --git a/CleanSlate/events/rip_symptom_events.txt b/CleanSlate/events/rip_symptom_events.txt index 07d6d9607..978cfdccc 100644 --- a/CleanSlate/events/rip_symptom_events.txt +++ b/CleanSlate/events/rip_symptom_events.txt @@ -1354,7 +1354,7 @@ character_event = { trigger_if = { limit = { has_character_flag = developing_illness } - has_character_flag = got_azz + has_character_flag = got_aztec_disease } NOR = { diff --git a/CleanSlate/events/roi_guru_events.txt b/CleanSlate/events/roi_guru_events.txt index d49de5c5a..bd448d68e 100644 --- a/CleanSlate/events/roi_guru_events.txt +++ b/CleanSlate/events/roi_guru_events.txt @@ -118,7 +118,7 @@ character_event = { else_if = { limit = { religion = hindu - NOT = { has_character_flag = basava } + NOT = { has_character_flag = is_basava } } random_list = { diff --git a/CleanSlate/events/soi_interesting_muslims.txt b/CleanSlate/events/soi_interesting_muslims.txt index 1339db4ba..5a2f672bb 100644 --- a/CleanSlate/events/soi_interesting_muslims.txt +++ b/CleanSlate/events/soi_interesting_muslims.txt @@ -747,6 +747,7 @@ character_event = { add_trait = scholar add_trait = quick add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -851,6 +852,7 @@ character_event = { add_trait = quick add_trait = charitable add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -1059,6 +1061,7 @@ character_event = { add_trait = poet add_trait = genius add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -1882,6 +1885,7 @@ character_event = { add_trait = scholar add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -2090,6 +2094,7 @@ character_event = { add_trait = mystic add_trait = elusive_shadow add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -2193,6 +2198,7 @@ character_event = { add_trait = scholar add_trait = quick add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -2302,6 +2308,7 @@ character_event = { add_trait = scholar add_trait = quick add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -2405,6 +2412,7 @@ character_event = { add_trait = gardener add_trait = mystic add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -2508,6 +2516,7 @@ character_event = { add_trait = gardener add_trait = scholar add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -3336,6 +3345,7 @@ character_event = { add_trait = ambitious add_trait = charismatic_negotiator add_trait = gregarious + add_trait = physician } new_character = { @@ -3441,6 +3451,7 @@ character_event = { add_trait = scholar add_trait = faqih add_trait = scholarly_theologian + add_trait = physician } new_character = { @@ -3545,6 +3556,7 @@ character_event = { add_trait = poet add_trait = scholar add_trait = scholarly_theologian + add_trait = physician } new_character = { diff --git a/CleanSlate/events/wol_intrigue_events.txt b/CleanSlate/events/wol_intrigue_events.txt index a0e1d8704..644736d54 100644 --- a/CleanSlate/events/wol_intrigue_events.txt +++ b/CleanSlate/events/wol_intrigue_events.txt @@ -1398,7 +1398,7 @@ character_event = { desc = { text = EVTDESC_WOL_2081 trigger = { - event_target:target_snooper = { has_character_flag = charge_dishonorable } + event_target:target_snooper = { has_character_flag = charge_slanderer } } } desc = { @@ -1803,7 +1803,7 @@ character_event = { desc = { text = EVTDESC_WOL_2086 trigger = { - event_target:target_snooper = { has_character_flag = charge_dishonorable } + event_target:target_snooper = { has_character_flag = charge_slanderer } } } desc = { diff --git a/CleanSlate/gfx/interface/laws_gender_strip.dds b/CleanSlate/gfx/interface/laws_gender_strip.dds new file mode 100644 index 000000000..e2b4c90e8 Binary files /dev/null and b/CleanSlate/gfx/interface/laws_gender_strip.dds differ diff --git a/CleanSlate/interface/domestic_law.gfx b/CleanSlate/interface/domestic_law.gfx index 93f6a7bd4..952beed35 100644 --- a/CleanSlate/interface/domestic_law.gfx +++ b/CleanSlate/interface/domestic_law.gfx @@ -170,7 +170,7 @@ spriteTypes = { spriteType = { name = "GFX_laws_gender_strip" textureFile = "gfx\\interface\\laws_gender_strip.dds" - noOfFrames = 3 + noOfFrames = 5 } spriteType = { diff --git a/CleanSlate/localisation/00_bloodlines.csv b/CleanSlate/localisation/00_bloodlines.csv index bffe4c3b5..ee2eb11a1 100644 --- a/CleanSlate/localisation/00_bloodlines.csv +++ b/CleanSlate/localisation/00_bloodlines.csv @@ -76,9 +76,9 @@ mansa_musa_desc;A scholar and conqueror, Musa became a legend in the Islamic wor mardavij;Blood of [This.GetFirstNameWithNick];Sang de [This.GetFirstNameWithNick];Blut von [This.GetFirstNameWithNick];;Sangre de [This.GetFirstNameWithNick];;;;;x mardavij_desc;He was the last Zoroastrian ruler who fought back against the Muslims in Persia, trying to reestablish the Sasanian Empire;Il fut le dernier dirigeant zoroastrien à s'être opposé aux musulmans de Perse, tentant de rétablir l'Empire sassanide.;Er war der letzte zoroastrische Herrscher, der sich in Persien gegen die Muslime wehrte und versuchte, das sasanische Reich wiederherzustellen.;;El último gobernante zoroástrico que luchó contra los musulmanes en Persia, intentando restablecer el Imperio sasánida.;;;;;x matilde_bloodline;Blood of [This.GetFirstName];Sang de [This.GetFirstName];Blut von [This.GetFirstName];;Sangre de [This.GetFirstName];;;;;x -matilde_bloodline_desc;By defending the integrity and dignity of the Holy See against its enemies, [This.GetTitledFirstName]'s has forever bound its fate to the Vatican.;En défendant l'intégrité et la dignité du Saint-Siège contre ses ennemis, [This.Get_le_TitledFirstName] a uni son destin à celui du Vatican.;Durch die Verteidigung der Integrität und der Würde des Heiligen Stuhls gegen seine Feinde hat [This.GetTitledFirstName] sein Schicksal für immer an den Vatikan gebunden.;;Al defender la integridad y dignidad de la Santa Sede contra sus enemigos, [This.GetTitledFirstName] ha unido para siempre su destino con el Vaticano;;;;;;;;;x +matilde_bloodline_desc;By defending the integrity and dignity of the Holy See against its enemies, [This.GetTitledFirstName]'s dynasty has forever bound its fate to the Vatican.;En défendant l'intégrité et la dignité du Saint-Siège contre ses ennemis, [This.Get_le_TitledFirstName] a uni son destin à celui du Vatican.;Durch die Verteidigung der Integrität und der Würde des Heiligen Stuhls gegen seine Feinde hat [This.GetTitledFirstName] sein Schicksal für immer an den Vatikan gebunden.;;Al defender la integridad y dignidad de la Santa Sede contra sus enemigos, [This.GetTitledFirstName] ha unido para siempre su destino con el Vaticano;;;;;;;;;x matilde_male_bloodline;Blood of [This.GetFirstName];Sang de [This.GetFirstName];Blut von [This.GetFirstName];;Sangre de [This.GetFirstName];;;;;x -matilde_male_bloodline_desc;By defending the integrity and dignity of the Holy See against its enemies, [This.GetTitledFirstName]'s has forever bound its fate to the Vatican.;En défendant l'intégrité et la dignité du Saint-Siège contre ses ennemis, [This.Get_le_TitledFirstName] a uni son destin à celui du Vatican.;Durch die Verteidigung der Integrität und der Würde des Heiligen Stuhls gegen seine Feinde hat [This.GetTitledFirstName] sein Schicksal für immer an den Vatikan gebunden.;;Al defender la integridad y dignidad de la Santa Sede contra sus enemigos, [This.GetTitledFirstName] ha unido para siempre su destino con el Vaticano;;;;;;;;;x +matilde_male_bloodline_desc;By defending the integrity and dignity of the Holy See against its enemies, [This.GetTitledFirstName]'s dynasty has forever bound its fate to the Vatican.;En défendant l'intégrité et la dignité du Saint-Siège contre ses ennemis, [This.Get_le_TitledFirstName] a uni son destin à celui du Vatican.;Durch die Verteidigung der Integrität und der Würde des Heiligen Stuhls gegen seine Feinde hat [This.GetTitledFirstName] sein Schicksal für immer an den Vatikan gebunden.;;Al defender la integridad y dignidad de la Santa Sede contra sus enemigos, [This.GetTitledFirstName] ha unido para siempre su destino con el Vaticano;;;;;;;;;x merovingian;Merovingian Blood;Sang mérovingien;Merovinganisches Blut;;sangre merovingia;;;;;;;;;x merovingian_desc;The legendary founder of the Merovingian dynasty. He joined his tribal forces with Rome to drive the Huns out of Gaul, ending Attila's ambitions in the area.;Fondateur légendaire de la dynastie mérovingienne qui a joint ses forces tribales à Rome pour chasser les Huns de la Gaule, mettant fin aux ambitions d'Attila dans la région.;Der legendäre Gründer der Merowinger-Dynastie. Er schloss sich seinen Stammesstreikräften in Rom an, um die Hunnen aus Gallien zu vertreiben und so Attilas Ambitionen zu beenden.;;Legendario fundador de la dinastía merovingia, que unió sus fuerzas con las de Roma para expulsar a los hunos de Atila de la Galia.;;;;;;;;;x muhammad_the_victorious;Blood of [This.GetFirstNameWithNick];Sang de [This.GetFirstNameWithNick];Blut von [This.GetFirstNameWithNick];;Sangre de [This.GetFirstNameWithNick];;;;;x