Skip to content

Commit bd12018

Browse files
ProcyonaeProcyonae
authored
Fix tutorial trap messages popping more than once and showing first message always (#82339)
1 parent 40d161c commit bd12018

File tree

5 files changed

+35
-27
lines changed

5 files changed

+35
-27
lines changed

‎data/mods/MindOverMatter/obsolete/recipes.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_telekinesis", -1 ] ]
1616
],
1717
"flags": [ "SECRET", "BLIND_EASY" ],
18-
"result_eocs": [ "EOC_NULL" ]
18+
"result_eocs": [ "EOC_NONE" ]
1919
},
2020
{
2121
"type": "recipe",

‎data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"id": "EOC_ARVORE_BRIARS_SELECTOR",
121121
"effect": [
122122
{
123-
"run_eoc_selector": [ "EOC_ARVORE_BRIARS_SELECTOR_ARC", "EOC_ARVORE_BRIARS_SELECTOR_LINE", "EOC_NULL" ],
123+
"run_eoc_selector": [ "EOC_ARVORE_BRIARS_SELECTOR_ARC", "EOC_ARVORE_BRIARS_SELECTOR_LINE", "EOC_NONE" ],
124124
"names": [ "Thorny Arc", "Wall of Brambles", "Do nothing" ],
125125
"keys": [ "1", "2", "3" ],
126126
"descriptions": [ "Summon a spray of brambles to entrap an enemy.", "Summon a wall of thorns to fortify a location.", "Do nothing." ]
@@ -412,7 +412,7 @@
412412
"EOC_GROWING_WOOD_FLOORS",
413413
"EOC_GROWING_WOOD_DOORS",
414414
"EOC_GROWING_WOOD_BRANCHES",
415-
"EOC_NULL"
415+
"EOC_NONE"
416416
],
417417
"names": [ "Grow Wooden Wall", "Grow Wooden Floor", "Grow Wooden Door", "Grow Leafy Branch", "Do nothing" ],
418418
"keys": [ "1", "2", "3", "4", "5" ],
@@ -446,11 +446,6 @@
446446
"id": "EOC_GROWING_WOOD_DOORS",
447447
"effect": [ { "u_cast_spell": { "id": "arvore_growing_wood_walls_door" }, "targeted": true } ]
448448
},
449-
{
450-
"type": "effect_on_condition",
451-
"id": "EOC_NULL",
452-
"effect": [ ]
453-
},
454449
{
455450
"type": "effect_on_condition",
456451
"id": "EOC_MIND_CONTROL_POLLEN_ON",
@@ -928,7 +923,7 @@
928923
},
929924
{ "u_cast_spell": { "id": "arvore_turn_into_tree_banish", "message": "" } },
930925
{
931-
"run_eocs": "EOC_NULL",
926+
"run_eocs": "EOC_NONE",
932927
"beta_loc": { "global_val": "arvore_tree_transform_target" },
933928
"false_eocs": "EOC_ARVORE_VERDANT_IMPRISONMENT_SUCCESS"
934929
}
@@ -965,7 +960,7 @@
965960
"true_eocs": [ { "id": "EOC_ARVORE_VERDANT_IMPRISONMENT_DELETE_NPC_ITEMS", "effect": [ "npc_die" ] } ]
966961
},
967962
{
968-
"run_eocs": "EOC_NULL",
963+
"run_eocs": "EOC_NONE",
969964
"beta_loc": { "global_val": "arvore_tree_transform_target" },
970965
"false_eocs": "EOC_ARVORE_VERDANT_IMPRISONMENT_SUCCESS"
971966
}

‎data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
"EOC_RESHAPE_EARTH_CHURN_EARTH",
526526
"EOC_RESHAPE_EARTH_DIRT_TO_STONE",
527527
"EOC_RESHAPE_EARTH_STONE_TO_DIRT",
528-
"EOC_NULL"
528+
"EOC_NONE"
529529
],
530530
"names": [
531531
"Create or Destroy Wall",

‎data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"EOC_SYLPH_JUMP_HIGH_SELECTOR_TWO",
6161
"EOC_SYLPH_JUMP_HIGH_SELECTOR_FOUR",
6262
"EOC_SYLPH_JUMP_HIGH_SELECTOR_SIX",
63-
"EOC_NULL"
63+
"EOC_NONE"
6464
],
6565
"names": [ "Leap two stories up", "Leap four stories up", "Leap six stories up", "Cancel" ],
6666
"keys": [ "1", "2", "3", "4" ],

‎data/mods/dda_tutorial/traps.json‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[
22
{
33
"type": "trap",
4-
"id": "tr_tutorial_1",
4+
"//": "Should be an abstract but traps don't support abstracts rn",
5+
"id": "tr_tutorial",
56
"name": { "str": "tutorial message", "//~": "NO_I18N" },
67
"color": "white",
78
"symbol": "x",
@@ -11,6 +12,12 @@
1112
"always_invisible": true,
1213
"flags": [ "UNDODGEABLE", "AVATAR_ONLY" ],
1314
"action": "eocs",
15+
"eocs": [ "EOC_NONE" ]
16+
},
17+
{
18+
"type": "trap",
19+
"id": "tr_tutorial_1",
20+
"copy-from": "tr_tutorial",
1421
"eocs": [ "EOC_LESSON_LOOK" ]
1522
},
1623
{
@@ -27,7 +34,7 @@
2734
{
2835
"type": "trap",
2936
"id": "tr_tutorial_2",
30-
"copy-from": "tr_tutorial_1",
37+
"copy-from": "tr_tutorial",
3138
"eocs": [ "EOC_LESSON_MOVEMENT_MODES" ]
3239
},
3340
{
@@ -44,13 +51,15 @@
4451
{
4552
"type": "trap",
4653
"id": "tr_tutorial_3",
47-
"copy-from": "tr_tutorial_1",
54+
"copy-from": "tr_tutorial",
4855
"eocs": [ "EOC_LESSON_MONSTER_SIGHTED" ]
4956
},
5057
{
5158
"type": "effect_on_condition",
5259
"id": "EOC_LESSON_MONSTER_SIGHTED",
60+
"condition": { "math": [ "u_seen_LESSON_MONSTER_SIGHTED != 1" ] },
5361
"effect": [
62+
{ "math": [ "u_seen_LESSON_MONSTER_SIGHTED = 1" ] },
5463
{
5564
"u_message": "There is a <color_light_cyan>dummy</color> standing before you. Attack it by moving into it.\nYou'll receive a message warning you that safe mode is on. Safe mode prevents certain actions while hostiles are visible and within a certain configurable range as well as preventing you accidently attacking non-hostile creatures. You can turn it off with <keybind:safemode>.\n\nAfter you've dealt with it, please move to the door behind it.",
5665
"popup": true,
@@ -61,13 +70,15 @@
6170
{
6271
"type": "trap",
6372
"id": "tr_tutorial_4",
64-
"copy-from": "tr_tutorial_1",
73+
"copy-from": "tr_tutorial",
6574
"eocs": [ "EOC_LESSON_REACH_ATTACK" ]
6675
},
6776
{
6877
"type": "effect_on_condition",
6978
"id": "EOC_LESSON_REACH_ATTACK",
79+
"condition": { "math": [ "u_seen_LESSON_REACH_ATTACK != 1" ] },
7080
"effect": [
81+
{ "math": [ "u_seen_LESSON_REACH_ATTACK = 1" ] },
7182
{
7283
"u_message": "There is another <color_light_cyan>dummy</color> standing behind the counters. Most melee weapons require standing directly adjacent to your target in order to hit it.\n\nFortunately, some long weapons such as spears are able to perform reach attack with a range of 2 or 3, so if you have one, you don't need to climb onto the counters to stand next to the dummy. The <color_light_cyan>steel spear</color> has a range of 2, so you can hit the dummy right over the counters. To use the reach attack, press the <keybind:fire> key. Once you select your target, press <keybind:CONFIRM> to confirm.\n\nAfter you've dealt with the dummy, please move to the corridor to the south.",
7384
"popup": true,
@@ -78,7 +89,7 @@
7889
{
7990
"type": "trap",
8091
"id": "tr_tutorial_5",
81-
"copy-from": "tr_tutorial_1",
92+
"copy-from": "tr_tutorial",
8293
"eocs": [ "EOC_LESSON_HOLSTERS_WEAR" ]
8394
},
8495
{
@@ -95,7 +106,7 @@
95106
{
96107
"type": "trap",
97108
"id": "tr_tutorial_6",
98-
"copy-from": "tr_tutorial_1",
109+
"copy-from": "tr_tutorial",
99110
"eocs": [ "EOC_LESSON_GUN_LOAD" ]
100111
},
101112
{
@@ -112,7 +123,7 @@
112123
{
113124
"type": "trap",
114125
"id": "tr_tutorial_7",
115-
"copy-from": "tr_tutorial_1",
126+
"copy-from": "tr_tutorial",
116127
"eocs": [ "EOC_LESSON_INVENTORY" ]
117128
},
118129
{
@@ -129,7 +140,7 @@
129140
{
130141
"type": "trap",
131142
"id": "tr_tutorial_8",
132-
"copy-from": "tr_tutorial_1",
143+
"copy-from": "tr_tutorial",
133144
"eocs": [ "EOC_LESSON_FLASHLIGHT" ]
134145
},
135146
{
@@ -146,7 +157,7 @@
146157
{
147158
"type": "trap",
148159
"id": "tr_tutorial_9",
149-
"copy-from": "tr_tutorial_1",
160+
"copy-from": "tr_tutorial",
150161
"eocs": [ "EOC_LESSON_INTERACT" ]
151162
},
152163
{
@@ -163,7 +174,7 @@
163174
{
164175
"type": "trap",
165176
"id": "tr_tutorial_10",
166-
"copy-from": "tr_tutorial_1",
177+
"copy-from": "tr_tutorial",
167178
"eocs": [ "EOC_LESSON_REMOTE_USE" ]
168179
},
169180
{
@@ -180,13 +191,15 @@
180191
{
181192
"type": "trap",
182193
"id": "tr_tutorial_11",
183-
"copy-from": "tr_tutorial_1",
194+
"copy-from": "tr_tutorial",
184195
"eocs": [ "EOC_LESSON_CRAFTING_FOOD" ]
185196
},
186197
{
187198
"type": "effect_on_condition",
188199
"id": "EOC_LESSON_CRAFTING_FOOD",
200+
"condition": { "math": [ "u_seen_LESSON_CRAFTING_FOOD != 1" ] },
189201
"effect": [
202+
{ "math": [ "u_seen_LESSON_CRAFTING_FOOD = 1" ] },
190203
{
191204
"u_message": "Looks like you're hungry! The hunger status is indicated on the sidebar. Let's make a <color_light_cyan>peanut butter sandwich</color> from <color_light_cyan>peanut butter</color> and <color_light_cyan>crackers</color> on the counter next to the wall.\n\nTo make food, you need to use the <color_light_cyan>Crafting</color> menu. Press <keybind:craft> to open the menu. Press <keybind:NEXT_TAB> and <keybind:PREV_TAB> to toggle crafting categories and select the <color_light_cyan>FOOD</color> category. From there, select peanut butter sandwich and press <keybind:CONFIRM> to start crafting.\n\nNote that you don't need to stand directly near the counter to be able to craft. The <color_light_cyan>crafting radius</color> is 6 tiles, so while you're standing no farther than 6 tiles from any crafting components and tools, your character is able to still get them in order to use them.\n\nTo continue the tutorial, please craft the peanut butter sandwich and then eat it by pressing <keybind:eat>.",
192205
"popup": true,
@@ -197,7 +210,7 @@
197210
{
198211
"type": "trap",
199212
"id": "tr_tutorial_12",
200-
"copy-from": "tr_tutorial_1",
213+
"copy-from": "tr_tutorial",
201214
"eocs": [ "EOC_LESSON_CONSTRUCTION" ]
202215
},
203216
{
@@ -214,13 +227,13 @@
214227
{
215228
"type": "trap",
216229
"id": "tr_tutorial_13",
217-
"copy-from": "tr_tutorial_1",
230+
"copy-from": "tr_tutorial",
218231
"action": "none"
219232
},
220233
{
221234
"type": "trap",
222235
"id": "tr_tutorial_14",
223-
"copy-from": "tr_tutorial_1",
236+
"copy-from": "tr_tutorial",
224237
"eocs": [ "EOC_LESSON_THROWING" ]
225238
},
226239
{
@@ -237,7 +250,7 @@
237250
{
238251
"type": "trap",
239252
"id": "tr_tutorial_15",
240-
"copy-from": "tr_tutorial_1",
253+
"copy-from": "tr_tutorial",
241254
"eocs": [ "EOC_LESSON_FINALE" ]
242255
},
243256
{

0 commit comments

Comments
 (0)