Skip to content

Commit 5d0aa37

Browse files
schwarherzschwarherz
authored
Merge pull request #170 from nbmsc/fix_hermetic
hermetic: fix some events and clean up
2 parents 5540346 + 7f0500b commit 5d0aa37

File tree

3 files changed

+95
-114
lines changed

3 files changed

+95
-114
lines changed

‎CleanSlate/common/scripted_effects/00_hermetic_effects.txt‎

Lines changed: 69 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,37 +1152,33 @@ add_western_zodiac_trait_effect = {
11521152
select_random_hermetic_ingredient_herb_effect = {
11531153
# Select first ingredient
11541154
if = {
1155-
limit = {
1156-
NOT = {
1157-
any_artifact = {
1158-
OR = {
1159-
has_artifact_flag = selected_ingredient_1
1160-
has_artifact_flag = selected_ingredient_2
1161-
}
1162-
}
1163-
}
1164-
}
1155+
limit = { has_selected_herb_ingredient_1_trigger = no }
11651156

11661157
random_artifact = {
1167-
limit = { is_ingredient_herb_trigger = yes }
1158+
limit = {
1159+
is_ingredient_herb_trigger = yes
1160+
1161+
NOR = {
1162+
has_artifact_flag = selected_ingredient_1
1163+
has_artifact_flag = selected_ingredient_2
1164+
}
1165+
}
11681166

11691167
set_artifact_flag = selected_ingredient_1
11701168
}
11711169
}
11721170
# Select second ingredient
11731171
else_if = {
1174-
limit = {
1175-
NOT = {
1176-
any_artifact = {
1177-
has_artifact_flag = selected_ingredient_2
1178-
}
1179-
}
1180-
}
1172+
limit = { has_selected_herb_ingredient_2_trigger = no }
11811173

11821174
random_artifact = {
11831175
limit = {
11841176
is_ingredient_herb_trigger = yes
1185-
NOT = { has_artifact_flag = selected_ingredient_1 }
1177+
1178+
NOR = {
1179+
has_artifact_flag = selected_ingredient_1
1180+
has_artifact_flag = selected_ingredient_2
1181+
}
11861182
}
11871183

11881184
set_artifact_flag = selected_ingredient_2
@@ -1193,37 +1189,33 @@ select_random_hermetic_ingredient_herb_effect = {
11931189
select_random_hermetic_ingredient_animal_part_effect = {
11941190
# Select first ingredient
11951191
if = {
1196-
limit = {
1197-
NOT = {
1198-
any_artifact = {
1199-
OR = {
1200-
has_artifact_flag = selected_ingredient_1
1201-
has_artifact_flag = selected_ingredient_2
1202-
}
1203-
}
1204-
}
1205-
}
1192+
limit = { has_selected_animal_part_ingredient_1_trigger = no }
12061193

12071194
random_artifact = {
1208-
limit = { is_ingredient_animal_part_trigger = yes }
1195+
limit = {
1196+
is_ingredient_animal_part_trigger = yes
1197+
1198+
NOR = {
1199+
has_artifact_flag = selected_ingredient_1
1200+
has_artifact_flag = selected_ingredient_2
1201+
}
1202+
}
12091203

12101204
set_artifact_flag = selected_ingredient_1
12111205
}
12121206
}
12131207
# Select second ingredient
12141208
else_if = {
1215-
limit = {
1216-
NOT = {
1217-
any_artifact = {
1218-
has_artifact_flag = selected_ingredient_2
1219-
}
1220-
}
1221-
}
1209+
limit = { has_selected_animal_part_ingredient_2_trigger = no }
12221210

12231211
random_artifact = {
12241212
limit = {
12251213
is_ingredient_animal_part_trigger = yes
1226-
NOT = { has_artifact_flag = selected_ingredient_1 }
1214+
1215+
NOR = {
1216+
has_artifact_flag = selected_ingredient_1
1217+
has_artifact_flag = selected_ingredient_2
1218+
}
12271219
}
12281220

12291221
set_artifact_flag = selected_ingredient_2
@@ -1234,37 +1226,33 @@ select_random_hermetic_ingredient_animal_part_effect = {
12341226
select_random_hermetic_ingredient_powder_effect = {
12351227
# Select first ingredient
12361228
if = {
1237-
limit = {
1238-
NOT = {
1239-
any_artifact = {
1240-
OR = {
1241-
has_artifact_flag = selected_ingredient_1
1242-
has_artifact_flag = selected_ingredient_2
1243-
}
1244-
}
1245-
}
1246-
}
1229+
limit = { has_selected_powder_ingredient_1_trigger = no }
12471230

12481231
random_artifact = {
1249-
limit = { is_ingredient_powder_trigger = yes }
1232+
limit = {
1233+
is_ingredient_powder_trigger = yes
1234+
1235+
NOR = {
1236+
has_artifact_flag = selected_ingredient_1
1237+
has_artifact_flag = selected_ingredient_2
1238+
}
1239+
}
12501240

12511241
set_artifact_flag = selected_ingredient_1
12521242
}
12531243
}
12541244
# Select second ingredient
12551245
else_if = {
1256-
limit = {
1257-
NOT = {
1258-
any_artifact = {
1259-
has_artifact_flag = selected_ingredient_2
1260-
}
1261-
}
1262-
}
1246+
limit = { has_selected_powder_ingredient_2_trigger = no }
12631247

12641248
random_artifact = {
12651249
limit = {
12661250
is_ingredient_powder_trigger = yes
1267-
NOT = { has_artifact_flag = selected_ingredient_1 }
1251+
1252+
NOR = {
1253+
has_artifact_flag = selected_ingredient_1
1254+
has_artifact_flag = selected_ingredient_2
1255+
}
12681256
}
12691257

12701258
set_artifact_flag = selected_ingredient_2
@@ -1275,37 +1263,33 @@ select_random_hermetic_ingredient_powder_effect = {
12751263
select_random_hermetic_ingredient_liquid_effect = {
12761264
# Select first ingredient
12771265
if = {
1278-
limit = {
1279-
NOT = {
1280-
any_artifact = {
1281-
OR = {
1282-
has_artifact_flag = selected_ingredient_1
1283-
has_artifact_flag = selected_ingredient_2
1284-
}
1285-
}
1286-
}
1287-
}
1266+
limit = { has_selected_liquid_ingredient_1_trigger = no }
12881267

12891268
random_artifact = {
1290-
limit = { is_ingredient_liquid_trigger = yes }
1269+
limit = {
1270+
is_ingredient_liquid_trigger = yes
1271+
1272+
NOR = {
1273+
has_artifact_flag = selected_ingredient_1
1274+
has_artifact_flag = selected_ingredient_2
1275+
}
1276+
}
12911277

12921278
set_artifact_flag = selected_ingredient_1
12931279
}
12941280
}
12951281
# Select second ingredient
12961282
else_if = {
1297-
limit = {
1298-
NOT = {
1299-
any_artifact = {
1300-
has_artifact_flag = selected_ingredient_2
1301-
}
1302-
}
1303-
}
1283+
limit = { has_selected_liquid_ingredient_2_trigger = no }
13041284

13051285
random_artifact = {
13061286
limit = {
13071287
is_ingredient_liquid_trigger = yes
1308-
NOT = { has_artifact_flag = selected_ingredient_1 }
1288+
1289+
NOR = {
1290+
has_artifact_flag = selected_ingredient_1
1291+
has_artifact_flag = selected_ingredient_2
1292+
}
13091293
}
13101294

13111295
set_artifact_flag = selected_ingredient_2
@@ -1316,15 +1300,17 @@ select_random_hermetic_ingredient_liquid_effect = {
13161300
# When it doesn't matter if it's a herb/animal part/metal/liquid
13171301
select_random_hermetic_ingredient_effect = {
13181302
if = {
1319-
limit = {
1320-
has_selected_ingredient_1_trigger = no
1321-
any_artifact = {
1322-
has_artifact_flag = ingredient
1323-
}
1324-
}
1303+
limit = { has_selected_ingredient_1_trigger = no }
13251304

13261305
random_artifact = {
1327-
limit = { has_artifact_flag = ingredient }
1306+
limit = {
1307+
has_artifact_flag = ingredient
1308+
1309+
NOR = {
1310+
has_artifact_flag = selected_ingredient_1
1311+
has_artifact_flag = selected_ingredient_2
1312+
}
1313+
}
13281314

13291315
set_artifact_flag = selected_ingredient_1
13301316
}

‎CleanSlate/events/mnm_hermetics_events.txt‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5112,7 +5112,7 @@ diploresponse_event = {
51125112
is_triggered_only = yes # sent from GRANT_LANDED_TITLE_INTERACTION_ACCEPT_EVENT
51135113

51145114
immediate = {
5115-
FROM = { set_character_flag = was_granted_title_voluntarily }
5115+
set_character_flag = was_granted_title_voluntarily
51165116
}
51175117
}
51185118

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

5128-
trigger = {
5129-
FROMFROM = { is_alive = yes }
5130-
}
5131-
51325128
immediate = {
51335129
if = {
51345130
limit = { has_character_flag = was_granted_title_voluntarily }
51355131
clr_character_flag = was_granted_title_voluntarily
51365132
}
51375133
else = {
5138-
FROMFROM = { character_event = { id = MNM.1219 days = 3 } }
5134+
FROMFROM = {
5135+
if = {
5136+
limit = { is_alive = yes }
5137+
character_event = { id = MNM.1219 days = 3 }
5138+
}
5139+
}
51395140
}
51405141
}
51415142
}
@@ -9503,7 +9504,7 @@ character_event = {
95039504
clr_character_flag = war_invention
95049505
clr_character_flag = prosperity_invention
95059506
clr_character_flag = knowledge_invention
9506-
clr_character_flag = great_outcome
9507+
clr_character_flag = best_outcome
95079508
clr_character_flag = good_outcome
95089509
clr_character_flag = ok_outcome
95099510
}
@@ -16219,6 +16220,10 @@ character_event = {
1621916220
is_triggered_only = yes
1622016221
hide_window = yes
1622116222

16223+
trigger = {
16224+
NOT = { has_character_flag = dealing_with_inherited_ingredients }
16225+
}
16226+
1622216227
immediate = {
1622316228
# FROMFROM = { save_event_target_as = previous_ingredient_owner } # does this work on dead folk?
1622416229

@@ -16228,27 +16233,7 @@ character_event = {
1622816233
}
1622916234
else = {
1623016235
set_character_flag = dealing_with_inherited_ingredients
16231-
16232-
if = {
16233-
limit = {
16234-
NOT = { has_character_flag = owns_inherited_ingredients }
16235-
}
16236-
16237-
set_character_flag = owns_inherited_ingredients
16238-
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...
16239-
}
16240-
else_if = { # run second time around
16241-
limit = {
16242-
has_character_flag = owns_inherited_ingredients
16243-
16244-
any_artifact = {
16245-
count >= 2
16246-
has_artifact_flag = ingredient
16247-
}
16248-
}
16249-
16250-
repeat_event = { id = MNM.5109 } # send visible event
16251-
}
16236+
character_event = { id = MNM.5109 days = 10 } # send visible event
1625216237
}
1625316238
}
1625416239
}
@@ -16281,6 +16266,17 @@ character_event = {
1628116266

1628216267
is_triggered_only = yes
1628316268

16269+
trigger = {
16270+
any_artifact = {
16271+
count >= 2
16272+
has_artifact_flag = ingredient
16273+
}
16274+
}
16275+
16276+
fail_trigger_effect = {
16277+
clr_character_flag = dealing_with_inherited_ingredients
16278+
}
16279+
1628416280
immediate = {
1628516281
select_random_hermetic_ingredient_effect = yes
1628616282
select_random_hermetic_ingredient_effect = yes
@@ -16307,7 +16303,6 @@ character_event = {
1630716303

1630816304
after = {
1630916305
remove_selection_of_ingredients_effect = yes
16310-
clr_character_flag = owns_inherited_ingredients
1631116306
clr_character_flag = dealing_with_inherited_ingredients
1631216307
}
1631316308
}

‎CleanSlate/localisation/13_mnm_hermetics_events.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ EVTDESC_MNM_1214_B;Some time has passed since my pet died. Was this what my visi
5555
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
5656
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
5757
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
58-
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
59-
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
58+
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
59+
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
6060
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
6161
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
6262
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

0 commit comments

Comments
 (0)