sergiotarxz/Camas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix incorrect itemstring in gold and goodies mod

Browse Source
This commit is contained in:
Wuzzy 2019-08-28 21:35:20 +02:00
parent bc0acb09bc
commit 1fd777b4a5
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mods/gold/init.lua
View File

@ -30,7 +30,7 @@ if minetest.get_modpath("mobs") ~= nil then
-- tool repair -- tool repair
{"gold:ingot_gold 6", "default:shovel_stone", "default:shovel_stone"}, {"gold:ingot_gold 6", "default:shovel_stone", "default:shovel_stone"},
{"gold:ingot_gold 8", "default:shovel_steel", "default:shovel_steel"}, {"gold:ingot_gold 8", "default:shovel_steel", "default:shovel_steel"},
{"gold:ingot_gold 10", "default:shovel_carbonsteel", "default:shovel_carbonsteel"}, {"gold:ingot_gold 10", "default:shovel_carbon_steel", "default:shovel_carbon_steel"},
} }
gold.trades["tavernkeeper"] = { gold.trades["tavernkeeper"] = {
-- materials -- materials
@ -49,7 +49,6 @@ if minetest.get_modpath("mobs") ~= nil then
-- smeltables -- smeltables
{"gold:ingot_gold", "", "default:lump_coal"}, {"gold:ingot_gold", "", "default:lump_coal"},
{"gold:ingot_gold 3", "", "default:lump_iron"}, {"gold:ingot_gold 3", "", "default:lump_iron"},
{"gold:ingot_gold 5", "", "default:dust_carbonsteel"},
-- materials -- materials
{"gold:ingot_gold 2", "", "default:cobble 10"}, {"gold:ingot_gold 2", "", "default:cobble 10"},
@ -63,16 +62,15 @@ if minetest.get_modpath("mobs") ~= nil then
-- ingots -- ingots
{"gold:ingot_gold 5", "", "default:ingot_steel"}, {"gold:ingot_gold 5", "", "default:ingot_steel"},
{"gold:ingot_gold 8", "", "default:ingot_carbonsteel"}, {"gold:ingot_gold 8", "", "default:ingot_carbon_steel"},
-- auto smelting -- auto smelting
{"gold:ingot_gold 2", "default:lump_iron", "default:ingot_steel"}, {"gold:ingot_gold 2", "default:lump_iron", "default:ingot_steel"},
{"gold:ingot_gold 4", "default:dust_carbonsteel", "default:ingot_carbonsteel"},
-- tool repair -- tool repair
{"gold:ingot_gold 8", "default:pick_stone", "default:pick_stone"}, {"gold:ingot_gold 8", "default:pick_stone", "default:pick_stone"},
{"gold:ingot_gold 12", "default:pick_steel", "default:pick_steel"}, {"gold:ingot_gold 12", "default:pick_steel", "default:pick_steel"},
{"gold:ingot_gold 16", "default:pick_carbonsteel", "default:pick_carbonsteel"}, {"gold:ingot_gold 16", "default:pick_carbon_steel", "default:pick_carbon_steel"},
} }
gold.trades["butcher"] = { gold.trades["butcher"] = {
-- materials -- materials
@ -93,7 +91,7 @@ if minetest.get_modpath("mobs") ~= nil then
-- tool repair -- tool repair
{"gold:ingot_gold 5", "default:spear_stone", "default:spear_stone"}, {"gold:ingot_gold 5", "default:spear_stone", "default:spear_stone"},
{"gold:ingot_gold 7", "default:spear_steel", "default:spear_steel"}, {"gold:ingot_gold 7", "default:spear_steel", "default:spear_steel"},
{"gold:ingot_gold 11", "default:spear_carbonsteel", "default:spear_carbonsteel"}, {"gold:ingot_gold 11", "default:spear_carbon_steel", "default:spear_carbon_steel"},
} }
-- trading currency -- trading currency
@ -333,4 +331,18 @@ achievements.register_achievement(
dignode = "gold:stone_with_gold", dignode = "gold:stone_with_gold",
}) })
if minetest.settings:get_bool("pixture_debug", false) == true then
-- Check if all specified items are valid
minetest.register_on_mods_loaded(function()
for trader_name, trader in pairs(gold.trades) do
for trade_id, trade in pairs(trader) do
for i=1,3 do
local item = ItemStack(trade[i]):get_name()
assert(item ~= nil and (item == "" or minetest.registered_items[item]), "[gold] Invalid trade item: trader="..trader_name..", index="..trade_id..", item="..item)
end
end
end
end)
end
default.log("mod:gold", "loaded") default.log("mod:gold", "loaded")

4
mods/goodies/init.lua
View File

@ -12,7 +12,6 @@ goodies.types = {}
-- custom types -- custom types
goodies.types["FURNACE_SRC"] = { goodies.types["FURNACE_SRC"] = {
["default:lump_iron"] = 3, ["default:lump_iron"] = 3,
["default:dust_carbonsteel"] = 8,
["farming:flour"] = 5, ["farming:flour"] = 5,
} }
goodies.types["FURNACE_FUEL"] = { goodies.types["FURNACE_FUEL"] = {
@ -22,7 +21,7 @@ goodies.types["FURNACE_FUEL"] = {
} }
goodies.types["FURNACE_DST"] = { goodies.types["FURNACE_DST"] = {
["default:ingot_steel"] = 5, ["default:ingot_steel"] = 5,
["default:ingot_carbonsteel"] = 12, ["default:ingot_carbon_steel"] = 12,
["farming:bread"] = 8, ["farming:bread"] = 8,
} }
@ -32,7 +31,6 @@ if minetest.get_modpath("village") ~= nil then
["default:ingot_steel"] = 10, ["default:ingot_steel"] = 10,
["default:lump_coal"] = 4, ["default:lump_coal"] = 4,
["default:lump_iron"] = 6, ["default:lump_iron"] = 6,
["default:dust_carbonsteel"] = 18,
["default:pick_stone"] = 9, ["default:pick_stone"] = 9,
["default:tree_oak"] = 2, ["default:tree_oak"] = 2,
} }