From 0e8bf148fccee4da956dbfebf9cb8220d4c570a4 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 7 Apr 2022 05:35:58 -0500 Subject: [PATCH 1/3] Adjust Materials Adjusts materials for books and manuals based on descriptive text --- data/json/items/book/barter.json | 4 +-- data/json/items/book/chemistry.json | 20 +++++++-------- data/json/items/book/computer.json | 8 +++--- data/json/items/book/dodge.json | 2 +- data/json/items/book/driving.json | 2 +- data/json/items/book/electronics.json | 14 +++++------ data/json/items/book/fabrication.json | 36 +++++++++++++-------------- data/json/items/book/firstaid.json | 12 ++++----- data/json/items/book/launcher.json | 2 +- data/json/items/book/mechanics.json | 6 ++--- data/json/items/book/melee.json | 4 +-- data/json/items/book/misc.json | 14 +++++------ data/json/items/book/pistol.json | 2 +- data/json/items/book/rifle.json | 2 +- data/json/items/book/shotgun.json | 2 +- data/json/items/book/speech.json | 4 +-- data/json/items/book/spiritual.json | 2 +- data/json/items/book/stabbing.json | 4 +-- data/json/items/book/survival.json | 6 ++--- data/json/items/book/swimming.json | 2 +- data/json/items/book/tailor.json | 8 +++--- data/json/items/book/throw.json | 2 +- data/json/items/book/traps.json | 10 ++++---- data/json/items/book/young.json | 2 +- 24 files changed, 85 insertions(+), 85 deletions(-) diff --git a/data/json/items/book/barter.json b/data/json/items/book/barter.json index 1938e933539d6..7586a2a517702 100644 --- a/data/json/items/book/barter.json +++ b/data/json/items/book/barter.json @@ -28,7 +28,7 @@ "volume": "750 ml", "price": 1900, "price_postapoc": 250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", @@ -50,7 +50,7 @@ "price": 9800, "price_postapoc": 250, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "blue", diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json index b33fd73acd46d..c9b01729e8cc2 100644 --- a/data/json/items/book/chemistry.json +++ b/data/json/items/book/chemistry.json @@ -10,7 +10,7 @@ "price": 7950, "price_postapoc": 750, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "chemistry", @@ -148,7 +148,7 @@ "volume": "500 ml", "price": 64000, "price_postapoc": 2000, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "chemistry", @@ -168,7 +168,7 @@ "volume": "500 ml", "price": 50000, "price_postapoc": 2000, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "chemistry", @@ -231,7 +231,7 @@ "volume": "500 ml", "price": 50000, "price_postapoc": 2000, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "chemistry", @@ -252,7 +252,7 @@ "price": 9000, "price_postapoc": 2000, "bashing": 7, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "light_green", @@ -271,7 +271,7 @@ "price": 7950, "price_postapoc": 2000, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "ascii_picture": "textbook_chemistry", "symbol": "?", "looks_like": "textbook_firstaid", @@ -295,7 +295,7 @@ "price": 6000, "price_postapoc": 10000, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "chemistry", @@ -314,7 +314,7 @@ "volume": "1500 ml", "price": 400, "price_postapoc": 1000, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "chemistry", @@ -337,7 +337,7 @@ "volume": "500 ml", "price": 550, "price_postapoc": 1900, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "recipe_alpha", "color": "light_cyan", @@ -358,7 +358,7 @@ "price": 1500, "price_postapoc": 2500, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "chemistry", diff --git a/data/json/items/book/computer.json b/data/json/items/book/computer.json index 973718bea560a..d7f1d57492763 100644 --- a/data/json/items/book/computer.json +++ b/data/json/items/book/computer.json @@ -10,7 +10,7 @@ "price": 7800, "price_postapoc": 500, "bashing": 6, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_traps", "color": "blue", @@ -32,7 +32,7 @@ "price": 7900, "price_postapoc": 250, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_traps", "color": "blue", @@ -92,7 +92,7 @@ "volume": "750 ml", "price": 5500, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_traps", "color": "green", @@ -112,7 +112,7 @@ "price": 8500, "price_postapoc": 500, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_traps", "color": "blue", diff --git a/data/json/items/book/dodge.json b/data/json/items/book/dodge.json index a724797bcb802..1e0ae2444f3cb 100644 --- a/data/json/items/book/dodge.json +++ b/data/json/items/book/dodge.json @@ -29,7 +29,7 @@ "volume": "1250 ml", "price": 7200, "price_postapoc": 750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", diff --git a/data/json/items/book/driving.json b/data/json/items/book/driving.json index ad6ae04a4c0ef..785f4cae5221e 100644 --- a/data/json/items/book/driving.json +++ b/data/json/items/book/driving.json @@ -49,7 +49,7 @@ "volume": "500 ml", "price": 2200, "price_postapoc": 250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json index 86a943b74a5dd..08a39095ed222 100644 --- a/data/json/items/book/electronics.json +++ b/data/json/items/book/electronics.json @@ -10,7 +10,7 @@ "price": 8200, "price_postapoc": 750, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "electronics", @@ -67,7 +67,7 @@ "volume": "800 ml", "price": 2200, "price_postapoc": 250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "intelligence": 8, @@ -144,7 +144,7 @@ "volume": "500 ml", "price": 56000, "price_postapoc": 2000, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "electronics", @@ -164,7 +164,7 @@ "volume": "500 ml", "price": 74000, "price_postapoc": 2500, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "looks_like": "recipe_lab_elec", "color": "light_green", @@ -206,7 +206,7 @@ "price": 9300, "price_postapoc": 2000, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "electronics", @@ -227,7 +227,7 @@ "price": 9200, "price_postapoc": 750, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "electronics", @@ -247,7 +247,7 @@ "volume": "500 ml", "price": 84000, "price_postapoc": 2500, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "electronics", diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 819fab1eaa57d..67a59046f42b1 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -10,7 +10,7 @@ "price": 4500, "price_postapoc": 250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -35,7 +35,7 @@ "price": 4500, "price_postapoc": 250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -60,7 +60,7 @@ "price": 4500, "price_postapoc": 250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "brown_yellow", "skill": "fabrication", @@ -83,7 +83,7 @@ "volume": "1250 ml", "price": 2000, "price_postapoc": 250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -144,7 +144,7 @@ "volume": "1250 ml", "price": 4800, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -164,7 +164,7 @@ "volume": "1250 ml", "price": 4800, "price_postapoc": 1500, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -184,7 +184,7 @@ "volume": "1500 ml", "price": 12000, "price_postapoc": 1750, - "material": [ "paper" ], + "material": [ "paper", "plastic" ],, "symbol": "?", "color": "blue", "skill": "fabrication", @@ -204,7 +204,7 @@ "volume": "500 ml", "price": 84000, "price_postapoc": 2500, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", "skill": "fabrication", @@ -264,7 +264,7 @@ "volume": "1250 ml", "price": 6400, "price_postapoc": 2250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -285,7 +285,7 @@ "volume": "1250 ml", "price": 6400, "price_postapoc": 2750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -306,7 +306,7 @@ "volume": "1250 ml", "price": 6400, "price_postapoc": 3000, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -328,7 +328,7 @@ "price": 4500, "price_postapoc": 750, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "recipe_lab_elec", "color": "blue", @@ -348,7 +348,7 @@ "volume": "1 L", "price": 6500, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -367,7 +367,7 @@ "volume": "1250 ml", "price": 6400, "price_postapoc": 2500, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -388,7 +388,7 @@ "volume": "1250 ml", "price": 6400, "price_postapoc": 3000, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -410,7 +410,7 @@ "price": 6500, "price_postapoc": 1500, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", @@ -454,7 +454,7 @@ "price": 8200, "price_postapoc": 1000, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "recipe_lab_elec", "color": "blue", @@ -524,7 +524,7 @@ "price": 6500, "price_postapoc": 1000, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "fabrication", diff --git a/data/json/items/book/firstaid.json b/data/json/items/book/firstaid.json index f9f77f4ea06f3..7e6d55f9ccb08 100644 --- a/data/json/items/book/firstaid.json +++ b/data/json/items/book/firstaid.json @@ -10,7 +10,7 @@ "price": 9200, "price_postapoc": 1500, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "firstaid", @@ -52,7 +52,7 @@ "volume": "1250 ml", "price": 2500, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "ascii_picture": "manual_first_aid", "symbol": "?", "color": "green", @@ -96,7 +96,7 @@ "price": 8500, "price_postapoc": 1250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "firstaid", @@ -136,7 +136,7 @@ "price": 10000, "price_postapoc": 2250, "bashing": 7, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "blue", @@ -155,7 +155,7 @@ "price": 8000, "price_postapoc": 750, "bashing": 7, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "blue", @@ -172,7 +172,7 @@ "volume": "1200 ml", "price": 30000, "price_postapoc": 5000, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "green", diff --git a/data/json/items/book/launcher.json b/data/json/items/book/launcher.json index 49f6e8e3c62d6..d0769697a22f8 100644 --- a/data/json/items/book/launcher.json +++ b/data/json/items/book/launcher.json @@ -28,7 +28,7 @@ "volume": "250 ml", "price": 2000, "price_postapoc": 2000, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "launcher", diff --git a/data/json/items/book/mechanics.json b/data/json/items/book/mechanics.json index c8b2178018874..6bb9c0a2a9ced 100644 --- a/data/json/items/book/mechanics.json +++ b/data/json/items/book/mechanics.json @@ -10,7 +10,7 @@ "price": 5950, "price_postapoc": 2250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "mechanics", @@ -116,7 +116,7 @@ "volume": "750 ml", "price": 5500, "price_postapoc": 500, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "mechanics", @@ -167,7 +167,7 @@ "price": 4950, "price_postapoc": 500, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "mechanics", diff --git a/data/json/items/book/melee.json b/data/json/items/book/melee.json index 7c269767dfa00..7804a0f1d217f 100644 --- a/data/json/items/book/melee.json +++ b/data/json/items/book/melee.json @@ -9,7 +9,7 @@ "volume": "250 ml", "price": 450, "price_postapoc": 750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "mag_glam", "color": "pink", @@ -29,7 +29,7 @@ "volume": "250 ml", "price": 2000, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index 2cb3bea0c887d..e43d738585382 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -81,7 +81,7 @@ "volume": "750 ml", "price": 1250, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "light_blue", @@ -727,7 +727,7 @@ "volume": "750 ml", "price": 1150, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "light_blue", @@ -745,7 +745,7 @@ "volume": "500 ml", "price": 1050, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "light_blue", @@ -783,7 +783,7 @@ "price": 2000, "price_postapoc": 50, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "looks_like": "record_patient", "color": "light_green", @@ -835,7 +835,7 @@ "volume": "1 L", "price": 1400, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "radio_book", "color": "light_blue", @@ -853,7 +853,7 @@ "volume": "750 ml", "price": 1050, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "light_blue", @@ -1083,7 +1083,7 @@ "volume": "750 ml", "price": 4550, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "looks_like": "tall_tales", "color": "light_blue", "symbol": "?", diff --git a/data/json/items/book/pistol.json b/data/json/items/book/pistol.json index 702cb81f23e32..adfe878adb312 100644 --- a/data/json/items/book/pistol.json +++ b/data/json/items/book/pistol.json @@ -28,7 +28,7 @@ "volume": "500 ml", "price": 2200, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "pistol", diff --git a/data/json/items/book/rifle.json b/data/json/items/book/rifle.json index f1bbb68a5976e..2c051102726db 100644 --- a/data/json/items/book/rifle.json +++ b/data/json/items/book/rifle.json @@ -28,7 +28,7 @@ "volume": "250 ml", "price": 2000, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "green", "skill": "rifle", diff --git a/data/json/items/book/shotgun.json b/data/json/items/book/shotgun.json index 90d6d83c9f19f..44121f5e0f7a8 100644 --- a/data/json/items/book/shotgun.json +++ b/data/json/items/book/shotgun.json @@ -28,7 +28,7 @@ "volume": "500 ml", "price": 2100, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "shotgun", diff --git a/data/json/items/book/speech.json b/data/json/items/book/speech.json index 293317fd1d8d1..b7bccad9b64e9 100644 --- a/data/json/items/book/speech.json +++ b/data/json/items/book/speech.json @@ -49,7 +49,7 @@ "price": 4000, "price_postapoc": 250, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "blue", @@ -71,7 +71,7 @@ "price_postapoc": 500, "bashing": 7, "//": "Have you held one of these things? Bastards have some real weight behind 'em", - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "light_blue", diff --git a/data/json/items/book/spiritual.json b/data/json/items/book/spiritual.json index c9e8d632e0e47..bfdfc1062c65a 100644 --- a/data/json/items/book/spiritual.json +++ b/data/json/items/book/spiritual.json @@ -144,7 +144,7 @@ "volume": "1 L", "price": 550, "price_postapoc": 550, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "dark_gray", diff --git a/data/json/items/book/stabbing.json b/data/json/items/book/stabbing.json index 8af592d00d834..324fb0fa2d59c 100644 --- a/data/json/items/book/stabbing.json +++ b/data/json/items/book/stabbing.json @@ -29,7 +29,7 @@ "volume": "250 ml", "price": 2000, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", @@ -48,7 +48,7 @@ "volume": "250 ml", "price": 5200, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "blue", diff --git a/data/json/items/book/survival.json b/data/json/items/book/survival.json index 5ef6820c3d4ff..e4b9f4c024d85 100644 --- a/data/json/items/book/survival.json +++ b/data/json/items/book/survival.json @@ -10,7 +10,7 @@ "price": 920, "price_postapoc": 3750, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "survival", @@ -127,7 +127,7 @@ "price": 920, "price_postapoc": 1250, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "light_blue", "skill": "survival", @@ -168,7 +168,7 @@ "volume": "2700 ml", "price": 6000, "price_postapoc": 1250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "green", diff --git a/data/json/items/book/swimming.json b/data/json/items/book/swimming.json index cfc03c09a6e6b..0de313f671ce6 100644 --- a/data/json/items/book/swimming.json +++ b/data/json/items/book/swimming.json @@ -28,7 +28,7 @@ "volume": "500 ml", "price": 2200, "price_postapoc": 750, - "material": [ "paper" ], + "material": [ "paper", "plastic" ], "symbol": "?", "color": "green", "skill": "swimming", diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json index 6427146bb5979..b6156de2695df 100644 --- a/data/json/items/book/tailor.json +++ b/data/json/items/book/tailor.json @@ -127,7 +127,7 @@ "price": 5000, "price_postapoc": 250, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "tailor", @@ -149,7 +149,7 @@ "price": 6000, "price_postapoc": 1500, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "blue", @@ -174,7 +174,7 @@ "price": 3000, "price_postapoc": 550, "bashing": 5, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "green", @@ -196,7 +196,7 @@ "price": 6000, "price_postapoc": 1500, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard", "leather" ], "symbol": "?", "looks_like": "textbook_firstaid", "color": "dark_gray", diff --git a/data/json/items/book/throw.json b/data/json/items/book/throw.json index 2adbbabf67dca..d812a98f5730d 100644 --- a/data/json/items/book/throw.json +++ b/data/json/items/book/throw.json @@ -29,7 +29,7 @@ "volume": "500 ml", "price": 2800, "price_postapoc": 750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "looks_like": "manual_gun", "color": "green", diff --git a/data/json/items/book/traps.json b/data/json/items/book/traps.json index 6245b2988e53c..e5154abe3a949 100644 --- a/data/json/items/book/traps.json +++ b/data/json/items/book/traps.json @@ -9,7 +9,7 @@ "volume": "500 ml", "price": 2400, "price_postapoc": 750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "traps", @@ -45,7 +45,7 @@ "volume": "500 ml", "price": 2400, "price_postapoc": 1750, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "traps", @@ -67,7 +67,7 @@ "volume": "500 ml", "price": 2000, "price_postapoc": 2250, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "green", "skill": "traps", @@ -90,7 +90,7 @@ "price": 6000, "price_postapoc": 1750, "bashing": 4, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "traps", @@ -110,7 +110,7 @@ "price": 920, "price_postapoc": 1250, "bashing": 8, - "material": [ "paper" ], + "material": [ "paper", "cardboard" ], "symbol": "?", "color": "blue", "skill": "traps", diff --git a/data/json/items/book/young.json b/data/json/items/book/young.json index ce06b2ba4421c..f3aa3f3caad10 100644 --- a/data/json/items/book/young.json +++ b/data/json/items/book/young.json @@ -8,7 +8,7 @@ "volume": "250 ml", "price": 550, "price_postapoc": 1900, - "material": [ "paper" ], + "material": [ "cardboard" ], "symbol": "?", "looks_like": "story_book", "color": "light_cyan", From 9bc82282970578932cbf772f724dd6d5510c2f6d Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 7 Apr 2022 06:14:57 -0500 Subject: [PATCH 2/3] fix typo --- data/json/items/book/fabrication.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 67a59046f42b1..1bea8fdc58537 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -184,7 +184,7 @@ "volume": "1500 ml", "price": 12000, "price_postapoc": 1750, - "material": [ "paper", "plastic" ],, + "material": [ "paper", "plastic" ], "symbol": "?", "color": "blue", "skill": "fabrication", From a051a31d4c22d114626e9d4210fb7560c203a91e Mon Sep 17 00:00:00 2001 From: David Seguin Date: Sun, 8 Jan 2023 21:31:45 -0500 Subject: [PATCH 3/3] Removed fixed densities from blacklist --- data/mods/TEST_DATA/known_bad_density.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 8d21a2df9d1c7..a680b459ba20e 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -152,7 +152,6 @@ "recipe_labchem", "xl_gambeson_sleeve", "art_rod", - "dieselpunk_tailor", "large_surface_pseudo", "deployment_bag", "chem_ferric_chloride", @@ -336,7 +335,6 @@ "coin_silver", "test_tube", "codeine", - "textbook_extraction", "art_crystal", "brew_vinegar", "meat_scrap_cooked", @@ -373,7 +371,6 @@ "AID_bio_blood_anal", "xl_k_gambeson_loose", "mre_accessory", - "textbook_computer", "candy3gator", "kevlar_chainmail_suit_xs", "bolt_simple_small_game", @@ -588,7 +585,6 @@ "helmet_eod", "car_wide_headlight", "hc_steel_lump", - "carpentry_book", "hickory_root", "leg", "sheet_metal_small", @@ -598,7 +594,6 @@ "chem_sulphuric_acid", "integrated_bark2_b", "confit_meat", - "textbook_tailor", "xl_k_gambeson_vest_loose", "integrated_chitin3", "chem_phenol", @@ -691,7 +686,6 @@ "brew_marloss_wine", "heatpack", "oxycodone", - "scots_tailor", "fake_smoke_plume", "syrup", "foodplace_food",