Skip to content

Commit

Permalink
Survivor armor (re)additions (cataclysmbnteam#396)
Browse files Browse the repository at this point in the history 
* Adding various things

* Adding various things

* Add 2 other helmets surv, fix positions

* fix craft new backpack

* Casings fix

* fix

* delete casings craft

* fix

* fix

* delete "reversible": true on survivor_bigback

* another backpack

* fix

* fix x2

* fix x3

* Update data/json/items/armor/storage.json

Co-authored-by: Oleg Antipin <olanti-p@yandex.ru>

* fix id craft

Co-authored-by: Oleg Antipin <olanti-p@yandex.ru>
  • Loading branch information
@VuradoZ @olanti-p
VuradoZ and olanti-p authored Mar 18, 2021
1 parent b741a5d commit 09fab01
Show file tree
Hide file tree
Showing 7 changed files with 220 additions and 87 deletions.
72 changes: 72 additions & 0 deletions data/json/items/armor/helmets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,78 @@
"material_thickness": 4,
"techniques": [ "WBLOCK_1" ]
},
{
"id": "helmet_survivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "survivor helmet" },
"description": "A customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
"weight": "1420 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"looks_like": "helmet_army",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 25,
"warmth": 15,
"material_thickness": 5,
"environmental_protection": 3,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "helmet_xlsurvivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "XL survivor helmet" },
"description": "A massive customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
"weight": "3060 g",
"volume": "6 L",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"looks_like": "helmet_survivor",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 50,
"warmth": 15,
"material_thickness": 4,
"environmental_protection": 3,
"techniques": [ "WBLOCK_1" ],
"flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "helmet_hsurvivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "heavy survivor helmet" },
"description": "A customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm. All the added material has made it rather heavy.",
"weight": "3312 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "steel" ],
"symbol": "[",
"looks_like": "helmet_survivor",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 40,
"warmth": 25,
"material_thickness": 6,
"environmental_protection": 5,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "pickelhaube",
"repairs_like": "helmet_barbute",
Expand Down
32 changes: 32 additions & 0 deletions data/json/items/armor/storage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,38 @@
"material_thickness": 3,
"flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
},
{
"id": "survivor_hiking_backpack",
"type": "ARMOR",
"name": { "str": "survivor hiking backpack" },
"description": "A custom-built backpack hiking. Durable and carefully crafted to hold as much stuff as possible.",
"weight": "2500 g",
"volume": "15000 ml",
"price": 15000,
"price_postapoc": 1500,
"rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"looks_like": "backpack",
"color": "black",
"covers": [ "TORSO" ],
"coverage": 50,
"encumbrance": 10,
"max_encumbrance": 40,
"storage": "60 L",
"material_thickness": 2,
"use_action": {
"type": "holster",
"holster_prompt": "Sheath blade",
"holster_msg": "You sheath your %s",
"min_volume": "250ml",
"max_volume": "2500ml",
"multi": 2,
"draw_cost": 3,
"flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]
},
"flags": [ "ONLY_ONE", "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
},
{
"id": "survivor_duffel_bag",
"type": "ARMOR",
Expand Down
72 changes: 0 additions & 72 deletions data/json/items/obsolete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1657,78 +1657,6 @@
],
"flags": [ "FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ]
},
{
"id": "helmet_survivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "survivor helmet" },
"description": "A customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
"weight": "1420 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"looks_like": "helmet_army",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 25,
"warmth": 15,
"material_thickness": 5,
"environmental_protection": 3,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "helmet_xlsurvivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "XL survivor helmet" },
"description": "A massive customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
"weight": "3060 g",
"volume": "6 L",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"looks_like": "helmet_survivor",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 50,
"warmth": 15,
"material_thickness": 4,
"environmental_protection": 3,
"techniques": [ "WBLOCK_1" ],
"flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "helmet_hsurvivor",
"type": "ARMOR",
"category": "armor",
"name": { "str": "heavy survivor helmet" },
"description": "A customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm. All the added material has made it rather heavy.",
"weight": "3312 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
"bashing": 10,
"material": [ "kevlar", "steel" ],
"symbol": "[",
"looks_like": "helmet_survivor",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
"encumbrance": 40,
"warmth": 25,
"material_thickness": 6,
"environmental_protection": 5,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "l_bak_223",
"copy-from": "pistol_base",
Expand Down
1 change: 1 addition & 0 deletions data/json/materials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@
"specific_heat_solid": 0.45,
"latent_heat": 273,
"soft": true,
"reinforces": true,
"bash_resist": 2,
"cut_resist": 4,
"acid_resist": 5,
Expand Down
86 changes: 86 additions & 0 deletions data/json/recipes/armor/head.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,92 @@
[ [ "kevlar_plate", 8 ] ]
]
},
{
"result": "helmet_survivor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HEAD",
"skill_used": "tailor",
"difficulty": 6,
"skills_required": [ "fabrication", 4 ],
"time": "45 m",
"autolearn": true,
"using": [ [ "sewing_standard", 10 ] ],
"tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
"components": [
[ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ],
[ [ "tac_helmet", 1 ], [ "tac_fullhelmet", 1 ], [ "helmet_army", 1 ], [ "kevlar_plate", 6 ] ],
[ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ],
[ [ "leather", 8 ], [ "tanned_hide", 2 ] ],
[ [ "duct_tape", 150 ] ],
[
[ "helmet_riot", 1 ],
[ "helmet_motor", 1 ],
[ "helmet_football", 1 ],
[ "helmet_ball", 1 ],
[ "helmet_skid", 1 ],
[ "helmet_bike", 1 ],
[ "hat_hard", 1 ],
[ "firehelmet", 1 ],
[ "pickelhaube", 1 ],
[ "plastic_chunk", 8 ]
]
]
},
{
"result": "helmet_xlsurvivor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HEAD",
"skill_used": "tailor",
"difficulty": 6,
"skills_required": [ "fabrication", 4 ],
"time": "1 h",
"autolearn": true,
"using": [ [ "sewing_standard", 20 ] ],
"tools": [ [ [ "welder", 84 ], [ "welder_crude", 126 ], [ "soldering_iron", 126 ], [ "toolset", 126 ] ] ],
"components": [
[ [ "scrap", 4 ] ],
[ [ "rag", 6 ] ],
[ [ "leather", 16 ], [ "tanned_hide", 3 ] ],
[ [ "plastic_chunk", 20 ] ],
[ [ "kevlar_plate", 14 ] ],
[ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ],
[ [ "duct_tape", 300 ] ]
]
},
{
"result": "helmet_hsurvivor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HEAD",
"skill_used": "tailor",
"difficulty": 7,
"skills_required": [ "fabrication", 5 ],
"time": "45 m",
"autolearn": true,
"using": [ [ "sewing_standard", 10 ] ],
"tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
"components": [
[ [ "helmet_liner", 1 ], [ "hat_cotton", 1 ], [ "rag", 3 ] ],
[ [ "helmet_army", 1 ] ],
[ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ],
[ [ "steel_chunk", 2 ], [ "scrap", 6 ] ],
[ [ "duct_tape", 75 ] ],
[
[ "helmet_riot", 1 ],
[ "helmet_motor", 1 ],
[ "helmet_football", 1 ],
[ "helmet_ball", 1 ],
[ "helmet_skid", 1 ],
[ "helmet_bike", 1 ],
[ "hat_hard", 1 ],
[ "firehelmet", 1 ],
[ "pickelhaube", 1 ],
[ "plastic_chunk", 8 ]
]
]
},
{
"result": "helmet_scrap",
"type": "recipe",
Expand Down
29 changes: 29 additions & 0 deletions data/json/recipes/armor/storage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,35 @@
"autolearn": true,
"components": [ [ [ "straw_pile", 5 ], [ "birchbark", 7 ] ] ]
},
{
"result": "survivor_hiking_backpack",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_STORAGE",
"skill_used": "tailor",
"difficulty": 7,
"skills_required": [ "fabrication", 6 ],
"time": "2 h 20 m",
"autolearn": true,
"using": [ [ "sewing_standard", 300 ] ],
"components": [
[ [ "rag", 30 ] ],
[ [ "leather", 36 ], [ "tanned_hide", 6 ] ],
[ [ "backpack_hiking", 2 ], [ "backpack_tactical_large", 1 ] ],
[
[ "tacvest", 1 ],
[ "legrig", 1 ],
[ "vest", 1 ],
[ "tool_belt", 1 ],
[ "ragpouch", 4 ],
[ "leather_pouch", 2 ],
[ "dump_pouch", 1 ],
[ "purse", 2 ],
[ "fanny", 2 ]
],
[ [ "duct_tape", 300 ] ]
]
},
{
"result": "survivor_duffel_bag",
"type": "recipe",
Expand Down
15 changes: 0 additions & 15 deletions data/json/recipes/recipe_obsolete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2304,21 +2304,6 @@
"result": "zweifire_off",
"obsolete": true
},
{
"type": "recipe",
"result": "helmet_survivor",
"obsolete": true
},
{
"type": "recipe",
"result": "helmet_hsurvivor",
"obsolete": true
},
{
"type": "recipe",
"result": "helmet_xlsurvivor",
"obsolete": true
},
{
"type": "recipe",
"result": "l_HFPack",
Expand Down

0 comments on commit 09fab01

Please sign in to comment.