Merge pull request #82637 from BalthazarArgall/OilPressAppliance

BalthazarArgall · web-flow · commit 6cfc519f4069 · 2025-09-03T01:10:30.000-05:00
Turn the electric oil press into an appliance
diff --git a/data/json/construction/appliances.json b/data/json/construction/appliances.json
@@ -899,5 +899,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance",
     "activity_level": "LIGHT_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "app_oil_press_industrial",
+    "group": "place_oil_press_industrial",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "oil_press_electric", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
   }
 ]
diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -2124,5 +2124,10 @@
     "type": "construction_group",
     "id": "place_deep_fryer",
     "name": "Place a deep fryer"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_oil_press_industrial",
+    "name": "Place an industrial oil press"
   }
 ]
diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
@@ -1141,5 +1141,35 @@
       { "item": "element", "count": [ 1, 2 ] },
       { "item": "cable", "charges": [ 1, 2 ] }
     ]
+  },
+  {
+    "id": "ap_oil_press_industrial",
+    "type": "vehicle_part",
+    "categories": [ "utility" ],
+    "name": "industrial oil press",
+    "description": "A heavy-duty press used to create vegetable oil from nuts or seeds.",
+    "looks_like": "f_machinery_light",
+    "variants": [ { "symbols": "Y", "symbols_broken": "#" } ],
+    "color": "green",
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "fake_oil_press_industrial" } ],
+    "item": "oil_press_electric",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "breaks_into": [
+      { "item": "funnel", "count": [ 0, 1 ] },
+      { "item": "frame", "count": [ 0, 1 ] },
+      { "item": "sheet_metal", "count": [ 0, 2 ] },
+      { "item": "element", "count": [ 0, 2 ] },
+      { "item": "crude_heating_element", "count": [ 0, 3 ] },
+      { "item": "motor_tiny", "count": [ 0, 1 ] },
+      { "item": "cable", "count": [ 0, 10 ] },
+      { "item": "power_supply", "count": [ 0, 1 ] },
+      { "item": "pipe_fittings", "count": [ 0, 2 ] },
+      { "item": "pipe", "count": [ 0, 2 ] },
+      { "item": "wire_mesh", "count": [ 0, 1 ] },
+      { "item": "metal_tank_little", "count": [ 0, 1 ] }
+    ]
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json
@@ -1690,5 +1690,29 @@
       "items": [ { "item": "chain", "count": 1 }, { "item": "block_and_tackle", "count": 1 }, { "item": "nuts_bolts", "charges": 2 } ]
     },
     "crafting_pseudo_item": "fake_lift_heavy"
+  },
+  {
+    "type": "furniture",
+    "id": "f_oil_press_industrial",
+    "name": "industrial oil press",
+    "looks_like": "f_machinery_light",
+    "description": "A heavy-duty press used to create vegetable oil from nuts or seeds.  You could take this down and use it for your own purposes if you wanted.",
+    "symbol": "Y",
+    "color": "green",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": 12,
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE_HARD",
+      "CONTAINER",
+      "PLACE_ITEM",
+      "BLOCKSDOOR",
+      "MOUNTABLE",
+      "LIQUIDCONT",
+      "EASY_DECONSTRUCT"
+    ],
+    "examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "oil_press_electric" },
+    "item": "oil_press_electric"
   }
 ]
diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
@@ -417,5 +417,21 @@
     "longest_side": "115 cm",
     "volume": "368 L",
     "weight": "86 kg"
+  },
+  {
+    "type": "ITEM",
+    "id": "oil_press_electric",
+    "//": "based on YZS-68 oil press: http://www.oilpressmachine.com/6yl-68-oil-press.html",
+    "name": { "str": "disconnected industrial oil press", "str_pl": "disconnected industrial oil presses" },
+    "description": "A heavy-duty press used to create vegetable oil from nuts or seeds.  Needs to be placed and plugged into a power source.",
+    "looks_like": "f_machinery_light",
+    "symbol": "Y",
+    "color": "green",
+    "material": [ "iron" ],
+    "longest_side": "88 cm",
+    "volume": "370 L",
+    "weight": "140 kg",
+    "price": "1 kUSD",
+    "price_postapoc": "10 USD"
   }
 ]
diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -527,5 +527,12 @@
     "type": "ITEM",
     "subtypes": [ "TOOL" ],
     "name": { "str": "deep fryer" }
+  },
+  {
+    "id": "fake_oil_press_industrial",
+    "copy-from": "fake_appliance_tool",
+    "type": "ITEM",
+    "subtypes": [ "TOOL" ],
+    "name": { "str": "industrial oil press", "str_pl": "industrial oil presses" }
   }
 ]
diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json
@@ -228,24 +228,5 @@
     "price": "30 USD",
     "price_postapoc": "50 cent",
     "melee_damage": { "bash": 2 }
-  },
-  {
-    "type": "ITEM",
-    "subtypes": [ "TOOL" ],
-    "id": "oil_press_electric",
-    "name": { "str": "electric oil press", "str_pl": "electric oil presses" },
-    "//": "based on YZS-68C oil press",
-    "description": "A heavy-duty press used to create vegetable oil from nuts or seeds.  It needs to be mounted on a vehicle due to its high power draw.",
-    "weight": "140 kg",
-    "volume": "370 L",
-    "longest_side": "88 cm",
-    "material": [ "lc_steel", "hc_steel" ],
-    "category": "veh_parts",
-    "color": "green",
-    "symbol": "Y",
-    "use_action": [ { "type": "link_up", "cable_length": 3, "charge_rate": "5500 W" } ],
-    "price": "1 kUSD",
-    "price_postapoc": "10 USD",
-    "tool_ammo": "battery"
   }
 ]
diff --git a/data/json/recipes/food/drink_other.json b/data/json/recipes/food/drink_other.json
@@ -53,7 +53,7 @@
     "//": "capacity: 50kg/hour * 40% efficiency = 20 L/hour -> 45s / 250 mL",
     "time": "45 s",
     "//2": "45 s * 5.5kW = 250 kJ",
-    "tools": [ [ [ "oil_press_electric", 250 ] ] ],
+    "tools": [ [ [ "fake_oil_press_industrial", 250 ] ] ],
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_food_prep" } ],
diff --git a/data/json/recipes/recipe_appliance.json b/data/json/recipes/recipe_appliance.json
@@ -224,5 +224,38 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_appliance_repair" } ],
     "components": [ [ [ "frame_wood", 1 ] ], [ [ "battery_charger", 1 ] ] ]
+  },
+  {
+    "result": "oil_press_electric",
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "reversible": true,
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "90 m",
+    "autolearn": true,
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_PARTS",
+    "skills_required": [ [ "electronics", 2 ] ],
+    "using": [ [ "soldering_standard", 5 ] ],
+    "qualities": [
+      { "id": "HAMMER", "level": 2 },
+      { "id": "SAW_M", "level": 1 },
+      { "id": "SCREW", "level": 1 },
+      { "id": "WRENCH", "level": 1 }
+    ],
+    "components": [
+      [ [ "funnel", 1 ], [ "metal_funnel", 1 ] ],
+      [ [ "frame", 1 ] ],
+      [ [ "sheet_metal", 4 ] ],
+      [ [ "element", 4 ], [ "crude_heating_element", 6 ] ],
+      [ [ "motor_tiny", 1 ] ],
+      [ [ "cable", 10 ] ],
+      [ [ "power_supply", 1 ] ],
+      [ [ "pipe_fittings", 2 ] ],
+      [ [ "pipe", 2 ] ],
+      [ [ "wire_mesh", 1 ], [ "cotton_patchwork", 1 ] ],
+      [ [ "metal_tank_little", 1 ], [ "jerrycan_big", 1 ], [ "jerrycan", 1 ] ]
+    ]
   }
 ]
diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -1382,39 +1382,6 @@
     ],
     "components": [ [ [ "seatbelt", 5 ] ], [ [ "nuts_bolts", 1 ] ] ]
   },
-  {
-    "result": "oil_press_electric",
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "reversible": true,
-    "skill_used": "fabrication",
-    "difficulty": 4,
-    "time": "90 m",
-    "autolearn": true,
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_PARTS",
-    "skills_required": [ [ "electronics", 2 ] ],
-    "using": [ [ "soldering_standard", 5 ] ],
-    "qualities": [
-      { "id": "HAMMER", "level": 2 },
-      { "id": "SAW_M", "level": 1 },
-      { "id": "SCREW", "level": 1 },
-      { "id": "WRENCH", "level": 1 }
-    ],
-    "components": [
-      [ [ "funnel", 1 ], [ "metal_funnel", 1 ] ],
-      [ [ "frame", 1 ] ],
-      [ [ "sheet_metal", 4 ] ],
-      [ [ "element", 4 ], [ "crude_heating_element", 6 ] ],
-      [ [ "motor_tiny", 1 ] ],
-      [ [ "cable", 10 ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "pipe_fittings", 2 ] ],
-      [ [ "pipe", 2 ] ],
-      [ [ "wire_mesh", 1 ], [ "cotton_patchwork", 1 ] ],
-      [ [ "metal_tank_little", 1 ], [ "jerrycan_big", 1 ], [ "jerrycan", 1 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "activity_level": "BRISK_EXERCISE",
diff --git a/data/json/vehicleparts/utilities.json b/data/json/vehicleparts/utilities.json
@@ -63,42 +63,6 @@
     "type": "vehicle_part",
     "variants": [ { "symbols": "&", "symbols_broken": "x" } ]
   },
-  {
-    "id": "veh_oil_press_electric",
-    "type": "vehicle_part",
-    "name": { "str": "mounted electric oil press" },
-    "item": "oil_press_electric",
-    "description": "A heavy-duty press used to create vegetable oil from nuts or seeds.",
-    "categories": [ "utility" ],
-    "location": "center",
-    "color": "green",
-    "broken_color": "green",
-    "damage_modifier": 10,
-    "damage_reduction": { "all": 30 },
-    "durability": 200,
-    "flags": [ "OBSTACLE", "CARGO" ],
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": {
-        "skills": [ [ "mechanics", 3 ] ],
-        "time": "60 m",
-        "using": [ [ "repair_welding_standard", 3 ], [ "soldering_standard", 5 ] ]
-      }
-    },
-    "pseudo_tools": [ { "id": "oil_press_electric" } ],
-    "size": "5 L",
-    "breaks_into": [
-      { "item": "lc_steel_lump", "count": [ 4, 7 ] },
-      { "item": "lc_steel_chunk", "count": [ 3, 6 ] },
-      { "item": "sheet_metal_small", "count": [ 4, 8 ] },
-      { "item": "scrap", "count": [ 4, 7 ] },
-      { "item": "element", "count": [ 0, 2 ] },
-      { "item": "pipe", "prob": 50 },
-      { "item": "motor_small", "prob": 25 }
-    ],
-    "variants": [ { "symbols": "Y", "symbols_broken": "x" } ]
-  },
   {
     "id": "door_lock",
     "type": "ITEM",
diff --git a/data/mods/TEST_DATA/known_bad_uncrafts.json b/data/mods/TEST_DATA/known_bad_uncrafts.json
@@ -2378,6 +2378,7 @@
       "fake_lift_light",
       "fake_lift_medium",
       "fake_milling_item",
+      "fake_oil_press_industrial",
       "fake_power_tool",
       "fake_radio",
       "fake_razor",

Original file line number	Diff line number	Diff line change
`@@ -2124,5 +2124,10 @@`
`2124`	`2124`	`"type": "construction_group",`
`2125`	`2125`	`"id": "place_deep_fryer",`
`2126`	`2126`	`"name": "Place a deep fryer"`
	`2127`	`+ },`
	`2128`	`+ {`
	`2129`	`+ "type": "construction_group",`
	`2130`	`+ "id": "place_oil_press_industrial",`
	`2131`	`+ "name": "Place an industrial oil press"`
`2127`	`2132`	`}`
`2128`	`2133`	`]`
Original file line number	Diff line number	Diff line change
`@@ -527,5 +527,12 @@`
`527`	`527`	`"type": "ITEM",`
`528`	`528`	`"subtypes": [ "TOOL" ],`
`529`	`529`	`"name": { "str": "deep fryer" }`
	`530`	`+ },`
	`531`	`+ {`
	`532`	`+ "id": "fake_oil_press_industrial",`
	`533`	`+ "copy-from": "fake_appliance_tool",`
	`534`	`+ "type": "ITEM",`
	`535`	`+ "subtypes": [ "TOOL" ],`
	`536`	`+ "name": { "str": "industrial oil press", "str_pl": "industrial oil presses" }`
`530`	`537`	`}`
`531`	`538`	`]`