[moreores] Update to Git patch e5abf12:

https://github.com/AntumMT/mtmod-moreores/tree/e5abf12
This commit is contained in:
AntumDeluge 2017-06-28 13:35:54 -07:00
parent 38f21a3590
commit 2435a71ddc
7 changed files with 161 additions and 18 deletions

View File

@ -562,7 +562,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.mobs_monster]: https://github.com/AntumMT/mtmod-mobs_monster/tree/71d3e0c [patch.mobs_monster]: https://github.com/AntumMT/mtmod-mobs_monster/tree/71d3e0c
[patch.mobs_redo]: https://github.com/AntumMT/mtmod-mobs_redo/tree/3a82320 [patch.mobs_redo]: https://github.com/AntumMT/mtmod-mobs_redo/tree/3a82320
[patch.moreblocks]: https://github.com/AntumMT/mtmod-moreblocks/tree/abb2e49 [patch.moreblocks]: https://github.com/AntumMT/mtmod-moreblocks/tree/abb2e49
[patch.moreores]: https://github.com/AntumMT/mtmod-moreores/tree/51fbd4f [patch.moreores]: https://github.com/AntumMT/mtmod-moreores/tree/e5abf12
[patch.mydoors]: https://github.com/AntumMT/mtmp-mydoors/tree/e36c9d1 [patch.mydoors]: https://github.com/AntumMT/mtmp-mydoors/tree/e36c9d1
[patch.mylights]: https://github.com/AntumMT/mtmod-mylights/tree/fef9fec [patch.mylights]: https://github.com/AntumMT/mtmod-mylights/tree/fef9fec
[patch.myroofs]: https://github.com/AntumMT/mtmod-myroofs/tree/e6b23fd [patch.myroofs]: https://github.com/AntumMT/mtmod-myroofs/tree/e6b23fd

View File

@ -31,6 +31,12 @@ if minetest.get_modpath("mg") then
dofile(modpath .. "/mg.lua") dofile(modpath .. "/mg.lua")
end end
local tool_wear = minetest.settings:get_bool('enable_tool_wear')
if tool_wear == nil then
-- Default is enabled
tool_wear = true
end
-- Utility functions -- Utility functions
-- ================= -- =================
@ -64,7 +70,9 @@ local function hoe_on_use(itemstack, user, pointed_thing, uses)
-- Turn the node into soil, wear out item and play sound: -- Turn the node into soil, wear out item and play sound:
minetest.set_node(pt.under, {name ="farming:soil"}) minetest.set_node(pt.under, {name ="farming:soil"})
minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5}) minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5})
itemstack:add_wear(65535 / (uses - 1)) if tool_wear then
itemstack:add_wear(65535 / (uses - 1))
end
return itemstack return itemstack
end end
@ -238,6 +246,31 @@ end
-- Add everything: -- Add everything:
local modname = "moreores" local modname = "moreores"
local t_uses = {}
if tool_wear then
t_uses.pick_silver = 100
t_uses.hoe_silver = 300
t_uses.shovel_silver = 100
t_uses.axe_silver = 100
t_uses.sword_silver = 100
t_uses.pick_mithril = 200
t_uses.hoe_mithril = 1000
t_uses.shovel_mithril = 200
t_uses.axe_mithril = 200
t_uses.sword_mithril = 200
else
t_uses.pick_silver = 0
t_uses.hoe_silver = 0
t_uses.shovel_silver = 0
t_uses.axe_silver = 0
t_uses.sword_silver = 0
t_uses.pick_mithril = 0
t_uses.hoe_mithril = 0
t_uses.shovel_mithril = 0
t_uses.axe_mithril = 0
t_uses.sword_mithril = 0
end
local oredefs = { local oredefs = {
silver = { silver = {
description = "Silver", description = "Silver",
@ -250,22 +283,22 @@ local oredefs = {
}, },
tools = { tools = {
pick = { 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 = t_uses.pick_silver, maxlevel= 1}
}, },
hoe = { hoe = {
uses = 300 uses = t_uses.hoe_silver
}, },
shovel = { 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 = t_uses.shovel_silver, maxlevel= 1}
}, },
axe = { axe = {
choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel= 1}, choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = t_uses.axe_silver, maxlevel= 1},
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1} fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = t_uses.axe_silver, maxlevel= 1}
}, },
sword = { sword = {
fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = t_uses.sword_silver, maxlevel= 1},
snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = t_uses.sword_silver, maxlevel= 1},
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel= 0} choppy = {times = {[3] = 0.80}, uses = t_uses.sword_silver, maxlevel= 0}
}, },
}, },
full_punch_interval = 1.0, full_punch_interval = 1.0,
@ -282,22 +315,22 @@ local oredefs = {
}, },
tools = { tools = {
pick = { 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 = t_uses.pick_mithril, maxlevel= 2}
}, },
hoe = { hoe = {
uses = 1000 uses = t_uses.hoe_mithril
}, },
shovel = { 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 = t_uses.shovel_mithril, maxlevel= 2}
}, },
axe = { axe = {
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 2}, choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = t_uses.axe_mithril, maxlevel= 2},
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = t_uses.axe_mithril, maxlevel= 1}
}, },
sword = { sword = {
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 2}, fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = t_uses.sword_mithril, maxlevel= 2},
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 2}, snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = t_uses.sword_mithril, maxlevel= 2},
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} choppy = {times = {[3] = 0.65}, uses = t_uses.sword_mithril, maxlevel= 0}
} }
}, },
full_punch_interval = 0.45, full_punch_interval = 0.45,

View File

@ -0,0 +1,22 @@
# Translation by Xanthin
[moreores] loaded. = [moreores] geladen.
%s Ore = %serz
%s Lump = %sklumpen
%s Ingot = %sbarren
%s Block = %sblock
%s Pickaxe = %sspitzhacke
%s Shovel = %sschaufel
%s Axe = %saxt
%s Sword = %sschwert
%s Hoe = %shacke
Copper = Kupfer
Tin = Zinn
Bronze = Bronze
Silver = Silber
Gold = Gold
Mithril = Mithril
Copper Rail = Kupferschiene

View File

@ -0,0 +1,21 @@
# Translation by kaeza
[moreores] loaded. = [moreores] cargado.
%s Ore = Mineral de %s
%s Lump = Pepita de %s
%s Ingot = Lingote de %s
%s Block = Bloque de %s
%s Pickaxe = Pico de %s
%s Shovel = Pala de %s
%s Axe = Hacha de %s
%s Sword = Espada de %s
Copper = cobre
Tin = estaño
Bronze = bronce
Silver = plata
Gold = oro
Mithril = mitrilo
Copper Rail = Riel de Cobre

View File

@ -0,0 +1,21 @@
# Translation by Calinou
[moreores] loaded. = [moreores] a été chargé.
%s Ore = Minerai en %s
%s Lump = Roche en %s
%s Ingot = Lingot en %s
%s Block = Bloc en %s
%s Pickaxe = Pioche en %s
%s Shovel = Pelle en %s
%s Axe = Hache en %s
%s Sword = Épée en %s
Copper = cuivre
Tin = étain
Bronze = bronze
Silver = argent
Gold = or
Mithril = mithril
Copper Rail = Rail en cuivre

View File

@ -0,0 +1,21 @@
# Translation by Pagliaccio
[moreores] loaded. = [moreores] caricato.
%s Ore = Minerale di %s
%s Lump = %s grezzo
%s Ingot = Lingotto di %s
%s Block = Blocco di %s
%s Pickaxe = Piccone di %s
%s Shovel = Badile di %s
%s Axe = Ascia di %s
%s Sword = Spada di %s
Copper = Rame
Tin = Stagno
Bronze = Bronzo
Silver = Argento
Gold = Oro
Mithril = Mithril
Copper Rail = Binario di rame

View File

@ -0,0 +1,25 @@
# Translation by Mahmutelmas06
# mahmutelmas06@hotmail.com
# Türkçe Çeviri
# Turkish translation
# Language 2 letter iso code is "tr"
[moreores] loaded. = [moreores] yüklendi.
%s Ore = %s madeni
%s Lump = %s yığını
%s Ingot = %s külçesi
%s Block = %s blok
%s Pickaxe = %s kazma
%s Shovel = %s kürek
%s Axe = %s balta
%s Sword = %s kılıç
Copper = Bakır
Tin = Kalay
Bronze = Bronz
Silver = Gümüş
Gold = Altın
Mithril = Mithril
Copper Rail = Bakır ray