Merge pull request #77901 from TheMurderUnicorn/MotorbikeBatteryPlace…

…ment Allow Placement of Motorbike Batteries as Appliances
CleverRaven · Nov 16, 2024 · 70e6f1f · 70e6f1f
2 parents 1de726b + 0a83e16
commit 70e6f1f
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 0 deletions.
diff --git a/data/json/construction/appliances.json b/data/json/construction/appliances.json
@@ -155,6 +155,30 @@
     "post_special": "done_appliance",
     "activity_level": "LIGHT_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_battery_motorbike",
+    "group": "place_motorbike_battery",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "6 m",
+    "components": [ [ [ "battery_motorbike", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "app_battery_motorbike_small",
+    "group": "place_motorbike_small_battery",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "electronics", 1 ] ],
+    "time": "6 m",
+    "components": [ [ [ "battery_motorbike_small", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "app_battery_large",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1465,6 +1465,16 @@
     "id": "place_car_battery",
     "name": "Place Car Battery"
   },
+  {
+    "type": "construction_group",
+    "id": "place_motorbike_battery",
+    "name": "Place Motorbike Battery"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_motorbike_small_battery",
+    "name": "Place Small Motorbike Battery"
+  },
   {
     "type": "construction_group",
     "id": "place_washing_machine",

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
@@ -826,6 +826,48 @@
     "requirements": { "removal": { "time": "6 m" } },
     "variants": [ { "symbols": "B", "symbols_broken": "#" } ]
   },
+  {
+    "type": "vehicle_part",
+    "id": "ap_battery_motorbike",
+    "name": { "str": "motorbike grid battery" },
+    "categories": [ "energy" ],
+    "looks_like": "battery_motorbike",
+    "color": "red",
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "description": "A motorbike battery wired into a static power grid.",
+    "item": "battery_motorbike",
+    "breaks_into": [
+      { "item": "lead", "charges": [ 252, 357 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 0, 1 ], "container-item": "null" },
+      { "item": "plastic_chunk", "count": [ 2, 3 ] },
+      { "item": "scrap", "charges": [ 0, 1 ] },
+      { "item": "shredded_rubber", "charges": [ 1, 2 ] }
+    ],
+    "durability": 100,
+    "requirements": { "removal": { "time": "6 m" } },
+    "variants": [ { "symbols": "B", "symbols_broken": "#" } ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_battery_motorbike_small",
+    "name": { "str": "small motorbike grid battery" },
+    "categories": [ "energy" ],
+    "looks_like": "battery_motorbike_small",
+    "color": "red",
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "description": "A small motorbike battery wired into a static power grid.",
+    "item": "battery_motorbike_small",
+    "breaks_into": [
+      { "item": "lead", "charges": [ 126, 178 ] },
+      { "item": "chem_sulphuric_acid", "count": [ 0, 1 ], "container-item": "null" },
+      { "item": "plastic_chunk" },
+      { "item": "scrap", "charges": [ 0, 1 ] },
+      { "item": "shredded_rubber", "charges": [ 0, 1 ] }
+    ],
+    "durability": 30,
+    "requirements": { "removal": { "time": "6 m" } },
+    "variants": [ { "symbols": "B", "symbols_broken": "#" } ]
+  },
   {
     "type": "vehicle_part",
     "id": "ap_washing_machine",