Skip to content

Commit

Permalink
Updates biosilicified chitin material and armor (#71100)
Browse files Browse the repository at this point in the history
* Updates biosilicified chitin material and armor

* Increased cut resistance, lowered bash and chipping resistance

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

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

---------

Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
  • Loading branch information
carlarctg and Maleclypse authored Jan 26, 2024
1 parent 185c7a1 commit 560a147
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 50 deletions.
5 changes: 1 addition & 4 deletions data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,14 @@
"price_postapoc": 1250,
"name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" },
"description": "A pair of arm guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"material": [ "acidchitin" ],
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"material_thickness": 4
"material": [ "acidchitin" ]
},
{
"id": "xl_armguard_acidchitin",
"copy-from": "armguard_acidchitin",
"type": "ARMOR",
"name": { "str": "pair of XL biosilicified chitin arm guards", "str_pl": "pairs of XL biosilicified chitin arm guards" },
"proportional": { "weight": 1.25, "volume": 1.25 },
"material_thickness": 5,
"extend": { "flags": [ "OVERSIZE" ] }
},
{
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,7 @@
"description": "Boots crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"price_postapoc": 1750,
"material": [ "acidchitin" ],
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"relative": { "melee_damage": { "bash": 2 } },
"material_thickness": 5
"relative": { "melee_damage": { "bash": 2 } }
},
{
"id": "xl_boots_acidchitin",
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,7 @@
"description": "A pair of gauntlets crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"material": [ "acidchitin" ],
"price_postapoc": 1750,
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"relative": { "melee_damage": { "bash": 1 } },
"material_thickness": 5
"relative": { "melee_damage": { "bash": 1 } }
},
{
"id": "xl_gauntlets_acidchitin",
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -760,9 +760,7 @@
"description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"price_postapoc": 1750,
"material": [ "acidchitin" ],
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "warmth": 1.5 },
"relative": { "melee_damage": { "bash": 1 } },
"material_thickness": 5
"relative": { "melee_damage": { "bash": 1 } }
},
{
"id": "xl_helmet_acidchitin",
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@
"price_postapoc": 1250,
"name": { "str": "pair of biosilicified chitin leg guards", "str_pl": "pairs of biosilicified chitin leg guards" },
"description": "A pair of leg guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"material": [ "acidchitin" ],
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"material_thickness": 5
"material": [ "acidchitin" ]
},
{
"id": "xl_legguard_acidchitin",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/pets_cow_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"material": [ "acidchitin" ],
"weight": "40 kg",
"volume": "180 L",
"material_thickness": 5,
"material_thickness": 7,
"environmental_protection": 7
},
{
Expand All @@ -48,7 +48,7 @@
"description": "A makeshift assembly of criniere, peytral and croupiere made from chitin fitted to a thin mesh. You could put this on a friendly cow.",
"price": 110000,
"price_postapoc": 7000,
"material": [ "chitin", "steel" ],
"material": [ "chitin" ],
"weight": "40 kg",
"volume": "180 L",
"material_thickness": 7,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/pets_horse_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"material": [ "acidchitin" ],
"weight": "35 kg",
"volume": "150 L",
"material_thickness": 4,
"material_thickness": 6,
"environmental_protection": 7
},
{
Expand All @@ -48,7 +48,7 @@
"description": "A makeshift assembly of criniere, peytral and croupiere made from chitin fitted to a thin mesh. You could put this on a friendly horse.",
"price": 100000,
"price_postapoc": 6000,
"material": [ "chitin", "steel" ],
"material": [ "chitin" ],
"weight": "35 kg",
"volume": "150 L",
"material_thickness": 6,
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,8 @@
"name": { "str": "biosilicified chitin armor" },
"description": "Leg and body armor crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.",
"material": [ "acidchitin" ],
"material_thickness": 5,
"environmental_protection": 2,
"price_postapoc": 3500,
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"relative": { "melee_damage": { "bash": 1 } }
},
{
Expand Down
1 change: 0 additions & 1 deletion data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@
"description": "A lump of exoskeleton that has undergone biosilicification. It is acid-resistant but rather brittle.",
"material": [ "acidchitin" ],
"flags": [ "NO_SALVAGE" ],
"proportional": { "weight": 1.25 },
"relative": { "melee_damage": { "bash": 2 } }
},
{
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/plating.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
"copy-from": "chitin_plate",
"name": { "str": "biosilicified chitin armor kit" },
"description": "A piece of durable silica-coated chitin plating made for a vehicle.",
"material": [ "acidchitin" ],
"proportional": { "price": 1.333, "weight": 1.2, "volume": 1.18, "melee_damage": { "bash": 1.25 } }
"material": [ "acidchitin" ]
},
{
"type": "GENERIC",
Expand Down
48 changes: 24 additions & 24 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,30 +251,6 @@
"resist": { "bash": 1, "cut": 2, "acid": 4, "heat": 2, "bullet": 1 },
"repair_difficulty": 5
},
{
"type": "material",
"id": "acidchitin",
"name": "Biosilicified Chitin",
"density": 4.5,
"specific_heat_liquid": 4.186,
"specific_heat_solid": 2.108,
"latent_heat": 333,
"chip_resist": 8,
"breathability": "GOOD",
"salvaged_into": "acidchitin_piece",
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
"bash_dmg_verb": "cracked",
"cut_dmg_verb": "chipped",
"//": "Normal chitin has low but non-zero flammability according to the US NFPA.",
"burn_data": [
{ "fuel": 0, "smoke": 0, "burn": 0.0001 },
{ "fuel": 0.2, "smoke": 3, "burn": 0.005, "volume_per_turn": "200 ml" },
{ "fuel": 0.35, "smoke": 5, "burn": 0.015, "volume_per_turn": "200 ml" }
],
"burn_products": [ [ "corpse_ash", 0.035 ] ],
"resist": { "bash": 2.3, "cut": 3.7, "acid": 16, "heat": 4, "bullet": 1.2 },
"repair_difficulty": 8
},
{
"type": "material",
"id": "bone",
Expand Down Expand Up @@ -487,6 +463,30 @@
"resist": { "bash": 2.5, "cut": 4, "acid": 6, "heat": 2.5, "bullet": 1.4 },
"repair_difficulty": 5
},
{
"type": "material",
"id": "acidchitin",
"name": "Biosilicified Chitin",
"density": 1.45,
"specific_heat_liquid": 4.186,
"specific_heat_solid": 2.108,
"latent_heat": 333,
"chip_resist": 7,
"breathability": "GOOD",
"wind_resist": 90,
"salvaged_into": "acidchitin_piece",
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
"bash_dmg_verb": "cracked",
"cut_dmg_verb": "chipped",
"burn_data": [
{ "fuel": 0, "smoke": 0, "burn": 0.0001 },
{ "fuel": 0.2, "smoke": 3, "burn": 0.001, "volume_per_turn": "200 ml" },
{ "fuel": 0.35, "smoke": 5, "burn": 0.05, "volume_per_turn": "200 ml" }
],
"burn_products": [ [ "corpse_ash", 0.035 ] ],
"resist": { "bash": 1, "cut": 6, "acid": 20, "heat": 4, "bullet": 1.2 },
"repair_difficulty": 5
},
{
"type": "material",
"id": "chitin_light",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@
"reversible": true,
"autolearn": true,
"components": [
[ [ "acidchitin_piece", 25 ] ],
[ [ "acidchitin_piece", 20 ] ],
[ [ "rope_natural", 1, "LIST" ] ],
[ [ "rope_natural_short", 2, "LIST" ], [ "adhesive", 4, "LIST" ] ]
]
Expand Down

0 comments on commit 560a147

Please sign in to comment.