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

Tool Armors #52322

Merged
merged 44 commits into from
Dec 4, 2021
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0c41a46
Update power_armor.json
Drew4484 Oct 16, 2021
82b8ca7
Update tool_armor.json
Drew4484 Oct 17, 2021
4ceb18d
Update tool_armor.json
Drew4484 Oct 17, 2021
160af09
Update power_armor.json
Drew4484 Oct 17, 2021
b637eb4
Update lab_floorplans_finale1level.json
Drew4484 Oct 17, 2021
daa584c
Update tool_armor.json
Drew4484 Oct 17, 2021
89a341a
Update tool_armor.json
Drew4484 Oct 17, 2021
50df65c
Update tool_armor.json
Drew4484 Oct 21, 2021
1c54111
Update tool_armor.json
Drew4484 Oct 21, 2021
a3243b5
Update lab_floorplans_finale1level.json
Drew4484 Oct 21, 2021
c03f190
Update tool_armor.json
Drew4484 Oct 23, 2021
6f82f02
Update tool_armor.json
Drew4484 Oct 25, 2021
c867891
Update tool_armor.json
Drew4484 Oct 25, 2021
4600a8e
Update tool_armor.json
Drew4484 Oct 27, 2021
f356b3c
Update tool_armor.json
Drew4484 Oct 28, 2021
4aec474
Update tool_armor.json
Drew4484 Oct 28, 2021
2ba6e9c
Update tool_armor.json
Drew4484 Oct 28, 2021
b91e903
Update data/json/items/tool_armor.json
Drew4484 Oct 28, 2021
a317010
Update data/json/items/tool_armor.json
Drew4484 Oct 28, 2021
94f703c
Update data/json/mapgen/lab/lab_floorplans_finale1level.json
Drew4484 Oct 28, 2021
4a2a448
Update tool_armor.json
Drew4484 Oct 28, 2021
3d3ac58
Merge branch 'Tool-Armor' of https://github.com/Drew4484/Cataclysm-DD…
Drew4484 Oct 28, 2021
4522d0d
Update electronics.json
Drew4484 Oct 28, 2021
d8048ec
Update electronics.json
Drew4484 Oct 28, 2021
608ce65
Update tool_armor.json
Drew4484 Oct 28, 2021
9051473
Update tool_armor.json
Drew4484 Oct 28, 2021
03d4def
Scale back
Drew4484 Oct 28, 2021
4465f04
Update data/json/items/tool_armor.json
Drew4484 Oct 28, 2021
b6e5867
Delete electronics.json
Drew4484 Oct 28, 2021
685cc18
Update tool_armor.json
Drew4484 Oct 28, 2021
2d7b548
Update tool_armor.json
Drew4484 Oct 29, 2021
7c57d5c
Merge branch 'Tool-Armor' of https://github.com/Drew4484/Cataclysm-DD…
Drew4484 Oct 29, 2021
9c9eeb2
Merge branch 'master' into Tool-Armor
Drew4484 Oct 29, 2021
04eb37c
Update tool_armor.json
Drew4484 Oct 29, 2021
dd09f73
Update tool_armor.json
Drew4484 Oct 29, 2021
9f2ccbd
Update tool_armor.json
Drew4484 Oct 29, 2021
ab90a4c
Update tool_armor.json
Drew4484 Oct 29, 2021
fa7c15a
Update data/json/items/tool_armor.json
Drew4484 Nov 5, 2021
55042ee
Update data/json/items/tool_armor.json
Drew4484 Nov 5, 2021
5c4f503
Update data/json/items/tool_armor.json
Drew4484 Nov 5, 2021
50f0d66
Update data/json/items/tool_armor.json
Drew4484 Nov 5, 2021
2afda01
Update tool_armor.json
Drew4484 Nov 5, 2021
4ac6b98
Update tool_armor.json
Drew4484 Nov 5, 2021
8a0dbb1
Update data/json/items/tool_armor.json
Drew4484 Nov 28, 2021
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
69 changes: 69 additions & 0 deletions data/json/items/tool/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -557,5 +557,74 @@
"default_magazine": "light_battery_cell"
}
]
},
{
"id": "exotool",
"type": "TOOL",
"name": { "str": "exoskeleton tool set" },
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"description": "This is a tool module for a powered exoskeleton.",
"weight": "5 kg",
"volume": "5 L",
"longest_side": "75 cm",
"price": 10000,
"price_postapoc": 30000,
"material": [ "aluminum", "steel" ],
"symbol": "=",
"color": "light_gray",
"use_action": [ [ "CROWBAR", 0 ], [ "HAMMER", 0 ] ],
"qualities": [
[ "HAMMER", 3 ],
[ "HAMMER_FINE", 1 ],
[ "SAW_W", 1 ],
[ "SAW_M", 2 ],
[ "SAW_M_FINE", 1 ],
[ "WRENCH", 2 ],
[ "WRENCH_FINE", 1 ],
[ "WHEEL_FAST", 1 ],
[ "SCREW", 1 ],
[ "SCREW_FINE", 1 ],
[ "CUT", 1 ],
[ "PRY", 1 ],
[ "PRYING_NAIL", 1 ],
[ "DRILL", 3 ],
[ "BUTCHER", -38 ]
]
},
{
"id": "powered_exotool",
"type": "TOOL",
"name": { "str": "exoskeleton powered tool set" },
"description": "This is a tool module for a powered exoskeleton It includes an arc welder and an electric jackhammer, powered by a heavy battery.",
"weight": "10 kg",
"volume": "5 L",
"longest_side": "75 cm",
"price": 10000,
"price_postapoc": 30000,
"material": [ "aluminum", "steel" ],
"symbol": "=",
"color": "light_gray",
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
"rigid": true,
"flag_restriction": [ "BATTERY_HEAVY" ],
"default_magazine": "heavy_battery_cell"
}
],
"ammo": [ "battery" ],
"charges_per_use": 5,
"qualities": [ [ "WELD", 2 ] ],
"use_action": [
{
"type": "repair_item",
"item_action_type": "repair_metal",
"materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy" ],
"skill": "fabrication",
"tool_quality": 10,
"cost_scaling": 0.1,
"move_cost": 500
},
"JACKHAMMER"
]
}
]
100 changes: 100 additions & 0 deletions data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -3318,5 +3318,105 @@
],
"flags": [ "FANCY", "VARSIZE", "SUN_GLASSES" ],
"material_thickness": 0.5
},
{
"id": "utility_exoskeleton_off",
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "battery powered utility exoskeleton" },
"//": "This is based on the Sarcos Guardian, a production model with independent battery power, all weather operation, and capable of lifting up to 200 lbs. It uses three 12 lb batteries that provide 8 hours of operation.",
"description": "This is a skeletal frame of sturdy metal with attached motors to allow the user to move heavier loads with less strain on the body.",
"weight": "90 kg",
"volume": "25 L",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"price": 11500000,
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "steel", "plastic" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "dark_gray",
"pocket_data": [
{ "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "medium_storage_battery" ] },
{ "pocket_type": "CONTAINER", "item_restriction": [ "exotool" ] },
{ "pocket_type": "CONTAINER", "item_restriction": [ "powered_exotool" ] }
],
"warmth": 0,
"material_thickness": 8,
"environmental_protection": 0,
"ammo": "battery",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"use_action": { "type": "transform", "msg": "The %s engages.", "target": "utility_exoskeleton_on", "active": true },
"flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "SLOWS_MOVEMENT" ],
"relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 20 } ] } ] },
"armor": [
{
"encumbrance": 20,
"coverage": 20,
"covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
}
]
},
{
"id": "utility_exoskeleton_on",
"copy-from": "utility_exoskeleton_off",
"repairs_like": "utility_exoskeleton_off",
"looks_like": "power_armor_light",
"type": "TOOL_ARMOR",
"name": { "str": "battery powered utility exoskeleton (on)", "str_pl": "battery powered utility exoskeletons (on)" },
"description": " It is turned on and continually drawing power. Use it to turn it off.",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "TRADER_AVOID" ],
"relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 20 } ] } ] },
"ammo": "battery",
"power_draw": 100000,
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "utility_exoskeleton_off" }
},
{
"id": "ice_utility_exoskeleton_off",
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "ICE utility exoskeleton" },
"description": "This is a skeletal frame of sturdy metal with attached motors to allow the user to move heavier loads with less strain on the body. This model uses a compact internal combustion engine for power.",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"weight": "110 kg",
"volume": "25 L",
"price": 11500000,
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "steel", "plastic" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "dark_gray",
"pocket_data": [
{ "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "medium_storage_battery" ] },
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
{ "pocket_type": "CONTAINER", "item_restriction": [ "exotool" ] },
{ "pocket_type": "CONTAINER", "item_restriction": [ "powered_exotool" ] }
],
"warmth": 0,
"material_thickness": 8,
"environmental_protection": 0,
"ammo": "gasoline",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"use_action": { "type": "transform", "msg": "The %s engages.", "target": "ice_utility_exoskeleton_on", "active": true },
"flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "SLOWS_MOVEMENT" ],
"relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 20 } ] } ] },
"armor": [
{
"encumbrance": 20,
"coverage": 20,
"covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
}
]
},
{
"id": "ice_utility_exoskeleton_on",
"copy-from": "ice_utility_exoskeleton_off",
"repairs_like": "ice_utility_exoskeleton_off",
"looks_like": "power_armor_light",
"type": "TOOL_ARMOR",
"name": { "str": "ICE utility exoskeleton (on)", "str_pl": "ICE utility exoskeletons (on)" },
"description": " It is turned on and continually draining gasoline. Use it to turn it off.",
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"flags": [ "STURDY", "OVERSIZE", "BELTED", "WATER_FRIENDLY", "TRADER_AVOID" ],
"relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 20 } ] } ] },
"turns_per_charge": 4,
Drew4484 marked this conversation as resolved.
Show resolved Hide resolved
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s disengages.", "target": "ice_utility_exoskeleton_off" }
}
]
3 changes: 2 additions & 1 deletion data/json/mapgen/lab/lab_floorplans_finale1level.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@
{ "monster": "mon_secubot", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 },
{ "monster": "mon_zombie_scientist", "x": [ 2, 20 ], "y": [ 1, 9 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "monster": "mon_mech_lifter", "x": 2, "y": 2, "chance": 50 }
]
],
"place_loot": [ { "item": "utility_exoskeleton_off", "x": 6, "y": 14, "chance": 10 } ]
}
},
{
Expand Down