Compare commits

1 Commits

Author SHA1 Message Date
7d86d7d8a5 Merge branch 'master' into nalc-1.2 2019-06-02 17:28:21 +02:00
20 changed files with 7701 additions and 388 deletions

10
bee.lua
View File

@ -1,7 +1,7 @@
local S = mobs.intllib
-- Bee by KrupnoPavel (.b3d model by sirrobzeroone)
-- Bee by KrupnoPavel
mobs:register_mob("mobs_animal:bee", {
type = "animal",
@ -11,7 +11,7 @@ mobs:register_mob("mobs_animal:bee", {
armor = 200,
collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.5, 0.2},
visual = "mesh",
mesh = "mobs_bee.b3d",
mesh = "mobs_bee.x",
textures = {
{"mobs_bee.png"},
},
@ -20,7 +20,7 @@ mobs:register_mob("mobs_animal:bee", {
makes_footstep_sound = false,
sounds = {
random = "mobs_bee",
},
},
walk_velocity = 1,
jump = true,
drops = {
@ -57,7 +57,7 @@ mobs:spawn({
day_toggle = true,
})
mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png")
mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png", 0)
-- compatibility
mobs:alias_mob("mobs:bee", "mobs_animal:bee")
@ -79,7 +79,7 @@ minetest.register_node(":mobs:beehive", {
paramtype = "light",
sunlight_propagates = true,
walkable = true,
groups = {oddly_breakable_by_hand = 3, flammable = 1, disable_suffocation = 1},
groups = {oddly_breakable_by_hand = 3, flammable = 1},
sounds = default.node_sound_defaults(),
on_construct = function(pos)

View File

@ -91,15 +91,15 @@ stepheight = 0.6,
})
local spawn_on = {"default:dirt_with_grass"}
local spawn_on = "default:dirt_with_grass"
if minetest.get_modpath("ethereal") then
spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"}
spawn_on = "ethereal:bamboo_dirt"
end
mobs:spawn({
name = "mobs_animal:chicken",
nodes = spawn_on,
nodes = {spawn_on},
neighbors = {"group:grass"},
min_light = 14,
interval = 60,

26
cow.lua
View File

@ -66,7 +66,6 @@ mobs:register_mob("mobs_animal:cow", {
{"group:grass", "mobs:dung", 0},
{"default:dirt_with_grass", "default:dirt", -1}
},
-- stay_near = {{"farming:straw", "group:grass"}, 10},
fear_height = 2,
on_rightclick = function(self, clicker)
@ -119,7 +118,6 @@ mobs:register_mob("mobs_animal:cow", {
return
end
end,
on_replace = function(self, pos, oldnode, newnode)
self.food = (self.food or 0) + 1
@ -157,7 +155,7 @@ minetest.register_craftitem(":mobs:bucket_milk", {
description = S("Bucket of Milk"),
inventory_image = "mobs_bucket_milk.png",
stack_max = 1,
on_use = minetest.item_eat(8, "bucket:bucket_empty"),
on_use = minetest.item_eat(8, 'bucket:bucket_empty'),
groups = {food_milk = 1, flammable = 3},
})
@ -165,7 +163,7 @@ minetest.register_craftitem(":mobs:bucket_milk", {
minetest.register_craftitem(":mobs:glass_milk", {
description = S("Glass of Milk"),
inventory_image = "mobs_glass_milk.png",
on_use = minetest.item_eat(2, "vessels:drinking_glass"),
on_use = minetest.item_eat(2, 'vessels:drinking_glass'),
groups = {food_milk_glass = 1, flammable = 3, vessel = 1},
})
@ -173,9 +171,9 @@ minetest.register_craft({
type = "shapeless",
output = "mobs:glass_milk 4",
recipe = {
"vessels:drinking_glass", "vessels:drinking_glass",
"vessels:drinking_glass", "vessels:drinking_glass",
"mobs:bucket_milk"
'vessels:drinking_glass', 'vessels:drinking_glass',
'vessels:drinking_glass', 'vessels:drinking_glass',
'mobs:bucket_milk'
},
replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} }
})
@ -184,9 +182,9 @@ minetest.register_craft({
type = "shapeless",
output = "mobs:bucket_milk",
recipe = {
"mobs:glass_milk", "mobs:glass_milk",
"mobs:glass_milk", "mobs:glass_milk",
"bucket:bucket_empty"
'mobs:glass_milk', 'mobs:glass_milk',
'mobs:glass_milk', 'mobs:glass_milk',
'bucket:bucket_empty'
},
replacements = { {"mobs:glass_milk", "vessels:drinking_glass 4"} }
})
@ -244,16 +242,16 @@ minetest.register_node(":mobs:cheeseblock", {
minetest.register_craft({
output = "mobs:cheeseblock",
recipe = {
{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
}
})
minetest.register_craft({
output = "mobs:cheese 9",
recipe = {
{"mobs:cheeseblock"},
{'mobs:cheeseblock'},
}
})

View File

@ -22,4 +22,4 @@ dofile(path .. "/panda.lua") -- AspireMint
dofile(path .. "/lucky_block.lua")
print (S("[MOD] Mobs Redo Animals loaded"))
print (S("[MOD] Mobs Redo 'Animals' loaded"))

View File

@ -25,5 +25,3 @@ Chicken sounds from freesounds.org under CC0
Mutton, Pork and Rabbit meat textures by Piezo_ under CC0
Cow textures by sirrobzeroone under CC0
mobs_panda_viking.png by Zlo under CC0

View File

@ -9,9 +9,9 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-13 16:00 (UTC+5)\n"
"PO-Revision-Date: 2020-06-19 19:00 (UTC+3)\n"
"Last-Translator: YELLOW <pikayellow35@gmail.com>\n"
"Language-Team: \n"
"PO-Revision-Date: 2018-03-29 18:00 (UTC+5)\n"
"Last-Translator: Oleg720 <contact@oleg720.ru>\n"
"Language-Team: 720 Locales <>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
@ -39,16 +39,16 @@ msgstr "Кролик"
#: bunny.lua
msgid "Raw Rabbit"
msgstr "Сырая крольчатина"
msgstr "Сырой кролик"
#: bunny.lua
#, fuzzy
msgid "Cooked Rabbit"
msgstr "Приготовленная крольчатина"
msgstr "Приготовленный кролик"
#: bunny.lua
msgid "Rabbit Hide"
msgstr "Кроличья шкурка"
msgstr "Кролик скрыть"
#: chicken.lua
msgid "Chicken"
@ -56,11 +56,11 @@ msgstr "Курица"
#: chicken.lua
msgid "Chicken Egg"
msgstr "Куриное яйцо"
msgstr "Курино яйцо"
#: chicken.lua
msgid "Fried Egg"
msgstr "Яичница"
msgstr "Жареное яйцо"
#: chicken.lua
msgid "Raw Chicken"
@ -68,7 +68,7 @@ msgstr "Сырая курятина"
#: chicken.lua
msgid "Cooked Chicken"
msgstr "Приготовленная курятина"
msgstr "Вареная курятина"
#: chicken.lua
msgid "Feather"
@ -86,14 +86,6 @@ msgstr "Корова"
msgid "Bucket of Milk"
msgstr "Ведро молока"
#: cow.lua
msgid "Glass of Milk"
msgstr "Стакан молока"
#: cow.lua
msgid "Butter"
msgstr "Масло"
#: cow.lua
msgid "Cheese"
msgstr "Сыр"
@ -110,14 +102,6 @@ msgstr "[МОД] Mobs Redo 'Animals' загружен"
msgid "Kitten"
msgstr "Котенок"
#: kitten.lua
msgid "Hairball"
msgstr "Комочек шерсти"
#: panda.lua
msgid "Panda"
msgstr "Панда"
#: penguin.lua
msgid "Penguin"
msgstr "Пингвин"
@ -132,76 +116,76 @@ msgstr "Приготовленная крыса"
#: sheep.lua
msgid "Black"
msgstr "Черная"
msgstr "Черный"
#: sheep.lua
msgid "Blue"
msgstr "Синяя"
msgstr "Синий"
#: sheep.lua
msgid "Brown"
msgstr "Коричневая"
msgstr "Коричневый"
#: sheep.lua
msgid "Cyan"
msgstr "Голубая"
msgstr "Голубой"
#: sheep.lua
msgid "Dark Green"
msgstr "Темно-зеленая"
msgstr "Темно-зеленый"
#: sheep.lua
msgid "Dark Grey"
msgstr "Темно-серая"
msgstr "Темно-серый"
#: sheep.lua
msgid "Green"
msgstr "Зеленая"
msgstr "Зеленый"
#: sheep.lua
msgid "Grey"
msgstr "Серая"
msgstr "Серый"
#: sheep.lua
msgid "Magenta"
msgstr "Пурпурная"
msgstr "Пурпурный"
#: sheep.lua
msgid "Orange"
msgstr "Оранжевая"
msgstr "Оранжевый"
#: sheep.lua
msgid "Pink"
msgstr "Розовая"
msgstr "Розовый"
#: sheep.lua
msgid "Red"
msgstr "Красная"
msgstr "Красный"
#: sheep.lua
msgid "Violet"
msgstr "Фиолетовая"
msgstr "Фиолетовый"
#: sheep.lua
msgid "White"
msgstr "Белая"
msgstr "Белый"
#: sheep.lua
msgid "Yellow"
msgstr "Желтая"
msgstr "Желтый"
#: sheep.lua
msgid "@1 Sheep"
msgstr "@1 овца"
msgstr "@1 Овец"
#: sheep.lua
msgid "Raw Mutton"
msgstr "Сырая баранина"
msgstr "сырой ягненок"
#: sheep.lua
#, fuzzy
msgid "Cooked Mutton"
msgstr "Приготовленная баранина"
msgstr "приготовленный ягненок"
#: warthog.lua
msgid "Warthog"
@ -209,8 +193,8 @@ msgstr "Бородавочник"
#: warthog.lua
msgid "Raw Porkchop"
msgstr "Свиные отбивные"
msgstr "Отбивные из свинины"
#: warthog.lua
msgid "Cooked Porkchop"
msgstr "Приготовленные свиные отбивные"
msgstr "Приготовленные отбивные"

View File

@ -1,206 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# IFRFSX <1079092922@qq.com>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-31 11:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: bee.lua
msgid "Bee"
msgstr "蜜蜂"
#: bee.lua
msgid "Honey"
msgstr "蜂蜜"
#: bee.lua
msgid "Beehive"
msgstr "蜂巢"
#: bee.lua
msgid "Honey Block"
msgstr "蜂蜜方块"
#: bunny.lua
msgid "Bunny"
msgstr "兔子"
#: bunny.lua
msgid "Raw Rabbit"
msgstr "生兔肉"
#: bunny.lua
msgid "Cooked Rabbit"
msgstr "熟兔肉"
#: bunny.lua
msgid "Rabbit Hide"
msgstr "兔子皮"
#: chicken.lua
msgid "Chicken"
msgstr "鸡"
#: chicken.lua
msgid "Chicken Egg"
msgstr "鸡蛋"
#: chicken.lua
msgid "Fried Egg"
msgstr "煎蛋"
#: chicken.lua
msgid "Raw Chicken"
msgstr "生鸡肉"
#: chicken.lua
msgid "Cooked Chicken"
msgstr "熟鸡肉"
#: chicken.lua
msgid "Feather"
msgstr "羽毛"
#: cow.lua
msgid "Cow already milked!"
msgstr "奶牛已经被挤奶了!"
#: cow.lua
msgid "Cow"
msgstr "奶牛"
#: cow.lua
msgid "Bucket of Milk"
msgstr "一桶牛奶"
#: cow.lua
msgid "Glass of Milk"
msgstr "一杯牛奶"
#: cow.lua
msgid "Cheese"
msgstr "奶酪"
#: cow.lua
msgid "Cheese Block"
msgstr "奶酪方块"
#: init.lua
msgid "[MOD] Mobs Redo 'Animals' loaded"
msgstr "[模组] Mobs Redo 'Animals' 已加载!"
#: kitten.lua
msgid "Kitten"
msgstr "小猫"
#: kitten.lua
msgid "Hairball"
msgstr "毛球"
#: penguin.lua
msgid "Penguin"
msgstr "企鹅"
#: rat.lua
msgid "Rat"
msgstr "老鼠"
#: rat.lua
msgid "Cooked Rat"
msgstr "熟老鼠"
#: sheep.lua
msgid "Black"
msgstr "黑"
#: sheep.lua
msgid "Blue"
msgstr "蓝"
#: sheep.lua
msgid "Brown"
msgstr "棕"
#: sheep.lua
msgid "Cyan"
msgstr "青"
#: sheep.lua
msgid "Dark Green"
msgstr "蓝绿"
#: sheep.lua
msgid "Dark Grey"
msgstr "蓝灰"
#: sheep.lua
msgid "Green"
msgstr "绿"
#: sheep.lua
msgid "Grey"
msgstr "灰"
#: sheep.lua
msgid "Magenta"
msgstr "品红"
#: sheep.lua
msgid "Orange"
msgstr "橙"
#: sheep.lua
msgid "Pink"
msgstr "粉红"
#: sheep.lua
msgid "Red"
msgstr "红"
#: sheep.lua
msgid "Violet"
msgstr "紫"
#: sheep.lua
msgid "White"
msgstr "白"
#: sheep.lua
msgid "Yellow"
msgstr "黄"
#: sheep.lua
msgid "@1 Sheep"
msgstr "@1羊"
#: sheep.lua
msgid "Raw Mutton"
msgstr "生羊肉"
#: sheep.lua
msgid "Cooked Mutton"
msgstr "熟羊肉"
#: warthog.lua
msgid "Warthog"
msgstr "野猪"
#: warthog.lua
msgid "Raw Porkchop"
msgstr "生猪排"
#: warthog.lua
msgid "Cooked Porkchop"
msgstr "熟猪排"

View File

@ -1,53 +0,0 @@
# Template for translations of mobs_animal mod
# last update: 2020/02/13
Bee = 蜜蜂
Honey = 蜂蜜
Beehive = 蜂巢
Honey Block = 蜂蜜方块
Butter = 黄油
Bunny = 兔子
Raw Rabbit = 生兔肉
Cooked Rabbit = 熟兔肉
Rabbit Hide = 兔子皮
Chicken = 鸡
Chicken Egg = 鸡蛋
Fried Egg = 煎蛋
Raw Chicken = 生鸡肉
Cooked Chicken = 熟鸡肉
Feather = 羽毛
Cow already milked! = 奶牛已被挤奶!
Cow = 奶牛
Bucket of Milk = 一桶牛奶
Cheese = 奶酪
Cheese Block = 奶酪方块
[MOD] Mobs Redo 'Animals' loaded = [模组] Mobs Redo 'Animals' 已加载!
Kitten = 小猫
Penguin = 企鹅
Rat = 老鼠
Cooked Rat = 熟老鼠
Black = 黑
Blue = 蓝
Brown = 棕
Cyan = 青
Dark Green = 暗绿
Dark Grey = 暗灰
Green = 绿
Grey = 灰
Magenta = 品红
Orange = 橙
Pink = 粉红
Red = 红
Violet = 紫
White = 白
Yellow = 黄
@1 Sheep = @1羊
Raw Mutton = 生羊肉
Cooked Mutton = 熟羊肉
Warthog = 野猪
Raw Porkchop = 生猪排
Cooked Porkchop = 熟猪排
Panda = 熊猫
Glass of Milk = 一杯牛奶
Hairball = 毛球

View File

@ -1,53 +0,0 @@
# Template for translations of mobs_animal mod
# last update: 2020/02/13
Bee = 蜜蜂
Honey = 蜂蜜
Beehive = 蜂巢
Honey Block = 蜂蜜方塊
Butter = 黃油
Bunny = 兔子
Raw Rabbit = 生兔肉
Cooked Rabbit = 熟兔肉
Rabbit Hide = 兔子皮
Chicken = 雞
Chicken Egg = 雞蛋
Fried Egg = 煎蛋
Raw Chicken = 生雞肉
Cooked Chicken = 熟雞肉
Feather = 羽毛
Cow already milked! = 奶牛已被擠奶!
Cow = 奶牛
Bucket of Milk = 一桶牛奶
Cheese = 奶酪
Cheese Block = 奶酪方塊
[MOD] Mobs Redo 'Animals' loaded = [模組] Mobs Redo 'Animals' 已加載!
Kitten = 小貓
Penguin = 企鵝
Rat = 老鼠
Cooked Rat = 熟老鼠
Black = 黑
Blue = 藍
Brown = 棕
Cyan = 青
Dark Green = 暗綠
Dark Grey = 暗灰
Green = 綠
Grey = 灰
Magenta = 品紅
Orange = 橙
Pink = 粉紅
Red = 紅
Violet = 紫
White = 白
Yellow = 黃
@1 Sheep = @1羊
Raw Mutton = 生羊肉
Cooked Mutton = 熟羊肉
Warthog = 野豬
Raw Porkchop = 生豬排
Cooked Porkchop = 熟豬排
Panda = 熊貓
Glass of Milk = 一杯牛奶
Hairball = 毛球

Binary file not shown.

7645
models/mobs_bee.x Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -33,7 +33,7 @@ stepheight = 0.6,
run_velocity = 1.5,
jump = false,
jump_height = 6,
follow = {"ethereal:bamboo", "bamboo:trunk"},
follow = {"ethereal:bamboo"},
view_range = 8,
drops = {
{name = "mobs:meat_raw", chance = 1, min = 1, max = 2},

View File

@ -47,8 +47,8 @@ stepheight = 0.6,
floats = 0,
follow = {
"ethereal:fish_raw",
"mobs_fish:clownfish_set", "mobs_fish:clownfish",
"mobs_fish:tropical_set", "mobs_fish:tropical",
"mobs_fish:clownfish",
"mobs_fish:tropical",
"fishing:fish_raw",
"fishing:clownfish_raw",
"fishing:bluewhite_raw",

View File

@ -2,7 +2,7 @@
local S = mobs.intllib
-- Rat by PilzAdam (B3D model by sirrobzeroone)
-- Rat by PilzAdam
mobs:register_mob("mobs_animal:rat", {
stepheight = 0.6,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 834 B

View File

@ -64,13 +64,13 @@ local spawn_on = {"default:dirt_with_grass"}
local spawn_by = {"group:grass"}
if minetest.get_mapgen_setting("mg_name") ~= "v6" then
spawn_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}
spawn_on = {"default:dirt_with_dry_grass"}
spawn_by = {"group:dry_grass"}
end
if minetest.get_modpath("ethereal") then
spawn_on = {"ethereal:mushroom_dirt"}
spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_red"}
spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_brown"}
end
mobs:spawn({