Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic Innawoods appliances #59784

Merged
merged 6 commits into from
Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions data/mods/innawood/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,29 @@
"components": [ [ [ "2x4", 14 ] ], [ [ "nail", 12 ] ], [ [ "sheet_metal_small", 13 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_fvat_empty"
},
{
"type": "construction",
"id": "app_battery_car_clay",
"group": "place_clay_car_battery",
"category": "APPLIANCE",
"required_skills": [ [ "electronics", 1 ] ],
"time": "6 m",
"components": [ [ [ "battery_car_clay", 1 ] ] ],
"pre_special": "check_empty",
"post_special": "done_appliance",
"activity_level": "LIGHT_EXERCISE"
},
{
"type": "construction",
"id": "app_battery_clay_array",
"group": "place_clay_battery_array",
"category": "APPLIANCE",
"required_skills": [ [ "electronics", 1 ] ],
"time": "6 m",
"components": [ [ [ "battery_clay_array", 1 ] ] ],
"pre_special": "check_empty",
"post_special": "done_appliance",
"activity_level": "LIGHT_EXERCISE"
}
]
12 changes: 12 additions & 0 deletions data/mods/innawood/construction_group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"type": "construction_group",
"id": "place_clay_car_battery",
"name": "Place Clay Car Battery"
},
{
"type": "construction_group",
"id": "place_clay_battery_array",
"name": "Place Clay Battery Array"
}
]
39 changes: 39 additions & 0 deletions data/mods/innawood/furniture_and_terrain/appliances.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
{
"type": "vehicle_part",
"id": "ap_battery_car_clay",
"name": { "str": "clay car grid battery" },
"categories": [ "energy" ],
"symbol": "B",
"looks_like": "clay_hydria",
"location": "structure",
"color": "light_cyan",
"flags": [ "OBSTACLE", "APPLIANCE" ],
"description": "A clay car battery wired into a static power grid.",
"item": "battery_car_clay",
"breaks_into": [ { "item": "ceramic_shard", "count": [ 1, 3 ] }, { "item": "lead", "count": [ 200, 1000 ] } ],
"durability": 120,
"requirements": { "removal": { "time": "6 m" } }
},
{
"type": "vehicle_part",
"id": "ap_battery_clay_array",
"name": { "str": "clay grid battery array" },
"categories": [ "energy" ],
"symbol": "B",
"looks_like": "f_crate_o",
"location": "structure",
"color": "light_cyan",
"flags": [ "OBSTACLE", "APPLIANCE" ],
"description": "A clay battery array wired into a static power grid.",
"item": "battery_clay_array",
"breaks_into": [
{ "item": "ceramic_shard", "count": [ 4, 12 ] },
{ "item": "lead", "count": [ 800, 4000 ] },
{ "item": "2x4", "count": [ 1, 4 ] },
{ "item": "nail", "count": [ 2, 6 ] }
],
"durability": 120,
"requirements": { "removal": { "time": "6 m" } }
}
]
20 changes: 20 additions & 0 deletions data/mods/innawood/items/vehicle_battery.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,25 @@
"//": "58Ah @ 12VDC. Could supply ~700 watts for an hour",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2500 } } ]
},
{
"id": "battery_clay_array",
"type": "MAGAZINE",
"category": "veh_parts",
"name": { "str": "clay battery array" },
"description": "A set of 4 clay car batteries wired together in series in a simple wooden frame.",
"looks_like": "clay_hydria",
"weight": "82400 g",
"volume": "26 L",
"price": 4000,
"price_postapoc": 500,
"material": [ "clay", "wood" ],
"symbol": ":",
"color": "light_cyan",
"ammo_type": [ "battery" ],
"capacity": 10000,
"//": "4 batteries in a box",
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 10000 } } ]
}
]
23 changes: 23 additions & 0 deletions data/mods/innawood/recipes/electronic_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,28 @@
[ [ "scrap", 1 ] ],
[ [ "charcoal", 1 ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "battery_clay_array",
"category": "CC_ELECTRONIC",
"subcategory": "CSC_ELECTRONIC_PARTS",
"skill_used": "electronics",
"skills_required": [ "fabrication", 2 ],
"difficulty": 4,
"time": "40 m",
"autolearn": true,
"reversible": true,
"using": [ [ "soldering_standard", 20 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ],
"components": [
[ [ "battery_car_clay", 4 ] ],
[ [ "makeshift_transformer", 2 ] ],
[ [ "2x4", 6 ] ],
[ [ "nail", 12 ] ],
[ [ "cable", 5 ] ]
]
}
]
46 changes: 46 additions & 0 deletions data/mods/innawood/recipes/tools_lights.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,51 @@
[ "cordage", 1, "LIST" ]
]
]
},
{
"result": "standing_lamp",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"reversible": true,
"skill_used": "electronics",
"difficulty": 1,
"time": "10 m",
"autolearn": [ [ "electronics", 1 ] ],
"category": "CC_APPLIANCE",
"subcategory": "CSC_APPLIANCE_LIGHTING",
"skills_required": [ [ "fabrication", 1 ] ],
"using": [ [ "soldering_standard", 5 ] ],
"qualities": [ { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "cable", 2 ] ],
[ [ "amplifier", 1 ], [ "makeshift_transformer", 2 ] ],
[ [ "lightstrip_inactive", 1 ], [ "light_bulb", 1 ] ],
[ [ "steel_lump", 1 ] ],
[ [ "pipe_fittings", 1 ] ],
[ [ "pipe", 2 ] ]
]
},
{
"result": "standing_floodlight",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"reversible": true,
"skill_used": "electronics",
"difficulty": 1,
"time": "10 m",
"autolearn": [ [ "electronics", 1 ] ],
"category": "CC_APPLIANCE",
"subcategory": "CSC_APPLIANCE_LIGHTING",
"skills_required": [ [ "fabrication", 1 ] ],
"using": [ [ "soldering_standard", 5 ] ],
"qualities": [ { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "cable", 2 ] ],
[ [ "amplifier", 1 ], [ "makeshift_transformer", 2 ] ],
[ [ "floodlight", 1 ] ],
[ [ "steel_lump", 1 ] ],
[ [ "pipe_fittings", 1 ] ],
[ [ "pipe", 2 ] ]
]
}
]