Skip to content

Commit

Permalink
Move concrete related recipes from autolearn to book (#39384)
Browse files Browse the repository at this point in the history
Disable autolearn of concrete, cement, and mortar recipies
Disables autolearn of quicklime
* add relevant book
* added book_learn
* add book to itemspawns
* add quicklime recipe to chemistry books
  • Loading branch information
SkuliAdams authored Apr 10, 2020
1 parent 40a256e commit 1de418f
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 6 deletions.
3 changes: 2 additions & 1 deletion data/json/itemgroups/SUS/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
{ "item": "textbook_mechanics", "count": [ 1, 4 ], "prob": 80 },
{ "item": "book_icef", "count": [ 1, 3 ], "prob": 60 },
{ "item": "welding_book", "count": [ 1, 3 ], "prob": 80 },
{ "item": "textbook_carpentry", "count": [ 1, 2 ], "prob": 50 }
{ "item": "textbook_carpentry", "count": [ 1, 2 ], "prob": 50 },
{ "item": "concrete_book", "count": [ 1, 2 ], "prob": 40 }
]
},
{
Expand Down
4 changes: 3 additions & 1 deletion data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@
{ "item": "textbook_mechanics", "prob": 12 },
{ "item": "textbook_biodiesel", "prob": 10 },
{ "item": "book_icef", "prob": 8 },
{ "item": "textbook_fabrication", "prob": 12 }
{ "item": "textbook_fabrication", "prob": 12 },
{ "item": "concrete_book", "prob": 12 }
]
},
{
Expand Down Expand Up @@ -391,6 +392,7 @@
{ "item": "textbook_fabrication", "prob": 12 },
{ "item": "welding_book", "prob": 2 },
{ "item": "glassblowing_book", "prob": 2 },
{ "item": "concrete_book", "prob": 2 },
{ "item": "textbook_tailor", "prob": 12 },
{ "item": "recipe_fauxfur", "prob": 4 },
{ "item": "recipe_bows", "prob": 4 },
Expand Down
19 changes: 19 additions & 0 deletions data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,5 +478,24 @@
"intelligence": 4,
"time": "30 m",
"fun": -2
},
{
"id": "concrete_book",
"type": "BOOK",
"name": { "str": "Concrete Constructions", "str_pl": "copies of Concrete Constructions" },
"description": "A collection of notable uses of concrete. Contains detailed directions on how to mix and use cement to form useful aggregates.",
"weight": "600 g",
"volume": "1250 ml",
"price": 4000,
"price_postapoc": 24000,
"bashing": 4,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
"required_level": 3,
"max_level": 4,
"intelligence": 9,
"time": "30 m"
}
]
12 changes: 8 additions & 4 deletions data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"skill_used": "fabrication",
"difficulty": 4,
"time": "10 m",
"autolearn": true,
"autolearn": false,
"book_learn": [ [ "concrete_book", 4 ] ],
"tools": [ [ [ "con_mix", 50 ] ] ],
"components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 25 ] ], [ [ "pebble", 20 ] ] ]
},
Expand Down Expand Up @@ -3217,8 +3218,9 @@
"skills_required": [ "cooking", 2 ],
"difficulty": 3,
"time": "1 h",
"autolearn": false,
"batch_time_factors": [ 75, 4 ],
"autolearn": true,
"book_learn": [ [ "concrete_book", 3 ], [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ],
"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ],
"components": [ [ [ "material_limestone", 50 ] ] ]
},
Expand All @@ -3231,7 +3233,8 @@
"skills_required": [ "cooking", 3 ],
"difficulty": 4,
"time": "1 h 30 m",
"autolearn": true,
"autolearn": false,
"book_learn": [ [ "concrete_book", 4 ] ],
"batch_time_factors": [ 75, 3 ],
"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 250 ], [ "oxy_torch", 50 ] ] ],
"components": [ [ [ "material_quicklime", 50 ] ], [ [ "material_sand", 50 ] ] ]
Expand Down Expand Up @@ -3942,7 +3945,8 @@
"skill_used": "fabrication",
"difficulty": 2,
"time": "10 m",
"autolearn": true,
"autolearn": false,
"book_learn": [ [ "concrete_book", 2 ] ],
"tools": [ [ [ "con_mix", 50 ] ] ],
"components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 150 ] ] ]
},
Expand Down

0 comments on commit 1de418f

Please sign in to comment.