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

Removes Incongruent Book Spawns from Child Mobs and School Libraries #71906

Merged
merged 31 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
97c423d
fixes merge errors.
DoctorBoomstick Jul 2, 2023
ad9a35b
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 3, 2023
f243460
Merge branch 'master' of https://github.com/DoctorBoomstick/Cataclysm…
DoctorBoomstick Jul 4, 2023
c85a281
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 9, 2023
9d40bd7
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 21, 2023
e3eb338
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 29, 2023
e03c3a4
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 3, 2023
d006c4e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 6, 2023
df5f709
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 13, 2023
6002b70
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 17, 2023
eabc64e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 20, 2023
4b38a26
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 31, 2023
3202fd6
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Sep 29, 2023
407f8eb
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Oct 6, 2023
55c0b70
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Oct 14, 2023
de0154c
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Nov 7, 2023
4984eeb
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Nov 20, 2023
a0e7e2c
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 7, 2023
f80539e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 11, 2023
397de31
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 14, 2023
4cbf7e7
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 22, 2023
fae5975
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jan 15, 2024
328362f
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 4, 2024
31dd3ad
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 8, 2024
1da0174
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 11, 2024
bdf7be4
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 16, 2024
78102e7
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 20, 2024
bf87539
removes the silly books.
DoctorBoomstick Feb 21, 2024
da9459b
removes the last use of textbooks_school.
DoctorBoomstick Feb 22, 2024
c5cc8e5
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 22, 2024
4d0c929
Merge branch 'master' into kids_books
DoctorBoomstick Feb 22, 2024
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
103 changes: 48 additions & 55 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@
"//": "Books found in school library",
"items": [
{ "group": "novels", "prob": 50 },
{ "group": "manuals_school", "prob": 40 },
{ "group": "textbooks_school", "prob": 30 },
{ "group": "kids_books", "prob": 30 },
{ "group": "kids_books", "prob": 40 },
{ "group": "manuals_school", "prob": 30 },
{ "group": "literature", "prob": 30 }
]
},
Expand Down Expand Up @@ -480,75 +479,57 @@
"type": "item_group",
"id": "manuals_school",
"//": "Same as manuals, but without inappropriate books, like weapons or traps.",
"//2": "The autobiography of a mountain man is included as, while an advanced survival book, it’s also a story novel in its current form. Should it be expanded with variants to include books that are not novels, then it should be removed.",
"//3": "While a rather high-level fabrication book, this could conceivably be something that a craft shop/design and technology class would use in its current form: Plastics and Polymers: Projects for the Classroom. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
"//4": "While it has the potential to be a high-level tailoring book, its current form, Friendly, Humane Fashion, can be passed off as an educational library book. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
"//5": "While a high-level speech book, Principles of Effective Communication, a public speaking book, isn’t unrealistic for a school library to possess,. Should it be expanded with variants to include books that aren’t so school-based, it should be removed.",
"//6": "Bit of a stretch, but The Wonderful World of Arthropodology could feasibly exist as a library encyclopaedia.",
"subtype": "distribution",
"entries": [
{ "item": "manual_brawl", "prob": 30 },
{ "item": "manual_dodge", "prob": 1 },
{ "item": "manual_throw", "prob": 12 },
{ "item": "manual_mechanics", "prob": 35 },
{ "item": "manual_speech", "prob": 50 },
{ "item": "manual_swimming", "prob": 5 },
{ "item": "manual_dodge", "variant": "manual_dodge", "prob": 5 },
{ "item": "manual_dodge", "variant": "manual_dodge_1", "prob": 5 },
{ "item": "manual_throw", "variant": "manual_throw", "prob": 6 },
{ "item": "manual_throw", "variant": "manual_throw_4", "prob": 6 },
{ "item": "manual_mechanics", "prob": 25 },
{ "item": "book_pneumatics", "prob": 5 },
{ "item": "manual_speech", "prob": 40 },
{ "item": "textbook_speech", "prob": 10 },
{ "item": "manual_business", "prob": 40 },
{ "item": "manual_first_aid", "prob": 40 },
{ "item": "manual_first_aid", "prob": 30 },
{ "item": "pocket_firstaid", "prob": 30 },
{ "item": "manual_computer", "prob": 20 },
{ "item": "howto_computer", "prob": 10 },
{ "item": "webbasics_computer", "prob": 20 },
{ "item": "hackerman_computer", "prob": 10 },
{ "item": "howto_computer", "prob": 10 },
{ "item": "cookbook", "prob": 35 },
{ "item": "offalcooking", "prob": 8 },
{ "item": "cookbook_italian", "prob": 25 },
{ "item": "cookbook", "prob": 25 },
{ "item": "offalcooking", "prob": 5 },
{ "item": "cookbook_italian", "prob": 10 },
{ "item": "cookbook_indian", "prob": 10 },
{ "item": "cookbook_native", "prob": 5 },
{ "item": "cookbook_mexican", "prob": 10 },
{ "item": "sweets_book", "prob": 10 },
{ "item": "manual_electronics", "prob": 20 },
{ "item": "cookbook_native", "prob": 5 },
{ "item": "manual_electronics", "prob": 25 },
{ "item": "arduino_experiments", "prob": 15 },
{ "item": "manual_tailor", "prob": 15 },
{ "item": "recipe_fauxfur", "prob": 5 },
{ "item": "manual_carpentry", "prob": 10 },
{ "item": "101_carpentry", "prob": 6 },
{ "item": "manual_fabrication", "prob": 20 },
{ "item": "manual_driving", "prob": 15 },
{ "item": "manual_survival", "prob": 20 },
{ "item": "101_carpentry", "prob": 10 },
{ "item": "manual_fabrication", "prob": 10 },
{ "item": "plastics_book", "prob": 10 },
{ "item": "manual_survival", "prob": 10 },
{ "item": "pocket_survival", "prob": 10 },
{ "item": "survival_book", "prob": 2 },
{ "item": "textbook_arthropod", "prob": 2 },
{ "item": "basic_chemistry", "prob": 30 },
{ "item": "dnd_handbook", "prob": 2 },
{ "item": "reference_cooking", "prob": 1 },
{ "item": "reference_fabrication1", "prob": 1 },
{ "item": "reference_firstaid1", "prob": 1 },
{ "item": "reference_firstaid2", "prob": 1 },
{ "item": "basic_chemistry", "prob": 10 },
{ "item": "survnote", "prob": 3 },
{ "item": "manual_canning", "prob": 8 },
{ "item": "manual_sealing", "prob": 9 },
{ "item": "vacuum_sealing", "prob": 5 },
{ "item": "arduino_experiments", "prob": 5 },
{ "item": "fermenting_book", "prob": 8 },
{ "item": "book_pneumatics", "prob": 3 }
{ "item": "survnote", "prob": 3 }
]
},
{
"type": "item_group",
"id": "textbooks",
"subtype": "distribution",
"entries": [
{ "group": "textbooks_school", "prob": 228 },
{ "item": "textbook_gaswarfare", "prob": 5 },
{ "item": "recipe_bullets", "prob": 8 },
{ "item": "book_pneumatics", "prob": 8 },
{ "item": "text_gunsmith", "prob": 4 },
{ "item": "pocket_firearms", "prob": 2 },
{ "item": "textbook_traps", "prob": 4 },
{ "item": "reference_cooking", "prob": 2 },
{ "item": "reference_fabrication1", "prob": 6 },
{ "item": "reference_firstaid1", "prob": 2 },
{ "item": "reference_firstaid2", "prob": 1 },
{ "item": "textbook_toxicology", "prob": 2 },
{ "item": "alloy_book", "prob": 5 },
{ "item": "metal_casting_book", "prob": 5 },
{ "item": "bronze_book", "prob": 6 }
]
},
{
"type": "item_group",
"id": "textbooks_school",
"//": "Same as textbooks, but without inappropriate books, like weapons or traps. Contains archery and armors/melee weapons as sport and historical information sources.",
"subtype": "distribution",
"entries": [
{ "item": "textbook_computer", "prob": 4 },
{ "item": "computer_science", "prob": 8 },
Expand Down Expand Up @@ -609,7 +590,19 @@
{ "item": "textbook_arthropod", "prob": 5 },
{ "item": "textbook_botany", "prob": 5 },
{ "item": "theater_props", "prob": 2 },
{ "item": "ballista_book", "prob": 3 }
{ "item": "ballista_book", "prob": 3 },
{ "item": "textbook_gaswarfare", "prob": 5 },
{ "item": "recipe_bullets", "prob": 8 },
{ "item": "text_gunsmith", "prob": 4 },
{ "item": "pocket_firearms", "prob": 2 },
{ "item": "textbook_traps", "prob": 4 },
{ "item": "reference_cooking", "prob": 2 },
{ "item": "reference_fabrication1", "prob": 6 },
{ "item": "reference_firstaid1", "prob": 2 },
{ "item": "reference_firstaid2", "prob": 1 },
{ "item": "textbook_toxicology", "prob": 2 },
{ "item": "alloy_book", "prob": 5 },
{ "item": "metal_casting_book", "prob": 5 }
]
},
{
Expand Down
1 change: 0 additions & 1 deletion data/json/npcs/campus/great_library_librarian_goods.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"items": [
{ "group": "novels", "count": [ 9, 12 ] },
{ "group": "manuals_school", "count": [ 9, 12 ] },
{ "group": "textbooks_school", "count": [ 9, 12 ] },
{ "group": "literature", "count": [ 9, 12 ] },
{ "group": "games", "count": [ 5, 6 ] }
]
Expand Down
Loading