diff --git a/common/casus_belli_types/00_religious_war.txt b/common/casus_belli_types/00_religious_war.txt index 45a1b8ca6b..45b433f27a 100644 --- a/common/casus_belli_types/00_religious_war.txt +++ b/common/casus_belli_types/00_religious_war.txt @@ -3048,17 +3048,7 @@ undirected_great_holy_war = { save_scope_as = the_ghw } - scope:attacker = { #Achievement setup. - every_character_war = { - limit = { - is_attacker = scope:attacker - is_defender = scope:defender - } - every_war_attacker = { - add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag } - } - } - } + #Warcraft scope:defender.faith = { #needed for hold_court.6150 set_variable = { @@ -3496,17 +3486,7 @@ undirected_great_holy_war = { } } - scope:defender = { #Achievement setup. - every_character_war = { - limit = { - is_attacker = scope:attacker - is_defender = scope:defender - } - every_war_defender = { - add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag } - } - } - } + #Warcraft every_player = { #Fluff for players limit = { @@ -3795,17 +3775,7 @@ directed_great_holy_war = { save_scope_as = the_ghw } - scope:attacker = { #Achievement setup. - every_character_war = { - limit = { - is_attacker = scope:attacker - is_defender = scope:defender - } - every_war_attacker = { - add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag } - } - } - } + #Warcraft if = { limit = { exists = scope:attacker.faith.great_holy_war.ghw_title_recipient } @@ -3983,17 +3953,7 @@ directed_great_holy_war = { save_scope_as = the_ghw } - scope:defender = { #Achievement setup. - every_character_war = { - limit = { - is_attacker = scope:attacker - is_defender = scope:defender - } - every_war_defender = { - add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag } - } - } - } + #Warcraft every_player = { #Fluff for players limit = { diff --git a/common/casus_belli_types/00_subjugation.txt b/common/casus_belli_types/00_subjugation.txt index 751a90ff31..f7aedc5187 100644 --- a/common/casus_belli_types/00_subjugation.txt +++ b/common/casus_belli_types/00_subjugation.txt @@ -30,12 +30,12 @@ scope:attacker = { trigger_if = { limit = { - faith.religion = religion:islam_religion + faith.religion = like_islam_religion_trigger = yes house ?= { house_head = scope:attacker has_variable = subjugations_expanded } - scope:defender.faith.religion = religion:islam_religion + scope:defender.faith.religion = like_islam_religion_trigger = yes } } trigger_else = { @@ -161,12 +161,12 @@ } } AND = { - faith.religion = religion:islam_religion + faith.religion = like_islam_religion_trigger = yes house ?= { house_head = scope:attacker has_variable = subjugations_expanded } - scope:defender.faith.religion = religion:islam_religion + scope:defender.faith.religion = like_islam_religion_trigger = yes } } } diff --git a/common/culture/traditions/01_fp1_traditions.txt b/common/culture/traditions/01_fp1_traditions.txt index 7fcecdcc0b..c0c008ff41 100644 --- a/common/culture/traditions/01_fp1_traditions.txt +++ b/common/culture/traditions/01_fp1_traditions.txt @@ -151,7 +151,7 @@ tradition_fp1_performative_honour = { is_shown = { # DLC check. has_fp1_dlc_trigger = yes - has_cultural_pillar = heritage_north_germanic + like_north_germanic_group_trigger = yes } can_pick = { @@ -160,7 +160,7 @@ tradition_fp1_performative_honour = { # Warcraft #custom_tooltip = { # text = northern_germanic_heritage_trigger - # has_cultural_pillar = heritage_north_germanic + # like_north_germanic_group_trigger= yes #} # End of Warcraft diff --git a/common/decisions/00_holy_order_decisions.txt b/common/decisions/00_holy_order_decisions.txt index 2233171ad8..484ac5e0bc 100644 --- a/common/decisions/00_holy_order_decisions.txt +++ b/common/decisions/00_holy_order_decisions.txt @@ -60,6 +60,9 @@ } trigger_if = { limit = { + # Warcraft + NOT = { has_character_flag = holy_order_debug } + exists = faith.religious_head NOT = { root = root.faith.religious_head } } diff --git a/common/decisions/test_decision.txt b/common/decisions/test_decision.txt index 96340c9fc6..7491b2feef 100644 --- a/common/decisions/test_decision.txt +++ b/common/decisions/test_decision.txt @@ -9,9 +9,7 @@ is_available_adult_or_is_commanding = yes } effect = { - custom_tooltip = wild_goose_chase_decision_effect_tooltip - remove_short_term_gold = 13 - add_stress = 20 + create_artifact_frostmourne_effect = { OWNER = root } } ai_check_interval = 0 diff --git a/common/religion/doctrines/00_core_tenets.txt b/common/religion/doctrines/00_core_tenets.txt index 0070cc292c..2128e67c95 100644 --- a/common/religion/doctrines/00_core_tenets.txt +++ b/common/religion/doctrines/00_core_tenets.txt @@ -3532,7 +3532,7 @@ piety_cost = { if = { limit = { - AND = { + #AND = { #OR = { # has_doctrine = muhammad_succession_shia_doctrine # has_doctrine = muhammad_succession_muhakkima_doctrine @@ -3541,8 +3541,9 @@ has_doctrine = tenet_warmonger has_doctrine = tenet_unrelenting_faith has_doctrine = tenet_consolamentum + has_doctrine = special_doctrine_end_justifies_means } - } + #} } value = faith_tenet_cost_low diff --git a/common/religion/doctrines/02_doctrines_special.txt b/common/religion/doctrines/02_doctrines_special.txt index fd62d73ab9..e9b0dacb0a 100644 --- a/common/religion/doctrines/02_doctrines_special.txt +++ b/common/religion/doctrines/02_doctrines_special.txt @@ -145,9 +145,10 @@ unreformed_faith = { parameters = { # unreformed = yes also serves as the basis for the unreformed_syncretic tenet. unreformed = yes - hostility_override_tenet_unreformed_syncretism = 2 - unreformed_syncretic_recipient_opinion_active = yes - opinion_of_unreformed_syncretic_actor_opinion_active = 30 + # Warcraft + # hostility_override_tenet_unreformed_syncretism = 2 + # unreformed_syncretic_recipient_opinion_active = yes + # opinion_of_unreformed_syncretic_actor_opinion_active = 30 conquest_cb_enabled = yes faith_can_raid = yes } @@ -268,7 +269,7 @@ not_allowed_to_hof = { } special_doctrine_not_allowed_to_hof = { - #name = { + name = { #first_valid = { #triggered_desc = { #trigger = { @@ -276,11 +277,11 @@ not_allowed_to_hof = { #} #desc = prophecy_of_malachi_name #} - #desc = special_doctrine_not_allowed_to_hof_name + desc = special_doctrine_not_allowed_to_hof_name #} - #} + } - #desc = { + desc = { #first_valid = { #triggered_desc = { #trigger = { @@ -288,9 +289,9 @@ not_allowed_to_hof = { #} #desc = prophecy_of_malachi_desc #} - #desc = special_doctrine_not_allowed_to_hof_desc + desc = special_doctrine_not_allowed_to_hof_desc #} - #} + } parameters = { block_from_create_hof_parameter = yes } @@ -315,7 +316,7 @@ has_jizya_doctrine = { #To be adapted for Warcraft is_available_on_create = { OR = { has_doctrine = special_doctrine_jizya - has_doctrine = special_doctrine_is_islamic_faith + like_islam_religion_trigger = yes } } diff --git a/common/script_values/00_struggle_values.txt b/common/script_values/00_struggle_values.txt index bd0210ec29..9c80d7c26b 100644 --- a/common/script_values/00_struggle_values.txt +++ b/common/script_values/00_struggle_values.txt @@ -38,71 +38,7 @@ catalyst_fp3_yearly_time_out_ending_drift = { } } -# Mess around with the AI's priorities for war targets. -## We mostly apply this in nakedly aggressive wars; AI with claims or de jure rights elsewhere shouldn't want to forgo them completely. -struggle_wars_prioritise_struggle_targets_value = { - value = 1 - - # If scope:attacker is involved in a struggle, we tank how much they want to attack non-struggle characters. - if = { - limit = { - scope:attacker = { - any_character_struggle = { - involvement = involved - is_secondary_character_involvement_neither_trigger = { CHAR = scope:defender } - } - } - } - multiply = 0.25 - } - # And scope:defender is an interloper in the same struggle, we double-dip. - if = { - limit = { - scope:attacker = { - any_character_struggle = { - involvement = involved - is_secondary_character_involvement_interloper_trigger = { CHAR = scope:defender } - } - } - } - multiply = 1.5 - } - - # Agenda impact - if = { - limit = { - scope:attacker = { - any_character_struggle = { - involvement = involved - } - } - } - multiply = { - value = 0 - if = { - limit = { - scope:attacker = { - any_character_struggle = { - phase_has_catalyst = catalyst_winning_large_conquest_war - } - has_character_flag = agenda_towards_escalation - } - } - add = 2 - } - else_if = { - limit = { - scope:attacker = { - any_character_struggle = { - phase_has_catalyst = catalyst_winning_large_conquest_war - } - } - } - add = 0.25 - } - } - } -} +# Warcraft ################################################## # Catalyst Values @@ -127,12 +63,7 @@ boost_county_conversion_phase_malus_value = { # Used for random weighting. add_X_per_sub_realm_struggle_county_value = { - every_sub_realm_county = { - limit = { - any_county_struggle = { this = root } - } - add = 2 - } + value = 0 } fp2_struggle_0011_gift_cost_value = { value = major_gold_value } @@ -169,6 +100,6 @@ sub_realm_size_value = { value = sub_realm_size } -caliph_realm_size_value = { - value = title:d_sunni.holder.realm_size -} +#caliph_realm_size_value = { + #value = title:d_sunni.holder.realm_size +#} diff --git a/common/script_values/99_court_chaplain_values.txt b/common/script_values/99_court_chaplain_values.txt index 382551d01a..cc5490f215 100644 --- a/common/script_values/99_court_chaplain_values.txt +++ b/common/script_values/99_court_chaplain_values.txt @@ -706,52 +706,7 @@ court_chaplain_conversion_contextual_bonuses = { desc = COURT_CHAPLAIN_CONVERSION_HARDER_TO_CONVERT_FAITH_AWAY_IN_MOUNTAINS_MALUS_MODIFIER } } - ### Syncretics - #### Syncretic tenets aim to allow a faith and a separate religion/family to coexist without one eating the other. Accordingly, we make it harder for you to syncretise with a faith *then* wipe it out. - if = { - limit = { - exists = scope:county - scope:councillor.faith = { has_doctrine_parameter = unreformed_syncretic_actor_opinion_active } - scope:county.faith = { has_doctrine_parameter = unreformed} - } - add = { - value = scope:councillor.conversion_syncretic_with_religion_malus - desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER - } - } - if = { - limit = { - exists = scope:county - scope:councillor.faith = { has_doctrine_parameter = christian_syncretic_actor_opinion_active } - scope:county.faith = { religion_tag = christianity_religion } - } - add = { - value = scope:councillor.conversion_syncretic_with_religion_malus - desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER - } - } - if = { - limit = { - exists = scope:county - scope:councillor.faith = { has_doctrine_parameter = islamic_syncretic_actor_opinion_active } - scope:county.faith = { religion_tag = islam_religion } - } - add = { - value = scope:councillor.conversion_syncretic_with_religion_malus - desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER - } - } - if = { - limit = { - exists = scope:county - scope:councillor.faith = { has_doctrine_parameter = jewish_syncretic_actor_opinion_active } - scope:county.faith = { religion_tag = judaism_religion } - } - add = { - value = scope:councillor.conversion_syncretic_with_religion_malus - desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER - } - } + # Warcraft - Removed unused syncretic vanilla faith maluses #Various Modifier Penalties if = { diff --git a/common/scripted_effects/00_claim_throne_scheme_effects.txt b/common/scripted_effects/00_claim_throne_scheme_effects.txt index ed06835132..3da203ebed 100644 --- a/common/scripted_effects/00_claim_throne_scheme_effects.txt +++ b/common/scripted_effects/00_claim_throne_scheme_effects.txt @@ -249,194 +249,195 @@ claim_throne_decline_execution_effect = { claim_throne_set_mythical_founder_variable_effect = { - if = { - limit = { - AND = { # Charles Martell - OR = { - scope:target_title = title:k_france - scope:target_title = title:e_france - } - current_date > 1000.1.1 - } - } - set_variable = { - name = mythical_founder - value = flag:charles_martell - } - } - else_if = { # Alexander - limit = { - OR = { - scope:target_title = title:k_thessalonika - scope:target_title = title:k_hellas - scope:target_title = title:k_egypt - AND = { - OR = { - scope:target_title = title:k_persia - scope:target_title = title:e_persia - } - NOR = { - root.faith.religion = religion:islam_religion - root.faith.religion = religion:zoroastrianism_religion - } - } - scope:target_title = title:k_anatolia - } - } - set_variable = { - name = mythical_founder - value = flag:alexander - } - } - else_if = { # Lech - limit = { - scope:target_title = title:k_poland # Lech - } - set_variable = { - name = mythical_founder - value = flag:lech - } - } - else_if = { # Czech - limit = { - scope:target_title = title:k_bohemia # Lech - } - set_variable = { - name = mythical_founder - value = flag:czech - } - } - else_if = { # Rus - limit = { - OR = { # Rus - scope:target_title = title:k_white_rus - scope:target_title = title:k_ruthenia - scope:target_title = title:e_russia - } - } - set_variable = { - name = mythical_founder - value = flag:rus - } - } - else_if = { # Arthur - limit = { - OR = { - scope:target_title = title:k_wales - scope:target_title = title:k_cornwall - scope:target_title = title:k_england - scope:target_title = title:e_britannia - } - } - set_variable = { - name = mythical_founder - value = flag:arthur - } - } - else_if = { # Belisarius - limit = { - OR = { - scope:target_title = title:k_italy - scope:target_title = title:k_romagna - scope:target_title = title:k_sardinia - scope:target_title = title:e_italy - scope:target_title = title:e_roman_empire - } - faith = faith:orthodox - } - set_variable = { - name = mythical_founder - value = flag:belisarius - } - } - else_if = { # Romulus - limit = { - OR = { - scope:target_title = title:k_italy - scope:target_title = title:k_romagna - scope:target_title = title:k_sardinia - scope:target_title = title:e_italy - scope:target_title = title:e_roman_empire - } - } - set_variable = { - name = mythical_founder - value = flag:romulus - } - } - else_if = { # Ardashir - limit = { - OR = { - scope:target_title = title:k_persia - scope:target_title = title:e_persia - } - } - set_variable = { - name = mythical_founder - value = flag:ardashir - } - } - else_if = { # The Pharaohs - limit = { - scope:target_title = title:k_egypt - NOT = { religion = religion:islam_religion } - } - set_variable = { - name = mythical_founder - value = flag:pharaohs - } - } - else_if = { # The Visigothic Kings - limit = { - OR = { - scope:target_title = title:k_castille - scope:target_title = title:k_aragon - scope:target_title = title:k_navarra - scope:target_title = title:k_andalusia - scope:target_title = title:k_portugal - scope:target_title = title:e_spain - } - NOT = { religion = religion:islam_religion } - } - set_variable = { - name = mythical_founder - value = flag:visigothic_kings - } - } - else_if = { # Abd al-Rahman - limit = { - OR = { - scope:target_title = title:k_castille - scope:target_title = title:k_aragon - scope:target_title = title:k_navarra - scope:target_title = title:k_andalusia - scope:target_title = title:k_portugal - scope:target_title = title:e_spain - } - religion = religion:islam_religion - } - set_variable = { - name = mythical_founder - value = flag:abd_al_rahman - } - } - else_if = { # Zenobia - limit = { - OR = { - scope:target_title = title:k_syria - scope:target_title = title:k_mesopotamia - } - NOT = { religion = religion:islam_religion } - } - set_variable = { - name = mythical_founder - value = flag:zenobia - } - } - else = { + # Warcraft + # if = { + # limit = { + # AND = { # Charles Martell + # OR = { + # scope:target_title = title:k_france + # scope:target_title = title:e_france + # } + # current_date > 1000.1.1 + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:charles_martell + # } + # } + # else_if = { # Alexander + # limit = { + # OR = { + # scope:target_title = title:k_thessalonika + # scope:target_title = title:k_hellas + # scope:target_title = title:k_egypt + # AND = { + # OR = { + # scope:target_title = title:k_persia + # scope:target_title = title:e_persia + # } + # NOR = { + # root = { like_islam_religion_trigger = yes } + # root.faith.religion = religion:zoroastrianism_religion + # } + # } + # scope:target_title = title:k_anatolia + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:alexander + # } + # } + # else_if = { # Lech + # limit = { + # scope:target_title = title:k_poland # Lech + # } + # set_variable = { + # name = mythical_founder + # value = flag:lech + # } + # } + # else_if = { # Czech + # limit = { + # scope:target_title = title:k_bohemia # Lech + # } + # set_variable = { + # name = mythical_founder + # value = flag:czech + # } + # } + # else_if = { # Rus + # limit = { + # OR = { # Rus + # scope:target_title = title:k_white_rus + # scope:target_title = title:k_ruthenia + # scope:target_title = title:e_russia + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:rus + # } + # } + # else_if = { # Arthur + # limit = { + # OR = { + # scope:target_title = title:k_wales + # scope:target_title = title:k_cornwall + # scope:target_title = title:k_england + # scope:target_title = title:e_britannia + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:arthur + # } + # } + # else_if = { # Belisarius + # limit = { + # OR = { + # scope:target_title = title:k_italy + # scope:target_title = title:k_romagna + # scope:target_title = title:k_sardinia + # scope:target_title = title:e_italy + # scope:target_title = title:e_roman_empire + # } + # faith = faith:orthodox + # } + # set_variable = { + # name = mythical_founder + # value = flag:belisarius + # } + # } + # else_if = { # Romulus + # limit = { + # OR = { + # scope:target_title = title:k_italy + # scope:target_title = title:k_romagna + # scope:target_title = title:k_sardinia + # scope:target_title = title:e_italy + # scope:target_title = title:e_roman_empire + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:romulus + # } + # } + # else_if = { # Ardashir + # limit = { + # OR = { + # scope:target_title = title:k_persia + # scope:target_title = title:e_persia + # } + # } + # set_variable = { + # name = mythical_founder + # value = flag:ardashir + # } + # } + # else_if = { # The Pharaohs + # limit = { + # scope:target_title = title:k_egypt + # NOT = { like_islam_religion_trigger = yes } + # } + # set_variable = { + # name = mythical_founder + # value = flag:pharaohs + # } + # } + # else_if = { # The Visigothic Kings + # limit = { + # OR = { + # scope:target_title = title:k_castille + # scope:target_title = title:k_aragon + # scope:target_title = title:k_navarra + # scope:target_title = title:k_andalusia + # scope:target_title = title:k_portugal + # scope:target_title = title:e_spain + # } + # NOT = { like_islam_religion_trigger = yes } + # } + # set_variable = { + # name = mythical_founder + # value = flag:visigothic_kings + # } + # } + # else_if = { # Abd al-Rahman + # limit = { + # OR = { + # scope:target_title = title:k_castille + # scope:target_title = title:k_aragon + # scope:target_title = title:k_navarra + # scope:target_title = title:k_andalusia + # scope:target_title = title:k_portugal + # scope:target_title = title:e_spain + # } + # like_islam_religion_trigger = yes + # } + # set_variable = { + # name = mythical_founder + # value = flag:abd_al_rahman + # } + # } + # else_if = { # Zenobia + # limit = { + # OR = { + # scope:target_title = title:k_syria + # scope:target_title = title:k_mesopotamia + # } + # NOT = { like_islam_religion_trigger = yes } + # } + # set_variable = { + # name = mythical_founder + # value = flag:zenobia + # } + # } + # else = { set_variable = { name = mythical_founder value = flag:fallback } - } + # } } diff --git a/common/scripted_effects/00_commander_effects.txt b/common/scripted_effects/00_commander_effects.txt index 30707cdb7d..137dbe18fd 100644 --- a/common/scripted_effects/00_commander_effects.txt +++ b/common/scripted_effects/00_commander_effects.txt @@ -162,7 +162,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_head_ripped_off killer = root } @@ -179,7 +179,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_cloven_in_half killer = root } @@ -196,7 +196,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_viciously_dismembered killer = root } @@ -213,7 +213,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_ripped_apart_limb_by_limb killer = root } @@ -230,7 +230,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_chopped_to_pieces killer = root } @@ -247,7 +247,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_heart_ripped_out killer = root } @@ -277,7 +277,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_fear killer = root } @@ -294,7 +294,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_skull_cracked_open killer = root } @@ -311,7 +311,7 @@ berserker_kill_version_randomization_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_strangled_with_own_intestines killer = root } @@ -333,7 +333,7 @@ shieldmaiden_kill_version_randomisation_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_decapitated killer = root } @@ -350,7 +350,7 @@ shieldmaiden_kill_version_randomisation_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_cloven_in_half killer = root } @@ -367,7 +367,7 @@ shieldmaiden_kill_version_randomisation_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_viciously_dismembered killer = root } @@ -384,7 +384,7 @@ shieldmaiden_kill_version_randomisation_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_piteously_cut_down killer = root } @@ -401,7 +401,7 @@ shieldmaiden_kill_version_randomisation_effect = { } } scope:enemy_knight = { - death = { + override_death_killer_effect = { death_reason = death_chopped_to_pieces killer = root } diff --git a/common/scripted_effects/00_ep1_artifact_creation_effects.txt b/common/scripted_effects/00_ep1_artifact_creation_effects.txt index c9eb4c4b3a..b93b21a520 100644 --- a/common/scripted_effects/00_ep1_artifact_creation_effects.txt +++ b/common/scripted_effects/00_ep1_artifact_creation_effects.txt @@ -811,7 +811,7 @@ get_cloth_type_sturdy_effect = { trigger = { artifact_value_trigger = { VALUE = scope:wealth MIN = 40 MAX = 999 } artifact_region_trigger = { CHARACTER = scope:owner REGION = material_cloth_cotton } - NOT = { scope:owner.religion = religion:judaism_religion } + NOT = { scope:owner = { like_judaism_religion_trigger = yes } } } save_scope_value_as = { name = $SCOPE_NAME$ value = flag:fustian } } @@ -1183,9 +1183,10 @@ add_scaled_artifact_modifier_combat_effect = { OR = { culture = { has_cultural_tradition = tradition_chivalry } culture = { has_cultural_tradition = tradition_martial_admiration } - culture = { has_cultural_tradition = tradition_futuwaa } - culture = { has_cultural_tradition = tradition_druzhina } - culture = { has_cultural_tradition = tradition_chanson_de_geste } + # Warcraft + # culture = { has_cultural_tradition = tradition_futuwaa } + # culture = { has_cultural_tradition = tradition_druzhina } + # culture = { has_cultural_tradition = tradition_chanson_de_geste } } } } @@ -2540,9 +2541,10 @@ add_2_scaled_artifact_modifier_combat_effect = { OR = { culture = { has_cultural_tradition = tradition_chivalry } culture = { has_cultural_tradition = tradition_martial_admiration } - culture = { has_cultural_tradition = tradition_futuwaa } - culture = { has_cultural_tradition = tradition_druzhina } - culture = { has_cultural_tradition = tradition_chanson_de_geste } + # Warcraft + # culture = { has_cultural_tradition = tradition_futuwaa } + # culture = { has_cultural_tradition = tradition_druzhina } + # culture = { has_cultural_tradition = tradition_chanson_de_geste } } } } @@ -10245,13 +10247,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_europe_south - geographical_region = world_africa_north - geographical_region = world_asia_minor - geographical_region = world_middle_east - geographical_region = world_steppe - } + flower_poppy_region_trigger = no } } save_scope_value_as = { @@ -10264,11 +10260,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_asia_minor - geographical_region = world_middle_east - geographical_region = world_steppe_west - } + flower_tulip_region_trigger = no } } save_scope_value_as = { @@ -10307,12 +10299,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_india - geographical_region = world_middle_east - geographical_region = world_africa_west - geographical_region = world_africa_east - } + flower_hibiscus_region_trigger = no } } save_scope_value_as = { @@ -10325,11 +10312,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_india - geographical_region = world_africa_west - geographical_region = world_africa_east - } + flower_gardenia_region_trigger = no } } save_scope_value_as = { @@ -10342,12 +10325,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_steppe_east - geographical_region = world_steppe_tarim - geographical_region = world_himalaya - geographical_region = world_india - } + flower_lotus_region_trigger = no } } save_scope_value_as = { @@ -10360,12 +10338,7 @@ get_pressed_flower_species_effect = { modifier = { factor = 0 $LOCATION$ = { - NOR = { - geographical_region = world_steppe_east - geographical_region = world_steppe_tarim - geographical_region = world_himalaya - geographical_region = world_india - } + flower_chrysanthemum_region_trigger = no } } save_scope_value_as = { diff --git a/common/scripted_rules/00_rules.txt b/common/scripted_rules/00_rules.txt index bdfa4ee189..4fba2dc14d 100644 --- a/common/scripted_rules/00_rules.txt +++ b/common/scripted_rules/00_rules.txt @@ -331,8 +331,8 @@ is_alliance_valid = { is_in_same_union_trigger = { TARGET = scope:second } # FP3 struggle case - has_character_flag = fp3_is_a_loyalist_puppet - scope:second = { has_character_flag = fp3_is_a_loyalist_puppet } + #has_character_flag = fp3_is_a_loyalist_puppet + #scope:second = { has_character_flag = fp3_is_a_loyalist_puppet } } } diff --git a/common/scripted_triggers/06_fp3_scripted_triggers.txt b/common/scripted_triggers/06_fp3_scripted_triggers.txt index 3ab21ef33b..09bb3121bc 100644 --- a/common/scripted_triggers/06_fp3_scripted_triggers.txt +++ b/common/scripted_triggers/06_fp3_scripted_triggers.txt @@ -9,9 +9,9 @@ eligible_for_fp3_khvarenah_legacy_trigger = { dynast = { culture = { OR = { - has_cultural_pillar = heritage_iranian + like_heritage_iranian_trigger = yes any_parent_culture_or_above = { - has_cultural_pillar = heritage_iranian + like_heritage_iranian_trigger = yes } } } @@ -28,25 +28,25 @@ fp3_warrior_culture_trigger = { has_cultural_tradition = tradition_swords_for_hire } OR = { - has_cultural_pillar = heritage_iranian - has_cultural_pillar = heritage_arabic - has_cultural_pillar = heritage_turkic - has_cultural_pillar = heritage_tocharian + like_heritage_iranian_trigger = yes + like_heritage_arabic_trigger = yes + like_turkic_group_trigger = yes + #has_cultural_pillar = heritage_tocharian } } } -fp3_custom_divinity_for_zoroastrianism_faiths = { - OR = { - faith.religion = faith:mazdayasna.religion - faith.religion = faith:gayomarthianism.religion - faith.religion = faith:khurmazta.religion - faith.religion = faith:zurvanism.religion - faith.religion = faith:urartuism.religion - faith.religion = faith:mazdakism.religion - faith.religion = faith:khurramism.religion - } -} +#fp3_custom_divinity_for_zoroastrianism_faiths = { + #OR = { + #faith.religion = faith:mazdayasna.religion + #faith.religion = faith:gayomarthianism.religion + #faith.religion = faith:khurmazta.religion + #faith.religion = faith:zurvanism.religion + #faith.religion = faith:urartuism.religion + #faith.religion = faith:mazdakism.religion + #faith.religion = faith:khurramism.religion + #} +#} fp3_sufism_enthusiast_trigger = { has_religion = religion:islam_religion @@ -70,174 +70,71 @@ is_developer_testing_trigger = { has_multiple_players = no } -fp3_will_remain_in_caliphate_regardless_of_takeover = { - OR = { - opinion = { # They must either not hate you - target = scope:struggle_ender - value > -29 # todo_cd_hci balance here is bad, since attaining the level necessary to take this decision causes everyone to like you! - } - opinion = { # Or really want to stay by the side of the caliph - target = scope:struggle_liege - value > 54 - } - } -} +#fp3_will_remain_in_caliphate_regardless_of_takeover = { + #OR = { + #opinion = { # They must either not hate you + #target = scope:struggle_ender + #value > -29 # todo_cd_hci balance here is bad, since attaining the level necessary to take this decision causes everyone to like you! + #} + #opinion = { # Or really want to stay by the side of the caliph + #target = scope:struggle_liege + #value > 54 + #} + #} +#} -fp3_eligible_for_yearly_events_trigger = { - has_fp3_dlc_trigger = yes - OR = { - culture = { has_cultural_pillar = heritage_iranian } - culture = { has_cultural_pillar = heritage_turkic } - culture = { has_cultural_pillar = heritage_mongolic } - culture = { has_cultural_pillar = heritage_arabic } - } - any_realm_county = { # Most events are geographical in nature - any_county_province = { geographical_region = world_persian_empire } - } -} - -fp3_is_valid_futuwaa_member = { - $SPONSOR$.capital_province ?= { this = prev.location } # Prevents error log errors from dumbo AI - is_ai = yes # TODO_CD_EREN: Allow players to benefit too (requires sending them interface messages that their skills have increased) - age > 12 - age < 25 - is_married = no - can_be_combatant_based_on_gender_trigger = { ARMY_OWNER = $SPONSOR$ } -} - -fp3_is_valid_madrasa_pupil = { - $SPONSOR$.capital_province ?= { this = prev.location } # Prevents error log errors from dumbo AI - is_ai = yes # TODO_CD_EREN: Allow players to benefit too (see above) - age > 8 - age < 16 - NOT = { has_character_flag = studying_at_university } +#fp3_eligible_for_yearly_events_trigger = { + #has_fp3_dlc_trigger = yes + #OR = { + #culture = { like_heritage_iranian_trigger = yes } + #culture = { like_turkic_group_trigger = yes } + #culture = { like_mongolic_group_trigger = yes } + #culture = { like_heritage_arabic_trigger = yes } + #} + #any_realm_county = { # Most events are geographical in nature + #any_county_province = { geographical_region = world_persian_empire } + #} +#} + +#fp3_is_valid_futuwaa_member = { + #$SPONSOR$.capital_province ?= { this = prev.location } # Prevents error log errors from dumbo AI + #is_ai = yes # TODO_CD_EREN: Allow players to benefit too (requires sending them interface messages that their skills have increased) + #age > 12 + #age < 25 + #is_married = no + #can_be_combatant_based_on_gender_trigger = { ARMY_OWNER = $SPONSOR$ } +#} + +#fp3_is_valid_madrasa_pupil = { + #$SPONSOR$.capital_province ?= { this = prev.location } # Prevents error log errors from dumbo AI + #is_ai = yes # TODO_CD_EREN: Allow players to benefit too (see above) + #age > 8 + #age < 16 + #NOT = { has_character_flag = studying_at_university } #Gender rules - OR = { - $SPONSOR$ = { has_realm_law = equal_law } - AND = { - $SPONSOR$ = { - OR = { - has_realm_law = female_only_law - has_realm_law = female_preference_law - } - } - is_female = yes - } - AND = { - $SPONSOR$ = { - OR = { - has_realm_law = male_only_law - has_realm_law = male_preference_law - } - } - is_male = yes - } - } -} - -fp3_valid_shia_head = { - calc_true_if = { - amount >= 2 - - # Sayyids get a free pass. - has_trait = sayyid - # The wise get a free pass. - has_trait = lifestyle_mystic - piety_level >= very_high_piety_level - # Having many faithful counties. - custom_description = { - text = claim_the_imamate_decision.need_at_least_fifteen_same_faith_counties - any_sub_realm_county = { - count >= claim_the_imamate_decision_same_faith_greater_county_count - faith = root.faith - } - } - # Ancient Authority legacy. - dynasty ?= { has_dynasty_perk = fp3_khvarenah_legacy_4 } - } -} - -fp3_valid_muhakkima_head = { - calc_true_if = { - amount >= 2 - - # Sayyids get a free pass. - has_trait = sayyid - piety_level >= very_high_piety_level - # Having many faithful counties - custom_description = { - text = claim_the_imamate_decision.need_at_least_fifteen_same_faith_counties - any_sub_realm_county = { - count >= claim_the_imamate_decision_same_faith_greater_county_count - faith = root.faith - } - } - # Famed - prestige_level >= 4 - # #Muhakkima cares about justified warfare - and a justified cause. - OR = { - has_trait = faith_warrior #mujahid really - has_trait = theologian - } - } -} - -fp3_does_this_player_care_about_the_persian_struggle = { - save_temporary_scope_as = char_temp - OR = { - capital_province ?= { - OR = { # Is in region - geographical_region = world_middle_east_persia - geographical_region = world_africa_north_east - } - } - struggle:persian_struggle = { is_culture_involved_in_struggle = scope:char_temp.culture } - struggle:persian_struggle = { is_faith_involved_in_struggle = scope:char_temp.faith } - # Ping islamic and zoroastrian players as they might be interested - religion = religion:islam_religion - religion = religion:zoroastrianism_religion - fp3_character_involved_in_struggle_trigger = yes - fp3_character_interloper_in_struggle_trigger = yes - } -} - -fp3_reward_from_vassalization_ending = { - has_fp3_dlc_trigger = yes - - # Only available when the vassalization happened - exists = global_var:fp3_struggle_ending - global_var:fp3_struggle_ending = flag:fp3_struggle_vassalize_caliph_ending - - #need to be the liege of the caliph or from their House - - scope:recipient = { - any_held_title = { - this = title:d_sunni - } - } - - scope:actor.house ?= scope:recipient.top_liege.house -} - -fp3_struggle_involves_one_supporter_and_one_detractor = { - OR = { - AND = { - $FIRST$ = { has_trait = fp3_struggle_detractor } - $SECOND$ = { has_trait = fp3_struggle_supporter } - } - AND = { - $FIRST$ = { has_trait = fp3_struggle_supporter } - $SECOND$ = { has_trait = fp3_struggle_detractor } - } - } -} - -fp3_struggle_scoped_is_the_arabian_caliph_trigger = { - OR = { - has_title = title:e_arabia - has_title = title:d_sunni - } -} + #OR = { + #$SPONSOR$ = { has_realm_law = equal_law } + #AND = { + #$SPONSOR$ = { + #OR = { + #has_realm_law = female_only_law + #has_realm_law = female_preference_law + #} + #} + #is_female = yes + #} + #AND = { + #$SPONSOR$ = { + #OR = { + #has_realm_law = male_only_law + #has_realm_law = male_preference_law + #} + #} + #is_male = yes + #} + #} +#} +#Warcraft fp3_fortress_of_faith_county_trigger = { faith = { save_temporary_scope_as = compare_faith } @@ -249,17 +146,17 @@ fp3_fortress_of_faith_county_trigger = { } } -fp3_is_valid_loyal_puppet = { # Install a suitable lackey to do your bidding - has_trait = fp3_struggle_supporter +#fp3_is_valid_loyal_puppet = { # Install a suitable lackey to do your bidding + #has_trait = fp3_struggle_supporter # Can't be friends w/liege or indebted to them - liege ?= { - NOR = { - has_relation_friend = prev - has_hook = prev - } - } - primary_title.tier >= tier_county # We don't want to promote baron to avoid having Republic or Theocracies realms -} + #liege ?= { + #NOR = { + #has_relation_friend = prev + #has_hook = prev + #} + #} + #primary_title.tier >= tier_county # We don't want to promote baron to avoid having Republic or Theocracies realms +#} fp3_proper_gender_for_dynastic_ambition_trigger = { OR = { #checking for appropriate gender @@ -291,47 +188,7 @@ fp3_proper_gender_for_dynastic_ambition_trigger = { } } -fp3_character_any_involvement_persian_struggle_trigger = { - has_fp3_dlc_trigger = yes - OR = { - fp3_character_involved_in_struggle_trigger = yes - fp3_character_interloper_in_struggle_trigger = yes - } -} - -fp3_character_involved_in_struggle_trigger = { - has_fp3_dlc_trigger = yes - any_character_struggle = { - involvement = involved - is_struggle_type = persian_struggle - } -} - -fp3_character_interloper_in_struggle_trigger = { - has_fp3_dlc_trigger = yes - any_character_struggle = { - involvement = interloper - is_struggle_type = persian_struggle - } -} - -fp3_character_uninvolved_in_struggle_trigger = { - has_fp3_dlc_trigger = yes - exists = struggle:persian_struggle - fp3_character_interloper_in_struggle_trigger = no - fp3_character_involved_in_struggle_trigger = no -} - -fp3_struggle_is_the_caliph = { - AND = { - any_held_title = { - this = title:d_sunni - } - any_held_title = { - this = title:e_arabia - } - } -} +#Warcrafta fp3_embellish_capital_decision_character_trigger = { is_capable_adult_ai = yes @@ -343,25 +200,25 @@ fp3_embellish_capital_decision_character_trigger = { } } -fp3_name_read_in_friday_prayer_decision_liege_requirements_trigger = { - OR = { - is_independent_ruler = yes - custom_description = { - text = name_read_in_friday_prayer_crown_authority - is_independent_ruler = no - liege ?= { has_realm_law = crown_authority_0 } - } - AND = { - has_trait = fp3_struggle_detractor - liege = { has_title = title:d_sunni } - } +#fp3_name_read_in_friday_prayer_decision_liege_requirements_trigger = { + #OR = { + #is_independent_ruler = yes + #custom_description = { + #text = name_read_in_friday_prayer_crown_authority + #is_independent_ruler = no + #liege ?= { has_realm_law = crown_authority_0 } + #} + #AND = { + #has_trait = fp3_struggle_detractor + #liege = { has_title = title:d_sunni } + #} # We have to trigger_if this for tooltip reasons. - trigger_if = { - limit = { is_independent_ruler = no } - liege = { government_has_flag = government_is_tribal } - } - } -} + #trigger_if = { + #limit = { is_independent_ruler = no } + #liege = { government_has_flag = government_is_tribal } + #} + #} +#} favour_skilled_outsiders_decision_valid_character_to_take_trigger = { OR = { diff --git a/events/activities/pilgrimage_activity/pilgrimage_events.txt b/events/activities/pilgrimage_activity/pilgrimage_events.txt index 257cc5ee86..d7923367ba 100644 --- a/events/activities/pilgrimage_activity/pilgrimage_events.txt +++ b/events/activities/pilgrimage_activity/pilgrimage_events.txt @@ -9323,14 +9323,14 @@ pilgrimage.6531 = { override_background = { trigger = { NOT = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } } reference = ep2_hunt_forest_cave } override_background = { trigger = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } reference = wilderness } @@ -9381,14 +9381,14 @@ pilgrimage.6532 = { override_background = { trigger = { NOT = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } } reference = ep2_hunt_foggy_forest } override_background = { trigger = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } reference = terrain_travel } @@ -9626,14 +9626,14 @@ pilgrimage.6533 = { override_background = { trigger = { NOT = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } } reference = ep2_hunt_foggy_forest } override_background = { trigger = { - root.location = { geographical_region = world_middle_east } + root.location = { geographical_region = world_steppe } } reference = terrain_travel } diff --git a/events/harm_events.txt b/events/harm_events.txt index 2dd7d7bc3f..b483e2901d 100644 --- a/events/harm_events.txt +++ b/events/harm_events.txt @@ -6693,7 +6693,7 @@ harm.1071 = { send_interface_toast = { title = harm.1071.a.tt.failure left_icon = root - override_death_effect = { + override_death_killer_effect = { death_reason = death_courtier_mistakenly_stabbed killer = scope:killer } @@ -6773,7 +6773,7 @@ harm.1071 = { send_interface_toast = { title = harm.1071.c.tt.failure left_icon = root - override_death_effect = { + override_death_killer_effect = { death_reason = death_courtier_mistakenly_stabbed killer = scope:killer } @@ -7833,7 +7833,7 @@ harm.1111 = { send_interface_toast = { title = harm.1111.a.tt.failure left_icon = root - override_death_effect = { + override_death_killer_effect = { death_reason = death_murder killer = scope:killer } diff --git a/events/religion_events/false_conversion_events.txt b/events/religion_events/false_conversion_events.txt index c7aa1aa141..b9070eff0d 100644 --- a/events/religion_events/false_conversion_events.txt +++ b/events/religion_events/false_conversion_events.txt @@ -167,46 +167,7 @@ false_conversion.0020 = { } } # Fp3 Struggle Catalyst - if = { - limit = { - highest_held_title_tier >= tier_county - faith.religion = religion:islam_religion - any_character_struggle = { - involvement = involved - phase_has_catalyst = catalyst_revealed_secret_faith_islam - } - } - every_character_struggle = { - involvement = involved - limit = { - phase_has_catalyst = catalyst_revealed_secret_faith_islam - } - activate_struggle_catalyst = { - catalyst = catalyst_revealed_secret_faith_islam - character = root - } - } - } - else_if = { - limit = { - highest_held_title_tier >= tier_county - NOT = { faith.religion = religion:islam_religion } - any_character_struggle = { - involvement = involved - phase_has_catalyst = catalyst_revealed_secret_faith_non_islam - } - } - every_character_struggle = { - involvement = involved - limit = { - phase_has_catalyst = catalyst_revealed_secret_faith_non_islam - } - activate_struggle_catalyst = { - catalyst = catalyst_revealed_secret_faith_non_islam - character = root - } - } - } + #Warcraft stress_impact = { zealous = medium_stress_impact_gain #Damn it, I was passionate about my openly-practiced faith!