feat(balance): allow hydraulic press to be grid furntiure, minor updates to press and brass items

data/json/construction.json

@@ -5305,5 +5305,17 @@
     "pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
     "pre_flags": [ "WALL" ],
     "post_furniture": "f_light_switch"
+  },
+  {
+    "type": "construction",
+    "id": "constr_hydraulic_press",
+    "group": "install_hydraulic_press",
+    "category": "WORKSHOP",
+    "required_skills": [  ],
+    "time": "10 m",
+    "components": [ [ [ "hydraulic_press", 1 ] ] ],
+    "pre_note": "Will only work if constructed in/on a building that has an electric grid with a mounted battery.",
+    "pre_special": "check_empty",
+    "post_furniture": "f_hydraulic_press"
   }
 ]

data/json/construction_group.json

@@ -1533,5 +1533,10 @@
     "type": "construction_group",
     "id": "build_light_switch",
     "name": "Install a light switch"
+  },
+  {
+    "type": "construction_group",
+    "id": "install_hydraulic_press",
+    "name": "Install Hydraulic Press"
   }
 ]

data/json/furniture_and_terrain/furniture-appliances.json

@@ -2770,5 +2770,34 @@
     "examine_action": "toggle_lights",
     "transforms_into": "f_light_switch",
     "message": "You switched off the lights."
+  },
+  {
+    "type": "furniture",
+    "id": "f_hydraulic_press",
+    "name": "grid hydraulic press",
+    "looks_like": "t_machinery_light",
+    "description": "If you really want to squash something a lot, this would be exactly the right industrial tool for you.",
+    "symbol": "9",
+    "color": "black_red",
+    "move_cost_mod": -1,
+    "coverage": 75,
+    "required_str": 16,
+    "flags": [ "BLOCKSDOOR", "TRANSPARENT", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 40,
+      "str_max": 150,
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "cable", "charges": [ 0, 4 ] },
+        { "item": "scrap", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 2, 4 ] },
+        { "item": "steel_lump", "count": [ 1, 2 ] },
+        { "item": "steel_plate", "count": [ 1, 2 ] }
+      ],
+      "//": "Variable reduction since might hit more or less material.",
+      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" }
+    },
+    "crafting_pseudo_item": [ "grid_hydraulic_press" ],
+    "deconstruct": { "items": [ { "item": "hydraulic_press", "count": 1 } ] }
   }
 ]

data/json/furniture_and_terrain/furniture-tools.json

@@ -843,34 +843,6 @@
       ]
     }
   },
-  {
-    "type": "furniture",
-    "id": "f_hydraulic_press",
-    "name": "hydraulic press",
-    "looks_like": "t_machinery_light",
-    "description": "If you really want to squash something a lot, this would be exactly the right industrial tool for you.  If, you know, it had power.",
-    "symbol": "9",
-    "color": "black_red",
-    "move_cost_mod": -1,
-    "coverage": 75,
-    "required_str": 16,
-    "flags": [ "BLOCKSDOOR", "TRANSPARENT" ],
-    "bash": {
-      "str_min": 40,
-      "str_max": 150,
-      "sound_fail": "clang!",
-      "items": [
-        { "item": "cable", "charges": [ 0, 4 ] },
-        { "item": "scrap", "count": [ 8, 12 ] },
-        { "item": "steel_chunk", "count": [ 2, 4 ] },
-        { "item": "steel_lump", "count": [ 1, 2 ] },
-        { "item": "steel_plate", "count": [ 1, 2 ] }
-      ],
-      "//": "Variable reduction since might hit more or less material.",
-      "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 150, "block_unaimed_chance": "75%" }
-    },
-    "deconstruct": { "items": [ { "item": "hydraulic_press", "count": 1 } ] }
-  },
   {
     "type": "furniture",
     "id": "f_heavy_lathe",

data/json/items/fake.json

@@ -440,5 +440,15 @@
     "name": { "str": "installed reloading press" },
     "//": "Doesn't substitute for hand press because we want to define this tool in crafting requirements separately, due to disassembly code.",
     "qualities": [ [ "PULL", 2 ] ]
+  },
+  {
+    "id": "grid_hydraulic_press",
+    "copy-from": "fake_item",
+    "type": "TOOL",
+    "name": { "str": "grid hydraulic press" },
+    "sub": "hydraulic_press",
+    "max_charges": 2500,
+    "charges_per_use": 5,
+    "flags": [ "USES_GRID_POWER" ]
   }
 ]

data/json/items/resources/metal.json

@@ -24,9 +24,10 @@
     "id": "cartridgebrass",
     "symbol": ",",
     "color": "light_gray",
-    "name": { "str_sp": "cartridge brass" },
+    "looks_like": "scrap_bronze",
+    "name": { "str_sp": "brass" },
     "category": "scrap_metal",
-    "description": "Some brass that has been made specifically to be formed into cartridge casings.",
+    "description": "Some brass scraps, if you have the right tools they could be formed into cartridge casings.",
     "price": "10 USD",
     "price_postapoc": "10 cent",
     "material": "brass",

data/json/items/tool/metalworking.json

@@ -226,16 +226,17 @@
     "type": "TOOL",
     "category": "tools_workshop",
     "name": { "str": "hydraulic press" },
-    "description": "A large, barely portable hydraulic press, that uses a 36kW motor to squash whatever needs squashing.  Do not put your hand in here, it will get squashed.",
+    "description": "A large, barely portable hydraulic press, that uses a 36kW motor to squash whatever needs squashing.  Do not put your hand in here, it will get squashed.  Can run off heavy-duty batteries, or installed to run off a power grid instead.",
     "weight": "320 kg",
     "volume": "130 L",
-    "price": 120000,
-    "price_postapoc": 14000,
+    "price": "1200 USD",
+    "price_postapoc": "40 USD",
     "to_hit": -2,
     "bashing": 8,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
+    "looks_like": "f_hydraulic_press",
     "ammo": "battery",
     "charges_per_use": 20,
     "flags": [ "ALLOWS_REMOTE_USE" ],