Merge pull request #71 from CleverRaven/master

Merge pull request CleverRaven#37638 from Night-Pryanik/st-john-farm-…
fengjixuchui · Feb 2, 2020 · 0965c11 · 0965c11
2 parents cedbb63 + 0428604
commit 0965c11
Show file tree

Hide file tree

Showing 150 changed files with 144,449 additions and 134,755 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -77,7 +77,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "survival", 2 ] ],
     "time": "60 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ],
     "components": [ [ [ "stick", 12 ], [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "pine_bough", 24 ], [ "willowbark", 24 ] ] ],
     "pre_terrain": "t_pit_shallow",
     "post_terrain": "t_improvised_shelter"
@@ -620,7 +620,7 @@
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "60 m",
     "tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
-    "qualities": [ [ { "id": "SAW_M", "level": 1 }, { "id": "GLARE", "level": 2 } ] ],
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
     "components": [ [ [ "pipe", 6 ] ], [ [ "sheet_metal", 2 ] ] ],
     "pre_terrain": "t_floor",
     "post_terrain": "t_bars"
@@ -1214,7 +1214,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ],
     "time": "180 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ],
     "components": [ [ [ "rock", 12 ] ], [ [ "pebble", 50 ] ], [ [ "mortar_build", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "t_rock_wall_half"
@@ -1227,7 +1227,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ],
     "time": "180 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ],
     "components": [ [ [ "rock", 12 ] ], [ [ "mortar_build", 1 ] ] ],
     "pre_terrain": "t_rock_wall_half",
     "post_terrain": "t_rock_wall"
@@ -2658,7 +2658,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "40 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [
       [ [ "2x4", 8 ] ],
       [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ],
@@ -2675,7 +2675,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "40 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [
       [ [ "2x4", 4 ] ],
       [ [ "2x4", 4 ], [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ],
@@ -2693,7 +2693,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "40 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
     "pre_terrain": "t_water_moving_sh",
     "post_terrain": "t_dock"
@@ -2706,7 +2706,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "720 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "DIG", "level": 2 } ] ],
     "components": [ [ [ "wood_beam", 1 ] ], [ [ "spike", 4 ] ] ],
     "pre_terrain": "t_water_moving_dp",
     "post_terrain": "t_dock_deep_pile"
@@ -2719,7 +2719,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "120 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "log", 4 ] ], [ [ "spike", 8 ] ] ],
     "pre_terrain": "t_dock_deep_pile",
     "post_terrain": "t_dock_deep_frame"
@@ -2732,7 +2732,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ],
     "pre_terrain": "t_dock_deep_frame",
     "post_terrain": "t_dock_deep"
@@ -2771,7 +2771,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "30 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
     "pre_terrain": "t_water_sh",
     "post_terrain": "t_sh_bridge"
@@ -2783,7 +2783,7 @@
     "category": "FURN",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "25 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 36 ] ], [ [ "pebble", 200 ] ], [ [ "material_soil", 75 ] ] ],
     "post_terrain": "f_planter"
   },

diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -58,25 +58,6 @@
     },
     "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ]
   },
-  {
-    "id": "f_bitts",
-    "type": "furniture",
-    "name": "bitts",
-    "description": "Paired vertical iron posts mounted on a wharf, pier or quay.  They are used to secure mooring lines, ropes, hawsers, or cables.",
-    "symbol": "B",
-    "color": "light_gray",
-    "move_cost_mod": 2,
-    "coverage": 30,
-    "required_str": 0,
-    "bash": {
-      "str_min": 80,
-      "str_max": 200,
-      "sound": "metal screeching!",
-      "sound_fail": "clang!",
-      "items": [ { "item": "steel_chunk", "count": [ 5, 10 ] } ]
-    },
-    "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ]
-  },
   {
     "type": "furniture",
     "id": "f_shackle",

diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
@@ -176,29 +176,6 @@
     "max_volume": "875 L",
     "deconstruct": { "items": [ { "item": "camp_chair", "count": 1 } ] }
   },
-  {
-    "type": "furniture",
-    "id": "f_bench",
-    "name": "bench",
-    "symbol": "#",
-    "description": "Hobo bed.  Airy.  Use at your own risk.",
-    "color": "brown",
-    "move_cost_mod": 1,
-    "coverage": 35,
-    "comfort": 1,
-    "floor_bedding_warmth": -1500,
-    "bonus_fire_warmth_feet": 1000,
-    "required_str": 5,
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-    "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
-    "bash": {
-      "str_min": 12,
-      "str_max": 40,
-      "sound": "smash!",
-      "sound_fail": "whump.",
-      "items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_logstool",

diff --git a/data/json/furniture_and_terrain/furniture-signs.json b/data/json/furniture_and_terrain/furniture-signs.json
@@ -45,27 +45,6 @@
       "items": [ { "item": "2x4", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 2, 4 ] }, { "item": "splinter", "count": 2 } ]
     }
   },
-  {
-    "type": "furniture",
-    "id": "f_sign",
-    "name": "sign",
-    "symbol": "P",
-    "description": "Read it.  Warnings ahead.",
-    "color": "brown",
-    "examine_action": "sign",
-    "move_cost_mod": 1,
-    "coverage": 35,
-    "required_str": -1,
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SIGN" ],
-    "deconstruct": { "items": [ { "item": "2x4", "count": 3 }, { "item": "nail", "charges": [ 2, 5 ] } ] },
-    "bash": {
-      "str_min": 6,
-      "str_max": 40,
-      "sound": "smash!",
-      "sound_fail": "whump.",
-      "items": [ { "item": "2x4", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 2, 4 ] }, { "item": "splinter", "count": 2 } ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_sign_warning",

diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json
@@ -616,59 +616,6 @@
       "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 40 ] } ]
     }
   },
-  {
-    "id": "t_floor_waxed_y",
-    "type": "terrain",
-    "name": "painted waxed floor",
-    "description": "This section of wax flooring has been painted.",
-    "symbol": ".",
-    "color": "yellow",
-    "move_cost": 2,
-    "roof": "t_flat_roof",
-    "bash": {
-      "str_min": 50,
-      "str_max": 400,
-      "str_min_supported": 100,
-      "ter_set": "t_null",
-      "sound": "SMASH!",
-      "items": [ { "item": "wax", "count": [ 1, 3 ] } ]
-    },
-    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ]
-  },
-  {
-    "type": "terrain",
-    "id": "t_rad_platform",
-    "looks_like": "t_blue_floor",
-    "name": "radiation platform",
-    "description": "A dual purpose platform that serves as a containment, and as a device that exposes items places on in to the radioactive source, by temporarily hoisting the radioactive material stored within.  Operated from external console.",
-    "symbol": "0",
-    "color": "light_blue",
-    "move_cost": 100,
-    "flags": [ "TRANSPARENT", "REDUCE_SCENT", "PERMEABLE" ],
-    "bash": {
-      "str_min": 50,
-      "str_max": 400,
-      "ter_set": "t_pit",
-      "sound": "metal screeching!",
-      "sound_fail": "clang!",
-      "items": [
-        { "item": "scrap", "count": [ 4, 16 ] },
-        { "item": "steel_chunk", "count": [ 1, 6 ] },
-        { "item": "cobalt_60", "charges": [ 1, 5 ] },
-        { "item": "lead", "charges": [ 12, 18 ] }
-      ]
-    },
-    "deconstruct": {
-      "ter_set": "t_pit",
-      "items": [
-        { "item": "cable", "charges": [ 8, 16 ] },
-        { "item": "cobalt_60", "charges": [ 2, 10 ] },
-        { "item": "scrap", "count": [ 8, 16 ] },
-        { "item": "sheet_metal", "count": [ 5, 10 ] },
-        { "item": "lead", "count": [ 12, 18 ] }
-      ]
-    }
-  },
   {
     "type": "terrain",
     "id": "t_dirt_underground",

diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -1446,29 +1446,5 @@
       "items": [ { "item": "pointy_stick", "count": 4 }, { "item": "string_6", "count": 4 }, { "item": "tarp", "count": 1 } ]
     },
     "flags": [ "TRANSPARENT", "FLAMMABLE", "THIN_OBSTACLE", "INDOORS", "MOUNTABLE", "EASY_DECONSTRUCT" ]
-  },
-  {
-    "type": "terrain",
-    "id": "t_grave",
-    "name": "grave",
-    "looks_like": "t_dirtmound",
-    "description": "A dirt grave, with some grass growing on it.  At least some of the dead do actually rest in peace.",
-    "symbol": "#",
-    "color": "green",
-    "move_cost": 3,
-    "flags": [ "TRANSPARENT", "DIGGABLE", "MOUNTABLE", "NOCOLLIDE" ],
-    "bash": { "sound": "thump", "ter_set": "t_dirt", "str_min": 50, "str_max": 100, "str_min_supported": 100 }
-  },
-  {
-    "type": "terrain",
-    "id": "t_grave_new",
-    "name": "grave",
-    "looks_like": "t_dirtmound",
-    "description": "A fresh grave, covered with stones, either to keep something from digging it out or to keep one inside from digging out of it.  Two planks mark this place of someone's eternal rest.",
-    "symbol": "#",
-    "color": "brown",
-    "move_cost": 3,
-    "flags": [ "TRANSPARENT", "DIGGABLE", "MOUNTABLE", "NOCOLLIDE", "CONTAINER", "SEALED" ],
-    "bash": { "sound": "thump", "ter_set": "t_dirt", "str_min": 50, "str_max": 100, "str_min_supported": 100 }
   }
 ]
diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
@@ -428,6 +428,33 @@
       [ "300blk_casing", 80 ]
     ]
   },
+  {
+    "id": "casings",
+    "//": "casings list for shooting range.",
+    "type": "item_group",
+    "items": [
+      [ "9mm_casing", 100 ],
+      [ "22_casing", 95 ],
+      [ "38_casing", 75 ],
+      [ "40_casing", 80 ],
+      [ "44_casing", 35 ],
+      [ "45_casing", 65 ],
+      [ "454_casing", 10 ],
+      [ "500_casing", 10 ],
+      [ "57mm_casing", 10 ],
+      [ "46mm_casing", 10 ],
+      [ "762_casing", 85 ],
+      [ "762_51_casing", 50 ],
+      [ "223_casing", 85 ],
+      [ "3006_casing", 40 ],
+      [ "308_casing", 50 ],
+      [ "50_casing", 30 ],
+      [ "700nx_casing", 10 ],
+      [ "300_casing", 60 ],
+      [ "762R_casing", 10 ],
+      [ "32_casing", 70 ]
+    ]
+  },
   {
     "id": "ammo_casings_bulk",
     "type": "item_group",