Refugee center cleanups (#77331)

* dino dave * door position * lobby cleanup
CleverRaven · Oct 31, 2024 · b329e34 · b329e34
1 parent 4b05bad
commit b329e34
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
@@ -405,7 +405,8 @@
       "effect": [
         { "math": [ "dave_castle_stage", "++" ] },
         { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] },
-        { "mapgen_update": "refcenter_unlock_roofstairs", "om_terrain": "evac_center_13" }
+        { "mapgen_update": "refcenter_unlock_roofstairs", "om_terrain": "evac_center_13" },
+        { "mapgen_update": "beggar_2_remove_lobbycardboard", "om_terrain": "evac_center_18" }
       ]
     }
   },
@@ -474,8 +475,14 @@
     "object": {
       "set": [
         { "point": "terrain", "id": "t_door_metal_c", "x": 1, "y": 14 },
-        { "point": "terrain", "id": "t_door_metal_c", "x": 22, "y": 14 }
+        { "point": "terrain", "id": "t_door_metal_c", "x": 21, "y": 14 }
       ]
     }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "beggar_2_remove_lobbycardboard",
+    "method": "json",
+    "object": { "set": [ { "line": "furniture", "id": "f_clear", "x": 6, "y": 1, "x2": 8, "y2": 1 } ] }
   }
 ]
diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json
@@ -240,6 +240,12 @@
     "id": "TALK_FREE_MERCHANTS_MERCHANT_BeggarsRecruited",
     "type": "talk_topic",
     "dynamic_line": "I appreciate it a lot, getting them somewhere safe.  I hope that's what you did, anyway.  In any case, having the lobby clear is a big help.  Even with the uh, cardboard guy still around, he's a lot easier to handle alone.",
+    "speaker_effect": {
+      "effect": [
+        { "mapgen_update": "shopkeep_lobby_cleanup1", "om_terrain": "evac_center_13" },
+        { "mapgen_update": "shopkeep_lobby_cleanup2", "om_terrain": "evac_center_18" }
+      ]
+    },
     "responses": [
       { "text": "I do believe we discussed a reward?", "topic": "TALK_FREE_MERCHANTS_MERCHANT_BeggarsRecruited_Reward" },
       { "text": "Just glad to help.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_Talk" }
@@ -373,5 +379,17 @@
         ]
       }
     ]
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "shopkeep_lobby_cleanup1",
+    "method": "json",
+    "object": { "set": [ { "square": "item_remove", "x": 5, "y": 22, "x2": 18, "y2": 23 } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "shopkeep_lobby_cleanup2",
+    "method": "json",
+    "object": { "set": [ { "square": "item_remove", "x": 5, "y": 0, "x2": 18, "y2": 2 } ] }
   }
 ]