diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index 72ae6d7ac48e5..4a944518294e0 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -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" ]
}
]
},
@@ -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
}
]
},
@@ -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
}
]
},
diff --git a/data/json/materials.json b/data/json/materials.json
index afbd82d6837c8..2a34566a7581b 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -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 }
}
]
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 73f73ff0fd8c6..50bdf9bb50f80 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -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",
@@ -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 },
@@ -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" ]
},
{
@@ -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" ],
@@ -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 },
diff --git a/data/mods/DinoMod/mutations/mutations.json b/data/mods/DinoMod/mutations/mutations.json
index 9beb8eeb7cebf..98dec81b8addd 100644
--- a/data/mods/DinoMod/mutations/mutations.json
+++ b/data/mods/DinoMod/mutations/mutations.json
@@ -257,6 +257,12 @@
"copy-from": "LIZ_IR",
"extend": { "category": [ "STEGO", "TYRANT" ] }
},
+ {
+ "type": "mutation",
+ "id": "SPARSE_SCALES",
+ "copy-from": "SPARSE_SCALES",
+ "extend": { "category": [ "STEGO", "TYRANT", "HORNS" ] }
+ },
{
"type": "mutation",
"id": "SCALES",
diff --git a/data/mods/Magiclysm/mutations/mutations.json b/data/mods/Magiclysm/mutations/mutations.json
index 5f5702bb15fa7..68414bcd72a3d 100644
--- a/data/mods/Magiclysm/mutations/mutations.json
+++ b/data/mods/Magiclysm/mutations/mutations.json
@@ -100,6 +100,12 @@
"copy-from": "SKIN_ROUGH",
"extend": { "category": [ "DRAGON_BLACK" ] }
},
+ {
+ "type": "mutation",
+ "id": "SPARSE_SCALES",
+ "copy-from": "SPARSE_SCALES",
+ "extend": { "category": [ "DRAGON_BLACK" ] }
+ },
{
"type": "mutation",
"id": "SCALES",
diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index f3ad5ff5afc19..00cc3cae4506d 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -2476,6 +2476,8 @@ scrrrash
scruffs
scutcher
scutellosaurus
+scute
+scutes
scuttles
sealab
sealable