Skip to content

Commit e361d88

Browse files
committed
Remove nomex/kevlar from skinning their respective zombie types. Remove sinew from all zombie types. Remove tainted skull bowl.
1 parent 59297a0 commit e361d88

3 files changed

Lines changed: 33 additions & 22 deletions

File tree

data/json/harvest.json

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,8 +1601,7 @@
16011601
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
16021602
{ "drop": "fat_tainted_human", "type": "flesh", "mass_ratio": 0.08 },
16031603
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.15 },
1604-
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
1605-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
1604+
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 }
16061605
]
16071606
}
16081607
},
@@ -1641,8 +1640,7 @@
16411640
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
16421641
{ "drop": "fat_tainted_human", "type": "flesh", "mass_ratio": 0.08 },
16431642
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.15 },
1644-
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
1645-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
1643+
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 }
16461644
]
16471645
},
16481646
"message": "<zombie_humanoid_headless_harvest>"
@@ -1666,8 +1664,7 @@
16661664
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
16671665
{ "drop": "fat_tainted_human", "type": "flesh", "mass_ratio": 0.08 },
16681666
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.15 },
1669-
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
1670-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
1667+
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 }
16711668
]
16721669
}
16731670
},
@@ -1838,8 +1835,7 @@
18381835
{ "drop": "fat_tainted_human", "type": "flesh", "mass_ratio": 0.06 },
18391836
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.08 },
18401837
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.003 },
1841-
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.07 },
1842-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }
1838+
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.07 }
18431839
]
18441840
},
18451841
{
@@ -1858,7 +1854,7 @@
18581854
},
18591855
{
18601856
"id": "zombie_kevlar",
1861-
"//": "zombies with Kevlar infused into their skin",
1857+
"//": "zombies with Kevlar infused into their skin. Gives unuseable scrap.",
18621858
"type": "harvest",
18631859
"message": "<zombie_humanoid_kevlar_harvest>",
18641860
"entries": [
@@ -1870,15 +1866,13 @@
18701866
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
18711867
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
18721868
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
1873-
{ "drop": "kevlar_patch", "type": "skin", "mass_ratio": 0.02, "flags": [ "FILTHY" ] },
1874-
{ "drop": "sheet_kevlar", "type": "skin", "mass_ratio": 0.01, "flags": [ "FILTHY" ] },
1875-
{ "drop": "sheet_kevlar_layered", "type": "skin", "mass_ratio": 0.01, "flags": [ "FILTHY" ] },
1869+
{ "drop": "tainted_kevlar", "type": "skin", "mass_ratio": 0.04, "flags": [ "FILTHY" ] },
18761870
{ "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 }
18771871
]
18781872
},
18791873
{
18801874
"id": "zombie_kevlar_hulk",
1881-
"//": "hulks with Kevlar infused into their skin",
1875+
"//": "hulks with Kevlar infused into their skin. Gives unuseable scrap.",
18821876
"type": "harvest",
18831877
"message": "<zombie_kevlar_hulk_harvest>",
18841878
"entries": [
@@ -1888,17 +1882,14 @@
18881882
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.15 },
18891883
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
18901884
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
1891-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
18921885
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
1893-
{ "drop": "kevlar_patch", "type": "skin", "mass_ratio": 0.02, "flags": [ "FILTHY" ] },
1894-
{ "drop": "sheet_kevlar", "type": "skin", "mass_ratio": 0.01, "flags": [ "FILTHY" ] },
1895-
{ "drop": "sheet_kevlar_layered", "type": "skin", "mass_ratio": 0.01, "flags": [ "FILTHY" ] },
1886+
{ "drop": "tainted_kevlar", "type": "skin", "mass_ratio": 0.04, "flags": [ "FILTHY" ] },
18961887
{ "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 }
18971888
]
18981889
},
18991890
{
19001891
"id": "zombie_nomex",
1901-
"//": "zombies with Nomex infused into their skin",
1892+
"//": "zombies with Nomex infused into their skin. Gives unuseable scrap.",
19021893
"type": "harvest",
19031894
"entries": [
19041895
{ "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
@@ -1907,10 +1898,8 @@
19071898
{ "drop": "tainted_innards_human", "type": "offal", "mass_ratio": 0.15 },
19081899
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
19091900
{ "drop": "tainted_marrow_human", "type": "bone", "mass_ratio": 0.005 },
1910-
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
19111901
{ "drop": "blood_tainted_human", "type": "blood", "mass_ratio": 0.1 },
1912-
{ "drop": "nomex", "type": "skin", "mass_ratio": 0.02, "flags": [ "FILTHY" ] },
1913-
{ "drop": "sheet_nomex", "type": "skin", "mass_ratio": 0.01, "flags": [ "FILTHY" ] },
1902+
{ "drop": "tainted_nomex", "type": "skin", "mass_ratio": 0.03, "flags": [ "FILTHY" ] },
19141903
{ "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 }
19151904
]
19161905
},

data/json/items/resources/tailoring.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,17 @@
9797
"price_postapoc": "10 cent",
9898
"material": [ "kevlar" ]
9999
},
100+
{
101+
"id": "tainted_kevlar",
102+
"type": "ITEM",
103+
"name": { "str_sp": "tainted kevlar" },
104+
"description": "A disgusting fusion of rotten flesh and what appears to have been Kevlar. It doesn't seem like you'll be able to use this.",
105+
"volume": "2 ml",
106+
"weight": "810 mg",
107+
"price": "0 cent",
108+
"price_postapoc": "0 cent",
109+
"material": [ "flesh" ]
110+
},
100111
{
101112
"id": "scrap_leather",
102113
"copy-from": "scrap_worthless",
@@ -148,6 +159,17 @@
148159
"price_postapoc": "8 cent",
149160
"material": [ "nomex" ]
150161
},
162+
{
163+
"id": "tainted_nomex",
164+
"type": "ITEM",
165+
"name": { "str_sp": "tainted nomex" },
166+
"description": "A disgusting fusion of rotten flesh and what appears to have been Nomex. It doesn't seem like you'll be able to use this.",
167+
"volume": "2 ml",
168+
"weight": "810 mg",
169+
"price": "0 cent",
170+
"price_postapoc": "0 cent",
171+
"material": [ "flesh" ]
172+
},
151173
{
152174
"id": "scrap_carpet",
153175
"copy-from": "scrap_worthless",

data/json/recipes/tools/containers.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@
876876
"autolearn": true,
877877
"qualities": [ { "id": "CUT", "level": 2 } ],
878878
"proficiencies": [ { "proficiency": "prof_carving" } ],
879-
"components": [ [ [ "skull_human", 1 ], [ "skull_human_tainted", 1 ] ] ]
879+
"components": [ [ [ "skull_human", 1 ] ] ]
880880
},
881881
{
882882
"type": "recipe",

0 commit comments

Comments
 (0)