From 0b12bd24596c2126071ed16aa69a49c3a37986c2 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 14:30:33 -0700
Subject: [PATCH 01/19] Update materials.json
---
data/json/materials.json | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/data/json/materials.json b/data/json/materials.json
index c90a354f23916..4a527e795773f 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -3093,5 +3093,31 @@
{ "fuel": 1, "smoke": 1, "burn": 2 }
],
"burn_products": [ [ "corpse_ash", 0.035 ] ]
+ },
+ {
+ "type": "material",
+ "id": "mut_scales",
+ "name": "Mutant Scales",
+ "density": 1.2,
+ "specific_heat_liquid": 1.2,
+ "specific_heat_solid": 1.2,
+ "latent_heat": 200,
+ "bash_resist": 2.2,
+ "cut_resist": 3.5,
+ "bullet_resist": 1.4,
+ "acid_resist": 7,
+ "fire_resist": 1,
+ "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 }
+ ],
+ "burn_products": [ [ "corpse_ash", 0.035 ] ]
}
]
From f009627a1443eb24e1674ca3961433956e98f738 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:12:20 -0700
Subject: [PATCH 02/19] Update integrated.json
---
data/json/items/armor/integrated.json | 168 +++++++++++++++++++++-----
1 file changed, 135 insertions(+), 33 deletions(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index cd72d7654560c..7e049ddf6719c 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -799,7 +799,7 @@
]
},
{
- "id": "integrated_scales",
+ "id": "integrated_sparse_scales",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "sparse scales" },
@@ -808,26 +808,104 @@
"volume": "900 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", "SOFT", "NO_SALVAGE" ],
"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", "SOFT", "NO_SALVAGE" ],
+ "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" ]
+ }
+ },
{
"id": "integrated_fishscales",
"type": "ARMOR",
@@ -849,7 +927,6 @@
"UNBREAKABLE",
"SKINTIGHT",
"WATER_FRIENDLY",
- "PADDED",
"SOFT",
"TOUGH_FEET",
"NO_SALVAGE"
@@ -857,25 +934,39 @@
"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": 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": 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.0 }
],
"covers": [ "mouth" ],
"coverage": 100,
- "encumbrance": 0,
- "breathability": "POOR"
+ "encumbrance": 2
}
]
},
@@ -889,7 +980,7 @@
"volume": "3600 ml",
"price": 0,
"price_postapoc": 0,
- "material": [ "leather", "flesh", "mut_bone", "chitin" ],
+ "material": [ "leather", "mut_scales" ],
"symbol": "x",
"color": "light_red",
"warmth": 5,
@@ -898,28 +989,39 @@
"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": 86, "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": 8,
- "breathability": "POOR"
+ "encumbrance": 8
+ },
+ {
+ "material": [
+ { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
+ { "type": "mut_scales", "covered_by_mat": 91, "thickness": 6.0 }
+ ],
+ "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
+ "coverage": 100,
+ "encumbrance": 8
},
{
"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": 7
+ },
+ {
+ "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
}
]
},
From 0891fc48b61fe9ad5735605cc9853ac3efadb45a Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:41:04 -0700
Subject: [PATCH 03/19] fix typos
---
data/json/items/armor/integrated.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index 7e049ddf6719c..129ea57685b7f 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -905,6 +905,7 @@
"breathability": "POOR",
"layers": [ "PERSONAL" ]
}
+ ]
},
{
"id": "integrated_fishscales",
@@ -1021,7 +1022,8 @@
],
"covers": [ "mouth" ],
"coverage": 100,
- "encumbrance": 2
+ "encumbrance": 2,
+ "layers": [ "SKINTIGHT" ]
}
]
},
From acd9018dcdab874d3f388effb548e807613ac96a Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:34:13 -0700
Subject: [PATCH 04/19] add another scales tier
---
data/json/mutations/mutations.json | 36 ++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index b06a11ddad38b..2f4a23c75534a 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -2402,17 +2402,44 @@
"armor": [ { "part_types": [ "ALL" ], "cut": 3, "bash": 5 } ],
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "SPEED", "multiply": -0.2 } ] } ]
},
+ {
+ "type": "mutation",
+ "id": "SPARSE_SCALES",
+ "name": { "str": "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": "Sparse 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 },
@@ -2426,7 +2453,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" ]
},
{
@@ -2469,6 +2496,7 @@
"prereqs": [ "SCALES" ],
"category": [ "FISH" ],
"movecost_swim_modifier": 0.75,
+ "threshreq": [ "THRESH_FISH" ],
"wet_protection": [
{ "part": "head", "good": 7 },
{ "part": "leg_l", "good": 21 },
From de45d6023cd443f5b837f0cddaaf898c1cadaf08 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:34:59 -0700
Subject: [PATCH 05/19] add SPARSE_SCALES
---
data/mods/DinoMod/mutations/mutations.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/mods/DinoMod/mutations/mutations.json b/data/mods/DinoMod/mutations/mutations.json
index c0d8b27aa9f9d..22b26654e6e0c 100644
--- a/data/mods/DinoMod/mutations/mutations.json
+++ b/data/mods/DinoMod/mutations/mutations.json
@@ -268,6 +268,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",
From 144bd68f54892e7af4ed4c94f66f4f4306778baf Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:36:37 -0700
Subject: [PATCH 06/19] SPARSE_SCALES
---
data/mods/Magiclysm/mutations/mutations.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/data/mods/Magiclysm/mutations/mutations.json b/data/mods/Magiclysm/mutations/mutations.json
index 57eb18a2fb018..feba1c32fe907 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",
From 52e4eb3e01ed40a0cb965be3e0a5055343542151 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:26:13 -0700
Subject: [PATCH 07/19] Sparse Scales
---
data/json/mutations/mutations.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 2f4a23c75534a..96d4e9fa5b98b 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -2405,7 +2405,7 @@
{
"type": "mutation",
"id": "SPARSE_SCALES",
- "name": { "str": "Scales" },
+ "name": { "str": "Sparse Scales" },
"points": 2,
"visibility": 5,
"ugliness": 1,
From 5edb001c1f3c3b445155cd150eb93d30d09510e6 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:29:54 -0700
Subject: [PATCH 08/19] fix roughskin
---
data/json/mutations/mutations.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 96d4e9fa5b98b..93f03980011ce 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -1911,7 +1911,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",
From dab54aed1ee2082a11c01ce8829035067d295090 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:38:27 -0700
Subject: [PATCH 09/19] correct fishscales material
---
data/json/items/armor/integrated.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index 129ea57685b7f..a0d1bdf191085 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -917,7 +917,7 @@
"volume": "1800 ml",
"price": 0,
"price_postapoc": 0,
- "material": [ "flesh", "mut_bone", "chitin" ],
+ "material": [ "flesh", "mut_scales" ],
"symbol": "x",
"color": "light_red",
"warmth": 3,
From 24cc4dbe623b2f10b5ce880b4ec0d48e822b5e46 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:40:15 -0700
Subject: [PATCH 10/19] lower sparse scales weight
---
data/json/items/armor/integrated.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index a0d1bdf191085..38712ef5e4fff 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -804,8 +804,8 @@
"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_scales" ],
From 0f65453a6ab2ca29f1e5631ba0093bba5a172dd2 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 09:13:58 -0700
Subject: [PATCH 11/19] make mutant scales soft
---
data/json/materials.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/json/materials.json b/data/json/materials.json
index 4a527e795773f..f7ca97e6b686d 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -3118,6 +3118,7 @@
{ "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250 ml" },
{ "fuel": 1, "smoke": 1, "burn": 2 }
],
- "burn_products": [ [ "corpse_ash", 0.035 ] ]
+ "burn_products": [ [ "corpse_ash", 0.035 ] ],
+ "soft": true
}
]
From c6990663535aeb9b00efe420c7e2ae418e416fba Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 09:23:49 -0700
Subject: [PATCH 12/19] lizard scales adjusts
---
data/json/items/armor/integrated.json | 29 ++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index 38712ef5e4fff..dfc4ebd0e2dbb 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -981,12 +981,12 @@
"volume": "3600 ml",
"price": 0,
"price_postapoc": 0,
- "material": [ "leather", "mut_scales" ],
+ "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" ],
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "SOFT", "NO_SALVAGE" ],
"armor": [
{
"material": [
@@ -995,16 +995,28 @@
],
"covers": [ "head" ],
"coverage": 100,
- "encumbrance": 8
+ "encumbrance": 6
},
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
- { "type": "mut_scales", "covered_by_mat": 91, "thickness": 6.0 }
+ { "type": "mut_scales", "covered_by_mat": 95, "thickness": 6.0 }
],
- "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
+ "covers": [ "torso" ],
"coverage": 100,
- "encumbrance": 8
+ "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": 75, "thickness": 3.0 }
+ ],
+ "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+ "coverage": 100,
+ "encumbrance": 8,
+ "layers": [ "NORMAL" ]
},
{
"material": [
@@ -1013,7 +1025,7 @@
],
"covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
"coverage": 100,
- "encumbrance": 7
+ "encumbrance": 6
},
{
"material": [
@@ -1022,8 +1034,7 @@
],
"covers": [ "mouth" ],
"coverage": 100,
- "encumbrance": 2,
- "layers": [ "SKINTIGHT" ]
+ "encumbrance": 2
}
]
},
From 6ae12c90d2b8905f96ea8809c6fa4e9cd60803c1 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 09:27:35 -0700
Subject: [PATCH 13/19] softness tweaks
---
data/json/items/armor/integrated.json | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index dfc4ebd0e2dbb..fe80b451457d2 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -813,7 +813,7 @@
"color": "light_red",
"warmth": 1,
"environmental_protection": 1,
- "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY", "SOFT", "NO_SALVAGE" ],
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY" ],
"armor": [
{
"material": [
@@ -862,7 +862,7 @@
"color": "light_red",
"warmth": 2,
"environmental_protection": 2,
- "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "SOFT", "NO_SALVAGE" ],
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET" ],
"armor": [
{
"material": [
@@ -922,16 +922,7 @@
"color": "light_red",
"warmth": 3,
"environmental_protection": 4,
- "flags": [
- "INTEGRATED",
- "ALLOWS_NATURAL_ATTACKS",
- "UNBREAKABLE",
- "SKINTIGHT",
- "WATER_FRIENDLY",
- "SOFT",
- "TOUGH_FEET",
- "NO_SALVAGE"
- ],
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "TOUGH_FEET" ],
"armor": [
{
"material": [
@@ -985,8 +976,8 @@
"symbol": "x",
"color": "light_red",
"warmth": 5,
- "environmental_protection": 3,
- "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "SOFT", "NO_SALVAGE" ],
+ "environmental_protection": 4,
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "TOUGH_FEET" ],
"armor": [
{
"material": [
From 4799795ac2ac3de168d93b1a92eef7a160076404 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 09:30:27 -0700
Subject: [PATCH 14/19] thick scales references its scutes
---
data/json/mutations/mutations.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 93f03980011ce..dda6b23c5e310 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -2464,7 +2464,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" ],
From 5eacbf54c813c1d6b8e49aa70c7807fa56033b32 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 09:37:59 -0700
Subject: [PATCH 15/19] restore no_salvage to reptilescales
---
data/json/items/armor/integrated.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index fe80b451457d2..1c87537d64999 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -977,7 +977,7 @@
"color": "light_red",
"warmth": 5,
"environmental_protection": 4,
- "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "TOUGH_FEET" ],
+ "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "TOUGH_FEET", "NO_SALVAGE" ],
"armor": [
{
"material": [
From a670f653073bf790914278455b5b7265d3481a82 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:57:45 -0700
Subject: [PATCH 16/19] Update data/json/items/armor/integrated.json
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
data/json/items/armor/integrated.json | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index 1c87537d64999..be201a45215fc 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -977,7 +977,16 @@
"color": "light_red",
"warmth": 5,
"environmental_protection": 4,
- "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "SKINTIGHT", "WATER_FRIENDLY", "PADDED", "TOUGH_FEET", "NO_SALVAGE" ],
+ "flags": [
+ "INTEGRATED",
+ "ALLOWS_NATURAL_ATTACKS",
+ "UNBREAKABLE",
+ "SKINTIGHT",
+ "WATER_FRIENDLY",
+ "PADDED",
+ "TOUGH_FEET",
+ "NO_SALVAGE"
+ ],
"armor": [
{
"material": [
From e6899f634a72feef134ec8e2d86c78a7712e8a39 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 31 Mar 2023 14:29:39 -0700
Subject: [PATCH 17/19] final tweaks
---
data/json/items/armor/integrated.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index be201a45215fc..ff92e6e7cca3d 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -991,7 +991,7 @@
{
"material": [
{ "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
- { "type": "mut_scales", "covered_by_mat": 86, "thickness": 5.0 }
+ { "type": "mut_scales", "covered_by_mat": 87, "thickness": 5.0 }
],
"covers": [ "head" ],
"coverage": 100,
@@ -1011,7 +1011,7 @@
"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": 75, "thickness": 3.0 }
+ { "type": "mut_bone", "covered_by_mat": 82, "thickness": 4.0 }
],
"covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 100,
From 5de0e95a9c19c3e067dd55eb6c555c0f9775e799 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Sat, 1 Apr 2023 19:07:46 -0700
Subject: [PATCH 18/19] scute is a real word
---
tools/spell_checker/dictionary.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index 2916518218527..9e408f144ecaa 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -2456,6 +2456,8 @@ scrrrash
scruffs
scutcher
scutellosaurus
+scute
+scutes
scuttles
sealab
sealabs
From 8fd5f7decdf341c6b31d799c3ce67f7a14655215 Mon Sep 17 00:00:00 2001
From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:16:45 -0700
Subject: [PATCH 19/19] fix
---
data/json/materials.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/json/materials.json b/data/json/materials.json
index 3f915b33c9a52..2a34566a7581b 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -2662,8 +2662,8 @@
{ "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250 ml" },
{ "fuel": 1, "smoke": 1, "burn": 2 }
],
- "resist": { "bash": 2, "cut": 3, "acid": 7, "heat": 1, "bullet": 1 },
- "burn_products": [ [ "corpse_ash", 0.035 ] ]
+ "burn_products": [ [ "corpse_ash", 0.035 ] ],
+ "resist": { "bash": 2, "cut": 3, "acid": 7, "heat": 1, "bullet": 1 }
},
{
"type": "material",
@@ -2684,7 +2684,8 @@
{ "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250 ml" },
{ "fuel": 1, "smoke": 1, "burn": 2 }
],
- "soft": true
+ "soft": true,
+ "burn_products": [ [ "corpse_ash", 0.035 ] ],
"resist": { "bash": 2.2, "cut": 3.5, "acid": 7, "heat": 1, "bullet": 1.4 }
}
]