Skip to content
This repository has been archived by the owner on Aug 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request CleverRaven#52888 from Termineitor244/Gambeson-cha…
Browse files Browse the repository at this point in the history 
…nges

Gambeson balance changes
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Nov 21, 2021
2 parents adf4c43 + 29d2820 commit 03f9cc1
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 22 deletions.
120 changes: 109 additions & 11 deletions data/json/items/armor/suits_protection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"id": "gambeson",
"type": "ARMOR",
"name": { "str": "gambeson" },
"description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. Or worn on its own, if you can't afford proper armor.",
"description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. Or worn on its own, if you can't afford proper armor. Use it to loosen it if you want to wear it over your clothes.",
"weight": "453 g",
"volume": "3 L",
"price": 20000,
Expand All @@ -592,49 +592,147 @@
"material_thickness": 5,
"valid_mods": [ "steel_padded" ],
"flags": [ "VARSIZE", "STURDY" ],
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "gambeson_loose", "menu_text": "Loosen" },
"armor": [
{ "covers": [ "torso", "arm_l", "arm_r" ], "coverage": 100, "encumbrance": 5 },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 30, "encumbrance": 5 }
{ "covers": [ "torso" ], "coverage": 100, "encumbrance": 8, "specifically_covers": [ "torso_upper", "torso_lower" ] },
{
"covers": [ "arm_l", "arm_r" ],
"coverage": 100,
"encumbrance": 8,
"specifically_covers": [
"arm_elbow_l",
"arm_elbow_r",
"arm_upper_l",
"arm_upper_r",
"arm_shoulder_l",
"arm_shoulder_r",
"arm_lower_r",
"arm_lower_l"
]
},
{
"covers": [ "leg_l", "leg_r" ],
"specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
"coverage": 20,
"encumbrance": 2
}
]
},
{
"id": "gambeson_loose",
"type": "ARMOR",
"name": { "str": "gambeson (loose)", "str_pl": "gambesons (loose)" },
"description": "A thick jacket of quilted fabric, loosened to be worn as outer armor. Use it to wear it tighter and be able to put proper armor over it.",
"copy-from": "gambeson",
"extend": { "flags": [ "OUTER" ] },
"use_action": {
"type": "transform",
"msg": "You adjust your gambeson a bit tighter.",
"target": "gambeson",
"menu_text": "Adjust tighter"
}
},
{
"id": "k_gambeson",
"type": "ARMOR",
"name": { "str": "kevlar gambeson" },
"description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. This one incorporates Kevlar layers added for better protection.",
"weight": "2880 g",
"description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. This one incorporates Kevlar layers added for better protection. Use it to loosen it if you want to wear it over your clothes.",
"weight": "2760 g",
"volume": "2520 ml",
"price": 20000,
"price_postapoc": 750,
"to_hit": -5,
"material": [ "kevlar_layered" ],
"material": [ { "type": "kevlar_layered", "portion": 6 }, { "type": "kevlar", "portion": 4 } ],
"symbol": "[",
"looks_like": "coat_winter",
"color": "light_gray",
"warmth": 30,
"material_thickness": 5,
"material_thickness": 3.2,
"valid_mods": [ "steel_padded" ],
"flags": [ "VARSIZE", "STURDY", "NONCONDUCTIVE" ],
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "k_gambeson_loose", "menu_text": "Loosen" },
"armor": [
{ "covers": [ "torso", "arm_l", "arm_r" ], "coverage": 100, "encumbrance": 5 },
{ "covers": [ "leg_l", "leg_r" ], "coverage": 30, "encumbrance": 5 }
{ "covers": [ "torso" ], "coverage": 100, "encumbrance": 12, "specifically_covers": [ "torso_upper", "torso_lower" ] },
{
"covers": [ "arm_l", "arm_r" ],
"coverage": 100,
"encumbrance": 16,
"specifically_covers": [
"arm_elbow_l",
"arm_elbow_r",
"arm_upper_l",
"arm_upper_r",
"arm_shoulder_l",
"arm_shoulder_r",
"arm_lower_r",
"arm_lower_l"
]
},
{
"covers": [ "leg_l", "leg_r" ],
"specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
"coverage": 20,
"encumbrance": 4
}
]
},
{
"id": "k_gambeson_loose",
"type": "ARMOR",
"name": { "str": "kevlar gambeson (loose)", "str_pl": "kevlar gambesons (loose)" },
"description": "A thick jacket of quilted fabric, loosened to be worn as outer armor. This one incorporates Kevlar layers added for better protection. Use it to wear it tighter and be able to put proper armor over it.",
"copy-from": "k_gambeson",
"extend": { "flags": [ "OUTER" ] },
"use_action": {
"type": "transform",
"msg": "You adjust your kevlar gambeson a bit tighter.",
"target": "k_gambeson",
"menu_text": "Adjust tighter"
}
},
{
"id": "xl_gambeson",
"type": "ARMOR",
"name": { "str": "XL gambeson" },
"copy-from": "gambeson",
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
"flags": [ "VARSIZE", "STURDY", "OVERSIZE" ],
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "xl_gambeson_loose", "menu_text": "Loosen" }
},
{
"id": "xl_gambeson_loose",
"type": "ARMOR",
"name": { "str": "XL gambeson (loose)", "str_pl": "XL gambesons (loose)" },
"copy-from": "xl_gambeson",
"extend": { "flags": [ "OUTER" ] },
"use_action": {
"type": "transform",
"msg": "You adjust your XL gambeson a bit tighter.",
"target": "xl_gambeson",
"menu_text": "Adjust tighter"
}
},
{
"id": "xl_k_gambeson",
"type": "ARMOR",
"name": { "str": "XL kevlar gambeson" },
"copy-from": "k_gambeson",
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
"flags": [ "VARSIZE", "STURDY", "NONCONDUCTIVE", "OVERSIZE" ]
"flags": [ "VARSIZE", "STURDY", "NONCONDUCTIVE", "OVERSIZE" ],
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "xl_k_gambeson_loose", "menu_text": "Loosen" }
},
{
"id": "xl_k_gambeson_loose",
"type": "ARMOR",
"name": { "str": "XL kevlar gambeson (loose)", "str_pl": "XL kevlar gambesons (loose)" },
"copy-from": "xl_k_gambeson",
"extend": { "flags": [ "OUTER" ] },
"use_action": {
"type": "transform",
"msg": "You adjust your XL kevlar gambeson a bit tighter.",
"target": "xl_k_gambeson",
"menu_text": "Adjust tighter"
}
},
{
"id": "hazmat_suit",
Expand Down
24 changes: 13 additions & 11 deletions data/json/recipes/armor/suit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,11 +852,12 @@
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "tailor",
"proficiencies": [ { "proficiency": "prof_closures" } ],
"difficulty": 4,
"time": "6 h",
"autolearn": true,
"book_learn": [ [ "textbook_armwest", 3 ] ],
"using": [ [ "sewing_standard", 30 ] ],
"using": [ [ "sewing_standard", 35 ], [ "fastener_large", 1 ] ],
"components": [ [ [ "rag", 26 ] ] ]
},
{
Expand All @@ -866,28 +867,29 @@
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_SUIT",
"skill_used": "tailor",
"difficulty": 8,
"time": "6 h",
"autolearn": true,
"book_learn": [ [ "textbook_armwest", 3 ] ],
"using": [ [ "sewing_standard", 30 ] ],
"components": [ [ [ "sheet_kevlar_layered", 36 ] ] ]
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } ],
"difficulty": 6,
"time": "8 h",
"autolearn": [ [ "tailor", 8 ] ],
"book_learn": [ [ "textbook_armwest", 4 ] ],
"using": [ [ "sewing_standard", 35 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_large", 1 ] ],
"components": [ [ [ "sheet_kevlar_layered", 18 ] ] ]
},
{
"result": "xl_gambeson",
"type": "recipe",
"copy-from": "gambeson",
"time": "6 h 45 m",
"using": [ [ "sewing_standard", 45 ] ],
"components": [ [ [ "rag", 62 ] ] ]
"using": [ [ "sewing_standard", 50 ], [ "fastener_large", 2 ] ],
"components": [ [ [ "rag", 52 ] ] ]
},
{
"result": "xl_k_gambeson",
"type": "recipe",
"copy-from": "k_gambeson",
"time": "6 h 45 m",
"using": [ [ "sewing_standard", 45 ] ],
"components": [ [ [ "sheet_kevlar_layered", 85 ] ] ]
"using": [ [ "sewing_standard", 50 ], [ "tailoring_kevlar_fabric", 24 ], [ "fastener_large", 2 ] ],
"components": [ [ [ "sheet_kevlar_layered", 36 ] ] ]
},
{
"result": "h20survivor_suit",
Expand Down

0 comments on commit 03f9cc1

Please sign in to comment.