Allow the Nunez family to pack up and move to Tacoma, not just talk a…

…bout it. (#57397) * start moving the nunez family * Finalize terrain IDs * Create bullet_trailer.json * Update bullet_trailer.json * Update bullet_trailer.json * Update Arrival_code.json * Update Arrival_code.json * Update Arrival_code.json * copy in some of my dialogue for pablo * some more pablo dialogue * dana dialogue * Update NPC_Dana_Tacoma.json * Add dialogue flag related to Dana's pregnancy allows you to ask about it later. * Update NPC_Dana_Tacoma.json This leaves her as a bit of a stub character, she should get some of her old conversation options back. * Update NPC_Pablo_Tacoma.json Improve dialogue conditionals, add stub missions. Needs dialogue to turn in the missions. * Update Arrival_code.json * Get ready to teleport NPCs Gonna need a little more here, and the dialogue needs to be set up so that they use the right dialogue after moving. * Update data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update refugee dana Make her stats fixed and change some her bread sale dialogue to be agnostic so that she can offer bread in Tacoma as well. need to review her mission dialogue and make sure it works. * refugee dana mission updates took the mission out of the default framework so that it can be offered by tacoma-dana as well. * Update NPC_Dana_Tacoma.json Add the last of the baking topic. Set up her skills and stats. * Update NPC_Pablo_Nunez.json * Update NPC_Pablo_Tacoma.json new gear and definition * Update Arrival_code.json integrate npc removal * Update bullet_trailer.json lint * Update NPC_Pablo_Nunez.json lint * Update Arrival_code.json lint * Update NPC_Dana_Tacoma.json lint * Update NPC_Pablo_Tacoma.json lint * Update bullet_trailer.json * Update bullet_trailer.json * Update bullet_trailer.json * Update bullet_trailer.json symbols * Update bullet_trailer.json * Update data/json/furniture_and_terrain/special_use/bullet_trailer.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review * Update data/json/furniture_and_terrain/special_use/bullet_trailer.json * Apply suggestions from code review * Apply suggestions from code review * Update data/json/furniture_and_terrain/special_use/bullet_trailer.json * Apply suggestions from code review * Apply suggestions from code review * Lint * Apply suggestions from code review Co-authored-by: Anton Simakov <[email protected]> * Update NPC_Pablo_Nunez.json * Update data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json Co-authored-by: Anton Simakov <[email protected]> * Update Arrival_code.json * Apply suggestions from code review * Update NPC_Pablo_Tacoma.json Add missing responses * several small fixes * further small fixes * almost all the errors now, except the dang cabinet * Fixes, then playtest fixes Fixed some issues with how the bakery was working, made sourdough easier to get * I.... I think it's working! * Update Arrival_code.json * Add a bit of a clue to the tacoma foreman * linting * hair change fix * Update data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Anton Simakov <[email protected]>
CleverRaven · Dec 21, 2023 · c5cf8ed · c5cf8ed
1 parent 94283ca
commit c5cf8ed
Show file tree

Hide file tree

Showing 8 changed files with 1,083 additions and 55 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
@@ -0,0 +1,291 @@
+[
+  {
+    "//": "These terrains are for generating a bullet trailer.  While they can be remixed in some ways, in general they will only fit with each other and will only produce a trailer in an east-west orientation with a south-facing door.  Furniture has to be made non-blocking and placed in the central path to work correctly.",
+    "type": "terrain",
+    "id": "t_bullettrailer_brownfloor",
+    "name": "brown laminate floor",
+    "roof": "t_metal_flat_roof",
+    "description": "A section of flooring made out of a tough, smooth material, colored in an atrocious mottled brown.",
+    "symbol": ".",
+    "color": "brown",
+    "copy-from": "t_linoleum_gray"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_nwall_westcorner",
+    "name": "bullet trailer exterior wall",
+    "copy-from": "t_scrap_wall",
+    "description": "A smooth wall of gleaming chrome, slightly dusty from the road.",
+    "flags": [ "SUPPORTS_ROOF", "WALL", "REDUCE_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "symbol": "LINE_OXOX",
+    "color": "light_gray"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_nwall",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_nwall_window",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "looks_like": "t_window",
+    "flags": [ "SUPPORTS_ROOF", "WALL", "REDUCE_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND", "TRANSPARENT" ],
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_nwall_eastcorner",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_wwall",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_ewall",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_inner_westcorner",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_inner_T",
+    "copy-from": "t_bullettrailer_nwall_westcorner",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "name": "bullet trailer interior wall",
+    "description": "A simple wall panelled in a coarsely textured grey laminate of some sort."
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_inner_eastcorner",
+    "copy-from": "t_bullettrailer_inner_T",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_westcorner",
+    "name": "bullet trailer exterior wall",
+    "description": "A smooth wall of gleaming chrome, slightly dusty from the road.",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_windows",
+    "symbol": "+",
+    "color": "light_blue",
+    "copy-from": "t_bullettrailer_nwall_window"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_door",
+    "symbol": "-",
+    "color": "light_gray",
+    "looks_like": "t_door_metal_c",
+    "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_WITH_WALL", "MINEABLE", "BLOCK_WIND", "SUPPORTS_ROOF" ],
+    "open": "t_bullettrailer_swall_door_o",
+    "copy-from": "t_bullettrailer_swall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_door_o",
+    "symbol": "/",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "looks_like": "t_door_metal_o",
+    "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "CONNECT_WITH_WALL", "MINEABLE", "BLOCK_WIND", "SUPPORTS_ROOF" ],
+    "copy-from": "t_bullettrailer_swall_westcorner",
+    "close": "t_bullettrailer_swall_door"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_wheels",
+    "symbol": "o",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_nwall_window"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_swall_westcorner"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_swall_eastcorner",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "copy-from": "t_bullettrailer_swall_westcorner"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_table_top",
+    "move_cost_mod": -1,
+    "description": "A small trailer table, designed to convert into a bed when not in use.",
+    "symbol": "T",
+    "color": "yellow",
+    "copy-from": "f_table"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_table_middle",
+    "symbol": "T",
+    "color": "yellow",
+    "copy-from": "f_bullettrailer_table_top"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_table_bottom",
+    "symbol": "T",
+    "color": "yellow",
+    "copy-from": "f_bullettrailer_table_top"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_cabinet",
+    "copy-from": "f_cupboard",
+    "name": "trailer cabinets",
+    "symbol": "n",
+    "color": "yellow",
+    "description": "Cramped trailer cabinets, with some inbuilt appliances taking up even more of the limited space.",
+    "move_cost_mod": 0
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_sink",
+    "name": "trailer sink",
+    "move_cost_mod": 0,
+    "symbol": "u",
+    "color": "brown",
+    "description": "A tiny metal sink and connected cabinet.",
+    "copy-from": "f_sink"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_desk",
+    "name": "mini desk",
+    "move_cost_mod": 20,
+    "symbol": "t",
+    "color": "brown",
+    "description": "A small wooden desk with a little attached bookshelf.",
+    "copy-from": "f_desk"
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_inner_door",
+    "name": "trailer bathroom door",
+    "description": "A gray textured door, rimmed in chrome, like a very tacky version of a ship's hatch.",
+    "move_cost": -1,
+    "symbol": "|",
+    "color": "light_gray",
+    "coverage": 100,
+    "flags": [ "NOITEM", "FLAMMABLE_ASH", "BLOCK_WIND", "REDUCE_SCENT", "DOOR" ],
+    "looks_like": "t_door_metal_c",
+    "open": "t_bullettrailer_inner_door_o",
+    "bash": {
+      "str_min": 10,
+      "str_max": 70,
+      "sound": "crunch!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [
+        { "item": "2x4", "count": [ 0, 5 ] },
+        { "item": "wood_panel", "count": [ 0, 1 ] },
+        { "item": "nail", "charges": [ 0, 5 ] },
+        { "item": "splinter", "count": [ 5, 10 ] }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_bullettrailer_inner_door_o",
+    "name": "trailer bathroom door",
+    "move_cost": 0,
+    "symbol": "/",
+    "color": "light_gray",
+    "coverage": 30,
+    "looks_like": "t_door_metal_o",
+    "description": "A gray textured door, rimmed in chrome, like a very tacky version of a ship's hatch.",
+    "flags": [ "NOITEM", "FLAMMABLE_ASH", "BLOCK_WIND", "DOOR", "MOUNTABLE", "TRANSPARENT" ],
+    "close": "t_bullettrailer_inner_door",
+    "bash": {
+      "str_min": 10,
+      "str_max": 70,
+      "sound": "crunch!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [
+        { "item": "2x4", "count": [ 0, 5 ] },
+        { "item": "wood_panel", "count": [ 0, 1 ] },
+        { "item": "nail", "charges": [ 0, 5 ] },
+        { "item": "splinter", "count": [ 5, 10 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_toilet",
+    "name": "travel toilet",
+    "description": "A tiny plastic toilet for use in a travel trailer.  Unlike a normal toilet, it doesn't store water locally for you to siphon out.",
+    "symbol": "b",
+    "color": "white",
+    "copy-from": "f_toilet"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_minisofa",
+    "name": "trailer sofa",
+    "symbol": "h",
+    "color": "red",
+    "description": "A folding trailer sofa with a durable, somewhat comfortable weave of coarse red fabric.",
+    "copy-from": "f_sofa"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_bed_foot",
+    "name": "trailer bed",
+    "symbol": "H",
+    "color": "green",
+    "description": "A small but comfy-looking double bed.",
+    "copy-from": "f_bed"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_bed_head",
+    "name": "trailer bed",
+    "symbol": "H",
+    "color": "green",
+    "description": "A small but comfy-looking double bed.",
+    "copy-from": "f_bed"
+  },
+  {
+    "type": "furniture",
+    "id": "f_bullettrailer_sign_danabakery",
+    "name": "plywood sign for 'Dana's Bakery'",
+    "symbol": "#",
+    "color": "red",
+    "description": "A spraypainted plywood sign reads 'Dana's Bakery' in red letters.",
+    "copy-from": "f_sign"
+  }
+]
diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json
@@ -598,10 +598,7 @@
         "random": true,
         "search_range": 120
       },
-      "update_mapgen": {
-        "om_terrain": "shelter_2_vandal",
-        "place_item": [ { "item": "laptop_boris", "x": 15, "y": 12 }, { "item": "mbag", "x": 15, "y": 12 } ]
-      }
+      "update_mapgen": { "place_item": [ { "item": "laptop_boris", "x": 15, "y": 12 }, { "item": "mbag", "x": 15, "y": 12 } ] }
     },
     "dialogue": {
       "describe": "Find Boris' son's laptop.",