From 3ee6f422ccc03792048f829488f45ca5c76383a3 Mon Sep 17 00:00:00 2001 From: Had Date: Sun, 12 Nov 2017 19:17:34 +0300 Subject: [PATCH] formating --- bin/events/mnm_hermetics_events.txt | 700 +++++++++--------- common/achievements.txt | 4 +- common/buildings/wh_lahmia.txt | 6 +- common/buildings/wh_norscan.txt | 2 +- common/cb_types/wh_cb_types.txt | 246 +++--- common/council_positions/00_loyalist.txt | 10 +- common/council_positions/01_pragmatist.txt | 10 +- common/council_positions/03_zealot.txt | 10 +- common/council_positions/04_malcontent.txt | 10 +- common/disease/wh_disease.txt | 6 +- common/event_modifiers/00_event_modifiers.txt | 2 +- .../event_modifiers/warhammer_modifiers.txt | 2 +- .../00_execution_methods.txt | 12 +- common/governments/feudal_governments.txt | 4 +- common/minor_titles/S_minor_titles.txt | 18 +- common/objectives/00_ambitions.txt | 48 +- common/objectives/00_factions.txt | 26 +- common/objectives/00_focuses.txt | 82 +- common/objectives/00_zeus_ambitions.txt | 4 +- .../objectives/00_zeus_childhood_focuses.txt | 16 +- .../objectives/00_zeus_education_focuses.txt | 10 +- common/objectives/wh_ambitions.txt | 4 +- common/objectives/wh_plots.txt | 6 +- .../scripted_effects/00_scripted_effects.txt | 140 ++-- .../scripted_effects/wh_scripted_effects.txt | 128 ++-- .../wh_scripted_triggers.txt | 4 +- common/societies/00_societies.txt | 4 +- common/traits/wh_creature.txt | 4 +- decisions/councillor_decision.txt | 4 +- decisions/wh_asur_decisions.txt | 4 +- decisions/wh_lahmian_decisions.txt | 2 +- decisions/wh_magic_decisions.txt | 2 +- decisions/wh_skaven_decisions.txt | 2 +- decisions/wh_vampire_decisions.txt | 14 +- decisions/wh_witch_hunter_decisions.txt | 126 ++-- events/hedge_knights_events.txt | 94 +-- events/hl_horse_events_2.txt | 6 +- events/mnm_artifacts_events.txt | 10 +- events/mnm_assassins_events.txt | 192 ++--- events/mnm_grand_debate_events.txt | 282 +++---- events/mnm_misc_events.txt | 28 +- events/mnm_monastic_orders_events.txt | 30 +- events/oldgods_ancestor_worship_events.txt | 22 +- events/on_action_events.txt | 30 +- events/pet_events.txt | 12 +- events/pope_free_investiture.txt | 2 +- events/regency_events.txt | 56 +- events/rip_eternal_life_events.txt | 8 +- events/rip_flavor_events.txt | 18 +- events/rip_seclusion_events.txt | 4 +- events/rip_torture_events.txt | 20 +- events/trait_notification.txt | 6 +- events/wh_chaos.txt | 14 +- events/wh_chaos_beastmen.txt | 4 +- events/wh_cult_of_pleasure_events.txt | 36 +- events/wh_druchii.txt | 38 +- events/wh_duel_actions.txt | 2 +- events/wh_duel_init.txt | 8 +- events/wh_elven_marriage_events.txt | 2 +- events/wh_geomantic_web.txt | 4 +- events/wh_high_elf_magic_events.txt | 230 +++--- events/wh_high_elves_events.txt | 2 +- events/wh_lunacy_events.txt | 2 +- events/wh_mage_learning_events.txt | 10 +- events/wh_magic_heavens_proc_events.txt | 8 +- events/wh_magic_lore_death.txt | 2 +- events/wh_magic_lore_nurgle.txt | 10 +- events/wh_vampire_events.txt | 4 +- events/wh_vampire_questing_events.txt | 10 +- events/wh_witch_hunters_election_events.txt | 66 +- events/wh_witch_hunters_events.txt | 8 +- history/characters/4000_amazon.txt | 2 +- history/characters/84000_talabeclander.txt | 62 +- history/provinces/1763 - Ganaina.txt | 2 +- history/provinces/1809 - Qu'ittax.txt | 2 +- history/titles/c_black_fire_pass.txt | 2 +- history/titles/c_booming_peak.txt | 2 +- history/titles/c_cragmere.txt | 2 +- history/titles/c_karak_azgal.txt | 4 +- history/titles/c_karak_azul.txt | 2 +- history/titles/c_kurgaz_grungon.txt | 2 +- history/titles/c_mount_bloodhorn.txt | 2 +- history/titles/c_slayer_keep.txt | 2 +- history/titles/c_zhufbar.txt | 2 +- history/titles/d_grungozar.txt | 2 +- history/titles/d_karak_azgalzul.txt | 2 +- history/titles/d_karak_kadrin.txt | 2 +- history/titles/d_sons_of_war.txt | 6 +- history/titles/d_zhufbar.txt | 2 +- history/titles/k_kadrin_ankor.txt | 2 +- history/titles/k_zhufbarak.txt | 2 +- interface/coats_of_arms.txt | 8 +- map/geographical_region.txt | 4 +- map/terrain.txt | 8 +- music/songs.txt | 18 +- 95 files changed, 1548 insertions(+), 1548 deletions(-) diff --git a/bin/events/mnm_hermetics_events.txt b/bin/events/mnm_hermetics_events.txt index f067f6d1..4dff71c8 100644 --- a/bin/events/mnm_hermetics_events.txt +++ b/bin/events/mnm_hermetics_events.txt @@ -1851,7 +1851,7 @@ character_event = { if = { limit = { any_artifact = { - has_artifact_flag = ingredient + has_artifact_flag = ingredient } } @@ -2462,33 +2462,33 @@ letter_event = { FROM = { # Chance of having Alexandria as an option random = { - chance = 10 - modifier = { - learning = 12 - factor = 1.2 + chance = 10 + modifier = { + learning = 12 + factor = 1.2 } - modifier = { - learning = 14 - factor = 1.2 + modifier = { + learning = 14 + factor = 1.2 } - modifier = { - learning = 16 - factor = 1.2 + modifier = { + learning = 16 + factor = 1.2 } - modifier = { - learning = 18 - factor = 1.2 + modifier = { + learning = 18 + factor = 1.2 } - modifier = { - learning = 20 - factor = 1.2 + modifier = { + learning = 20 + factor = 1.2 } - set_character_flag = alexandria + set_character_flag = alexandria } } @@ -2519,21 +2519,21 @@ letter_event = { limit = { ai = no } - random_independent_ruler = { - limit = { - is_within_diplo_range = ROOT - NOT = { + random_independent_ruler = { + limit = { + is_within_diplo_range = ROOT + NOT = { same_realm = ROOT } - any_realm_title = { - tier = DUCHY - OR = { - title = d_alexandria - title = d_damietta - title = d_cairo - title = d_aswan - title = d_nobatia - region = world_middle_east_jerusalem + any_realm_title = { + tier = DUCHY + OR = { + title = d_alexandria + title = d_damietta + title = d_cairo + title = d_aswan + title = d_nobatia + region = world_middle_east_jerusalem region = world_europe_south_east region = world_asia_minor @@ -2542,9 +2542,9 @@ letter_event = { } } - random_realm_province = { - save_event_target_as = ruin_site - owner = { + random_realm_province = { + save_event_target_as = ruin_site + owner = { top_liege = { save_event_target_as = ruin_site_top_liege } @@ -2607,7 +2607,7 @@ letter_event = { modifier = { learning = 20 factor = 1.2 } - modifier = { + modifier = { FROM = { learning = 8 } factor = 1.2 @@ -2696,7 +2696,7 @@ letter_event = { modifier = { learning = 20 factor = 1.2 } - modifier = { + modifier = { FROM = { learning = 8 } factor = 1.2 @@ -2785,7 +2785,7 @@ letter_event = { modifier = { learning = 20 factor = 1.2 } - modifier = { + modifier = { FROM = { learning = 8 } factor = 1.2 @@ -2867,7 +2867,7 @@ letter_event = { modifier = { learning = 20 factor = 1.2 } - modifier = { + modifier = { FROM = { learning = 8 } factor = 1.2 @@ -2939,58 +2939,58 @@ character_event = { has_quest = quest_hermetics_find_text } } - trigger_switch = { - on_trigger = has_character_flag - A_SUCCESS = { + trigger_switch = { + on_trigger = has_character_flag + A_SUCCESS = { FROM = { narrative_event = { id = MNM.1422 } } } - B_SUCCESS = { + B_SUCCESS = { FROM = { character_event = { id = MNM.1423 } } } - C_SUCCESS = { + C_SUCCESS = { FROM = { character_event = { id = MNM.1424 } } } - D_SUCCESS = { + D_SUCCESS = { FROM = { character_event = { id = MNM.1425 } } } - A_FAIL = { + A_FAIL = { FROM = { character_event = { id = MNM.1426 } } } - B_FAIL = { + B_FAIL = { FROM = { character_event = { id = MNM.1426 } } } - C_FAIL = { + C_FAIL = { FROM = { character_event = { id = MNM.1426 } } } - D_FAIL = { + D_FAIL = { FROM = { character_event = { id = MNM.1426 @@ -3009,9 +3009,9 @@ character_event = { } } clr_character_flag = A_FAIL - clr_character_flag = B_FAIL - clr_character_flag = C_FAIL - clr_character_flag = D_FAIL + clr_character_flag = B_FAIL + clr_character_flag = C_FAIL + clr_character_flag = D_FAIL } clr_character_flag = A_SUCCESS clr_character_flag = B_SUCCESS @@ -3045,9 +3045,9 @@ narrative_event = { add_society_currency_massive_effect = yes hidden_effect = { opinion = { - who = FROM - modifier = epic_adventure - years = 30 + who = FROM + modifier = epic_adventure + years = 30 } @@ -3079,9 +3079,9 @@ character_event = { add_society_currency_major_effect = yes hidden_effect = { opinion = { - who = FROM - modifier = great_adventure - years = 30 + who = FROM + modifier = great_adventure + years = 30 } @@ -3113,9 +3113,9 @@ character_event = { add_society_currency_medium_effect = yes hidden_effect = { opinion = { - who = FROM - modifier = nice_adventure - years = 30 + who = FROM + modifier = nice_adventure + years = 30 } @@ -3842,18 +3842,18 @@ character_event = { } factor = 1.5 } custom_tooltip = { - text = EVTOPTX_MNM_1435_FAIL_TT - hidden_effect = { - random_list = { - 50 = { - character_event = { + text = EVTOPTX_MNM_1435_FAIL_TT + hidden_effect = { + random_list = { + 50 = { + character_event = { id = MNM.1436 days = 7 } # You get deteced later, but continue for now - set_character_flag = guards_wake_up + set_character_flag = guards_wake_up } - 50 = { - character_event = { + 50 = { + character_event = { id = MNM.1437 days = 7 } # Hard fail @@ -3924,18 +3924,18 @@ character_event = { } factor = 1.5 } custom_tooltip = { - text = EVTOPTX_MNM_1435_FAIL_TT - hidden_effect = { - random_list = { - 50 = { - character_event = { + text = EVTOPTX_MNM_1435_FAIL_TT + hidden_effect = { + random_list = { + 50 = { + character_event = { id = MNM.1436 days = 7 } # You get deteced later, but continue for now - set_character_flag = guards_wake_up + set_character_flag = guards_wake_up } - 50 = { - character_event = { + 50 = { + character_event = { id = MNM.1437 days = 7 } # Hard fail @@ -4007,18 +4007,18 @@ character_event = { } factor = 1.5 } custom_tooltip = { - text = EVTOPTX_MNM_1435_FAIL_TT - hidden_effect = { - random_list = { - 50 = { - character_event = { + text = EVTOPTX_MNM_1435_FAIL_TT + hidden_effect = { + random_list = { + 50 = { + character_event = { id = MNM.1438 days = 7 } # You get deteced later, but continue for now - set_character_flag = distraction_failed + set_character_flag = distraction_failed } - 50 = { - character_event = { + 50 = { + character_event = { id = MNM.1439 days = 7 } # Hard fail @@ -4095,7 +4095,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_stealing @@ -4106,8 +4106,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4134,7 +4134,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_destroying @@ -4145,8 +4145,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4173,7 +4173,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_stealing @@ -4184,8 +4184,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4207,7 +4207,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_destroying @@ -4218,8 +4218,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4289,7 +4289,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_stealing @@ -4300,8 +4300,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4320,7 +4320,7 @@ character_event = { limit = { OR = { has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = distraction_failed } } set_character_flag = caught_destroying @@ -4331,8 +4331,8 @@ character_event = { if = { limit = { NOR = { - has_character_flag = guards_wake_up - has_character_flag = distraction_failed + has_character_flag = guards_wake_up + has_character_flag = distraction_failed } } @@ -4387,12 +4387,12 @@ character_event = { desc = { trigger = { OR = { - AND = { - has_character_flag = distraction_failed - has_character_flag = caught_destroying + AND = { + has_character_flag = distraction_failed + has_character_flag = caught_destroying } - FROM = { + FROM = { has_character_flag = bad_theft } @@ -4424,26 +4424,26 @@ character_event = { name = EVTOPTA_MNM_1440 event_target:infiltration_target = { if = { - limit = { + limit = { is_landed = yes } - ROOT = { + ROOT = { imprison = PREV } - event_target:infiltration_companion = { + event_target:infiltration_companion = { imprison = PREV } } if = { - limit = { + limit = { is_landed = no } - host = { - ROOT = { + host = { + ROOT = { imprison = PREV } - event_target:infiltration_companion = { + event_target:infiltration_companion = { imprison = PREV } @@ -4459,9 +4459,9 @@ character_event = { hidden_effect = { event_target:infiltration_companion = { reverse_opinion = { - who = event_target:infiltration_target - modifier = opinion_thief - years = 20 + who = event_target:infiltration_target + modifier = opinion_thief + years = 20 } } @@ -4519,14 +4519,14 @@ character_event = { } 40 = { modifier = { - OR = { - trait = greedy - trait = ambitious - trait = wroth - trait = paranoid + OR = { + trait = greedy + trait = ambitious + trait = wroth + trait = paranoid } - factor = 2 + factor = 2 } custom_tooltip = { @@ -4808,7 +4808,7 @@ character_event = { # Good theft trigger = { event_target:infiltration_target = { - any_artifact = { + any_artifact = { has_artifact_flag = hermetics has_artifact_flag = ingredient } @@ -4965,18 +4965,18 @@ character_event = { } } random_artifact = { - limit = { - has_artifact_flag = hermetics + limit = { + has_artifact_flag = hermetics has_artifact_flag = text } - tooltip = { + tooltip = { destroy_artifact = yes } - hidden_effect = { - transfer_artifact = { - from = ROOT - to = FROM + hidden_effect = { + transfer_artifact = { + from = ROOT + to = FROM } @@ -4994,26 +4994,26 @@ character_event = { } } if = { - limit = { - any_artifact = { - has_artifact_flag = hermetics + limit = { + any_artifact = { + has_artifact_flag = hermetics has_artifact_flag = ingredient } } - random_artifact = { - limit = { - has_artifact_flag = hermetics - has_artifact_flag = ingredient + random_artifact = { + limit = { + has_artifact_flag = hermetics + has_artifact_flag = ingredient } - tooltip = { + tooltip = { destroy_artifact = yes } - hidden_effect = { - transfer_artifact = { - from = ROOT - to = FROM + hidden_effect = { + transfer_artifact = { + from = ROOT + to = FROM } @@ -5103,14 +5103,14 @@ character_event = { immediate = { log = "work event id = MNM.1443" random_list = { - 40 = { + 40 = { # Total destruction - trigger = { + trigger = { event_target:infiltration_target = { has_character_flag = built_laboratory } } - modifier = { + modifier = { learning = 12 factor = 1.2 } modifier = { @@ -5125,9 +5125,9 @@ character_event = { set_character_flag = lab_destruction } - 55 = { + 55 = { # Major damage - modifier = { + modifier = { learning = 10 factor = 1.2 } modifier = { @@ -5145,39 +5145,39 @@ character_event = { set_character_flag = lab_damage } - 5 = { + 5 = { # You die in an accident - modifier = { + modifier = { event_target:infiltration_target = { has_character_flag = hidden_lab } factor = 1.2 } - modifier = { + modifier = { event_target:infiltration_target = { has_character_flag = very_hidden_lab } factor = 1.5 } - trigger = { + trigger = { event_target:infiltration_target = { has_character_flag = built_laboratory } } - modifier = { + modifier = { NOT = { learning = 10 } factor = 1.5 } - modifier = { + modifier = { NOT = { learning = 8 } factor = 2 } - modifier = { + modifier = { NOT = { learning = 6 } factor = 2 } - set_character_flag = lab_explosion_death + set_character_flag = lab_explosion_death } @@ -5363,9 +5363,9 @@ character_event = { } after = { hidden_effect = { - FROM = { - clr_character_flag = lab_destruction - clr_character_flag = lab_damage + FROM = { + clr_character_flag = lab_destruction + clr_character_flag = lab_damage } } @@ -5390,7 +5390,7 @@ character_event = { 40 = { # Good theft trigger = { - any_artifact = { + any_artifact = { has_artifact_flag = hermetics has_artifact_flag = ingredient } @@ -5705,9 +5705,9 @@ character_event = { } hidden_effect = { opinion = { - who = event_target:infiltration_companion - modifier = opinion_accomplice - years = 10 + who = event_target:infiltration_companion + modifier = opinion_accomplice + years = 10 } } @@ -5838,16 +5838,16 @@ character_event = { } hidden_effect = { random_list = { - 10 = { - set_character_flag = battle_focused_scrying_flag + 10 = { + set_character_flag = battle_focused_scrying_flag } - 10 = { - set_character_flag = relationship_focused_scrying_flag + 10 = { + set_character_flag = relationship_focused_scrying_flag } - 10 = { - set_character_flag = power_hungry_scrying_flag + 10 = { + set_character_flag = power_hungry_scrying_flag } @@ -5874,7 +5874,7 @@ character_event = { character_event = { id = MNM.1201 days = 5 random = 1 } - remove_selection_of_ingredients_effect = yes + remove_selection_of_ingredients_effect = yes } } } @@ -6324,8 +6324,8 @@ character_event = { FROM = { is_alive = yes OR = { - is_smart_trigger = yes - is_strong_trigger = yes + is_smart_trigger = yes + is_strong_trigger = yes } NOT = { has_negative_congenital_trigger = yes @@ -8272,8 +8272,8 @@ character_event = { set_variable = { which = horoscope_destiny_points value = 0 } # to track truthfulness of horoscope - set_character_flag = horoscope_destiny_revealed # to track and handle horoscope_maker dying - character_event = { + set_character_flag = horoscope_destiny_revealed # to track and handle horoscope_maker dying + character_event = { id = MNM.1297 days = 5 } # Gating event @@ -8296,26 +8296,26 @@ character_event = { immediate = { log = "work event id = MNM.1251" hidden_effect = { - event_target:horoscope_child = { - random_list = { - 10 = { - set_character_flag = destined_steward + event_target:horoscope_child = { + random_list = { + 10 = { + set_character_flag = destined_steward } - 10 = { - set_character_flag = destined_fighter + 10 = { + set_character_flag = destined_fighter } - 10 = { - set_character_flag = destined_diplomat + 10 = { + set_character_flag = destined_diplomat } - 10 = { - set_character_flag = destined_schemer + 10 = { + set_character_flag = destined_schemer } - 10 = { - set_character_flag = destined_scholar + 10 = { + set_character_flag = destined_scholar } @@ -8703,9 +8703,9 @@ character_event = { limit = { has_guardian = yes } - trigger_switch = { + trigger_switch = { # finds an appropriate inspiring adult... - on_trigger = has_character_flag + on_trigger = has_character_flag destined_steward = { random_courtier = { limit = { @@ -8843,9 +8843,9 @@ character_event = { limit = { has_guardian = no } - trigger_switch = { + trigger_switch = { # finds an appropriate inspiring adult... - on_trigger = has_character_flag + on_trigger = has_character_flag destined_steward = { random_courtier = { limit = { @@ -9481,8 +9481,8 @@ character_event = { after = { hidden_effect = { event_target:horoscope_maker = { - set_character_flag = child_fulfilled_destiny_flag - character_event = { + set_character_flag = child_fulfilled_destiny_flag + character_event = { id = MNM.1265 } @@ -9528,9 +9528,9 @@ character_event = { } after = { hidden_effect = { - event_target:horoscope_maker = { - set_character_flag = child_avoided_destiny_flag - character_event = { + event_target:horoscope_maker = { + set_character_flag = child_avoided_destiny_flag + character_event = { id = MNM.1265 } } @@ -11011,17 +11011,17 @@ character_event = { immediate = { log = "work event id = MNM.1461" hidden_effect = { - # Guest of honor (1) - random_list = { - 50 = { - trigger = { + # Guest of honor (1) + random_list = { + 50 = { + trigger = { society = { any_society_member = { is_friend = ROOT ai = yes } } } - society = { + society = { random_society_member = { limit = { is_friend = ROOT ai = yes @@ -11030,21 +11030,21 @@ character_event = { } } - 50 = { - trigger = { - society = { - any_society_member = { - ai = yes - OR = { - learning = 16 - society_rank == 4 + 50 = { + trigger = { + society = { + any_society_member = { + ai = yes + OR = { + learning = 16 + society_rank == 4 } - is_within_diplo_range = ROOT - opinion = { + is_within_diplo_range = ROOT + opinion = { who = ROOT value = 20 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 20 } @@ -11053,45 +11053,45 @@ character_event = { } } - society = { - random_society_member = { - limit = { - ai = yes - OR = { - learning = 16 - society_rank == 4 + society = { + random_society_member = { + limit = { + ai = yes + OR = { + learning = 16 + society_rank == 4 } - is_within_diplo_range = ROOT - opinion = { + is_within_diplo_range = ROOT + opinion = { who = ROOT value = 20 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 20 } } - save_event_target_as = great_minds_guest_1 + save_event_target_as = great_minds_guest_1 } } } - 1 = { - society = { - random_society_member = { - limit = { - ai = yes - opinion = { + 1 = { + society = { + random_society_member = { + limit = { + ai = yes + opinion = { who = ROOT value = 15 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 15 } } - save_event_target_as = great_minds_guest_1 + save_event_target_as = great_minds_guest_1 } @@ -11103,21 +11103,21 @@ character_event = { } # Guest 2 society = { - random_society_member = { - limit = { - ai = yes - NOT = { + random_society_member = { + limit = { + ai = yes + NOT = { character = event_target:great_minds_guest_1 } - opinion = { + opinion = { who = ROOT value = 15 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 15 } } - save_event_target_as = great_minds_guest_2 + save_event_target_as = great_minds_guest_2 } } @@ -11174,22 +11174,22 @@ character_event = { } } society = { - random_society_member = { - limit = { - ai = yes - NOR = { + random_society_member = { + limit = { + ai = yes + NOR = { character = event_target:great_minds_guest_1 character = event_target:great_minds_guest_2 } - opinion = { + opinion = { who = ROOT value = 15 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 15 } } - save_event_target_as = great_minds_guest_3 + save_event_target_as = great_minds_guest_3 } @@ -11199,44 +11199,44 @@ character_event = { 30 = { # Nothing special society = { - random_society_member = { - limit = { - ai = yes - NOR = { + random_society_member = { + limit = { + ai = yes + NOR = { character = event_target:great_minds_guest_1 character = event_target:great_minds_guest_2 } - opinion = { + opinion = { who = ROOT value = 15 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 15 } } - save_event_target_as = great_minds_guest_3 + save_event_target_as = great_minds_guest_3 } } - society = { - random_society_member = { - limit = { - ai = yes - NOR = { + society = { + random_society_member = { + limit = { + ai = yes + NOR = { character = event_target:great_minds_guest_1 character = event_target:great_minds_guest_2 character = event_target:great_minds_guest_3 } - opinion = { + opinion = { who = ROOT value = 15 } - reverse_opinion = { + reverse_opinion = { who = ROOT value = 15 } } - save_event_target_as = great_minds_guest_4 + save_event_target_as = great_minds_guest_4 } @@ -11268,16 +11268,16 @@ character_event = { } hidden_effect = { if = { - limit = { + limit = { has_character_flag = disliked_hermetic_colleague } - event_target:great_minds_guest_3 = { + event_target:great_minds_guest_3 = { character_event = { id = MNM.1462 days = 10 } } - clr_character_flag = disliked_hermetic_colleague - break = yes + clr_character_flag = disliked_hermetic_colleague + break = yes } character_event = { @@ -11444,134 +11444,134 @@ character_event = { } after = { hidden_effect = { - random_list = { - 50 = { - trigger = { - always = yes - OR = { - event_target:great_minds_guest_1 = { + random_list = { + 50 = { + trigger = { + always = yes + OR = { + event_target:great_minds_guest_1 = { NOT = { opinion = { who = ROOT value = 10 } } } - event_target:great_minds_guest_1 = { + event_target:great_minds_guest_1 = { is_dumb_trigger = yes } - event_target:great_minds_guest_1 = { + event_target:great_minds_guest_1 = { trait = ambitious } } } - modifier = { + modifier = { is_rival = event_target:great_minds_guest_1 factor = 3 } - event_target:great_minds_guest_1 = { + event_target:great_minds_guest_1 = { character_event = { id = MNM.1465 days = 3 } } } - 50 = { - trigger = { - always = yes - OR = { - event_target:great_minds_guest_2 = { + 50 = { + trigger = { + always = yes + OR = { + event_target:great_minds_guest_2 = { NOT = { opinion = { who = ROOT value = 10 } } } - event_target:great_minds_guest_2 = { + event_target:great_minds_guest_2 = { is_dumb_trigger = yes } - event_target:great_minds_guest_2 = { + event_target:great_minds_guest_2 = { trait = ambitious } } } - modifier = { + modifier = { is_rival = event_target:great_minds_guest_2 factor = 3 } - event_target:great_minds_guest_2 = { + event_target:great_minds_guest_2 = { character_event = { id = MNM.1465 days = 3 } } } - 50 = { - trigger = { - always = yes - OR = { - event_target:great_minds_guest_3 = { + 50 = { + trigger = { + always = yes + OR = { + event_target:great_minds_guest_3 = { NOT = { opinion = { who = ROOT value = 10 } } } - event_target:great_minds_guest_3 = { + event_target:great_minds_guest_3 = { is_dumb_trigger = yes } - event_target:great_minds_guest_3 = { + event_target:great_minds_guest_3 = { trait = ambitious } } } - modifier = { + modifier = { is_rival = event_target:great_minds_guest_3 factor = 3 } - event_target:great_minds_guest_3 = { + event_target:great_minds_guest_3 = { character_event = { id = MNM.1465 days = 3 } } } - 50 = { - trigger = { - always = yes - OR = { - event_target:great_minds_guest_4 = { + 50 = { + trigger = { + always = yes + OR = { + event_target:great_minds_guest_4 = { NOT = { opinion = { who = ROOT value = 10 } } } - event_target:great_minds_guest_4 = { + event_target:great_minds_guest_4 = { is_dumb_trigger = yes } - event_target:great_minds_guest_4 = { + event_target:great_minds_guest_4 = { trait = ambitious } } } - modifier = { + modifier = { is_rival = event_target:great_minds_guest_4 factor = 3 } - event_target:great_minds_guest_4 = { + event_target:great_minds_guest_4 = { character_event = { id = MNM.1465 days = 3 } } } - 50 = { + 50 = { # They agree - character_event = { + character_event = { id = MNM.1467 days = 3 } @@ -11614,56 +11614,56 @@ character_event = { immediate = { log = "work event id = MNM.1466" FROM = { - random_list = { - 33 = { - trigger = { + random_list = { + 33 = { + trigger = { NOT = { ROOT = { has_character_flag = war_invention } } } - modifier = { + modifier = { has_education_martial_trigger = yes factor = 1.5 } - modifier = { + modifier = { has_lifestyle_martial_trigger = yes factor = 1.5 } - set_character_flag = war_invention + set_character_flag = war_invention } - 33 = { - trigger = { + 33 = { + trigger = { NOT = { ROOT = { has_character_flag = prosperity_invention } } } - modifier = { + modifier = { has_education_stewardship_trigger = yes factor = 1.5 } - modifier = { + modifier = { has_lifestyle_stewardship_trigger = yes factor = 1.5 } - set_character_flag = prosperity_invention + set_character_flag = prosperity_invention } - 33 = { - trigger = { + 33 = { + trigger = { NOT = { ROOT = { has_character_flag = knowledge_invention } } } - modifier = { + modifier = { has_education_learning_trigger = yes factor = 1.5 } - modifier = { + modifier = { has_lifestyle_learning_trigger = yes factor = 1.5 } - set_character_flag = knowledge_invention + set_character_flag = knowledge_invention } @@ -12065,13 +12065,13 @@ character_event = { society = { any_society_member = { OR = { - character = event_target:great_minds_guest_1 - character = event_target:great_minds_guest_2 - character = event_target:great_minds_guest_3 - character = event_target:great_minds_guest_4 + character = event_target:great_minds_guest_1 + character = event_target:great_minds_guest_2 + character = event_target:great_minds_guest_3 + character = event_target:great_minds_guest_4 } - NOT = { + NOT = { opinion = { who = PREVPREV value = 10 } @@ -12093,13 +12093,13 @@ character_event = { society = { any_society_member = { OR = { - character = event_target:great_minds_guest_1 - character = event_target:great_minds_guest_2 - character = event_target:great_minds_guest_3 - character = event_target:great_minds_guest_4 + character = event_target:great_minds_guest_1 + character = event_target:great_minds_guest_2 + character = event_target:great_minds_guest_3 + character = event_target:great_minds_guest_4 } - NOT = { + NOT = { opinion = { who = PREVPREV value = 10 } @@ -12109,23 +12109,23 @@ character_event = { } save_event_target_as = arguer_2 society = { - random_society_member = { - limit = { - OR = { - character = event_target:great_minds_guest_1 - character = event_target:great_minds_guest_2 - character = event_target:great_minds_guest_3 - character = event_target:great_minds_guest_4 + random_society_member = { + limit = { + OR = { + character = event_target:great_minds_guest_1 + character = event_target:great_minds_guest_2 + character = event_target:great_minds_guest_3 + character = event_target:great_minds_guest_4 } - NOT = { + NOT = { opinion = { who = PREVPREV value = 10 } } } - save_event_target_as = arguer_1 + save_event_target_as = arguer_1 } } @@ -12529,9 +12529,9 @@ character_event = { } hidden_effect = { opinion = { - who = FROM - modifier = opinion_great_minds - years = 10 + who = FROM + modifier = opinion_great_minds + years = 10 } } @@ -13140,7 +13140,7 @@ character_event = { event_target:great_minds_guest_1 = { trigger_switch = { on_trigger = has_character_flag - invention_failure_death = { + invention_failure_death = { death = { death_reason = death_accident } @@ -13157,7 +13157,7 @@ character_event = { event_target:great_minds_guest_2 = { trigger_switch = { on_trigger = has_character_flag - invention_failure_death = { + invention_failure_death = { death = { death_reason = death_accident } @@ -13174,7 +13174,7 @@ character_event = { event_target:great_minds_guest_3 = { trigger_switch = { on_trigger = has_character_flag - invention_failure_death = { + invention_failure_death = { death = { death_reason = death_accident } @@ -13191,7 +13191,7 @@ character_event = { event_target:great_minds_guest_4 = { trigger_switch = { on_trigger = has_character_flag - invention_failure_death = { + invention_failure_death = { death = { death_reason = death_accident } @@ -13249,16 +13249,16 @@ character_event = { immediate = { log = "work event id = MNM.1480" if = { - limit = { - NOR = { - has_character_flag = hermetics_minor_scandal - has_character_flag = hermetics_major_scandal + limit = { + NOR = { + has_character_flag = hermetics_minor_scandal + has_character_flag = hermetics_major_scandal } } - set_character_flag = hermetics_minor_scandal - break = yes + set_character_flag = hermetics_minor_scandal + break = yes } if = { limit = { @@ -14851,7 +14851,7 @@ character_event = { intrigue = 15 } tooltip_info = intrigue - custom_tooltip = { + custom_tooltip = { text = EVTOPTC_MNM_1630_TT } hidden_effect = { diff --git a/common/achievements.txt b/common/achievements.txt index e91680a9..28521553 100644 --- a/common/achievements.txt +++ b/common/achievements.txt @@ -1,8 +1,8 @@ # ######################## -# # +# # # # Crusader Kings II # # Steam Achievements -# # +# # # ######################## # # "The Marriage Game" - Marry another character. diff --git a/common/buildings/wh_lahmia.txt b/common/buildings/wh_lahmia.txt index 3dc91bed..bf38ac43 100644 --- a/common/buildings/wh_lahmia.txt +++ b/common/buildings/wh_lahmia.txt @@ -65,7 +65,7 @@ castle = { heavy_infantry_defensive = 0.1 heavy_infantry_offensive = 0.1 levy_reinforce_rate = 0.1 - levy_size = 0.1 + levy_size = 0.1 liege_prestige = 0.01 ai_creation_factor = 305 extra_tech_building_start = 1.0 @@ -236,7 +236,7 @@ city = { tax_income = 2.5 fort_level = 0.4 garrison_size = 0.05 - levy_size = 0.1 + levy_size = 0.1 levy_reinforce_rate = 0.05 light_infantry = 50 archers = 35 @@ -272,7 +272,7 @@ temple = { heavy_infantry = 15 heavy_infantry_defensive = 0.1 heavy_infantry_offensive = 0.1 - levy_size = 0.1 + levy_size = 0.1 ai_creation_factor = 93 extra_tech_building_start = 1.5 } diff --git a/common/buildings/wh_norscan.txt b/common/buildings/wh_norscan.txt index f156eaa3..f7ffa2b4 100644 --- a/common/buildings/wh_norscan.txt +++ b/common/buildings/wh_norscan.txt @@ -619,7 +619,7 @@ castle = { gold_cost = 400 build_time = 1065 tax_income = 3 - levy_size = 0.2 + levy_size = 0.2 garrison_size = 0.1 retinuesize = 20 light_infantry = 70 diff --git a/common/cb_types/wh_cb_types.txt b/common/cb_types/wh_cb_types.txt index 60980b1d..8ed175f6 100644 --- a/common/cb_types/wh_cb_types.txt +++ b/common/cb_types/wh_cb_types.txt @@ -1110,25 +1110,25 @@ nehekharan_county_conquest = { on_success_title = { usurp_title_plus_barony_if_unlanded = ROOT any_de_jure_vassal_title = { - limit = { - has_holder = yes - holder_scope = { + limit = { + has_holder = yes + holder_scope = { OR = { - character = FROM - is_liege_or_above = FROM - AND = { - is_liege_or_above = ROOT - NOT = { + character = FROM + is_liege_or_above = FROM + AND = { + is_liege_or_above = ROOT + NOT = { culture = ROOT } - NOT = { + NOT = { religion = ROOT } } } } } - usurp_title = ROOT + usurp_title = ROOT } any_attacker = { limit = { @@ -1774,7 +1774,7 @@ punish_graverobbers = { } hidden_tooltip = { ROOT = { - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_graverobbed_me } @@ -1933,25 +1933,25 @@ nehekharan_county_colonisation = { on_success_title = { usurp_title_plus_barony_if_unlanded = ROOT any_de_jure_vassal_title = { - limit = { - has_holder = yes - holder_scope = { + limit = { + has_holder = yes + holder_scope = { OR = { - character = FROM - is_liege_or_above = FROM - AND = { - is_liege_or_above = ROOT - NOT = { + character = FROM + is_liege_or_above = FROM + AND = { + is_liege_or_above = ROOT + NOT = { culture = ROOT } - NOT = { + NOT = { religion = ROOT } } } } } - usurp_title = ROOT + usurp_title = ROOT } any_attacker = { limit = { @@ -8345,7 +8345,7 @@ chaos_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -8552,7 +8552,7 @@ chaos_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -8734,7 +8734,7 @@ chaos_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -8912,7 +8912,7 @@ daemonic_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -9129,7 +9129,7 @@ daemonic_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -9317,7 +9317,7 @@ daemonic_subjugation = { } hidden_tooltip = { any_courtier = { - piety = 100 + piety = 100 if = { limit = { religion = tzeentch @@ -11361,143 +11361,143 @@ imperial_reconquest = { # Imperial Reconquest for Emperors - THIS IS FOR THE CIVIL WAR ERA, IT WILL BE INVALIDATED ONCE THE TITULAR TITLES DISAPPEAR AS THE EMPIRE IS REFORMED imperial_reconquest2 = { - name = CB_NAME_IMPERIAL - war_name = WAR_NAME_IMPERIAL - sprite = 17 - truce_days = 1825 - is_permanent = yes - check_de_jure_tier = DUKE # this scans all dejure duchies for the counties which are held by or vassals(or below) of selected character. Only valid if is_permanent = yes + name = CB_NAME_IMPERIAL + war_name = WAR_NAME_IMPERIAL + sprite = 17 + truce_days = 1825 + is_permanent = yes + check_de_jure_tier = DUKE # this scans all dejure duchies for the counties which are held by or vassals(or below) of selected character. Only valid if is_permanent = yes - can_use = { - ROOT = { + can_use = { + ROOT = { wh_cb_this_or_from_is_necrarch_trigger = no - OR = { - has_landed_title = e_westerland - has_landed_title = e_reikland - has_landed_title = e_middenland - has_landed_title = e_talabecland - AND = { - has_landed_title = e_sylvania - NOT = { + OR = { + has_landed_title = e_westerland + has_landed_title = e_reikland + has_landed_title = e_middenland + has_landed_title = e_talabecland + AND = { + has_landed_title = e_sylvania + NOT = { has_artifact = carstein_ring } - } - } + } + } independent = yes NOT = { same_realm = FROM } - } - } + } + } - can_use_title = { + can_use_title = { region = world_old_world_empire - } + } - is_valid = { - ROOT = { - independent = yes - NOT = { + is_valid = { + ROOT = { + independent = yes + NOT = { same_realm = FROM } - } - } + } + } - on_success = { - any_attacker = { - limit = { + on_success = { + any_attacker = { + limit = { character = ROOT } - participation_scaled_prestige = 100 - } - any_attacker = { - limit = { + participation_scaled_prestige = 100 + } + any_attacker = { + limit = { NOT = { character = ROOT } } - hidden_tooltip = { - participation_scaled_prestige = 100 - } - } - FROM = { + hidden_tooltip = { + participation_scaled_prestige = 100 + } + } + FROM = { prestige = -100 } - } + } - on_success_title = { - custom_tooltip = { - text = tribal_invasion_succ_tip - hidden_tooltip = { - ROOT = { - vassalize_or_take_under_title = { - title = PREV - enemy = FROM - } - } - } - } - if = { - limit = { - holder_scope = { + on_success_title = { + custom_tooltip = { + text = tribal_invasion_succ_tip + hidden_tooltip = { + ROOT = { + vassalize_or_take_under_title = { + title = PREV + enemy = FROM + } + } + } + } + if = { + limit = { + holder_scope = { character = FROM } - } - usurp_title_only = ROOT - } - } + } + usurp_title_only = ROOT + } + } - on_fail = { - ROOT = { + on_fail = { + ROOT = { prestige = -150 } - } + } - on_reverse_demand = { - ROOT = { - transfer_scaled_wealth = { - to = FROM - value = 4.0 - } - ROOT = { + on_reverse_demand = { + ROOT = { + transfer_scaled_wealth = { + to = FROM + value = 4.0 + } + ROOT = { prestige = -200 } - } - any_defender = { - limit = { + } + any_defender = { + limit = { character = FROM } - participation_scaled_piety = 100 - participation_scaled_prestige = 200 - } - any_defender = { - limit = { + participation_scaled_piety = 100 + participation_scaled_prestige = 200 + } + any_defender = { + limit = { NOT = { character = FROM } } - hidden_tooltip = { - participation_scaled_piety = 100 - participation_scaled_prestige = 200 - } - } - } + hidden_tooltip = { + participation_scaled_piety = 100 + participation_scaled_prestige = 200 + } + } + } - attacker_ai_victory_worth = { - factor = -1 # always accept - } + attacker_ai_victory_worth = { + factor = -1 # always accept + } - attacker_ai_defeat_worth = { - factor = 100 - } + attacker_ai_defeat_worth = { + factor = 100 + } - defender_ai_victory_worth = { - factor = -1 # always accept - } + defender_ai_victory_worth = { + factor = -1 # always accept + } - defender_ai_defeat_worth = { - factor = 100 - } + defender_ai_defeat_worth = { + factor = 100 + } } witch_hunter_forceinvestigation_cb = { diff --git a/common/council_positions/00_loyalist.txt b/common/council_positions/00_loyalist.txt index da252457..0409b53e 100644 --- a/common/council_positions/00_loyalist.txt +++ b/common/council_positions/00_loyalist.txt @@ -97,12 +97,12 @@ loyalist = { opinion = { who = LIEGE value = 95 } } additive_modifier = { - value = 25 - is_nomadic = yes - liege = { + value = 25 + is_nomadic = yes + liege = { has_character_modifier = greatest_of_khans - } - } + } + } } voting_patterns = { diff --git a/common/council_positions/01_pragmatist.txt b/common/council_positions/01_pragmatist.txt index f65b5aa9..c593881c 100644 --- a/common/council_positions/01_pragmatist.txt +++ b/common/council_positions/01_pragmatist.txt @@ -93,12 +93,12 @@ pragmatist = { trait = zealous } additive_modifier = { - value = -50 - is_nomadic = yes - liege = { + value = -50 + is_nomadic = yes + liege = { has_character_modifier = greatest_of_khans - } - } + } + } additive_modifier = { value = -10 trait = interventionist_elf diff --git a/common/council_positions/03_zealot.txt b/common/council_positions/03_zealot.txt index 33c7f534..77ecfc6c 100644 --- a/common/council_positions/03_zealot.txt +++ b/common/council_positions/03_zealot.txt @@ -136,12 +136,12 @@ zealot = { trait = cynical } additive_modifier = { - value = -50 - is_nomadic = yes - liege = { + value = -50 + is_nomadic = yes + liege = { has_character_modifier = greatest_of_khans - } - } + } + } } war_target = { diff --git a/common/council_positions/04_malcontent.txt b/common/council_positions/04_malcontent.txt index beec901e..df30d5b7 100644 --- a/common/council_positions/04_malcontent.txt +++ b/common/council_positions/04_malcontent.txt @@ -95,12 +95,12 @@ malcontent = { liege = { is_rival = ROOT } } additive_modifier = { - value = -50 - is_nomadic = yes - liege = { + value = -50 + is_nomadic = yes + liege = { has_character_modifier = greatest_of_khans - } - } + } + } additive_modifier = { value = 10 diff --git a/common/disease/wh_disease.txt b/common/disease/wh_disease.txt index 7142e9ec..a153cdbb 100644 --- a/common/disease/wh_disease.txt +++ b/common/disease/wh_disease.txt @@ -49,7 +49,7 @@ nurgles_rot = { effect = { city_tax_modifier = -0.8 supply_limit = -4 - max_attrition = 0.05 + max_attrition = 0.05 } icon = 1 #TODO tooltip = NURGLES_ROT_INFO #TODO @@ -70,7 +70,7 @@ rattlelung = { effect = { city_tax_modifier = -0.5 supply_limit = -4 - max_attrition = 0.05 + max_attrition = 0.05 } icon = 1 #TODO tooltip = RATTLELUNG_ROT_INFO #TODO @@ -91,7 +91,7 @@ creeping_buboes = { effect = { city_tax_modifier = -0.8 supply_limit = -4 - max_attrition = 0.05 + max_attrition = 0.05 } icon = 1 #TODO tooltip = CREEPING_BUBOES_INFO #TODO diff --git a/common/event_modifiers/00_event_modifiers.txt b/common/event_modifiers/00_event_modifiers.txt index a836fa2f..9a005573 100644 --- a/common/event_modifiers/00_event_modifiers.txt +++ b/common/event_modifiers/00_event_modifiers.txt @@ -50,7 +50,7 @@ # 83 - Test-tubes - 84 # 85 - Science flask - 86 # 87 - Flower - 88 -# 89 - Rats - 90 +# 89 - Rats - 90 # 91 - Otter - 92 # 93 - Hedgehog - 94 diff --git a/common/event_modifiers/warhammer_modifiers.txt b/common/event_modifiers/warhammer_modifiers.txt index 48b66939..fdd9fac5 100644 --- a/common/event_modifiers/warhammer_modifiers.txt +++ b/common/event_modifiers/warhammer_modifiers.txt @@ -50,7 +50,7 @@ # 83 - Test-tubes - 84 # 85 - Science flask - 86 # 87 - Flower - 88 -# 89 - Rats - 90 +# 89 - Rats - 90 # 91 - Otter - 92 # 93 - Hedgehog - 94 diff --git a/common/execution_methods/00_execution_methods.txt b/common/execution_methods/00_execution_methods.txt index 4d0b4ee5..c2893c59 100644 --- a/common/execution_methods/00_execution_methods.txt +++ b/common/execution_methods/00_execution_methods.txt @@ -40,7 +40,7 @@ execution_method = { trait = wroth religion_group = chaos_gods_group religion_group = old_gods_group - religion_group = necromantic_group + religion_group = necromantic_group } } } @@ -61,7 +61,7 @@ execution_method = { # Only available to the following: religion_group = chaos_gods_group religion_group = old_gods_group - religion_group = necromantic_group + religion_group = necromantic_group } } } @@ -226,7 +226,7 @@ execution_method = { NOR = { religion_group = chaos_gods_group religion_group = old_gods_group - religion_group = necromantic_group + religion_group = necromantic_group } } } @@ -316,7 +316,7 @@ execution_method = { trait = wroth religion_group = chaos_gods_group religion_group = old_gods_group - religion_group = necromantic_group + religion_group = necromantic_group } is_nomadic = no } @@ -332,7 +332,7 @@ execution_method = { FROM = { AND = { capital_scope = { - region = world_old_world_empire + region = world_old_world_empire } trait = cruel is_nomadic = no @@ -424,7 +424,7 @@ execution_method = { NOR = { religion_group = chaos_gods_group religion_group = old_gods_group - religion_group = necromantic_group + religion_group = necromantic_group } } } diff --git a/common/governments/feudal_governments.txt b/common/governments/feudal_governments.txt index 4fc28b81..e1a0ff0e 100644 --- a/common/governments/feudal_governments.txt +++ b/common/governments/feudal_governments.txt @@ -511,7 +511,7 @@ feudal_governments = { barons_need_dynasty = yes can_imprison_without_reason = yes can_revoke_without_reason = yes - ##protected_inheritance = yes + ##protected_inheritance = yes can_grant_kingdoms_and_empires_to_other_government = yes free_revoke_on_tiers = { baron @@ -1218,7 +1218,7 @@ feudal_governments = { can_be_granted_kingdoms_and_empires_by_other_government = no can_grant_kingdoms_and_empires_to_other_government = no barons_need_dynasty = yes - ##protected_inheritance = yes + ##protected_inheritance = yes can_imprison_without_reason = no can_revoke_without_reason = no diff --git a/common/minor_titles/S_minor_titles.txt b/common/minor_titles/S_minor_titles.txt index 5bb104ee..723c3b93 100644 --- a/common/minor_titles/S_minor_titles.txt +++ b/common/minor_titles/S_minor_titles.txt @@ -102,15 +102,15 @@ title_knight_captain_heir = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order } } diff --git a/common/objectives/00_ambitions.txt b/common/objectives/00_ambitions.txt index a4f2c420..fb946e70 100644 --- a/common/objectives/00_ambitions.txt +++ b/common/objectives/00_ambitions.txt @@ -20,7 +20,7 @@ obj_become_chancellor = { has_dlc = "Zeus" trait = creature_chaosspawn } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -156,7 +156,7 @@ obj_become_marshal = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -274,7 +274,7 @@ obj_become_treasurer = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -400,7 +400,7 @@ obj_become_spymaster = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -529,7 +529,7 @@ obj_become_spiritual = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } OR = { @@ -696,7 +696,7 @@ obj_amass_wealth = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -771,7 +771,7 @@ obj_become_paragon_of_virtue = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -869,7 +869,7 @@ obj_become_exalted = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -969,10 +969,10 @@ obj_get_married = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } - NOT = { + NOT = { culture_group = skaven_group } OR = { @@ -1086,13 +1086,13 @@ obj_marry_ruler = { trait = creature_chaosspawn trait = creature_nehekharan } - NOT = { + NOT = { culture_group = skaven_group } NOT = { trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } OR = { @@ -1162,10 +1162,10 @@ obj_have_a_daughter = { has_dlc = "Zeus" trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } - NOT = { + NOT = { culture_group = skaven_group } NOT = { @@ -1243,10 +1243,10 @@ obj_have_a_son = { has_dlc = "Zeus" trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } - NOT = { + NOT = { culture_group = skaven_group } prisoner = no @@ -1344,7 +1344,7 @@ obj_wants_landed_title = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } nor = { @@ -1472,7 +1472,7 @@ obj_become_heir = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } liege = { @@ -1570,7 +1570,7 @@ obj_improve_martial = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -1640,7 +1640,7 @@ obj_improve_stewardship = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -1713,7 +1713,7 @@ obj_improve_learning = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -1782,7 +1782,7 @@ obj_improve_diplomacy = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -1851,7 +1851,7 @@ obj_improve_intrigue = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -1920,7 +1920,7 @@ obj_lower_decadence = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } diff --git a/common/objectives/00_factions.txt b/common/objectives/00_factions.txt index 6fb950fe..39d5cf62 100644 --- a/common/objectives/00_factions.txt +++ b/common/objectives/00_factions.txt @@ -46,7 +46,7 @@ faction_succ_seniority = { trait = incapable trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -56,7 +56,7 @@ faction_succ_seniority = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } is_vice_royalty = no @@ -820,7 +820,7 @@ faction_succ_primogeniture = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -854,7 +854,7 @@ faction_succ_primogeniture = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -1607,7 +1607,7 @@ faction_succ_gavelkind = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -1636,7 +1636,7 @@ faction_succ_gavelkind = { liege = { is_vice_royalty = no is_feudal = yes - NOT = { + NOT = { culture_group = daemonic_group } nor = { @@ -2463,7 +2463,7 @@ faction_succ_feudal_elective = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -3281,7 +3281,7 @@ faction_lower_crown_authority = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } nor = { @@ -3292,7 +3292,7 @@ faction_lower_crown_authority = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -3939,7 +3939,7 @@ faction_lower_tribal_organization = { trait = incapable trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -3970,7 +3970,7 @@ faction_lower_tribal_organization = { NOT = { trait = creature_nehekharan } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -5676,7 +5676,7 @@ faction_claimant = { NOT = { trait = incapable } - NOT = { + NOT = { culture_group = daemonic_group } NOT = { @@ -5684,7 +5684,7 @@ faction_claimant = { } #Lizardmen built for compliance to Lizardmen liege = { is_vice_royalty = no - NOT = { + NOT = { culture_group = daemonic_group } NOT = { diff --git a/common/objectives/00_focuses.txt b/common/objectives/00_focuses.txt index 516a9a1b..cc93912f 100644 --- a/common/objectives/00_focuses.txt +++ b/common/objectives/00_focuses.txt @@ -22,7 +22,7 @@ focus_rulership = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -96,7 +96,7 @@ focus_business = { trait = creature_beastman trait = creature_orc } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -172,28 +172,28 @@ focus_seduction = { trait = creature_orc trait = creature_goblin } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = tzeentch_demon } - NOT = { + NOT = { trait = witch_hunter } - NOT = { + NOT = { trait = druchi_witch_elf } - NOT = { + NOT = { trait = druchi_assassin } - NOT = { + NOT = { culture_group = lizardman_group } - NOT = { + NOT = { culture_group = skaven_group } custom_tooltip = { @@ -344,13 +344,13 @@ focus_intrigue = { trait = creature_beastman trait = creature_orc } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } } @@ -458,16 +458,16 @@ focus_hunting = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } prisoner = no @@ -532,13 +532,13 @@ focus_war = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } } @@ -636,19 +636,19 @@ focus_carousing = { trait = khemri_soldier trait = creature_beastman } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } - NOT = { + NOT = { trait = witch_hunter } custom_tooltip = { @@ -727,22 +727,22 @@ focus_family = { trait = creature_orc trait = creature_goblin } - NOT = { + NOT = { trait = witch_hunter } - NOT = { + NOT = { culture_group = lizardman_group } - NOT = { + NOT = { culture_group = skaven_group } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } prisoner = no @@ -850,16 +850,16 @@ focus_scholarship = { trait = creature_beastman trait = creature_orc } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } OR = { @@ -868,7 +868,7 @@ focus_scholarship = { NOT = { religion = ormazd } - NOT = { + NOT = { religion = kitabid } } @@ -960,16 +960,16 @@ focus_theology = { trait = creature_beastman trait = creature_orc } - NOT = { + NOT = { trait = khorne_demon } - NOT = { + NOT = { trait = nurgle_demon } - NOT = { + NOT = { trait = slaanesh_demon } - NOT = { + NOT = { trait = tzeentch_demon } OR = { @@ -978,7 +978,7 @@ focus_theology = { NOT = { religion = ormazd } - NOT = { + NOT = { religion = kitabid } } diff --git a/common/objectives/00_zeus_ambitions.txt b/common/objectives/00_zeus_ambitions.txt index 1ea8ba14..5ada0908 100644 --- a/common/objectives/00_zeus_ambitions.txt +++ b/common/objectives/00_zeus_ambitions.txt @@ -14,7 +14,7 @@ obj_become_council_member = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -425,7 +425,7 @@ obj_groom_an_heir = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } diff --git a/common/objectives/00_zeus_childhood_focuses.txt b/common/objectives/00_zeus_childhood_focuses.txt index a0e0c4ea..644209cd 100644 --- a/common/objectives/00_zeus_childhood_focuses.txt +++ b/common/objectives/00_zeus_childhood_focuses.txt @@ -15,7 +15,7 @@ focus_ch_pride = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -49,7 +49,7 @@ focus_ch_humility = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -83,7 +83,7 @@ focus_ch_duty = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -116,7 +116,7 @@ focus_ch_etiquette = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -150,7 +150,7 @@ focus_ch_thrift = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -184,7 +184,7 @@ focus_ch_faith = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -217,7 +217,7 @@ focus_ch_struggle = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -255,7 +255,7 @@ focus_ch_heritage = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } diff --git a/common/objectives/00_zeus_education_focuses.txt b/common/objectives/00_zeus_education_focuses.txt index c92aaa25..df7d07ae 100644 --- a/common/objectives/00_zeus_education_focuses.txt +++ b/common/objectives/00_zeus_education_focuses.txt @@ -16,7 +16,7 @@ focus_ed_diplomacy = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -57,7 +57,7 @@ focus_ed_martial = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -102,7 +102,7 @@ focus_ed_stewardship = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -143,7 +143,7 @@ focus_ed_intrigue = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } @@ -184,7 +184,7 @@ focus_ed_learning = { trait = creature_chaosspawn trait = khemri_soldier } - NOT = { + NOT = { culture_group = daemonic_group } } diff --git a/common/objectives/wh_ambitions.txt b/common/objectives/wh_ambitions.txt index 62aa7bc2..ced2eebd 100644 --- a/common/objectives/wh_ambitions.txt +++ b/common/objectives/wh_ambitions.txt @@ -130,12 +130,12 @@ obj_acquire_dark_crystal = { } } } - nor = { + nor = { culture_group = daemonic_group trait = khemri_soldier has_artifact = dark_crystal } - NAND = { + NAND = { has_global_flag = tlaxtlan_crystal_found has_global_flag = calxi_crystal_found has_global_flag = mutiris_crystal_found diff --git a/common/objectives/wh_plots.txt b/common/objectives/wh_plots.txt index 7cc13de5..28c1dcc5 100644 --- a/common/objectives/wh_plots.txt +++ b/common/objectives/wh_plots.txt @@ -737,7 +737,7 @@ plot_hunt_character = { abort_effect = { FROM = { clr_character_flag = huntdown_in_motion - any_courtier = { + any_courtier = { FROM = { remove_opinion = { who = PREV @@ -755,7 +755,7 @@ plot_hunt_character = { clr_character_flag = huntdown_in_motion remove_trait = monster_hunting #character_event = { id = huntdown.9999 days = 30 random = 70 } - any_courtier = { + any_courtier = { FROM = { remove_opinion = { who = PREV @@ -772,7 +772,7 @@ plot_hunt_character = { hidden_tooltip = { clr_character_flag = huntdown_in_motion remove_trait = monster_hunting - any_courtier = { + any_courtier = { FROM = { remove_opinion = { who = PREV diff --git a/common/scripted_effects/00_scripted_effects.txt b/common/scripted_effects/00_scripted_effects.txt index f9e15519..5436a44e 100644 --- a/common/scripted_effects/00_scripted_effects.txt +++ b/common/scripted_effects/00_scripted_effects.txt @@ -2673,80 +2673,80 @@ deaths_gift_removes_disease_effect = { remove_disease_trait_effect = { if = { - limit = { trait = ill } - remove_trait = ill + limit = { trait = ill } + remove_trait = ill } if = { - limit = { trait = has_tuberculosis } - remove_trait = has_tuberculosis + limit = { trait = has_tuberculosis } + remove_trait = has_tuberculosis } if = { - limit = { trait = has_typhoid_fever } - remove_trait = has_typhoid_fever + limit = { trait = has_typhoid_fever } + remove_trait = has_typhoid_fever } if = { - limit = { trait = has_typhus } - remove_trait = has_typhus + limit = { trait = has_typhus } + remove_trait = has_typhus } if = { - limit = { trait = has_bubonic_plague } - remove_trait = has_bubonic_plague + limit = { trait = has_bubonic_plague } + remove_trait = has_bubonic_plague } if = { - limit = { trait = has_measles } - remove_trait = has_measles + limit = { trait = has_measles } + remove_trait = has_measles } if = { - limit = { trait = has_small_pox } - remove_trait = has_small_pox + limit = { trait = has_small_pox } + remove_trait = has_small_pox } if = { - limit = { trait = has_aztec_disease } - remove_trait = has_aztec_disease + limit = { trait = has_aztec_disease } + remove_trait = has_aztec_disease } if = { - limit = { trait = syphilitic } - remove_trait = syphilitic + limit = { trait = syphilitic } + remove_trait = syphilitic } if = { - limit = { trait = flu } - remove_trait = flu + limit = { trait = flu } + remove_trait = flu } if = { - limit = { trait = dysentery } - remove_trait = dysentery + limit = { trait = dysentery } + remove_trait = dysentery } if = { - limit = { trait = gout } - remove_trait = gout + limit = { trait = gout } + remove_trait = gout } if = { - limit = { trait = food_poisoning } - remove_trait = food_poisoning + limit = { trait = food_poisoning } + remove_trait = food_poisoning } if = { - limit = { trait = rabies } - remove_trait = rabies + limit = { trait = rabies } + remove_trait = rabies } if = { - limit = { trait = cancer } - remove_trait = cancer + limit = { trait = cancer } + remove_trait = cancer } if = { - limit = { trait = pneumonic } - remove_trait = pneumonic + limit = { trait = pneumonic } + remove_trait = pneumonic } if = { - limit = { trait = scurvy } - remove_trait = scurvy + limit = { trait = scurvy } + remove_trait = scurvy } if = { - limit = { trait = dancing_plague } - remove_trait = dancing_plague + limit = { trait = dancing_plague } + remove_trait = dancing_plague } if = { - limit = { trait = leper } - remove_trait = leper + limit = { trait = leper } + remove_trait = leper } clear_disease_level_effect = yes } @@ -3506,14 +3506,14 @@ impregnate_effect_event_target = { if = { limit = { OR = { - AND = { - is_married = yes - NOT = { spouse = { character = event_target:sex_partner } } - } - AND = { - is_consort = yes - NOT = { consort = { character = event_target:sex_partner } } - } + AND = { + is_married = yes + NOT = { spouse = { character = event_target:sex_partner } } + } + AND = { + is_consort = yes + NOT = { consort = { character = event_target:sex_partner } } + } } } event_target:sex_partner = { impregnate_cuckoo = PREV } @@ -3560,14 +3560,14 @@ impregnate_effect_event_target = { limit = { event_target:sex_partner = { OR = { - AND = { - is_married = yes - NOT = { spouse = { character = PREVPREV } } - } - AND = { - is_consort = yes - NOT = { consort = { character = PREVPREV } } - } + AND = { + is_married = yes + NOT = { spouse = { character = PREVPREV } } + } + AND = { + is_consort = yes + NOT = { consort = { character = PREVPREV } } + } } } } @@ -3715,14 +3715,14 @@ impregnate_effect = { if = { limit = { OR = { - AND = { - is_married = yes - NOT = { spouse = { character = FROM } } - } - AND = { - is_consort = yes - NOT = { consort = { character = FROM } } - } + AND = { + is_married = yes + NOT = { spouse = { character = FROM } } + } + AND = { + is_consort = yes + NOT = { consort = { character = FROM } } + } } } FROM = { impregnate_cuckoo = ROOT } @@ -3769,14 +3769,14 @@ impregnate_effect = { limit = { FROM = { OR = { - AND = { - is_married = yes - NOT = { spouse = { character = ROOT } } - } - AND = { - is_consort = yes - NOT = { consort = { character = ROOT } } - } + AND = { + is_married = yes + NOT = { spouse = { character = ROOT } } + } + AND = { + is_consort = yes + NOT = { consort = { character = ROOT } } + } } } } diff --git a/common/scripted_effects/wh_scripted_effects.txt b/common/scripted_effects/wh_scripted_effects.txt index 1871d567..bda2b9f9 100644 --- a/common/scripted_effects/wh_scripted_effects.txt +++ b/common/scripted_effects/wh_scripted_effects.txt @@ -3226,16 +3226,16 @@ dispel_setup_effect = { war_with = root at_location = event_target:spellloc or = { - and = { - or = { - wh_is_mage_trigger = yes - trait = warlock_engineer + and = { + or = { + wh_is_mage_trigger = yes + trait = warlock_engineer } - not = { - has_character_modifier = dispel_cooldown + not = { + has_character_modifier = dispel_cooldown } } - has_character_modifier = z_light_magic_wards_of_light + has_character_modifier = z_light_magic_wards_of_light } } } @@ -3245,16 +3245,16 @@ dispel_setup_effect = { war_with = root at_location = event_target:spellloc or = { - and = { - or = { - wh_is_mage_trigger = yes - trait = warlock_engineer + and = { + or = { + wh_is_mage_trigger = yes + trait = warlock_engineer } - not = { - has_character_modifier = dispel_cooldown + not = { + has_character_modifier = dispel_cooldown } } - has_character_modifier = z_light_magic_wards_of_light + has_character_modifier = z_light_magic_wards_of_light } } save_event_target_as = magic_dispeler @@ -3558,8 +3558,8 @@ dispel_saving_roll_30 = { } 70 = { modifier = { - factor = 1.1 - event_target:magic_caster = { + factor = 1.1 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 1 @@ -3568,8 +3568,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.2 - event_target:magic_caster = { + factor = 1.2 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 2 @@ -3578,8 +3578,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.3 - event_target:magic_caster = { + factor = 1.3 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 3 @@ -3588,8 +3588,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.4 - event_target:magic_caster = { + factor = 1.4 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 4 @@ -3598,8 +3598,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.5 - event_target:magic_caster = { + factor = 1.5 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 5 @@ -3608,8 +3608,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.6 - event_target:magic_caster = { + factor = 1.6 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 6 @@ -3618,8 +3618,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.7 - event_target:magic_caster = { + factor = 1.7 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 7 @@ -3628,8 +3628,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.8 - event_target:magic_caster = { + factor = 1.8 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 8 @@ -3638,8 +3638,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 1.9 - event_target:magic_caster = { + factor = 1.9 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 9 @@ -3648,8 +3648,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2 - event_target:magic_caster = { + factor = 2 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 10 @@ -3658,8 +3658,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.1 - event_target:magic_caster = { + factor = 2.1 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 11 @@ -3668,8 +3668,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.2 - event_target:magic_caster = { + factor = 2.2 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 12 @@ -3678,8 +3678,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.3 - event_target:magic_caster = { + factor = 2.3 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 13 @@ -3688,8 +3688,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.4 - event_target:magic_caster = { + factor = 2.4 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 14 @@ -3698,8 +3698,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.5 - event_target:magic_caster = { + factor = 2.5 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 15 @@ -3708,8 +3708,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.6 - event_target:magic_caster = { + factor = 2.6 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 16 @@ -3718,8 +3718,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.7 - event_target:magic_caster = { + factor = 2.7 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 17 @@ -3728,8 +3728,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.8 - event_target:magic_caster = { + factor = 2.8 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 18 @@ -3738,8 +3738,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 2.9 - event_target:magic_caster = { + factor = 2.9 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 19 @@ -3748,8 +3748,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 3 - event_target:magic_caster = { + factor = 3 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 20 @@ -3758,8 +3758,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 3.1 - event_target:magic_caster = { + factor = 3.1 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 21 @@ -3768,8 +3768,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 3.2 - event_target:magic_caster = { + factor = 3.2 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 22 @@ -3778,8 +3778,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 3.3 - event_target:magic_caster = { + factor = 3.3 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 23 @@ -3788,8 +3788,8 @@ dispel_saving_roll_30 = { } modifier = { - factor = 3.4 - event_target:magic_caster = { + factor = 3.4 + event_target:magic_caster = { check_variable = { which = "caster_level_dispel" value = 24 @@ -32208,8 +32208,8 @@ magic_points_setup = { } if = { limit = { - not = { - check_variable = { + not = { + check_variable = { which = "magical_mod" value = 0 } diff --git a/common/scripted_triggers/wh_scripted_triggers.txt b/common/scripted_triggers/wh_scripted_triggers.txt index 126d2c3b..f85dc29c 100644 --- a/common/scripted_triggers/wh_scripted_triggers.txt +++ b/common/scripted_triggers/wh_scripted_triggers.txt @@ -96,8 +96,8 @@ wh_num_of_consorts_trigger = { num_of_consorts = 3 } AND = { - religion = slaanesh - NOT = { + religion = slaanesh + NOT = { num_of_consorts = 6 } } diff --git a/common/societies/00_societies.txt b/common/societies/00_societies.txt index c323a1f1..f3136786 100644 --- a/common/societies/00_societies.txt +++ b/common/societies/00_societies.txt @@ -252,7 +252,7 @@ cult_of_shallya = { primary_title = { title = k_cult_of_shallya } } - religion_group = old_world_group + religion_group = old_world_group NOR = { religion = old_faith religion = ursun @@ -1576,7 +1576,7 @@ cult_of_pleasure = { # trigger = { # ai = yes # controls_religion = no - # trait = creature_dwarf + # trait = creature_dwarf # religion_group = dwarf_gods_group # age = 16 # is_in_society = no diff --git a/common/traits/wh_creature.txt b/common/traits/wh_creature.txt index 05193656..ae70019a 100644 --- a/common/traits/wh_creature.txt +++ b/common/traits/wh_creature.txt @@ -442,7 +442,7 @@ creature_chaosspawn = { creature_dwarf creature_orc creature_elf - creature_goblin + creature_goblin creature_snotling creature_nehekharan creature_skink @@ -480,7 +480,7 @@ creature_monster = { creature_amazon creature_elf creature_orc - creature_goblin + creature_goblin creature_snotling creature_nehekharan creature_dwarf diff --git a/decisions/councillor_decision.txt b/decisions/councillor_decision.txt index 318d10f0..9815162e 100644 --- a/decisions/councillor_decision.txt +++ b/decisions/councillor_decision.txt @@ -8,7 +8,7 @@ decisions = { help_liege_manage_titles = { - is_high_prio = yes + is_high_prio = yes potential = { ai = no is_councillor = yes @@ -109,7 +109,7 @@ decisions = { ask_help_to_manage_titles = { only_rulers = yes - is_high_prio = yes + is_high_prio = yes potential = { is_ruler = yes is_nomadic = no diff --git a/decisions/wh_asur_decisions.txt b/decisions/wh_asur_decisions.txt index d954f6c3..da221c60 100644 --- a/decisions/wh_asur_decisions.txt +++ b/decisions/wh_asur_decisions.txt @@ -658,7 +658,7 @@ decisions = { only_playable = yes only_independent = yes is_high_prio = yes - potential = { + potential = { trait = phoenix_king religion_group = cadai_group nor = { @@ -873,7 +873,7 @@ decisions = { matrimonial_inheritance_decision = { only_playable = yes is_high_prio = yes - potential = { + potential = { # Sadly the limitations on the code cause always gameover on succession for the player ai = yes is_married = yes diff --git a/decisions/wh_lahmian_decisions.txt b/decisions/wh_lahmian_decisions.txt index 904a7578..8a584916 100644 --- a/decisions/wh_lahmian_decisions.txt +++ b/decisions/wh_lahmian_decisions.txt @@ -305,7 +305,7 @@ decisions = { prestige = 1000 hidden_tooltip = { set_global_flag = wh_rebuild_palace_and_blood_temple - 1127 = { + 1127 = { add_province_modifier = { name = great_city_lahmia days = -1 diff --git a/decisions/wh_magic_decisions.txt b/decisions/wh_magic_decisions.txt index cc6d73e7..29edc390 100644 --- a/decisions/wh_magic_decisions.txt +++ b/decisions/wh_magic_decisions.txt @@ -1184,7 +1184,7 @@ targetted_decisions = { } } trait = vampire_necrarch_visible - wh_is_mage_trigger = yes + wh_is_mage_trigger = yes is_within_diplo_range = FROM } } diff --git a/decisions/wh_skaven_decisions.txt b/decisions/wh_skaven_decisions.txt index e5ed8386..0ad3f3b7 100644 --- a/decisions/wh_skaven_decisions.txt +++ b/decisions/wh_skaven_decisions.txt @@ -386,7 +386,7 @@ targetted_decisions = { from_potential = { age = 14 is_female = no - trait = creature_skaven + trait = creature_skaven } potential = { prisoner = yes diff --git a/decisions/wh_vampire_decisions.txt b/decisions/wh_vampire_decisions.txt index d0bcb243..4b5ae636 100644 --- a/decisions/wh_vampire_decisions.txt +++ b/decisions/wh_vampire_decisions.txt @@ -1061,7 +1061,7 @@ decisions = { duration = 720 } #gives timer hidden_tooltip = { - set_character_flag = preparing_strygos_invasion #Prevents AI from starting the war immediately + set_character_flag = preparing_strygos_invasion #Prevents AI from starting the war immediately if = { limit = { ai = yes @@ -3046,8 +3046,8 @@ targetted_decisions = { jade_hipnotize = { filter = court ai_target_filter = court - from_potential = { - trait = vampire_jade_visible + from_potential = { + trait = vampire_jade_visible nor = { has_character_modifier = magic_cooldown trait = blinded @@ -3055,7 +3055,7 @@ targetted_decisions = { has_character_modifier = jade_degradation_4 } } - potential = { + potential = { is_undead_trigger = no is_demon_trigger = no nor = { @@ -3229,11 +3229,11 @@ targetted_decisions = { jade_hipnotize_stop = { ai_target_filter = court - from_potential = { - trait = vampire_jade_visible + from_potential = { + trait = vampire_jade_visible is_incapacitated_trigger = no } - potential = { + potential = { any_friend = { character = FROM } diff --git a/decisions/wh_witch_hunter_decisions.txt b/decisions/wh_witch_hunter_decisions.txt index f4a46871..e998f13e 100644 --- a/decisions/wh_witch_hunter_decisions.txt +++ b/decisions/wh_witch_hunter_decisions.txt @@ -15,15 +15,15 @@ targetted_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order } } @@ -35,15 +35,15 @@ targetted_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order } nor = { @@ -546,15 +546,15 @@ targetted_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order AND = { is_landed = yes @@ -966,15 +966,15 @@ targetted_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order AND = { is_landed = yes @@ -1169,15 +1169,15 @@ targetted_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order AND = { is_landed = yes @@ -2814,15 +2814,15 @@ settlement_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order AND = { is_landed = yes @@ -2894,15 +2894,15 @@ settlement_decisions = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 has_landed_title = k_witch_hunters_order AND = { is_landed = yes diff --git a/events/hedge_knights_events.txt b/events/hedge_knights_events.txt index 327f346a..4e7bef6a 100644 --- a/events/hedge_knights_events.txt +++ b/events/hedge_knights_events.txt @@ -343,16 +343,16 @@ character_event = { picture = GFX_evt_joust trigger = { - any_courtier = { - age = 16 - is_female = no - OR = { - trait = cruel - trait = proud - trait = wroth - trait = zealous - trait = envious - prestige = 100 + any_courtier = { + age = 16 + is_female = no + OR = { + trait = cruel + trait = proud + trait = wroth + trait = zealous + trait = envious + prestige = 100 } @@ -389,17 +389,17 @@ character_event = { option = { name = EVTOPTB71003 # Ignore the complaints - random_courtier = { - limit = { - age = 16 - is_female = no - OR = { - trait = cruel - trait = proud - trait = wroth - trait = zealous - trait = envious - prestige = 100 + random_courtier = { + limit = { + age = 16 + is_female = no + OR = { + trait = cruel + trait = proud + trait = wroth + trait = zealous + trait = envious + prestige = 100 } @@ -432,14 +432,14 @@ character_event = { has_character_flag = hedge_knight_woman_seduced } any_courtier = { - age = 16 - not = { + age = 16 + not = { age = 20 } - is_female = yes - is_married = no + is_female = yes + is_married = no has_lover = no - is_pregnant = no + is_pregnant = no fertility = 0.3 } @@ -461,18 +461,18 @@ character_event = { option = { name = EVTOPTA71004 # stay random_courtier = { - limit = { - age = 16 - not = { + limit = { + age = 16 + not = { age = 20 } - is_female = yes - is_married = no - is_pregnant = no + is_female = yes + is_married = no + is_pregnant = no has_lover = no } - add_trait = lustful - create_character = { + add_trait = lustful + create_character = { random_traits = yes dynasty = random fertility = 0.6 @@ -480,12 +480,12 @@ character_event = { age = 24 } new_character = { - impregnate = PREV - add_lover = PREV + impregnate = PREV + add_lover = PREV add_trait = lustful } } - piety = -10 + piety = -10 } option = { @@ -501,17 +501,17 @@ character_event = { } } random_courtier = { - limit = { - age = 16 - not = { + limit = { + age = 16 + not = { age = 20 } - is_female = yes - is_married = no - is_pregnant = no + is_female = yes + is_married = no + is_pregnant = no } - add_trait = lustful + add_trait = lustful create_character = { random_traits = yes dynasty = random @@ -521,8 +521,8 @@ character_event = { } new_character = { - impregnate = PREV - add_lover = PREV + impregnate = PREV + add_lover = PREV add_trait = lustful imprison = root @@ -543,7 +543,7 @@ character_event = { has_character_flag = hedge_knights_visiting trigger = { - always = yes + always = yes } immediate = { diff --git a/events/hl_horse_events_2.txt b/events/hl_horse_events_2.txt index 7b4fcb2c..fac52c37 100644 --- a/events/hl_horse_events_2.txt +++ b/events/hl_horse_events_2.txt @@ -76,7 +76,7 @@ character_event = { NOT = { trait = incapable } - ai = yes + ai = yes } any_courtier = { is_adult = yes @@ -102,7 +102,7 @@ character_event = { NOT = { trait = incapable } - ai = yes + ai = yes } } random_vassal = { @@ -112,7 +112,7 @@ character_event = { NOT = { trait = incapable } - ai = yes + ai = yes } character_event = { id = HL.6511 diff --git a/events/mnm_artifacts_events.txt b/events/mnm_artifacts_events.txt index c6668ab0..53897dc1 100644 --- a/events/mnm_artifacts_events.txt +++ b/events/mnm_artifacts_events.txt @@ -8218,7 +8218,7 @@ character_event = { } } } - ai_chance = { + ai_chance = { factor = 15 } } @@ -9325,7 +9325,7 @@ character_event = { option = { name = EVTOPTA_MNM_9120 - if = { + if = { limit = { FROM = { has_character_flag = weapon_sword @@ -9351,7 +9351,7 @@ character_event = { has_character_flag = weapon_lance } } - custom_tooltip = { + custom_tooltip = { text = EVTOPTA_MNM_9120_TT_LANCE } } @@ -9454,7 +9454,7 @@ character_event = { has_character_flag = weapon_lance } } - custom_tooltip = { + custom_tooltip = { text = EVTOPTB_MNM_9120_TT_LANCE } } @@ -9604,7 +9604,7 @@ character_event = { custom_tooltip = { text = EVTOPTD_MNM_9120_TT } - ai_chance = { + ai_chance = { factor = 15 modifier = { NOR = { diff --git a/events/mnm_assassins_events.txt b/events/mnm_assassins_events.txt index e12fb9b7..758b97eb 100644 --- a/events/mnm_assassins_events.txt +++ b/events/mnm_assassins_events.txt @@ -5624,31 +5624,31 @@ province_event = { # location = { is_quest_target = yes } # OR = { -# location = { +# location = { -# any_quester_targeting_this = { -# character = FROMFROM +# any_quester_targeting_this = { +# character = FROMFROM -# NOT = { is_vassal_or_below = ROOT } -# has_quest = quest_the_assassins_convert_province +# NOT = { is_vassal_or_below = ROOT } +# has_quest = quest_the_assassins_convert_province -# } -# } +# } +# } -# location = { -# any_quester_targeting_this = { +# location = { +# any_quester_targeting_this = { -# is_vassal_or_below = FROMFROM -# NOR = { +# is_vassal_or_below = FROMFROM +# NOR = { -# character = ROOT -# is_vassal_or_below = ROOT +# character = ROOT +# is_vassal_or_below = ROOT -# } -# has_quest = quest_the_assassins_convert_province +# } +# has_quest = quest_the_assassins_convert_province -# } -# } +# } +# } # } # } @@ -5660,34 +5660,34 @@ province_event = { # location = { # any_quester_targeting_this = { -# limit = { +# limit = { -# OR = { -# AND = { +# OR = { +# AND = { -# character = FROMFROM -# NOT = { is_vassal_or_below = ROOT } +# character = FROMFROM +# NOT = { is_vassal_or_below = ROOT } -# has_quest = quest_the_assassins_convert_province -# } +# has_quest = quest_the_assassins_convert_province +# } -# AND = { -# is_vassal_or_below = FROMFROM +# AND = { +# is_vassal_or_below = FROMFROM -# NOR = { -# character = ROOT +# NOR = { +# character = ROOT -# is_vassal_or_below = ROOT -# } +# is_vassal_or_below = ROOT +# } -# } -# } +# } +# } -# has_quest = quest_the_assassins_convert_province -# } +# has_quest = quest_the_assassins_convert_province +# } # wealth = 5000 -# } +# } # } # } @@ -6081,28 +6081,28 @@ character_event = { border = GFX_event_normal_frame_intrigue hide_from = yes desc = { - trigger = { - OR = { - trait = paranoid - trait = schemer - intrigue = 15 + trigger = { + OR = { + trait = paranoid + trait = schemer + intrigue = 15 } } - text = EVTDESC_MNM_6209_A + text = EVTDESC_MNM_6209_A } desc = { - trigger = { - NOR = { - trait = paranoid - trait = schemer - intrigue = 15 + trigger = { + NOR = { + trait = paranoid + trait = schemer + intrigue = 15 } } - text = EVTDESC_MNM_6209_B + text = EVTDESC_MNM_6209_B } is_triggered_only = yes @@ -6116,8 +6116,8 @@ character_event = { limit = { OR = { trait = paranoid - trait = schemer - intrigue = 15 + trait = schemer + intrigue = 15 } } custom_tooltip = { @@ -6128,8 +6128,8 @@ character_event = { limit = { NOR = { trait = paranoid - trait = schemer - intrigue = 15 + trait = schemer + intrigue = 15 } } custom_tooltip = { @@ -7253,8 +7253,8 @@ character_event = { AND = { trait = paranoid any_realm_character = { - same_sex = root - NOT = { + same_sex = root + NOT = { character = ROOT } } @@ -8630,14 +8630,14 @@ character_event = { } } random_realm_character = { - limit = { - same_sex = root - NOT = { + limit = { + same_sex = root + NOT = { character = ROOT } } - save_event_target_as = drug_cheater_lover + save_event_target_as = drug_cheater_lover } save_event_target_as = drug_cheater_spouse @@ -10557,16 +10557,16 @@ character_event = { } set_character_flag = won_outstrong random_list = { - 75 = { + 75 = { set_character_flag = modifier_outstrong } - 25 = { - modifier = { + 25 = { + modifier = { OR = { is_strong_trigger = yes is_weak_trigger = yes } factor = 0 } - set_character_flag = trait_robust + set_character_flag = trait_robust } } @@ -11001,12 +11001,12 @@ character_event = { add_rival = FROM FROM = { if = { - limit = { + limit = { NOT = { trait = wounded } } - add_trait = wounded + add_trait = wounded } } } @@ -11466,9 +11466,9 @@ character_event = { is_friend = FROM } reverse_opinion = { - who = FROM - modifier = opinion_grateful - years = 10 + who = FROM + modifier = opinion_grateful + years = 10 } } if = { @@ -11766,62 +11766,62 @@ character_event = { immediate = { log = "work event id = MNM.6922 for [Root.GetBestName]" hidden_effect = { - FROM = { - random_lover = { + FROM = { + random_lover = { save_event_target_as = lover_of_target } - if = { - limit = { - has_character_flag = blackmail_lover - NOT = { + if = { + limit = { + has_character_flag = blackmail_lover + NOT = { any_lover = { is_alive = yes } } } - host = { - if = { - limit = { + host = { + if = { + limit = { prefers_men_trigger = yes } - create_random_diplomat = { - female = no - random_traits = yes - dynasty = none - age = 30 + create_random_diplomat = { + female = no + random_traits = yes + dynasty = none + age = 30 } - new_character = { - add_lover = event_target:assassin_blackmail_target - save_event_target_as = lover_of_target + new_character = { + add_lover = event_target:assassin_blackmail_target + save_event_target_as = lover_of_target } } - if = { - limit = { + if = { + limit = { prefers_men_trigger = no } - create_random_diplomat = { - female = yes - random_traits = yes - dynasty = none - age = 30 + create_random_diplomat = { + female = yes + random_traits = yes + dynasty = none + age = 30 } - new_character = { - add_lover = event_target:assassin_blackmail_target - save_event_target_as = lover_of_target + new_character = { + add_lover = event_target:assassin_blackmail_target + save_event_target_as = lover_of_target } } - if = { - limit = { + if = { + limit = { trait = homosexual } - event_target:lover_of_target = { + event_target:lover_of_target = { add_trait = homosexual } diff --git a/events/mnm_grand_debate_events.txt b/events/mnm_grand_debate_events.txt index 0e3db95f..b6087918 100644 --- a/events/mnm_grand_debate_events.txt +++ b/events/mnm_grand_debate_events.txt @@ -193,8 +193,8 @@ character_event = { NOT = { trait = poet } - society = { - any_society_member = { + society = { + any_society_member = { has_character_flag = attending_grand_debate is_incapable = no prisoner = no @@ -216,10 +216,10 @@ character_event = { } 10 = { trigger = { - society = { - any_society_member = { - is_rival = ROOT - has_character_flag = attending_grand_debate + society = { + any_society_member = { + is_rival = ROOT + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -245,8 +245,8 @@ character_event = { 10 = { trigger = { society = { - any_society_member = { - has_character_flag = attending_grand_debate + any_society_member = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -273,9 +273,9 @@ character_event = { 10 = { trigger = { society = { - any_society_member = { - count = 2 - has_character_flag = attending_grand_debate + any_society_member = { + count = 2 + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -296,12 +296,12 @@ character_event = { } 10 = { trigger = { - NOT = { + NOT = { has_character_modifier = childish_prankster } - society = { - any_society_member = { - has_character_flag = attending_grand_debate + society = { + any_society_member = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -326,23 +326,23 @@ character_event = { } 10 = { trigger = { - OR = { - any_lover = { - prisoner = no - is_incapable = no + OR = { + any_lover = { + prisoner = no + is_incapable = no } - any_spouse = { - prisoner = no - is_incapable = no + any_spouse = { + prisoner = no + is_incapable = no } - any_friend = { - prisoner = no - is_incapable = no + any_friend = { + prisoner = no + is_incapable = no } - any_child = { + any_child = { is_incapable = no prisoner = no is_child_of = ROOT @@ -355,20 +355,20 @@ character_event = { } } - mother = { - is_alive = yes - is_incapable = no - prisoner = no - NOT = { + mother = { + is_alive = yes + is_incapable = no + prisoner = no + NOT = { is_rival = ROOT } } - father = { - is_alive = yes - is_incapable = no - prisoner = no - NOT = { + father = { + is_alive = yes + is_incapable = no + prisoner = no + NOT = { is_rival = ROOT } @@ -1522,7 +1522,7 @@ character_event = { trait = poet } society = { - any_society_member = { + any_society_member = { has_character_flag = attending_grand_debate is_incapable = no prisoner = no @@ -1542,7 +1542,7 @@ character_event = { immediate = { log = "work event id = MNM.5201 for [Root.GetBestName]" society = { - random_society_member = { + random_society_member = { # find a fellow poet if you can limit = { has_character_flag = attending_grand_debate @@ -1613,9 +1613,9 @@ character_event = { trigger = { society = { - any_society_member = { - is_rival = ROOT - has_character_flag = attending_grand_debate + any_society_member = { + is_rival = ROOT + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -1637,7 +1637,7 @@ character_event = { immediate = { log = "work event id = MNM.5202 for [Root.GetBestName]" society = { - random_society_member = { + random_society_member = { limit = { has_character_flag = attending_grand_debate is_incapable = no @@ -1680,8 +1680,8 @@ character_event = { trigger = { society = { - any_society_member = { - has_character_flag = attending_grand_debate + any_society_member = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -1700,9 +1700,9 @@ character_event = { immediate = { log = "work event id = MNM.5203 for [Root.GetBestName]" society = { - random_society_member = { + random_society_member = { limit = { - has_character_flag = attending_grand_debate + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -1723,8 +1723,8 @@ character_event = { trigger = { event_target:striking_debater_target = { NOR = { - is_lover = ROOT - ROOT_possibly_romantically_interested_trigger = yes + is_lover = ROOT + ROOT_possibly_romantically_interested_trigger = yes } } @@ -1747,30 +1747,30 @@ character_event = { if = { limit = { event_target:striking_debater_target = { - NOR = { - is_lover = ROOT - ROOT_possibly_romantically_interested_trigger = yes + NOR = { + is_lover = ROOT + ROOT_possibly_romantically_interested_trigger = yes } } } - random_list = { - 10 = { - opinion = { + random_list = { + 10 = { + opinion = { who = event_target:striking_debater_target modifier = opinion_scholarly_appreciation years = 10 } } 10 = { - opinion = { + opinion = { who = event_target:striking_debater_target modifier = opinion_budding_friendship years = 10 } hidden_effect = { - reverse_opinion = { + reverse_opinion = { who = event_target:striking_debater_target modifier = opinion_budding_friendship years = 10 @@ -1790,30 +1790,30 @@ character_event = { if = { limit = { event_target:striking_debater_target = { - OR = { - is_lover = ROOT - ROOT_possibly_romantically_interested_trigger = yes + OR = { + is_lover = ROOT + ROOT_possibly_romantically_interested_trigger = yes } } } - random_list = { - 35 = { - opinion = { + random_list = { + 35 = { + opinion = { who = event_target:striking_debater_target modifier = opinion_scholarly_appreciation years = 10 } } 25 = { - opinion = { + opinion = { who = event_target:striking_debater_target modifier = opinion_budding_romance years = 10 } hidden_effect = { - reverse_opinion = { + reverse_opinion = { who = event_target:striking_debater_target modifier = opinion_budding_romance years = 10 @@ -1821,13 +1821,13 @@ character_event = { } } 20 = { - opinion = { + opinion = { who = event_target:striking_debater_target modifier = opinion_budding_friendship years = 10 } hidden_effect = { - reverse_opinion = { + reverse_opinion = { who = event_target:striking_debater_target modifier = opinion_budding_friendship years = 10 @@ -1871,53 +1871,53 @@ character_event = { } hidden_effect = { random_list = { - 50 = { - modifier = { - factor = 1.1 - diplomacy = 7 + 50 = { + modifier = { + factor = 1.1 + diplomacy = 7 } - modifier = { - factor = 1.1 - diplomacy = 9 + modifier = { + factor = 1.1 + diplomacy = 9 } - modifier = { - factor = 1.1 - diplomacy = 11 + modifier = { + factor = 1.1 + diplomacy = 11 } - modifier = { - factor = 1.1 - diplomacy = 13 + modifier = { + factor = 1.1 + diplomacy = 13 } - modifier = { - factor = 1.1 - diplomacy = 15 + modifier = { + factor = 1.1 + diplomacy = 15 } - modifier = { - factor = 1.1 - diplomacy = 17 + modifier = { + factor = 1.1 + diplomacy = 17 } - modifier = { - factor = 1.1 - diplomacy = 19 + modifier = { + factor = 1.1 + diplomacy = 19 } - modifier = { - factor = 1.1 - diplomacy = 21 + modifier = { + factor = 1.1 + diplomacy = 21 } - modifier = { - factor = 1.1 - diplomacy = 23 + modifier = { + factor = 1.1 + diplomacy = 23 } - modifier = { + modifier = { factor = 1.2 trait = genius } @@ -1945,13 +1945,13 @@ character_event = { factor = 0.1 trait = imbecile } - character_event = { + character_event = { id = MNM.5205 days = 3 random = 5 } # it works! } - 50 = { - character_event = { + 50 = { + character_event = { id = MNM.5206 days = 3 random = 5 } # it fails @@ -2047,9 +2047,9 @@ character_event = { trigger = { society = { - any_society_member = { - count = 2 - has_character_flag = attending_grand_debate + any_society_member = { + count = 2 + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2068,9 +2068,9 @@ character_event = { immediate = { log = "work event id = MNM.5207 for [Root.GetBestName]" society = { - random_society_member = { - limit = { - has_character_flag = attending_grand_debate + random_society_member = { + limit = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2081,9 +2081,9 @@ character_event = { save_event_target_as = fellow_member_1 } - random_society_member = { - limit = { - has_character_flag = attending_grand_debate + random_society_member = { + limit = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2164,8 +2164,8 @@ character_event = { trigger = { society = { - any_society_member = { - has_character_flag = attending_grand_debate + any_society_member = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2186,9 +2186,9 @@ character_event = { select_random_hermetic_ingredient_effect = yes select_random_hermetic_ingredient_effect = yes society = { - random_society_member = { - limit = { - has_character_flag = attending_grand_debate + random_society_member = { + limit = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2201,9 +2201,9 @@ character_event = { break = yes } - random_society_member = { - limit = { - has_character_flag = attending_grand_debate + random_society_member = { + limit = { + has_character_flag = attending_grand_debate is_incapable = no prisoner = no NOT = { @@ -2287,8 +2287,8 @@ character_event = { trigger = { OR = { - any_lover = { - always = yes + any_lover = { + always = yes } any_spouse = { @@ -2362,7 +2362,7 @@ character_event = { mother = { if = { limit = { - is_alive = yes + is_alive = yes is_incapable = no prisoner = no NOT = { @@ -2378,9 +2378,9 @@ character_event = { } } father = { - if = { - limit = { - is_alive = yes + if = { + limit = { + is_alive = yes is_incapable = no prisoner = no NOT = { @@ -2442,8 +2442,8 @@ character_event = { } event_target:inspired_letter_target = { trigger_switch = { - on_trigger = has_character_flag - love_letters_flag = { + on_trigger = has_character_flag + love_letters_flag = { opinion = { who = ROOT modifier = opinion_love_letters @@ -2451,7 +2451,7 @@ character_event = { } } - pen_pal_flag = { + pen_pal_flag = { opinion = { who = ROOT modifier = opinion_pen_pal @@ -2459,7 +2459,7 @@ character_event = { } } - delighted_parent_flag = { + delighted_parent_flag = { opinion = { who = ROOT modifier = opinion_delighted_parent @@ -2521,8 +2521,8 @@ character_event = { } event_target:inspired_letter_target = { trigger_switch = { - on_trigger = has_character_flag - love_letters_flag = { + on_trigger = has_character_flag + love_letters_flag = { opinion = { who = ROOT modifier = opinion_poet_love_letters @@ -2530,7 +2530,7 @@ character_event = { } } - pen_pal_flag = { + pen_pal_flag = { opinion = { who = ROOT modifier = opinion_poet_pen_pal @@ -2538,7 +2538,7 @@ character_event = { } } - delighted_parent_flag = { + delighted_parent_flag = { opinion = { who = ROOT modifier = opinion_poet_delighted_parent @@ -2598,9 +2598,9 @@ character_event = { has_character_flag = poetic_flag } tooltip = { - trigger_switch = { - on_trigger = has_character_flag - love_letters_flag = { + trigger_switch = { + on_trigger = has_character_flag + love_letters_flag = { opinion = { who = ROOT modifier = opinion_love_letters @@ -2608,7 +2608,7 @@ character_event = { } } - pen_pal_flag = { + pen_pal_flag = { opinion = { who = ROOT modifier = opinion_pen_pal @@ -2616,7 +2616,7 @@ character_event = { } } - delighted_parent_flag = { + delighted_parent_flag = { opinion = { who = ROOT modifier = opinion_delighted_parent @@ -2635,9 +2635,9 @@ character_event = { } } tooltip = { - trigger_switch = { - on_trigger = has_character_flag - love_letters_flag = { + trigger_switch = { + on_trigger = has_character_flag + love_letters_flag = { opinion = { who = ROOT modifier = opinion_poet_love_letters @@ -2645,7 +2645,7 @@ character_event = { } } - pen_pal_flag = { + pen_pal_flag = { opinion = { who = ROOT modifier = opinion_poet_pen_pal @@ -2653,7 +2653,7 @@ character_event = { } } - delighted_parent_flag = { + delighted_parent_flag = { opinion = { who = ROOT modifier = opinion_poet_delighted_parent @@ -2727,8 +2727,8 @@ character_event = { selected_ingredient_is_sleep_inducing_trigger = no } random = { - chance = 50 - add_character_modifier = { + chance = 50 + add_character_modifier = { modifier = nauseous_from_potion years = 1 } diff --git a/events/mnm_misc_events.txt b/events/mnm_misc_events.txt index 0e51690c..61dd7444 100644 --- a/events/mnm_misc_events.txt +++ b/events/mnm_misc_events.txt @@ -1126,18 +1126,18 @@ character_event = { who = ROOT value = -20 } } - NOT = { + NOT = { opinion = { who = ROOT value = 0 } } - NOT = { + NOT = { is_rival = ROOT } - NOT = { + NOT = { has_character_flag = ineligible_for_society_rivalry } - ai = yes + ai = yes } character_event = { id = MNM.10041 @@ -1267,19 +1267,19 @@ character_event = { reverse_opinion = { who = ROOT value = 30 } - opinion = { + opinion = { who = ROOT value = 40 } - NOR = { - is_friend = ROOT - is_rival = ROOT - is_close_relative = ROOT + NOR = { + is_friend = ROOT + is_rival = ROOT + is_close_relative = ROOT } - NOT = { + NOT = { has_character_flag = ineligible_for_society_friendship } - ai = yes + ai = yes } character_event = { @@ -1821,9 +1821,9 @@ character_event = { } hidden_effect = { clr_character_flag = A_FAIL - clr_character_flag = B_FAIL - clr_character_flag = C_FAIL - clr_character_flag = D_FAIL + clr_character_flag = B_FAIL + clr_character_flag = C_FAIL + clr_character_flag = D_FAIL clr_character_flag = A_SUCCESS clr_character_flag = B_SUCCESS clr_character_flag = C_SUCCESS diff --git a/events/mnm_monastic_orders_events.txt b/events/mnm_monastic_orders_events.txt index df155ee1..d19e4aac 100644 --- a/events/mnm_monastic_orders_events.txt +++ b/events/mnm_monastic_orders_events.txt @@ -5070,7 +5070,7 @@ letter_event = { } option = { - name = EVTOPTA_MNM_4428 + name = EVTOPTA_MNM_4428 add_artifact = fingerbone_of_saint } } @@ -8429,7 +8429,7 @@ character_event = { immediate = { log = "work event id = MNM.3265 for [Root.GetBestName]" FROM = { - trigger_switch = { + trigger_switch = { # Which event to send on_trigger = has_character_flag 3264_publish_flag = { @@ -8447,14 +8447,14 @@ character_event = { } 3264_depressed_flag = { - character_event = { + character_event = { id = MNM.3268 } clr_character_flag = 3264_depressed_flag } 3264_deceitful_flag = { - character_event = { + character_event = { id = MNM.3269 } clr_character_flag = 3264_deceitful_flag @@ -8942,7 +8942,7 @@ character_event = { immediate = { log = "work event id = MNM.4203 for [Root.GetBestName]" FROM = { - trigger_switch = { + trigger_switch = { # which event to send on_trigger = has_character_flag 4202_visit_monastery_flag = { @@ -8960,7 +8960,7 @@ character_event = { } 4202_send_my_own_samples_flag = { - character_event = { + character_event = { id = MNM.4206 } clr_character_flag = 4202_send_my_own_samples_flag @@ -9032,8 +9032,8 @@ character_event = { learning = 12 } add_character_modifier = { - name = green_fingers - years = 10 + name = green_fingers + years = 10 } } 40 = { @@ -9046,8 +9046,8 @@ character_event = { trait = genius } add_character_modifier = { - name = dirty_hands - years = 5 + name = dirty_hands + years = 5 } } } @@ -9304,7 +9304,7 @@ character_event = { immediate = { log = "work event id = MNM.4213 for [Root.GetBestName]" FROM = { - trigger_switch = { + trigger_switch = { # which event to send on_trigger = has_character_flag 4212_woke_them_up_flag = { @@ -9322,7 +9322,7 @@ character_event = { } 4212_pranked_them_flag = { - character_event = { + character_event = { id = MNM.4216 } clr_character_flag = 4212_pranked_them_flag @@ -9387,9 +9387,9 @@ character_event = { # They are embarrassed name = EVTOPTA_MNM_4215 FROM = { - add_character_modifier = { - name = embarrassed_believer - years = 5 + add_character_modifier = { + name = embarrassed_believer + years = 5 } } } diff --git a/events/oldgods_ancestor_worship_events.txt b/events/oldgods_ancestor_worship_events.txt index a476dc0a..0d0751ea 100644 --- a/events/oldgods_ancestor_worship_events.txt +++ b/events/oldgods_ancestor_worship_events.txt @@ -638,7 +638,7 @@ character_event = { modifier = { factor = 0 is_strong_trigger = yes } # Robust - character_event = { + character_event = { id = TOG.7011 days = 300 } } @@ -673,7 +673,7 @@ character_event = { modifier = { factor = 0 is_strong_trigger = yes } # Robust - character_event = { + character_event = { id = TOG.7011 days = 300 } } @@ -708,7 +708,7 @@ character_event = { modifier = { factor = 0 is_strong_trigger = yes } # Robust - character_event = { + character_event = { id = TOG.7011 days = 300 } } @@ -743,7 +743,7 @@ character_event = { modifier = { factor = 0 is_strong_trigger = yes } # Robust - character_event = { + character_event = { id = TOG.7011 days = 300 } } @@ -3076,7 +3076,7 @@ character_event = { trait = eunuch } } - character_event = { + character_event = { id = TOG.7511 } } @@ -4518,10 +4518,10 @@ character_event = { if = { limit = { OR = { - NOT = { + NOT = { has_dlc = "Zeus" } - age = 16 + age = 16 } } remove_trait_craven_effect = yes @@ -4581,10 +4581,10 @@ character_event = { if = { limit = { OR = { - NOT = { + NOT = { has_dlc = "Zeus" } - age = 16 + age = 16 } } remove_trait_craven_effect = yes @@ -4605,10 +4605,10 @@ character_event = { if = { limit = { OR = { - NOT = { + NOT = { has_dlc = "Zeus" } - age = 16 + age = 16 } } add_trait_craven_effect = yes diff --git a/events/on_action_events.txt b/events/on_action_events.txt index e09a404c..e2b81a6d 100644 --- a/events/on_action_events.txt +++ b/events/on_action_events.txt @@ -1531,7 +1531,7 @@ character_event = { factor = 1000 } if = { - limit = { + limit = { realm_intrigue = 16 } random = { @@ -1540,9 +1540,9 @@ character_event = { } } if = { - limit = { - realm_intrigue = 9 - NOT = { + limit = { + realm_intrigue = 9 + NOT = { realm_intrigue = 16 } @@ -1553,8 +1553,8 @@ character_event = { } } if = { - limit = { - NOT = { + limit = { + NOT = { realm_intrigue = 9 } @@ -1572,7 +1572,7 @@ character_event = { same_realm = FROMFROM independent = yes FROMFROM = { - prisoner = yes + prisoner = yes nor = { host = { character = ROOT @@ -1602,7 +1602,7 @@ character_event = { same_realm = FROMFROM independent = yes FROMFROM = { - prisoner = yes + prisoner = yes host = { character = ROOT } @@ -1741,7 +1741,7 @@ character_event = { } } if = { - limit = { + limit = { realm_intrigue = 16 } random_list = { @@ -1767,9 +1767,9 @@ character_event = { } } if = { - limit = { - realm_intrigue = 9 - NOT = { + limit = { + realm_intrigue = 9 + NOT = { realm_intrigue = 16 } @@ -1797,8 +1797,8 @@ character_event = { } } if = { - limit = { - NOT = { + limit = { + NOT = { realm_intrigue = 9 } @@ -6915,7 +6915,7 @@ character_event = { trigger = { OR = { - AND = { + AND = { OR = { any_courtier = { has_minor_title = title_appointed_regent diff --git a/events/pet_events.txt b/events/pet_events.txt index 98da433c..cef1d66a 100644 --- a/events/pet_events.txt +++ b/events/pet_events.txt @@ -1414,9 +1414,9 @@ character_event = { is_inaccessible_trigger = no NOR = { trait = incapable - trait = cruel - has_character_modifier = pet_cat - has_character_modifier = pet_hunting_dog + trait = cruel + has_character_modifier = pet_cat + has_character_modifier = pet_hunting_dog } } @@ -1438,9 +1438,9 @@ character_event = { is_inaccessible_trigger = no NOR = { trait = incapable - trait = cruel - has_character_modifier = pet_cat - has_character_modifier = pet_hunting_dog + trait = cruel + has_character_modifier = pet_cat + has_character_modifier = pet_hunting_dog } } diff --git a/events/pope_free_investiture.txt b/events/pope_free_investiture.txt index 8797e5c3..33c3334b 100644 --- a/events/pope_free_investiture.txt +++ b/events/pope_free_investiture.txt @@ -465,7 +465,7 @@ character_event = { random_realm_lord = { limit = { is_theocracy = yes - NOT = { + NOT = { has_character_flag = pope_bribing } } diff --git a/events/regency_events.txt b/events/regency_events.txt index 56367c7a..54ac7f3d 100644 --- a/events/regency_events.txt +++ b/events/regency_events.txt @@ -2773,8 +2773,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 1 - 6 - limit = { - martial = 15 + limit = { + martial = 15 FROM = { NOT = { martial = 7 @@ -2811,8 +2811,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 7 - 14 - limit = { - martial = 15 + limit = { + martial = 15 FROM = { martial = 7 NOT = { @@ -2850,8 +2850,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 15+ - limit = { - martial = 15 + limit = { + martial = 15 FROM = { martial = 15 } @@ -2886,11 +2886,11 @@ character_event = { } if = { # HAS 7 - 14 MARTIAL, OPPONENT HAS 1 - 6 - limit = { + limit = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { NOT = { martial = 7 @@ -2930,7 +2930,7 @@ character_event = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { martial = 7 NOT = { @@ -2968,11 +2968,11 @@ character_event = { } if = { # HAS 7 - 14 MARTIAL, OPPONENT HAS 15+ - limit = { + limit = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { martial = 15 } @@ -3007,7 +3007,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 1 - 6 - limit = { + limit = { NOT = { martial = 7 } @@ -3047,7 +3047,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 7 - 14 - limit = { + limit = { NOT = { martial = 7 } @@ -3088,7 +3088,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 15+ - limit = { + limit = { NOT = { martial = 7 } @@ -3157,8 +3157,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 1 - 6 - limit = { - martial = 15 + limit = { + martial = 15 FROM = { NOT = { martial = 7 @@ -3195,8 +3195,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 7 - 14 - limit = { - martial = 15 + limit = { + martial = 15 FROM = { martial = 7 NOT = { @@ -3234,8 +3234,8 @@ character_event = { } if = { # HAS 15+ MARTIAL, OPPONENT HAS 15+ - limit = { - martial = 15 + limit = { + martial = 15 FROM = { martial = 15 } @@ -3270,11 +3270,11 @@ character_event = { } if = { # HAS 7 - 14 MARTIAL, OPPONENT HAS 1 - 6 - limit = { + limit = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { NOT = { martial = 7 @@ -3314,7 +3314,7 @@ character_event = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { martial = 7 NOT = { @@ -3352,11 +3352,11 @@ character_event = { } if = { # HAS 7 - 14 MARTIAL, OPPONENT HAS 15+ - limit = { + limit = { NOT = { martial = 15 } - martial = 7 + martial = 7 FROM = { martial = 15 } @@ -3391,7 +3391,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 1 - 6 - limit = { + limit = { NOT = { martial = 7 } @@ -3431,7 +3431,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 7 - 14 - limit = { + limit = { NOT = { martial = 7 } @@ -3472,7 +3472,7 @@ character_event = { } if = { # HAS 1 - 6 MARTIAL, OPPONENT HAS 15+ - limit = { + limit = { NOT = { martial = 7 } diff --git a/events/rip_eternal_life_events.txt b/events/rip_eternal_life_events.txt index 65d47fa9..237c90cd 100644 --- a/events/rip_eternal_life_events.txt +++ b/events/rip_eternal_life_events.txt @@ -427,10 +427,10 @@ narrative_event = { trigger = { OR = { NOR = { - diplomacy = 12 - martial = 12 - intrigue = 12 - learning = 12 + diplomacy = 12 + martial = 12 + intrigue = 12 + learning = 12 } AND = { diff --git a/events/rip_flavor_events.txt b/events/rip_flavor_events.txt index 4e6a8898..6b6cdd68 100644 --- a/events/rip_flavor_events.txt +++ b/events/rip_flavor_events.txt @@ -5972,8 +5972,8 @@ character_event = { text = EVTOPTB_RIP_29019_TOOLTIP } reverse_opinion = { - who = FROM - modifier = opinion_neglectful_parent + who = FROM + modifier = opinion_neglectful_parent } } } @@ -8030,12 +8030,12 @@ character_event = { option = { name = EVTOPTA_RIP_29401 random_list = { - 60 = { + 60 = { character_event = { id = RIP.29402 tooltip = EVTOPTA_RIP_29401_SUCCESS } } - 40 = { + 40 = { character_event = { id = RIP.29403 tooltip = EVTOPTA_RIP_29401_FAILURE } @@ -8277,12 +8277,12 @@ character_event = { option = { name = EVTOPTA_RIP_29501 random_list = { - 50 = { + 50 = { character_event = { id = RIP.29502 tooltip = EVTOPTA_RIP_29501_SUCCESS days = 30 } } - 50 = { + 50 = { character_event = { id = RIP.29503 tooltip = EVTOPTA_RIP_29501_FAILURE days = 15 } @@ -8293,12 +8293,12 @@ character_event = { option = { name = EVTOPTB_RIP_29501 random_list = { - 80 = { + 80 = { character_event = { id = RIP.29502 tooltip = EVTOPTA_RIP_29501_SUCCESS days = 30 } } - 20 = { + 20 = { character_event = { id = RIP.29504 tooltip = EVTOPTB_RIP_29501_FAILURE days = 15 } @@ -13154,7 +13154,7 @@ narrative_event = { hidden_tooltip = { FROM = { #leave_court_effect = yes - death = { + death = { death_reason = death_missing } } diff --git a/events/rip_seclusion_events.txt b/events/rip_seclusion_events.txt index f4600837..9eb33ec8 100644 --- a/events/rip_seclusion_events.txt +++ b/events/rip_seclusion_events.txt @@ -2477,12 +2477,12 @@ character_event = { # Stay but don't get married option = { trigger = { - FROM = { + FROM = { NOT = { has_character_flag = escaping_seclusion } } - NOT = { + NOT = { trait = paranoid } diff --git a/events/rip_torture_events.txt b/events/rip_torture_events.txt index 478a3346..d585ad6d 100644 --- a/events/rip_torture_events.txt +++ b/events/rip_torture_events.txt @@ -155,7 +155,7 @@ character_event = { tooltip = { random = { chance = 20 - add_trait = stressed + add_trait = stressed hidden_tooltip = { character_event = { id = 38282 # Notify Stressed @@ -185,13 +185,13 @@ character_event = { random = { chance = 20 if = { - limit = { + limit = { NOT = { trait = stressed } } - add_trait = stressed - hidden_tooltip = { + add_trait = stressed + hidden_tooltip = { character_event = { id = 38282 } @@ -220,11 +220,11 @@ character_event = { from = { random_list = { 60 = { - add_trait = stressed + add_trait = stressed } 30 = { - add_trait = fatigue + add_trait = fatigue set_character_flag = disease_not_serious character_event = { id = RIP.11011 days = 100 random = 300 @@ -292,9 +292,9 @@ character_event = { hidden_tooltip = { if = { limit = { - NOR = { - has_character_flag = developing_illness - has_character_flag = disease_not_serious + NOR = { + has_character_flag = developing_illness + has_character_flag = disease_not_serious } @@ -358,7 +358,7 @@ character_event = { } 30 = { set_character_flag = disease_not_serious - add_trait = cough + add_trait = cough character_event = { id = RIP.11002 days = 10 random = 30 } diff --git a/events/trait_notification.txt b/events/trait_notification.txt index f9d407f7..a26bb702 100644 --- a/events/trait_notification.txt +++ b/events/trait_notification.txt @@ -31,9 +31,9 @@ # honest = 38162 & 38262 # humble = 38160 & 38260 -# just = 38167 & 38267 +# just = 38167 & 38267 -# kind = 38168 & 38268 +# kind = 38168 & 38268 # lustful = 38172 & 38272 # maimed = 38181 & 38281 @@ -42,7 +42,7 @@ # patient = 38164 & 38264 # proud = 38161 & 38261 -# shy = 38163 & 38263 +# shy = 38163 & 38263 # slothful = 38151 & 38251 # stutter = 38153 & 38253 diff --git a/events/wh_chaos.txt b/events/wh_chaos.txt index a99e10e7..66da7730 100644 --- a/events/wh_chaos.txt +++ b/events/wh_chaos.txt @@ -1942,7 +1942,7 @@ character_event = { abdicate = yes move_character = FROM hidden_tooltip = { - 1 = { + 1 = { change_variable = { which = "doom_counter" value = 0.5 @@ -2156,7 +2156,7 @@ character_event = { abdicate = yes move_character = FROM hidden_tooltip = { - 1 = { + 1 = { change_variable = { which = "doom_counter" value = 0.5 @@ -2370,7 +2370,7 @@ character_event = { abdicate = yes move_character = FROM hidden_tooltip = { - 1 = { + 1 = { change_variable = { which = "doom_counter" value = 0.5 @@ -2584,7 +2584,7 @@ character_event = { abdicate = yes move_character = FROM hidden_tooltip = { - 1 = { + 1 = { change_variable = { which = "doom_counter" value = 0.5 @@ -8415,7 +8415,7 @@ long_character_event = { limit = { OR = { trait = lore_nurgle - trait = lore_slaanesh + trait = lore_slaanesh } } remove_trait = lore_nurgle @@ -14139,7 +14139,7 @@ character_event = { limit = { wh_is_chaos_chosen_trigger = yes } - 1 = { + 1 = { change_variable = { which = "doom_counter" value = -3 @@ -14150,7 +14150,7 @@ character_event = { limit = { is_demon_prince_trigger = yes } - 1 = { + 1 = { change_variable = { which = "doom_counter" value = -10 diff --git a/events/wh_chaos_beastmen.txt b/events/wh_chaos_beastmen.txt index 6fc29feb..7782aad9 100644 --- a/events/wh_chaos_beastmen.txt +++ b/events/wh_chaos_beastmen.txt @@ -3784,8 +3784,8 @@ character_event = { } } 90 = { - modifier = { - factor = 0.6 + modifier = { + factor = 0.6 has_global_flag = morrslieb_full } diff --git a/events/wh_cult_of_pleasure_events.txt b/events/wh_cult_of_pleasure_events.txt index b3beb66e..cc3d867e 100644 --- a/events/wh_cult_of_pleasure_events.txt +++ b/events/wh_cult_of_pleasure_events.txt @@ -3457,7 +3457,7 @@ character_event = { option = { name = EVTOPTEspleasure.69 # Changed my mind - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_twisting } @@ -4085,11 +4085,11 @@ character_event = { option = { name = EVTOPTAspleasure.74 prestige = 50 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_twisting } - FROM = { + FROM = { remove_opinion = { who = ROOT modifier = opinion_twisting @@ -4112,11 +4112,11 @@ character_event = { option = { name = EVTOPTAspleasure.75 prestige = -50 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_twisting } - FROM = { + FROM = { remove_opinion = { who = ROOT modifier = opinion_twisting @@ -5909,7 +5909,7 @@ character_event = { option = { name = EVTOPTCspleasure94 # Changed my mind - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -12001,7 +12001,7 @@ character_event = { option = { name = EVTOPTAspleasure105 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -12142,7 +12142,7 @@ character_event = { } } } - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -14713,7 +14713,7 @@ character_event = { option = { name = EVTOPTAspleasure115 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -14742,7 +14742,7 @@ character_event = { immediate = { log = "work event id = spleasure.116 for [Root.GetBestName]" - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -17346,7 +17346,7 @@ character_event = { option = { name = EVTOPTAspleasure125 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -17375,7 +17375,7 @@ character_event = { immediate = { log = "work event id = spleasure.126 for [Root.GetBestName]" - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -20020,7 +20020,7 @@ character_event = { option = { name = EVTOPTAspleasure135 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -20049,7 +20049,7 @@ character_event = { immediate = { log = "work event id = spleasure.136 for [Root.GetBestName]" - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -22699,7 +22699,7 @@ character_event = { option = { name = EVTOPTAspleasure145 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -22728,7 +22728,7 @@ character_event = { immediate = { log = "work event id = spleasure.146 for [Root.GetBestName]" - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -25387,7 +25387,7 @@ character_event = { option = { name = EVTOPTAspleasure155 - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } @@ -25416,7 +25416,7 @@ character_event = { immediate = { log = "work event id = spleasure.156 for [Root.GetBestName]" - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_quirking } diff --git a/events/wh_druchii.txt b/events/wh_druchii.txt index 58d8a028..6d1b8cae 100644 --- a/events/wh_druchii.txt +++ b/events/wh_druchii.txt @@ -3463,79 +3463,79 @@ character_event = { } } } - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } diff --git a/events/wh_duel_actions.txt b/events/wh_duel_actions.txt index f683cade..b4cab0c6 100644 --- a/events/wh_duel_actions.txt +++ b/events/wh_duel_actions.txt @@ -1436,7 +1436,7 @@ character_event = { trigger = { character = event_target:charA } - if = { + if = { limit = { or = { is_invincible_trigger = yes diff --git a/events/wh_duel_init.txt b/events/wh_duel_init.txt index 8cd67479..c67d4ab5 100644 --- a/events/wh_duel_init.txt +++ b/events/wh_duel_init.txt @@ -1246,12 +1246,12 @@ character_event = { } } if = { - limit = { + limit = { has_artifact = war_bear_mount } - change_variable = { which = "duel_def" value = 3 } - change_variable = { which = "duel_att" value = 5 } - change_variable = { which = "duel_max_hp" value = 2 } + change_variable = { which = "duel_def" value = 3 } + change_variable = { which = "duel_att" value = 5 } + change_variable = { which = "duel_max_hp" value = 2 } } # MISC if = { diff --git a/events/wh_elven_marriage_events.txt b/events/wh_elven_marriage_events.txt index c32e5ea9..ff5fbb0e 100644 --- a/events/wh_elven_marriage_events.txt +++ b/events/wh_elven_marriage_events.txt @@ -3797,7 +3797,7 @@ character_event = { father = { character = ROOT } - mother = { + mother = { character = ROOT } } diff --git a/events/wh_geomantic_web.txt b/events/wh_geomantic_web.txt index 7d808587..ff68cb14 100644 --- a/events/wh_geomantic_web.txt +++ b/events/wh_geomantic_web.txt @@ -94,7 +94,7 @@ province_event = { if = { limit = { 1754 = { - z_geomancy_ok = yes + z_geomancy_ok = yes } } 1754 = { @@ -276,7 +276,7 @@ province_event = { if = { limit = { 1754 = { - z_geomancy_not = yes + z_geomancy_not = yes } } 1754 = { diff --git a/events/wh_high_elf_magic_events.txt b/events/wh_high_elf_magic_events.txt index 685c4518..224ee55f 100644 --- a/events/wh_high_elf_magic_events.txt +++ b/events/wh_high_elf_magic_events.txt @@ -105,475 +105,475 @@ character_event = { # bad year 10 = { add_trait = shy - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 0.95 has_character_flag = magic_potential_flag_2 } - modifier = { + modifier = { factor = 0.85 has_character_flag = magic_potential_flag_3 } - modifier = { + modifier = { factor = 0.65 has_character_flag = magic_potential_flag_4 } - modifier = { + modifier = { factor = 0.75 has_character_flag = young_asur_apprentice } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } } 10 = { add_trait = slothful - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 0.95 has_character_flag = magic_potential_flag_2 } - modifier = { + modifier = { factor = 0.85 has_character_flag = magic_potential_flag_3 } - modifier = { + modifier = { factor = 0.65 has_character_flag = magic_potential_flag_4 } - modifier = { + modifier = { factor = 0.75 has_character_flag = young_asur_apprentice } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } } 10 = { add_trait = content - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 0.95 has_character_flag = magic_potential_flag_2 } - modifier = { + modifier = { factor = 0.85 has_character_flag = magic_potential_flag_3 } - modifier = { + modifier = { factor = 0.65 has_character_flag = magic_potential_flag_4 } - modifier = { + modifier = { factor = 0.75 has_character_flag = young_asur_apprentice } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } } 10 = { add_trait = cynical - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 0.95 has_character_flag = magic_potential_flag_2 } - modifier = { + modifier = { factor = 0.85 has_character_flag = magic_potential_flag_3 } - modifier = { + modifier = { factor = 0.65 has_character_flag = magic_potential_flag_4 } - modifier = { + modifier = { factor = 0.75 has_character_flag = young_asur_apprentice } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } } 10 = { add_trait = drunkard - modifier = { + modifier = { factor = 0.5 trait = genius } - modifier = { + modifier = { factor = 0.65 trait = brilliant } - modifier = { + modifier = { factor = 0.75 trait = smart } - modifier = { + modifier = { factor = 0.85 trait = quick } - modifier = { + modifier = { factor = 0.95 trait = bright } - modifier = { + modifier = { factor = 1.25 trait = dim } - modifier = { + modifier = { factor = 1.35 trait = dumb } - modifier = { + modifier = { factor = 1.5 trait = slow } - modifier = { + modifier = { factor = 1.75 trait = idiot } - modifier = { + modifier = { factor = 2 trait = imbecile } - modifier = { + modifier = { factor = 0.95 trait = magic_potential_2 } - modifier = { + modifier = { factor = 0.85 trait = magic_potential_3 } - modifier = { + modifier = { factor = 0.65 trait = magic_potential_4 } - modifier = { + modifier = { factor = 0.95 has_character_flag = magic_potential_flag_2 } - modifier = { + modifier = { factor = 0.85 has_character_flag = magic_potential_flag_3 } - modifier = { + modifier = { factor = 0.65 has_character_flag = magic_potential_flag_4 } - modifier = { + modifier = { factor = 0.75 has_character_flag = young_asur_apprentice } - modifier = { + modifier = { factor = 1.25 trait = slothful } - modifier = { + modifier = { factor = 1.35 trait = content } - modifier = { + modifier = { factor = 1.25 trait = drunkard } - modifier = { + modifier = { factor = 1.25 trait = addict } - modifier = { + modifier = { factor = 1.25 trait = gluttonous } - modifier = { + modifier = { factor = 1.25 trait = lustful } diff --git a/events/wh_high_elves_events.txt b/events/wh_high_elves_events.txt index 2246d95a..b9ce76d6 100644 --- a/events/wh_high_elves_events.txt +++ b/events/wh_high_elves_events.txt @@ -3118,7 +3118,7 @@ character_event = { } } # any_independent_ruler = { any_vassal = { limit = { higher_tier_than = COUNT - # trait = creature_elf + # trait = creature_elf # religion = cadai } # character_event = { id = asur.50 days = 15 } } } } diff --git a/events/wh_lunacy_events.txt b/events/wh_lunacy_events.txt index e75c6eee..a86992c2 100644 --- a/events/wh_lunacy_events.txt +++ b/events/wh_lunacy_events.txt @@ -2689,7 +2689,7 @@ character_event = { } # The special cases have pretty much no saving throw - modifier = { + modifier = { factor = 0.1 OR = { trait = vampire_strigoi_visible diff --git a/events/wh_mage_learning_events.txt b/events/wh_mage_learning_events.txt index febac462..aa24fb8e 100644 --- a/events/wh_mage_learning_events.txt +++ b/events/wh_mage_learning_events.txt @@ -890,19 +890,19 @@ character_event = { NOT = { religion = ormazd } - NOT = { + NOT = { religion = kitabid } - NOT = { + NOT = { culture = ramaccan } - NOT = { + NOT = { culture = medean } - NOT = { + NOT = { culture = tevari } - NOT = { + NOT = { culture = cophic } } diff --git a/events/wh_magic_heavens_proc_events.txt b/events/wh_magic_heavens_proc_events.txt index e3443a34..ba57f5a7 100644 --- a/events/wh_magic_heavens_proc_events.txt +++ b/events/wh_magic_heavens_proc_events.txt @@ -453,8 +453,8 @@ character_event = { } event_target:plot_target = { if = { - limit = { - is_invincible_trigger = yes + limit = { + is_invincible_trigger = yes } antideath_effect = yes @@ -471,8 +471,8 @@ character_event = { is_alive = yes } if = { - limit = { - is_invincible_trigger = yes + limit = { + is_invincible_trigger = yes } antideath_effect = yes diff --git a/events/wh_magic_lore_death.txt b/events/wh_magic_lore_death.txt index 347fc4ce..64b171a6 100644 --- a/events/wh_magic_lore_death.txt +++ b/events/wh_magic_lore_death.txt @@ -80,7 +80,7 @@ character_event = { chance = 35 leader = { if = { - limit = { + limit = { is_invincible_trigger = yes } antideath_effect = yes diff --git a/events/wh_magic_lore_nurgle.txt b/events/wh_magic_lore_nurgle.txt index 936cfd8f..70aafe5f 100644 --- a/events/wh_magic_lore_nurgle.txt +++ b/events/wh_magic_lore_nurgle.txt @@ -316,27 +316,27 @@ character_event = { random_list = { 20 = { location = { - spawn_disease = tuberculosis + spawn_disease = tuberculosis } } 20 = { location = { - spawn_disease = typhoid_fever + spawn_disease = typhoid_fever } } 20 = { location = { - spawn_disease = typhus + spawn_disease = typhus } } 20 = { location = { - spawn_disease = small_pox + spawn_disease = small_pox } } 20 = { location = { - spawn_disease = syphilis + spawn_disease = syphilis } } } diff --git a/events/wh_vampire_events.txt b/events/wh_vampire_events.txt index fb0d3178..bb6f602c 100644 --- a/events/wh_vampire_events.txt +++ b/events/wh_vampire_events.txt @@ -4444,7 +4444,7 @@ province_event = { name = EVTOPTAsvampires21 build_holding = { type = castle - holder = FROMFROM + holder = FROMFROM } } } @@ -6874,7 +6874,7 @@ character_event = { capital_scope = { build_holding = { type = tribal - holder = ROOT + holder = ROOT } } } diff --git a/events/wh_vampire_questing_events.txt b/events/wh_vampire_questing_events.txt index de79fc11..72b90990 100644 --- a/events/wh_vampire_questing_events.txt +++ b/events/wh_vampire_questing_events.txt @@ -196,7 +196,7 @@ letter_event = { clr_character_flag = athel_loren_questing clr_character_flag = chaos_wastes_questing clr_character_flag = ocean_questing - FROM = { + FROM = { remove_opinion = { who = ROOT modifier = opinion_blood_questing @@ -234,7 +234,7 @@ letter_event = { clr_character_flag = athel_loren_questing clr_character_flag = chaos_wastes_questing clr_character_flag = ocean_questing - remove_opinion = { + remove_opinion = { who = FROM modifier = opinion_blood_questing } @@ -308,7 +308,7 @@ character_event = { clr_character_flag = athel_loren_questing clr_character_flag = chaos_wastes_questing clr_character_flag = ocean_questing - FROM = { + FROM = { remove_opinion = { who = ROOT modifier = opinion_blood_questing @@ -408,7 +408,7 @@ character_event = { clr_character_flag = athel_loren_questing clr_character_flag = chaos_wastes_questing clr_character_flag = ocean_questing - FROM = { + FROM = { remove_opinion = { who = ROOT modifier = opinion_blood_questing @@ -4091,7 +4091,7 @@ character_event = { immediate = { log = "work event id = sblooddragons.28 for [Root.GetBestName]" - random_list = { + random_list = { # Everywhere - Duel with somebody # Everywhere - Band of Orcs VVV # Everywhere - Band of Ogre eating VVV diff --git a/events/wh_witch_hunters_election_events.txt b/events/wh_witch_hunters_election_events.txt index 41696153..3f6c277c 100644 --- a/events/wh_witch_hunters_election_events.txt +++ b/events/wh_witch_hunters_election_events.txt @@ -12,15 +12,15 @@ character_event = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 } } @@ -150,7 +150,7 @@ character_event = { title = d_witch_hunter_seat_4 title = d_witch_hunter_seat_5 title = d_witch_hunter_seat_6 - title = d_witch_hunter_seat_7 + title = d_witch_hunter_seat_7 title = d_witch_hunter_seat_8 title = d_witch_hunter_seat_9 title = d_witch_hunter_seat_10 @@ -223,13 +223,13 @@ character_event = { has_landed_title = d_witch_hunter_seat_3 has_landed_title = d_witch_hunter_seat_4 has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 } } character_event = { @@ -245,13 +245,13 @@ character_event = { title = d_witch_hunter_seat_3 title = d_witch_hunter_seat_4 title = d_witch_hunter_seat_5 - title = d_witch_hunter_seat_6 - title = d_witch_hunter_seat_7 - title = d_witch_hunter_seat_8 - title = d_witch_hunter_seat_9 - title = d_witch_hunter_seat_10 - title = d_witch_hunter_seat_11 - title = d_witch_hunter_seat_12 + title = d_witch_hunter_seat_6 + title = d_witch_hunter_seat_7 + title = d_witch_hunter_seat_8 + title = d_witch_hunter_seat_9 + title = d_witch_hunter_seat_10 + title = d_witch_hunter_seat_11 + title = d_witch_hunter_seat_12 } mercenary = yes } @@ -17588,15 +17588,15 @@ character_event = { has_landed_title = d_witch_hunter_seat_1 has_landed_title = d_witch_hunter_seat_2 has_landed_title = d_witch_hunter_seat_3 - has_landed_title = d_witch_hunter_seat_4 - has_landed_title = d_witch_hunter_seat_5 - has_landed_title = d_witch_hunter_seat_6 - has_landed_title = d_witch_hunter_seat_7 - has_landed_title = d_witch_hunter_seat_8 - has_landed_title = d_witch_hunter_seat_9 - has_landed_title = d_witch_hunter_seat_10 - has_landed_title = d_witch_hunter_seat_11 - has_landed_title = d_witch_hunter_seat_12 + has_landed_title = d_witch_hunter_seat_4 + has_landed_title = d_witch_hunter_seat_5 + has_landed_title = d_witch_hunter_seat_6 + has_landed_title = d_witch_hunter_seat_7 + has_landed_title = d_witch_hunter_seat_8 + has_landed_title = d_witch_hunter_seat_9 + has_landed_title = d_witch_hunter_seat_10 + has_landed_title = d_witch_hunter_seat_11 + has_landed_title = d_witch_hunter_seat_12 } } diff --git a/events/wh_witch_hunters_events.txt b/events/wh_witch_hunters_events.txt index e90a4bf4..5e1f4ea6 100644 --- a/events/wh_witch_hunters_events.txt +++ b/events/wh_witch_hunters_events.txt @@ -2199,8 +2199,8 @@ province_event = { option = { name = EVTOPTA_SOA_1024 build_holding = { - type = castle - holder = FROMFROM + type = castle + holder = FROMFROM } } } @@ -2638,8 +2638,8 @@ letter_event = { name = EVTOPTAswhunters23 FROM = { build_holding = { - type = castle - holder = FROMFROMFROM + type = castle + holder = FROMFROMFROM } } FROMFROMFROM = { diff --git a/history/characters/4000_amazon.txt b/history/characters/4000_amazon.txt index 9e93fdf9..2795e597 100644 --- a/history/characters/4000_amazon.txt +++ b/history/characters/4000_amazon.txt @@ -34,7 +34,7 @@ learning=6 add_trait =pretty - add_trait =creature_amazon + add_trait =creature_amazon mother=4000 2000.5.27={birth=yes} 2060.4.21={death=yes} diff --git a/history/characters/84000_talabeclander.txt b/history/characters/84000_talabeclander.txt index 12f2df17..3650e26f 100644 --- a/history/characters/84000_talabeclander.txt +++ b/history/characters/84000_talabeclander.txt @@ -17,7 +17,7 @@ add_trait=weak add_trait=gregarious add_trait=tall - add_trait=stone_breaker + add_trait=stone_breaker 1313.7.14={birth=yes} 1347.3.6={death=yes} } @@ -37,7 +37,7 @@ add_trait=fortune_builder add_trait=gluttonous add_trait=patient - add_trait=stone_breaker + add_trait=stone_breaker father=84022 1333.7.21={birth=yes} 1381.7.21={death=yes} @@ -56,7 +56,7 @@ add_trait=creature_human add_trait=skilled_tactician add_trait=kind - add_trait=stone_breaker + add_trait=stone_breaker father=84022 1339.10.14={birth=yes} 1391.10.14={death=yes} @@ -77,7 +77,7 @@ add_trait=duelist add_trait=diligent add_trait=zealous - add_trait=stone_breaker + add_trait=stone_breaker mother=84039 1353.6.18={birth=yes} 1398.6.18={death=yes} @@ -97,7 +97,7 @@ add_trait=underhanded_rogue add_trait=cruel add_trait=drunkard - add_trait=stone_breaker + add_trait=stone_breaker father=84041 1376.4.20={birth=yes} 1422.4.20={death=yes} @@ -117,7 +117,7 @@ add_trait=intricate_webweaver add_trait=kind add_trait=slothful - add_trait=stone_breaker + add_trait=stone_breaker father=84042 1412.3.26={birth=yes} 1424.3.26={death=yes} @@ -140,7 +140,7 @@ add_trait=deceitful add_trait=chaste add_trait=brave - add_trait=stone_breaker + add_trait=stone_breaker father=84042 1401.11.5={birth=yes} 1437.11.5={death=yes} @@ -159,7 +159,7 @@ add_trait=creature_human add_trait=underhanded_rogue add_trait=cynical - add_trait=stone_breaker + add_trait=stone_breaker father=84042 1395.6.7={birth=yes} 1449.6.7={death=yes} @@ -179,7 +179,7 @@ add_trait=charismatic_negotiator add_trait=greedy add_trait=zealous - add_trait=stone_breaker + add_trait=stone_breaker father=84042 1404.11.15={birth=yes} 1455.11.15={death=yes} @@ -222,7 +222,7 @@ add_trait=stone_breaker add_trait=skilled_tactician add_trait=cruel add_trait=temperate - add_trait=stone_breaker + add_trait=stone_breaker father=84047 1466.11.5={birth=yes} 1530.11.5={death=yes} @@ -242,7 +242,7 @@ add_trait=stone_breaker father=84048 add_trait=underhanded_rogue add_trait=envious - add_trait=stone_breaker + add_trait=stone_breaker 1512.4.26={birth=yes} 1577.4.26={death=yes} } @@ -263,7 +263,7 @@ add_trait=stone_breaker add_trait=skilled_tactician add_trait=cruel add_trait=patient - add_trait=stone_breaker + add_trait=stone_breaker 1545.10.7={birth=yes} 1589.10.7={death=yes} } @@ -280,7 +280,7 @@ add_trait=stone_breaker learning=6 add_trait=creature_human add_trait=fortune_builder - add_trait=stone_breaker + add_trait=stone_breaker mother=84050 1571.11.21={birth=yes} 1623.11.21={death=yes} @@ -300,7 +300,7 @@ add_trait=stone_breaker add_trait=intricate_webweaver add_trait=greedy add_trait=chaste - add_trait=stone_breaker + add_trait=stone_breaker father=84051 1594.5.5={birth=yes} 1631.5.5={death=yes} @@ -318,7 +318,7 @@ add_trait=stone_breaker learning=2 add_trait=creature_human add_trait=misguided_warrior - add_trait=stone_breaker + add_trait=stone_breaker father=84051 1597.5.12={birth=yes} 1637.5.12={death=yes} @@ -338,7 +338,7 @@ add_trait=stone_breaker add_trait=intricate_webweaver add_trait=cruel add_trait=just - add_trait=stone_breaker + add_trait=stone_breaker father=84051 1589.2.13={birth=yes} 1652.2.13={death=yes} @@ -359,7 +359,7 @@ add_trait=stone_breaker add_trait=ambitious add_trait=humble add_trait=honest - add_trait=stone_breaker + add_trait=stone_breaker father=84051 1602.3.29={birth=yes} 1653.3.29={death=yes} @@ -381,7 +381,7 @@ add_trait=stone_breaker add_trait=just add_trait=chaste add_trait=cynical - add_trait=stone_breaker + add_trait=stone_breaker 1645.4.2={birth=yes} 1655.4.2={death=yes} } @@ -399,7 +399,7 @@ add_trait=stone_breaker add_trait=creature_human father=84055 add_trait=misguided_warrior - add_trait=stone_breaker + add_trait=stone_breaker 1647.3.24={birth=yes} 1678.3.24={death=yes} } @@ -421,7 +421,7 @@ add_trait=stone_breaker add_trait=proud add_trait=cruel add_trait=just - add_trait=stone_breaker + add_trait=stone_breaker 1653.5.31={birth=yes} 1683.5.31={death=yes} } @@ -439,7 +439,7 @@ add_trait=stone_breaker add_trait=creature_human father=84058 add_trait=flamboyant_schemer - add_trait=stone_breaker + add_trait=stone_breaker 1671.4.19={birth=yes} 1737.4.19={death=yes} } @@ -659,7 +659,7 @@ add_trait=stone_breaker add_trait=envious add_trait=gregarious add_trait=cynical - add_trait=stone_breaker + add_trait=stone_breaker father=700303 1819.10.20={birth=yes} 1887.10.20={death=yes} @@ -707,7 +707,7 @@ add_trait=stone_breaker learning=4 add_trait=creature_human add_trait=grey_eminence - add_trait=stone_breaker + add_trait=stone_breaker father=700300 1932.5.11={birth=yes} 1998.5.11={death=yes} @@ -729,7 +729,7 @@ add_trait=stone_breaker add_trait=proud add_trait=envious add_trait=ambitious - add_trait=stone_breaker + add_trait=stone_breaker 1965.5.26={birth=yes} 2007.5.26={death=yes} } @@ -857,7 +857,7 @@ add_trait=stone_breaker add_trait=underhanded_rogue add_trait=celibate add_trait=humble - add_trait=stone_breaker + add_trait=stone_breaker father=700307 2050.6.28={birth=yes} 2100.6.28={death=yes} @@ -876,7 +876,7 @@ add_trait=stone_breaker add_trait=creature_human add_trait=intricate_webweaver add_trait=envious - add_trait=stone_breaker + add_trait=stone_breaker mother=84070 2076.8.30={birth=yes} 2101.8.30={death=yes} @@ -898,7 +898,7 @@ add_trait=stone_breaker add_trait=gluttonous add_trait=content add_trait=wroth - add_trait=stone_breaker + add_trait=stone_breaker mother=84070 2087.4.30={birth=yes} 2125.4.30={death=yes} @@ -918,7 +918,7 @@ add_trait=stone_breaker add_trait=creature_human add_trait=thrifty_clerk add_trait=wroth - add_trait=stone_breaker + add_trait=stone_breaker father=84072 2125.1.4={birth=yes} 2171.1.4={death=yes} @@ -936,7 +936,7 @@ add_trait=stone_breaker learning=7 add_trait=creature_human add_trait=fortune_builder - add_trait=stone_breaker + add_trait=stone_breaker mother=84074 2151.4.2={birth=yes} 2208.4.2={death=yes} @@ -958,7 +958,7 @@ add_trait=stone_breaker add_trait=patient add_trait=temperate add_trait=kind - add_trait=stone_breaker + add_trait=stone_breaker father=84075 2198.3.27={birth=yes} 2267.3.27={death=yes} @@ -979,7 +979,7 @@ add_trait=stone_breaker add_trait=trusting add_trait=envious add_trait=gregarious - add_trait=stone_breaker + add_trait=stone_breaker mother=84076 2229.3.17={birth=yes} 2287.3.17={death=yes} diff --git a/history/provinces/1763 - Ganaina.txt b/history/provinces/1763 - Ganaina.txt index a1b087ed..05470dc7 100644 --- a/history/provinces/1763 - Ganaina.txt +++ b/history/provinces/1763 - Ganaina.txt @@ -19,5 +19,5 @@ religion = amazon terrain = jungle #History 2000.1.15 = { - b_ganaina = tb_ganaina + b_ganaina = tb_ganaina } diff --git a/history/provinces/1809 - Qu'ittax.txt b/history/provinces/1809 - Qu'ittax.txt index 375843d0..b4a6163c 100644 --- a/history/provinces/1809 - Qu'ittax.txt +++ b/history/provinces/1809 - Qu'ittax.txt @@ -16,5 +16,5 @@ religion = kukaili terrain = jungle #History 2000.1.15 = { - b_quittax = tb_quittax + b_quittax = tb_quittax } diff --git a/history/titles/c_black_fire_pass.txt b/history/titles/c_black_fire_pass.txt index f87033f5..ad60c7e6 100644 --- a/history/titles/c_black_fire_pass.txt +++ b/history/titles/c_black_fire_pass.txt @@ -6,5 +6,5 @@ law=succ_gavelkind liege=d_haz_drazh } 800.1.1={ - holder=0 + holder=0 } \ No newline at end of file diff --git a/history/titles/c_booming_peak.txt b/history/titles/c_booming_peak.txt index f87033f5..ad60c7e6 100644 --- a/history/titles/c_booming_peak.txt +++ b/history/titles/c_booming_peak.txt @@ -6,5 +6,5 @@ law=succ_gavelkind liege=d_haz_drazh } 800.1.1={ - holder=0 + holder=0 } \ No newline at end of file diff --git a/history/titles/c_cragmere.txt b/history/titles/c_cragmere.txt index 5426f24f..d640a8b4 100644 --- a/history/titles/c_cragmere.txt +++ b/history/titles/c_cragmere.txt @@ -6,6 +6,6 @@ law=succ_gavelkind liege=d_varnan } -2010.1.1={ +2010.1.1={ holder=13004 } \ No newline at end of file diff --git a/history/titles/c_karak_azgal.txt b/history/titles/c_karak_azgal.txt index 5e0f043f..1ac185dc 100644 --- a/history/titles/c_karak_azgal.txt +++ b/history/titles/c_karak_azgal.txt @@ -6,8 +6,8 @@ law=succ_gavelkind liege=d_karak_azgalzul } 1800.1.1={ - holder=53301 + holder=53301 } 2007.1.1={ - holder=53302 + holder=53302 } diff --git a/history/titles/c_karak_azul.txt b/history/titles/c_karak_azul.txt index b30bf5ea..d6d92b48 100644 --- a/history/titles/c_karak_azul.txt +++ b/history/titles/c_karak_azul.txt @@ -3,7 +3,7 @@ holder=53430 } 1062.1.29={ - holder=53431 + holder=53431 } 1221.4.15={ diff --git a/history/titles/c_kurgaz_grungon.txt b/history/titles/c_kurgaz_grungon.txt index d4309705..0bfb4692 100644 --- a/history/titles/c_kurgaz_grungon.txt +++ b/history/titles/c_kurgaz_grungon.txt @@ -3,7 +3,7 @@ holder=53525 } 1418.8.5={ - holder=53526 + holder=53526 } 1506.7.13={ diff --git a/history/titles/c_mount_bloodhorn.txt b/history/titles/c_mount_bloodhorn.txt index 46fd2423..4072ac02 100644 --- a/history/titles/c_mount_bloodhorn.txt +++ b/history/titles/c_mount_bloodhorn.txt @@ -4,7 +4,7 @@ holder=53532 } 1541.8.4={ - holder=53533 + holder=53533 } 1762.2.14={ diff --git a/history/titles/c_slayer_keep.txt b/history/titles/c_slayer_keep.txt index 3123101f..87dc73c9 100644 --- a/history/titles/c_slayer_keep.txt +++ b/history/titles/c_slayer_keep.txt @@ -5,7 +5,7 @@ holder=53201 } 46.5.19={ - holder=53202 + holder=53202 } 61.12.17={ diff --git a/history/titles/c_zhufbar.txt b/history/titles/c_zhufbar.txt index 24fd66c7..01ed4b74 100644 --- a/history/titles/c_zhufbar.txt +++ b/history/titles/c_zhufbar.txt @@ -4,7 +4,7 @@ liege=d_zhufbar } 892.9.16={ - holder=53236 + holder=53236 } 1074.12.9={ diff --git a/history/titles/d_grungozar.txt b/history/titles/d_grungozar.txt index ffd62e7c..cbff6ec0 100644 --- a/history/titles/d_grungozar.txt +++ b/history/titles/d_grungozar.txt @@ -3,7 +3,7 @@ holder=53525 } 1418.8.5={ - holder=53526 + holder=53526 } 1506.7.13={ diff --git a/history/titles/d_karak_azgalzul.txt b/history/titles/d_karak_azgalzul.txt index 4a465a61..551da97d 100644 --- a/history/titles/d_karak_azgalzul.txt +++ b/history/titles/d_karak_azgalzul.txt @@ -3,7 +3,7 @@ holder=53430 } 1062.1.29={ - holder=53431 + holder=53431 } 1221.4.15={ diff --git a/history/titles/d_karak_kadrin.txt b/history/titles/d_karak_kadrin.txt index ba317c21..7facbf0b 100644 --- a/history/titles/d_karak_kadrin.txt +++ b/history/titles/d_karak_kadrin.txt @@ -4,7 +4,7 @@ holder=53201 } 36.5.19={ - holder=53202 + holder=53202 } 67.12.17={ diff --git a/history/titles/d_sons_of_war.txt b/history/titles/d_sons_of_war.txt index 4dee68f0..d9cc8324 100644 --- a/history/titles/d_sons_of_war.txt +++ b/history/titles/d_sons_of_war.txt @@ -91,13 +91,13 @@ holder=53524 } 1431.9.19={ - holder=53266 + holder=53266 } 1539.12.17={ - holder=53267 + holder=53267 } 1875.12.17={ - holder=53268 + holder=53268 } \ No newline at end of file diff --git a/history/titles/d_zhufbar.txt b/history/titles/d_zhufbar.txt index 0a6d9e4f..52a18549 100644 --- a/history/titles/d_zhufbar.txt +++ b/history/titles/d_zhufbar.txt @@ -4,7 +4,7 @@ holder=53237 } 892.9.16={ - holder=53236 + holder=53236 } 1074.12.9={ diff --git a/history/titles/k_kadrin_ankor.txt b/history/titles/k_kadrin_ankor.txt index e0d60de0..ab6dc73a 100644 --- a/history/titles/k_kadrin_ankor.txt +++ b/history/titles/k_kadrin_ankor.txt @@ -4,7 +4,7 @@ holder=53201 } 36.5.19={ - holder=53202 + holder=53202 } 63.12.17={ diff --git a/history/titles/k_zhufbarak.txt b/history/titles/k_zhufbarak.txt index 86f7ffb7..cf98fa1d 100644 --- a/history/titles/k_zhufbarak.txt +++ b/history/titles/k_zhufbarak.txt @@ -8,7 +8,7 @@ holder=53237 } 892.9.16={ - holder=53236 + holder=53236 } 1074.12.9={ diff --git a/interface/coats_of_arms.txt b/interface/coats_of_arms.txt index 3a3f5f4e..fc2ac73a 100644 --- a/interface/coats_of_arms.txt +++ b/interface/coats_of_arms.txt @@ -1301,7 +1301,7 @@ culture = { { 242 217 163 } #1 "Sand { 248 236 216 } #2 "Bone" { 94 76 52 } #3 "Dust" - { 37 32 22 } #4 "Dark" + { 37 32 22 } #4 "Dark" { 135 59 61 } #5 "Ocra" { 147 23 43 } #6 "Carmine" { 103 69 68 } #7 "Night" @@ -1369,7 +1369,7 @@ culture = { { 242 217 163 } #1 "Sand { 248 236 216 } #2 "Bone" { 94 76 52 } #3 "Dust" - { 37 32 22 } #4 "Dark" + { 37 32 22 } #4 "Dark" { 135 59 61 } #5 "Ocra" { 147 23 43 } #6 "Carmine" { 103 69 68 } #7 "Night" @@ -1441,7 +1441,7 @@ culture = { { 242 217 163 } #1 "Sand { 248 236 216 } #2 "Bone" { 94 76 52 } #3 "Dust" - { 37 32 22 } #4 "Dark" + { 37 32 22 } #4 "Dark" { 135 59 61 } #5 "Ocra" { 147 23 43 } #6 "Carmine" { 103 69 68 } #7 "Night" @@ -1663,7 +1663,7 @@ culture = { } color = { - { 103 0 0 } #0 Sanguine Red + { 103 0 0 } #0 Sanguine Red { 140 58 58 } #1 Unsettling Umber { 176 0 30 } #2 Glistening Red { 205 55 34 } #3 Forge Fire Orange diff --git a/map/geographical_region.txt b/map/geographical_region.txt index be683d30..2d9af706 100644 --- a/map/geographical_region.txt +++ b/map/geographical_region.txt @@ -444,7 +444,7 @@ world_underempire = { } world_troll_country = { - duchies = { - d_kozdramask d_volkolamsk d_osasto d_lynsk d_the_czegniks d_tivar d_fjelljer d_ursfjord d_hulebjorn d_aponnia d_dypvann d_kalti + duchies = { + d_kozdramask d_volkolamsk d_osasto d_lynsk d_the_czegniks d_tivar d_fjelljer d_ursfjord d_hulebjorn d_aponnia d_dypvann d_kalti } } diff --git a/map/terrain.txt b/map/terrain.txt index 01a9ef76..36f1ed41 100644 --- a/map/terrain.txt +++ b/map/terrain.txt @@ -166,22 +166,22 @@ categories = { } ter_mount_dry = { type = mountain color = { 0 } priority = 0 } #dry mountain -ter_desert = { type = desert color = { 1 } priority = 1 } #desert +ter_desert = { type = desert color = { 1 } priority = 1 } #desert ter_jungle = { type = jungle color = { 2 } priority = 2 } #jungle ter_steppe = { type = steppe color = { 3 } priority = 3 } #steppe ter_wasteland = { type = wasteland color = { 4 } priority = 4 } #wasteland ter_mount_waste = { type = mountain color = { 5 } priority = 5 } #wasteland mountain ter_arctic = { type = arctic color = { 6 } priority = 6 } #arctic -ter_hills_green = { type = hills color = { 7 } priority = 7 } #green hills +ter_hills_green = { type = hills color = { 7 } priority = 7 } #green hills ter_mount_high = { type = mountain color = { 8 } priority = 8 } #high mountain ter_ice = { type = wasteland color = { 9 } priority = 9 } #ice ter_mount_snow = { type = mountain color = { 10 } priority = 10 } #mountain snow ter_mount_ice = { type = mountain color = { 11 } priority = 11 } #mountain icecap -ter_plains = { type = plains color = { 12 } priority = 12 } #plains +ter_plains = { type = plains color = { 12 } priority = 12 } #plains ter_farms = { type = farmlands color = { 13 } priority = 13 } #farmlands -ter_plains_dry = { type = plains color = { 14 } priority = 14 } #plains to desert +ter_plains_dry = { type = plains color = { 14 } priority = 14 } #plains to desert ter_water = { type = coastal_desert color = { 15 } priority = 15 } #fake water ter_mount_desert = { type = mountain color = { 16 } priority = 16 } #desert mountain diff --git a/music/songs.txt b/music/songs.txt index 66ac5ace..3670c98a 100644 --- a/music/songs.txt +++ b/music/songs.txt @@ -185,9 +185,9 @@ song = { NOT = { culture_group = asrai_group } NOT = { any_current_enemy = { culture_group = asrai_group } } NOT = { culture_group = asur_group } - NOT = { any_current_enemy = { culture_group = asur_group } } + NOT = { any_current_enemy = { culture_group = asur_group } } NOT = { culture_group = druchi_group } - NOT = { any_current_enemy = { culture_group = druchi_group } } + NOT = { any_current_enemy = { culture_group = druchi_group } } } } } @@ -203,9 +203,9 @@ song = { NOT = { culture_group = asrai_group } NOT = { any_current_enemy = { culture_group = asrai_group } } NOT = { culture_group = asur_group } - NOT = { any_current_enemy = { culture_group = asur_group } } + NOT = { any_current_enemy = { culture_group = asur_group } } NOT = { culture_group = druchi_group } - NOT = { any_current_enemy = { culture_group = druchi_group } } + NOT = { any_current_enemy = { culture_group = druchi_group } } } } } @@ -221,9 +221,9 @@ song = { NOT = { culture_group = asrai_group } NOT = { any_current_enemy = { culture_group = asrai_group } } NOT = { culture_group = asur_group } - NOT = { any_current_enemy = { culture_group = asur_group } } + NOT = { any_current_enemy = { culture_group = asur_group } } NOT = { culture_group = druchi_group } - NOT = { any_current_enemy = { culture_group = druchi_group } } + NOT = { any_current_enemy = { culture_group = druchi_group } } } } } @@ -239,7 +239,7 @@ song = { NOT = { culture_group = goblin_group } NOT = { any_current_enemy = { culture_group = goblin_group } } NOT = { culture_group = orc_group } - NOT = { any_current_enemy = { culture_group = orc_group } } + NOT = { any_current_enemy = { culture_group = orc_group } } } } } @@ -255,7 +255,7 @@ song = { NOT = { culture_group = goblin_group } NOT = { any_current_enemy = { culture_group = goblin_group } } NOT = { culture_group = orc_group } - NOT = { any_current_enemy = { culture_group = orc_group } } + NOT = { any_current_enemy = { culture_group = orc_group } } } } } @@ -271,7 +271,7 @@ song = { NOT = { culture_group = goblin_group } NOT = { any_current_enemy = { culture_group = goblin_group } } NOT = { culture_group = orc_group } - NOT = { any_current_enemy = { culture_group = orc_group } } + NOT = { any_current_enemy = { culture_group = orc_group } } } } }