diff --git a/mods/i3/etc/compress.lua b/mods/i3/etc/compress.lua index c30c7ad..d94fed0 100644 --- a/mods/i3/etc/compress.lua +++ b/mods/i3/etc/compress.lua @@ -4,12 +4,8 @@ local wood_types = { "acacia_wood", "aspen_wood", "junglewood", "pine_wood", } -local material_tools = { - "bronze", "diamond", "mese", "stone", "wood", -} - local material_armor = { - "bronze", "diamond", "mese", "stone", "wood", "cactus", "gold", + "bronze", "diamond", "mese", "stone", "wood", "cactus", "gold", "mithril" } local material_stairs = { @@ -70,7 +66,8 @@ local to_compress = { by = { "acacia_sapling", "aspen_sapling", - "jungle_sapling", + "junglesapling", + "emergent_jungle_sapling", "pine_sapling", "bush_sapling", "acacia_bush_sapling", @@ -95,6 +92,8 @@ local to_compress = { "default:iron", "default:gold", "default:tin", + "moreores:silver_lump", + "moreores:mithril_lump", "nether:nether_lump", }, }, @@ -106,9 +105,115 @@ local to_compress = { "default:gold", "default:tin", "default:bronze", + "moreores:silver", + "moreores:mithril", "nether:nether", + "basic_materials:brass", }, }, + + ["default:steelblock"] = { + replace = "default:steel", + by = { + "default:copper", + "default:gold", + "default:tin", + "default:bronze", + "default:diamond", + "moreores:silver", + "moreores:mithril", + "basic_materials:brass_", + }, + }, + + ["basic_materials:chain_brass"] = { + replace = "basic_materials:chain_brass", + by = { + "basic_materials:chain", + "basic_materials:chainlink_brass", + "basic_materials:chainlink_steel", + "basic_materials:chain_steel", + "basic_materials:chain_brass_top", + "homedecor:chains", + "homedecor:chain_steel_top", + } + }, + + ["basic_materials:copper_wire"] = { + replace = "copper_wire", + by = { + "empty_spool", + "gold_wire", + "silver_wire", + "steel_wire", + } + }, + + ["basic_materials:gear_steel"] = { + replace = "gear_steel", + by = { + "cement_block", + "concrete_block", + "copper_strip", + "energy_crystal", + "heating_element", + "ic", + "motor", + "padlock", + "paraffin", + "plastic_sheet", + "plastic_strip", + "silicon", + "steel_bar", + "steel_strip", + "energy_crystal_simple" + }, + }, + + ["bell:bell"] = { + replace = ":bell", + by = {":bell_small"}, + }, + + ["bike:bike"] = { + replace = ":bike", + by = { + ":handles", + ":wheel", + }, + }, + + ["beds:bed_bottom"] = { + replace = "beds:bed_bottom" + by = { + "beds:bed_bottom", + "homedecor:bed_kingsize", + "homedecor:bed_regular", + } + } + + ["homedecor:fence_picket"] = { + replace = "fence_picket", + by = { + "fence_picket_corner", + "gate_picket_closed", + "fence_picket_white", + "fence_picket_corner_white", + "gate_picket_white_closed", + "fence_chainlink", + "fence_chainlink_corner", + "gate_chainlink_closed", + "fence_barbed_wire", + "fence_barbed_wire_corner", + "gate_barbed_wire_closed", + "fence_privacy", + "fence_privacy_corner", + "fence_wrought_iron_2", + "fence_wrought_iron_2_corner", + "fence_wrought_iron", + "fence_brass", + } + }, ["default:stone_with_coal"] = { replace = "coal", @@ -162,7 +267,7 @@ local to_compress = { }, }, - ["defuault:permafrost"] = { + ["default:permafrost"] = { replace = "frost", by = { "frost_with_moss", @@ -201,8 +306,34 @@ local to_compress = { "doors:door_glass", "doors:door_steel", "doors:door_obsidian_glass", + "doors:homedecor_basic_panel", + "doors:homedecor_carolina", + "doors:homedecor_closet_mahogany", + "doors:homedecor_closet_oak", + "doors:homedecor_exterior_fancy", + "doors:homedecor_french_mahogany", + "doors:homedecor_french_oak", + "doors:homedecor_french_white", + "doors:homedecor_woodglass", + "doors:homedecor_wood_plain", + "doors:homedecor_wrought_iron", + "homedecor:door_japanese_closed", + "travelnet:elevator_door_glass_closed", + "travelnet:elevator_door_steel_closed", + "travelnet:elevator_door_tin_closed", + "homedecor:gate_healf_door_closed", + "homedecor:gate_healf_door_white_closed", "castle_gates:oak_door", "castle_gates:jail_door", + "xpanes:door_steel_bar", + }, + }, + + ["doors:trapdoor"] = { + replace = "doors:trapdoor", + by = { + "doors:trapdoor_steel", + "xpanes:trapdoor_steel_bar", }, }, @@ -298,28 +429,68 @@ local to_compress = { }, ["default:axe_steel"] = { - replace = "steel", - by = material_tools + replace = "default:axe_steel", + by = { + "default:axe_bronze", + "default:axe_diamond", + "default:axe_mese", + "default:axe_stone", + "default:axe_wood", + "moreores:axe_silver", + "moreores:axe_mithril", + } }, ["default:pick_steel"] = { - replace = "steel", - by = material_tools + replace = "default:pick_steel", + by = { + "default:pick_bronze", + "default:pick_diamond", + "default:pick_mese", + "default:pick_stone", + "default:pick_wood", + "moreores:pick_silver", + "moreores:pick_mithril", + } }, ["default:shovel_steel"] = { - replace = "steel", - by = material_tools + replace = "default:shovel_steel", + by = { + "default:shovel_bronze", + "default:shovel_diamond", + "default:shovel_mese", + "default:shovel_stone", + "default:shovel_wood", + "moreores:shovel_silver", + "moreores:shovel_mithril", + } }, ["default:sword_steel"] = { - replace = "steel", - by = material_tools + replace = "default:sword_steel", + by = { + "default:sword_bronze", + "default:sword_diamond", + "default:sword_mese", + "default:sword_stone", + "default:sword_wood", + "moreores:sword_silver", + "moreores:sword_mithril", + } }, ["farming:hoe_steel"] = { - replace = "steel", - by = {"wood", "stone"} + replace = "farming:hoe_steel", + by = { + "farming:hoe_bronze", + "farming:hoe_diamond", + "farming:hoe_mese", + "farming:hoe_stone", + "farming:hoe_wood", + "moreores:hoe_silver", + "moreores:hoe_mithril", + } }, ["flowers:chrysanthemum_green"] = { @@ -479,7 +650,7 @@ local to_compress = { ["bonemeal:bonemeal"] = { replace = ":bonemeal", - by = {"fertilizer","mulch"}, + by = {":fertiliser",":mulch"}, }, ["cartographer:simple_table"] = { @@ -522,11 +693,11 @@ local to_compress = { }, ["caverealms:glow_emerald_ore"] = { - replace = "emerald", + replace = "emerald_ore", by = { - "amethyst", - "crystal", - "ruby", + "amethyst_ore", + "ore", --crystal + "ruby_ore", }, }, @@ -547,6 +718,47 @@ local to_compress = { "gem_poison", } }, + + ["falls:basin"] = { + replace = "basin", + by = { + "lava_basin", + "basin_inv", + "lava_basin_inv", + } + }, + + ["falls:basin"] = { + replace = "basin", + by = { + "lava_basin", + "basin_inv", + "lava_basin_inv", + } + }, + + ["falls:bucket_turbulent"] = { + replace = "bucket", + by = { + "lava", + } + }, + + ["falls:fountain"] = { + replace = "fountain", + by = { + "lava_fountain", + } + }, + + ["falls:waterfall_block"] = { + replace = "waterfall_block", + by = { + "lavafall_block", + "waterfall_block_inv", + "lavafall_block_inv", + } + }, } local circular_saw_names = { diff --git a/mods/moreores/.editorconfig b/mods/moreores/.editorconfig new file mode 100644 index 0000000..a41c697 --- /dev/null +++ b/mods/moreores/.editorconfig @@ -0,0 +1,13 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{lua,luacheckrc}] +indent_style = tab +indent_size = 4 diff --git a/mods/moreores/.gitignore b/mods/moreores/.gitignore new file mode 100644 index 0000000..8b38e58 --- /dev/null +++ b/mods/moreores/.gitignore @@ -0,0 +1,3 @@ +## Generic ignorable patterns and files +*~ +debug.txt diff --git a/mods/moreores/.luacheckrc b/mods/moreores/.luacheckrc new file mode 100644 index 0000000..16e7350 --- /dev/null +++ b/mods/moreores/.luacheckrc @@ -0,0 +1,33 @@ +std = "lua51+minetest" +unused_args = false +allow_defined_top = true +max_line_length = 90 + +stds.minetest = { + read_globals = { + "DIR_DELIM", + "minetest", + "core", + "dump", + "vector", + "nodeupdate", + "VoxelManip", + "VoxelArea", + "PseudoRandom", + "ItemStack", + "default", + table = { + fields = { + "copy", + }, + }, + } +} + +read_globals = { + "carts", + "farming", + "frame", + "mg", + "toolranks", +} diff --git a/mods/moreores/.pre-commit-config.yaml b/mods/moreores/.pre-commit-config.yaml new file mode 100644 index 0000000..2ac726e --- /dev/null +++ b/mods/moreores/.pre-commit-config.yaml @@ -0,0 +1,15 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.3.0 + hooks: + - id: fix-byte-order-marker + - id: end-of-file-fixer + - id: trailing-whitespace + + - id: mixed-line-ending + args: [--fix=lf] + + - repo: https://github.com/Calinou/pre-commit-luacheck + rev: v1.0.0 + hooks: + - id: luacheck diff --git a/mods/moreores/.travis.yml b/mods/moreores/.travis.yml new file mode 100644 index 0000000..32a776a --- /dev/null +++ b/mods/moreores/.travis.yml @@ -0,0 +1,16 @@ +dist: bionic +language: python + +python: + - 3.7.1 + +install: + - sudo apt-get update -qq + - sudo apt-get install -qqq luarocks + - pip3 install pre-commit + - luarocks install --local luacheck + +script: + # All linters are run with pre-commit hooks + - export PATH="$HOME/.luarocks/bin:$PATH" + - pre-commit run --all-files diff --git a/mods/moreores/CHANGELOG.md b/mods/moreores/CHANGELOG.md new file mode 100644 index 0000000..d57c03a --- /dev/null +++ b/mods/moreores/CHANGELOG.md @@ -0,0 +1,69 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +## [2.1.0] - 2021-06-28 + +### Added + +- More Ores tools now have [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) support. +- Hungarian translation. + +### Changed + +- Migrated translations to the + [Minetest translation file format](https://rubenwardy.com/minetest_modding_book/lua_api.html#translation-file-format). + +## [2.0.0] - 2019-11-25 + +### Added + +- More Ores nodes/items/tools can now be placed in item frames + from the [`frame`](https://github.com/minetest-mods/frame) mod. +- Polish translation. + +### Changed + +- The minimum supported Minetest version is now 5.0.0. +- Copper rails are now registered using functions from the `carts` mod, + making them interoperate seamlessly with default rails. + - Copper rails can no longer be placed in the air. + +## [1.1.0] - 2019-03-23 + +### Added + +- Brazilian and Dutch translations. + +### Changed + +- Ores are now slower to mine and cannot be mined using wooden tools anymore. +- Updated intllib support to avoid using deprecated functions. + +### Deprecated + +- Deprecated hoes to follow Minetest Game's deprecation of hoes + made of "rare" materials. + - Hoes are still available in existing worlds, but they + cannot be crafted anymore. + +### Fixed + +- Hoes now use the `farming` mod's handling function and can no longer + turn desert sand into dirt. +- Handle tin which is now included in [Minetest Game](https://github.com/minetest/minetest_game). + If it is detected, then the tin nodes and items from More Ores won't be registered. + +## 1.0.0 - 2017-02-19 + +- Initial versioned release. + +[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.1.0...HEAD +[2.1.0]: https://github.com/minetest-mods/moreores/compare/v2.0.0...v2.1.0 +[2.0.0]: https://github.com/minetest-mods/moreores/compare/v1.1.0...v2.0.0 +[1.1.0]: https://github.com/minetest-mods/moreores/compare/v1.0.0...v1.1.0 diff --git a/mods/moreores/CONTRIBUTING.md b/mods/moreores/CONTRIBUTING.md new file mode 100644 index 0000000..e2a55fa --- /dev/null +++ b/mods/moreores/CONTRIBUTING.md @@ -0,0 +1,10 @@ +# Contributing to More Ores + +Thank you for your interest in More Ores! Before contributing, +be sure to know about these few guidelines: + +- Contributions have to be licensed under the zlib license (or compatible) + for code, and CC BY-SA 3.0 (or compatible) for assets. +- Make sure to update the changelog, keeping the + [changelog format](http://keepachangelog.com/en/1.0.0/) we use. +- Don't bump the version yourself. Maintainers will do this when necessary. diff --git a/mods/moreores/LICENSE.md b/mods/moreores/LICENSE.md new file mode 100644 index 0000000..67f5f7f --- /dev/null +++ b/mods/moreores/LICENSE.md @@ -0,0 +1,13 @@ +# zlib license + +Copyright © 2011-2020 Hugo Locurcio 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 new file mode 100644 index 0000000..3bb1cba --- /dev/null +++ b/mods/moreores/README.md @@ -0,0 +1,72 @@ +# More Ores + +More Ores for [Minetest](https://www.minetest.net/), a free and open source infinite +world block sandbox game. + +[**Forum topic**](https://forum.minetest.net/viewtopic.php?f=11&t=549) + +## Installation + +### Download the mod + +To install More Ores, clone this Git repository into your Minetest's `mods/` +directory: + +```bash +git clone https://github.com/minetest-mods/moreores.git +``` + +You can also +[download a ZIP archive](https://github.com/minetest-mods/moreores/archive/master.zip) +of More Ores. + +### Enable the mod + +Once you have installed More Ores, you need to enable it in Minetest. +The procedure is as follows: + +#### Using the client's main menu + +This is the easiest way to enable More Ores when playing in singleplayer +(or on a server hosted from a client). + +1. Start Minetest and switch to the **Local Game** tab. +2. Select the world you want to enable More Ores in. +3. Click **Configure**, then enable `moreores` by double-clicking it + (or ticking the **Enabled** checkbox). +4. Save the changes, then start a game on the world you enabled More Ores on. +5. More Ores should now be running on your world. + +#### Using a text editor + +This is the recommended way to enable the mod on a server without using a GUI. + +1. Make sure Minetest is not currently running (otherwise, it will overwrite + the changes when exiting). +2. Open the world's `world.mt` file using a text editor. +3. Add the following line at the end of the file: + +```text +load_mod_moreores = true +``` + +If the line is already present in the file, then replace `false` with `true` +on that line. + +4. Save the file, then start a game on the world you enabled More Ores on. +5. More Ores should now be running on your world. + +## Version compatibility + +More Ores is currently primarily tested with Minetest 5.1.0. +It may or may not work with newer or older versions. Issues arising in older +versions than 5.0.0 will generally not be fixed. + +## License + +Copyright © 2011-2020 Hugo Locurcio and contributors + +- More Ores code is licensed under the zlib license, see + [`LICENSE.md`](LICENSE.md) for details. +- Unless otherwise specified, More Ores textures are licensed under + [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/). diff --git a/mods/moreores/_config.txt b/mods/moreores/_config.txt new file mode 100644 index 0000000..42e7b37 --- /dev/null +++ b/mods/moreores/_config.txt @@ -0,0 +1,27 @@ +------------------------------------------------------------------------------ +------------------------------ 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 = 8 +moreores.silver_max_depth = -2 +moreores.mithril_max_depth = -512 diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua new file mode 100644 index 0000000..92f3eeb --- /dev/null +++ b/mods/moreores/init.lua @@ -0,0 +1,366 @@ +--[[ +===================================================================== +** More Ores ** +By Calinou, with the help of Nore. + +Copyright © 2011-2020 Hugo Locurcio and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +===================================================================== +--]] + +moreores = {} + +local modpath = minetest.get_modpath("moreores") + +local S = minetest.get_translator("moreores") +moreores.S = S + +dofile(modpath .. "/_config.txt") + +-- `mg` mapgen support +if minetest.get_modpath("mg") then + dofile(modpath .. "/mg.lua") +end + +-- `frame` support +local use_frame = minetest.get_modpath("frame") + +local default_stone_sounds = default.node_sound_stone_defaults() +local default_metal_sounds = default.node_sound_metal_defaults() + +-- Returns the crafting recipe table for a given material and item. +local function get_recipe(material, item) + if item == "sword" then + return { + {material}, + {material}, + {"group:stick"}, + } + end + if item == "shovel" then + return { + {material}, + {"group:stick"}, + {"group:stick"}, + } + end + if item == "axe" then + return { + {material, material}, + {material, "group:stick"}, + {"", "group:stick"}, + } + end + if item == "pick" then + return { + {material, material, material}, + {"", "group:stick", ""}, + {"", "group:stick", ""}, + } + end + if item == "block" then + return { + {material, material, material}, + {material, material, material}, + {material, material, material}, + } + end + if item == "lockedchest" then + return { + {"group:wood", "group:wood", "group:wood"}, + {"group:wood", material, "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" + + if oredef.makes.ore then + minetest.register_node(modname .. ":mineral_" .. mineral_name, { + description = S("@1 Ore", S(description)), + tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, + groups = {cracky = 2}, + sounds = default_stone_sounds, + drop = lump_item, + }) + + if use_frame then + frame.register(modname .. ":mineral_" .. mineral_name) + end + end + + if oredef.makes.block then + local block_item = item_base .. "_block" + minetest.register_node(block_item, { + description = S("@1 Block", S(description)), + tiles = {img_base .. "_block.png"}, + groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, + sounds = default_metal_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 + if use_frame then + frame.register(block_item) + end + end + + if oredef.makes.lump then + minetest.register_craftitem(lump_item, { + description = S("@1 Lump", 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 + if use_frame then + frame.register(lump_item) + end + end + + if oredef.makes.ingot then + minetest.register_craftitem(ingot, { + description = S("@1 Ingot", S(description)), + inventory_image = img_base .. "_ingot.png", + }) + minetest.register_alias(mineral_name .. "_ingot", ingot) + if use_frame then + frame.register(ingot) + end + 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, + }, + sound = {breaks = "default_tool_breaks"}, + } + + if tool_name == "sword" then + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.tools.sword.damage_groups + tdef.description = S("@1 Sword", S(description)) + end + + if tool_name == "pick" then + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.tools.pick.damage_groups + tdef.description = S("@1 Pickaxe", S(description)) + end + + if tool_name == "axe" then + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.tools.axe.damage_groups + tdef.description = S("@1 Axe", S(description)) + end + + if tool_name == "shovel" then + tdef.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.tools.shovel.damage_groups + tdef.description = S("@1 Shovel", S(description)) + tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90" + end + + local fulltool_name = tool_base .. tool_name .. tool_post + + if tool_name == "hoe" and minetest.get_modpath("farming") then + tdef.max_uses = tooldef.uses + tdef.description = S("@1 Hoe", S(description)) + farming.register_hoe(fulltool_name, tdef) + end + + -- Hoe registration is handled above. + -- There are no crafting recipes for hoes, as they have been + -- deprecated from Minetest Game: + -- https://github.com/minetest/minetest_game/commit/9c459e77a + if tool_name ~= "hoe" then + minetest.register_tool(fulltool_name, tdef) + + if oredef.makes.ingot then + minetest.register_craft({ + output = fulltool_name, + recipe = get_recipe(ingot, tool_name) + }) + end + end + + -- Toolranks support + if minetest.get_modpath("toolranks") then + minetest.override_item(fulltool_name, { + original_description = tdef.description, + description = toolranks.create_description(tdef.description, 0, 1), + after_use = toolranks.new_afteruse}) + end + + minetest.register_alias(tool_name .. tool_post, fulltool_name) + if use_frame then + frame.register(fulltool_name) + end + end +end + +local oredefs = { + silver = { + description = "Silver", + makes = {ore = true, block = true, lump = true, ingot = true, chest = true}, + oredef = { + clust_scarcity = moreores.silver_chunk_size ^ 3, + 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}, + damage_groups = {fleshy = 4}, + }, + hoe = { + uses = 300, + }, + shovel = { + crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, + damage_groups = {fleshy = 3}, + }, + 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}, + damage_groups = {fleshy = 5}, + }, + sword = { + fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, + choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, + damage_groups = {fleshy = 6}, + }, + }, + full_punch_interval = 1.0, + }, + mithril = { + description = "Mithril", + makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, + oredef = { + clust_scarcity = moreores.mithril_chunk_size ^ 3, + 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 = 3}, + damage_groups = {fleshy = 6}, + }, + hoe = { + uses = 1000, + }, + shovel = { + crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, + damage_groups = {fleshy = 5}, + }, + axe = { + choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, + fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, + damage_groups = {fleshy = 8}, + }, + sword = { + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, + choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, + damage_groups = {fleshy = 10}, + }, + }, + full_punch_interval = 0.45, + } +} + +-- If tin is available in the `default` mod, don't register More Ores' variant of tin +local default_tin +if minetest.registered_items["default:tin_ingot"] then + default_tin = true +else + default_tin = false +end + +if default_tin then + minetest.register_alias("moreores:mineral_tin", "default:stone_with_tin") + minetest.register_alias("moreores:tin_lump", "default:tin_lump") + minetest.register_alias("moreores:tin_ingot", "default:tin_ingot") + minetest.register_alias("moreores:tin_block", "default:tinblock") +else + oredefs.tin = { + description = "Tin", + makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, + oredef = { + clust_scarcity = moreores.tin_chunk_size ^ 3, + 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 = {}, + } + + -- 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", + }, + }) +end + +for orename, def in pairs(oredefs) do + -- Register everything + add_ore("moreores", def.description, orename, def) +end diff --git a/mods/moreores/locale/moreores.de.tr b/mods/moreores/locale/moreores.de.tr new file mode 100644 index 0000000..aac97be --- /dev/null +++ b/mods/moreores/locale/moreores.de.tr @@ -0,0 +1,22 @@ +# textdomain: moreores + +# Translation by Xanthin + +[moreores] loaded.=[moreores] geladen. + +@1 Ore=@1erz +@1 Lump=@1klumpen +@1 Ingot=@1barren +@1 Block=@1block +@1 Pickaxe=@1spitzhacke +@1 Shovel=@1schaufel +@1 Axe=@1axt +@1 Sword=@1schwert + +Copper=Kupfer +Tin=Zinn +Bronze=Bronze +Silver=Silber +Gold=Gold +Mithril=Mithril +Copper Rail=Kupferschiene diff --git a/mods/moreores/locale/moreores.en.tr b/mods/moreores/locale/moreores.en.tr new file mode 100644 index 0000000..b13188d --- /dev/null +++ b/mods/moreores/locale/moreores.en.tr @@ -0,0 +1,21 @@ +# textdomain: moreores + +[moreores] loaded.=[moreores] loaded. + +@1 Ore=@1 Ore +@1 Lump=@1 Lump +@1 Ingot=@1 Ingot +@1 Block=@1 Block +@1 Pickaxe=@1 Pickaxe +@1 Shovel=@1 Shovel +@1 Axe=@1 Axe +@1 Sword=@1 Sword +@1 Hoe=@1 Hoe + +Copper=Copper +Tin=Tin +Bronze=Bronze +Silver=Silver +Gold=Gold +Mithril=Mithril +Copper Rail=Copper Rail diff --git a/mods/moreores/locale/moreores.es.tr b/mods/moreores/locale/moreores.es.tr new file mode 100644 index 0000000..3b709a3 --- /dev/null +++ b/mods/moreores/locale/moreores.es.tr @@ -0,0 +1,22 @@ +# textdomain: moreores + +# Translation by kaeza + +[moreores] loaded.=[moreores] cargado. + +@1 Ore=Mineral de @1 +@1 Lump=Pepita de @1 +@1 Ingot=Lingote de @1 +@1 Block=Bloque de @1 +@1 Pickaxe=Pico de @1 +@1 Shovel=Pala de @1 +@1 Axe=Hacha de @1 +@1 Sword=Espada de @1 + +Copper=cobre +Tin=estaño +Bronze=bronce +Silver=plata +Gold=oro +Mithril=mitrilo +Copper Rail=Riel de Cobre diff --git a/mods/moreores/locale/moreores.fr.tr b/mods/moreores/locale/moreores.fr.tr new file mode 100644 index 0000000..2ac45a8 --- /dev/null +++ b/mods/moreores/locale/moreores.fr.tr @@ -0,0 +1,23 @@ +# textdomain: moreores + +# Translation by Calinou + +[moreores] loaded.=[moreores] a été chargé. + +@1 Ore=Minerai en @1 +@1 Lump=Roche en @1 +@1 Ingot=Lingot en @1 +@1 Block=Bloc en @1 +@1 Pickaxe=Pioche en @1 +@1 Shovel=Pelle en @1 +@1 Axe=Hache en @1 +@1 Sword=Épée en @1 +@1 Hoe=Houe en @1 + +Copper=cuivre +Tin=étain +Bronze=bronze +Silver=argent +Gold=or +Mithril=mithril +Copper Rail=Rail en cuivre diff --git a/mods/moreores/locale/moreores.hu.tr b/mods/moreores/locale/moreores.hu.tr new file mode 100644 index 0000000..820ece7 --- /dev/null +++ b/mods/moreores/locale/moreores.hu.tr @@ -0,0 +1,22 @@ +# textdomain: moreores + +# Translation by An0n3m0us + +[moreores] loaded.=[moreores] betöltve. + +@1 Ore=@1 érc +@1 Lump=@1 rög +@1 Ingot=@1 öntvény +@1 Block=@1 blokk +@1 Pickaxe=@1 csákány +@1 Shovel=@1 ásó +@1 Axe=@1 fejsze +@1 Sword=@1 kard + +Copper=Réz +Tin=Ón +Bronze=Bronz +Silver=Ezüst +Gold=Arany +Mithril=Mithril +Copper Rail=Réz sín diff --git a/mods/moreores/locale/moreores.it.tr b/mods/moreores/locale/moreores.it.tr new file mode 100644 index 0000000..96541f7 --- /dev/null +++ b/mods/moreores/locale/moreores.it.tr @@ -0,0 +1,22 @@ +# textdomain: moreores + +# Translation by Pagliaccio + +[moreores] loaded.=[moreores] caricato. + +@1 Ore=Minerale di @1 +@1 Lump=@1 grezzo +@1 Ingot=Lingotto di @1 +@1 Block=Blocco di @1 +@1 Pickaxe=Piccone di @1 +@1 Shovel=Badile di @1 +@1 Axe=Ascia di @1 +@1 Sword=Spada di @1 + +Copper=Rame +Tin=Stagno +Bronze=Bronzo +Silver=Argento +Gold=Oro +Mithril=Mithril +Copper Rail=Binario di rame diff --git a/mods/moreores/locale/moreores.nl.tr b/mods/moreores/locale/moreores.nl.tr new file mode 100644 index 0000000..e572ff3 --- /dev/null +++ b/mods/moreores/locale/moreores.nl.tr @@ -0,0 +1,19 @@ +# textdomain: moreores + +[moreores] loaded.=[moreores] geladen. + +@1 Ore=@1 Erts +@1 Lump=@1 Klomp +@1 Ingot=@1 Staaf +@1 Block=@1 Blok +@1 Pickaxe=@1 Pikhouweel +@1 Shovel=@1 Schep +@1 Axe=@1 Bijl +@1 Sword=@1 Zwaard + +Copper=Koper +Tin=Tin +Bronze=Brons +Silver=Silver +Gold=Goud +Mithril=Mithril diff --git a/mods/moreores/locale/moreores.pl.tr b/mods/moreores/locale/moreores.pl.tr new file mode 100644 index 0000000..2eb2993 --- /dev/null +++ b/mods/moreores/locale/moreores.pl.tr @@ -0,0 +1,22 @@ +# textdomain: moreores + +# Translation by mat9117 + +[moreores] loaded.=[moreores] załadowano. + +@1 Ore=@1 Ruda +@1 Lump=@1 Bryłka +@1 Ingot=@1 Sztabka +@1 Block=@1 Blok +@1 Pickaxe=@1 Kilof +@1 Shovel=@1 Łopatka +@1 Axe=@1 Siekiera +@1 Sword=@1 Miecz + +Copper=Miedź +Tin=Cyna +Bronze=Brąz +Silver=Srebro +Gold=Złoto +Mithril=Mithril +Copper Rail=Miedziany tor diff --git a/mods/moreores/locale/moreores.pt_br.tr b/mods/moreores/locale/moreores.pt_br.tr new file mode 100644 index 0000000..613209d --- /dev/null +++ b/mods/moreores/locale/moreores.pt_br.tr @@ -0,0 +1,23 @@ +# textdomain: moreores + +# Translation by github.com/caiorrs + +[moreores] loaded.=[moreores] carregado. + +@1 Ore=Minério de @1 +@1 Lump=Pepita de @1 +@1 Ingot=Lingote de @1 +@1 Block=Bloco de @1 +@1 Pickaxe=Picareta de @1 +@1 Shovel=Pá de @1 +@1 Axe=Machado de @1 +@1 Sword=Espada de @1 + +Copper=Cobre +Tin=Estanho +Bronze=Bronze +Silver=Prata +Gold=Ouro +Mithril=Mitrilo + +Copper Rail=Trilho de Cobre diff --git a/mods/moreores/locale/moreores.tr.tr b/mods/moreores/locale/moreores.tr.tr new file mode 100644 index 0000000..e41f8e3 --- /dev/null +++ b/mods/moreores/locale/moreores.tr.tr @@ -0,0 +1,28 @@ +# textdomain: moreores + +# Translation by Mahmutelmas06 +# mahmutelmas06@hotmail.com + +# Türkçe Çeviri +# Turkish translation +# Language 2 letter iso code is "tr" + +[moreores] loaded.=[moreores] yüklendi. + +@1 Ore=@1 madeni +@1 Lump=@1 yığını +@1 Ingot=@1 külçesi +@1 Block=@1 blok +@1 Pickaxe=@1 kazma +@1 Shovel=@1 kürek +@1 Axe=@1 balta +@1 Sword=@1 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 new file mode 100644 index 0000000..e7ea5b2 --- /dev/null +++ b/mods/moreores/mg.lua @@ -0,0 +1,55 @@ +--[[ +More Ores: `mg` mod support + +Copyright © 2011-2020 Hugo Locurcio and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +if not minetest.registered_items["default:tin_ingot"] then + 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 + }) +end + +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 new file mode 100644 index 0000000..341e834 --- /dev/null +++ b/mods/moreores/mod.conf @@ -0,0 +1,5 @@ +name = moreores +description = Adds new ore types. +depends = default +optional_depends = carts,farming,frame,mg,toolranks +min_minetest_version = 5.0.0 diff --git a/mods/moreores/textures/moreores_mineral_mithril.png b/mods/moreores/textures/moreores_mineral_mithril.png new file mode 100644 index 0000000..e9219cb Binary files /dev/null and b/mods/moreores/textures/moreores_mineral_mithril.png differ diff --git a/mods/moreores/textures/moreores_mineral_silver.png b/mods/moreores/textures/moreores_mineral_silver.png new file mode 100644 index 0000000..82e9158 Binary files /dev/null and b/mods/moreores/textures/moreores_mineral_silver.png differ diff --git a/mods/moreores/textures/moreores_mineral_tin.png b/mods/moreores/textures/moreores_mineral_tin.png new file mode 100644 index 0000000..d2a240f Binary files /dev/null and b/mods/moreores/textures/moreores_mineral_tin.png differ diff --git a/mods/moreores/textures/moreores_mithril_block.png b/mods/moreores/textures/moreores_mithril_block.png new file mode 100644 index 0000000..7eda9cc Binary files /dev/null and b/mods/moreores/textures/moreores_mithril_block.png differ diff --git a/mods/moreores/textures/moreores_mithril_ingot.png b/mods/moreores/textures/moreores_mithril_ingot.png new file mode 100644 index 0000000..9065e6a Binary files /dev/null and b/mods/moreores/textures/moreores_mithril_ingot.png differ diff --git a/mods/moreores/textures/moreores_mithril_lump.png b/mods/moreores/textures/moreores_mithril_lump.png new file mode 100644 index 0000000..6c7f30c Binary files /dev/null and b/mods/moreores/textures/moreores_mithril_lump.png differ diff --git a/mods/moreores/textures/moreores_silver_block.png b/mods/moreores/textures/moreores_silver_block.png new file mode 100644 index 0000000..c2fec68 Binary files /dev/null and b/mods/moreores/textures/moreores_silver_block.png differ diff --git a/mods/moreores/textures/moreores_silver_ingot.png b/mods/moreores/textures/moreores_silver_ingot.png new file mode 100644 index 0000000..5af8d37 Binary files /dev/null and b/mods/moreores/textures/moreores_silver_ingot.png differ diff --git a/mods/moreores/textures/moreores_silver_lump.png b/mods/moreores/textures/moreores_silver_lump.png new file mode 100644 index 0000000..e815ef0 Binary files /dev/null and b/mods/moreores/textures/moreores_silver_lump.png differ diff --git a/mods/moreores/textures/moreores_tin_block.png b/mods/moreores/textures/moreores_tin_block.png new file mode 100644 index 0000000..31ebce0 Binary files /dev/null and b/mods/moreores/textures/moreores_tin_block.png differ diff --git a/mods/moreores/textures/moreores_tin_ingot.png b/mods/moreores/textures/moreores_tin_ingot.png new file mode 100644 index 0000000..4e8c4f5 Binary files /dev/null and b/mods/moreores/textures/moreores_tin_ingot.png differ diff --git a/mods/moreores/textures/moreores_tin_lump.png b/mods/moreores/textures/moreores_tin_lump.png new file mode 100644 index 0000000..72bd339 Binary files /dev/null and b/mods/moreores/textures/moreores_tin_lump.png differ diff --git a/mods/moreores/textures/moreores_tool_mithrilaxe.png b/mods/moreores/textures/moreores_tool_mithrilaxe.png new file mode 100644 index 0000000..46f7776 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_mithrilaxe.png differ diff --git a/mods/moreores/textures/moreores_tool_mithrilhoe.png b/mods/moreores/textures/moreores_tool_mithrilhoe.png new file mode 100644 index 0000000..4a58e8f Binary files /dev/null and b/mods/moreores/textures/moreores_tool_mithrilhoe.png differ diff --git a/mods/moreores/textures/moreores_tool_mithrilpick.png b/mods/moreores/textures/moreores_tool_mithrilpick.png new file mode 100644 index 0000000..7f7c3a2 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_mithrilpick.png differ diff --git a/mods/moreores/textures/moreores_tool_mithrilshovel.png b/mods/moreores/textures/moreores_tool_mithrilshovel.png new file mode 100644 index 0000000..72ec2f5 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_mithrilshovel.png differ diff --git a/mods/moreores/textures/moreores_tool_mithrilsword.png b/mods/moreores/textures/moreores_tool_mithrilsword.png new file mode 100644 index 0000000..cd1d864 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_mithrilsword.png differ diff --git a/mods/moreores/textures/moreores_tool_silveraxe.png b/mods/moreores/textures/moreores_tool_silveraxe.png new file mode 100644 index 0000000..a47eb13 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_silveraxe.png differ diff --git a/mods/moreores/textures/moreores_tool_silverhoe.png b/mods/moreores/textures/moreores_tool_silverhoe.png new file mode 100644 index 0000000..f384113 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_silverhoe.png differ diff --git a/mods/moreores/textures/moreores_tool_silverpick.png b/mods/moreores/textures/moreores_tool_silverpick.png new file mode 100644 index 0000000..a291d3f Binary files /dev/null and b/mods/moreores/textures/moreores_tool_silverpick.png differ diff --git a/mods/moreores/textures/moreores_tool_silvershovel.png b/mods/moreores/textures/moreores_tool_silvershovel.png new file mode 100644 index 0000000..74676b1 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_silvershovel.png differ diff --git a/mods/moreores/textures/moreores_tool_silversword.png b/mods/moreores/textures/moreores_tool_silversword.png new file mode 100644 index 0000000..1393df5 Binary files /dev/null and b/mods/moreores/textures/moreores_tool_silversword.png differ