From 9b54ac29f3c9e9f8a63beab6e3bf45cb66adc9dd Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Fri, 25 Aug 2023 06:24:27 +0200 Subject: [PATCH] Some book spawning changes & locking bronze behind a book recipe (#67864) * books books books * innawood * dictionary --- .../Locations_MapExtras/locations.json | 1 - data/json/itemgroups/books.json | 5 ++-- data/json/items/book/fabrication.json | 21 ++++++++++++++++ data/json/recipes/other/materials.json | 2 +- .../innawood/recipes/other/materials.json | 25 +++++++++++++++++++ tools/spell_checker/dictionary.txt | 7 +++--- 6 files changed, 53 insertions(+), 8 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 3f57f4b051300..afc3d6a1b0d03 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2059,7 +2059,6 @@ { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "file", 20 ], [ "howto_computer", 20 ], - [ "glassblowing_book", 4 ], [ "manual_fabrication", 30 ], [ "usb_drive", 5 ], { "group": "book_mag_tech", "prob": 70 }, diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index ef6a88fa206b0..4aad523c42d13 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -412,8 +412,7 @@ { "item": "vacuum_sealing", "prob": 5 }, { "item": "arduino_experiments", "prob": 5 }, { "item": "fermenting_book", "prob": 8 }, - { "item": "book_pneumatics", "prob": 3 }, - { "item": "distilling_cookbook", "prob": 8 } + { "item": "book_pneumatics", "prob": 3 } ] }, { @@ -495,7 +494,6 @@ { "item": "book_lockpick", "prob": 2 }, { "item": "basic_chemistry", "prob": 5 }, { "item": "fermenting_book", "prob": 8 }, - { "item": "distilling_cookbook", "prob": 8 }, { "item": "textbook_arthropod", "prob": 5 }, { "item": "textbook_botany", "prob": 5 }, { "item": "theater_props", "prob": 2 } @@ -595,6 +593,7 @@ { "item": "textbook_gaswarfare", "prob": 15 }, { "item": "text_gunsmith", "prob": 10 }, { "item": "glassblowing_book", "prob": 12 }, + { "item": "alloy_book", "prob": 12 }, { "item": "plastics_book", "prob": 12 }, { "item": "cookbook_human", "prob": 10 }, { "item": "collector_book", "prob": 10 }, diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 7816f7fbe36b6..03e4e3d5d676f 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -45,6 +45,27 @@ "time": "30 m", "melee_damage": { "bash": 4 } }, + { + "id": "alloy_book", + "type": "BOOK", + "category": "manuals", + "name": { "str": "Alloying reference manual" }, + "description": "A textbook with information about alloying various types of metals.", + "weight": "1500 g", + "volume": "1250 ml", + "price": 4500, + "price_postapoc": 250, + "material": [ "paper", "cardboard" ], + "symbol": "?", + "color": "blue", + "skill": "fabrication", + "required_level": 4, + "max_level": 7, + "proficiencies": [ { "proficiency": "prof_metalworking", "time_factor": 0.7, "fail_factor": 0.5 } ], + "intelligence": 8, + "time": "30 m", + "melee_damage": { "bash": 4 } + }, { "id": "theater_props", "type": "BOOK", diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 7abfcc2476493..656bd8828b13c 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -115,7 +115,7 @@ "difficulty": 2, "time": "10 m", "batch_time_factors": [ 90, 4 ], - "autolearn": true, + "book_learn": [ [ "alloy_book", 4 ] ], "using": [ [ "forging_standard", 1 ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], diff --git a/data/mods/innawood/recipes/other/materials.json b/data/mods/innawood/recipes/other/materials.json index 44fff9a5b82b8..14f62e97f8bf2 100644 --- a/data/mods/innawood/recipes/other/materials.json +++ b/data/mods/innawood/recipes/other/materials.json @@ -232,5 +232,30 @@ "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], "components": [ [ [ "meal_chitin_piece", 30 ] ], [ [ "lye", 4 ], [ "lye_potassium", 6 ] ], [ [ "any_strong_acid", 1, "LIST" ] ] ] + }, + { + "result": "scrap_bronze", + "type": "recipe", + "activity_level": "ACTIVE_EXERCISE", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "10 m", + "batch_time_factors": [ 90, 4 ], + "autolearn": true, + "using": [ [ "forging_standard", 1 ] ], + "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ + [ + [ "tin", 12 ], + [ "aluminum_foil", 371 ], + [ "chem_aluminium_powder", 29 ], + [ "can_drink", 2 ], + [ "scrap_aluminum", 1 ] + ], + [ [ "copper_scrap_equivalent", 1, "LIST" ] ] + ] } ] diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index ce0fdccfc5ecd..630f5b11f4433 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -77,6 +77,7 @@ allosaurid allosaurus allosaurusid allotrope +alloying allucination alnico alquerque @@ -2154,10 +2155,10 @@ pasteurize pathfinding patios pauldrons -pebbled peacoat peanutbutter pearlescent +pebbled peccari peccary pecial @@ -3125,8 +3126,8 @@ underbarrel underbody undercovering underfongen -underhill undergrown +underhill underlayer underlayers undersides @@ -3294,8 +3295,8 @@ wasnt wastebread watchband waterfowl -waterproofed waterkin +waterproofed waterskin waterskins waterskis