Skip to content

hermetic: fix some events and clean up #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schwarherz merged 3 commits into from
Jul 12, 2023
Merged

hermetic: fix some events and clean up #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9db925f
ingredients: fix missing tooltip and duplicate window on inherit
nbmsc Jul 8, 2023
ac1293b
scrying: fix title lose checker and flag clean up
nbmsc Jul 8, 2023
7f0500b
invention: clear the correct flag
nbmsc Jul 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 69 additions & 83 deletions CleanSlate/common/scripted_effects/00_hermetic_effects.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,37 +1152,33 @@ add_western_zodiac_trait_effect = {
select_random_hermetic_ingredient_herb_effect = {
# Select first ingredient
if = {
limit = {
NOT = {
any_artifact = {
OR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}
}
}
limit = { has_selected_herb_ingredient_1_trigger = no }

random_artifact = {
limit = { is_ingredient_herb_trigger = yes }
limit = {
is_ingredient_herb_trigger = yes

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_1
}
}
# Select second ingredient
else_if = {
limit = {
NOT = {
any_artifact = {
has_artifact_flag = selected_ingredient_2
}
}
}
limit = { has_selected_herb_ingredient_2_trigger = no }

random_artifact = {
limit = {
is_ingredient_herb_trigger = yes
NOT = { has_artifact_flag = selected_ingredient_1 }

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_2
Expand All @@ -1193,37 +1189,33 @@ select_random_hermetic_ingredient_herb_effect = {
select_random_hermetic_ingredient_animal_part_effect = {
# Select first ingredient
if = {
limit = {
NOT = {
any_artifact = {
OR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}
}
}
limit = { has_selected_animal_part_ingredient_1_trigger = no }

random_artifact = {
limit = { is_ingredient_animal_part_trigger = yes }
limit = {
is_ingredient_animal_part_trigger = yes

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_1
}
}
# Select second ingredient
else_if = {
limit = {
NOT = {
any_artifact = {
has_artifact_flag = selected_ingredient_2
}
}
}
limit = { has_selected_animal_part_ingredient_2_trigger = no }

random_artifact = {
limit = {
is_ingredient_animal_part_trigger = yes
NOT = { has_artifact_flag = selected_ingredient_1 }

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_2
Expand All @@ -1234,37 +1226,33 @@ select_random_hermetic_ingredient_animal_part_effect = {
select_random_hermetic_ingredient_powder_effect = {
# Select first ingredient
if = {
limit = {
NOT = {
any_artifact = {
OR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}
}
}
limit = { has_selected_powder_ingredient_1_trigger = no }

random_artifact = {
limit = { is_ingredient_powder_trigger = yes }
limit = {
is_ingredient_powder_trigger = yes

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_1
}
}
# Select second ingredient
else_if = {
limit = {
NOT = {
any_artifact = {
has_artifact_flag = selected_ingredient_2
}
}
}
limit = { has_selected_powder_ingredient_2_trigger = no }

random_artifact = {
limit = {
is_ingredient_powder_trigger = yes
NOT = { has_artifact_flag = selected_ingredient_1 }

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_2
Expand All @@ -1275,37 +1263,33 @@ select_random_hermetic_ingredient_powder_effect = {
select_random_hermetic_ingredient_liquid_effect = {
# Select first ingredient
if = {
limit = {
NOT = {
any_artifact = {
OR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}
}
}
limit = { has_selected_liquid_ingredient_1_trigger = no }

random_artifact = {
limit = { is_ingredient_liquid_trigger = yes }
limit = {
is_ingredient_liquid_trigger = yes

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_1
}
}
# Select second ingredient
else_if = {
limit = {
NOT = {
any_artifact = {
has_artifact_flag = selected_ingredient_2
}
}
}
limit = { has_selected_liquid_ingredient_2_trigger = no }

random_artifact = {
limit = {
is_ingredient_liquid_trigger = yes
NOT = { has_artifact_flag = selected_ingredient_1 }

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_2
Expand All @@ -1316,15 +1300,17 @@ select_random_hermetic_ingredient_liquid_effect = {
# When it doesn't matter if it's a herb/animal part/metal/liquid
select_random_hermetic_ingredient_effect = {
if = {
limit = {
has_selected_ingredient_1_trigger = no
any_artifact = {
has_artifact_flag = ingredient
}
}
limit = { has_selected_ingredient_1_trigger = no }

random_artifact = {
limit = { has_artifact_flag = ingredient }
limit = {
has_artifact_flag = ingredient

NOR = {
has_artifact_flag = selected_ingredient_1
has_artifact_flag = selected_ingredient_2
}
}

set_artifact_flag = selected_ingredient_1
}
Expand Down
53 changes: 24 additions & 29 deletions CleanSlate/events/mnm_hermetics_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5112,7 +5112,7 @@ diploresponse_event = {
is_triggered_only = yes # sent from GRANT_LANDED_TITLE_INTERACTION_ACCEPT_EVENT

immediate = {
FROM = { set_character_flag = was_granted_title_voluntarily }
set_character_flag = was_granted_title_voluntarily
}
}

Expand All @@ -5125,17 +5125,18 @@ character_event = {
hide_window = yes
is_triggered_only = yes # on_new_holder(_inheritance/usurpation), 1 day delay to allow MNM.1217 to fire first.

trigger = {
FROMFROM = { is_alive = yes }
}

immediate = {
if = {
limit = { has_character_flag = was_granted_title_voluntarily }
clr_character_flag = was_granted_title_voluntarily
}
else = {
FROMFROM = { character_event = { id = MNM.1219 days = 3 } }
FROMFROM = {
if = {
limit = { is_alive = yes }
character_event = { id = MNM.1219 days = 3 }
}
}
}
}
}
Expand Down Expand Up @@ -9503,7 +9504,7 @@ character_event = {
clr_character_flag = war_invention
clr_character_flag = prosperity_invention
clr_character_flag = knowledge_invention
clr_character_flag = great_outcome
clr_character_flag = best_outcome
clr_character_flag = good_outcome
clr_character_flag = ok_outcome
}
Expand Down Expand Up @@ -16219,6 +16220,10 @@ character_event = {
is_triggered_only = yes
hide_window = yes

trigger = {
NOT = { has_character_flag = dealing_with_inherited_ingredients }
}

immediate = {
# FROMFROM = { save_event_target_as = previous_ingredient_owner } # does this work on dead folk?

Expand All @@ -16228,27 +16233,7 @@ character_event = {
}
else = {
set_character_flag = dealing_with_inherited_ingredients

if = {
limit = {
NOT = { has_character_flag = owns_inherited_ingredients }
}

set_character_flag = owns_inherited_ingredients
repeat_event = { id = MNM.5108 days = 10 } # if this is the first instance of this event, send this event again to check if you ever inherited more than one ingredient...
}
else_if = { # run second time around
limit = {
has_character_flag = owns_inherited_ingredients

any_artifact = {
count >= 2
has_artifact_flag = ingredient
}
}

repeat_event = { id = MNM.5109 } # send visible event
}
character_event = { id = MNM.5109 days = 10 } # send visible event
}
}
}
Expand Down Expand Up @@ -16281,6 +16266,17 @@ character_event = {

is_triggered_only = yes

trigger = {
any_artifact = {
count >= 2
has_artifact_flag = ingredient
}
}

fail_trigger_effect = {
clr_character_flag = dealing_with_inherited_ingredients
}

immediate = {
select_random_hermetic_ingredient_effect = yes
select_random_hermetic_ingredient_effect = yes
Expand All @@ -16307,7 +16303,6 @@ character_event = {

after = {
remove_selection_of_ingredients_effect = yes
clr_character_flag = owns_inherited_ingredients
clr_character_flag = dealing_with_inherited_ingredients
}
}
Expand Down
4 changes: 2 additions & 2 deletions CleanSlate/localisation/13_mnm_hermetics_events.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ EVTDESC_MNM_1214_B;Some time has passed since my pet died. Was this what my visi
EVTDESC_MNM_1214_B_lunatic;It has been some time since my pet left this world. I'm beginning to think it was no curse, but perhaps it was I? WHAT IF I FORETOLD ITS DEMISE?;Du temps a pass� depuis que mon animal de compagnie a quitt� ce monde. Je commence � penser que ce n'�tait pas une mal�diction, mais peut-�tre que c'�tait moi�? Et si j'avais pr�dis sa mort�?;Es ist schon eine Weile her, dass mein Haustier das Diesseits verlassen hat. Ich fange an zu glauben, dass es kein Fluch war, sondern vielleicht an mir gelegen haben k�nnte... WAS, WENN ICH SEIN ABLEBEN VORHERGESAGT HABE?;;Ha pasado un tiempo desde que mi mascota dej� este mundo. Empiezo a creer que no hab�a maldici�n y que quiz� fuera culpa m�a. �Y SI HUBIESE PREDICHO SU FALLECIMIENTO?;;;;;;;;;x
EVTDESC_MNM_1215_A;I have gained the [From.GetFullName]! I knew something good would happen!;J'ai obtenu [From.GetFullName]�! Je savais que quelque chose de bon arriverait�!;Ich habe Folgendes erhalten: [From.GetFullName]! Ich wusste, dass etwas Gutes geschehen w�rde!;;�He ganado [From.GetElLa] [From.GetFullName]! �Sab�a que pasar�a algo bueno!;;;;;;;;;x
EVTDESC_MNM_1215_B;I have gained the [From.GetFullName]! This is... not what I expected.;J'ai obtenu [From.GetFullName]�! Ce n'est pas ce � quoi je m'attendais.;Ich habe Folgendes erhalten: [From.GetFullName]! Das entspricht... nicht dem Erwarteten.;;�He ganado [From.GetElLa] [From.GetFullName]! Esto... no es lo que esperaba.;;;;;;;;;x
EVTDESC_MNM_1219_A;I have lost the [FromFromFrom.GetFullName]! I knew something bad would happen!;J'ai perdu [FromFromFrom.GetFullName]�! Je savais qu'un malheur arriverait�!;Ich habe Folgendes verloren: [FromFromFrom.GetFullName]! Ich wusste, dass etwas Schlimmes geschehen w�rde!;;�He perdido [FromFromFrom.GetElLa] [FromFromFrom.GetFullName]! �Sab�a que pasar�a algo malo!;;;;;;;;;x
EVTDESC_MNM_1219_B;I have lost the [FromFromFrom.GetFullName]! This is... not what I expected.;J'ai perdu [FromFromFrom.GetFullName]�! Ce n'est pas ce � quoi je m'attendais.;Ich habe Folgendes verloren: [FromFromFrom.GetFullName]! Das entspricht... nicht dem Erwarteten.;;�He perdido [FromFromFrom.GetElLa] [FromFromFrom.GetFullName]! Esto... no es lo que esperaba.;;;;;;;;;x
EVTDESC_MNM_1219_A;I have lost the [FromFrom.GetFullName]! I knew something bad would happen!;J'ai perdu [FromFrom.GetFullName]�! Je savais qu'un malheur arriverait�!;Ich habe Folgendes verloren: [FromFrom.GetFullName]! Ich wusste, dass etwas Schlimmes geschehen w�rde!;;�He perdido [FromFromFrom.GetElLa] [FromFrom.GetFullName]! �Sab�a que pasar�a algo malo!;;;;;;;;;x
EVTDESC_MNM_1219_B;I have lost the [FromFrom.GetFullName]! This is... not what I expected.;J'ai perdu [FromFrom.GetFullName]�! Ce n'est pas ce � quoi je m'attendais.;Ich habe Folgendes verloren: [FromFrom.GetFullName]! Das entspricht... nicht dem Erwarteten.;;�He perdido [FromFromFrom.GetElLa] [FromFrom.GetFullName]! Esto... no es lo que esperaba.;;;;;;;;;x
EVTDESC_MNM_1220_A;So I suppose the vision was about me having [Root.GetDisease]. I knew something bad would happen!;Donc je suppose que la vision �tait � propos de moi ayant [Root.GetDisease]. Je savais que quelque chose de mal allait se produire�!;Dann ging es in der Vision wohl darum, dass ich an [Root.GetDisease] erkranken w�rde. Ich wusste, dass etwas Schlimmes geschehen w�rde!;;Entonces, supongo que la visi�n me dec�a que contraer�a [Root.GetDisease]. �Sab�a que pasar�a algo malo!;;;;;;;;;x
EVTDESC_MNM_1220_B;So I suppose the vision was about me having [Root.GetDisease]. That could have been clearer, I think!;Donc je suppose que la vision �tait � propos de moi ayant [Root.GetDisease]. �a aurait pu �tre plus clair, je pense�!;Dann ging es in der Vision wohl darum, dass ich an [Root.GetDisease] erkranken w�rde. Das h�tte durchaus etwas klarer sein k�nnen, denke ich!;;Entonces, supongo que la visi�n me dec�a que contraer�a [Root.GetDisease]. �Podr�a haber sido un poco m�s clara!;;;;;;;;;x
EVTDESC_MNM_1221_A;So I suppose the vision was about my [GetFromRelation] having [From.GetDisease]. I knew something bad would happen!;Donc je suppose que la vision �tait � propos de m[From.GetOnA] [GetFromRelation] ayant [Root.GetDisease]. Je savais que quelque chose de mal allait se produire�!;Dann ging es in der Vision wohl darum, dass m[From.Geteineine] [GetFromRelation] an [From.GetDisease] erkranken w�rde. Ich wusste, dass etwas Schlimmes geschehen w�rde!;;Entonces, supongo que la visi�n dec�a que mi [GetFromRelation] contraer�a [From.GetDisease]. �Sab�a que pasar�a algo malo!;;;;;;;;;x
Expand Down