12 Commits

Author SHA1 Message Date
73c8696c82 Add Ukrainian localization (#63) 2025-03-15 23:00:26 +01:00
31e9d09355 Update Polish translation (#62) 2024-12-13 16:42:35 +01:00
473abca716 Add Russian localization (#60) 2024-11-16 22:43:03 +01:00
bf02115f31 Fix default_stone_sounds undeclared global variable warnings (#59)
* to fix these messages: <WARNING> 2024-04-04 01:04:37: [Main] Undeclared global variable "default_stone_sounds" accessed at .../moreores/init.lua:129

* to further drive the point home: luacheck is still happy
2024-04-04 16:01:22 +02:00
0d1e32ce72 block-nodes aren't ground content (#58) 2024-02-29 21:41:48 +01:00
c9e25aca43 Fixed regression with merge_tables, fixes #56 (#57) 2024-01-17 15:31:39 +01:00
4f7ec3b3ae Add mineclone2, mineclonia and mineclone5 support (#55)
* Added mineclone2 support apart from with mg
* Add Mineclone2 adjustments
* Fix, Ores now spawn in stone in Mineclone2
* Added Bronze ingot recipe and copper rail
* Made ores breakable
* Made tools work with Mineclone2
* Nerf mithril sword to be same as diamond

---------

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
2024-01-16 00:24:12 +01:00
b20cc8d102 Provide a template file and capitalize various strings (#54)
* Provide a template file and capitalize various...
* Remove unused string and locale file
2023-09-29 09:03:58 +02:00
c5195f4ecd Fix LuaCheck workflow (#53) 2023-08-31 20:50:18 +02:00
041abf66a5 Replace Travis CI with GitHub Actions (#51) 2023-02-11 17:42:07 +01:00
5be4ccb23f Add tool groups for use by various mods (#50) 2023-01-25 15:30:32 +01:00
c142b47539 Pass material to hoe registration (#48) 2022-11-20 13:19:16 +01:00
20 changed files with 293 additions and 118 deletions

22
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,22 @@
name: build
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- run: |
sudo apt-get update -qq
sudo apt-get install -qqq luarocks
- name: Install LuaCheck and pre-commit
run: |
pip3 install pre-commit
luarocks install --local luacheck
- name: Run LuaCheck using pre-commit
run: |
export PATH="$HOME/.luarocks/bin:$PATH"
pre-commit run --all-files

View File

@ -30,4 +30,5 @@ read_globals = {
"frame",
"mg",
"toolranks",
"mcl_sounds"
}

View File

@ -1,16 +0,0 @@
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

View File

@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
single node in one chunk.
- The same overall ore density is retained in the deep layer.
- Switch to GitHub Actions.
- Benefits include faster responses, easier management, and more.
## [2.1.0] - 2021-06-28
### Added

View File

@ -54,27 +54,47 @@ moreores.mithril_clust_size_high = 3
moreores.mithril_clust_size = 3
moreores.mithril_clust_size_deep = 3
-- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
-- Tin
moreores.tin_max_depth_high = 31000
moreores.tin_min_depth_high = 1025
moreores.tin_max_depth = -64 -- For v6 mapgen, -32 fits better
moreores.tin_min_depth = -127
moreores.tin_max_depth_deep = -128
moreores.tin_min_depth_deep = -31000
-- Silver
moreores.silver_max_depth_high = 31000
moreores.silver_min_depth_high = 1025
moreores.silver_max_depth = -64 -- For v6 mapgen, -32 fits better
moreores.silver_min_depth = -127 -- For v6 mapgen, -63 fits better
moreores.silver_max_depth_deep = -128 -- For v6 mapgen, -64 fits better
moreores.silver_min_depth_deep = -31000
if minetest.get_modpath("mcl_core") then
-- Example adjustments for MineClone2
moreores.tin_max_depth_high = 0
moreores.tin_min_depth_high = -10
moreores.tin_max_depth = -11
moreores.tin_min_depth = -57
-- Mithril
moreores.mithril_max_depth_high = 31000
moreores.mithril_min_depth_high = 2049
moreores.mithril_max_depth = -2048 -- For v6 mapgen, -256 fits better
moreores.mithril_min_depth = -4095 -- For v6 mapgen, -511 fits better
moreores.mithril_max_depth_deep = -4096 -- For v6 mapgen, -512 fits better
moreores.mithril_min_depth_deep = -31000
-- Similar adjustments for silver and mithril
moreores.silver_max_depth_high = 0
moreores.silver_min_depth_high = -10
moreores.silver_max_depth = -11
moreores.silver_min_depth = -57
moreores.mithril_max_depth_high = 0
moreores.mithril_min_depth_high = -20
moreores.mithril_max_depth = -21
moreores.mithril_min_depth = -57
else
-- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
-- Tin
moreores.tin_max_depth_high = 31000
moreores.tin_min_depth_high = 1025
moreores.tin_max_depth = -64 -- For v6 mapgen, -32 fits better
moreores.tin_min_depth = -127
moreores.tin_max_depth_deep = -128
moreores.tin_min_depth_deep = -31000
-- Silver
moreores.silver_max_depth_high = 31000
moreores.silver_min_depth_high = 1025
moreores.silver_max_depth = -64 -- For v6 mapgen, -32 fits better
moreores.silver_min_depth = -127 -- For v6 mapgen, -63 fits better
moreores.silver_max_depth_deep = -128 -- For v6 mapgen, -64 fits better
moreores.silver_min_depth_deep = -31000
-- Mithril
moreores.mithril_max_depth_high = 31000
moreores.mithril_min_depth_high = 2049
moreores.mithril_max_depth = -2048 -- For v6 mapgen, -256 fits better
moreores.mithril_min_depth = -4095 -- For v6 mapgen, -511 fits better
moreores.mithril_max_depth_deep = -4096 -- For v6 mapgen, -512 fits better
moreores.mithril_min_depth_deep = -31000
end

187
init.lua
View File

@ -25,11 +25,32 @@ 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()
local is_mcl_core_present = minetest.get_modpath("mcl_core") ~= nil
local is_mcl_sounds_present = minetest.get_modpath("mcl_sounds") ~= nil
local is_mcl_copper_present = minetest.registered_items["mcl_copper:copper_ingot"] ~= nil
local stone_ingredient = is_mcl_core_present and "mcl_core:stone" or "default:stone"
local copper_ingredient =
is_mcl_core_present and "mcl_copper:copper_ingot" or 'default:copper_ingot'
local default_stone_sounds
local default_metal_sounds
if is_mcl_sounds_present then
default_stone_sounds = mcl_sounds.node_sound_stone_defaults()
default_metal_sounds = mcl_sounds.node_sound_metal_defaults()
else
default_stone_sounds = default.node_sound_stone_defaults()
default_metal_sounds = default.node_sound_metal_defaults()
end
-- Returns the crafting recipe table for a given material and item.
local function get_recipe(material, item)
if is_mcl_core_present then
material = material:gsub("default:", "mcl_core:")
end
if item == "sword" then
return {
{material},
@ -74,7 +95,12 @@ local function get_recipe(material, item)
end
end
local function add_ore(modname, description, mineral_name, oredef)
local function add_ore(modname, description, mineral_name, oredef, extra_node_def)
if mineral_name == "copper" and is_mcl_copper_present then
return
end
local img_base = modname .. "_" .. mineral_name
local toolimg_base = modname .. "_tool_"..mineral_name
local tool_base = modname .. ":"
@ -83,14 +109,34 @@ local function add_ore(modname, description, mineral_name, oredef)
local ingot = item_base .. "_ingot"
local lump_item = item_base .. "_lump"
local function merge_tables(t1, t2)
for k, v in pairs(t2) do
if type(v) == "table" and type(t1[k]) == "table" then
-- If both t1[k] and v are tables, merge them recursively
merge_tables(t1[k], v)
else
-- Otherwise, simply set the value
t1[k] = v
end
end
return t1
end
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,
})
local node_def_tbl = {
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 extra_node_def then
node_def_tbl = merge_tables(node_def_tbl, extra_node_def)
end
minetest.register_node(modname .. ":mineral_" .. mineral_name, node_def_tbl)
if use_frame then
frame.register(modname .. ":mineral_" .. mineral_name)
@ -103,6 +149,7 @@ local function add_ore(modname, description, mineral_name, oredef)
description = S("@1 Block", S(description)),
tiles = {img_base .. "_block.png"},
groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2},
is_ground_content = false,
sounds = default_metal_sounds,
})
minetest.register_alias(mineral_name.."_block", block_item)
@ -153,6 +200,7 @@ local function add_ore(modname, description, mineral_name, oredef)
end
if oredef.makes.chest then
if not is_mcl_core_present then
minetest.register_craft( {
output = "default:chest_locked",
recipe = {
@ -160,23 +208,25 @@ local function add_ore(modname, description, mineral_name, oredef)
{"default:chest"},
}
})
minetest.register_craft( {
output = "default:chest_locked",
recipe = get_recipe(ingot, "lockedchest")
})
end
end
oredef.oredef_high.ore_type = "scatter"
oredef.oredef_high.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef_high.wherein = "default:stone"
oredef.oredef_high.wherein = stone_ingredient
oredef.oredef.ore_type = "scatter"
oredef.oredef.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef.wherein = "default:stone"
oredef.oredef.wherein = stone_ingredient
oredef.oredef_deep.ore_type = "scatter"
oredef.oredef_deep.ore = modname .. ":mineral_" .. mineral_name
oredef.oredef_deep.wherein = "default:stone"
oredef.oredef_deep.wherein = stone_ingredient
minetest.register_ore(oredef.oredef_high)
minetest.register_ore(oredef.oredef)
@ -193,22 +243,46 @@ local function add_ore(modname, description, mineral_name, oredef)
full_punch_interval = oredef.full_punch_interval,
},
sound = {breaks = "default_tool_breaks"},
_repair_material = ingot,
_mcl_toollike_wield = true,
mcl_diggroups = tooldef._mcl_diggroups,
groups = tooldef.groups,
}
if tool_name == "sword" then
tdef.description = S("@1 Sword", S(description))
if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {sword = 1})
else
tdef.groups = {sword = 1}
end
end
if tool_name == "pick" then
tdef.description = S("@1 Pickaxe", S(description))
if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {pickaxe = 1, tool=1})
else
tdef.groups = {pickaxe = 1, tool=1}
end
end
if tool_name == "axe" then
tdef.description = S("@1 Axe", S(description))
if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {axe = 1, tool=1})
else
tdef.groups = {axe = 1, tool=1}
end
end
if tool_name == "shovel" then
tdef.description = S("@1 Shovel", S(description))
if tdef.groups then
tdef.groups = merge_tables(tdef.groups, {shovel = 1, tool=1})
else
tdef.groups = {shovel = 1, tool=1}
end
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
end
@ -216,6 +290,7 @@ local function add_ore(modname, description, mineral_name, oredef)
if tool_name == "hoe" and minetest.get_modpath("farming") then
tdef.max_uses = tooldef.max_uses
tdef.material = ingot
tdef.description = S("@1 Hoe", S(description))
farming.register_hoe(fulltool_name, tdef)
end
@ -281,15 +356,23 @@ local oredefs = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
},
damage_groups = {fleshy = 4},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
pickaxey = { speed = 6, level = 4, uses = 126 }
},
},
hoe = {
max_uses = 300,
max_uses = 150,
},
shovel = {
groupcaps = {
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
},
damage_groups = {fleshy = 3},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
shovely = { speed = 6, level = 4, uses = 126 }
},
},
axe = {
groupcaps = {
@ -297,6 +380,10 @@ local oredefs = {
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
},
damage_groups = {fleshy = 5},
groups = {dig_speed_class=4, enchantability=14},
_mcl_diggroups = {
axey = { speed = 6, level = 4, uses = 126 }
},
},
sword = {
groupcaps = {
@ -305,9 +392,19 @@ local oredefs = {
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
},
damage_groups = {fleshy = 6},
_mcl_diggroups = {
swordy = { speed = 6, level = 4, uses = 126 },
swordy_cobweb = { speed = 6, level = 4, uses = 126 }
},
},
},
full_punch_interval = 1.0,
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 4,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 4}
}
},
mithril = {
description = "Mithril",
@ -336,36 +433,58 @@ local oredefs = {
tools = {
pick = {
groupcaps = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3},
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 3126, maxlevel = 3},
},
damage_groups = {fleshy = 6},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
pickaxey = { speed = 8, level = 5, uses = 3126 }
},
},
hoe = {
max_uses = 1000,
max_uses = 2000,
},
shovel = {
groupcaps = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3},
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 3126, maxlevel = 3},
},
damage_groups = {fleshy = 6},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
shovely = { speed = 8, level = 5, uses = 3126 }
},
damage_groups = {fleshy = 5},
},
axe = {
groupcaps = {
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},
choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 3126, maxlevel = 3},
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 3126, maxlevel = 3},
},
damage_groups = {fleshy = 10},
groups = {dig_speed_class=5, enchantability=10},
_mcl_diggroups = {
axey = { speed = 8, level = 5, uses = 3126 }
},
damage_groups = {fleshy = 8},
},
sword = {
groupcaps = {
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},
fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 3126, maxlevel = 3},
choppy = {times = {[3] = 0.80}, uses = 3126, maxlevel = 0},
},
damage_groups = {fleshy = 7},
_mcl_diggroups = {
swordy = { speed = 8, level = 5, uses = 3126 },
swordy_cobweb = { speed = 8, level = 5, uses = 3126 }
},
damage_groups = {fleshy = 10},
},
},
full_punch_interval = 0.45,
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 5,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 5}
},
}
}
@ -408,6 +527,12 @@ else
y_max = moreores.tin_max_depth_deep,
},
tools = {},
extra_node_def = {
_mcl_blast_resistance = 3,
_mcl_hardness = 3,
_mcl_silk_touch_drop = true,
groups = {pickaxey = 3}
},
}
-- Bronze has some special cases, because it is made from copper and tin
@ -416,8 +541,8 @@ else
output = "default:bronze_ingot 3",
recipe = {
"moreores:tin_ingot",
"default:copper_ingot",
"default:copper_ingot",
copper_ingredient,
copper_ingredient,
},
})
end
@ -441,13 +566,13 @@ 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"},
{copper_ingredient, "", copper_ingredient},
{copper_ingredient, "group:stick", copper_ingredient},
{copper_ingredient, "", copper_ingredient},
},
})
for orename, def in pairs(oredefs) do
-- Register everything
add_ore("moreores", def.description, orename, def)
add_ore("moreores", def.description, orename, def, def.extra_node_def)
end

View File

@ -2,8 +2,6 @@
# Translation by Xanthin
[moreores] loaded.=[moreores] geladen.
@1 Ore=@1erz
@1 Lump=@1klumpen
@1 Ingot=@1barren

View File

@ -1,21 +0,0 @@
# 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

View File

@ -2,8 +2,6 @@
# Translation by kaeza
[moreores] loaded.=[moreores] cargado.
@1 Ore=Mineral de @1
@1 Lump=Pepita de @1
@1 Ingot=Lingote de @1
@ -13,10 +11,10 @@
@1 Axe=Hacha de @1
@1 Sword=Espada de @1
Copper=cobre
Tin=estaño
Bronze=bronce
Silver=plata
Gold=oro
Mithril=mitrilo
Copper=Cobre
Tin=Estaño
Bronze=Bronce
Silver=Plata
Gold=Oro
Mithril=Mitrilo
Copper Rail=Riel de Cobre

View File

@ -2,8 +2,6 @@
# Translation by Calinou
[moreores] loaded.=[moreores] a été chargé.
@1 Ore=Minerai en @1
@1 Lump=Roche en @1
@1 Ingot=Lingot en @1

View File

@ -2,8 +2,6 @@
# Translation by An0n3m0us
[moreores] loaded.=[moreores] betöltve.
@1 Ore=@1 érc
@1 Lump=@1 rög
@1 Ingot=@1 öntvény

View File

@ -2,8 +2,6 @@
# Translation by Pagliaccio
[moreores] loaded.=[moreores] caricato.
@1 Ore=Minerale di @1
@1 Lump=@1 grezzo
@1 Ingot=Lingotto di @1

View File

@ -1,7 +1,5 @@
# textdomain: moreores
[moreores] loaded.=[moreores] geladen.
@1 Ore=@1 Erts
@1 Lump=@1 Klomp
@1 Ingot=@1 Staaf

View File

@ -2,14 +2,12 @@
# 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 Shovel=@1 Łopata
@1 Axe=@1 Siekiera
@1 Sword=@1 Miecz
@ -19,4 +17,4 @@ Bronze=Brąz
Silver=Srebro
Gold=Złoto
Mithril=Mithril
Copper Rail=Miedziany tor
Copper Rail=Miedziany Tor

View File

@ -2,8 +2,6 @@
# 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

19
locale/moreores.ru.tr Executable file
View File

@ -0,0 +1,19 @@
# textdomain: moreores
@1 Ore=Руда @1
@1 Lump=Кусок @1
@1 Ingot=Слиток @1
@1 Block=Блок @1
@1 Pickaxe=Кирка из @1
@1 Shovel=Лопата из @1
@1 Axe=Топор из @1
@1 Sword=Меч из @1
@1 Hoe=Мотыга из @1
Copper=меди
Tin=олова
Bronze=бронзы
Silver=серебра
Gold=золота
Mithril=мифрила
Copper Rail=медные рельсы

View File

@ -7,8 +7,6 @@
# 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

22
locale/moreores.uk.tr Normal file
View File

@ -0,0 +1,22 @@
# textdomain: moreores
More Ores=Більше Руд
Adds new ore types.=Додає нові типи руд.
@1 Ore=Руда @1
@1 Lump=Шматок @1
@1 Ingot=Злиток @1
@1 Block=Блок @1
@1 Pickaxe=Кайло з @1
@1 Shovel=Лопата з @1
@1 Axe=Сокира з @1
@1 Sword=Меч з @1
@1 Hoe=Мотика з @1
Copper=міді
Tin=олова
Bronze=бронзи
Silver=срібла
Gold=золота
Mithril=міфрілу
Copper Rail=Мідні рейки

18
locale/template.txt Normal file
View File

@ -0,0 +1,18 @@
# textdomain: moreores
@1 Ore=
@1 Lump=
@1 Ingot=
@1 Block=
@1 Pickaxe=
@1 Shovel=
@1 Axe=
@1 Sword=
Copper=
Tin=
Bronze=
Silver=
Gold=
Mithril=
Copper Rail=

View File

@ -1,5 +1,5 @@
name = moreores
description = Adds new ore types.
depends = default
optional_depends = carts,farming,frame,mg,toolranks
optional_depends = carts,farming,frame,mg,toolranks,mcl_core,mcl_sounds
min_minetest_version = 5.0.0
supported_games = mineclone2,mineclonia,minetest_game