nalc/moreores
1
0
Fork 0
forked from minetest-mods/moreores
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:nalc-1.2.0
Branches Tags
nalc:master
nalc:nalc-1.2.0 nalc:nalc-1.0 minetest-mods:v2.1.0 minetest-mods:v2.0.0 minetest-mods:v1.1.0 minetest-mods:v1.0.0
..
compare: nalc:972352fecddd19150ccf9b345c53276803750999
Branches Tags
nalc:master minetest-mods:master
nalc:nalc-1.2.0 nalc:nalc-1.0 minetest-mods:v2.1.0 minetest-mods:v2.0.0 minetest-mods:v1.1.0 minetest-mods:v1.0.0

10 Commits
nalc-1.2.0 ... 972352fecd

Author SHA1 Message Date
sys4
972352fecd Merge remote-tracking branch 'upstream/master' 2021-10-04 21:38:17 +02:00
OgelGames
cad7278522 Fix incorrect tool_capabilities (#44) 
Fixes incorrectly defined damage_groups in the tool_capabilities of all tools, and full_punch_interval of shovels.

Also fixes crash happening after a9bd9dc when toolranks mod is used.
 2021-10-03 17:03:29 +02:00
Dirkfried
a9bd9dc84a Tweak fleshy damage and mithril tools' levels (#43) 
- Tools now have different fleshy damages. The sword cause now more damage to a monster than the axe, which cause more damage than the pick, which cause more damage than the shovel (like it is in default).
- Mithril tools become level = 3 (as Mithril should be the strongest material?!).
- Swords can now dig all snappy nodes (of their level) (also like default). As far as I know, it is unusual for a sword to dig choppy nodes and there are no fleshy nodes in the minetest game (so far).

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
 2021-09-21 21:25:11 +02:00
sys4
2f495340ca Merge remote-tracking branch 'upstream/master' 2021-07-03 17:22:18 +02:00
Hugo Locurcio
0b6f669df4 Bump to version 2.1.0 2021-06-29 00:43:27 +02:00
sys4
dec888aee9 Merge remote-tracking branch 'upstream/master' 2020-10-29 22:16:45 +01:00
Hugo Locurcio
3fe0ba8fcb Update pre-commit hooks to version 3.3.0 2020-10-28 16:43:27 +01:00
sys4
b4b42adb6e Merge remote-tracking branch 'upstream/master' 2020-07-31 22:25:00 +02:00
Panquesito7
734f927f37 Fix Brazilian Portuguese translation... 
...file format.
 2020-07-25 14:26:57 +02:00
Panquesito7
8cb3486791 Remove intllib from .luacheckrc 2020-07-25 14:26:57 +02:00
5 changed files with 54 additions and 29 deletions
Expand all files Collapse all files

1
.luacheckrc
View File

@ -28,7 +28,6 @@ read_globals = {
"carts",
"farming",
"frame",
"intllib",
"mg",
"toolranks",
}

3
.pre-commit-config.yaml
View File

@ -1,7 +1,8 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v3.3.0
hooks:
- id: fix-byte-order-marker
- id: end-of-file-fixer
- id: trailing-whitespace

5
CHANGELOG.md
View File

@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
## [2.1.0] - 2021-06-28
### Added
- More Ores tools now have [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) support.
@ -61,6 +63,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Initial versioned release.
[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.0.0...HEAD
[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

74
init.lua
View File

@ -178,32 +178,26 @@ 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.groupcaps,
damage_groups = tooldef.damage_groups,
full_punch_interval = oredef.full_punch_interval,
},
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.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.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.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.damage_groups
tdef.description = S("@1 Shovel", S(description))
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
end
@ -211,7 +205,7 @@ local function add_ore(modname, description, mineral_name, oredef)
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.max_uses = tooldef.max_uses
tdef.description = S("@1 Hoe", S(description))
farming.register_hoe(fulltool_name, tdef)
end
@ -259,23 +253,37 @@ local oredefs = {
},
tools = {
pick = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
groupcaps = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
},
damage_groups = {fleshy = 4},
},
hoe = {
max_uses = 300,
},
shovel = {
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
groupcaps = {
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}
groupcaps = {
choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1},
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
},
damage_groups = {fleshy = 5},
},
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},
groupcaps = {
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,
damage_groups = {fleshy = 6},
},
mithril = {
description = "Mithril",
@ -289,23 +297,37 @@ local oredefs = {
},
tools = {
pick = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2}
groupcaps = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3},
},
damage_groups = {fleshy = 6},
},
hoe = {
max_uses = 1000,
},
shovel = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2},
groupcaps = {
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 = 2},
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 1}
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},
},
damage_groups = {fleshy = 8},
},
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},
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},
},
damage_groups = {fleshy = 10},
},
},
full_punch_interval = 0.45,
damage_groups = {fleshy = 9},
}
}

0
locale/moreores.pt_br.txt → locale/moreores.pt_br.tr
View File