fengjixuchui · fengjixuchui · Jan 9, 2020 · Jan 8, 2020 · Jan 8, 2020 · Jan 8, 2020
diff --git a/data/core/tips.json b/data/core/tips.json
@@ -119,11 +119,6 @@
     "category": "tip",
     "text": [ "Not much survives a car at 120mph.  Can you?" ]
   },
-  {
-    "type": "snippet",
-    "category": "tip",
-    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" ]
-  },
   {
     "type": "snippet",
     "category": "tip",
@@ -214,11 +209,6 @@
     "category": "tip",
     "text": [ "You're on fire?  Stop and wait to put it out." ]
   },
-  {
-    "type": "snippet",
-    "category": "tip",
-    "text": [ "Why it's called chicken walker?  Because you'll chicken out every time you'll see it." ]
-  },
   {
     "type": "snippet",
     "category": "tip",
@@ -289,11 +279,6 @@
     "category": "tip",
     "text": [ "Don't be afraid to make the game easier on yourself.  Worlds can be made to spawn with more resources." ]
   },
-  {
-    "type": "snippet",
-    "category": "tip",
-    "text": [ "Don't get caught with your pants down.  There's no toilet paper anymore anyway." ]
-  },
   {
     "type": "snippet",
     "category": "tip",

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1988,6 +1988,17 @@
     "pre_terrain": "t_window_alarm",
     "post_terrain": "t_window_bars_alarm"
   },
+  {
+    "type": "construction",
+    "description": "Install Bars Onto Window",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [ [ [ "nail", 4 ] ], [ [ "sheet", 2 ] ], [ [ "stick", 1 ] ], [ [ "string_36", 1 ] ] ],
+    "pre_terrain": "t_window_bars",
+    "post_terrain": "t_window_bars_curtains"
+  },
   {
     "type": "construction",
     "description": "Build Large Metal Support",

diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json
@@ -571,6 +571,65 @@
       "items": [ { "item": "glass_shard", "count": [ 34, 50 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_window_bars_curtains",
+    "name": "window with metal bars and curtains",
+    "description": "A barred window with fancy curtains that have been drawn shut, blocking sunlight and visibility.  The curtains can only be opened on the inside.  If you examined the curtains more closely, you could peek through the drapes or tear down everything.",
+    "symbol": "\"",
+    "looks_like": "t_curtains",
+    "color": "light_gray",
+    "move_cost": 0,
+    "coverage": 95,
+    "roof": "t_flat_roof",
+    "flags": [ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", "REDUCE_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ],
+    "examine_action": "curtains",
+    "open": "t_window_bars_domestic",
+    "bash": {
+      "str_min": 3,
+      "str_max": 6,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_window_bars",
+      "items": [
+        { "item": "glass_shard", "count": [ 34, 50 ] },
+        { "item": "sheet", "count": 2 },
+        { "item": "stick", "count": 1 },
+        { "item": "string_36", "count": 1 }
+      ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_window_bars_domestic",
+    "name": "window with metal bars and curtains",
+    "description": "A giant sheet of glass inserted into a window with thick security grilles, making it impossible to crawl through.  Typically installed for high-value stores, or at least stores in bad neighborhoods.  This one has been retrofitted with curtains.",
+    "symbol": "#",
+    "looks_like": "t_window_bars",
+    "color": "light_gray",
+    "move_cost": 0,
+    "roof": "t_flat_roof",
+    "flags": [ "TRANSPARENT", "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", "REDUCE_SCENT", "CONNECT_TO_WALL" ],
+    "examine_action": "curtains",
+    "close": "t_window_bars_curtains",
+    "bash": {
+      "str_min": 3,
+      "str_max": 6,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_window_bars",
+      "items": [
+        { "item": "glass_shard", "count": [ 34, 50 ] },
+        { "item": "sheet", "count": 2 },
+        { "item": "stick", "count": 1 },
+        { "item": "string_36", "count": 1 }
+      ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_window_stained_green",

diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -102,7 +102,7 @@
       { "item": "boots_combat" },
       { "item": "helmet_army", "prob": 80 },
       { "item": "gloves_tactical", "prob": 60 },
-      { "item": "ballistic_vest", "prob": 90 },
+      { "item": "ballistic_vest_esapi", "prob": 90 },
       { "item": "molle_pack", "prob": 85 },
       { "group": "clothing_tactical_leg", "prob": 15 },
       {
@@ -139,7 +139,7 @@
       { "item": "boots_combat" },
       { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 },
       { "collection": [ { "item": "gloves_liner", "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 },
-      { "item": "ballistic_vest", "prob": 90 },
+      { "item": "ballistic_vest_esapi", "prob": 90 },
       { "item": "molle_pack", "prob": 85 },
       { "group": "clothing_tactical_leg", "prob": 15 },
       {

diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json
@@ -1,10 +1,29 @@
 [
   {
-    "id": "ballistic_vest",
+    "id": "ballistic_vest_empty",
     "type": "ARMOR",
     "category": "armor",
     "//": "Based on US Army SPCS",
-    "name": { "str": "ballistic vest" },
+    "name": { "str": "empty ballistic vest" },
+    "description": "Ballistic armor without any armor inserts.  The soft armor plate carrier is still protective but it won't stop high energy projectiles.",
+    "weight": "2911 g",
+    "volume": "6 L",
+    "price": 160000,
+    "material": [ "nylon" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "covers": [ "TORSO" ],
+    "coverage": 85,
+    "encumbrance": 6,
+    "warmth": 15,
+    "material_thickness": 6,
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "ballistic_vest_esapi",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "ESAPI ballistic vest" },
     "description": "Ballistic armor with ESAPI ceramic armor plates.",
     "weight": "9911 g",
     "volume": "6 L",
@@ -17,6 +36,6 @@
     "encumbrance": 10,
     "warmth": 15,
     "material_thickness": 20,
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY" ]
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ]
   }
 ]
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -958,5 +958,10 @@
     "id": "40mm_teargas",
     "type": "MIGRATION",
     "replace": "40x46mm_m651"
+  },
+  {
+    "id": "ballistic_vest",
+    "type": "MIGRATION",
+    "replace": "ballistic_vest_esapi"
   }
 ]
diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -79,5 +79,31 @@
     "symbol": "=",
     "color": "dark_gray",
     "ammo_type": "components"
+  },
+  {
+    "id": "esapi_plate",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "ESAPI ballistic plate" },
+    "description": "A polygonal ceramic ballistic plate with a slightly concave profile.  Its inner surface is coated with Ultra High Molecular Weight Polyethylene, and is labelled \"TOP\", while its outer surface is labelled \"STRIKE FACE\".  This is intended to be worn in a ballistic vest and can withstand several high energy rifle rounds before breaking.",
+    "weight": "2500 g",
+    "volume": "1533 ml",
+    "price": 60000,
+    "material": "ceramic",
+    "symbol": ",",
+    "color": "dark_gray"
+  },
+  {
+    "id": "esbi_plate",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "ESBI ballistic plate" },
+    "description": "A polygonal ceramic ballistic plate with a slightly concave profile.  \"STRIKE FACE\" is printed on its outer surface.  This is designed to be worn in the sides of a plate carrier and can withstand several high energy rifle rounds before breaking.",
+    "weight": "1 kg",
+    "volume": "600 ml",
+    "price": 60000,
+    "material": "ceramic",
+    "symbol": ",",
+    "color": "dark_gray"
   }
 ]
diff --git a/data/json/mapgen/house/house_dogs.json b/data/json/mapgen/house/house_dogs.json
@@ -24,104 +24,89 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "house" ],
+    "om_terrain": [ "house_dogs" ],
     "weight": 100,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".###....P...............",
-        ".#---v----v;v----------.",
-        ".#|hk   | oooo       hv.",
-        ".#| k   +       nnn  hv.",
-        ".#|     |            h|.",
-        ".|-----+|             v.",
-        ".v      |         h   v.",
-        ".|d @@  |       h   h |.",
-        ".v  @@c |     | ---nn-|.",
-        ".|-----+-     |       |.",
-        ".|d           |      Ov.",
-        ".|d           |   CfSC|.",
-        ".|--+-|-+---+---v-----|.",
-        ".vB  S|...............q.",
-        ".|B  t|...............q.",
-        ".------...............q.",
-        ".q....................q.",
-        ".q....................q.",
-        ".q....................q.",
-        ".q....................q.",
-        ".q....................q.",
-        ".q....................q.",
-        ".QQQQQQQQQQQQQQQQQQQQQQ.",
+        ".!%%....p.---...........",
+        ".%###o####o*o##########.",
+        ".%#EI  y| RRRR   sHHHHo.",
+        ".%# I E +            Ho.",
+        ".%#P    |            H#.",
+        ".##||||+|        EsE so.",
+        ".o      |             o.",
+        ".#d @@  |       A A A #.",
+        ".o  @@s | hfh | ||JJJ|#^",
+        ".#|||||+| hfh |  Y    #.",
+        ".#U|d     hfh |6     Oo.",
+        ".#>+          |7432F51#.",
+        ".###+###&###&###o######.",
+        ".oB  S#^~~~~~~........$.",
+        ".#B8 t#%~~~~~~........$.",
+        ".######%~~~~~~........$.",
+        ".$....................$.",
+        ".$....................$.",
+        ".$....................$.",
+        ".$....................$.",
+        ".$....................$.",
+        ".$....................$.",
+        ".$$$$$$$$$$$$$$$$$$$$$$.",
         "........................"
       ],
+      "palettes": [ "standard_domestic_palette" ],
+      "terrain": {
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "$": "t_fence",
+        "~": "t_concrete",
+        "&": "t_door_glass_c",
+        "!": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ]
+      },
       "set": [
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
-        { "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] },
-        { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 1, 2 ] },
-        { "point": "terrain", "id": "t_tree", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 2, 6 ] },
+        { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": 0, "repeat": [ 1, 2 ] },
         { "point": "terrain", "id": "t_tree_young", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 3, 5 ] }
       ],
-      "terrain": {
-        "#": "t_shrub",
-        "+": "t_door_c",
-        "-": "t_wall",
-        ".": "t_grass",
-        ";": "t_door_locked",
-        "@": "t_floor",
-        "B": "t_floor",
-        "C": "t_floor",
-        "O": "t_floor",
-        "P": "t_grass",
-        "Q": "t_fence_h",
-        "S": "t_floor",
-        "c": "t_floor",
-        "d": "t_floor",
-        "f": "t_floor",
-        "h": "t_floor",
-        "k": "t_floor",
-        "n": "t_floor",
-        "o": "t_floor",
-        "q": "t_fence_v",
-        "v": "t_window_domestic",
-        "|": "t_wall"
-      },
-      "furniture": {
-        "@": "f_bed",
-        "B": "f_bathtub",
-        "C": "f_cupboard",
-        "O": "f_oven",
-        "P": "f_mailbox",
-        "S": "f_sink",
-        "c": "f_counter",
-        "d": "f_dresser",
-        "f": "f_fridge",
-        "h": "f_chair",
-        "k": "f_desk",
-        "n": "f_table",
-        "o": "f_bookcase"
-      },
-      "toilets": { "t": {  } },
-      "items": { "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
       "place_loot": [
-        { "group": "bed", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] },
-        { "group": "bedroom", "x": [ 2, 8 ], "y": [ 6, 8 ], "chance": 80, "repeat": [ 1, 4 ] },
-        { "group": "livingroom", "x": [ 9, 21 ], "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 5, "ammo": 90, "magazine": 100 },
-        { "group": "dresser", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 65, "repeat": [ 1, 2 ] },
-        { "group": "dresser", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 85, "repeat": [ 1, 4 ] },
-        { "group": "fridge", "x": [ 19, 19 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
-        { "group": "kitchen", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 85, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 18, 18 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 2 ] },
-        { "group": "kitchen", "x": [ 18, 20 ], "y": [ 7, 10 ], "chance": 65, "repeat": [ 1, 3 ] },
-        { "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "cleaning", "x": [ 2, 5 ], "y": [ 13, 14 ], "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "softdrugs", "x": [ 2, 5 ], "y": [ 12, 14 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "office", "x": [ 2, 7 ], "y": [ 2, 4 ], "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "dogfight", "x": [ 18, 18 ], "y": [ 17, 17 ], "chance": 95 }
+        { "group": "guns_pistol_common", "x": 4, "y": 10, "chance": 5, "ammo": 90, "magazine": 100 },
+        { "group": "dogfight", "x": 18, "y": 17, "chance": 95 }
       ],
       "place_monsters": [ { "monster": "GROUP_DOGS", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 1 } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_dogs_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "  |22222222222222222223 ",
+        "  |...................3 ",
+        "  |...................3 ",
+        "  |.............X.....3 ",
+        " |2...................3 ",
+        " |....................3 ",
+        " |....................3 ",
+        " |....................5 ",
+        " |....................3 ",
+        " |................&...3 ",
+        " |....................3 ",
+        " |....5---------------- ",
+        " |.=..3                 ",
+        " |....3                 ",
+        " |----3                 ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
   }
 ]