From e78e92928b286bc60c1635eca780f25a0c91995f Mon Sep 17 00:00:00 2001 From: Edmund <447ght@gmail.com> Date: Wed, 2 Oct 2024 01:32:40 -0400 Subject: [PATCH] 1.13 - resolve plague related errors --- .../wc_scheme_interactions.txt | 2 +- .../modifiers/wc_plague_scheme_modifiers.txt | 6 ++--- common/on_action/wc_plague_on_actions.txt | 21 ++------------- .../schemes/scheme_types/wc_plague_scheme.txt | 27 ++----------------- .../wc_plague_scheme_effects.txt | 4 +-- .../scripted_triggers/wc_plague_triggers.txt | 2 +- 6 files changed, 11 insertions(+), 51 deletions(-) diff --git a/common/character_interactions/wc_scheme_interactions.txt b/common/character_interactions/wc_scheme_interactions.txt index e1352905b7..2b0801dded 100644 --- a/common/character_interactions/wc_scheme_interactions.txt +++ b/common/character_interactions/wc_scheme_interactions.txt @@ -41,7 +41,7 @@ start_plague_interaction = { can_start_scheme = { type = plague - target = scope:recipient + target_character = scope:recipient } } } diff --git a/common/modifiers/wc_plague_scheme_modifiers.txt b/common/modifiers/wc_plague_scheme_modifiers.txt index a1b0d3eb1f..97e7f349f8 100644 --- a/common/modifiers/wc_plague_scheme_modifiers.txt +++ b/common/modifiers/wc_plague_scheme_modifiers.txt @@ -1,19 +1,19 @@ # Scheme modifiers plague_recruit_cultists_critical_success_modifier = { icon = intrigue_positive - personal_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value + scheme_phase_duration = minor_scheme_phase_duration_bonus_value scheme_success_chance = 15 } plague_recruit_cultists_success_modifier = { icon = intrigue_positive - personal_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value + scheme_phase_duration = minor_scheme_phase_duration_bonus_value scheme_success_chance = 10 } plague_recruit_cultists_failure_modifier = { icon = intrigue_negative - personal_scheme_phase_duration_add = minor_scheme_phase_duration_malus_value + scheme_phase_duration = minor_scheme_phase_duration_malus_value scheme_success_chance = -10 scheme_secrecy = -10 } diff --git a/common/on_action/wc_plague_on_actions.txt b/common/on_action/wc_plague_on_actions.txt index e36ae83bd2..1687f0e3b7 100644 --- a/common/on_action/wc_plague_on_actions.txt +++ b/common/on_action/wc_plague_on_actions.txt @@ -1,5 +1,5 @@ -# PLAGUE ON ACTIONS -## PLAGUE ON ACTIONS +## PLAGUE ON ACTIONS + plague_county_setup = { trigger = { exists = scope:owner @@ -156,8 +156,6 @@ plague_ongoing = { 50 = intrigue_scheme_ongoing.1008 # Agent close to being discovered 50 = intrigue_scheme_ongoing.1009 # Close relation is willing to join your scheme after all 50 = intrigue_scheme_ongoing.2003 # Discover a secret about someone else than your target - 100 = intrigue_scheme_ongoing.5019 # Find old architectural papers - 100 = intrigue_scheme_ongoing.5026 # Court chaplain is in on it ##Target: 100 = intrigue_scheme_ongoing.2001 # Trusting target @@ -166,21 +164,6 @@ plague_ongoing = { 50 = intrigue_scheme_ongoing.3001 # Being Just Causes Stress 50 = intrigue_scheme_ongoing.3002 # Being Compassionate Causes Pain ##Child target: - 200 = intrigue_scheme_ongoing.4001 # Agent is put in charge of a group of children - 200 = intrigue_scheme_ongoing.4002 # Child is gullible - 150 = intrigue_scheme_ongoing.4003 # Agent has second thoughts - ##Other - 100 = intrigue_scheme_ongoing.5001 # Distract guards with itching powder - 100 = intrigue_scheme_ongoing.5002 # Convince mystic to give target omen - 100 = intrigue_scheme_ongoing.5005 # Gift them poisonous gold - 100 = intrigue_scheme_ongoing.5009 # "Friend of Animals" gets some help - 10 = intrigue_scheme_ongoing.5011 # You mess up with venomous animals - 50 = intrigue_scheme_ongoing.5014 # You buy them a plush and exotic carpet - 100 = intrigue_scheme_ongoing.5016 # Lower their courtiers opinion of them - 50 = intrigue_scheme_ongoing.5017 # Lower their spouse's opinion of them - 100 = intrigue_scheme_ongoing.5018 # Target at war - send camp followers to them - 100 = intrigue_scheme_ongoing.5024 # Encourage local celebration - 100 = intrigue_scheme_ongoing.3005 # Messenger pigeon 100 = intrigue_scheme_ongoing.3003 # Mapping the local surroundings ############# diff --git a/common/schemes/scheme_types/wc_plague_scheme.txt b/common/schemes/scheme_types/wc_plague_scheme.txt index afd3f90f65..b218a963c5 100644 --- a/common/schemes/scheme_types/wc_plague_scheme.txt +++ b/common/schemes/scheme_types/wc_plague_scheme.txt @@ -60,16 +60,8 @@ agent_join_chance = { base = 0 + ai_agent_join_chance_basic_suite_modifier = yes plague_agent_join_chance_modifier = yes - - # Base Reluctance, including negative AI Energy - hostile_scheme_base_reluctance_modifier = yes - - #Is Owner sending a gift in the invite interaction? - hostile_scheme_with_gift_modifier = yes - - #Default Hostile Scheme modifiers - hostile_scheme_agent_base_join_chance_modifier = yes } base_success_chance = { @@ -81,12 +73,6 @@ scheme_war_success_chance_modifier = { value = -50 } } - agent_success_chance = { - base = 0 - - hostile_scheme_agent_success_chance_modifier = yes #Adds a value depending on their "closeness" to target - } - agent_leave_threshold = -25 on_start = { @@ -117,15 +103,8 @@ } } - on_agent_join = { - } - - on_agent_leave = { - #TODO random event of agent being like "they are plaguing and it's this guy", very low - } - on_monthly = { - hostile_scheme_discovery_chance_effect = yes + hostile_scheme_monthly_discovery_chance_effect = yes if = { limit = { NOT = { exists = scope:discovery_event_happening } @@ -137,6 +116,4 @@ } } } - - } \ No newline at end of file diff --git a/common/scripted_effects/wc_plague_scheme_effects.txt b/common/scripted_effects/wc_plague_scheme_effects.txt index e238e11862..ef76e11db0 100644 --- a/common/scripted_effects/wc_plague_scheme_effects.txt +++ b/common/scripted_effects/wc_plague_scheme_effects.txt @@ -232,13 +232,13 @@ recruit_cultists_critical_failure_effect = { start_plague_scheme_effect = { start_scheme = { type = plague - target = $TARGET$ + target_character = $TARGET$ } random_scheme = { limit = { scheme_type = plague - scheme_target = $TARGET$ + scheme_target_character = $TARGET$ } set_variable = { name = plague_center diff --git a/common/scripted_triggers/wc_plague_triggers.txt b/common/scripted_triggers/wc_plague_triggers.txt index 383ed55f2a..8aef10d612 100644 --- a/common/scripted_triggers/wc_plague_triggers.txt +++ b/common/scripted_triggers/wc_plague_triggers.txt @@ -23,6 +23,6 @@ can_start_plague_scheme_on_county_trigger = { } can_start_scheme = { type = plague - target = $COUNTY$.holder.top_liege + target_character = $COUNTY$.holder.top_liege } } \ No newline at end of file