Revert "[Aftershock] Move non scifi vehicle parts to Blaze Industries (…

…CleverRaven#47279)" I never intended for this to happen.
UmbralReaper · Feb 18, 2021 · 5d02657 · 5d02657
1 parent 758bd46
commit 5d02657
Show file tree

Hide file tree

Showing 10 changed files with 564 additions and 474 deletions.
diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json
@@ -29,6 +29,33 @@
     "symbol": ";",
     "color": "yellow"
   },
+  {
+    "id": "afs_fridge",
+    "category": "veh_parts",
+    "type": "GENERIC",
+    "name": { "str": "vehicle refrigerator" },
+    "description": "A household refrigerator with impressive capacity.  Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.",
+    "symbol": "{",
+    "color": "white",
+    "weight": "142882 g",
+    "volume": "300 L",
+    "price": 40000,
+    "price_postapoc": 10000,
+    "material": [ "steel" ],
+    "to_hit": -4,
+    "bashing": 8,
+    "flags": [ "DURABLE_MELEE" ],
+    "looks_like": "minifridge"
+  },
+  {
+    "id": "afs_freezer",
+    "category": "veh_parts",
+    "type": "GENERIC",
+    "name": { "str": "vehicle freezer" },
+    "copy-from": "afs_fridge",
+    "description": "This refurbished refrigerator has been stripped of much of its internal components and converted to run at a much lower temperature, causing it to serve as a freezer for more power.  Like its predecessor, it runs on vehicle power.",
+    "color": "light_blue"
+  },
   {
     "type": "GENERIC",
     "id": "afs_scrap_titanium",
@@ -45,6 +72,27 @@
     "bashing": 1,
     "to_hit": -2
   },
+  {
+    "type": "GENERIC",
+    "id": "afs_metal_rig",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "MetalMaster forge buddy", "str_pl": "MetalMaster forge buddies" },
+    "description": "From the makers of the best-selling* FOODCO kitchen buddy comes the MetalMaster forge buddy, for all your metalworking, firing, and welding needs!  It's just as clunky and awkward as the thing it's spinning off, and still requires a vehicle battery to function."
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_kitchen_rig",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "KitchenMaster cooking buddy", "str_pl": "KitchenMaster cooking buddies" },
+    "description": "Because it *clearly* needed one, this large all-in-one station provides the functions of FOODCO's kitchen buddy, now with complementary fume hoods and chemistry materials.  Why a chef would need a chemical rig is anyone's guess, but you can mount it on a vehicle to make use of it."
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_cooking_rig",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "cooking rig" },
+    "description": "Skillet, pot, hotplate, and chemistry set; everything you need to cook food and chemicals.  Includes proper fume vents and a separator, so you don't contaminate your food with toxic chemicals."
+  },
   {
     "id": "nuclear_waste",
     "type": "GENERIC",

diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json
@@ -22,209 +22,6 @@
     "flags": [ "TRADER_AVOID" ],
     "qualities": [ [ "SAW_M_FINE", 1 ], [ "SCREW_FINE", 1 ], [ "CUT_FINE", 2 ], [ "BIONIC_ASSEMBLY", 2 ] ]
   },
-  {
-    "id": "afs_fridge",
-    "category": "veh_parts",
-    "type": "GENERIC",
-    "name": { "str": "vehicle refrigerator" },
-    "description": "A household refrigerator with impressive capacity.  Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.",
-    "symbol": "{",
-    "color": "white",
-    "weight": "142882 g",
-    "volume": "300 L",
-    "price": 40000,
-    "price_postapoc": 10000,
-    "material": [ "steel" ],
-    "to_hit": -4,
-    "bashing": 8,
-    "flags": [ "DURABLE_MELEE" ],
-    "looks_like": "minifridge"
-  },
-  {
-    "type": "vehicle_part",
-    "id": "afs_fridge",
-    "copy-from": "minifridge",
-    "name": { "str": "refrigerator" },
-    "symbol": "{",
-    "categories": [ "cargo" ],
-    "color": "white",
-    "broken_color": "white",
-    "looks_like": "minifridge",
-    "durability": 400,
-    "description": "A medium-sized household refrigerator, converted to utilize vehicle power.  When turned on, food inside will be cooled, extending the time it has before spoiling.",
-    "epower": -100,
-    "size": 1200,
-    "item": "afs_fridge"
-  },
-  {
-    "type": "vehicle_part",
-    "id": "afs_freezer",
-    "copy-from": "minifreezer",
-    "name": { "str": "freezer" },
-    "symbol": "{",
-    "categories": [ "cargo" ],
-    "color": "light_blue",
-    "broken_color": "light_blue",
-    "looks_like": "minifridge",
-    "durability": 400,
-    "description": "A household fridge, converted to run at a much lower temperature and on vehicle power.  When turned on, food inside will be frozen, completely stopping it from spoiling.",
-    "epower": -120,
-    "size": 1200,
-    "item": "afs_freezer"
-  },
-  {
-    "type": "vehicle_part",
-    "id": "afs_metal_rig",
-    "name": { "str": "MetalMaster forge buddy" },
-    "symbol": "&",
-    "categories": [ "utility" ],
-    "color": "red",
-    "broken_symbol": "x",
-    "broken_color": "red",
-    "looks_like": "welding_rig",
-    "damage_modifier": 10,
-    "durability": 200,
-    "description": "A welding and metalworking station, powered by the vehicle's battery.  'e'xamine the forge rig to utilize its welder or soldering iron; you'll still need glare protection.",
-    "size": 200,
-    "item": "afs_metal_rig",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
-    },
-    "flags": [ "CARGO", "OBSTACLE", "COVERED" ],
-    "pseudo_tools": [ { "id": "welder", "hotkey": "w" }, { "id": "soldering_iron", "hotkey": "s" }, { "id": "forge" }, { "id": "kiln" } ],
-    "breaks_into": [
-      { "item": "steel_lump", "count": [ 3, 6 ] },
-      { "item": "steel_chunk", "count": [ 3, 6 ] },
-      { "item": "scrap", "count": [ 3, 6 ] },
-      { "item": "welder", "charges": 0, "prob": 50 },
-      { "item": "forge", "charges": 0, "prob": 50 },
-      { "item": "kiln", "charges": 0, "prob": 50 }
-    ]
-  },
-  {
-    "type": "vehicle_part",
-    "id": "afs_cooking_rig",
-    "name": { "str": "cooking rig" },
-    "symbol": "&",
-    "categories": [ "utility" ],
-    "color": "blue",
-    "broken_symbol": "x",
-    "broken_color": "blue",
-    "looks_like": "kitchen_unit",
-    "damage_modifier": 10,
-    "durability": 125,
-    "description": "An all-in-one kitchen unit and chemistry lab.  'e'xamine it to use its hotplate to heat up food or drinks.",
-    "size": 200,
-    "item": "afs_cooking_rig",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
-    },
-    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF" ],
-    "pseudo_tools": [
-      { "id": "water_faucet" },
-      { "id": "hotplate", "hotkey": "h" },
-      { "id": "pot" },
-      { "id": "pan" },
-      { "id": "chemistry_set" },
-      { "id": "electrolysis_kit" }
-    ],
-    "breaks_into": [
-      { "item": "steel_lump", "count": [ 6, 9 ] },
-      { "item": "steel_chunk", "count": [ 6, 9 ] },
-      { "item": "scrap", "count": [ 6, 9 ] },
-      { "item": "pot", "prob": 50 },
-      { "item": "pan", "prob": 50 },
-      { "item": "chemistry_set", "charges": 0, "prob": 50 },
-      { "item": "hotplate", "charges": 0, "prob": 50 }
-    ]
-  },
-  {
-    "type": "vehicle_part",
-    "id": "afs_kitchen_rig",
-    "name": { "str": "KitchenMaster cooking buddy" },
-    "symbol": "&",
-    "categories": [ "utility" ],
-    "color": "yellow",
-    "broken_symbol": "x",
-    "broken_color": "yellow",
-    "looks_like": "kitchen_unit",
-    "damage_modifier": 10,
-    "durability": 200,
-    "description": "An all-in-one kitchen unit, chemistry lab, and food preparation area.  'e'xamine it to use its hotplate to heat up food or drinks.",
-    "size": 200,
-    "item": "afs_kitchen_rig",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
-    },
-    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF" ],
-    "pseudo_tools": [
-      { "id": "water_faucet" },
-      { "id": "vac_sealer" },
-      { "id": "dehydrator" },
-      { "id": "food_processor" },
-      { "id": "press" },
-      { "id": "puller" },
-      { "id": "hotplate", "hotkey": "h" },
-      { "id": "pot" },
-      { "id": "pan" },
-      { "id": "chemistry_set" },
-      { "id": "electrolysis_kit" },
-      { "id": "water_purifier", "hotkey": "p" }
-    ],
-    "breaks_into": [
-      { "item": "steel_lump", "count": [ 9, 18 ] },
-      { "item": "steel_chunk", "count": [ 9, 18 ] },
-      { "item": "scrap", "count": [ 9, 18 ] },
-      { "item": "pot", "prob": 50 },
-      { "item": "pan", "prob": 50 },
-      { "item": "chemistry_set", "charges": 0, "prob": 50 },
-      { "item": "hotplate", "charges": 0, "prob": 50 },
-      { "item": "water_purifier", "charges": 0, "prob": 50 },
-      { "item": "vac_sealer", "charges": 0, "prob": 50 },
-      { "item": "dehydrator", "charges": 0, "prob": 50 },
-      { "item": "food_processor", "charges": 0, "prob": 50 },
-      { "item": "press", "prob": 50 }
-    ]
-  },
-  {
-    "id": "afs_freezer",
-    "category": "veh_parts",
-    "type": "GENERIC",
-    "name": { "str": "vehicle freezer" },
-    "copy-from": "afs_fridge",
-    "description": "This refurbished refrigerator has been stripped of much of its internal components and converted to run at a much lower temperature, causing it to serve as a freezer for more power.  Like its predecessor, it runs on vehicle power.",
-    "color": "light_blue"
-  },
-  {
-    "type": "GENERIC",
-    "id": "afs_metal_rig",
-    "copy-from": "vehicle_rig",
-    "name": { "str": "MetalMaster forge buddy", "str_pl": "MetalMaster forge buddies" },
-    "description": "From the makers of the best-selling* FOODCO kitchen buddy comes the MetalMaster forge buddy, for all your metalworking, firing, and welding needs!  It's just as clunky and awkward as the thing it's spinning off, and still requires a vehicle battery to function."
-  },
-  {
-    "type": "GENERIC",
-    "id": "afs_kitchen_rig",
-    "copy-from": "vehicle_rig",
-    "name": { "str": "KitchenMaster cooking buddy", "str_pl": "KitchenMaster cooking buddies" },
-    "description": "Because it *clearly* needed one, this large all-in-one station provides the functions of FOODCO's kitchen buddy, now with complementary fume hoods and chemistry materials.  Why a chef would need a chemical rig is anyone's guess, but you can mount it on a vehicle to make use of it."
-  },
-  {
-    "type": "GENERIC",
-    "id": "afs_cooking_rig",
-    "copy-from": "vehicle_rig",
-    "name": { "str": "cooking rig" },
-    "description": "Skillet, pot, hotplate, and chemistry set; everything you need to cook food and chemicals.  Includes proper fume vents and a separator, so you don't contaminate your food with toxic chemicals."
-  },
   {
     "id": "afs_bio_precision_solderers",
     "copy-from": "bionic_general",

diff --git a/data/mods/Aftershock/maps/furniture.json b/data/mods/Aftershock/maps/furniture.json
@@ -1,4 +1,70 @@
 [
+  {
+    "type": "furniture",
+    "id": "f_afs_fridge_vehicle",
+    "name": "vehicle refrigerator",
+    "symbol": "{",
+    "description": "This fridge has been converted to run off of a vehicle's power supply.  You'll need to take it down first.",
+    "color": "white",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] },
+    "max_volume": "1000 L",
+    "deployed_item": "afs_fridge",
+    "examine_action": "deployed_furniture",
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "sheet_metal", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 0, 3 ] },
+        { "item": "scrap", "count": [ 2, 8 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "cu_pipe", "count": [ 2, 4 ] },
+        { "item": "scrap_copper", "count": [ 1, 2 ] },
+        { "item": "motor_tiny", "prob": 25 }
+      ]
+    },
+    "looks_like": "f_fridge"
+  },
+  {
+    "type": "furniture",
+    "id": "f_afs_freezer_vehicle",
+    "name": "vehicle freezer",
+    "symbol": "{",
+    "description": "This fridge has been further refurbished, and runs at a much lower temperature.  You'll need to take it down first.",
+    "color": "light_blue",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] },
+    "max_volume": "1000 L",
+    "deployed_item": "afs_freezer",
+    "examine_action": "deployed_furniture",
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "sheet_metal", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 0, 3 ] },
+        { "item": "scrap", "count": [ 2, 8 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "cu_pipe", "count": [ 2, 4 ] },
+        { "item": "scrap_copper", "count": [ 1, 2 ] },
+        { "item": "motor_tiny", "prob": 25 }
+      ]
+    },
+    "looks_like": "f_fridge"
+  },
   {
     "type": "furniture",
     "id": "f_afs_escape_pod_seat",

diff --git a/...s/recipes/blaze_construction_recipes.json → ...mods/Aftershock/recipes/construction.json b/...s/recipes/blaze_construction_recipes.json → ...mods/Aftershock/recipes/construction.json
diff --git a/data/mods/Aftershock/recipes/recipes.json b/data/mods/Aftershock/recipes/recipes.json
@@ -245,6 +245,23 @@
     "//": "Conversion of a normal smartphone into an atomic one by replacing the power supply.",
     "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "processor", 1 ] ], [ [ "smart_phone", 1 ] ], [ [ "plut_cell", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "fake",
+    "result": "purifier_smart_shot",
+    "category": "CC_CHEM",
+    "subcategory": "CSC_CHEM_MUTAGEN",
+    "skill_used": "chemistry",
+    "skills_required": [ "firstaid", 6 ],
+    "difficulty": 10,
+    "time": 120000,
+    "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
+    "book_learn": [ [ "recipe_alpha", 9 ], [ "recipe_serum", 9 ] ],
+    "qualities": [ { "id": "CHEM", "level": 3 } ],
+    "components": [ [ [ "iv_purifier", 3 ] ], [ [ "afs_biomaterial_4", 2 ] ], [ [ "syringe", 1 ] ] ],
+    "//": "Biomaterial 4 was chosen for balance purposes, given the utility of this shot.",
+    "//2": "slimes are unlikely to make it into aftershock so might be a good idea to not have that in there -- MomBun"
+  },
   {
     "result": "laser_rifle_cheap",
     "type": "recipe",