From e3e8de8b101ed09c2fcd0f04ce9f56db15c1536b Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 27 Apr 2016 16:01:44 +0200 Subject: [PATCH] [moreores & mff_game] Fuse moreores and mff_game together --- minetestforfun_game/mods/default/README.txt | 1 + minetestforfun_game/mods/default/aliases.lua | 18 + minetestforfun_game/mods/default/crafting.lua | 169 +++++++- .../mods/default/craftitems.lua | 33 ++ minetestforfun_game/mods/default/mapgen.lua | 94 +++++ minetestforfun_game/mods/default/nodes.lua | 109 +++++ .../textures/default_mineral_mithril.png | Bin .../textures/default_mineral_silver.png | Bin .../default/textures/default_mineral_tin.png | Bin .../textures/default_mithril_block.png | Bin .../textures/default_mithril_ingot.png | Bin .../default/textures/default_mithril_lump.png | Bin .../default/textures/default_silver_block.png | Bin .../default/textures/default_silver_ingot.png | Bin .../default/textures/default_silver_lump.png | Bin .../default/textures/default_tin_block.png | Bin .../default/textures/default_tin_ingot.png | Bin .../default/textures/default_tin_lump.png | Bin minetestforfun_game/mods/default/tools.lua | 106 +++++ minetestforfun_game/mods/farming/hoes.lua | 16 +- .../textures/farming_tool_mithrilhoe.png | Bin .../textures/farming_tool_silverhoe.png | Bin mods/moreores/LICENSE.md | 14 - mods/moreores/README.md | 11 - mods/moreores/_config.txt | 27 -- mods/moreores/depends.txt | 2 - mods/moreores/description.txt | 1 - mods/moreores/init.lua | 380 ------------------ mods/moreores/locale/de.txt | 22 - mods/moreores/locale/es.txt | 21 - mods/moreores/locale/fr.txt | 21 - mods/moreores/locale/it.txt | 21 - mods/moreores/locale/tr.txt | 25 -- mods/moreores/mg.lua | 53 --- mods/moreores/mod.conf | 1 - mods/moreores/ores.lua | 34 -- .../textures/moreores_bronze_block.png | Bin 368 -> 0 bytes .../textures/moreores_bronze_ingot.png | Bin 212 -> 0 bytes .../textures/moreores_copper_block.png | Bin 453 -> 0 bytes .../textures/moreores_copper_ingot.png | Bin 228 -> 0 bytes .../textures/moreores_copper_lump.png | Bin 224 -> 0 bytes .../textures/moreores_copper_rail.png | Bin 437 -> 0 bytes .../moreores_copper_rail_crossing.png | Bin 388 -> 0 bytes .../textures/moreores_copper_rail_curved.png | Bin 374 -> 0 bytes .../moreores_copper_rail_t_junction.png | Bin 374 -> 0 bytes .../moreores/textures/moreores_gold_block.png | Bin 672 -> 0 bytes .../moreores/textures/moreores_gold_ingot.png | Bin 240 -> 0 bytes mods/moreores/textures/moreores_gold_lump.png | Bin 174 -> 0 bytes .../textures/moreores_mineral_copper.png | Bin 149 -> 0 bytes .../textures/moreores_mineral_gold.png | Bin 149 -> 0 bytes .../textures/moreores_tool_bronzeaxe.png | Bin 219 -> 0 bytes .../textures/moreores_tool_bronzepick.png | Bin 265 -> 0 bytes .../textures/moreores_tool_bronzeshovel.png | Bin 263 -> 0 bytes .../textures/moreores_tool_bronzesword.png | Bin 735 -> 0 bytes .../textures/moreores_tool_goldaxe.png | Bin 220 -> 0 bytes .../textures/moreores_tool_goldpick.png | Bin 265 -> 0 bytes .../textures/moreores_tool_goldshovel.png | Bin 205 -> 0 bytes .../textures/moreores_tool_goldsword.png | Bin 788 -> 0 bytes .../textures/moreores_tool_mithrilaxe.png | Bin 257 -> 0 bytes .../textures/moreores_tool_mithrilpick.png | Bin 311 -> 0 bytes .../textures/moreores_tool_mithrilshovel.png | Bin 304 -> 0 bytes .../textures/moreores_tool_mithrilsword.png | Bin 856 -> 0 bytes .../textures/moreores_tool_silveraxe.png | Bin 220 -> 0 bytes .../textures/moreores_tool_silverpick.png | Bin 270 -> 0 bytes .../textures/moreores_tool_silvershovel.png | Bin 204 -> 0 bytes .../textures/moreores_tool_silversword.png | Bin 480 -> 0 bytes worlds/minetestforfun/world.mt | 1 - 67 files changed, 544 insertions(+), 636 deletions(-) rename mods/moreores/textures/moreores_mineral_mithril.png => minetestforfun_game/mods/default/textures/default_mineral_mithril.png (100%) rename mods/moreores/textures/moreores_mineral_silver.png => minetestforfun_game/mods/default/textures/default_mineral_silver.png (100%) rename mods/moreores/textures/moreores_mineral_tin.png => minetestforfun_game/mods/default/textures/default_mineral_tin.png (100%) rename mods/moreores/textures/moreores_mithril_block.png => minetestforfun_game/mods/default/textures/default_mithril_block.png (100%) rename mods/moreores/textures/moreores_mithril_ingot.png => minetestforfun_game/mods/default/textures/default_mithril_ingot.png (100%) rename mods/moreores/textures/moreores_mithril_lump.png => minetestforfun_game/mods/default/textures/default_mithril_lump.png (100%) rename mods/moreores/textures/moreores_silver_block.png => minetestforfun_game/mods/default/textures/default_silver_block.png (100%) rename mods/moreores/textures/moreores_silver_ingot.png => minetestforfun_game/mods/default/textures/default_silver_ingot.png (100%) rename mods/moreores/textures/moreores_silver_lump.png => minetestforfun_game/mods/default/textures/default_silver_lump.png (100%) rename mods/moreores/textures/moreores_tin_block.png => minetestforfun_game/mods/default/textures/default_tin_block.png (100%) rename mods/moreores/textures/moreores_tin_ingot.png => minetestforfun_game/mods/default/textures/default_tin_ingot.png (100%) rename mods/moreores/textures/moreores_tin_lump.png => minetestforfun_game/mods/default/textures/default_tin_lump.png (100%) rename mods/moreores/textures/moreores_tool_mithrilhoe.png => minetestforfun_game/mods/farming/textures/farming_tool_mithrilhoe.png (100%) rename mods/moreores/textures/moreores_tool_silverhoe.png => minetestforfun_game/mods/farming/textures/farming_tool_silverhoe.png (100%) delete mode 100755 mods/moreores/LICENSE.md delete mode 100755 mods/moreores/README.md delete mode 100644 mods/moreores/_config.txt delete mode 100755 mods/moreores/depends.txt delete mode 100644 mods/moreores/description.txt delete mode 100755 mods/moreores/init.lua delete mode 100755 mods/moreores/locale/de.txt delete mode 100755 mods/moreores/locale/es.txt delete mode 100755 mods/moreores/locale/fr.txt delete mode 100755 mods/moreores/locale/it.txt delete mode 100755 mods/moreores/locale/tr.txt delete mode 100755 mods/moreores/mg.lua delete mode 100644 mods/moreores/mod.conf delete mode 100755 mods/moreores/ores.lua delete mode 100755 mods/moreores/textures/moreores_bronze_block.png delete mode 100755 mods/moreores/textures/moreores_bronze_ingot.png delete mode 100755 mods/moreores/textures/moreores_copper_block.png delete mode 100755 mods/moreores/textures/moreores_copper_ingot.png delete mode 100755 mods/moreores/textures/moreores_copper_lump.png delete mode 100755 mods/moreores/textures/moreores_copper_rail.png delete mode 100755 mods/moreores/textures/moreores_copper_rail_crossing.png delete mode 100755 mods/moreores/textures/moreores_copper_rail_curved.png delete mode 100755 mods/moreores/textures/moreores_copper_rail_t_junction.png delete mode 100755 mods/moreores/textures/moreores_gold_block.png delete mode 100755 mods/moreores/textures/moreores_gold_ingot.png delete mode 100755 mods/moreores/textures/moreores_gold_lump.png delete mode 100755 mods/moreores/textures/moreores_mineral_copper.png delete mode 100755 mods/moreores/textures/moreores_mineral_gold.png delete mode 100755 mods/moreores/textures/moreores_tool_bronzeaxe.png delete mode 100755 mods/moreores/textures/moreores_tool_bronzepick.png delete mode 100755 mods/moreores/textures/moreores_tool_bronzeshovel.png delete mode 100644 mods/moreores/textures/moreores_tool_bronzesword.png delete mode 100755 mods/moreores/textures/moreores_tool_goldaxe.png delete mode 100755 mods/moreores/textures/moreores_tool_goldpick.png delete mode 100755 mods/moreores/textures/moreores_tool_goldshovel.png delete mode 100644 mods/moreores/textures/moreores_tool_goldsword.png delete mode 100755 mods/moreores/textures/moreores_tool_mithrilaxe.png delete mode 100755 mods/moreores/textures/moreores_tool_mithrilpick.png delete mode 100755 mods/moreores/textures/moreores_tool_mithrilshovel.png delete mode 100644 mods/moreores/textures/moreores_tool_mithrilsword.png delete mode 100755 mods/moreores/textures/moreores_tool_silveraxe.png delete mode 100755 mods/moreores/textures/moreores_tool_silverpick.png delete mode 100755 mods/moreores/textures/moreores_tool_silvershovel.png delete mode 100755 mods/moreores/textures/moreores_tool_silversword.png diff --git a/minetestforfun_game/mods/default/README.txt b/minetestforfun_game/mods/default/README.txt index 975f58a1..ac0d0c73 100755 --- a/minetestforfun_game/mods/default/README.txt +++ b/minetestforfun_game/mods/default/README.txt @@ -64,6 +64,7 @@ Calinou (CC BY-SA): default_papyrus.png default_mineral_copper.png default_glass_detail.png + default_tool_goldsword.png MirceaKitsune (WTFPL): character.x diff --git a/minetestforfun_game/mods/default/aliases.lua b/minetestforfun_game/mods/default/aliases.lua index 63fe59b2..b727e88d 100755 --- a/minetestforfun_game/mods/default/aliases.lua +++ b/minetestforfun_game/mods/default/aliases.lua @@ -78,3 +78,21 @@ minetest.register_alias("default:pinewood", "default:pine_wood") minetest.register_alias("default:ladder", "default:ladder_wood") minetest.register_alias("default:sign_wall", "default:sign_wall_wood") +-- Those lines are for moreores integration +minetest.register_alias("moreores:pick_silver", "default:pick_silver") +minetest.register_alias("moreores:pick_mithril", "defaut:pick_mithril") +minetest.register_alias("moreores:shovel_silver", "default:shovel_silver") +minetest.register_alias("moreores:shovel_mithril", "default:shovel_mithril") +minetest.register_alias("moreores:axe_silver", "default:axe_silver") +minetest.register_alias("moreores:axe_mithril", "default:axe_mithril") +minetest.register_alias("moreores:sword_silver", "default:sword_silver") +minetest.register_alias("moreores:sword_mithril", "default:sword_mithril") +minetest.register_alias("moreores:mineral_silver", "default:stone_with_silver") +minetest.register_alias("moreores:mineral_tin", "default:stone_with_tin") +minetest.register_alias("moreores:mineral_mithril", "default:stone_with_mithril") +minetest.register_alias("moreores:mithril_ingot", "default:mithril_ingot") +minetest.register_alias("moreores:silver_ingot", "default:silver_ingot") +minetest.register_alias("moreores:tin_ingot", "default:tin_ingot") +minetest.register_alias("moreores:mithril_lump", "default:mithril_lump") +minetest.register_alias("moreores:silver_lump", "default:silver_lump") +minetest.register_alias("moreores:tin_lump", "default:tin_lump") diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index b469eea1..76feadf9 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -111,6 +111,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:pick_silver', + recipe = { + {'default:silver_ingot', 'default:silver_ingot', 'default:silver_ingot'}, + {'', 'group:stick', ''}, + {'', 'group:stick', ''}, + } +}) + minetest.register_craft({ output = 'default:pick_gold', recipe = { @@ -129,6 +138,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:pick_mithril', + recipe = { + {'default:mithril_ingot', 'default:mithril_ingot', 'default:mithril_ingot'}, + {'', 'group:stick', ''}, + {'', 'group:stick', ''}, + } +}) + minetest.register_craft({ output = 'default:pick_diamond', recipe = { @@ -183,6 +201,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:shovel_silver', + recipe = { + {'default:silver_ingot'}, + {'group:stick'}, + {'group:stick'}, + } +}) + minetest.register_craft({ output = 'default:shovel_gold', recipe = { @@ -201,6 +228,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:shovel_mithril', + recipe = { + {'default:mithril_ingot'}, + {'group:stick'}, + {'group:stick'}, + } +}) + minetest.register_craft({ output = 'default:shovel_diamond', recipe = { @@ -255,6 +291,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:axe_silver', + recipe = { + {'default:silver_ingot', 'default:silver_ingot'}, + {'default:silver_ingot', 'group:stick'}, + {'', 'group:stick'}, + } +}) + minetest.register_craft({ output = "default:axe_gold", recipe = { @@ -273,6 +318,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:axe_mithril', + recipe = { + {'default:mithril_ingot', 'default:mithril_ingot'}, + {'default:mithril_ingot', 'group:stick'}, + {'', 'group:stick'}, + } +}) + minetest.register_craft({ output = 'default:axe_diamond', recipe = { @@ -327,6 +381,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:axe_silver', + recipe = { + {'default:silver_ingot', 'default:silver_ingot'}, + {'group:stick', 'default:silver_ingot'}, + {'group:stick', ''}, + } +}) + minetest.register_craft({ output = 'default:axe_gold', recipe = { @@ -345,6 +408,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:axe_mithril', + recipe = { + {'default:mithril_ingot', 'default:mithril_ingot'}, + {'group:stick', 'default:mithril_ingot'}, + {'group:stick', ''}, + } +}) + minetest.register_craft({ output = 'default:axe_diamond', recipe = { @@ -399,6 +471,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:sword_silver', + recipe = { + {'default:silver_ingot'}, + {'default:silver_ingot'}, + {'group:stick'}, + } +}) + minetest.register_craft({ output = "default:sword_gold", recipe = { @@ -417,6 +498,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:sword_mithril', + recipe = { + {'default:mithril_ingot'}, + {'default:mithril_ingot'}, + {'group:stick'}, + } +}) + minetest.register_craft({ output = 'default:sword_diamond', recipe = { @@ -457,7 +547,7 @@ minetest.register_craft({ output = 'default:chest_locked', recipe = { {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'default:steel_ingot', 'group:wood'}, + {'group:wood', 'group:ingot', 'group:wood'}, {'group:wood', 'group:wood', 'group:wood'}, } }) @@ -498,6 +588,16 @@ minetest.register_craft({ recipe = {"default:steel_ingot", "default:copper_ingot"}, }) +minetest.register_craft({ + type = "shapeless", + output = "default:bronze_ingot 3", + recipe = { + "default:tin_ingot", + "default:copper_ingot", + "default:copper_ingot", + } +}) + minetest.register_craft({ output = 'default:coalblock', recipe = { @@ -546,6 +646,23 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:tinblock', + recipe = { + {'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'}, + {'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'}, + {'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'}, + } +}) + +minetest.register_craft({ + output = 'default:tin_ingot 9', + recipe = { + {'default:tinblock'}, + } +}) + + minetest.register_craft({ output = 'default:bronzeblock', recipe = { @@ -562,6 +679,22 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:silverblock', + recipe = { + {'default:silver_ingot', 'default:silver_ingot', 'default:silver_ingot'}, + {'default:silver_ingot', 'default:silver_ingot', 'default:silver_ingot'}, + {'default:silver_ingot', 'default:silver_ingot', 'default:silver_ingot'}, + } +}) + +minetest.register_craft({ + output = 'default:silver_ingot 9', + recipe = { + {'default:silverblock'}, + } +}) + minetest.register_craft({ output = 'default:goldblock', recipe = { @@ -571,6 +704,22 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:mithrilblock', + recipe = { + {'default:mithril_ingot', 'default:mithril_ingot', 'default:mithril_ingot'}, + {'default:mithril_ingot', 'default:mithril_ingot', 'default:mithril_ingot'}, + {'default:mithril_ingot', 'default:mithril_ingot', 'default:mithril_ingot'}, + } +}) + +minetest.register_craft({ + output = 'default:mithril_ingot 9', + recipe = { + {'default:mithrilblock'}, + } +}) + minetest.register_craft({ output = 'default:gold_ingot 9', recipe = { @@ -883,12 +1032,30 @@ minetest.register_craft({ recipe = "default:copper_lump", }) +minetest.register_craft({ + type = "cooking", + output = "default:tin_ingot", + recipe = "default:tin_lump", +}) + +minetest.register_craft({ + type = "cooking", + output = "default:silver_ingot", + recipe = "default:silver_lump", +}) + minetest.register_craft({ type = "cooking", output = "default:gold_ingot", recipe = "default:gold_lump", }) +minetest.register_craft({ + type = "cooking", + output = "default:mithril_ingot", + recipe = "default:mithril_lump", +}) + minetest.register_craft({ type = "cooking", cooktime = 2, -- //MFF(Mg|07/24/15) diff --git a/minetestforfun_game/mods/default/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua index 9594af02..0ca79105 100755 --- a/minetestforfun_game/mods/default/craftitems.lua +++ b/minetestforfun_game/mods/default/craftitems.lua @@ -180,6 +180,16 @@ minetest.register_craftitem("default:copper_lump", { inventory_image = "default_copper_lump.png", }) +minetest.register_craftitem("default:tin_lump", { + description = "Tin Lump", + inventory_image = "default_tin_lump.png", +}) + +minetest.register_craftitem("default:silver_lump", { + description = "Silver Lump", + inventory_image = "default_silver_lump.png", +}) + minetest.register_craftitem("default:mese_crystal", { description = "Mese Crystal", inventory_image = "default_mese_crystal.png", @@ -190,6 +200,11 @@ minetest.register_craftitem("default:gold_lump", { inventory_image = "default_gold_lump.png", }) +minetest.register_craftitem("default:mithril_lump", { + description = "Mithril Lump", + inventory_image = "default_mithril_lump.png", +}) + minetest.register_craftitem("default:diamond", { description = "Diamond", inventory_image = "default_diamond.png", @@ -213,12 +228,24 @@ minetest.register_craftitem("default:copper_ingot", { groups = {ingot = 1}, }) +minetest.register_craftitem("default:tin_ingot", { + description = "Tin Ingot", + inventory_image = "default_tin_ingot.png", + groups = {ingot = 1}, +}) + minetest.register_craftitem("default:bronze_ingot", { description = "Bronze Ingot", inventory_image = "default_bronze_ingot.png", groups = {ingot = 1}, }) +minetest.register_craftitem("default:silver_ingot", { + description = "Silver Ingot", + inventory_image = "default_silver_ingot.png", + groups = {ingot = 1}, +}) + minetest.register_craftitem("default:gold_ingot", { description = "Gold Ingot", groups = {ingot = 1}, @@ -230,6 +257,12 @@ minetest.register_craftitem("default:mese_crystal_fragment", { inventory_image = "default_mese_crystal_fragment.png", }) +minetest.register_craftitem("default:mithril_ingot", { + description = "Mithril Ingot", + groups = {ingot = 1}, + inventory_image = "default_mithril_ingot.png", +}) + minetest.register_craftitem("default:clay_brick", { description = "Clay Brick", inventory_image = "default_clay_brick.png", diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index 605e08f6..86622880 100755 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -322,6 +322,100 @@ function default.register_ores() }) + -- Tin + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_tin", + wherein = "default:stone", + clust_scarcity = 7 * 7 * 7, + clust_num_ores = 3, + clust_size = 7, + y_min = -31000, + y_max = 12, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:desert_stone_with_tin", + wherein = "default:desert_stone", + clust_scarcity = 7 * 7 * 7, + clust_num_ores = 3, + clust_size = 7, + y_min = -31000, + y_max = 12, + }) + + -- Silver + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_silver", + wherein = "default:stone", + clust_scarcity = 11 * 11 * 11, + clust_num_ores = 4, + clust_size = 11, + y_min = -31000, + y_max = -12, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:desert_stone_with_silver", + wherein = "default:desert_stone", + clust_scarcity = 11 * 11 * 11, + clust_num_ores = 4, + clust_size = 11, + y_min = -31000, + y_max = -12, + }) + + -- Mithril + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mithril", + wherein = "default:stone", + clust_scarcity = 11 * 11 * 11, + clust_num_ores = 1, + clust_size = 11, + y_min = -31000, + y_max = -1024, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mithril", + wherein = "default:stone", + clust_scarcity = 15 * 15 * 15, + clust_num_ores = 2, + clust_size = 3, + y_min = -31000, + y_max = -2048, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mithril", + wherein = "default:stone", + clust_scarcity = 22 * 22 * 22, + clust_num_ores = 5, + clust_size = 5, + y_min = -31000, + y_max = -4096, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mithril", + wherein = "default:stone", + clust_scarcity = 28 * 28 * 28, + clust_num_ores = 20, + clust_size = 7, + y_min = -31000, + y_max = -12288, + }) + -- Gold minetest.register_ore({ diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 27d2c93e..8212fe13 100755 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -105,8 +105,20 @@ default:steelblock default:stone_with_copper default:desert_stone_with_copper default:copperblock + +default:stone_with_tin +default:desert_stone_with_tin +default:tinblock + default:bronzeblock +default:stone_with_silver +default:desert_stone_with_silver +default:silverblock + +default:stone_with_mithril +default:mithrilblock + default:stone_with_gold default:goldblock @@ -1059,6 +1071,81 @@ minetest.register_node("default:bronzeblock", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:stone_with_tin", { + description = "Tin Ore", + tiles = {"default_stone.png^default_mineral_tin.png"}, + is_ground_content = true, + groups = {cracky = 3}, + drop = { + items = { + {items = {"default:cobble"}}, + {items = {"default:tin_lump"}}, + {items = {"maptools:copper_coin 3"}}, + }, + }, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:desert_stone_with_tin", { + description = "Tin Ore", + tiles = {"default_desert_stone.png^default_mineral_tin.png"}, + is_ground_content = true, + groups = {crumbly = 1, cracky = 3}, + drop = { + items = { + {items = {"default:desert_cobble"}}, + {items = {"default:tin_lump"}}, + {items = {"maptools:copper_coin 3"}}, + }, + }, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:tinblock", { + description = "Tin Block", + tiles = {"default_tin_block.png"}, + is_ground_content = false, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:stone_with_silver", { + description = "Silver Ore", + tiles = {"default_stone.png^default_mineral_silver.png"}, + is_ground_content = true, + groups = {cracky = 3}, + drop = { + items = { + {items = {"default:cobble"}}, + {items = {"default:silver_lump"}}, + {items = {"maptools:copper_coin 3"}}, + }, + }, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:desert_stone_with_silver", { + description = "Silver Ore", + tiles = {"default_desert_stone.png^default_mineral_silver.png"}, + is_ground_content = true, + groups = {crumbly = 1, cracky = 3}, + drop = { + items = { + {items = {"default:desert_cobble"}}, + {items = {"default:silver_lump"}}, + {items = {"maptools:copper_coin 3"}}, + }, + }, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:silverblock", { + description = "Silver Block", + tiles = {"default_silver_block.png"}, + is_ground_content = false, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, + sounds = default.node_sound_stone_defaults(), +}) minetest.register_node("default:stone_with_mese", { description = "Mese Ore", @@ -1137,6 +1224,28 @@ minetest.register_node("default:goldblock", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:stone_with_mithril", { + description = "Tin Ore", + tiles = {"default_stone.png^default_mineral_mithril.png"}, + is_ground_content = true, + groups = {cracky = 3}, + drop = { + items = { + {items = {"default:cobble"}}, + {items = {"default:mithril_lump"}}, + {items = {"maptools:copper_coin 3"}}, + }, + }, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("default:mithrilblock", { + description = "Mithril Block", + tiles = {"default_mithril_block.png"}, + is_ground_content = false, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, + sounds = default.node_sound_stone_defaults(), +}) minetest.register_node("default:stone_with_diamond", { description = "Diamond Ore", diff --git a/mods/moreores/textures/moreores_mineral_mithril.png b/minetestforfun_game/mods/default/textures/default_mineral_mithril.png similarity index 100% rename from mods/moreores/textures/moreores_mineral_mithril.png rename to minetestforfun_game/mods/default/textures/default_mineral_mithril.png diff --git a/mods/moreores/textures/moreores_mineral_silver.png b/minetestforfun_game/mods/default/textures/default_mineral_silver.png similarity index 100% rename from mods/moreores/textures/moreores_mineral_silver.png rename to minetestforfun_game/mods/default/textures/default_mineral_silver.png diff --git a/mods/moreores/textures/moreores_mineral_tin.png b/minetestforfun_game/mods/default/textures/default_mineral_tin.png similarity index 100% rename from mods/moreores/textures/moreores_mineral_tin.png rename to minetestforfun_game/mods/default/textures/default_mineral_tin.png diff --git a/mods/moreores/textures/moreores_mithril_block.png b/minetestforfun_game/mods/default/textures/default_mithril_block.png similarity index 100% rename from mods/moreores/textures/moreores_mithril_block.png rename to minetestforfun_game/mods/default/textures/default_mithril_block.png diff --git a/mods/moreores/textures/moreores_mithril_ingot.png b/minetestforfun_game/mods/default/textures/default_mithril_ingot.png similarity index 100% rename from mods/moreores/textures/moreores_mithril_ingot.png rename to minetestforfun_game/mods/default/textures/default_mithril_ingot.png diff --git a/mods/moreores/textures/moreores_mithril_lump.png b/minetestforfun_game/mods/default/textures/default_mithril_lump.png similarity index 100% rename from mods/moreores/textures/moreores_mithril_lump.png rename to minetestforfun_game/mods/default/textures/default_mithril_lump.png diff --git a/mods/moreores/textures/moreores_silver_block.png b/minetestforfun_game/mods/default/textures/default_silver_block.png similarity index 100% rename from mods/moreores/textures/moreores_silver_block.png rename to minetestforfun_game/mods/default/textures/default_silver_block.png diff --git a/mods/moreores/textures/moreores_silver_ingot.png b/minetestforfun_game/mods/default/textures/default_silver_ingot.png similarity index 100% rename from mods/moreores/textures/moreores_silver_ingot.png rename to minetestforfun_game/mods/default/textures/default_silver_ingot.png diff --git a/mods/moreores/textures/moreores_silver_lump.png b/minetestforfun_game/mods/default/textures/default_silver_lump.png similarity index 100% rename from mods/moreores/textures/moreores_silver_lump.png rename to minetestforfun_game/mods/default/textures/default_silver_lump.png diff --git a/mods/moreores/textures/moreores_tin_block.png b/minetestforfun_game/mods/default/textures/default_tin_block.png similarity index 100% rename from mods/moreores/textures/moreores_tin_block.png rename to minetestforfun_game/mods/default/textures/default_tin_block.png diff --git a/mods/moreores/textures/moreores_tin_ingot.png b/minetestforfun_game/mods/default/textures/default_tin_ingot.png similarity index 100% rename from mods/moreores/textures/moreores_tin_ingot.png rename to minetestforfun_game/mods/default/textures/default_tin_ingot.png diff --git a/mods/moreores/textures/moreores_tin_lump.png b/minetestforfun_game/mods/default/textures/default_tin_lump.png similarity index 100% rename from mods/moreores/textures/moreores_tin_lump.png rename to minetestforfun_game/mods/default/textures/default_tin_lump.png diff --git a/minetestforfun_game/mods/default/tools.lua b/minetestforfun_game/mods/default/tools.lua index bf3cafec..9adfd3fc 100755 --- a/minetestforfun_game/mods/default/tools.lua +++ b/minetestforfun_game/mods/default/tools.lua @@ -72,6 +72,19 @@ minetest.register_tool("default:pick_bronze", { damage_groups = {fleshy = 3}, }, }) +minetest.register_tool("default:pick_silver", { + description = "Silver Pickaxe", + inventory_image = "default_tool_silverpick.png", + tool_capabilities = { + full_punch_interval = 0.8, + max_drop_level = 3, + groupcaps = { + cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}, + crumbly = {times = {[1] = 1.75, [2] = 0.80, [3] = 0.65}, uses = 90, maxlevel= 2} + }, + damage_groups = {fleshy = 3}, + }, +}) minetest.register_tool("default:pick_gold", { description = "Golden Pickaxe", inventory_image = "default_tool_goldpick.png", @@ -98,6 +111,19 @@ minetest.register_tool("default:pick_mese", { damage_groups = {fleshy = 4}, }, }) +minetest.register_tool("default:pick_mithril", { + description = "Mithril Pickaxe", + inventory_image = "default_tool_mithrilpick.png", + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 3, + groupcaps = { + cracky = {times = {[1] = 1.50, [2] = 0.80, [3] = 0.35}, uses = 200, maxlevel= 3}, + crumbly = {times = {[1] = 1.00, [2] = 0.60, [3] = 0.25}, uses = 200, maxlevel= 3} + }, + damage_groups = {fleshy = 5}, + }, +}) minetest.register_tool("default:pick_nyan", { description = "Nyan Pickaxe", inventory_image = "default_tool_nyanpick.png", @@ -181,6 +207,19 @@ minetest.register_tool("default:shovel_bronze", { damage_groups = {fleshy = 3}, }, }) +minetest.register_tool("default:shovel_silver", { + description = "Silver Shovel", + inventory_image = "default_tool_silvershovel.png", + wield_image = "default_tool_silvershovel.png^[transformR90", + tool_capabilities = { + full_punch_interval = 0.8, + max_drop_level = 1, + groupcaps = { + crumbly = {times = {[1] = 1.50, [2] = 0.60, [3] = 0.35}, uses = 90, maxlevel= 2} + }, + damage_groups = {fleshy = 3}, + }, +}) minetest.register_tool("default:shovel_gold", { description = "Golden Shovel", inventory_image = "default_tool_goldshovel.png", @@ -207,6 +246,19 @@ minetest.register_tool("default:shovel_mese", { damage_groups = {fleshy = 4}, }, }) +minetest.register_tool("default:shovel_mithril", { + description = "Mithril Shovel", + inventory_image = "default_tool_mithrilshovel.png", + wield_image = "default_tool_mithrilshovel.png^[transformR90", + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 3, + groupcaps = { + crumbly = {times = {[1] = 0.75, [2] = 0.4, [3] = 0.17}, uses = 200, maxlevel= 3} + }, + damage_groups = {fleshy = 5}, + }, +}) minetest.register_tool("default:shovel_nyan", { description = "Nyan Shovel", inventory_image = "default_tool_nyanshovel.png", @@ -290,6 +342,19 @@ minetest.register_tool("default:axe_bronze", { damage_groups = {fleshy = 3}, }, }) +minetest.register_tool("default:axe_silver", { + description = "Silver Axe", + inventory_image = "default_tool_silveraxe.png", + tool_capabilities = { + full_punch_interval = 0.8, + max_drop_level = 1, + groupcaps = { + choppy = {times = {[1] = 3.30, [2] = 1.32, [3] = 0.77}, uses = 90, maxlevel= 2}, + fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1} + }, + damage_groups = {fleshy = 3}, + }, +}) minetest.register_tool("default:axe_gold", { description = "Golden Axe", inventory_image = "default_tool_goldaxe.png", @@ -316,6 +381,19 @@ minetest.register_tool("default:axe_mese", { damage_groups = {fleshy = 4}, }, }) +minetest.register_tool("default:axe_mithril", { + description = "Mithril Axe", + inventory_image = "default_tool_mithrilaxe.png", + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 1, + groupcaps = { + choppy = {times = {[1] = 1.65, [2] = 0.88, [3] = 0.39}, uses = 200, maxlevel= 3}, + fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} + }, + damage_groups = {fleshy = 5}, + }, +}) minetest.register_tool("default:axe_nyan", { description = "Nyan Axe", inventory_image = "default_tool_nyanaxe.png", @@ -395,6 +473,20 @@ minetest.register_tool("default:sword_bronze", { damage_groups = {fleshy = 5}, } }) +minetest.register_tool("default:sword_silver", { + description = "Silver Sword", + inventory_image = "default_tool_silversword.png", + tool_capabilities = { + full_punch_interval = 0.85, + max_drop_level = 1, + 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 = 40, maxlevel= 0} + }, + damage_groups = {fleshy = 5}, + } +}) minetest.register_tool("default:sword_gold", { description = "Golden Sword", inventory_image = "default_tool_goldsword.png", @@ -419,6 +511,20 @@ minetest.register_tool("default:sword_mese", { damage_groups = {fleshy = 6}, } }) +minetest.register_tool("default:sword_mithril", { + description = "Mithril Sword (Warrior)", + inventory_image = "default_tool_mithrilsword.png", + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 1, + 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} + }, + damage_groups = {fleshy = 9}, + } +}) minetest.register_tool("default:sword_nyan", { description = "Nyan Sword", inventory_image = "default_tool_nyansword.png", diff --git a/minetestforfun_game/mods/farming/hoes.lua b/minetestforfun_game/mods/farming/hoes.lua index 98144f2c..880985fc 100755 --- a/minetestforfun_game/mods/farming/hoes.lua +++ b/minetestforfun_game/mods/farming/hoes.lua @@ -151,6 +151,13 @@ farming.register_hoe(":farming:hoe_bronze", { material = "default:bronze_ingot" }) +farming.register_hoe(":farming:hoe_silver", { + description = "Silver Hoe", + inventory_image = "farming_tool_silverhoe.png", + max_uses = 300, + material = "moreores:silver_ingot" +}) + farming.register_hoe(":farming:hoe_mese", { description = "Mese Hoe", inventory_image = "farming_tool_mesehoe.png", @@ -163,4 +170,11 @@ farming.register_hoe(":farming:hoe_diamond", { inventory_image = "farming_tool_diamondhoe.png", max_uses = 500, material = "default:diamond" -}) \ No newline at end of file +}) + +farming.register_hoe(":farming:hoe_mithril", { + description = "Mithril Hoe", + inventory_image = "farming_tool_mithrilhoe.png", + max_uses = 1000, + material = "moreores:mithril_ingot" +}) diff --git a/mods/moreores/textures/moreores_tool_mithrilhoe.png b/minetestforfun_game/mods/farming/textures/farming_tool_mithrilhoe.png similarity index 100% rename from mods/moreores/textures/moreores_tool_mithrilhoe.png rename to minetestforfun_game/mods/farming/textures/farming_tool_mithrilhoe.png diff --git a/mods/moreores/textures/moreores_tool_silverhoe.png b/minetestforfun_game/mods/farming/textures/farming_tool_silverhoe.png similarity index 100% rename from mods/moreores/textures/moreores_tool_silverhoe.png rename to minetestforfun_game/mods/farming/textures/farming_tool_silverhoe.png diff --git a/mods/moreores/LICENSE.md b/mods/moreores/LICENSE.md deleted file mode 100755 index 45c5ff5a..00000000 --- a/mods/moreores/LICENSE.md +++ /dev/null @@ -1,14 +0,0 @@ -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/README.md b/mods/moreores/README.md deleted file mode 100755 index f54dda7b..00000000 --- a/mods/moreores/README.md +++ /dev/null @@ -1,11 +0,0 @@ -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/_config.txt b/mods/moreores/_config.txt deleted file mode 100644 index 7581de93..00000000 --- a/mods/moreores/_config.txt +++ /dev/null @@ -1,27 +0,0 @@ ------------------------------------------------------------------------------- ------------------------------- CONFIGURATION --------------------------------- ------------------------------------------------------------------------------- - ------------------------------------------------------------------------------- --------- Change settings by changing the values after the "=". --------------- ------------------------------------------------------------------------------- - --- Chunk sizes for ore generation (bigger = ore deposits are more scattered around) -moreores_tin_chunk_size = 7 -moreores_silver_chunk_size = 11 -moreores_mithril_chunk_size = 11 - --- Amount of ore per chunk (higher = bigger ore deposits) -moreores_tin_ore_per_chunk = 3 -moreores_silver_ore_per_chunk = 4 -moreores_mithril_ore_per_chunk = 1 - --- Minimal depths of ore generation (Y coordinate, 0 being sea level by default) -moreores_tin_min_depth = -31000 -moreores_silver_min_depth = -31000 -moreores_mithril_min_depth = -31000 - --- Maximal depths of ore generation (Y coordinate, 0 being sea level by default) -moreores_tin_max_depth = 12 -moreores_silver_max_depth = -12 -moreores_mithril_max_depth = -1024 diff --git a/mods/moreores/depends.txt b/mods/moreores/depends.txt deleted file mode 100755 index 02190529..00000000 --- a/mods/moreores/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -mg? diff --git a/mods/moreores/description.txt b/mods/moreores/description.txt deleted file mode 100644 index 6bd1c7cb..00000000 --- a/mods/moreores/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds new Ore types. diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua deleted file mode 100755 index 3d24b736..00000000 --- a/mods/moreores/init.lua +++ /dev/null @@ -1,380 +0,0 @@ ---[[ -===================================================================== -** 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 - S = intllib.Getter() -else - S = function(s) return s end -end - -local modpath = minetest.get_modpath("moreores") - -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: - if not pt then - return - end - if pt.type ~= "node" then - return - end - - local under = minetest.get_node(pt.under) - local pos = {x = pt.under.x, y = pt.under.y + 1, z = pt.under.z} - local above = minetest.get_node(pos) - - -- Return if any of the nodes is not registered: - if not minetest.registered_nodes[under.name] then return end - if not minetest.registered_nodes[above.name] then return end - - -- Check if the node above the pointed thing is air: - if above.name ~= "air" then return end - - -- Check if pointing at dirt: - if minetest.get_item_group(under.name, "soil") ~= 1 then return end - - -- Turn the node into soil, wear out item and play sound: - minetest.set_node(pt.under, {name ="farming:soil"}) - minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}) - itemstack:add_wear(65535 / (uses - 1)) - return itemstack -end - -local function get_recipe(c, name) - if name == "sword" then - return {{c}, {c}, {"group:stick"}} - end - if name == "shovel" then - return {{c}, {"group:stick"}, {"group:stick"}} - end - if name == "axe" then - return {{c, c}, {c, "group:stick"}, {"", "group:stick"}} - end - if name == "pick" then - return {{c, c, c}, {"", "group:stick", ""}, {"", "group:stick", ""}} - end - if name == "hoe" then - return {{c, c}, {"", "group:stick"}, {"", "group:stick"}} - end - if name == "block" then - return {{c, c, c}, {c, c, c}, {c, c, c}} - end - if name == "lockedchest" then - return {{"group:wood", "group:wood", "group:wood"}, {"group:wood", c, "group:wood"}, {"group:wood", "group:wood", "group:wood"}} - end -end - -local function add_ore(modname, description, mineral_name, oredef) - local img_base = modname .. "_" .. mineral_name - local toolimg_base = modname .. "_tool_"..mineral_name - local tool_base = modname .. ":" - local tool_post = "_" .. mineral_name - local item_base = tool_base .. mineral_name - local ingot = item_base .. "_ingot" - local lump_item = item_base .. "_lump" - local ingotcraft = ingot - - if oredef.makes.ore then - minetest.register_node(modname .. ":mineral_" .. mineral_name, { - description = S("%s Ore"):format(S(description)), - tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, - groups = {cracky = 3}, - sounds = default_stone_sounds, - drop = lump_item - }) - end - - if oredef.makes.block then - 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}, - sounds = default_stone_sounds - }) - minetest.register_alias(mineral_name.."_block", block_item) - if oredef.makes.ingot then - minetest.register_craft( { - output = block_item, - recipe = get_recipe(ingot, "block") - }) - minetest.register_craft( { - output = ingot .. " 9", - recipe = { - { block_item } - } - }) - end - end - - if oredef.makes.lump then - minetest.register_craftitem(lump_item, { - description = S("%s Lump"):format(S(description)), - inventory_image = img_base .. "_lump.png", - }) - minetest.register_alias(mineral_name .. "_lump", lump_item) - if oredef.makes.ingot then - minetest.register_craft({ - type = "cooking", - output = ingot, - recipe = lump_item - }) - end - end - - if oredef.makes.ingot then - minetest.register_craftitem(ingot, { - description = S("%s Ingot"):format(S(description)), - inventory_image = img_base .. "_ingot.png", - groups = {ingot = 1} - }) - minetest.register_alias(mineral_name .. "_ingot", ingot) - end - - if oredef.makes.chest then - minetest.register_craft( { - output = "default:chest_locked", - recipe = { - {ingot}, - {"default:chest"} - } - }) - minetest.register_craft( { - output = "default:chest_locked", - recipe = get_recipe(ingot, "lockedchest") - }) - end - - oredef.oredef.ore_type = "scatter" - oredef.oredef.ore = modname .. ":mineral_" .. mineral_name - oredef.oredef.wherein = "default:stone" - - minetest.register_ore(oredef.oredef) - - for tool_name, tooldef in pairs(oredef.tools) do - local tdef = { - description = "", - inventory_image = toolimg_base .. tool_name .. ".png", - tool_capabilities = { - max_drop_level = 3, - groupcaps = tooldef - } - } - - 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 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 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 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 tool_name == "hoe" then - tdef.description = S("%s Hoe"):format(S(description)) - local uses = tooldef.uses - tooldef.uses = nil - tdef.on_use = function(itemstack, user, pointed_thing) - return hoe_on_use(itemstack, user, pointed_thing, uses) - end - end - - 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 = fulltool_name, - recipe = get_recipe(ingot, tool_name) - }) - end - end -end - --- Add everything: -local modname = "moreores" - -local oredefs = { - 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, - clust_size = moreores_silver_chunk_size, - y_min = moreores_silver_min_depth, - y_max = moreores_silver_max_depth - }, - tools = { - pick = { - cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel= 1} - }, - hoe = { - uses = 300 - }, - shovel = { - crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1} - }, - axe = { - 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} - }, - sword = { - 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} - }, - }, - full_punch_interval = 1.0, - damage_groups = {fleshy = 6}, - }, - 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, - clust_size = moreores_tin_chunk_size, - y_min = moreores_tin_min_depth, - y_max = moreores_tin_max_depth - }, - tools = {}, - }, - 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, - clust_size = moreores_mithril_chunk_size, - y_min = moreores_mithril_min_depth, - y_max = moreores_mithril_max_depth - }, - tools = { - pick = { - cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel= 1} - }, - hoe = { - uses = 1000 - }, - shovel = { - crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1} - }, - axe = { - 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} - }, - sword = { - 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} - } - }, - full_punch_interval = 0.45, - damage_groups = {fleshy = 9}, - } -} - -for orename,def in pairs(oredefs) do - add_ore(modname, def.description, orename, def) -end - -dofile(modpath .. "/ores.lua") - ---[[ --- Copper rail (special node): -minetest.register_craft({ - output = "moreores:copper_rail 16", - recipe = { - {"default:copper_ingot", "", "default:copper_ingot"}, - {"default:copper_ingot", "group:stick", "default:copper_ingot"}, - {"default:copper_ingot", "", "default:copper_ingot"} - } -}) ---]] - --- Bronze has some special cases, because it is made from copper and tin: -minetest.register_craft( { - type = "shapeless", - output = "default:bronze_ingot 3", - recipe = { - "moreores:tin_ingot", - "default:copper_ingot", - "default:copper_ingot", - } -}) - ---[[ --- Unique node: -minetest.register_node("moreores:copper_rail", { - description = S("Copper Rail"), - drawtype = "raillike", - tiles = {"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", - sunlight_propagates = true, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - groups = {bendy = 2,snappy = 1,dig_immediate = 2,rail= 1, connect_to_raillike = 1}, - mesecons = { - effector = { - action_on = function(pos, node) - minetest.get_meta(pos):set_string("cart_acceleration", "0.5") - end, - - action_off = function(pos, node) - minetest.get_meta(pos):set_string("cart_acceleration", "0") - end, - }, - }, -}) ---]] - --- mg support: -if minetest.get_modpath("mg") then - dofile(moreores_modpath.."/mg.lua") -end - -if minetest.setting_getbool("log_mods") then - minetest.log("action", S("[moreores] loaded.")) -end - --- Sword overwrite -minetest.override_item("moreores:sword_mithril", {description = "Mithril Sword (Warrior)"}) - diff --git a/mods/moreores/locale/de.txt b/mods/moreores/locale/de.txt deleted file mode 100755 index 2eb60757..00000000 --- a/mods/moreores/locale/de.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Translation by Xanthin - -[moreores] loaded. = [moreores] geladen. - -%s Ore = %serz -%s Lump = %sklumpen -%s Ingot = %sbarren -%s Block = %sblock -%s Pickaxe = %sspitzhacke -%s Shovel = %sschaufel -%s Axe = %saxt -%s Sword = %sschwert -%s Hoe = %shacke - -Copper = Kupfer -Tin = Zinn -Bronze = Bronze -Silver = Silber -Gold = Gold -Mithril = Mithril - -Copper Rail = Kupferschiene diff --git a/mods/moreores/locale/es.txt b/mods/moreores/locale/es.txt deleted file mode 100755 index 1344a5a6..00000000 --- a/mods/moreores/locale/es.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Translation by kaeza - -[moreores] loaded. = [moreores] cargado. - -%s Ore = Mineral de %s -%s Lump = Pepita de %s -%s Ingot = Lingote de %s -%s Block = Bloque de %s -%s Pickaxe = Pico de %s -%s Shovel = Pala de %s -%s Axe = Hacha de %s -%s Sword = Espada de %s - -Copper = cobre -Tin = estaño -Bronze = bronce -Silver = plata -Gold = oro -Mithril = mitrilo - -Copper Rail = Riel de Cobre diff --git a/mods/moreores/locale/fr.txt b/mods/moreores/locale/fr.txt deleted file mode 100755 index 65687fa4..00000000 --- a/mods/moreores/locale/fr.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Translation by Calinou - -[moreores] loaded. = [moreores] a été chargé. - -%s Ore = Minerai en %s -%s Lump = Roche en %s -%s Ingot = Lingot en %s -%s Block = Bloc en %s -%s Pickaxe = Pioche en %s -%s Shovel = Pelle en %s -%s Axe = Hache en %s -%s Sword = Épée en %s - -Copper = cuivre -Tin = étain -Bronze = bronze -Silver = argent -Gold = or -Mithril = mithril - -Copper Rail = Rail en cuivre diff --git a/mods/moreores/locale/it.txt b/mods/moreores/locale/it.txt deleted file mode 100755 index dcd8c52a..00000000 --- a/mods/moreores/locale/it.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Translation by Pagliaccio - -[moreores] loaded. = [moreores] caricato. - -%s Ore = Minerale di %s -%s Lump = %s grezzo -%s Ingot = Lingotto di %s -%s Block = Blocco di %s -%s Pickaxe = Piccone di %s -%s Shovel = Badile di %s -%s Axe = Ascia di %s -%s Sword = Spada di %s - -Copper = Rame -Tin = Stagno -Bronze = Bronzo -Silver = Argento -Gold = Oro -Mithril = Mithril - -Copper Rail = Binario di rame \ No newline at end of file diff --git a/mods/moreores/locale/tr.txt b/mods/moreores/locale/tr.txt deleted file mode 100755 index 4f20286d..00000000 --- a/mods/moreores/locale/tr.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Translation by Mahmutelmas06 -# mahmutelmas06@hotmail.com -# Türkçe Çeviri -# Turkish translation -# Language 2 letter iso code is "tr" - -[moreores] loaded. = [moreores] yüklendi. - -%s Ore = %s madeni -%s Lump = %s yığını -%s Ingot = %s külçesi -%s Block = %s blok -%s Pickaxe = %s kazma -%s Shovel = %s kürek -%s Axe = %s balta -%s Sword = %s kılıç - -Copper = Bakır -Tin = Kalay -Bronze = Bronz -Silver = Gümüş -Gold = Altın -Mithril = Mithril - -Copper Rail = Bakır ray diff --git a/mods/moreores/mg.lua b/mods/moreores/mg.lua deleted file mode 100755 index e323b747..00000000 --- a/mods/moreores/mg.lua +++ /dev/null @@ -1,53 +0,0 @@ ---[[ -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", - seeddiff = 8, - maxvdistance = 10.5, - maxheight = 8, - seglenghtn = 15, - seglenghtdev = 6, - segincln = 0, - segincldev = 0.6, - turnangle = 57, - forkturnangle = 57, - numperblock = 2 -}) - -mg.register_ore({ - name = "moreores:mineral_silver", - wherein = "default:stone", - seeddiff = 9, - maxvdistance = 10.5, - maxheight = -2, - seglenghtn = 15, - seglenghtdev = 6, - sizen = 60, - sizedev = 30, - segincln = 0, - segincldev = 0.6, - turnangle = 57, - forkturnangle = 57, - numperblock = 2 -}) - -mg.register_ore({ - name = "moreores:mineral_mithril", - wherein = "default:stone", - seeddiff = 10, - maxvdistance = 10.5, - maxheight = -512, - seglenghtn = 2, - seglenghtdev = 4, - sizen = 12, - sizedev = 5, - segincln = 0, - segincldev = 0.6, - turnangle = 57, -}) diff --git a/mods/moreores/mod.conf b/mods/moreores/mod.conf deleted file mode 100644 index 5a9f1e27..00000000 --- a/mods/moreores/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = moreores diff --git a/mods/moreores/ores.lua b/mods/moreores/ores.lua deleted file mode 100755 index 84c56505..00000000 --- a/mods/moreores/ores.lua +++ /dev/null @@ -1,34 +0,0 @@ --- Register ores - -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_mithril", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 2, - clust_size = 3, - y_min = -31000, - y_max = -2048, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_mithril", - wherein = "default:stone", - clust_scarcity = 22 * 22 * 22, - clust_num_ores = 5, - clust_size = 5, - y_min = -31000, - y_max = -4096, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_mithril", - wherein = "default:stone", - clust_scarcity = 28 * 28 * 28, - clust_num_ores = 20, - clust_size = 7, - y_min = -31000, - y_max = -12288, -}) diff --git a/mods/moreores/textures/moreores_bronze_block.png b/mods/moreores/textures/moreores_bronze_block.png deleted file mode 100755 index 710c49a4c76612ce7774b894369d0e0e959f5843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmV-$0gwKPP)mxqD~k83#ngu|Kjmc3Tw-+?_x~O=d2tV$ugX2k$Ho;9eC2xMN~t=?Eb- zN!wQ(TPyBd-QUCX=b^E)20juYOo)$rvgTDWS8VY!-rv6 zFvE%vhE0(S2ND==gs1ECw=TQzOG%mA}pNMe{H_^ z%ZhumRCHRjpH1{@oGGCA+3UgkH7&J|WwSaHUUB|C$EzU2yx`iT;#8oq44$rjF6*2U FngAmBN__wT diff --git a/mods/moreores/textures/moreores_copper_block.png b/mods/moreores/textures/moreores_copper_block.png deleted file mode 100755 index bb97a38b7aaff58fc6612fe321e926ca2f783ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf#sHrX*JNL_6kqccKl4<7^E7{p zv;d3r0L#oEtE?caoDl20P@B9k+k$Z0!f?C72)m+4`(hx9vM-5pD2;X~i*_uFaV(E@ ztcZ20jB~Dvckapc?alM+&-a^9;6JG_U{X=Ql;XgtB|+0lgQk}T&nN?;keTHnvw)}~ zbarLvoXW7dRblh0!{-B0O~itlh(&dgi|eD7)JH9C0HWySO+Xa0qB&+|bL^^?*ww9Z z?JEV(03Cnc)5S4FLX!1hw^NgY0PBUu4Nu$`RJiC!4Sz$N#+F7TAu0~x=mb9yrTpc5`#c0B1Ih)nX9+mMr`M%zfYI^DP z-7B$emlKUL{1;E3^FHl(=i1)rPpc=eue!P_mc=`H@@cktzNw5EInRIU81sl_nn^Gy q2=BkQ=bU`_(ZA8pu5C{J$3H1sJ?%^1&X+*1F?hQAxvXEj(aYnDuj_p`18Qb0 z3GxeOaCmkj4akY~ba4!+xHb3OX}$&p9+yD&##4v4{rWGTEtte(y?3|q%SET#8#-5M z$BEeTCnijAUHib;YNo47%N*f@ZLgR=pY6?Y(As*;;s#$w(9OFE+_^=XWp>-vcdS@O1TaS?83{1OO%AT|58) diff --git a/mods/moreores/textures/moreores_copper_lump.png b/mods/moreores/textures/moreores_copper_lump.png deleted file mode 100755 index 3e5282f24eeef502bb7417f7cd163de59a897c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`E0B(K(TjCANb@soN_K8f zcbk~!HM=ZeQFZXr+K?3u;j5aXSGUBhX^UUmp0IgB&bFz=yJuJJo!@X^aqBN(TMM9m z#*!evUGX%9`zx=P?D&hI{7U%St45v+=ht|hs zYpd4(J+Vs4%|q#q`i}RLcs_10^xni;;oOtMUf9B}6!BM6P_bcW^Np)DUDB<`nEJ}^ Sg?|B>&fw|l=d#Wzp$Py6Jy3N3 diff --git a/mods/moreores/textures/moreores_copper_rail.png b/mods/moreores/textures/moreores_copper_rail.png deleted file mode 100755 index 73963f629f9bf6ff7a8ef6ac3febbb3240d9f6c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf?Es$;S0EkZD3RhWo#G*t=_Q@% zC6nbXljS3m?IV-xE0gOdo98E+?+-+B1^%)H0dj?228BQ}P_8IIt|(BhI7q%ESgs^k zzBE|AEJVIMRK6lqzA_Am6sp1%s>2oPqZJ#Xl^SA{8l#oklC?Wib-L4aCuHeQ%+{Zr zYcLgv@(iZs1Cim3LZg{QMzesZ*l2dK@thK)IVHw(ON{520+GqWGLuE+ri&|0msFT8 zsWe+!WwyN9d_}GK${O?4br$OzEjKh#K(q^@--Fkbw&BZlSRzEKa0eX+IB*-tA z!Qt7BG$5zL)5S4FBD}Z9Rp<}{!x6Fa2#uq$-O=5<-~Eq2(i*M*WX4REh7NfVh8maC zc5n2)ZE?)1)kk6r(U>8 zPUqg^(D_9SDo1xnc5Uf)>-zNn>x}O2i!bk?3Bvlb2T^%Z29VSx~CS4OQ zQwKy5GTmvq-5I()>ADlL^(SWQPsufymS;G7ojg#TBMYDuKvsX_eWsD$`|EX3J~LR@RxXsxx0xZ*g(Wl*wmnM1XE( zED7=pW^j0RBMr#u@^odjdB10 diff --git a/mods/moreores/textures/moreores_copper_rail_curved.png b/mods/moreores/textures/moreores_copper_rail_curved.png deleted file mode 100755 index 6cfc8c2dc2c1e5f698f08e32fdd1f2de3c9e6722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS0J6?C6nzVlj93Svbnx8 zd496_{;~xDKqOb_Wl$I>TNEHy6ew35BwrFNUm7e|79w8}3PcLkkt(&3ighunbuntq zvC7Ty>MaTCEs5IgNgACgn!V|oy_tFwvh^os>rcu7B7>><1~UqcW)&IDE;gQ1Vm!CR zcz&tL{4(Q(<)(|uO%_#{E&-xSv*k7BD{9PF*O{-Wvslw$adFL*uBz>(K!-Ax1o;Is zI6S+N2ISOxx;TbNNU|PeS7K&lU^x(YxX7hb&&8$p+`s>sAO#1mN;4!}*~XADnZ;o? zPjSQJezi4qOg+*w?l75%?=SeqV6ttwan4<4-rvv9zd7f?+^){uChey$y}`V8`@RPY zen#&*R8Tv8fuvgYef@ZurLN7rQ_s#nUXtF)Cc*o1a=oq=j~=`1heDuD44$rjF6*2U FngIDrfuR5Z diff --git a/mods/moreores/textures/moreores_copper_rail_t_junction.png b/mods/moreores/textures/moreores_copper_rail_t_junction.png deleted file mode 100755 index 57759193a2798bebe1899827ad4e43f53668b652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf`~aU2S0J74DV^aZlj$v!<0F&f zE0gOhljkR!4@Ca51p#t}UIv9gGElZCP_8&gz9d+_G+3@IM7|;vh!iTr6sjXtY9kfv zVpQv5)as*^n&Z`564ZOsHT$#lCT8nT$}yOnYcM6(U|PQ6^nAk^1%@*Ujb;}c&nYpU zTVgz~#CU$G$^0_oh2^G8DomHxn6IcYUtMRurp{tbgT=))Q~qt}*$i|dV@Z%-FoVOh z8)-mJtEY=&h(vhkxlo})3?j}KyS*3e2)+}$>HpS`7pEQiZS#2&XM*5-o`UV$mOstf zI4}Q+b(06b9h;obPgi&>IQU^Qn}5(?4+gY#gW+KOZThd80UPRf3TV8#IoaJ2dH%H(UazI z>qCRZ@{B*9e1a9uhZ=jPTf}WnX&$RCeBa+1u@K9!R9+$(qt|Ki!NI-x+$v>&MI<#! zLZ&UdWoq{X!4*@L#1gC8n|gf*f=&Jn_&GJH;Yel ze^P|9iFV6H&Pmi=pu{7^=4z95HetCl?VUO$0i_UQgt=v;c6AvyRt{T~vX#iD#{PGI zxs+ieU9G2JLaPfkcjfft@A5RH`?GX{X4(b`jXZS2m}STH>H|6n!Wwo07O1-xNhh60 zv#_rH_bak#C~e$1PHHv*5&00YLF)lXpdJA6(cL}^s%vl(Oj5zG5GrVJB_u&MLT~^< zJ?e9e?u_}%mou@*x-c!c704j0;Y-*)f&&o{pbfMJEUL2Rei52A-v5Je3ylaBOdI|d zV5q`7*dEsZ;jcfDjKPNFVpg%mv*+Lh*^e+5!6D5NcVG(;k~W4<@ykzO!D8*{%^xp` zYhz?pZZ9uB-Wfe!F0a9MTXQeFoi33ke%S4-nwH=!hR**rOfczNHXHZ=0000bXaN*>pm9J8irDnPw*(t%iuq8+K^U+o>2M^2Y`;q(|PEo$; lvROund3!GZUi;|3HKR}%b7RusECZlD44$rjF6*2UngHOYV2J<# diff --git a/mods/moreores/textures/moreores_gold_lump.png b/mods/moreores/textures/moreores_gold_lump.png deleted file mode 100755 index 9f79149b42584b8e5c756d6626c811296e4b423d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rJgR1Ar_~T6D0OMIBeSX-@s?v zv-I>p!^m0kb6g&DSF`>TPG#71?DlaM#V>*!((4sZ%(A~DaIEX2R6~xj5A%&@$~*;U zkDEO8(A7&%96_RWlGF75JUtnfP XQM{V3w^?^F&;bmdu6{1-oD!M8W4$S;_|;n|HeAjibh#WAFUG5G-342e#G)TFe8gv68}8g@cTnP*ed~Rznf9x%yjlsg Omci52&t;ucLK6T~QB%SI diff --git a/mods/moreores/textures/moreores_tool_bronzepick.png b/mods/moreores/textures/moreores_tool_bronzepick.png deleted file mode 100755 index 8f26d0b51ec1cc2650c3c0ed4f81f6d5875db01a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyiUB?$u0UEtj@#2rG{aA>+?t^? zUA^C(VTKRGfdq!zISl_NC>-13)DKj|SQ6wH%;50sMjDVa&C|s(q=Iqoq>EgK4S1NR zyJSB4_n&>eo^W!HadOqwLN8zW{jTL+kM<~Cb#V!i%6y-2?8NMs4KrRYUaVStM54Ft zTGa8SnO6hD-Yov{%r3uu$Nb>#M!RDP$z0V0B%44a6tfaLI89_0Cq$GdPe|z zUod<~0DNFEequ9!V>EzD0D*mPf=d8{gnEQc0EC2kgoSv9P5_CFgo%xXickQIQ2>ro z0FYDwkdlazl8BO30Fsl4lb4N@Rsfclizq90HkOWrKg{#sh_E(?RvG3DQe#wKNe_US5eKWw_T>e&50$fT@qws-j zMtTuyD&Rijc$k?gxIcC-Ftxw~?&gWhj5)g<@Z5GPo8Uq~dufY##tf4Hz9KA}FdcMZ z2^`_vi~+8v9HJz~Ikd-yL(~{GFyI#db3*kYU)^}V`F@Y9m<;>BKeM;H^YL>YB~jn?xuo{sjX?iuSY}S zN`wk$0e=`7tS&`hFX^$mt_s+fzurPMMF_6p^{Kxe1yozrJ5i2;Dk~`t;$N)LGVt?s RfVKbt002ovPDHLkV1h|}IS&8; diff --git a/mods/moreores/textures/moreores_tool_goldaxe.png b/mods/moreores/textures/moreores_tool_goldaxe.png deleted file mode 100755 index 970d118cdb6bf49df169b2052bc034bc12e62d12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy(g8jpuK)l4*O243wN>#n6V33G z>r7YQvOxCsVYSESgVJ|7&ju=EED7=pW^j0RBMr#O_jGX#sbJiC!I6*2kjFXjm6ghO zd&3<eQ}w;`}iiz*8O?K&fpO9?#*Gl R`G8h4c)I$ztaD0e0sxm>RZ{=} diff --git a/mods/moreores/textures/moreores_tool_goldpick.png b/mods/moreores/textures/moreores_tool_goldpick.png deleted file mode 100755 index 456a3373b6c186b9214a47120e5c3ef3ec0287b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyiUB?$u0UEtj@#2rG{aA>GhKaR zlk}RI(pwkFpW32$_n5)+t9ol2e&qlaF_r}R1v5B2yO9RuO!IVc45?t8JLxUgAqN5G zz5TCKfB)mp*)HLdB4$``?6b~We!pwE*P}g3S6y5}q%z+p96K@lWy6e@ix;aFACc&7 zyB2kPY39|yus4f;JhRJh-!VV9yV34g4(o;VefEt4KR^Gi3{T8w_!ck!y7&Fx9?=Ke zoh}@1`|kPhFaHCPpMRyfs+qUsI|0!Pb4J@c?F{?*FW>n;UHyD58-w1pj%Pp@GI+ZB KxvXWP)Cc?h9jzn7OsN;u8AG5g#fUMIJ1Z~w1@z-iwU%n5w(dmwUi;Xl`OTHB)E(= zxR4pRkUO}S5xAQrxSc<^pA)#B8@Qq@x{eFGjsUxn0K1V1yQ?a|kubuzTEmkt!k%9t_Am@>-B%Fenh(9qD)odD9HHPgN>)5Q+ep*7Z|F4v+k*Q6}iq5#;? zGTNst+|4oJ<9y<+8{@4Wgww3!x-(;d+pdW z?co^h^|@9?+qx;gORukiil^xP`;z&-c9A@{yI_x$+!<$U`3`uq0Q{PZ~d z{QCU=J^cUu{r@)p{{H^|J^#f_|Hnc9&^Z6sNB`J5|K2YD>5>2IRR8Qh|MRc^^R@r< zvH$e8|Mb59_QwDBIsf|G|NA`u`{n=r#sB^F|Nj2}{|Nv8KL7uR|Nqqg|Kb1t;{X5t z|Ns9+?pKxo0004WQchC6h@~6hv4q+?hNiuAvndQ zcyJe59Qyre8ctay?|qxhIrrXdo?v%#cfsLj$6jJ6C)^{sB80}Px9Dl$e(-?y)Noqx zxG|8K&h%Tb=T;_=7+)Bv&S3g)jMrvG(Y*&Jz1d6;oUa$fkoe#SXUnBb|AOnyjslvy zae7?B^bTxHbQW{>8SZ))rs=xx;k{4Oldupp{r^7ASHenwG>o0M?z(MZwFRlfc>!DgZ;*r#Y(&QI zyOF_QB7?VH3!KUf#LnE#;k_T(ov{ARepulR*GK|Nvliw92X8Tln0^%<7zPfDgmX@Nq()78&qol`;+ E0BH1fL;wH) diff --git a/mods/moreores/textures/moreores_tool_mithrilshovel.png b/mods/moreores/textures/moreores_tool_mithrilshovel.png deleted file mode 100755 index 4f2fcb99b4ca40ba363d5feea45890d85664459f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dymH|E?u0WbW)Sf{)m_fTyLyp_i zOf%XhZ-u!z-{&Vd+X61L@*T1(;U-WHfc~#Z@WSRT^G0*p{`X2t1|2dPN&-xa9@5YQ0 a|F_()_6Q`!JjiSYx!BXy&t;ucLK6Txs&d2t diff --git a/mods/moreores/textures/moreores_tool_mithrilsword.png b/mods/moreores/textures/moreores_tool_mithrilsword.png deleted file mode 100644 index 0c03d7bb187d79120230f19f10c31e10b7789297..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 856 zcmV-e1E>6nP)8cESLx`p9n6Y2rr`uFsBJJt_d@+ z2{W<@HMj~ly$U$N3OK_GImHS&#|k^o3o)7tJ=6<7+6zD23qalsGnfoQB$uWM_u zZEdn{ZnJT5xO{xMeSN!ufxLo(z>12&i;KjPlE;^q%b%asv9aC1zv0Kn=ErqI3+ zmG$#7%~(3mcP_uF63E1o!~SUZ5`tuZ;5F!aq^(_WU>*M^yUB2yZZ&YDfM zKQnEt3$?>qxq$ThdWat&H9MP1b=I#ZhClVYH-LY7{d3aty iEfZa`va~qYt^WpSxJw>c!rM;(0000=sdT1rYaLZWumh!^AT$jQfEx8X#^1Nltmj3bQ+=iQCVJ{l%9-n=+ z;bQuYPaZjUd7gIe_5as=?{202hEjd;@1D>9)j!|&>GSuUbMHK7e5$qiPlVi;C(Kt% T=Hy=oTFv0;>gTe~DWM4fB0OEP diff --git a/mods/moreores/textures/moreores_tool_silverpick.png b/mods/moreores/textures/moreores_tool_silverpick.png deleted file mode 100755 index 283bf797639bed95a9c1891fad9600e2403030fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyDgizru0UEtj@#2rG{aA>GhKbw ztXWH!E?u^4*@g`pjvYJp^5x6_|NpPLF5?MQ$5;~N7tG-B>_!@pGsDxxF{FZV?xfsR zhYbXn=i5(7&wp2cKh4=yGj&?f->U{i)Be!PC{xWt~$(69B_dZmIwP diff --git a/mods/moreores/textures/moreores_tool_silvershovel.png b/mods/moreores/textures/moreores_tool_silvershovel.png deleted file mode 100755 index 447feebff3a206fba8148f065d97bebd4a0046d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy(g8jpu8NEd8gkq&E-s#Cq8Wa2 zo$2Za4<5X6?9GUa2(;_}Nk zZ$?|qIee$R_Wxw&L&j(S3%&b)Y-d4pg!bbw{m);SQykv@I}5am!PC{xWt~$(698y| BQndg8 diff --git a/mods/moreores/textures/moreores_tool_silversword.png b/mods/moreores/textures/moreores_tool_silversword.png deleted file mode 100755 index 64dfb25aa59c55ad1ea6b98434095e5c2dec309b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmV<60U!Q}P)@&SYinzDer-V)c|;O({)z#M4*4WwE+S=OO+}z&Y-{9Zi;o;%# z?(XyR^Y-@k_xJbv`}_a@|B1*VGynhq19VbOQvd-14P%tE0002nNkl4FXHUqn$Na6emtY+CS~D{(SeAR7%=w+#aCC~?P diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt index c8fb33fc..bae13060 100755 --- a/worlds/minetestforfun/world.mt +++ b/worlds/minetestforfun/world.mt @@ -3,7 +3,6 @@ backend = redis redis_hash = IGNORED redis_address = localhost -load_mod_moreores = true load_mod_darkage = true load_mod_quartz = true load_mod_moreblocks = true