Compare commits
32 Commits
Author | SHA1 | Date | |
---|---|---|---|
7ea70d5595 | |||
4d5fe50dfd | |||
308c6732a8 | |||
d7ac127d24 | |||
8aa3cbd191 | |||
a1f6897e52 | |||
f7a757c716 | |||
42c4c7ab04 | |||
d0a1798b0b | |||
564cb11ba6 | |||
34d096832c | |||
8cd2d3de89 | |||
cea44dce57 | |||
1075b4678f | |||
ead1f1d82d | |||
7ed6ffe7a7 | |||
5010a148a7 | |||
19e060c31e | |||
3da5fbdc6d | |||
09e69ec0b6 | |||
2fe764ba79 | |||
222a6d47c5 | |||
d6e2b237c7 | |||
54e52ce1ce | |||
b851252996 | |||
77dcac7895 | |||
4db884e00c | |||
2831c806f1 | |||
9dc3378f65 | |||
87be9a6a59 | |||
876630c70d | |||
fe7d656235 |
13
.editorconfig
Normal file
@ -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
|
33
.luacheckrc
Normal file
@ -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",
|
||||
"intllib",
|
||||
"mg",
|
||||
}
|
14
.pre-commit-config.yaml
Normal file
@ -0,0 +1,14 @@
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v2.3.0
|
||||
hooks:
|
||||
- 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
|
16
.travis.yml
Normal file
@ -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
|
37
CHANGELOG.md
@ -7,12 +7,43 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [2.0.0] - 2019-11-25
|
||||
|
||||
### Added
|
||||
|
||||
- Brazilian translation.
|
||||
- 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.
|
||||
|
||||
@ -20,4 +51,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
|
||||
- Initial versioned release.
|
||||
|
||||
[Unreleased]: https://github.com/minetest-mods/moreblocks/compare/v1.0.0...HEAD
|
||||
[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.0.0...HEAD
|
||||
[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
|
||||
|
@ -1,6 +1,6 @@
|
||||
# zlib license
|
||||
|
||||
Copyright (c) 2011-2017 Hugo Locurcio and contributors
|
||||
Copyright © 2011-2019 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.**
|
||||
|
||||
|
19
README.md
@ -12,15 +12,15 @@ world block sandbox game.
|
||||
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. If you do so, you will need to extract the archive, then rename
|
||||
of More Ores. If you do so, you will need to extract the archive then rename
|
||||
the resulting folder from `moreores-master` to `moreores` – this is
|
||||
**absolutely** necessary to do, else, it won't work!
|
||||
**absolutely** required, as the mod won't work otherwise.
|
||||
|
||||
### Enable the mod
|
||||
|
||||
@ -43,29 +43,30 @@ This is the easiest way to enable More Ores when playing in singleplayer
|
||||
|
||||
This is the recommended way to enable the mod on a server without using a GUI.
|
||||
|
||||
1. Make sure Minetest is not currently running (else, it will overwrite
|
||||
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.
|
||||
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 0.4.16.
|
||||
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 0.4.16 will generally not be fixed.
|
||||
versions than 5.0.0 will generally not be fixed.
|
||||
|
||||
## License
|
||||
|
||||
Copyright © 2011-2017 Hugo Locurcio and contributors
|
||||
Copyright © 2011-2019 Hugo Locurcio and contributors
|
||||
|
||||
- More Ores code is licensed under the zlib license, see
|
||||
[`LICENSE.md`](LICENSE.md) for details.
|
||||
|
@ -1,2 +0,0 @@
|
||||
default
|
||||
mg?
|
@ -1 +0,0 @@
|
||||
Adds new Ore types.
|
344
init.lua
@ -3,92 +3,75 @@
|
||||
** More Ores **
|
||||
By Calinou, with the help of Nore.
|
||||
|
||||
Copyright (c) 2011-2017 Hugo Locurcio and contributors.
|
||||
Copyright © 2011-2019 Hugo Locurcio and contributors.
|
||||
Licensed under the zlib license. See LICENSE.md for more information.
|
||||
=====================================================================
|
||||
--]]
|
||||
|
||||
moreores = {}
|
||||
|
||||
local default_tin = false
|
||||
if minetest.registered_items["default:tin_ingot"] then
|
||||
default_tin = true
|
||||
end
|
||||
|
||||
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")
|
||||
|
||||
local S, NS = dofile(modpath .. "/intllib.lua")
|
||||
moreores.S = S
|
||||
moreores.NS = NS
|
||||
|
||||
dofile(modpath .. "/_config.txt")
|
||||
|
||||
-- `mg` support:
|
||||
-- `mg` mapgen support
|
||||
if minetest.get_modpath("mg") then
|
||||
dofile(modpath .. "/mg.lua")
|
||||
end
|
||||
|
||||
-- Utility functions
|
||||
-- =================
|
||||
-- `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()
|
||||
|
||||
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
|
||||
-- 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 pt.type ~= "node" then
|
||||
return
|
||||
if item == "shovel" then
|
||||
return {
|
||||
{material},
|
||||
{"group:stick"},
|
||||
{"group:stick"},
|
||||
}
|
||||
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"}}
|
||||
if item == "axe" then
|
||||
return {
|
||||
{material, material},
|
||||
{material, "group:stick"},
|
||||
{"", "group:stick"},
|
||||
}
|
||||
end
|
||||
if name == "shovel" then
|
||||
return {{c}, {"group:stick"}, {"group:stick"}}
|
||||
if item == "pick" then
|
||||
return {
|
||||
{material, material, material},
|
||||
{"", "group:stick", ""},
|
||||
{"", "group:stick", ""},
|
||||
}
|
||||
end
|
||||
if name == "axe" then
|
||||
return {{c, c}, {c, "group:stick"}, {"", "group:stick"}}
|
||||
if item == "block" then
|
||||
return {
|
||||
{material, material, material},
|
||||
{material, material, material},
|
||||
{material, material, material},
|
||||
}
|
||||
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"}}
|
||||
if item == "lockedchest" then
|
||||
return {
|
||||
{"group:wood", "group:wood", "group:wood"},
|
||||
{"group:wood", material, "group:wood"},
|
||||
{"group:wood", "group:wood", "group:wood"},
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
@ -100,24 +83,27 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
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},
|
||||
groups = {cracky = 2},
|
||||
sounds = default_stone_sounds,
|
||||
drop = lump_item
|
||||
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("%s Block"):format(S(description)),
|
||||
tiles = { img_base .. "_block.png" },
|
||||
groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level= 2},
|
||||
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)
|
||||
@ -129,10 +115,13 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
minetest.register_craft( {
|
||||
output = ingot .. " 9",
|
||||
recipe = {
|
||||
{ block_item }
|
||||
{block_item},
|
||||
}
|
||||
})
|
||||
end
|
||||
if use_frame then
|
||||
frame.register(block_item)
|
||||
end
|
||||
end
|
||||
|
||||
if oredef.makes.lump then
|
||||
@ -145,9 +134,12 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
minetest.register_craft({
|
||||
type = "cooking",
|
||||
output = ingot,
|
||||
recipe = lump_item
|
||||
recipe = lump_item,
|
||||
})
|
||||
end
|
||||
if use_frame then
|
||||
frame.register(lump_item)
|
||||
end
|
||||
end
|
||||
|
||||
if oredef.makes.ingot then
|
||||
@ -156,6 +148,9 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
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
|
||||
@ -163,7 +158,7 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
output = "default:chest_locked",
|
||||
recipe = {
|
||||
{ingot},
|
||||
{"default:chest"}
|
||||
{"default:chest"},
|
||||
}
|
||||
})
|
||||
minetest.register_craft( {
|
||||
@ -184,9 +179,9 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
inventory_image = toolimg_base .. tool_name .. ".png",
|
||||
tool_capabilities = {
|
||||
max_drop_level = 3,
|
||||
groupcaps = tooldef
|
||||
groupcaps = tooldef,
|
||||
},
|
||||
sound = {breaks = "default_tool_breaks"},
|
||||
sound = {breaks = "default_tool_breaks"},
|
||||
}
|
||||
|
||||
if tool_name == "sword" then
|
||||
@ -211,61 +206,68 @@ local function add_ore(modname, description, mineral_name, oredef)
|
||||
tdef.full_punch_interval = oredef.full_punch_interval
|
||||
tdef.tool_capabilities.damage_groups = oredef.damage_groups
|
||||
tdef.description = S("%s Shovel"):format(S(description))
|
||||
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
|
||||
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
|
||||
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
|
||||
end
|
||||
|
||||
local fulltool_name = tool_base .. tool_name .. tool_post
|
||||
minetest.register_tool(fulltool_name, tdef)
|
||||
|
||||
if tool_name == "hoe" and minetest.get_modpath("farming") then
|
||||
tdef.max_uses = tooldef.uses
|
||||
tdef.description = S("%s Hoe"):format(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
|
||||
|
||||
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)
|
||||
})
|
||||
if use_frame then
|
||||
frame.register(fulltool_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,
|
||||
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
|
||||
},
|
||||
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}
|
||||
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
|
||||
},
|
||||
hoe = {
|
||||
uses = 300
|
||||
uses = 300,
|
||||
},
|
||||
shovel = {
|
||||
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1}
|
||||
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}
|
||||
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}
|
||||
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,
|
||||
@ -274,113 +276,103 @@ local oredefs = {
|
||||
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,
|
||||
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
|
||||
},
|
||||
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= 2}
|
||||
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
|
||||
},
|
||||
hoe = {
|
||||
uses = 1000
|
||||
uses = 1000,
|
||||
},
|
||||
shovel = {
|
||||
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 2}
|
||||
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
|
||||
},
|
||||
axe = {
|
||||
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 2},
|
||||
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1}
|
||||
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2},
|
||||
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 1}
|
||||
},
|
||||
sword = {
|
||||
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 2},
|
||||
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 2},
|
||||
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0}
|
||||
}
|
||||
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
|
||||
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2},
|
||||
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0},
|
||||
},
|
||||
},
|
||||
full_punch_interval = 0.45,
|
||||
damage_groups = {fleshy = 9},
|
||||
}
|
||||
}
|
||||
|
||||
if not default_tin then
|
||||
oredefs.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 = {},
|
||||
}
|
||||
-- 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
|
||||
|
||||
for orename,def in pairs(oredefs) do
|
||||
add_ore(modname, def.description, orename, def)
|
||||
end
|
||||
|
||||
-- Copper rail (special node):
|
||||
minetest.register_craft({
|
||||
output = "moreores:copper_rail 24",
|
||||
recipe = {
|
||||
{"default:copper_ingot", "", "default:copper_ingot"},
|
||||
{"default:copper_ingot", "group:stick", "default:copper_ingot"},
|
||||
{"default:copper_ingot", "", "default:copper_ingot"}
|
||||
}
|
||||
})
|
||||
|
||||
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
|
||||
-- Bronze has some special cases, because it is made from copper and tin:
|
||||
minetest.register_craft( {
|
||||
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
|
||||
|
||||
-- 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},
|
||||
},
|
||||
sounds = default_metal_sounds,
|
||||
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,
|
||||
-- Copper rail (unique node)
|
||||
if minetest.get_modpath("carts") then
|
||||
carts:register_rail("moreores:copper_rail", {
|
||||
description = S("Copper Rail"),
|
||||
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",
|
||||
groups = carts:get_rail_groups(),
|
||||
}, {})
|
||||
end
|
||||
|
||||
minetest.register_craft({
|
||||
output = "moreores:copper_rail 24",
|
||||
recipe = {
|
||||
{"default:copper_ingot", "", "default:copper_ingot"},
|
||||
{"default:copper_ingot", "group:stick", "default:copper_ingot"},
|
||||
{"default:copper_ingot", "", "default:copper_ingot"},
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
if minetest.settings:get_bool("log_mods") then
|
||||
minetest.log("action", S("[moreores] loaded."))
|
||||
for orename, def in pairs(oredefs) do
|
||||
-- Register everything
|
||||
add_ore("moreores", def.description, orename, def)
|
||||
end
|
||||
|
44
intllib.lua
Normal file
@ -0,0 +1,44 @@
|
||||
-- Fallback functions for when `intllib` is not installed.
|
||||
-- Code released under Unlicense <http://unlicense.org>.
|
||||
|
||||
-- Get the latest version of this file at:
|
||||
-- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
|
||||
|
||||
local function format(str, ...)
|
||||
local args = { ... }
|
||||
local function repl(escape, open, num, close)
|
||||
if escape == "" then
|
||||
local replacement = tostring(args[tonumber(num)])
|
||||
if open == "" then
|
||||
replacement = replacement..close
|
||||
end
|
||||
return replacement
|
||||
else
|
||||
return "@"..open..num..close
|
||||
end
|
||||
end
|
||||
return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
|
||||
end
|
||||
|
||||
local gettext, ngettext
|
||||
if minetest.get_modpath("intllib") then
|
||||
if intllib.make_gettext_pair then
|
||||
-- New method using gettext.
|
||||
gettext, ngettext = intllib.make_gettext_pair()
|
||||
else
|
||||
-- Old method using text files.
|
||||
gettext = intllib.Getter()
|
||||
end
|
||||
end
|
||||
|
||||
-- Fill in missing functions.
|
||||
|
||||
gettext = gettext or function(msgid, ...)
|
||||
return format(msgid, ...)
|
||||
end
|
||||
|
||||
ngettext = ngettext or function(msgid, msgid_plural, n, ...)
|
||||
return format(n==1 and msgid or msgid_plural, ...)
|
||||
end
|
||||
|
||||
return gettext, ngettext
|
@ -10,7 +10,6 @@
|
||||
%s Shovel = %sschaufel
|
||||
%s Axe = %saxt
|
||||
%s Sword = %sschwert
|
||||
%s Hoe = %shacke
|
||||
|
||||
Copper = Kupfer
|
||||
Tin = Zinn
|
||||
|
@ -18,4 +18,4 @@ Silver = Argento
|
||||
Gold = Oro
|
||||
Mithril = Mithril
|
||||
|
||||
Copper Rail = Binario di rame
|
||||
Copper Rail = Binario di rame
|
||||
|
@ -8,7 +8,6 @@
|
||||
%s Shovel = %s Schep
|
||||
%s Axe = %s Bijl
|
||||
%s Sword = %s Zwaard
|
||||
%s Hoe = %s Schoffel
|
||||
|
||||
Copper = Koper
|
||||
Tin = Tin
|
||||
|
21
locale/pl.txt
Normal file
@ -0,0 +1,21 @@
|
||||
# Translation by mat9117
|
||||
|
||||
[moreores] loaded. = [moreores] załadowano.
|
||||
|
||||
%s Ore = %s Ruda
|
||||
%s Lump = %s Bryłka
|
||||
%s Ingot = %s Sztabka
|
||||
%s Block = %s Blok
|
||||
%s Pickaxe = %s Kilof
|
||||
%s Shovel = %s Łopatka
|
||||
%s Axe = %s Siekiera
|
||||
%s Sword = %s Miecz
|
||||
|
||||
Copper = Miedź
|
||||
Tin = Cyna
|
||||
Bronze = Brąz
|
||||
Silver = Srebro
|
||||
Gold = Złoto
|
||||
Mithril = Mithril
|
||||
|
||||
Copper Rail = Miedziany tor
|
2
mg.lua
@ -1,7 +1,7 @@
|
||||
--[[
|
||||
More Ores: `mg` mod support
|
||||
|
||||
Copyright (c) 2011-2017 Hugo Locurcio and contributors.
|
||||
Copyright © 2011-2019 Hugo Locurcio and contributors.
|
||||
Licensed under the zlib license. See LICENSE.md for more information.
|
||||
--]]
|
||||
|
||||
|
3
mod.conf
@ -1 +1,4 @@
|
||||
name = moreores
|
||||
description = Adds new ore types.
|
||||
depends = default
|
||||
optional_depends = carts,farming,frame,intllib,mg
|
||||
|
Before Width: | Height: | Size: 267 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 272 B |
Before Width: | Height: | Size: 141 B After Width: | Height: | Size: 140 B |
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 149 B |
Before Width: | Height: | Size: 171 B After Width: | Height: | Size: 171 B |
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 213 B |
Before Width: | Height: | Size: 265 B After Width: | Height: | Size: 247 B |
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 197 B |
Before Width: | Height: | Size: 267 B After Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 198 B |
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 196 B |
Before Width: | Height: | Size: 195 B After Width: | Height: | Size: 194 B |
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 201 B After Width: | Height: | Size: 199 B |