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.

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

Tailoring recipe audit #54256

Merged
Merged
Show file tree
Hide file tree
Changes from 124 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
1bb7b16
First pass on the cotton update. These adjustements are to the cotton…
a-chancey Jan 4, 2022
785def5
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 4, 2022
923fdc0
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 5, 2022
52d35df
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 8, 2022
a9d5414
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 10, 2022
41d1d1a
Tailoring Recipe Audit - Cotton
a-chancey Jan 10, 2022
789ca6c
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 10, 2022
2bc9460
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jan 11, 2022
a126643
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Feb 1, 2022
88eeb2e
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 1, 2022
311f2ca
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 3, 2022
4837392
Merge conflicts
a-chancey Feb 5, 2022
a23bc0b
Merge pull request #3 from CleverRaven/master
a-chancey Feb 5, 2022
2f1c032
Quick commit with all the weight and volume changes. starting work on…
a-chancey Feb 6, 2022
d563450
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 6, 2022
18c6c15
linting json
a-chancey Feb 6, 2022
8df3c3d
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 6, 2022
534a7a2
Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a…
a-chancey Feb 6, 2022
68db6eb
More updates
a-chancey Feb 6, 2022
aee796a
Adjustments and requirement updates
a-chancey Feb 9, 2022
959fdb3
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 9, 2022
7d574d8
Fixing linting errors and requirements
a-chancey Feb 10, 2022
7079dc5
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 10, 2022
9c702ef
More linting issues/minor adjustments
a-chancey Feb 10, 2022
96e2e73
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Feb 14, 2022
e353e33
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 14, 2022
163bf8c
Goofed a merge on Arms
a-chancey Feb 14, 2022
e141d56
Adding last of new requirements
a-chancey Feb 14, 2022
795ad5c
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 14, 2022
8c72c2b
few recipe changes, updating then testing
a-chancey Feb 14, 2022
b8eedb7
Recipe changes
a-chancey Feb 14, 2022
429ae09
Linting and json error fixing
a-chancey Feb 15, 2022
fb86421
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 15, 2022
1962e4f
Working through arms
a-chancey Feb 16, 2022
57fffb5
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 16, 2022
0895b57
oops. lint them arms.
a-chancey Feb 16, 2022
5878851
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 17, 2022
55c5dc7
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 18, 2022
c3b89a0
Arms first pass complete
a-chancey Feb 18, 2022
cca7315
lint baby lint
a-chancey Feb 19, 2022
c83cc96
Updating tests that failed
a-chancey Feb 19, 2022
87a7b1c
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 19, 2022
fe92694
working on boots
a-chancey Feb 23, 2022
cd1bfe0
Update feet.json
a-chancey Feb 23, 2022
388f416
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Feb 23, 2022
c9c5559
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 23, 2022
23459d5
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 24, 2022
5a85aa5
Done with feet first pass
a-chancey Feb 24, 2022
fd707dc
Linting
a-chancey Feb 25, 2022
a6fbea2
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 25, 2022
1f50174
Working through head.json
a-chancey Feb 25, 2022
eb816de
Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a…
a-chancey Feb 25, 2022
7dc013a
ope had more linting to do
a-chancey Feb 25, 2022
d356f40
sorting items for astyle
a-chancey Feb 27, 2022
dbe7d93
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Feb 27, 2022
b400fb5
removing scissors from crafting test
a-chancey Feb 27, 2022
4e22db0
Quick fixes for head.json
a-chancey Mar 1, 2022
c412257
Head.json first pass complete
a-chancey Mar 2, 2022
228d101
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 2, 2022
e98a26e
Working through legs
a-chancey Mar 4, 2022
88fa48d
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Mar 4, 2022
af1c7f1
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 4, 2022
2b9dc3f
Fix byproduct error
a-chancey Mar 8, 2022
859852f
Fix leather skirt
a-chancey Mar 8, 2022
78fe97f
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Mar 15, 2022
9505deb
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 15, 2022
4d84759
I finished legs
a-chancey Mar 15, 2022
4651aa8
Other is done
a-chancey Mar 15, 2022
4a5b575
linting
a-chancey Mar 15, 2022
2edfd34
Finished pet armors
a-chancey Mar 15, 2022
3b74cbd
Storage first pass
a-chancey Mar 16, 2022
ee4dc49
Linting and obsoleting the recipe for xs leather rifle case
a-chancey Mar 16, 2022
2176fd7
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 16, 2022
a973aed
Cleaning up errors
a-chancey Mar 16, 2022
b81ccfc
committing changes to update from master
a-chancey Mar 16, 2022
51a5970
Linting before merging
a-chancey Mar 17, 2022
19d40ff
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 17, 2022
7b0b28a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Mar 22, 2022
a0840cc
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 22, 2022
43eda39
Updating leather armor
a-chancey Mar 23, 2022
0238160
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 23, 2022
6c76b40
Committing to update
a-chancey Mar 27, 2022
50037a0
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Mar 27, 2022
f7b35e2
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 27, 2022
744e461
json fix
a-chancey Mar 27, 2022
935054c
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Mar 28, 2022
07f98ff
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 28, 2022
6b3f721
Got suits up to wetsuit
a-chancey Mar 29, 2022
e3e83e6
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Mar 31, 2022
f4b93b2
First pass of suits
a-chancey Mar 31, 2022
2ab25cb
Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a…
a-chancey Mar 31, 2022
2504f7c
json error and linting in suits
a-chancey Mar 31, 2022
3075e5b
Removed neoprene scrap weight
a-chancey Mar 31, 2022
a9c82aa
beginning work through Torso
a-chancey Apr 3, 2022
8b0f64c
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey Apr 12, 2022
74696da
Tons of merges
a-chancey Apr 12, 2022
27b9c61
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Apr 12, 2022
3aabaae
json errors
a-chancey Apr 13, 2022
4524afd
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Apr 14, 2022
a04c656
updating leather ammo pouch to cover the waist
a-chancey Apr 14, 2022
d8f061a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
a-chancey May 2, 2022
8c57f40
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey May 2, 2022
f8d32c7
Ope missed a line in the merge
a-chancey May 2, 2022
83c5ec0
Updating to at least let the tests run
a-chancey May 3, 2022
f1763c3
Update data/json/requirements/materials.json
Maleclypse Jun 10, 2022
4fe5830
Merge branch 'master' of github.com:CleverRaven/Cataclysm-DDA into Cl…
a-chancey Jun 10, 2022
6563b01
Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 10, 2022
c47cebe
Here we go
a-chancey Jun 11, 2022
7bac63b
OMG
a-chancey Jun 11, 2022
1d4c6e7
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 11, 2022
c7df447
omg we're done
a-chancey Jun 11, 2022
15bcd58
Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a…
a-chancey Jun 11, 2022
4c6b8be
astyle
a-chancey Jun 11, 2022
a22a9d5
This should fix the errors
a-chancey Jun 12, 2022
77c467c
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 12, 2022
4ec0bd8
Oh my god no more rags.
a-chancey Jun 12, 2022
51dde22
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 12, 2022
2dcf21e
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 12, 2022
1fcd53f
Ok, NOW rags are gone.
a-chancey Jun 12, 2022
dfbefe3
Linting
a-chancey Jun 12, 2022
22ddfc5
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 15, 2022
6641790
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 15, 2022
e245f38
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 15, 2022
766f884
Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton
a-chancey Jun 16, 2022
d204ed5
Update data/json/recipes/other/materials.json
kevingranade Jun 17, 2022
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
2 changes: 1 addition & 1 deletion data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -5595,7 +5595,7 @@
"required_skills": [ [ "fabrication", 3 ] ],
"time": "60 m",
"qualities": [ [ { "id": "HAMMER_SOFT", "level": 1 } ] ],
"components": [ [ [ "frame_wood", 1 ] ], [ [ "chunk_rubber", 16 ] ], [ [ "glass_sheet", 2 ] ], [ [ "rag", 8 ] ] ],
"components": [ [ [ "frame_wood", 1 ] ], [ [ "chunk_rubber", 16 ] ], [ [ "glass_sheet", 2 ] ], [ [ "cotton_patchwork", 8 ] ] ],
"pre_note": "Must be supported on at least two sides.",
"pre_special": "check_support",
"post_terrain": "t_door_glass_c"
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
{ "item": "steel_chunk", "count": [ 0, 3 ] },
{ "item": "sheet_metal_small", "count": [ 8, 12 ] },
{ "item": "sheet_metal", "count": [ 1, 2 ] },
{ "item": "rag", "count": [ 5, 10 ] },
{ "item": "cotton_patchwork", "count": [ 5, 10 ] },
{ "item": "pipe_fittings", "count": [ 1, 3 ] },
{ "item": "cable", "charges": [ 1, 15 ] },
{ "item": "hose", "count": [ 0, 1 ] },
Expand Down
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/furniture-medical.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"deconstruct": {
"items": [
{ "item": "2x4", "count": 12 },
{ "item": "rag", "count": [ 30, 33 ] },
{ "item": "cotton_patchwork", "count": [ 30, 33 ] },
{ "item": "nail", "charges": [ 8, 10 ] },
{ "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
]
Expand All @@ -77,7 +77,7 @@
{ "item": "2x4", "count": [ 2, 5 ] },
{ "item": "nail", "charges": [ 3, 8 ] },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "rag", "count": [ 20, 30 ] }
{ "item": "cotton_patchwork", "count": [ 20, 30 ] }
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/furniture-recreation.json
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@
"items": [
{ "item": "chain", "count": [ 1, 3 ] },
{ "item": "leather", "count": [ 4, 12 ] },
{ "item": "rag", "count": [ 4, 18 ] }
{ "item": "cotton_patchwork", "count": [ 4, 18 ] }
]
}
},
Expand Down Expand Up @@ -657,7 +657,7 @@
"str_max": 12,
"sound": "whish!",
"sound_fail": "whish.",
"items": [ { "item": "cardboard", "count": [ 20, 80 ] }, { "item": "rag", "count": [ 50, 175 ] } ]
"items": [ { "item": "cardboard", "count": [ 20, 80 ] }, { "item": "cotton_patchwork", "count": [ 50, 175 ] } ]
}
},
{
Expand Down
20 changes: 12 additions & 8 deletions data/json/furniture_and_terrain/furniture-seats.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@
"bonus_fire_warmth_feet": 1000,
"required_str": 7,
"deconstruct": {
"items": [ { "item": "2x4", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 6, 8 ] } ]
"items": [
{ "item": "2x4", "count": 10 },
{ "item": "cotton_patchwork", "count": [ 30, 33 ] },
{ "item": "nail", "charges": [ 6, 8 ] }
]
},
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT", "ALIGN_WORKBENCH" ],
"bash": {
Expand All @@ -48,7 +52,7 @@
{ "item": "2x4", "count": [ 1, 3 ] },
{ "item": "nail", "charges": [ 2, 6 ] },
{ "item": "splinter", "count": 1 },
{ "item": "rag", "count": [ 20, 30 ] }
{ "item": "cotton_patchwork", "count": [ 20, 30 ] }
]
}
},
Expand All @@ -70,7 +74,7 @@
"deconstruct": {
"items": [
{ "item": "pipe", "count": 10 },
{ "item": "rag", "count": [ 30, 33 ] },
{ "item": "cotton_patchwork", "count": [ 30, 33 ] },
{ "item": "rope_6" },
{ "item": "spring", "count": [ 2, 3 ] }
]
Expand All @@ -84,7 +88,7 @@
"items": [
{ "item": "pipe", "count": [ 1, 3 ] },
{ "item": "scrap", "charges": [ 2, 6 ] },
{ "item": "rag", "count": [ 20, 30 ] },
{ "item": "cotton_patchwork", "count": [ 20, 30 ] },
{ "item": "rope_6" }
]
}
Expand Down Expand Up @@ -127,7 +131,7 @@
"deconstruct": {
"items": [
{ "item": "2x4", "count": 12 },
{ "item": "rag", "count": [ 30, 33 ] },
{ "item": "cotton_patchwork", "count": [ 30, 33 ] },
{ "item": "nail", "charges": [ 8, 10 ] },
{ "item": "spring", "charges": [ 2, 3 ] }
]
Expand All @@ -143,7 +147,7 @@
{ "item": "nail", "charges": [ 3, 8 ] },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "scrap", "count": [ 0, 5 ] },
{ "item": "rag", "count": [ 20, 30 ] }
{ "item": "cotton_patchwork", "count": [ 20, 30 ] }
]
}
},
Expand Down Expand Up @@ -237,7 +241,7 @@
"max_volume": "750 L",
"deconstruct": {
"items": [
{ "item": "rag", "count": [ 10, 20 ] },
{ "item": "cotton_patchwork", "count": [ 10, 20 ] },
{ "item": "2x4", "count": [ 2, 4 ] },
{ "item": "nail", "charges": [ 2, 6 ] }
]
Expand All @@ -250,7 +254,7 @@
"items": [
{ "item": "splinter", "count": [ 2, 6 ] },
{ "item": "nail", "charges": [ 1, 3 ] },
{ "item": "rag", "count": [ 5, 10 ] }
{ "item": "cotton_patchwork", "count": [ 5, 10 ] }
]
}
},
Expand Down
20 changes: 12 additions & 8 deletions data/json/furniture_and_terrain/furniture-sleep.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{ "item": "2x4", "count": [ 5, 8 ] },
{ "item": "nail", "charges": [ 6, 8 ] },
{ "item": "splinter", "count": [ 3, 6 ] },
{ "item": "rag", "count": [ 40, 55 ] },
{ "item": "cotton_patchwork", "count": [ 40, 55 ] },
{ "item": "scrap", "count": [ 10, 20 ] }
]
}
Expand Down Expand Up @@ -53,7 +53,7 @@
{ "item": "2x4", "count": [ 8, 15 ] },
{ "item": "nail", "charges": [ 15, 20 ] },
{ "item": "splinter", "count": [ 8, 15 ] },
{ "item": "rag", "count": [ 80, 110 ] },
{ "item": "cotton_patchwork", "count": [ 80, 110 ] },
{ "item": "scrap", "count": [ 20, 40 ] }
]
}
Expand Down Expand Up @@ -88,7 +88,7 @@
"items": [
{ "item": "pipe", "count": [ 8, 15 ] },
{ "item": "sheet_metal_small", "count": [ 0, 2 ] },
{ "item": "rag", "count": [ 120, 160 ] },
{ "item": "cotton_patchwork", "count": [ 120, 160 ] },
{ "item": "scrap", "count": [ 60, 100 ] }
]
}
Expand Down Expand Up @@ -138,7 +138,7 @@
"str_max": 30,
"sound": "rrrrip!",
"sound_fail": "whump.",
"items": [ { "item": "rag", "count": [ 40, 55 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] } ]
}
},
{
Expand All @@ -162,7 +162,7 @@
"str_max": 30,
"sound": "rrrrip!",
"sound_fail": "whump.",
"items": [ { "item": "rag", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
}
},
{
Expand All @@ -186,7 +186,7 @@
"sound_fail": "slap!",
"sound_vol": 6,
"sound_fail_vol": 3,
"items": [ { "item": "rag", "count": [ 20, 30 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 20, 30 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
}
},
{
Expand Down Expand Up @@ -226,7 +226,11 @@
"floor_bedding_warmth": 500,
"required_str": 10,
"deconstruct": {
"items": [ { "item": "2x4", "count": 4 }, { "item": "rag", "count": [ 30, 35 ] }, { "item": "nail", "charges": [ 4, 6 ] } ]
"items": [
{ "item": "2x4", "count": 4 },
{ "item": "cotton_patchwork", "count": [ 30, 35 ] },
{ "item": "nail", "charges": [ 4, 6 ] }
]
},
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT" ],
"bash": {
Expand All @@ -238,7 +242,7 @@
{ "item": "2x4", "count": [ 1, 3 ] },
{ "item": "nail", "charges": [ 2, 6 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "rag", "count": [ 20, 30 ] }
{ "item": "cotton_patchwork", "count": [ 20, 30 ] }
]
}
},
Expand Down
8 changes: 4 additions & 4 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{ "item": "2x4", "count": 12 },
{ "item": "nail", "charges": [ 12, 24 ] },
{ "item": "wood_panel", "count": [ 0, 1 ] },
{ "item": "rag", "count": [ 15, 20 ] }
{ "item": "cotton_patchwork", "count": [ 15, 20 ] }
]
},
"max_volume": "875 L",
Expand All @@ -102,7 +102,7 @@
{ "item": "2x4", "count": [ 1, 5 ] },
{ "item": "splinter", "count": [ 2, 6 ] },
{ "item": "nail", "charges": [ 2, 10 ] },
{ "item": "rag", "count": [ 8, 12 ] }
{ "item": "cotton_patchwork", "count": [ 8, 12 ] }
]
}
},
Expand All @@ -122,7 +122,7 @@
{ "item": "2x4", "count": 12 },
{ "item": "nail", "charges": [ 12, 24 ] },
{ "item": "wood_panel", "count": [ 0, 1 ] },
{ "item": "rag", "count": [ 15, 20 ] }
{ "item": "cotton_patchwork", "count": [ 15, 20 ] }
]
},
"max_volume": "875 L",
Expand All @@ -135,7 +135,7 @@
{ "item": "2x4", "count": [ 1, 5 ] },
{ "item": "splinter", "count": [ 2, 6 ] },
{ "item": "nail", "charges": [ 2, 10 ] },
{ "item": "rag", "count": [ 8, 12 ] }
{ "item": "cotton_patchwork", "count": [ 8, 12 ] }
]
}
},
Expand Down
18 changes: 9 additions & 9 deletions data/json/furniture_and_terrain/furniture-terrains.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"sound_fail": "whump.",
"items": [
{ "item": "straw_pile", "count": [ 5, 8 ] },
{ "item": "rag", "count": [ 2, 4 ] },
{ "item": "cotton_patchwork", "count": [ 2, 4 ] },
{ "item": "string_36", "count": [ 1, 2 ] }
]
},
Expand Down Expand Up @@ -109,7 +109,7 @@
{ "item": "box_large", "count": 1 },
{ "item": "box_medium", "count": 2 },
{ "item": "box_small", "count": 4 },
{ "item": "rag", "count": 50 },
{ "item": "cotton_patchwork", "count": 50 },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": 20 },
{ "item": "plastic_sheet", "count": 2 }
Expand All @@ -124,7 +124,7 @@
{ "item": "box_large", "count": [ 0, 1 ] },
{ "item": "box_medium", "count": [ 0, 2 ] },
{ "item": "box_small", "count": [ 0, 4 ] },
{ "item": "rag", "count": [ 20, 50 ] },
{ "item": "cotton_patchwork", "count": [ 20, 50 ] },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": [ 5, 20 ] },
{ "item": "plastic_sheet", "count": [ 0, 2 ] }
Expand Down Expand Up @@ -170,7 +170,7 @@
"items": [
{ "item": "box_small", "count": 10 },
{ "item": "cardboard", "count": 10 },
{ "item": "rag", "count": 10 },
{ "item": "cotton_patchwork", "count": 10 },
{ "item": "paper", "count": 50 },
{ "item": "plastic_sheet", "count": 2 }
]
Expand All @@ -184,7 +184,7 @@
{ "item": "box_small", "count": [ 0, 10 ] },
{ "item": "cardboard", "count": [ 5, 9 ] },
{ "item": "paper", "count": [ 10, 40 ] },
{ "item": "rag", "count": [ 0, 10 ] },
{ "item": "cotton_patchwork", "count": [ 0, 10 ] },
{ "item": "plastic_sheet", "count": [ 1, 2 ] }
]
}
Expand All @@ -205,7 +205,7 @@
{ "item": "box_large", "count": 1 },
{ "item": "box_medium", "count": 2 },
{ "item": "box_small", "count": 4 },
{ "item": "rag", "count": 50 },
{ "item": "cotton_patchwork", "count": 50 },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": 20 },
{ "item": "plastic_sheet", "count": 2 }
Expand All @@ -220,7 +220,7 @@
{ "item": "box_large", "count": [ 0, 1 ] },
{ "item": "box_medium", "count": [ 0, 2 ] },
{ "item": "box_small", "count": [ 0, 4 ] },
{ "item": "rag", "count": [ 20, 50 ] },
{ "item": "cotton_patchwork", "count": [ 20, 50 ] },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": [ 5, 20 ] },
{ "item": "plastic_sheet", "count": [ 0, 2 ] }
Expand All @@ -244,7 +244,7 @@
{ "item": "box_large", "count": 1 },
{ "item": "box_medium", "count": 2 },
{ "item": "box_small", "count": 4 },
{ "item": "rag", "count": 50 },
{ "item": "cotton_patchwork", "count": 50 },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": 20 },
{ "item": "plastic_sheet", "count": 2 }
Expand All @@ -259,7 +259,7 @@
{ "item": "box_large", "count": [ 0, 1 ] },
{ "item": "box_medium", "count": [ 0, 2 ] },
{ "item": "box_small", "count": [ 0, 4 ] },
{ "item": "rag", "count": [ 20, 50 ] },
{ "item": "cotton_patchwork", "count": [ 20, 50 ] },
{ "item": "paper", "count": [ 30, 80 ] },
{ "item": "plastic_chunk", "count": [ 5, 20 ] },
{ "item": "plastic_sheet", "count": [ 0, 2 ] }
Expand Down
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/terrain-doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
"ter_set": "t_dirt",
"items": [
{ "item": "sheet", "count": [ 0, 1 ] },
{ "item": "rag", "count": [ 2, 5 ] },
{ "item": "cotton_patchwork", "count": [ 2, 5 ] },
{ "item": "stick", "count": 1 },
{ "item": "withered", "count": [ 2, 12 ] }
]
Expand Down Expand Up @@ -1700,7 +1700,7 @@
"ter_set": "t_dirt",
"items": [
{ "item": "sheet", "count": [ 0, 1 ] },
{ "item": "rag", "count": [ 2, 5 ] },
{ "item": "cotton_patchwork", "count": [ 2, 5 ] },
{ "item": "stick", "count": 1 },
{ "item": "withered", "count": [ 2, 12 ] }
]
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/terrain-floors-indoor.json
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
"str_min": 5,
"str_max": 15,
"str_min_supported": 100,
"items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
},
"deconstruct": { "items": [ { "item": "r_carpet", "count": 1 }, { "item": "nail", "count": [ 2, 5 ] } ], "ter_set": "t_floor" }
},
Expand Down Expand Up @@ -736,7 +736,7 @@
"str_min": 5,
"str_max": 15,
"str_min_supported": 100,
"items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
},
"deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" }
},
Expand Down Expand Up @@ -808,7 +808,7 @@
"str_min": 5,
"str_max": 15,
"str_min_supported": 100,
"items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
"items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
},
"deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" }
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"subtype": "collection",
"items": [
{ "item": "molotov", "count": 5 },
{ "item": "rag", "count": 25 },
{ "item": "cotton_patchwork", "count": 25 },
{ "item": "gasoline", "count": 1 },
{ "item": "improvised_pipebomb", "count": 25 },
{ "item": "fuse", "count": 5 },
Expand Down
Loading