Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

bee.lua

@@ -1,7 +1,7 @@
 
 local S = mobs.intllib
 
--- Bee by KrupnoPavel
+-- Bee by KrupnoPavel (.b3d model by sirrobzeroone)
 
 mobs:register_mob("mobs_animal:bee", {
 	type = "animal",
@@ -11,10 +11,12 @@ 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.x",
+	mesh = "mobs_bee.b3d",
 	textures = {
 		{"mobs_bee.png"},
 	},
+	blood_texture = "mobs_bee_inv.png",
+	blood_amount = 1,
 	makes_footstep_sound = false,
 	sounds = {
 		random = "mobs_bee",
@@ -24,7 +26,7 @@ mobs:register_mob("mobs_animal:bee", {
 	drops = {
 		{name = "mobs:honey", chance = 2, min = 1, max = 2},
 	},
-	water_damage = 2,
+	water_damage = 1,
 	lava_damage = 2,
 	light_damage = 0,
 	fall_damage = 0,
@@ -55,7 +57,7 @@ mobs:spawn({
 	day_toggle = true,
 })
 
-mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png", 0)
+mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png")
 
 -- compatibility
 mobs:alias_mob("mobs:bee", "mobs_animal:bee")
@@ -77,7 +79,7 @@ minetest.register_node(":mobs:beehive", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = true,
-	groups = {oddly_breakable_by_hand = 3, flammable = 1},
+	groups = {oddly_breakable_by_hand = 3, flammable = 1, disable_suffocation = 1},
 	sounds = default.node_sound_defaults(),
 
 	on_construct = function(pos)

bunny.lua

@@ -33,7 +33,7 @@ stepheight = 0.6,
 		{name = "mobs:rabbit_raw", chance = 1, min = 1, max = 1},
 		{name = "mobs:rabbit_hide", chance = 1, min = 0, max = 1},
 	},
-	water_damage = 1,
+	water_damage = 0,
 	lava_damage = 4,
 	light_damage = 0,
 	fear_height = 2,

chicken.lua

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Chicken by JK Murray
+-- Chicken by JK Murray and Sirrobzeroone
 
 mobs:register_mob("mobs_animal:chicken", {
 stepheight = 0.6,
@@ -13,17 +13,14 @@ stepheight = 0.6,
 	armor = 200,
 	collisionbox = {-0.3, -0.75, -0.3, 0.3, 0.1, 0.3},
 	visual = "mesh",
-	mesh = "mobs_chicken.x",
+	mesh = "mobs_chicken.b3d",
-	-- seems a lot of textures but this fixes the problem with the model
 	textures = {
-		{"mobs_chicken.png", "mobs_chicken.png", "mobs_chicken.png", "mobs_chicken.png",
+		{"mobs_chicken.png"}, -- white
-		"mobs_chicken.png", "mobs_chicken.png", "mobs_chicken.png", "mobs_chicken.png", "mobs_chicken.png"},
+		{"mobs_chicken_brown.png"},
-		{"mobs_chicken_black.png", "mobs_chicken_black.png", "mobs_chicken_black.png", "mobs_chicken_black.png",
+		{"mobs_chicken_black.png"},
-		"mobs_chicken_black.png", "mobs_chicken_black.png", "mobs_chicken_black.png", "mobs_chicken_black.png", "mobs_chicken_black.png"},
 	},
 	child_texture = {
-		{"mobs_chick.png", "mobs_chick.png", "mobs_chick.png", "mobs_chick.png",
+		{"mobs_chick.png"},
-		"mobs_chick.png", "mobs_chick.png", "mobs_chick.png", "mobs_chick.png", "mobs_chick.png"},
 	},
 	makes_footstep_sound = true,
 	sounds = {
@@ -45,10 +42,18 @@ stepheight = 0.6,
 	fear_height = 5,
 	animation = {
 		speed_normal = 15,
-		stand_start = 0,
+		stand_start = 1,
-		stand_end = 1, -- 20
+		stand_end = 30,
-		walk_start = 20,
+		stand_speed = 28,
-		walk_end = 40,
+		stand1_start = 31,
+		stand1_end = 70,
+		stand1_speed = 32,
+		walk_start = 71,
+		walk_end = 90,
+		walk_speed = 24,
+		run_start = 91,
+		run_end = 110,
+		run_speed = 24,
 	},
 	follow = {"farming:seed_wheat", "farming:seed_cotton"},
 	view_range = 5,
@@ -86,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"
+	spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"}
 end
 
 mobs:spawn({
 	name = "mobs_animal:chicken",
-	nodes = {spawn_on},
+	nodes = spawn_on,
 	neighbors = {"group:grass"},
 	min_light = 14,
 	interval = 60,

cow.lua

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Cow by Krupnovpavel (additional texture by JurajVajda)
+-- Cow by sirrobzeroone
 
 mobs:register_mob("mobs_animal:cow", {
 	type = "animal",
@@ -16,7 +16,7 @@ mobs:register_mob("mobs_animal:cow", {
 	armor = 200,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.2, 0.4},
 	visual = "mesh",
-	mesh = "mobs_cow.x",
+	mesh = "mobs_cow.b3d",
 	textures = {
 		{"mobs_cow.png"},
 		{"mobs_cow2.png"},
@@ -35,35 +35,52 @@ mobs:register_mob("mobs_animal:cow", {
 		{name = "mobs:leather", chance = 1, min = 0, max = 2},
 		{name = "maptools:silver_coin", chance = 10, min = 0, max = 1,},
 	},
-	water_damage = 1,
+	water_damage = 0,
 	lava_damage = 5,
 	light_damage = 0,
 	animation = {
-		speed_normal = 15,
-		speed_run = 15,
 		stand_start = 0,
 		stand_end = 30,
-		walk_start = 35,
+		stand_speed = 20,
-		walk_end = 65,
+		stand1_start = 35,
-		run_start = 105,
+		stand1_end = 75,
-		run_end = 135,
+		stand1_speed = 20,
-		punch_start = 70,
+		walk_start = 85,
-		punch_end = 100,
+		walk_end = 114,
+		walk_speed = 20,
+		run_start = 120,
+		run_end = 140,
+		run_speed = 30,
+		punch_start = 145,
+		punch_end = 160,
+		punch_speed = 20,
+		die_start = 165,
+		die_end = 185,
+		die_speed = 10,
+		die_loop = false,
 	},
-	follow = "farming:wheat",
+	follow = {"farming:wheat", "default:grass_1"},
 	view_range = 8,
 	replace_rate = 10,
---	replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "farming:wheat_8"},
 	replace_what = {
 		{"group:grass", "mobs:dung", 0},
 		{"default:dirt_with_grass", "default:dirt", -1}
 	},
---	replace_with = "air",
+--	stay_near = {{"farming:straw", "group:grass"}, 10},
 	fear_height = 2,
 	on_rightclick = function(self, clicker)
 
 		-- feed or tame
-		if mobs:feed_tame(self, clicker, 8, true, true) then return end
+		if mobs:feed_tame(self, clicker, 8, true, true) then
+
+			-- if fed 7x wheat or grass then cow can be milked again
+			if self.food and self.food > 6 then
+				self.gotten = false
+			end
+
+			return
+		end
+
 		if mobs:protect(self, clicker) then return end
 		if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end
 
@@ -102,6 +119,17 @@ mobs:register_mob("mobs_animal:cow", {
 			return
 		end
 	end,
+
+	on_replace = function(self, pos, oldnode, newnode)
+
+		self.food = (self.food or 0) + 1
+
+		-- if cow replaces 8x grass then it can be milked again
+		if self.food >= 8 then
+			self.food = 0
+			self.gotten = false
+		end
+	end,
 })
 
 
@@ -118,7 +146,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:cow", S("Cow"), "default_grass.png", 1)
+mobs:register_egg("mobs_animal:cow", S("Cow"), "mobs_cow_inv.png")
 
 
 mobs:alias_mob("mobs:cow", "mobs_animal:cow") -- compatibility
@@ -129,10 +157,41 @@ 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},
 })
 
+-- glass of 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"),
+	groups = {food_milk_glass = 1, flammable = 3, vessel = 1},
+})
+
+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"
+	},
+	replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} }
+})
+
+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"
+	},
+	replacements = { {"mobs:glass_milk", "vessels:drinking_glass 4"} }
+})
+
+
 -- butter
 minetest.register_craftitem(":mobs:butter", {
 	description = S("Butter"),
@@ -185,16 +244,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"},
 	}
 })
 

init.lua

@@ -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"))

kitten.lua

@@ -13,6 +13,7 @@ attack_type = "dogfight",
 attack_animals = true, -- so it can attack rat
 attack_players = false,
 reach = 1,
+stepheight = 1.1,
 	passive = false,
 	hp_min = 5,
 	hp_max = 10,
@@ -39,7 +40,7 @@ reach = 1,
 	drops = {
 		{name = "farming:string", chance = 1, min = 0, max = 1},
 	},
-	water_damage = 1,
+	water_damage = 0,
 	lava_damage = 5,
 	fear_height = 3,
 	animation = {

license.txt

@@ -19,3 +19,11 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+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

locale/ru.po

@@ -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: 2018-03-29 18:00 (UTC+5)\n"
+"PO-Revision-Date: 2020-06-19 19:00 (UTC+3)\n"
-"Last-Translator: Oleg720 <contact@oleg720.ru>\n"
+"Last-Translator: YELLOW <pikayellow35@gmail.com>\n"
-"Language-Team: 720 Locales <>\n"
+"Language-Team: \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,6 +86,14 @@ msgstr "Корова"
 msgid "Bucket of Milk"
 msgstr "Ведро молока"
 
+#: cow.lua
+msgid "Glass of Milk"
+msgstr "Стакан молока"
+
+#: cow.lua
+msgid "Butter"
+msgstr "Масло"
+
 #: cow.lua
 msgid "Cheese"
 msgstr "Сыр"
@@ -102,6 +110,14 @@ msgstr "[МОД] Mobs Redo 'Animals' загружен"
 msgid "Kitten"
 msgstr "Котенок"
 
+#: kitten.lua
+msgid "Hairball"
+msgstr "Комочек шерсти"
+
+#: panda.lua
+msgid "Panda"
+msgstr "Панда"
+
 #: penguin.lua
 msgid "Penguin"
 msgstr "Пингвин"
@@ -116,76 +132,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"
@@ -193,8 +209,8 @@ msgstr "Бородавочник"
 
 #: warthog.lua
 msgid "Raw Porkchop"
-msgstr "Отбивные из свинины"
+msgstr "Свиные отбивные"
 
 #: warthog.lua
 msgid "Cooked Porkchop"
-msgstr "Приготовленные отбивные"
+msgstr "Приготовленные свиные отбивные"

locale/zh_CN.pot

@@ -0,0 +1,206 @@
+# 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 "熟猪排"

locale/zh_CN.txt

@@ -0,0 +1,53 @@
+# 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 = 毛球

locale/zh_TW.txt

@@ -0,0 +1,53 @@
+# 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 = 毛球

lucky_block.lua

@@ -16,6 +16,11 @@ if minetest.get_modpath("lucky_block") then
 		{"spw", "mobs:kitten", 2},
 		{"exp"},
 		{"dro", {"mobs:hairball"}, 3},
+		{"dro", {"mobs:chicken_raw", "mobs:chicken_cooked"}, 10},
+		{"dro", {"mobs:pork_raw", "mobs:pork_cooked"}, 10},
+		{"dro", {"mobs:mutton_raw", "mobs:mutton_cooked"}, 10},
+		{"dro", {"mobs:meat_raw", "mobs:meat"}, 10},
+		{"dro", {"mobs:glass_milk"}, 5},
 	})
 
 	if minetest.registered_nodes["default:nyancat"] then

panda.lua

@@ -33,12 +33,12 @@ stepheight = 0.6,
 	run_velocity = 1.5,
 	jump = false,
 	jump_height = 6,
-	follow = {"ethereal:bamboo"},
+	follow = {"ethereal:bamboo", "bamboo:trunk"},
 	view_range = 8,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 2},
 	},
-	water_damage = 1,
+	water_damage = 0,
 	lava_damage = 5,
 	light_damage = 0,
 	fear_height = 6,
@@ -83,4 +83,4 @@ if minetest.get_modpath("ethereal") then
 	})
 end
 
-mobs:register_egg("mobs_animal:panda", S("Panda"), "wool_green.png", 1)
+mobs:register_egg("mobs_animal:panda", S("Panda"), "mobs_panda_inv.png")

penguin.lua

@@ -47,8 +47,8 @@ stepheight = 0.6,
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw",
-		"mobs_fish:clownfish",
+		"mobs_fish:clownfish_set", "mobs_fish:clownfish",
-		"mobs_fish:tropical",
+		"mobs_fish:tropical_set", "mobs_fish:tropical",
 		"fishing:fish_raw",
 		"fishing:clownfish_raw",
 		"fishing:bluewhite_raw",
@@ -81,4 +81,4 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:penguin", S("Penguin"), "default_snow.png", 1)
+mobs:register_egg("mobs_animal:penguin", S("Penguin"), "mobs_penguin_inv.png")

rat.lua

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Rat by PilzAdam
+-- Rat by PilzAdam (B3D model by sirrobzeroone)
 
 mobs:register_mob("mobs_animal:rat", {
 stepheight = 0.6,
@@ -79,7 +79,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inventory.png", 0)
+mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inv.png")
 
 
 mobs:alias_mob("mobs:rat", "mobs_animal:rat") -- compatibility

readme.md

@@ -42,4 +42,4 @@ These monochrome cuties spawn in Ethereal's bamboo biome and can be tamed with b
 ---
 *Note: After breeding, animals need to rest for 4 minutes and baby animals take 4 minutes to grow up, also feeding them helps them grow quicker...*
 
-#### Lucky Blocks: 15
+#### Lucky Blocks: 20

sheep.lua

@@ -1,7 +1,6 @@
 
 local S = mobs.intllib
 
-
 local all_colours = {
 	{"black",      S("Black"),      "#000000b0"},
 	{"blue",       S("Blue"),       "#015dbb70"},
@@ -26,7 +25,8 @@ local all_colours = {
 for _, col in ipairs(all_colours) do
 
 	mobs:register_mob("mobs_animal:sheep_"..col[1], {
-stepheight = 0.6,
+		stay_near = {"farming:straw", 10},
+		stepheight = 0.6,
 		type = "animal",
 		passive = true,
 		hp_min = 8,
@@ -54,7 +54,7 @@ stepheight = 0.6,
 			{name = "mobs:mutton_raw", chance = 1, min = 1, max = 2},
 			{name = "wool:"..col[1], chance = 1, min = 1, max = 1},
 		},
-		water_damage = 1,
+		water_damage = 0,
 		lava_damage = 5,
 		light_damage = 0,
 		animation = {
@@ -65,25 +65,39 @@ stepheight = 0.6,
 			walk_start = 81,
 			walk_end = 100,
 		},
-		follow = {"farming:wheat", "default:grass_5"},
+		follow = {"farming:wheat", "default:grass_1"},
 		view_range = 8,
 		replace_rate = 10,
-		replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "farming:wheat_8"},
+		replace_what = {
-		replace_with = "air",
+			{"group:grass", "air", -1},
-		replace_offset = -1,
+			{"default:dirt_with_grass", "default:dirt", -2}
+		},
 		fear_height = 3,
---[[
 		on_replace = function(self, pos, oldnode, newnode)
-			print ("---- replaced") ; return false -- false to keep node, true to replace
+
+			self.food = (self.food or 0) + 1
+
+			-- if sheep replaces 8x grass then it regrows wool
+			if self.food >= 8 then
+
+				self.food = 0
+				self.gotten = false
+
+				self.object:set_properties({
+					textures = {"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
+					mesh = "mobs_sheep.b3d",
+				})
+			end
 		end,
-]]
 		on_rightclick = function(self, clicker)
 
 			--are we feeding?
 			if mobs:feed_tame(self, clicker, 8, true, true) then
 
-				--if full grow fuzz
+				--if fed 7x grass or wheat then sheep regrows wool
-				if self.gotten == false then
+				if self.food and self.food > 6 then
+
+					self.gotten = false
 
 					self.object:set_properties({
 						textures = {"mobs_sheep_base.png^(mobs_sheep_wool.png^[colorize:" .. col[3] .. ")"},
@@ -182,7 +196,7 @@ stepheight = 0.6,
 		end
 	})
 
-	mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_"..col[1]..".png", 1)
+mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_"..col[1]..".png^mobs_sheep_inv.png")
 
 	-- compatibility
 	mobs:alias_mob("mobs:sheep_" .. col[1], "mobs_animal:sheep_" .. col[1])

warthog.lua

@@ -2,10 +2,10 @@
 local S = mobs.intllib
 
 
--- Warthog by KrupnoPavel
+-- Warthog originally by KrupnoPavel, B3D model by sirrobzeroone
 
 mobs:register_mob("mobs_animal:pumba", {
-stepheight = 0.6,
+	stepheight = 0.6,
 	type = "animal",
 	passive = false,
 	attack_type = "dogfight",
@@ -19,7 +19,7 @@ stepheight = 0.6,
 	armor = 200,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.95, 0.4},
 	visual = "mesh",
-	mesh = "mobs_pumba.x",
+	mesh = "mobs_pumba.b3d",
 	textures = {
 		{"mobs_pumba.png"},
 	},
@@ -39,7 +39,7 @@ stepheight = 0.6,
 		{name = "mobs:pork_raw", chance = 1, min = 1, max = 3},
 	   {name = "maptools:silver_coin", chance = 10, min = 0, max = 1,},
 	},
-	water_damage = 1,
+	water_damage = 0,
 	lava_damage = 5,
 	light_damage = 0,
 	fear_height = 2,
@@ -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"}
+	spawn_on = {"default:dirt_with_dry_grass", "default:dry_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_brown"}
+	spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_red"}
 end
 
 mobs:spawn({
@@ -86,7 +86,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:pumba", S("Warthog"), "wool_pink.png", 1)
+mobs:register_egg("mobs_animal:pumba", S("Warthog"), "mobs_pumba_inv.png")
 
 
 mobs:alias_mob("mobs:pumba", "mobs_animal:pumba") -- compatibility