Merge pull request #37601 from BevapDin/hou

Deduplicate some JSON data:
CleverRaven · Jan 31, 2020 · f290077 · f290077
2 parents 2c8919d + 0e7f752
commit f290077
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 242 deletions.
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/items/obsolete.json b/data/json/items/obsolete.json
@@ -611,33 +611,6 @@
     },
     "flags": [ "TRADER_AVOID" ]
   },
-  {
-    "id": "tool_black_powder_bomb",
-    "type": "TOOL",
-    "category": "weapons",
-    "name": "black gunpowder bomb",
-    "description": "This is a tin can filled to the brim with black gunpowder and with a bit of fuse sticking out of it.",
-    "//": "40g of tin can and 250ml/412g of gunpowder",
-    "weight": "452 g",
-    "volume": "250 ml",
-    "price": 2500,
-    "to_hit": -2,
-    "material": [ "steel", "plastic" ],
-    "symbol": "*",
-    "color": "red",
-    "explode_in_fire": true,
-    "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } },
-    "use_action": {
-      "target": "tool_black_powder_bomb_act",
-      "msg": "You light the fuse on the black gunpowder bomb.  Throw it before it blows in your face!",
-      "target_charges": 3,
-      "active": true,
-      "need_fire": 1,
-      "menu_text": "Light fuse",
-      "type": "transform"
-    },
-    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB" ]
-  },
   {
     "id": "tool_black_powder_bomb_act",
     "type": "TOOL",
@@ -1091,20 +1064,21 @@
     }
   },
   {
+    "type": "GENERIC",
     "id": "broken_chickenbot",
     "looks_like": "broken_tripod",
-    "type": "TOOL",
-    "name": "inactive chicken walker",
-    "description": "This is an inactive chicken walker.  Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on.  If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.",
-    "weight": "190000 g",
-    "//": "cheating a bit with the volume due to lack of proper vehicle storage options",
-    "volume": "250 L",
-    "price": 100000000,
+    "symbol": ",",
+    "color": "green",
+    "name": "broken chickenbot",
+    "category": "other",
+    "description": "A broken chicken walker.  Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass.  Could be gutted for parts.",
+    "price": 1000,
+    "material": [ "steel", "plastic" ],
+    "weight": "1023850 g",
+    "volume": "1100 L",
+    "bashing": 20,
+    "cutting": 15,
     "to_hit": -3,
-    "bashing": 8,
-    "material": [ "steel" ],
-    "symbol": ";",
-    "color": "light_green",
     "use_action": {
       "type": "place_monster",
       "monster_id": "mon_chickenbot",
@@ -1177,23 +1151,6 @@
     "to_hit": -3,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
-  {
-    "type": "GENERIC",
-    "id": "broken_chickenbot",
-    "symbol": ",",
-    "color": "green",
-    "name": "broken chickenbot",
-    "category": "other",
-    "description": "A broken chicken walker.  Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass.  Could be gutted for parts.",
-    "price": 1000,
-    "material": [ "steel", "plastic" ],
-    "weight": "1023850 g",
-    "volume": "1100 L",
-    "bashing": 20,
-    "cutting": 15,
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
-  },
   {
     "type": "GENERIC",
     "id": "tripod_chassis",

diff --git a/data/json/overmap/overmap_special/campus.json b/data/json/overmap/overmap_special/campus.json
@@ -203,29 +203,6 @@
     "occurrences": [ 0, 0 ],
     "flags": [ "UNIQUE" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "campus_health",
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "campus_health_0_0_0_north" },
-      { "point": [ 0, 1, 0 ], "overmap": "campus_health_0_1_0_north" },
-      { "point": [ 0, 2, 0 ], "overmap": "campus_health_0_2_0_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "campus_health_0_0_1_north" },
-      { "point": [ 0, 1, 1 ], "overmap": "campus_health_0_1_1_north" },
-      { "point": [ 0, 2, 1 ], "overmap": "campus_health_0_2_1_north" },
-      { "point": [ 0, 0, 2 ], "overmap": "campus_health_0_0_2_north" },
-      { "point": [ 0, 1, 2 ], "overmap": "campus_health_0_1_2_north" },
-      { "point": [ 0, 2, 2 ], "overmap": "campus_health_0_2_2_north" },
-      { "point": [ 0, 0, 3 ], "overmap": "campus_health_0_0_3_north" },
-      { "point": [ 0, 1, 3 ], "overmap": "campus_health_0_1_3_north" },
-      { "point": [ 0, 2, 3 ], "overmap": "campus_health_0_2_3_north" }
-    ],
-    "locations": [ "wilderness" ],
-    "city_distance": [ 3, -1 ],
-    "city_sizes": [ 1, 16 ],
-    "occurrences": [ 0, 0 ],
-    "flags": [ "UNIQUE" ]
-  },
   {
     "type": "overmap_special",
     "id": "campus_health",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
@@ -79,16 +79,6 @@
     "see_cost": 2,
     "spawns": { "group": "GROUP_VANILLA", "population": [ 4, 12 ], "chance": 90 }
   },
-  {
-    "type": "overmap_terrain",
-    "id": "FEMA_le",
-    "name": "FEMA refugee camp",
-    "sym": "f",
-    "color": "i_blue",
-    "extras": "build",
-    "see_cost": 2,
-    "spawns": { "group": "GROUP_VANILLA", "population": [ 4, 12 ], "chance": 90 }
-  },
   {
     "type": "overmap_terrain",
     "id": "FEMA_blc",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
@@ -1490,13 +1490,6 @@
     "sym": "a",
     "color": "i_white"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "cs_public_space",
-    "copy-from": "generic_city_building",
-    "name": "public space",
-    "color": "i_white"
-  },
   {
     "type": "overmap_terrain",
     "id": "lake_dock_small",

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -362,20 +362,14 @@
     "id": "any_fat",
     "type": "requirement",
     "//": "Any type of raw fat.",
-    "components": [ [ [ "fat", 1 ], [ "mutant_fat", 1 ], [ "fat_tainted", 1 ] ] ]
+    "components": [ [ [ "fat", 1 ], [ "mutant_fat", 1 ], [ "fat_tainted", 1 ], [ "edible_fat", 1, "LIST" ], [ "fat_tainted", 1 ] ] ]
   },
   {
     "id": "edible_fat",
     "type": "requirement",
     "//": "Any type of edible raw fat.",
     "components": [ [ [ "fat", 1 ], [ "mutant_fat", 1 ], [ "human_fat", 1 ], [ "mutant_human_fat", 1 ] ] ]
   },
-  {
-    "id": "any_fat",
-    "type": "requirement",
-    "//": "Any type of raw fat.",
-    "components": [ [ [ "edible_fat", 1, "LIST" ], [ "fat_tainted", 1 ] ] ]
-  },
   {
     "id": "edible_tallow",
     "type": "requirement",