From c60d11ab9220fe16037f2054509ffccaf334950b Mon Sep 17 00:00:00 2001
From: OzcarMike <43490-OzcarMike@users.noreply.gitgud.io>
Date: Mon, 25 Sep 2023 20:42:30 +0000
Subject: [PATCH 1/2] Use stress impact rather than add_stress for exhaurire
vitale effects.
---
.../regula_exhaurire_vitale_events.txt | 156 ++++++------------
1 file changed, 55 insertions(+), 101 deletions(-)
diff --git a/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt b/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
index 531795f6..b4f9380f 100644
--- a/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
+++ b/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
@@ -318,25 +318,20 @@ regula_exhaurire_vitale_event.0031 = {
increase_wounds_no_death_effect = { REASON = treatment }
- add_stress = {
- value = minor_stress_gain
- if = {
- limit = {
- OR = {
- has_trait = ambitious
- has_trait = compassionate
- has_trait = content
- has_trait = calm
- has_trait = just
- }
- }
- value = medium_stress_gain
- }
+ stress_impact = {
+ base = minor_stress_impact_gain
+ ambitious = medium_stress_impact_gain
+ compassionate = medium_stress_impact_gain
+ content = medium_stress_impact_gain
+ calm = medium_stress_impact_gain
+ just = medium_stress_impact_gain
}
scope:recipient = {
increase_wounds_no_death_effect = { REASON = treatment }
- add_stress = minor_stress_gain
+ stress_impact = {
+ base = minor_stress_impact_gain
+ }
}
if = { # If possible, do a reverse drain
@@ -370,24 +365,19 @@ regula_exhaurire_vitale_event.0032 = {
desc = regula_exhaurire_vitale_absorb_essence_bad.desc
right_icon = scope:recipient
- add_stress = {
- value = minor_stress_gain
- if = {
- limit = {
- OR = {
- has_trait = compassionate
- has_trait = content
- has_trait = calm
- has_trait = just
- }
- }
- value = medium_stress_gain
- }
+ stress_impact = {
+ base = minor_stress_impact_gain
+ compassionate = medium_stress_impact_gain
+ content = medium_stress_impact_gain
+ calm = medium_stress_impact_gain
+ just = medium_stress_impact_gain
}
scope:recipient = {
increase_wounds_no_death_effect = { REASON = treatment }
- add_stress = minor_stress_gain
+ stress_impact = {
+ base = minor_stress_impact_gain
+ }
}
random = {
@@ -416,33 +406,21 @@ regula_exhaurire_vitale_event.0033 = {
desc = regula_exhaurire_vitale_absorb_essence_good.desc
right_icon = scope:recipient
- add_stress = {
- value = minor_stress_gain
- if = {
- limit = {
- OR = {
- has_trait = compassionate
- has_trait = content
- has_trait = calm
- has_trait = just
- }
- }
- value = medium_stress_gain
- }
- if = {
- limit = {
- OR = {
- has_trait = ambitious
- has_trait = callous
- has_trait = sadistic
- }
- }
- value = minor_stress_loss
- }
+ stress_impact = {
+ base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_loss
+ callous = minor_stress_impact_loss
+ compassionate = medium_stress_impact_gain
+ content = medium_stress_impact_gain
+ calm = medium_stress_impact_gain
+ just = medium_stress_impact_gain
+ sadistic = minor_stress_impact_loss
}
scope:recipient = {
- add_stress = minor_stress_gain
+ stress_impact = {
+ base = minor_stress_impact_gain
+ }
random = {
chance = 25
@@ -472,33 +450,21 @@ regula_exhaurire_vitale_event.0034 = {
desc = regula_exhaurire_vitale_absorb_essence_great.desc
right_icon = scope:recipient
- add_stress = {
- value = minor_stress_gain
- if = {
- limit = {
- OR = {
- has_trait = compassionate
- has_trait = content
- has_trait = calm
- has_trait = just
- }
- }
- value = medium_stress_gain
- }
- if = {
- limit = {
- OR = {
- has_trait = ambitious
- has_trait = callous
- has_trait = sadistic
- }
- }
- value = minor_stress_loss
- }
+ stress_impact = {
+ base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_loss
+ callous = minor_stress_impact_loss
+ compassionate = minor_stress_impact_gain
+ content = minor_stress_impact_gain
+ calm = minor_stress_impact_gain
+ just = minor_stress_impact_gain
+ sadistic = minor_stress_impact_loss
}
scope:recipient = {
- add_stress = minor_stress_gain
+ stress_impact = {
+ base = minor_stress_impact_gain
+ }
}
random_list = {
@@ -537,33 +503,21 @@ regula_exhaurire_vitale_event.0035 = {
desc = regula_exhaurire_vitale_absorb_essence_fantastic.desc
right_icon = scope:recipient
- add_stress = {
- value = minor_stress_gain
- if = {
- limit = {
- OR = {
- has_trait = compassionate
- has_trait = content
- has_trait = calm
- has_trait = just
- }
- }
- value = medium_stress_gain
- }
- if = {
- limit = {
- OR = {
- has_trait = ambitious
- has_trait = callous
- has_trait = sadistic
- }
- }
- value = minor_stress_loss
- }
+ stress_impact = {
+ base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_loss
+ callous = minor_stress_impact_loss
+ compassionate = minor_stress_impact_gain
+ content = minor_stress_impact_gain
+ calm = minor_stress_impact_gain
+ just = minor_stress_impact_gain
+ sadistic = minor_stress_impact_loss
}
scope:recipient = {
- add_stress = minor_stress_gain
+ stress_impact = {
+ base = minor_stress_impact_gain
+ }
}
random_list = {
--
GitLab
From 23ee804022d5c43cd383f4cbba60c1094ae62e95 Mon Sep 17 00:00:00 2001
From: OzcarMike <43490-OzcarMike@users.noreply.gitgud.io>
Date: Mon, 25 Sep 2023 20:54:14 +0000
Subject: [PATCH 2/2] Adjust stress numbers since stress impact applies
multiple stress values - stress losses should overshoot the base in this
case.
---
.../regula_exhaurire_vitale_events.txt | 51 ++++++++++---------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt b/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
index b4f9380f..f57988e0 100644
--- a/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
+++ b/Regula_Magistri/events/interactions/regula_exhaurire_vitale_events.txt
@@ -319,18 +319,18 @@ regula_exhaurire_vitale_event.0031 = {
increase_wounds_no_death_effect = { REASON = treatment }
stress_impact = {
- base = minor_stress_impact_gain
- ambitious = medium_stress_impact_gain
- compassionate = medium_stress_impact_gain
- content = medium_stress_impact_gain
- calm = medium_stress_impact_gain
- just = medium_stress_impact_gain
+ base = medium_stress_impact_gain
+ ambitious = minor_stress_impact_gain
+ compassionate = minor_stress_impact_gain
+ content = minor_stress_impact_gain
+ calm = minor_stress_impact_gain
+ just = minor_stress_impact_gain
}
scope:recipient = {
increase_wounds_no_death_effect = { REASON = treatment }
stress_impact = {
- base = minor_stress_impact_gain
+ base = medium_stress_impact_gain
}
}
@@ -367,10 +367,10 @@ regula_exhaurire_vitale_event.0032 = {
stress_impact = {
base = minor_stress_impact_gain
- compassionate = medium_stress_impact_gain
- content = medium_stress_impact_gain
- calm = medium_stress_impact_gain
- just = medium_stress_impact_gain
+ compassionate = minor_stress_impact_gain
+ content = minor_stress_impact_gain
+ calm = minor_stress_impact_gain
+ just = minor_stress_impact_gain
}
scope:recipient = {
@@ -408,18 +408,19 @@ regula_exhaurire_vitale_event.0033 = {
stress_impact = {
base = minor_stress_impact_gain
- ambitious = minor_stress_impact_loss
- callous = minor_stress_impact_loss
- compassionate = medium_stress_impact_gain
- content = medium_stress_impact_gain
- calm = medium_stress_impact_gain
- just = medium_stress_impact_gain
- sadistic = minor_stress_impact_loss
+ ambitious = medium_stress_impact_loss
+ callous = medium_stress_impact_loss
+ compassionate = minor_stress_impact_gain
+ content = minor_stress_impact_gain
+ calm = minor_stress_impact_gain
+ just = minor_stress_impact_gain
+ sadistic = medium_stress_impact_loss
}
scope:recipient = {
stress_impact = {
base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_gain
}
random = {
@@ -452,18 +453,19 @@ regula_exhaurire_vitale_event.0034 = {
stress_impact = {
base = minor_stress_impact_gain
- ambitious = minor_stress_impact_loss
- callous = minor_stress_impact_loss
+ ambitious = medium_stress_impact_loss
+ callous = medium_stress_impact_loss
compassionate = minor_stress_impact_gain
content = minor_stress_impact_gain
calm = minor_stress_impact_gain
just = minor_stress_impact_gain
- sadistic = minor_stress_impact_loss
+ sadistic = medium_stress_impact_loss
}
scope:recipient = {
stress_impact = {
base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_gain
}
}
@@ -505,18 +507,19 @@ regula_exhaurire_vitale_event.0035 = {
stress_impact = {
base = minor_stress_impact_gain
- ambitious = minor_stress_impact_loss
- callous = minor_stress_impact_loss
+ ambitious = medium_stress_impact_loss
+ callous = medium_stress_impact_loss
compassionate = minor_stress_impact_gain
content = minor_stress_impact_gain
calm = minor_stress_impact_gain
just = minor_stress_impact_gain
- sadistic = minor_stress_impact_loss
+ sadistic = medium_stress_impact_loss
}
scope:recipient = {
stress_impact = {
base = minor_stress_impact_gain
+ ambitious = minor_stress_impact_gain
}
}
--
GitLab