diff --git a/CleanSlate/common/scripted_effects/00_hermetic_effects.txt b/CleanSlate/common/scripted_effects/00_hermetic_effects.txt index dcb966982..b7b8ce8f7 100644 --- a/CleanSlate/common/scripted_effects/00_hermetic_effects.txt +++ b/CleanSlate/common/scripted_effects/00_hermetic_effects.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 } diff --git a/CleanSlate/events/mnm_hermetics_events.txt b/CleanSlate/events/mnm_hermetics_events.txt index dfe674fb4..5a9c3bb98 100644 --- a/CleanSlate/events/mnm_hermetics_events.txt +++ b/CleanSlate/events/mnm_hermetics_events.txt @@ -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 } } @@ -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 } + } + } } } } @@ -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 } @@ -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? @@ -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 } } } @@ -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 @@ -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 } } diff --git a/CleanSlate/localisation/13_mnm_hermetics_events.csv b/CleanSlate/localisation/13_mnm_hermetics_events.csv index 1633bc230..baca0c6c3 100644 --- a/CleanSlate/localisation/13_mnm_hermetics_events.csv +++ b/CleanSlate/localisation/13_mnm_hermetics_events.csv @@ -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