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.

Sign up for GitHub

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

Further mutant scales refinements #64681

Merged
merged 22 commits into from
May 11, 2023
Merged

Further mutant scales refinements #64681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0b12bd2
Update materials.json
anoobindisguise Mar 28, 2023
f009627
Update integrated.json
anoobindisguise Mar 28, 2023
0891fc4
fix typos
anoobindisguise Mar 28, 2023
acd9018
add another scales tier
anoobindisguise Mar 29, 2023
de45d60
add SPARSE_SCALES
anoobindisguise Mar 29, 2023
144bd68
SPARSE_SCALES
anoobindisguise Mar 29, 2023
52e4eb3
Sparse Scales
anoobindisguise Mar 29, 2023
5edb001
fix roughskin
anoobindisguise Mar 29, 2023
dab54ae
correct fishscales material
anoobindisguise Mar 29, 2023
24cc4db
lower sparse scales weight
anoobindisguise Mar 29, 2023
0f65453
make mutant scales soft
anoobindisguise Mar 31, 2023
c699066
lizard scales adjusts
anoobindisguise Mar 31, 2023
6ae12c9
softness tweaks
anoobindisguise Mar 31, 2023
4799795
thick scales references its scutes
anoobindisguise Mar 31, 2023
5eacbf5
restore no_salvage to reptilescales
anoobindisguise Mar 31, 2023
a670f65
Update data/json/items/armor/integrated.json
anoobindisguise Mar 31, 2023
e6899f6
final tweaks
anoobindisguise Mar 31, 2023
5de0e95
scute is a real word
anoobindisguise Apr 2, 2023
2065ce8
Merge branch 'CleverRaven:master' into anoobindisguise-scales2scaleha…
anoobindisguise Apr 7, 2023
20de3ff
Merge branch 'CleverRaven:master' into anoobindisguise-scales2scaleha…
anoobindisguise Apr 12, 2023
32cb261
Merge branch 'master' into anoobindisguise-scales2scaleharder
anoobindisguise Apr 29, 2023
8fd5f7d
fix
anoobindisguise Apr 29, 2023
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
209 changes: 162 additions & 47 deletions data/json/items/armor/integrated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,32 +804,111 @@
]
},
{
"id": "integrated_scales",
"id": "integrated_sparse_scales",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "sparse scales" },
"description": "Your dermis has toughened and started to grow scales in places.",
"weight": "1 kg",
"volume": "900 ml",
"weight": "400 g",
"volume": "400 ml",
"price": 0,
"price_postapoc": 0,
"material": [ "hflesh", "mut_bone", "chitin" ],
"material": [ "hflesh", "mut_scales" ],
"symbol": "x",
"color": "light_red",
"warmth": 1,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY", "PADDED", "SOFT", "NO_SALVAGE" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY" ],
"armor": [
{
"material": [
{ "type": "hflesh", "covered_by_mat": 100, "thickness": 1 },
{ "type": "bone", "covered_by_mat": 60, "thickness": 1 },
{ "type": "chitin", "covered_by_mat": 60, "thickness": 1 }
{ "type": "hflesh", "covered_by_mat": 100, "thickness": 0.5 },
{ "type": "mut_scales", "covered_by_mat": 45, "thickness": 1.0 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r", "leg_l", "leg_r", "arm_l", "arm_r", "torso", "head" ],
"covers": [ "head" ],
"coverage": 100,
"encumbrance": 0,
"breathability": "GOOD"
},
{
"material": [
{ "type": "hflesh", "covered_by_mat": 100, "thickness": 0.5 },
{ "type": "mut_scales", "covered_by_mat": 50, "thickness": 1.0 }
],
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 100,
"encumbrance": 0,
"breathability": "GOOD"
},
{
"material": [
{ "type": "hflesh", "covered_by_mat": 100, "thickness": 0.5 },
{ "type": "mut_scales", "covered_by_mat": 45, "thickness": 0.5 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 0,
"breathability": "GOOD"
}
]
},
{
"id": "integrated_scales",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "scales" },
"description": "Your scales have grown thicker and cover most of your body, providing solid armor.",
"weight": "1 kg",
"volume": "900 ml",
"price": 0,
"price_postapoc": 0,
"material": [ "flesh", "mut_scales" ],
"symbol": "x",
"color": "light_red",
"warmth": 2,
"environmental_protection": 2,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET" ],
"armor": [
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "mut_scales", "covered_by_mat": 85, "thickness": 2.0 }
],
"covers": [ "head" ],
"coverage": 100,
"encumbrance": 1,
"breathability": "POOR"
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "mut_scales", "covered_by_mat": 90, "thickness": 2.0 }
],
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 100,
"encumbrance": 2,
"breathability": "POOR"
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "mut_scales", "covered_by_mat": 85, "thickness": 1.0 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 1,
"breathability": "POOR"
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "mut_scales", "covered_by_mat": 90, "thickness": 1.0 }
],
"covers": [ "mouth" ],
"coverage": 90,
"encumbrance": 1,
"breathability": "POOR",
"layers": [ "PERSONAL" ]
}
]
},
Expand All @@ -843,44 +922,48 @@
"volume": "1800 ml",
"price": 0,
"price_postapoc": 0,
"material": [ "flesh", "mut_bone", "chitin" ],
"material": [ "flesh", "mut_scales" ],
"symbol": "x",
"color": "light_red",
"warmth": 3,
"environmental_protection": 4,
"flags": [
"INTEGRATED",
"ALLOWS_NATURAL_ATTACKS",
"UNBREAKABLE",
"SKINTIGHT",
"WATER_FRIENDLY",
"PADDED",
"SOFT",
"TOUGH_FEET",
"NO_SALVAGE"
],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET" ],
"armor": [
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "bone", "covered_by_mat": 99, "thickness": 2.0 },
{ "type": "chitin", "covered_by_mat": 99, "thickness": 2.0 }
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.5 },
{ "type": "mut_scales", "covered_by_mat": 95, "thickness": 2.5 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r", "leg_l", "leg_r", "arm_l", "arm_r", "torso", "head" ],
"covers": [ "head" ],
"coverage": 100,
"encumbrance": 3,
"breathability": "POOR"
"encumbrance": 3
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "bone", "covered_by_mat": 75, "thickness": 2.0 },
{ "type": "chitin", "covered_by_mat": 75, "thickness": 2.0 }
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.5 },
{ "type": "mut_scales", "covered_by_mat": 95, "thickness": 2.5 }
],
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 100,
"encumbrance": 3
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.5 },
{ "type": "mut_scales", "covered_by_mat": 95, "thickness": 2.0 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 3
},
{
"material": [
{ "type": "flesh", "covered_by_mat": 100, "thickness": 1.5 },
{ "type": "mut_scales", "covered_by_mat": 95, "thickness": 2.0 }
],
"covers": [ "mouth" ],
"coverage": 100,
"encumbrance": 0,
"breathability": "POOR"
"encumbrance": 2
}
]
},
Expand All @@ -894,37 +977,69 @@
"volume": "3600 ml",
"price": 0,
"price_postapoc": 0,
"material": [ "leather", "flesh", "mut_bone", "chitin" ],
"material": [ "leather", "mut_scales", "mut_bone" ],
"symbol": "x",
"color": "light_red",
"warmth": 5,
"environmental_protection": 3,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "NORMAL", "WATER_FRIENDLY", "PADDED", "SOFT", "NO_SALVAGE" ],
"environmental_protection": 4,
"flags": [
"INTEGRATED",
"ALLOWS_NATURAL_ATTACKS",
"UNBREAKABLE",
"SKINTIGHT",
"WATER_FRIENDLY",
"PADDED",
"TOUGH_FEET",
"NO_SALVAGE"
],
"armor": [
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.5 },
{ "type": "flesh", "covered_by_mat": 100, "thickness": 0.5 },
{ "type": "bone", "covered_by_mat": 95, "thickness": 4.0 },
{ "type": "chitin", "covered_by_mat": 95, "thickness": 4.0 }
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "mut_scales", "covered_by_mat": 87, "thickness": 5.0 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r", "leg_l", "leg_r", "arm_l", "arm_r", "torso", "head" ],
"covers": [ "head" ],
"coverage": 100,
"encumbrance": 6
},
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "mut_scales", "covered_by_mat": 95, "thickness": 6.0 }
],
"covers": [ "torso" ],
"coverage": 100,
"encumbrance": 5
},
{
"//": "mut_bone represents the scutes",
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "mut_scales", "covered_by_mat": 91, "thickness": 6.0 },
{ "type": "mut_bone", "covered_by_mat": 82, "thickness": 4.0 }
],
"covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 100,
"encumbrance": 8,
"breathability": "POOR"
"layers": [ "NORMAL" ]
},
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "flesh", "covered_by_mat": 100, "thickness": 0.5 },
{ "type": "bone", "covered_by_mat": 60, "thickness": 4.0 },
{ "type": "chitin", "covered_by_mat": 60, "thickness": 4.0 }
{ "type": "mut_scales", "covered_by_mat": 85, "thickness": 4.0 }
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 6
},
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
{ "type": "mut_scales", "covered_by_mat": 85, "thickness": 4.0 }
],
"covers": [ "mouth" ],
"coverage": 100,
"encumbrance": 0,
"breathability": "POOR",
"layers": [ "SKINTIGHT" ]
"encumbrance": 2
}
]
},
Expand Down
23 changes: 23 additions & 0 deletions data/json/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2664,5 +2664,28 @@
],
"burn_products": [ [ "corpse_ash", 0.035 ] ],
"resist": { "bash": 2, "cut": 3, "acid": 7, "heat": 1, "bullet": 1 }
},
{
"type": "material",
"id": "mut_scales",
"name": "Mutant Scales",
"density": 1.2,
"specific_heat_liquid": 1.2,
"specific_heat_solid": 1.2,
"latent_heat": 200,
"chip_resist": 8,
"wind_resist": 75,
"dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
"bash_dmg_verb": "cracked",
"cut_dmg_verb": "chipped",
"vitamins": [ [ "calcium", 2 ] ],
"burn_data": [
{ "fuel": 0, "smoke": 0, "burn": 0 },
{ "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250 ml" },
{ "fuel": 1, "smoke": 1, "burn": 2 }
],
"soft": true,
"burn_products": [ [ "corpse_ash", 0.035 ] ],
"resist": { "bash": 2.2, "cut": 3.5, "acid": 7, "heat": 1, "bullet": 1.4 }
}
]
40 changes: 34 additions & 6 deletions data/json/mutations/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@
"ugliness": 1,
"description": "Your skin is slightly rough. This has no gameplay effect.",
"types": [ "SKIN" ],
"changes_to": [ "SCALES", "FEATHERS", "LIGHTFUR", "CHITIN", "PLANTSKIN", "PATCHSKIN1" ],
"changes_to": [ "SPARSE_SCALES", "FEATHERS", "LIGHTFUR", "CHITIN", "PLANTSKIN", "PATCHSKIN1" ],
"category": [
"LIZARD",
"RAPTOR",
Expand Down Expand Up @@ -2415,15 +2415,42 @@
},
{
"type": "mutation",
"id": "SCALES",
"id": "SPARSE_SCALES",
"name": { "str": "Sparse Scales" },
"points": 2,
"visibility": 5,
"ugliness": 1,
"description": "Your skin has toughened and grown thin, flexible scales in some places, acting as natural armor.",
"types": [ "SKIN" ],
"category": [ "RAPTOR", "LIZARD", "FISH" ],
"prereqs": [ "SKIN_ROUGH" ],
"changes_to": [ "SCALES" ],
"wet_protection": [
{ "part": "head", "ignored": 2 },
{ "part": "leg_l", "ignored": 5 },
{ "part": "leg_r", "ignored": 5 },
{ "part": "foot_l", "ignored": 2 },
{ "part": "foot_r", "ignored": 2 },
{ "part": "arm_l", "ignored": 4 },
{ "part": "arm_r", "ignored": 4 },
{ "part": "hand_l", "ignored": 1 },
{ "part": "hand_r", "ignored": 1 },
{ "part": "torso", "ignored": 10 }
],
"armor": [ { "part_types": [ "tail" ], "cut": 2, "bash": 1 } ],
"integrated_armor": [ "integrated_sparse_scales" ]
},
{
"type": "mutation",
"id": "SCALES",
"name": { "str": "Scales" },
"points": 2,
"visibility": 10,
"ugliness": 3,
"description": "Your skin has toughened and grown thin, flexible scales in some places, acting as natural armor. Somewhat reduces wet effects.",
"description": "Your skin has toughened further and your scales have grown to cover most of your body. Somewhat reduces wet effects.",
"types": [ "SKIN" ],
"category": [ "RAPTOR", "LIZARD", "FISH" ],
"prereqs": [ "SKIN_ROUGH" ],
"prereqs": [ "SPARSE_SCALES" ],
"changes_to": [ "THICK_SCALES", "SLEEK_SCALES" ],
"wet_protection": [
{ "part": "head", "ignored": 2 },
Expand All @@ -2437,7 +2464,7 @@
{ "part": "hand_r", "ignored": 1 },
{ "part": "torso", "ignored": 10 }
],
"armor": [ { "part_types": [ "tail" ], "cut": 2, "bash": 2 } ],
"armor": [ { "part_types": [ "tail" ], "cut": 7, "bash": 4 } ],
"integrated_armor": [ "integrated_scales" ]
},
{
Expand All @@ -2448,7 +2475,7 @@
"visibility": 10,
"ugliness": 4,
"mixed_effect": true,
"description": "Your skin has grown thick and leathery and a set of heavy green scales has grown to cover most of your body, acting as natural armor. While difficult to penetrate, it also limits your flexibility. Greatly reduces wet effects.",
"description": "Your skin has grown thick and leathery and a set of heavy green scales has grown to cover most of your body, acting as natural armor. Further, bony scutes cover your extremities, offering additional protection there. While difficult to penetrate, it also limits your flexibility. Greatly reduces wet effects.",
"types": [ "SKIN" ],
"prereqs": [ "SCALES" ],
"threshreq": [ "THRESH_LIZARD" ],
Expand Down Expand Up @@ -2480,6 +2507,7 @@
"prereqs": [ "SCALES" ],
"category": [ "FISH" ],
"movecost_swim_modifier": 0.75,
"threshreq": [ "THRESH_FISH" ],
"wet_protection": [
{ "part": "head", "good": 7 },
{ "part": "leg_l", "good": 21 },
Expand Down
Loading