Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-01-22 20:05:18 +01:00
commit e00766a6d7
13 changed files with 100 additions and 41 deletions

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Bee by KrupnoPavel (.b3d model by sirrobzeroone)

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Bunny by ExeterDad

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Chicken by JK Murray and Sirrobzeroone

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Cow by sirrobzeroone

View File

@ -1,11 +1,31 @@
-- Load support for intllib.
local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
local S = minetest.get_translator and minetest.get_translator("mobs_animal") or
dofile(path .. "intllib.lua")
local S
mobs.intllib = S
-- Check for translation method
local S
if minetest.get_translator ~= nil then
S = minetest.get_translator("mobs_animal") -- 5.x translation function
else
if minetest.get_modpath("intllib") then
dofile(minetest.get_modpath("intllib") .. "/init.lua")
if intllib.make_gettext_pair then
gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
else
gettext = intllib.Getter() -- old text file method
end
S = gettext
else -- boilerplate function
S = function(str, ...)
local args = {...}
return str:gsub("@%d+", function(match)
return args[tonumber(match:sub(2))]
end)
end
end
end
mobs.intllib_animal = S
-- Check for custom mob spawn file

View File

@ -1,3 +0,0 @@
-- Support for the old multi-load method
return dofile(minetest.get_modpath("intllib").."/init.lua")

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
local hairball = minetest.settings:get("mobs_hairball")
-- Kitten by Jordach / BFD

46
locale/mobs_animal.es.tr Normal file
View File

@ -0,0 +1,46 @@
# textdomain: mobs_animal
Bee=Abeja
Honey=Miel
Beehive=Colmena
Honey Block=Bloque de Mel
Bunny=Conejo
Raw Rabbit=Carne de Conejo
Cooked Rabbit=Conejo Asado
Rabbit Hide=Conejo oculto
Chicken=Gallina
Chicken Egg=Huevo de Gallina
Fried Egg=Huevo Frito
Raw Chicken=Gallina cruda
Cooked Chicken=Gallina Asada
Feather=Pluma
Cow already milked!=Vaca ordeñada
Cow=Vaca
Bucket of Milk=Balde de leche
Cheese=Queso
Cheese Block=Bloque de queso
[MOD] Mobs Redo 'Animals' loaded=[MOD] Mobs redo Animals cargado
Kitten=Gato
Penguin=Pinguino
Rat=Raton
Cooked Rat=Raton Asado
Black=Negro
Blue=Azul
Brown=Marrom
Cyan=Cian
Dark Green=Verde Oscuro
Dark Grey=Gris Oscuro
Green=Verde
Grey=Gris
Magenta=Magenta
Orange=Naranja
Pink=Rosa
Red=Rojo
Violet=Violeta
White=Blanco
Yellow=Amarillo
@1 Sheep=Oveja @1
Raw Mutton=Carnero crudo
Cooked Mutton=Carnero Assado
Warthog=Javali
Raw Porkchop=Costilla de Jabali crudo
Cooked Porkchop=Costilla de Javali Assada

View File

@ -1,6 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Panda by AspireMint (CC BY-SA 3.0)

View File

@ -1,6 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Penguin by D00Med

View File

@ -1,6 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Rat by PilzAdam (B3D model by sirrobzeroone)

View File

@ -1,5 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
local all_colours = {
{"black", S("Black"), "#000000b0"},
@ -16,7 +16,7 @@ local all_colours = {
{"red", S("Red"), "#ff0000a0"},
{"violet", S("Violet"), "#2000c970"},
{"white", S("White"), "#abababc0"},
{"yellow", S("Yellow"), "#e3ff0070"},
{"yellow", S("Yellow"), "#e3ff0070"}
}
@ -36,13 +36,13 @@ for _, col in ipairs(all_colours) do
visual = "mesh",
mesh = "mobs_sheep.b3d",
textures = {
{"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
{"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"}
},
gotten_texture = {"mobs_sheep_shaved.png"},
gotten_mesh = "mobs_sheep_shaved.b3d",
makes_footstep_sound = true,
sounds = {
random = "mobs_sheep",
random = "mobs_sheep"
},
walk_velocity = 1,
run_velocity = 2,
@ -52,7 +52,7 @@ for _, col in ipairs(all_colours) do
pushable = true,
drops = {
{name = "mobs:mutton_raw", chance = 1, min = 1, max = 2},
{name = "wool:"..col[1], chance = 1, min = 1, max = 1},
{name = "wool:"..col[1], chance = 1, min = 1, max = 1}
},
water_damage = 0,
lava_damage = 5,
@ -69,7 +69,7 @@ for _, col in ipairs(all_colours) do
die_end = 2, -- re-use 2 standing frames at a speed of 1 fps and
die_speed = 1, -- have mob rotate when dying.
die_loop = false,
die_rotate = true,
die_rotate = true
},
follow = {
"farming:wheat", "default:grass_1", "farming:barley",
@ -110,7 +110,7 @@ for _, col in ipairs(all_colours) do
self.object:set_properties({
textures = {"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
mesh = "mobs_sheep.b3d",
mesh = "mobs_sheep.b3d"
})
end
@ -223,7 +223,7 @@ mobs:spawn({
chance = 8000, -- 15000
min_height = 0,
max_height = 200,
day_toggle = true,
day_toggle = true
})
end
@ -235,7 +235,7 @@ minetest.register_craftitem(":mobs:mutton_raw", {
description = S("Raw Mutton"),
inventory_image = "mobs_mutton_raw.png",
on_use = minetest.item_eat(2),
groups = {food_meat_raw = 1, food_mutton_raw = 1, flammable = 2},
groups = {food_meat_raw = 1, food_mutton_raw = 1, flammable = 2}
})
-- cooked mutton
@ -243,12 +243,12 @@ minetest.register_craftitem(":mobs:mutton_cooked", {
description = S("Cooked Mutton"),
inventory_image = "mobs_mutton_cooked.png",
on_use = minetest.item_eat(6),
groups = {food_meat = 1, food_mutton = 1, flammable = 2},
groups = {food_meat = 1, food_mutton = 1, flammable = 2}
})
minetest.register_craft({
type = "cooking",
output = "mobs:mutton_cooked",
recipe = "mobs:mutton_raw",
cooktime = 5,
cooktime = 5
})

View File

@ -1,6 +1,5 @@
local S = mobs.intllib
local S = mobs.intllib_animal
-- Warthog originally by KrupnoPavel, B3D model by sirrobzeroone
@ -21,12 +20,12 @@ mobs:register_mob("mobs_animal:pumba", {
visual = "mesh",
mesh = "mobs_pumba.b3d",
textures = {
{"mobs_pumba.png"},
{"mobs_pumba.png"}
},
makes_footstep_sound = true,
sounds = {
random = "mobs_pig",
attack = "mobs_pig_angry",
attack = "mobs_pig_angry"
},
walk_velocity = 2,
run_velocity = 3,
@ -37,7 +36,7 @@ mobs:register_mob("mobs_animal:pumba", {
view_range = 10,
drops = {
{name = "mobs:pork_raw", chance = 1, min = 1, max = 3},
{name = "maptools:silver_coin", chance = 10, min = 0, max = 1,},
{name = "maptools:silver_coin", chance = 10, min = 0, max = 1}
},
water_damage = 0,
lava_damage = 5,
@ -56,14 +55,14 @@ mobs:register_mob("mobs_animal:pumba", {
die_end = 2, -- re-use 2 standing frames at a speed of 1 fps and
die_speed = 1, -- have mob rotate when dying.
die_loop = false,
die_rotate = true,
die_rotate = true
},
on_rightclick = function(self, clicker)
if mobs:feed_tame(self, clicker, 8, true, true) then return end
if mobs:protect(self, clicker) then return end
if mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) then return end
end,
end
})
local spawn_on = {"default:dirt_with_grass"}
@ -89,7 +88,7 @@ mobs:spawn({
chance = 8000, -- 15000
min_height = 0,
max_height = 200,
day_toggle = true,
day_toggle = true
})
end
@ -104,7 +103,7 @@ minetest.register_craftitem(":mobs:pork_raw", {
description = S("Raw Porkchop"),
inventory_image = "mobs_pork_raw.png",
on_use = minetest.item_eat(4),
groups = {food_meat_raw = 1, food_pork_raw = 1, flammable = 2},
groups = {food_meat_raw = 1, food_pork_raw = 1, flammable = 2}
})
-- cooked porkchop
@ -112,12 +111,12 @@ minetest.register_craftitem(":mobs:pork_cooked", {
description = S("Cooked Porkchop"),
inventory_image = "mobs_pork_cooked.png",
on_use = minetest.item_eat(8),
groups = {food_meat = 1, food_pork = 1, flammable = 2},
groups = {food_meat = 1, food_pork = 1, flammable = 2}
})
minetest.register_craft({
type = "cooking",
output = "mobs:pork_cooked",
recipe = "mobs:pork_raw",
cooktime = 5,
cooktime = 5
})