diff --git a/minerdream/api.lua b/minerdream/api.lua index 8e6dc1f..9a89828 100644 --- a/minerdream/api.lua +++ b/minerdream/api.lua @@ -127,6 +127,7 @@ minerdream.register_ore=function(i,tdef) local ore_name=tdef.name or i tdef.ore_name=ore_name tdef.ore_modname=minerdream.modname + if tdef.name == nil then tdef.name = i end tdef.tier_string="" tdef.tierd={} if tdef.tier then @@ -199,10 +200,8 @@ minerdream.register_ore=function(i,tdef) minerdream.register_3d_armor(tdef,tdef["3d_armor"]) end - if tdef.fuel ~= nil then - if tdef.fuel.burntime ~= nil then - - end + if tdef.crafts ~= nil then + minerdream.register_crafts(tdef,tdef.crafts) end -- print(dump(tdef)) end @@ -296,6 +295,25 @@ minerdream.register_node_ore=function(tdef,odef,ltype) end end +minerdream.register_crafts=function(tdef,cdef) + if cdef ~= nil then + print(dump(cdef)) + for _,ccdef in pairs(cdef) do + if ccdef.output ~= nil and ccdef.recipe ~= nil then + -- analyse, if recipe refers to items in definition + for k,v in pairs(ccdef.recipe) do + if type(v) == "table" then + for l,w in pairs(v) do + if tdef[w] ~= nil then + if tdef[w].node_name ~= nil then + ccdef.recipe[k][l]=tdef[w].node_name + end end end end end + minetest.register_craft(ccdef) + end + end + end +end + minerdream.register_ore_lump=function(ore_name,tdef) -- base config of ore found in normal stone local tore=tdef.ore @@ -502,7 +520,7 @@ minerdream.register_block=function(tdef) block_def.tiles={tdef.block.inventory_image} block_def.inventory_image=tdef.block.inventory_image end - print(dump(block_def)) +-- print(dump(block_def)) minetest.register_craftitem(tdef.block.node_name,block_def) local_craft_block(tdef.ingot.node_name,tdef.block.node_name) end @@ -666,18 +684,24 @@ minerdream.register_3d_armor=function(tdef,adef) for _,gc in pairs({"cracky","crumbly","choppy","snappy"}) do tt_def.damage_groups[gc]=ttv[gc] end - print(tool) - print(agroup[tool]) +-- print(tool) +-- print(agroup[tool]) tt_def.groups[agroup[tool]]=1 armor:register_armor(ttv.item_name,tt_def) - + local stick = ttv.tool_stick or "group:stick" - minetest.register_craft({ - output=ttv.item_name, - recipe=local_get_recipe(tool,tdef.ingot.node_name,stick) - }) + local arm_rec = {output=ttv.item_name} + if tdef.ingot ~= nil then if tdef.ingot.node_name ~= nil then + arm_rec.recipe=local_get_recipe(tool,tdef.ingot.node_name,stick) + end end + if ttv.recipe ~= nil then + arm_rec.recipe=ttv.recipe + end + if arm_rec.recipe ~= nil then + minetest.register_craft(arm_rec) + end end end end diff --git a/minerdream/config/adamantite.json b/minerdream/config/adamantite.json index c3ebe31..bcab125 100644 --- a/minerdream/config/adamantite.json +++ b/minerdream/config/adamantite.json @@ -13,9 +13,9 @@ "wherein":["stone"], "crack":5, "inventory_image":"minerdream_adamantite_ore.png", - "clust_size":3, + "clust_size":5, "num_ores":4, - "scarcity":15, + "scarcity":16, "y_max":-2300, "y_min":-31000 }, diff --git a/minerdream/config/bituminous_coal.json b/minerdream/config/bituminous_coal.json index 62eb264..0617d92 100644 --- a/minerdream/config/bituminous_coal.json +++ b/minerdream/config/bituminous_coal.json @@ -34,4 +34,14 @@ "inventory_image":"minerdream_bituminous_coal_nugget.png", "stack_max":99, "burntime":30 -}} +}, +"crafts":{ + "torch":{"output":"default:torch 8", + "recipe":[["lump"], + ["group:stick"]] + }, + "torch_nugget":{"output":"default:torch 2", + "recipe":[["nugget"], + ["group:stick"]] + }} +} diff --git a/minerdream/config/calcium.json b/minerdream/config/calcium.json index 19be98d..5c0c7a0 100644 --- a/minerdream/config/calcium.json +++ b/minerdream/config/calcium.json @@ -15,9 +15,9 @@ "wherein":["stone"], "crack":2, "inventory_image":"minerdream_calcium_ore.png", - "clust_size":2, + "clust_size":3, "num_ores":5, - "scarcity":12, + "scarcity":13, "y_max":120, "y_min":-31000 }, diff --git a/minerdream/config/cobalt.json b/minerdream/config/cobalt.json index 843f31a..b664563 100644 --- a/minerdream/config/cobalt.json +++ b/minerdream/config/cobalt.json @@ -9,9 +9,9 @@ "wherein":["stone"], "crack":4, "inventory_image":"minerdream_cobalt_ore.png", - "clust_size":3, - "num_ores":3, - "scarcity":15, + "clust_size":4, + "num_ores":5, + "scarcity":16, "y_max":-500, "y_min":-31000 }, @@ -19,7 +19,7 @@ "wherein":["stone","desert_stone"], "crack":3, "inventory_image":"minerdream_cobalt_poorore.png", - "clust_size":3, + "clust_size":4, "num_ores":3, "scarcity":15, "y_max":-350, diff --git a/minerdream/config/knight.json b/minerdream/config/knight.json new file mode 100644 index 0000000..fe36507 --- /dev/null +++ b/minerdream/config/knight.json @@ -0,0 +1,24 @@ +{"tier":9, + "3d_armor":{"choppy":2,"cracky":2,"crumbly":1,"heal":8.5,"level":2,"snappy":3,"use":60, + "boots":{"fleshy":15.25,"gravity":-0.09,"jump":0.1,"speed":0.13, + "recipe":[ ["", "minerdream:topaz", ""], + ["minerdream:silver_bar", "minerdream:boots_rhodium", "minerdream:silver_bar"], + ["", "minerdream:topaz", ""]]}, + "chestplate":{"fleshy":20.25,"gravity":-0.09,"jump":0.1,"speed":0.13, + "recipe":[["", "minerdream:topaz", ""], + ["minerdream:silver_bar", "minerdream:chestplate_rhodium", "minerdream:silver_bar"], + ["", "minerdream:topaz", ""]]}, + "helmet":{"fleshy":15.25,"gravity":-0.09,"jump":0.1,"speed":0.13, + "recipe":[["", "minerdream:topaz", ""], + ["minerdream:silver_bar", "minerdream:helmet_rhodium", "minerdream:silver_bar"], + ["", "minerdream:topaz", ""]]}, + "leggings":{"fleshy":20.25,"gravity":-0.09,"jump":0.1,"speed":0.13, + "recipe":[["", "minerdream:topaz", ""], + ["minerdream:silver_bar", "minerdream:leggings_rhodium", "minerdream:silver_bar"], + ["", "minerdream:topaz", ""]]}, + "shields":{"fleshy":15.25,"gravity":-0.09,"jump":0.1,"speed":0.13, + "recipe":[["", "minerdream:topaz", ""], + ["minerdream:silver_bar", "minerdream:shield_rhodium", "minerdream:silver_bar"], + ["", "", ""]]} + } +} diff --git a/minerdream/config/lithium.json b/minerdream/config/lithium.json index 15d64d3..a38755e 100644 --- a/minerdream/config/lithium.json +++ b/minerdream/config/lithium.json @@ -15,7 +15,7 @@ "inventory_image":"minerdream_lithium_ore.png", "clust_size":3, "num_ores":5, - "scarcity":14, + "scarcity":15, "y_max":-100, "y_min":-31000 }, diff --git a/minerdream/config/nickel.json b/minerdream/config/nickel.json index dae220f..8c5fdce 100644 --- a/minerdream/config/nickel.json +++ b/minerdream/config/nickel.json @@ -15,9 +15,9 @@ "wherein":["stone","desert_stone"], "crack":2, "inventory_image":"minerdream_nickel_ore.png", - "clust_size":3, + "clust_size":4, "num_ores":7, - "scarcity":15, + "scarcity":16, "y_max":-40, "y_min":-31000 }, diff --git a/minerdream/config/orichalcum.json b/minerdream/config/orichalcum.json index 2ad20e6..a4f7998 100644 --- a/minerdream/config/orichalcum.json +++ b/minerdream/config/orichalcum.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_orichalcum_ore.png", "clust_size":3, "num_ores":3, - "scarcity":17, + "scarcity":18, "y_max":-6500, "y_min":-31000 }, diff --git a/minerdream/config/osmium.json b/minerdream/config/osmium.json index df885f6..a5520ef 100644 --- a/minerdream/config/osmium.json +++ b/minerdream/config/osmium.json @@ -15,9 +15,9 @@ "wherein":["stone","desert_stone"], "crack":6, "inventory_image":"minerdream_osmium_ore.png", - "clust_size":3, + "clust_size":4, "num_ores":3, - "scarcity":16, + "scarcity":17, "y_max":-2500, "y_min":-31000 }, @@ -25,8 +25,8 @@ "wherein":["stone","desert_stone"], "inventory_image":"minerdream_osmium_poorore.png", "crack":4, - "clust_size":3, - "num_ores":3, + "clust_size":4, + "num_ores":5, "scarcity":16, "y_max":-2050 }, diff --git a/minerdream/config/palladium.json b/minerdream/config/palladium.json index c5f481a..06460c7 100644 --- a/minerdream/config/palladium.json +++ b/minerdream/config/palladium.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_palladium_ore.png", "clust_size":3, "num_ores":5, - "scarcity":16, + "scarcity":17, "y_max":-3700, "y_min":-31000 }, diff --git a/minerdream/config/platinum.json b/minerdream/config/platinum.json index 68337ec..c6bec47 100644 --- a/minerdream/config/platinum.json +++ b/minerdream/config/platinum.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_platinum_ore.png", "clust_size":3, "num_ores":4, - "scarcity":16, + "scarcity":17, "y_max":-300, "y_min":-31000 }, diff --git a/minerdream/config/potassium.json b/minerdream/config/potassium.json index 2b79ab8..f73cad6 100644 --- a/minerdream/config/potassium.json +++ b/minerdream/config/potassium.json @@ -11,7 +11,7 @@ "inventory_image":"minerdream_potassium_ore.png", "clust_size":3, "num_ores":7, - "scarcity":12, + "scarcity":13, "y_max":420, "y_min":-31000 }, diff --git a/minerdream/config/rhodium.json b/minerdream/config/rhodium.json index 90cb5a9..cfd0889 100644 --- a/minerdream/config/rhodium.json +++ b/minerdream/config/rhodium.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_rhodium_ore.png", "clust_size":3, "num_ores":2, - "scarcity":17, + "scarcity":18, "y_max":-1500, "y_min":-31000 }, diff --git a/minerdream/config/ruthenium.json b/minerdream/config/ruthenium.json index 46e4c42..791db5f 100644 --- a/minerdream/config/ruthenium.json +++ b/minerdream/config/ruthenium.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_ruthenium_ore.png", "clust_size":3, "num_ores":3, - "scarcity":15, + "scarcity":16, "y_max":-500, "y_min":-31000 }, @@ -44,8 +44,8 @@ "inventory_image":"minerdream_ruthenium_poorore.png", "crack":3, "clust_size":3, - "num_ores":3, - "scarcity":13, + "num_ores":4, + "scarcity":14, "y_max":-250 }, "tier":5, diff --git a/minerdream/config/saltpeter.json b/minerdream/config/saltpeter.json index 67e8d4c..b309f95 100644 --- a/minerdream/config/saltpeter.json +++ b/minerdream/config/saltpeter.json @@ -11,7 +11,7 @@ "inventory_image":"minerdream_saltpeter_ore.png", "clust_size":3, "num_ores":5, - "scarcity":15, + "scarcity":16, "y_max":420, "y_min":-31000 }, @@ -20,7 +20,7 @@ "crack":2, "inventory_image":"minerdream_saltpeter_poorore.png", "clust_size":3, - "num_ores":5, + "num_ores":6, "scarcity":15, "y_max":500, "y_min":-31000 diff --git a/minerdream/config/scout.json b/minerdream/config/scout.json new file mode 100644 index 0000000..17e5cc2 --- /dev/null +++ b/minerdream/config/scout.json @@ -0,0 +1,21 @@ +{"tier":6,"3d_armor":{"choppy":2,"cracky":2,"crumbly":1,"level":2,"snappy":3,"use":80, + "boots":{"fleshy":13.5,"gravity":-0.1,"heal":8.75,"jump":0.1,"speed":0.13, + "recipe":[["", "", ""], + ["minerdream:amethyst", "minerdream:boots_cobalt", "minerdream:amethyst"], + ["default:gold_ingot", "", "default:gold_ingot"]]}, + "chestplate":{"fleshy":18.5,"gravity":-0.1,"heal":8.75,"jump":0.1,"speed":0.13, + "recipe":[["minerdream:amethyst", "", "minerdream:amethyst"], + ["default:gold_ingot", "minerdream:chestplate_cobalt", "default:gold_ingot"], + ["default:gold_ingot", "default:gold_ingot", "default:gold_ingot"]]}, +"helmet":{"fleshy":13.5,"gravity":-0.1,"heal":8.75,"jump":0.1,"speed":0.13, + "recipe":[["", "minerdream:amethyst", ""], + ["default:gold_ingot", "minerdream:helmet_cobalt", "default:gold_ingot"]]}, +"leggings":{"fleshy":18.5,"gravity":-0.1,"heal":8.75,"jump":0.1,"speed":0.13, + "recipe":[["", "default:gold_ingot", ""], + ["minerdream:amethyst", "minerdream:leggings_cobalt", "minerdream:amethyst"], + ["", "", ""]]}, +"shields":{"fleshy":13.5,"gravity":-0.1,"heal":8.75,"jump":0.1,"speed":0.13, + "recipe":[["", "default:gold_ingot", ""], + ["default:gold_ingot", "minerdream:amethyst", "default:gold_ingot"], + ["", "minerdream:shield_cobalt", ""]]} +}} diff --git a/minerdream/config/shadow.json b/minerdream/config/shadow.json new file mode 100644 index 0000000..636a1d4 --- /dev/null +++ b/minerdream/config/shadow.json @@ -0,0 +1,23 @@ +{"tier":7, + "3d_armor":{"choppy":2,"cracky":2,"crumbly":1,"heal":9,"level":2,"snappy":3,"use":50, + "boots":{"fleshy":14.5,"gravity":-0.1,"jump":0.1,"speed":0.25, + "recipe":[["", "minerdream:spinel", ""], + ["wool:black", "minerdream:boots_tantalum", "wool:black"], + ["", "minerdream:onyx", ""]]}, + "chestplate":{"fleshy":19.5,"gravity":-0.1,"jump":0.1,"speed":0.25, + "recipe":[["", "minerdream:spinel", ""], + ["wool:black", "minerdream:chestplate_tantalum", "wool:black"], + ["", "minerdream:onyx", ""]]}, +"helmet":{"fleshy":14.5,"gravity":-0.1,"jump":0.1,"speed":0.25, + "recipe":[["", "minerdream:spinel", ""], + ["wool:black", "minerdream:helmet_tantalum", "wool:black"], + ["", "minerdream:onyx", ""]]}, +"leggings":{"fleshy":19.5,"gravity":-0.1,"jump":0.1,"speed":0.25, + "recipe":[["", "minerdream:spinel", ""], + ["wool:black", "minerdream:leggings_tantalum", "wool:black"], + ["", "minerdream:onyx", ""]]}, +"shields":{"fleshy":14.5,"gravity":-0.1,"jump":0.1,"speed":0.25, + "recipe":[["", "minerdream:spinel", ""], + ["minerdream:lead_bar", "minerdream:shield_tantalum", "minerdream:lead_bar"], + ["", "minerdream:onyx", ""]]} +}} diff --git a/minerdream/config/tantalum.json b/minerdream/config/tantalum.json index 541fcff..24d4869 100644 --- a/minerdream/config/tantalum.json +++ b/minerdream/config/tantalum.json @@ -17,7 +17,7 @@ "inventory_image":"minerdream_tantalum_ore.png", "clust_size":3, "num_ores":2, - "scarcity":16, + "scarcity":17, "y_max":-1500, "y_min":-31000 }, @@ -44,7 +44,7 @@ "inventory_image":"minerdream_tantalum_poorore.png", "crack":5, "clust_size":3, - "num_ores":2, + "num_ores":4, "scarcity":16, "y_max":-1250 }, diff --git a/minerdream/crafting.lua b/minerdream/crafting.lua index bd74950..184f9e8 100644 --- a/minerdream/crafting.lua +++ b/minerdream/crafting.lua @@ -168,13 +168,6 @@ if silveringot ~= nil then end end -minetest.register_craft({ - output = 'default:torch 8', - recipe = { - {'minerdream:bituminous_coal'}, - {'group:stick'}, - } -}) --------------lapis---------------- minetest.register_craft({ @@ -409,152 +402,6 @@ minetest.register_craft({ } }) -------special armors----- - -minetest.register_craft({ - output = 'minerdream:helmet_scout', - recipe = { - {'', 'minerdream:amethyst', ''}, - {'default:gold_ingot', 'minerdream:helmet_cobalt', 'default:gold_ingot'}, - } -}) - -minetest.register_craft({ - output = 'minerdream:chestplate_scout', - recipe = { - {'minerdream:amethyst', '', 'minerdream:amethyst'}, - {'default:gold_ingot', 'minerdream:chestplate_cobalt', 'default:gold_ingot'}, - {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, - } -}) - -minetest.register_craft({ - output = 'minerdream:leggings_scout', - recipe = { - {'', 'default:gold_ingot', ''}, - {'minerdream:amethyst', 'minerdream:leggings_cobalt', 'minerdream:amethyst'}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'minerdream:boots_scout', - recipe = { - {'', '', ''}, - {'minerdream:amethyst', 'minerdream:boots_cobalt', 'minerdream:amethyst'}, - {'default:gold_ingot', '', 'default:gold_ingot'}, - } -}) - -minetest.register_craft({ - output = 'minerdream:shield_scout', - recipe = { - {'', 'default:gold_ingot', ''}, - {'default:gold_ingot', 'minerdream:amethyst', 'default:gold_ingot'}, - {'', 'minerdream:shield_cobalt', ''}, - } -}) - -minetest.register_craft({ - output = 'minerdream:helmet_shadow', - recipe = { - {'', 'minerdream:spinel', ''}, - {'wool:black', 'minerdream:helmet_tantalum', 'wool:black'}, - {'', 'minerdream:onyx', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:chestplate_shadow', - recipe = { - {'', 'minerdream:spinel', ''}, - {'wool:black', 'minerdream:chestplate_tantalum', 'wool:black'}, - {'', 'minerdream:onyx', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:leggings_shadow', - recipe = { - {'', 'minerdream:spinel', ''}, - {'wool:black', 'minerdream:leggings_tantalum', 'wool:black'}, - {'', 'minerdream:onyx', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:boots_shadow', - recipe = { - {'', 'minerdream:spinel', ''}, - {'wool:black', 'minerdream:boots_tantalum', 'wool:black'}, - {'', 'minerdream:onyx', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:shield_shadow', - recipe = { - {'', 'minerdream:spinel', ''}, - {'minerdream:lead_bar', 'minerdream:shield_tantalum', 'minerdream:lead_bar'}, - {'', 'minerdream:onyx', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:helmet_knight', - recipe = { - {'', 'minerdream:topaz', ''}, - {'minerdream:silver_bar', 'minerdream:helmet_rhodium', 'minerdream:silver_bar'}, - {'', 'minerdream:topaz', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:chestplate_knight', - recipe = { - {'', 'minerdream:topaz', ''}, - {'minerdream:silver_bar', 'minerdream:chestplate_rhodium', 'minerdream:silver_bar'}, - {'', 'minerdream:topaz', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:leggings_knight', - recipe = { - {'', 'minerdream:topaz', ''}, - {'minerdream:silver_bar', 'minerdream:leggings_rhodium', 'minerdream:silver_bar'}, - {'', 'minerdream:topaz', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:boots_knight', - recipe = { - {'', 'minerdream:topaz', ''}, - {'minerdream:silver_bar', 'minerdream:boots_rhodium', 'minerdream:silver_bar'}, - {'', 'minerdream:topaz', ''}, - - } -}) - -minetest.register_craft({ - output = 'minerdream:shield_knight', - recipe = { - {'', 'minerdream:topaz', ''}, - {'minerdream:silver_bar', 'minerdream:shield_rhodium', 'minerdream:silver_bar'}, - {'', '', ''}, - - } -}) - ----------------------accessories--------------- minetest.register_craft({ diff --git a/minerdream/init.lua b/minerdream/init.lua index be7d7ff..1ded7ab 100644 --- a/minerdream/init.lua +++ b/minerdream/init.lua @@ -21,7 +21,6 @@ dofile(minerdream.path .. "/overrides.lua") dofile(minerdream.path .. "/blocks.lua") dofile(minerdream.path .. "/generation.lua") dofile(minerdream.path .. "/crafting.lua") -dofile(minerdream.path .. "/weapons.lua") dofile(minerdream.path .. "/read_weapon_config.lua") dofile(minerdream.path .. "/armor.lua") dofile(minerdream.path .. "/experiments.lua") diff --git a/minerdream/read_ore_config.lua b/minerdream/read_ore_config.lua index 97e3938..627ce3b 100644 --- a/minerdream/read_ore_config.lua +++ b/minerdream/read_ore_config.lua @@ -6,7 +6,7 @@ local tier_cols={ local tier_definition = basic_functions.import_csv(minerdream.path.."/tiers.txt",tier_cols) local ore_configs=minetest.get_dir_list(minerdream.path..'/config') -print(dump(ore_configs)) +--print(dump(ore_configs)) for i,oc in pairs(ore_configs) do ore=string.split(oc,'.')[1] local inconfig=basic_functions.read_file(minerdream.path..'/config/'..oc)