Skip to content

Commit

Permalink
Implement grid recharging stations, battery charger tweak (cataclysmb…
Browse files Browse the repository at this point in the history
…nteam#2350)

* Implement grid recharging stations, battery charger tweak

* Suggestion per feedback
  • Loading branch information
chaosvolt authored Mar 26, 2023
1 parent ab50700 commit 254bdc4
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 3 deletions.
14 changes: 14 additions & 0 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -4282,6 +4282,20 @@
"pre_special": "check_empty",
"post_furniture": "f_charger"
},
{
"type": "construction",
"id": "constr_recharge_station",
"group": "place_recharge_station",
"category": "WORKSHOP",
"required_skills": [ [ "electronics", 1 ] ],
"time": "30 m",
"qualities": [ [ { "id": "SCREW", "level": 1 } ] ],
"using": [ [ "soldering_standard", 20 ] ],
"components": [ [ [ "cable", 5 ] ], [ [ "recharge_station", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "solder_wire", 5 ] ] ],
"pre_note": "Will only work if constructed in a building with an electric grid.",
"pre_special": "check_empty",
"post_furniture": "f_recharge_station"
},
{
"type": "construction",
"id": "constr_gridwelder",
Expand Down
5 changes: 5 additions & 0 deletions data/json/construction_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,11 @@
"id": "place_charger",
"name": "Place Charger"
},
{
"type": "construction_group",
"id": "place_recharge_station",
"name": "Place Recharging Station"
},
{
"type": "construction_group",
"id": "place_electric_forge",
Expand Down
20 changes: 19 additions & 1 deletion data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@
"move_cost_mod": -1,
"coverage": 90,
"required_str": -1,
"active": [ "charger", { "power": 100 } ],
"active": [ "charger", { "power": 15 } ],
"deconstruct": {
"items": [
{ "item": "cable", "charges": [ 2, 5 ] },
Expand All @@ -943,6 +943,24 @@
]
}
},
{
"type": "furniture",
"id": "f_recharge_station",
"copy-from": "f_charger",
"looks_like": "recharge_station",
"name": "grid recharging station",
"description": "A vehicle recharging station connected to building's electric grid, providing higher output than consumer battery chargers.",
"symbol": ":",
"color": "blue_white",
"active": [ "charger", { "power": 600 } ],
"deconstruct": {
"items": [
{ "item": "cable", "charges": [ 2, 5 ] },
{ "item": "recharge_station", "count": 1 },
{ "item": "power_supply", "count": 1 }
]
}
},
{
"type": "furniture",
"id": "f_cable_connector",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/utilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"type": "GENERIC",
"id": "recharge_station",
"name": { "str": "recharging station" },
"description": "A universal recharging station designed to operate on vehicle power. While on it will steadily charge all rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly within its storage space. The system can only be installed onto existing storage compartments, and is controlled from a dashboard or electronics control unit.",
"description": "A universal recharging station designed to operate on vehicle power. While on it will steadily charge all rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly within its storage space, at a greater rate than most consumer chargers. The system can only be installed onto existing storage compartments, and is controlled from a dashboard or electronics control unit.",
"weight": "10000 g",
"to_hit": 1,
"color": "light_blue",
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@
"broken_color": "blue",
"damage_modifier": 10,
"durability": 20,
"description": "A device for recharging batteries. When turned on, it charges any rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly in the attached storage space.",
"description": "A device for recharging batteries, capable of higher output than most consumer models. When turned on, it charges any rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly in the attached storage space.",
"bonus": 600,
"item": "recharge_station",
"location": "on_cargo",
Expand Down

0 comments on commit 254bdc4

Please sign in to comment.