1
0
forked from MTSR/moreblocks

Realign the rail craft recipes (#169)

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
This commit is contained in:
Oblomov 2020-12-30 22:55:52 +01:00 committed by GitHub
parent ff7e85094f
commit ddf8b39f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 49 deletions

View File

@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
### Changed
- Refactored recipe override mechanism to avoid re-coding recipes
when we only want to change the amount produced.
- [Realigned rail recipe to the changes made in Minetest Game.](https://github.com/minetest-mods/moreblocks/pull/169)
- All rail recipes (standard, power, break) were boosted by 50%.
### Fixed ### Fixed
- [Fixed strange placement behavior for non-default Stairs+ nodes.](https://github.com/minetest-mods/moreblocks/pull/168) - [Fixed strange placement behavior for non-default Stairs+ nodes.](https://github.com/minetest-mods/moreblocks/pull/168)

View File

@ -5,64 +5,78 @@ Copyright © 2011-2020 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information. Licensed under the zlib license. See LICENSE.md for more information.
--]] --]]
-- Redefinitions of some default crafting recipes: local modname = minetest.get_current_modname()
-- Signs: +1 -- Redefine some of the default crafting recipes to be more productive
minetest.clear_craft({
recipe = { -- Auxiliary function: take a recipe as returned by get_all_craft_recipes
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, -- and turn it into a table that can be used to clear a craft or declare a new one
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, local reconstruct_internal_craft = function(recipe)
{'', 'group:stick', ''}, local recp = {
{ "", "", "" },
{ "", "", "" },
{ "", "", "" },
} }
}) for idx, item in pairs(recipe.items) do
local row = math.ceil(idx / recipe.width)
local col = idx - (row-1)*recipe.width
recp[row][col] = item
end
return recp
end
minetest.clear_craft({ -- Change the amount produced by recipe by apply func to the old amount
recipe = { local change_recipe_amount = function(product, recipe, func)
{'group:wood', 'group:wood', 'group:wood'}, local recp = reconstruct_internal_craft(recipe)
{'group:wood', 'group:wood', 'group:wood'},
{'', 'group:stick', ''},
}
})
minetest.register_craft({ local oldamount = tonumber(recipe.output:match(" [0-9]+$") or "1")
output = 'default:sign_wall_steel 4',
recipe = {
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
{'', 'group:stick', ''},
}
})
minetest.register_craft({ local newamount = func(oldamount)
output = 'default:sign_wall_wood 4',
recipe = {
{'group:wood', 'group:wood', 'group:wood'},
{'group:wood', 'group:wood', 'group:wood'},
{'', 'group:stick', ''},
}
})
-- remove old crafting recipe
local redo = { recipe = recp }
minetest.clear_craft(redo)
minetest.clear_craft({ -- new output
recipe = { redo.output = ("%s %d"):format(product, newamount)
{"default:papyrus", "default:papyrus", "default:papyrus"} minetest.register_craft(redo)
}
})
minetest.register_craft({
output = "default:paper 4",
recipe = {
{"default:papyrus", "default:papyrus", "default:papyrus"},
}
})
minetest.log("action", ("[MOD]%s: recipe for %s production: %d => %d"):format(modname, product, oldamount, newamount))
end
minetest.register_craft({ local increase_craft_production = function(product, func)
output = "default:rail 24", local recipes = minetest.get_all_craft_recipes(product)
recipe = { for _, r in pairs(recipes) do
{"default:steel_ingot", "", "default:steel_ingot"}, if r.type == "normal" or r.method == "normal" then
{"default:steel_ingot", "default:stick", "default:steel_ingot"}, change_recipe_amount(product, r, func)
{"default:steel_ingot", "", "default:steel_ingot"}, end
} end
end
-- Increase the crafting production according to the rules from the table, which is in the form:
-- {
-- { detector, amount changing function }
-- { detector, amount changing function }
-- }
-- TODO: consider exporting this function to other mods
local increase_craft_production_table = function(map_table)
for product, _ in pairs(minetest.registered_items) do
for _, tab in pairs(map_table) do
local detector = tab[1]
local func = tab[2]
if detector(product) then
increase_craft_production(product, func)
-- only apply one boost
break
end
end
end
end
increase_craft_production_table({
{ function(n) return n:match('^default:sign_wall') end, function(old) return old + 1 end },
{ function(n) return n == 'default:paper' end, function(old) return old*4 end },
{ function(n) return n:match('^carts:.*rail$') or n:match('^default:.*rail$') end, function(old) return old + old/2 end },
}) })
minetest.register_craft({ minetest.register_craft({