Dear sweet David, it is time to go home. (#57291)

* Dave Updates 1 Ref center rooftops, cardboard fort mapgen update * Add cardboard terrain and Dave's mission movement * lint * Nearly complete - Adds the rest of Dave's mission framework - Adds Smokes dialogue - Tests and completes most of Dave's mission stuff - Minor Dave dialogue improvements Dave still does not move properly. * This isn't even Dave's final form but it is a much better point to leave him with.
CleverRaven · May 2, 2022 · dd1c695 · dd1c695
1 parent 200caf5
commit dd1c695
Show file tree

Hide file tree

Showing 9 changed files with 399 additions and 42 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -98,7 +98,7 @@
     "id": "f_cardboard_wall",
     "name": "cardboard wall",
     "symbol": "#",
-    "bgcolor": "brown",
+    "color": "brown",
     "move_cost_mod": -1,
     "coverage": 100,
     "description": "This is a pile of cardboard boxes that have been filled with rags and junk and stacked together like bricks to form a wall.",
@@ -116,8 +116,143 @@
       ]
     },
     "bash": {
-      "str_min": 8,
-      "str_max": 30,
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "crash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "box_large", "count": [ 0, 1 ] },
+        { "item": "box_medium", "count": [ 0, 2 ] },
+        { "item": "box_small", "count": [ 0, 4 ] },
+        { "item": "rag", "count": [ 20, 50 ] },
+        { "item": "paper", "count": [ 30, 80 ] },
+        { "item": "plastic_chunk", "count": [ 5, 20 ] },
+        { "item": "plastic_sheet", "count": [ 0, 2 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_cardboard_floor",
+    "name": "cardboard floor",
+    "symbol": "_",
+    "color": "brown",
+    "move_cost_mod": 0,
+    "description": "A flat floor made of sheets of cardboard duct-taped together overtop a plastic sheet.",
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "FLAT", "ORGANIC", "EASY_DECONSTRUCT" ],
+    "deconstruct": {
+      "items": [ { "item": "cardboard", "count": 10 }, { "item": "paper", "count": 50 }, { "item": "plastic_sheet", "count": 2 } ]
+    },
+    "bash": {
+      "str_min": 1,
+      "str_max": 10,
+      "sound": "crash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "cardboard", "count": [ 5, 9 ] },
+        { "item": "paper", "count": [ 10, 40 ] },
+        { "item": "plastic_sheet", "count": [ 1, 2 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_cardboard_roof",
+    "name": "cardboard roof",
+    "symbol": "_",
+    "color": "brown",
+    "move_cost_mod": 0,
+    "description": "A sloped roof made of cardboard boxes, stuffed with scrap cardboard and paper and layered atop each other.  Sheets of plastic are carefully arrayed on top to shed water.  It looks like it could last a season or two at least before crumbling.",
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "FLAT", "ORGANIC", "EASY_DECONSTRUCT", "ALLOW_ON_OPEN_AIR" ],
+    "deconstruct": {
+      "items": [
+        { "item": "box_small", "count": 10 },
+        { "item": "cardboard", "count": 10 },
+        { "item": "rag", "count": 10 },
+        { "item": "paper", "count": 50 },
+        { "item": "plastic_sheet", "count": 2 }
+      ]
+    },
+    "bash": {
+      "str_min": 1,
+      "str_max": 10,
+      "sound": "crash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "box_small", "count": [ 0, 10 ] },
+        { "item": "cardboard", "count": [ 5, 9 ] },
+        { "item": "paper", "count": [ 10, 40 ] },
+        { "item": "rag", "count": [ 0, 10 ] },
+        { "item": "plastic_sheet", "count": [ 1, 2 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_cardboard_door_o",
+    "name": "cardboard door",
+    "symbol": ".",
+    "color": "brown",
+    "move_cost_mod": 1,
+    "coverage": 100,
+    "description": "This is a pile of cardboard boxes that have been filled with rags and junk and stacked together like bricks to form a wall.  The largest box has been cut open and folded to form a makeshift door, which is open.",
+    "required_str": -1,
+    "flags": [ "NOITEM", "BLOCKSDOOR", "FLAMMABLE_ASH", "ORGANIC", "EASY_DECONSTRUCT", "BLOCK_WIND", "DOOR" ],
+    "deconstruct": {
+      "items": [
+        { "item": "box_large", "count": 1 },
+        { "item": "box_medium", "count": 2 },
+        { "item": "box_small", "count": 4 },
+        { "item": "rag", "count": 50 },
+        { "item": "paper", "count": [ 30, 80 ] },
+        { "item": "plastic_chunk", "count": 20 },
+        { "item": "plastic_sheet", "count": 2 }
+      ]
+    },
+    "bash": {
+      "str_min": 4,
+      "str_max": 12,
+      "sound": "crash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "box_large", "count": [ 0, 1 ] },
+        { "item": "box_medium", "count": [ 0, 2 ] },
+        { "item": "box_small", "count": [ 0, 4 ] },
+        { "item": "rag", "count": [ 20, 50 ] },
+        { "item": "paper", "count": [ 30, 80 ] },
+        { "item": "plastic_chunk", "count": [ 5, 20 ] },
+        { "item": "plastic_sheet", "count": [ 0, 2 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_cardboard_door",
+    "name": "cardboard door",
+    "symbol": "+",
+    "color": "brown",
+    "move_cost_mod": -1,
+    "coverage": 100,
+    "description": "This is a pile of cardboard boxes that have been filled with rags and junk and stacked together like bricks to form a wall.  The largest box has been cut open and folded to form a makeshift door, which is closed.",
+    "required_str": -1,
+    "flags": [ "NOITEM", "FLAMMABLE_ASH", "ORGANIC", "EASY_DECONSTRUCT", "BLOCK_WIND", "DOOR" ],
+    "open": "f_cardboard_door_o",
+    "deconstruct": {
+      "items": [
+        { "item": "box_large", "count": 1 },
+        { "item": "box_medium", "count": 2 },
+        { "item": "box_small", "count": 4 },
+        { "item": "rag", "count": 50 },
+        { "item": "paper", "count": [ 30, 80 ] },
+        { "item": "plastic_chunk", "count": 20 },
+        { "item": "plastic_sheet", "count": 2 }
+      ]
+    },
+    "bash": {
+      "str_min": 4,
+      "str_max": 13,
       "sound": "crash!",
       "sound_fail": "whump.",
       "items": [

diff --git a/data/json/mapgen/refugee_center/refugee_center.json b/data/json/mapgen/refugee_center/refugee_center.json
@@ -181,7 +181,7 @@
         "......_______,,________,________ss..## 2    #  #D        ######       D#  #    2 ##..ss_________,________,,_______......",
         "......_______,,________,________ss..##~#~#rr#  #####P  hh#EEEE#S  d#####  #rr#~#~##..ss_________,________,,_______......",
         "......_______,,________,________ss..#########  #>>>#l2 TT#EEEE#S 2c#>>>#  #########..ss_________,________,,_______......",
-        "......_________________,________ss..##  #L L#  #   #l  hh#EEEE#cccc#   #  #L L#  ##..ss_________,_________________......",
+        "......_________________,________ss..##  #L L#  #<'2#l  hh#EEEE#cccc#2'<#  #L L#  ##..ss_________,_________________......",
         "......_______,,________,________ss..###+##+##++##=##11111#EEE6#1111##=##++##+##+###..ss_________,________,,_______......",
         "......_______,,________,________ss..##  P                ##  ##                  ##..ss_________,________,,_______......",
         "......_______,,________,________ss..!1                                           1!..ss_________,________,,_______......",

diff --git a/data/json/mapgen/refugee_center/z1_refugee_center.json b/data/json/mapgen/refugee_center/z1_refugee_center.json
@@ -55,10 +55,10 @@
         "                                    |.............................................3                                     ",
         "                                    |.............................................3                                     ",
         "                                    |.............................................3                                     ",
-        "                                    |......................&......................3                                     ",
-        "                                    |.............................................3                                     ",
-        "                                    |.............................................3                                     ",
-        "                                    |.............................................3                                     ",
+        "                                    |..........WWWWW.......&.......WWWWW..........3                                     ",
+        "                                    |..........WflfW...............WflfW..........3                                     ",
+        "                                    |..........W>ffW...............Wff>W..........3                                     ",
+        "                                    |..........WWMWW...............WWMWW..........3                                     ",
         "                                    |.............................................3                                     ",
         "                                    |......................:......................3                                     ",
         "                                    |.............................................3                                     ",
@@ -70,6 +70,13 @@
         "                                   5-.............................................-5                                    "
       ],
       "palettes": [ "roof_palette" ],
+      "terrain": {
+        ">": "t_stairs_down",
+        "W": "t_brick_wall",
+        "f": "t_thconc_floor",
+        "l": "t_thconc_floor_olight",
+        "M": "t_door_metal_locked"
+      },
       "furniture": { ":": "f_standing_tank", "#": "f_solar_unit", "&": "f_roof_turbine_vent" }
     }
   },

diff --git a/data/json/mapgen_palettes/refugee_center.json b/data/json/mapgen_palettes/refugee_center.json
@@ -17,6 +17,7 @@
       "!": "t_fence_barbed",
       "=": "t_door_metal_locked",
       ">": "t_stairs_down",
+      "<": "t_stairs_up",
       "E": "t_elevator",
       "U": "t_sidewalk",
       "V": "t_reinforced_glass",