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.

Sign up for GitHub

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

Harden books #56647

Merged
merged 5 commits into from
Jan 9, 2023
Merged

Harden books #56647

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e8bf14
Adjust Materials
BoatNectar Apr 7, 2022
9bc8228
fix typo
BoatNectar Apr 7, 2022
d106cf0
Merge branch 'master' into Harder-books
Night-Pryanik Oct 25, 2022
dd47bb5
Merge branch 'master' into Harder-books
dseguin Jan 9, 2023
a051a31
Removed fixed densities from blacklist
dseguin Jan 9, 2023
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
4 changes: 2 additions & 2 deletions data/json/items/book/barter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"volume": "750 ml",
"price": 1900,
"price_postapoc": 250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "manual_gun",
"color": "green",
Expand All @@ -50,7 +50,7 @@
"price": 9800,
"price_postapoc": 250,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_firstaid",
"color": "blue",
Expand Down
20 changes: 10 additions & 10 deletions data/json/items/book/chemistry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"price": 7950,
"price_postapoc": 750,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "chemistry",
Expand Down Expand Up @@ -148,7 +148,7 @@
"volume": "500 ml",
"price": 64000,
"price_postapoc": 2000,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "chemistry",
Expand All @@ -168,7 +168,7 @@
"volume": "500 ml",
"price": 50000,
"price_postapoc": 2000,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "chemistry",
Expand Down Expand Up @@ -231,7 +231,7 @@
"volume": "500 ml",
"price": 50000,
"price_postapoc": 2000,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "chemistry",
Expand All @@ -252,7 +252,7 @@
"price": 9000,
"price_postapoc": 2000,
"bashing": 7,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_firstaid",
"color": "light_green",
Expand All @@ -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",
Expand All @@ -295,7 +295,7 @@
"price": 6000,
"price_postapoc": 10000,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "chemistry",
Expand All @@ -314,7 +314,7 @@
"volume": "1500 ml",
"price": 400,
"price_postapoc": 1000,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "chemistry",
Expand All @@ -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",
Expand Down Expand Up @@ -378,7 +378,7 @@
"price": 1500,
"price_postapoc": 2500,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "chemistry",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/book/computer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"price": 7800,
"price_postapoc": 500,
"bashing": 6,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_traps",
"color": "blue",
Expand All @@ -32,7 +32,7 @@
"price": 7900,
"price_postapoc": 250,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_traps",
"color": "blue",
Expand Down Expand Up @@ -92,7 +92,7 @@
"volume": "750 ml",
"price": 5500,
"price_postapoc": 50,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_traps",
"color": "green",
Expand All @@ -112,7 +112,7 @@
"price": 8500,
"price_postapoc": 500,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "textbook_traps",
"color": "blue",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/dodge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"volume": "1250 ml",
"price": 7200,
"price_postapoc": 750,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "manual_gun",
"color": "green",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/driving.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"volume": "500 ml",
"price": 2200,
"price_postapoc": 250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "manual_gun",
"color": "green",
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/book/electronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"price": 8200,
"price_postapoc": 750,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "electronics",
Expand Down Expand Up @@ -88,7 +88,7 @@
"volume": "800 ml",
"price": 2200,
"price_postapoc": 250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "green",
"intelligence": 8,
Expand Down Expand Up @@ -165,7 +165,7 @@
"volume": "500 ml",
"price": 56000,
"price_postapoc": 2000,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "electronics",
Expand All @@ -185,7 +185,7 @@
"volume": "500 ml",
"price": 74000,
"price_postapoc": 2500,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"looks_like": "recipe_lab_elec",
"color": "light_green",
Expand Down Expand Up @@ -227,7 +227,7 @@
"price": 9300,
"price_postapoc": 2000,
"bashing": 5,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "electronics",
Expand All @@ -248,7 +248,7 @@
"price": 9200,
"price_postapoc": 750,
"bashing": 8,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "electronics",
Expand All @@ -268,7 +268,7 @@
"volume": "500 ml",
"price": 84000,
"price_postapoc": 2500,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "electronics",
Expand Down
36 changes: 18 additions & 18 deletions data/json/items/book/fabrication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"price": 4500,
"price_postapoc": 250,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -35,7 +35,7 @@
"price": 4500,
"price_postapoc": 250,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -60,7 +60,7 @@
"price": 4500,
"price_postapoc": 250,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "brown_yellow",
"skill": "fabrication",
Expand All @@ -83,7 +83,7 @@
"volume": "1250 ml",
"price": 2000,
"price_postapoc": 250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand Down Expand Up @@ -144,7 +144,7 @@
"volume": "1250 ml",
"price": 4800,
"price_postapoc": 1250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -164,7 +164,7 @@
"volume": "1250 ml",
"price": 4800,
"price_postapoc": 1500,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -184,7 +184,7 @@
"volume": "1500 ml",
"price": 12000,
"price_postapoc": 1750,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -204,7 +204,7 @@
"volume": "500 ml",
"price": 84000,
"price_postapoc": 2500,
"material": [ "paper" ],
"material": [ "paper", "plastic" ],
"symbol": "?",
"color": "light_green",
"skill": "fabrication",
Expand Down Expand Up @@ -264,7 +264,7 @@
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 2250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -285,7 +285,7 @@
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 2750,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -306,7 +306,7 @@
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 3000,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -328,7 +328,7 @@
"price": 4500,
"price_postapoc": 750,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "recipe_lab_elec",
"color": "blue",
Expand All @@ -348,7 +348,7 @@
"volume": "1 L",
"price": 6500,
"price_postapoc": 1250,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -367,7 +367,7 @@
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 2500,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -388,7 +388,7 @@
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 3000,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand All @@ -410,7 +410,7 @@
"price": 6500,
"price_postapoc": 1500,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand Down Expand Up @@ -454,7 +454,7 @@
"price": 8200,
"price_postapoc": 1000,
"bashing": 8,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"looks_like": "recipe_lab_elec",
"color": "blue",
Expand Down Expand Up @@ -524,7 +524,7 @@
"price": 6500,
"price_postapoc": 1000,
"bashing": 4,
"material": [ "paper" ],
"material": [ "paper", "cardboard" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
Expand Down
Loading