From 1e35fe9a5016739ff2a6816f1a2d6e0e8cf6a75a Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sat, 21 Dec 2019 22:10:39 -0500 Subject: [PATCH 1/3] Humans have human skin --- data/json/harvest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 49512175917ee..116ae34ef670b 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -535,7 +535,7 @@ { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 } + { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 } ] }, { @@ -547,7 +547,7 @@ { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 }, - { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 } + { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.01 } ] }, { From fc1da1fc941ed5ae35095c815654442f563e7e5c Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sat, 21 Dec 2019 22:26:10 -0500 Subject: [PATCH 2/3] Furry mutant humans have human skin on their fur --- data/json/harvest.json | 4 ++-- data/json/items/comestibles/carnivore.json | 8 ++++++++ data/json/recipes/armor/storage.json | 2 +- data/json/recipes/recipe_others.json | 5 ++++- data/mods/More_Survival_Tools/recipes.json | 2 +- data/mods/blazemod/blaze_blob_recipes.json | 7 ++++++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 116ae34ef670b..f9f7b6e869272 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -139,7 +139,7 @@ { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, @@ -152,7 +152,7 @@ { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }, { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, - { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 }, + { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 }, { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 } ] }, diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 46ff3c932d530..bdeb99d56237c 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -881,6 +881,14 @@ "price": 0, "flags": [ "NO_SALVAGE" ] }, + { + "type": "COMESTIBLE", + "id": "raw_hfur", + "copy-from": "raw_fur", + "name": "raw human pelt", + "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", + "material": [ "fur", "hflesh" ] + }, { "type": "COMESTIBLE", "comestible_type": "FOOD", diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c6248fbdbfd83..0cd1726f3eb92 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -333,7 +333,7 @@ "time": "36 s", "reversible": true, "autolearn": true, - "components": [ [ [ "raw_leather", 6 ], [ "raw_hleather", 6 ], [ "raw_fur", 6 ] ] ], + "components": [ [ [ "raw_leather", 6 ], [ "raw_hleather", 6 ], [ "raw_fur", 6 ], [ "raw_hfur", 6 ] ] ], "flags": [ "BLIND_EASY" ] }, { diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 6e65ac792fbf8..621eddfe76e6b 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3633,7 +3633,10 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] + "components": [ + [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], + [ [ "raw_fur", 1 ], [ "raw_hfur", 1 ], [ "raw_tainted_fur", 1 ] ] + ] }, { "type": "recipe", diff --git a/data/mods/More_Survival_Tools/recipes.json b/data/mods/More_Survival_Tools/recipes.json index edec45181d908..8227d366db18b 100644 --- a/data/mods/More_Survival_Tools/recipes.json +++ b/data/mods/More_Survival_Tools/recipes.json @@ -44,7 +44,7 @@ "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] + "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ], [ "raw_hfur", 1 ] ] ] }, { "type": "recipe", diff --git a/data/mods/blazemod/blaze_blob_recipes.json b/data/mods/blazemod/blaze_blob_recipes.json index 35915b7cd5cf9..6115e6ebddb08 100644 --- a/data/mods/blazemod/blaze_blob_recipes.json +++ b/data/mods/blazemod/blaze_blob_recipes.json @@ -225,7 +225,12 @@ "time": 30000, "autolearn": true, "qualities": [ { "id": "CHEM", "level": 2 } ], - "components": [ [ [ "biter", 1 ] ], [ [ "bfeed", 250 ] ], [ [ "raw_fur", 150 ], [ "fur", 24 ] ], [ [ "mutagen", 1 ] ] ] + "components": [ + [ [ "biter", 1 ] ], + [ [ "bfeed", 250 ] ], + [ [ "raw_fur", 150 ], [ "raw_hfur", 150 ], [ "fur", 24 ] ], + [ [ "mutagen", 1 ] ] + ] }, { "result": "gloople", From 081ff32ba833ad6150baa25070e440521fc08d44 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com> Date: Sun, 22 Dec 2019 00:21:10 -0500 Subject: [PATCH 3/3] Spacing Co-Authored-By: Anton Burmistrov --- data/json/items/comestibles/carnivore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index bdeb99d56237c..339ab769d4e07 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -886,7 +886,7 @@ "id": "raw_hfur", "copy-from": "raw_fur", "name": "raw human pelt", - "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", + "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", "material": [ "fur", "hflesh" ] }, {