From 70d7d0fee75ea9fe6f17cc006248415e592b8749 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sat, 24 Jan 2015 19:28:26 +0100 Subject: [PATCH] Updated moreores mod : NOT RUNNING YET --- minetestforfun_game/mods/default/tools.lua | 2 +- mods/coloredwood/wood.lua | 8 +- mods/moreores/LICENSE.md | 14 + mods/moreores/LICENSE.txt | 17 - mods/moreores/README.md | 11 + mods/moreores/README.txt | 22 - mods/moreores/init.lua | 96 +-- mods/moreores/mg.lua | 7 + mods/moreores/old_init.lua | 745 --------------------- 9 files changed, 87 insertions(+), 835 deletions(-) create mode 100644 mods/moreores/LICENSE.md delete mode 100755 mods/moreores/LICENSE.txt create mode 100644 mods/moreores/README.md delete mode 100755 mods/moreores/README.txt delete mode 100755 mods/moreores/old_init.lua diff --git a/minetestforfun_game/mods/default/tools.lua b/minetestforfun_game/mods/default/tools.lua index 8bcc7401..bb2a0a46 100644 --- a/minetestforfun_game/mods/default/tools.lua +++ b/minetestforfun_game/mods/default/tools.lua @@ -28,7 +28,7 @@ minetest.register_tool("default:pick_wood", { full_punch_interval = 1.2, max_drop_level = 0, groupcaps = { - cracky = {times = [3] = 1.2}, uses = 20, maxlevel = 1}, + cracky = {times = {[3] = 1.2}, uses = 20, maxlevel = 1}, }, damage_groups = {fleshy = 1}, }, diff --git a/mods/coloredwood/wood.lua b/mods/coloredwood/wood.lua index 959d885a..c8432581 100755 --- a/mods/coloredwood/wood.lua +++ b/mods/coloredwood/wood.lua @@ -74,7 +74,7 @@ for shade = 1, 3 do "wood_"..shadename..huename, colorname, { - groups = stairsplus_groups, + groups = colored_block_groups, tiles = { pngname }, description = nodedesc, drop = "wood_"..shadename..huename, @@ -86,7 +86,7 @@ for shade = 1, 3 do "wood_"..shadename..huename.."_s50", s50colorname, { - groups = stairsplus_groups, + groups = colored_block_groups, tiles = { s50pngname }, description = s50nodedesc, drop = "wood_"..shadename..huename.."_s50", @@ -155,7 +155,7 @@ for hue = 1, 12 do "wood_light_"..huename, colorname, { - groups = stairsplus_groups, + groups = colored_block_groups, tiles = { pngname }, description = nodedesc, drop = "wood_light_"..huename, @@ -214,7 +214,7 @@ for grey = 1,5 do "wood_"..greyname, greyshadename, { - groups = stairsplus_groups, + groups = colored_block_groups, tiles = { pngname }, description = nodedesc, drop = "wood_"..greyname, diff --git a/mods/moreores/LICENSE.md b/mods/moreores/LICENSE.md new file mode 100644 index 00000000..45c5ff5a --- /dev/null +++ b/mods/moreores/LICENSE.md @@ -0,0 +1,14 @@ +zlib license +============ + +Copyright (c) 2011-2015 Calinou and contributors + +**This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.** + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/mods/moreores/LICENSE.txt b/mods/moreores/LICENSE.txt deleted file mode 100755 index 2499ee93..00000000 --- a/mods/moreores/LICENSE.txt +++ /dev/null @@ -1,17 +0,0 @@ -+---- GNU GPL v3 ----+ - -More Ores -- a Minetest mod that adds ores. -Copyright (C) 2013 Calinou - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/mods/moreores/README.md b/mods/moreores/README.md new file mode 100644 index 00000000..f54dda7b --- /dev/null +++ b/mods/moreores/README.md @@ -0,0 +1,11 @@ +More Ores +========= + +More Ores for Minetest , a free/libre infinite +world block sandbox game. + +To install, just clone this repository into your "mods" directory. + +More Ores code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported. + +**Forum topic:** diff --git a/mods/moreores/README.txt b/mods/moreores/README.txt deleted file mode 100755 index 4c155813..00000000 --- a/mods/moreores/README.txt +++ /dev/null @@ -1,22 +0,0 @@ -Calinou's Minetest Mods -===================== - -Calinou's Mods for Minetest [http://minetest.net], a free and opensource Minecraft-like game. - -This Git repository is mostly made for servers; it allows easy updating. - -To install, just clone this repository somewhere, then copy the "calinou_mods" folder in the "mods/minetest" folder of Minetest's installation folder. - - - -Misc stuff -===================== - -All these mods' source codes, except More Ores are under the zlib/libpng license. More Ores is under the GNU GPLv3; the mods' textures are under the CC BY-SA 3.0 Unported. - -Mods' forum threads: -More Blocks: http://minetest.net/forum/viewtopic.php?id=509 -More Ores: http://minetest.net/forum/viewtopic.php?id=549 -Map Tools: http://minetest.net/forum/viewtopic.php?id=1882 -Doors+: http://minetest.net/forum/viewtopic.php?id=2059 -Stairs+: http://minetest.net/forum/viewtopic.php?id=2092 diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua index 1dadd916..f1d3080f 100755 --- a/mods/moreores/init.lua +++ b/mods/moreores/init.lua @@ -1,4 +1,12 @@ --- Load translation library if intllib is installed +--[[ +===================================================================== +** More Ores ** +By Calinou, with the help of Nore. + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +===================================================================== +--]] local S if (minetest.get_modpath("intllib")) then @@ -8,25 +16,23 @@ if (minetest.get_modpath("intllib")) then S = function ( s ) return s end end -moreores_modpath = minetest.get_modpath("moreores") -dofile(moreores_modpath .. "/_config.txt") +local modpath = minetest.get_modpath("moreores") ---[[ -**** -More Ores -by Calinou -with the help of Nore/Novatux -Licensed under the CC0 -**** ---]] +dofile(modpath .. "/_config.txt") + +-- `mg` support: +if minetest.get_modpath("mg") then + dofile(modpath .. "/mg.lua") +end -- Utility functions +-- ================= local default_stone_sounds = default.node_sound_stone_defaults() local function hoe_on_use(itemstack, user, pointed_thing, uses) local pt = pointed_thing - -- check if pointing at a node + -- Check if pointing at a node: if not pt then return end @@ -86,53 +92,53 @@ local function add_ore(modname, description, mineral_name, oredef) local tool_post = "_" .. mineral_name local item_base = tool_base .. mineral_name local ingot = item_base .. "_ingot" - local lumpitem = item_base .. "_lump" + local lump_item = item_base .. "_lump" local ingotcraft = ingot if oredef.makes.ore then - minetest.register_node(modname .. ":mineral_"..mineral_name, { + minetest.register_node(modname .. ":mineral_" .. mineral_name, { description = S("%s Ore"):format(S(description)), - tiles = {"default_stone.png^"..modname.."_mineral_"..mineral_name..".png"}, + tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, groups = {cracky = 3}, sounds = default_stone_sounds, - drop = lumpitem + drop = lump_item }) end if oredef.makes.block then - local blockitem = item_base .. "_block" - minetest.register_node(blockitem, { + local block_item = item_base .. "_block" + minetest.register_node(block_item, { description = S("%s Block"):format(S(description)), tiles = { img_base .. "_block.png" }, - groups = {snappy = 1,bendy = 2, cracky = 1,melty = 2,level= 2}, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2}, sounds = default_stone_sounds }) - minetest.register_alias(mineral_name.."_block", blockitem) + minetest.register_alias(mineral_name.."_block", block_item) if oredef.makes.ingot then minetest.register_craft( { - output = blockitem, + output = block_item, recipe = get_recipe(ingot, "block") }) minetest.register_craft( { output = ingot .. " 9", recipe = { - { blockitem } + { block_item } } }) end end if oredef.makes.lump then - minetest.register_craftitem(lumpitem, { + minetest.register_craftitem(lump_item, { description = S("%s Lump"):format(S(description)), inventory_image = img_base .. "_lump.png", }) - minetest.register_alias(mineral_name .. "_lump", lumpitem) + minetest.register_alias(mineral_name .. "_lump", lump_item) if oredef.makes.ingot then minetest.register_craft({ type = "cooking", output = ingot, - recipe = lumpitem + recipe = lump_item }) end end @@ -165,41 +171,41 @@ local function add_ore(modname, description, mineral_name, oredef) minetest.register_ore(oredef.oredef) - for toolname, tooldef in pairs(oredef.tools) do + for tool_name, tooldef in pairs(oredef.tools) do local tdef = { description = "", - inventory_image = toolimg_base .. toolname .. ".png", + inventory_image = toolimg_base .. tool_name .. ".png", tool_capabilities = { max_drop_level = 3, groupcaps = tooldef } } - if toolname == "sword" then + if tool_name == "sword" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Sword"):format(S(description)) end - if toolname == "pick" then + if tool_name == "pick" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Pickaxe"):format(S(description)) end - if toolname == "axe" then + if tool_name == "axe" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Axe"):format(S(description)) end - if toolname == "shovel" then + if tool_name == "shovel" then tdef.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Shovel"):format(S(description)) end - if toolname == "hoe" then + if tool_name == "hoe" then tdef.description = S("%s Hoe"):format(S(description)) local uses = tooldef.uses tooldef.uses = nil @@ -208,13 +214,13 @@ local function add_ore(modname, description, mineral_name, oredef) end end - local fulltoolname = tool_base .. toolname .. tool_post - minetest.register_tool(fulltoolname, tdef) - minetest.register_alias(toolname .. tool_post, fulltoolname) + local fulltool_name = tool_base .. tool_name .. tool_post + minetest.register_tool(fulltool_name, tdef) + minetest.register_alias(tool_name .. tool_post, fulltool_name) if oredef.makes.ingot then minetest.register_craft({ - output = fulltoolname, - recipe = get_recipe(ingot, toolname) + output = fulltool_name, + recipe = get_recipe(ingot, tool_name) }) end end @@ -225,7 +231,7 @@ local modname = "moreores" local oredefs = { silver = { - desc = "Silver", + description = "Silver", makes = {ore = true, block = true, lump = true, ingot = true, chest = true}, oredef = {clust_scarcity = moreores_silver_chunk_size * moreores_silver_chunk_size * moreores_silver_chunk_size, clust_num_ores = moreores_silver_ore_per_chunk, @@ -235,7 +241,7 @@ local oredefs = { }, tools = { pick = { - cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2} + cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}}, damage_groups = {fleshy = 3}, full_punch_interval = 0.8, }, @@ -263,7 +269,7 @@ local oredefs = { }, }, tin = { - desc = "Tin", + description = "Tin", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, oredef = {clust_scarcity = moreores_tin_chunk_size * moreores_tin_chunk_size * moreores_tin_chunk_size, clust_num_ores = moreores_tin_ore_per_chunk, @@ -274,7 +280,7 @@ local oredefs = { tools = {} }, mithril = { - desc = "Mithril", + description = "Mithril", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, oredef = {clust_scarcity = moreores_mithril_chunk_size * moreores_mithril_chunk_size * moreores_mithril_chunk_size, clust_num_ores = moreores_mithril_ore_per_chunk, @@ -311,12 +317,10 @@ local oredefs = { } for orename,def in pairs(oredefs) do - add_ore(modname, def.desc, orename, def) + add_ore(modname, def.description, orename, def) end ---[[ désactivé car utilisé par le mod "cart_boost" --- Copper rail (special node) - +-- Copper rail (special node): minetest.register_craft({ output = "moreores:copper_rail 16", recipe = { @@ -372,5 +376,5 @@ if minetest.get_modpath("mg") then end if minetest.setting_getbool("log_mods") then - print(S("[moreores] loaded.")) + minetest.log("action", S("[moreores] loaded.")) end diff --git a/mods/moreores/mg.lua b/mods/moreores/mg.lua index c950a4b1..e323b747 100755 --- a/mods/moreores/mg.lua +++ b/mods/moreores/mg.lua @@ -1,3 +1,10 @@ +--[[ +More Ores: `mg` mod support + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + mg.register_ore({ name = "moreores:mineral_tin", wherein = "default:stone", diff --git a/mods/moreores/old_init.lua b/mods/moreores/old_init.lua deleted file mode 100755 index 0c1e5802..00000000 --- a/mods/moreores/old_init.lua +++ /dev/null @@ -1,745 +0,0 @@ ---[[ -**** -More Ores -by Calinou -Old and "inefficient" version; use if the new version does not work for some reason. Outdated. -Licensed under the zlib/libpng license, see LICENSE.txt for info. -**** ---]] - --- Blocks - -minetest.register_node( "moreores:mineral_gold", { - description = "Gold Ore", - tile_images = { "default_stone.png^moreores_mineral_gold.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "moreores:gold_lump" 1', -}) - -minetest.register_node( "moreores:gold_block", { - description = "Gold Block", - tile_images = { "moreores_gold_block.png" }, - is_ground_content = true, - groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node( "moreores:mineral_silver", { - description = "Silver Ore", - tile_images = { "default_stone.png^moreores_mineral_silver.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "moreores:silver_lump" 1', -}) - -minetest.register_node( "moreores:silver_block", { - description = "Silver Block", - tile_images = { "moreores_silver_block.png" }, - is_ground_content = true, - groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node( "moreores:mineral_copper", { - description = "Copper Ore", - tile_images = { "default_stone.png^moreores_mineral_copper.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "moreores:copper_lump" 1', -}) - -minetest.register_node( "moreores:mineral_tin", { - description = "Tin Ore", - tile_images = { "default_stone.png^moreores_mineral_tin.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "moreores:tin_lump" 1', -}) - -minetest.register_node( "moreores:bronze_block", { - description = "Bronze Block", - tile_images = { "moreores_bronze_block.png" }, - is_ground_content = true, - groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node( "moreores:mineral_mithril", { - description = "Mithril Ore", - tile_images = { "default_stone.png^moreores_mineral_mithril.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "moreores:mithril_lump" 1', -}) - -minetest.register_node( "moreores:mithril_block", { - description = "Mithril Block", - tile_images = { "moreores_mithril_block.png" }, - is_ground_content = true, - groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("moreores:copper_rail", { - description = "Copper Rail", - drawtype = "raillike", - tile_images = {"moreores_copper_rail.png", "moreores_copper_rail_curved.png", "moreores_copper_rail_t_junction.png", "moreores_copper_rail_crossing.png"}, - inventory_image = "moreores_copper_rail.png", - wield_image = "moreores_copper_rail.png", - paramtype = "light", - is_ground_content = true, - walkable = false, - selection_box = { - type = "fixed", - --fixed = - }, - groups = {bendy=2,snappy=1,dig_immediate=2}, -}) - --- Items - -minetest.register_craftitem( "moreores:gold_lump", { - description = "Gold Lump", - inventory_image = "moreores_gold_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:gold_ingot", { - description = "Gold Ingot", - inventory_image = "moreores_gold_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:silver_lump", { - description = "Silver Lump", - inventory_image = "moreores_silver_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:silver_ingot", { - description = "Silver Ingot", - inventory_image = "moreores_silver_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:copper_lump", { - description = "Copper Lump", - inventory_image = "moreores_copper_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:copper_ingot", { - description = "Copper Ingot", - inventory_image = "moreores_copper_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:tin_lump", { - description = "Tin Lump", - inventory_image = "moreores_tin_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:tin_ingot", { - description = "Tin Ingot", - inventory_image = "moreores_tin_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:bronze_ingot", { - description = "Bronze Ingot", - inventory_image = "moreores_bronze_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "moreores:mithril_lump", { - description = "Mithril Lump", - inventory_image = "moreores_mithril_lump.png", - on_place_on_ground = minetest.craftitem_place_item, - on_use = minetest.item_eat(2), -}) - -minetest.register_craftitem( "moreores:mithril_ingot", { - description = "Mithril Ingot", - inventory_image = "moreores_mithril_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - --- Tools - -minetest.register_tool("moreores:pick_bronze", { - description = "Bronze Pickaxe", - inventory_image = "moreores_tool_bronzepick.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - cracky={times={[1]=3.00, [2]=1.20, [3]=0.80}, uses=160, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:shovel_bronze", { - description = "Bronze Shovel", - inventory_image = "moreores_tool_bronzeshovel.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - crumbly={times={[1]=1.50, [2]=0.50, [3]=0.30}, uses=160, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:axe_bronze", { - description = "Bronze Axe", - inventory_image = "moreores_tool_bronzeaxe.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - choppy={times={[1]=3.00, [2]=1.00, [3]=0.60}, uses=160, maxlevel=1}, - fleshy={times={[2]=1.30, [3]=0.70}, uses=160, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:sword_bronze", { - description = "Bronze Sword", - inventory_image = "moreores_tool_bronzesword.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=3, - groupcaps={ - fleshy={times={[2]=0.80, [3]=0.40}, uses=160, maxlevel=1}, - snappy={times={[2]=0.80, [3]=0.40}, uses=160, maxlevel=1}, - choppy={times={[3]=0.90}, uses=160, maxlevel=0} - } - } -}) - -minetest.register_tool("moreores:pick_silver", { - description = "Silver Pickaxe", - inventory_image = "moreores_tool_silverpick.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - cracky={times={[1]=2.60, [2]=1.00, [3]=0.60}, uses=100, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:shovel_silver", { - description = "Silver Shovel", - inventory_image = "moreores_tool_silvershovel.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - crumbly={times={[1]=1.10, [2]=0.40, [3]=0.25}, uses=100, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:axe_silver", { - description = "Silver Axe", - inventory_image = "moreores_tool_silveraxe.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - choppy={times={[1]=2.50, [2]=0.80, [3]=0.50}, uses=100, maxlevel=1}, - fleshy={times={[2]=1.10, [3]=0.60}, uses=100, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:sword_silver", { - description = "Silver Sword", - inventory_image = "moreores_tool_silversword.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=3, - groupcaps={ - fleshy={times={[2]=0.70, [3]=0.30}, uses=100, maxlevel=1}, - snappy={times={[2]=0.70, [3]=0.30}, uses=100, maxlevel=1}, - choppy={times={[3]=0.80}, uses=100, maxlevel=0} - } - } -}) - -minetest.register_tool("moreores:pick_gold", { - description = "Golden Pickaxe", - inventory_image = "moreores_tool_goldpick.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - cracky={times={[1]=2.00, [2]=0.50, [3]=0.30}, uses=70, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:shovel_gold", { - description = "Golden Shovel", - inventory_image = "moreores_tool_goldshovel.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - crumbly={times={[1]=0.60, [2]=0.25, [3]=0.15}, uses=70, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:axe_gold", { - description = "Golden Axe", - inventory_image = "moreores_tool_goldaxe.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - choppy={times={[1]=1.70, [2]=0.40, [3]=0.35}, uses=70, maxlevel=1}, - fleshy={times={[2]=0.90, [3]=0.30}, uses=70, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:sword_gold", { - description = "Golden Sword", - inventory_image = "moreores_tool_goldsword.png", - tool_capabilities = { - full_punch_interval = 0.85, - max_drop_level=3, - groupcaps={ - fleshy={times={[2]=0.60, [3]=0.20}, uses=70, maxlevel=1}, - snappy={times={[2]=0.60, [3]=0.20}, uses=70, maxlevel=1}, - choppy={times={[3]=0.65}, uses=70, maxlevel=0} - } - } -}) - -minetest.register_tool("moreores:pick_mithril", { - description = "Mithril Pickaxe", - inventory_image = "moreores_tool_mithrilpick.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - cracky={times={[1]=2.25, [2]=0.55, [3]=0.35}, uses=200, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:shovel_mithril", { - description = "Mithril Shovel", - inventory_image = "moreores_tool_mithrilshovel.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - crumbly={times={[1]=0.70, [2]=0.35, [3]=0.20}, uses=200, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:axe_mithril", { - description = "Mithril Axe", - inventory_image = "moreores_tool_mithrilaxe.png", - tool_capabilities = { - max_drop_level=3, - groupcaps={ - choppy={times={[1]=1.75, [2]=0.45, [3]=0.45}, uses=200, maxlevel=1}, - fleshy={times={[2]=0.95, [3]=0.30}, uses=200, maxlevel=1} - } - }, -}) - -minetest.register_tool("moreores:sword_mithril", { - description = "Mithril Sword", - inventory_image = "moreores_tool_mithrilsword.png", - tool_capabilities = { - full_punch_interval = 0.45, - max_drop_level=3, - groupcaps={ - fleshy={times={[2]=0.65, [3]=0.25}, uses=200, maxlevel=1}, - snappy={times={[2]=0.70, [3]=0.25}, uses=200, maxlevel=1}, - choppy={times={[3]=0.65}, uses=200, maxlevel=0} - } - } -}) - --- Crafting - -minetest.register_craft({ - output = 'moreores:copper_rail 15', - recipe = { - {'moreores:copper_ingot', '', 'moreores:copper_ingot'}, - {'moreores:copper_ingot', 'default:stick', 'moreores:copper_ingot'}, - {'moreores:copper_ingot', '', 'moreores:copper_ingot'}, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:pick_bronze" 1', - recipe = { - { 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:shovel_bronze" 1', - recipe = { - { '', 'craft "moreores:bronze_ingot"', '' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:axe_bronze" 1', - recipe = { - { 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"', '' }, - { 'craft "moreores:bronze_ingot"', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:sword_bronze" 1', - recipe = { - { '', 'craft "moreores:bronze_ingot"', '' }, - { '', 'craft "moreores:bronze_ingot"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:pick_silver" 1', - recipe = { - { 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:shovel_silver" 1', - recipe = { - { '', 'craft "moreores:silver_ingot"', '' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:axe_silver" 1', - recipe = { - { 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"', '' }, - { 'craft "moreores:silver_ingot"', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:sword_silver" 1', - recipe = { - { '', 'craft "moreores:silver_ingot"', '' }, - { '', 'craft "moreores:silver_ingot"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:pick_gold" 1', - recipe = { - { 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:shovel_gold" 1', - recipe = { - { '', 'craft "moreores:gold_ingot"', '' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:axe_gold" 1', - recipe = { - { 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"', '' }, - { 'craft "moreores:gold_ingot"', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:sword_gold" 1', - recipe = { - { '', 'craft "moreores:gold_ingot"', '' }, - { '', 'craft "moreores:gold_ingot"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:pick_mithril" 1', - recipe = { - { 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:shovel_mithril" 1', - recipe = { - { '', 'craft "moreores:mithril_ingot"', '' }, - { '', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:axe_mithril" 1', - recipe = { - { 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"', '' }, - { 'craft "moreores:mithril_ingot"', 'craft "Stick"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:sword_mithril" 1', - recipe = { - { '', 'craft "moreores:mithril_ingot"', '' }, - { '', 'craft "moreores:mithril_ingot"', '' }, - { '', 'craft "Stick"', '' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:bronze_ingot"', - recipe = { - { 'craft "moreores:tin_ingot"'}, - { 'craft "moreores:copper_ingot"'}, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:bronze_ingot"', - recipe = { - { 'craft "moreores:copper_ingot"'}, - { 'craft "moreores:tin_ingot"'}, - } -}) - -minetest.register_craft( { - output = 'node "moreores:gold_block" 1', - recipe = { - { 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"' }, - { 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"' }, - { 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"', 'craft "moreores:gold_ingot"' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:gold_ingot" 9', - recipe = { - { 'node "moreores:gold_block"' }, - } -}) - -minetest.register_craft( { - output = 'node "moreores:silver_block" 1', - recipe = { - { 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"' }, - { 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"' }, - { 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"', 'craft "moreores:silver_ingot"' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:silver_ingot" 9', - recipe = { - { 'node "moreores:silver_block"' }, - } -}) - -minetest.register_craft( { - output = 'node "moreores:bronze_block" 1', - recipe = { - { 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"' }, - { 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"' }, - { 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"', 'craft "moreores:bronze_ingot"' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:bronze_ingot" 9', - recipe = { - { 'node "moreores:bronze_block"' }, - } -}) - -minetest.register_craft( { - output = 'node "moreores:mithril_block" 1', - recipe = { - { 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"' }, - { 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"' }, - { 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"', 'craft "moreores:mithril_ingot"' }, - } -}) - -minetest.register_craft( { - output = 'craft "moreores:mithril_ingot" 9', - recipe = { - { 'node "moreores:mithril_block"' }, - } -}) - --- Smelting - -minetest.register_craft({ - type = "cooking", - output = "moreores:gold_ingot", - recipe = "moreores:gold_lump", -}) - -minetest.register_craft({ - type = "cooking", - output = "moreores:silver_ingot", - recipe = "moreores:silver_lump", -}) - -minetest.register_craft({ - type = "cooking", - output = "moreores:tin_ingot", - recipe = "moreores:tin_lump", -}) - -minetest.register_craft({ - type = "cooking", - output = "moreores:copper_ingot", - recipe = "moreores:copper_lump", -}) - -minetest.register_craft({ - type = "cooking", - output = "moreores:mithril_ingot", - recipe = "moreores:mithril_lump", -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'craft "moreores:bronze_ingot"' }, - { 'node "default:chest"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'craft "moreores:silver_ingot"' }, - { 'node "default:chest"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'craft "moreores:gold_ingot"' }, - { 'node "default:chest"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - { 'node "default:wood"', 'craft "moreores:bronze_ingot"', 'node "default:wood"' }, - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - { 'node "default:wood"', 'craft "moreores:bronze_ingot"', 'node "default:wood"' }, - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - { 'node "default:wood"', 'craft "moreores:silver_ingot"', 'node "default:wood"' }, - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - } -}) - -minetest.register_craft( { - output = 'node "default:chest_locked" 1', - recipe = { - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - { 'node "default:wood"', 'craft "moreores:gold_ingot"', 'node "default:wood"' }, - { 'node "default:wood"', 'node "default:wood"', 'node "default:wood"' }, - } -}) - --- Ore generation - -local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, ore_per_chunk, height_min, height_max) - if maxp.y < height_min or minp.y > height_max then - return - end - local y_min = math.max(minp.y, height_min) - local y_max = math.min(maxp.y, height_max) - local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1) - local pr = PseudoRandom(seed) - local num_chunks = math.floor(chunks_per_volume * volume) - local chunk_size = 3 - if ore_per_chunk <= 4 then - chunk_size = 2 - end - local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk) - --print("generate_ore num_chunks: "..dump(num_chunks)) - for i=1,num_chunks do - if (y_max-chunk_size+1 <= y_min) then return end - local y0 = pr:next(y_min, y_max-chunk_size+1) - if y0 >= height_min and y0 <= height_max then - local x0 = pr:next(minp.x, maxp.x-chunk_size+1) - local z0 = pr:next(minp.z, maxp.z-chunk_size+1) - local p0 = {x=x0, y=y0, z=z0} - for x1=0,chunk_size-1 do - for y1=0,chunk_size-1 do - for z1=0,chunk_size-1 do - if pr:next(1,inverse_chance) == 1 then - local x2 = x0+x1 - local y2 = y0+y1 - local z2 = z0+z1 - local p2 = {x=x2, y=y2, z=z2} - if minetest.get_node(p2).name == wherein then - minetest.set_node(p2, {name=name}) - end - end - end - end - end - end - end - --print("generate_ore done") -end - -minetest.register_on_generated(function(minp, maxp, seed) -generate_ore("moreores:mineral_copper", "default:stone", minp, maxp, seed+16, 1/11/11/11, 8, -31000, 64) -generate_ore("moreores:mineral_tin", "default:stone", minp, maxp, seed+17, 1/8/8/8, 2, -31000, 8) -generate_ore("moreores:mineral_silver", "default:stone", minp, maxp, seed+18, 1/10/10/10, 5, -31000, 2) -generate_ore("moreores:mineral_gold", "default:stone", minp, maxp, seed+19, 1/12/12/12, 5, -31000, -64) -generate_ore("moreores:mineral_mithril", "default:stone", minp, maxp, seed+20, 1/6/6/6, 1, -31000, -512) -end) \ No newline at end of file