Merge pull request #77879 from Procyonae/ObsoleteQueuedEoC

Fix nunez bullet trailer appearing out of nowhere
CleverRaven · Nov 17, 2024 · 0461e7d · 0461e7d
2 parents 9060e01 + fab5c03
commit 0461e7d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/data/json/furniture_and_terrain/special_use/bullet_trailer.json b/data/json/furniture_and_terrain/special_use/bullet_trailer.json
@@ -10,6 +10,13 @@
     "color": "brown",
     "copy-from": "t_linoleum_gray"
   },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_roof",
+    "name": "bullet trailer roof",
+    "description": "A smooth roof of gleaming chrome, slightly dusty from the road.",
+    "copy-from": "t_metal_flat_roof"
+  },
   {
     "type": "terrain",
     "id": "t_bullettrailer_nwall_westcorner",

diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
@@ -244,7 +244,7 @@
         { "npc_location_variable": { "context_val": "refcenter_nunez_departure" } },
         { "math": [ "_travel_time", "=", "time_since('cataclysm', 'unit': 'days') + 2" ] },
         {
-          "run_eocs": [ "EOC_Nunez_Travel" ],
+          "run_eocs": [ "EOC_Nunez_Travel_To_Tacoma" ],
           "time_in_future": { "context_val": "travel_time" },
           "variables": {
             "refcenter_nunez_departure": { "context_val": "refcenter_nunez_departure" },

diff --git a/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json b/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "EOC_Nunez_Travel",
+    "id": "EOC_Nunez_Travel_To_Tacoma",
     "type": "effect_on_condition",
     "effect": [
       { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] },
@@ -30,23 +30,17 @@
     "update_mapgen_id": "tacoma_nunez_trailer_arrive",
     "method": "json",
     "//": "In addition to basic mapgen, adds some point variables in the hopes that I can add some passive movement animations for pablo and dana.",
-    "object": {
-      "place_nested": [ { "chunks": [ "nunez_trailer" ], "x": 0, "y": 17 } ],
-      "place_npcs": [ { "class": "tacoma_DanaNunez", "x": 4, "y": 19 }, { "class": "tacoma_PabloNunez", "x": 4, "y": 20 } ],
-      "set": [
-        { "point": "variable", "id": "Pablo_relax", "x": 4, "y": 20 },
-        { "point": "variable", "id": "Dana_baking", "x": 4, "y": 19 }
-      ]
-    }
+    "object": { "flags": [ "NO_UNDERLYING_ROTATE" ], "place_nested": [ { "chunks": [ "nunez_trailer" ], "x": 5, "y": 15 } ] }
   },
   {
     "type": "mapgen",
     "method": "json",
     "nested_mapgen_id": "nunez_trailer",
     "//": "Nunez bakery inside a silver bullet trailer.",
     "object": {
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN", "NO_UNDERLYING_ROTATE" ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "mapgensize": [ 6, 6 ],
+      "rotation": [ 0 ],
       "rows": [
         "ABCDE ",
         "123456",
@@ -99,7 +93,32 @@
         "c": "f_bullettrailer_bed_head",
         "d": "f_bullettrailer_toilet",
         "i": "f_bullettrailer_sign_danabakery"
-      }
+      },
+      "place_npcs": [ { "class": "tacoma_DanaNunez", "x": 4, "y": 2 }, { "class": "tacoma_PabloNunez", "x": 4, "y": 3 } ],
+      "set": [
+        { "point": "variable", "id": "Pablo_relax", "x": 4, "y": 3 },
+        { "point": "variable", "id": "Dana_baking", "x": 4, "y": 2 }
+      ],
+      "place_nested": [ { "chunks": [ "nunez_trailer_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "nunez_trailer_roof",
+    "object": {
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "mapgensize": [ 6, 6 ],
+      "rotation": [ 0 ],
+      "rows": [
+        "      ",
+        "......",
+        "......",
+        "......",
+        "......",
+        "      "
+      ],
+      "terrain": { ".": "t_bullettrailer_roof" }
     }
   }
 ]
diff --git a/data/json/obsoletion_and_migration_0.I/obsolete_eoc.json b/data/json/obsoletion_and_migration_0.I/obsolete_eoc.json
@@ -30,5 +30,9 @@
   {
     "type": "effect_on_condition",
     "id": "eoc_conjunctivitis_itch"
+  },
+  {
+    "id": "EOC_Nunez_Travel",
+    "type": "effect_on_condition"
   }
 ]