Merge remote-tracking branch 'upstream/master'

bee.lua

@@ -8,7 +8,7 @@ mobs:register_mob("mobs_animal:bee", {
 	passive = true,
 	hp_min = 1,
 	hp_max = 2,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.5, 0.2},
 	visual = "mesh",
 	mesh = "mobs_bee.b3d",

bunny.lua

@@ -10,7 +10,7 @@ mobs:register_mob("mobs_animal:bunny", {
 	stepheight = 0.6,
 	hp_min = 1,
 	hp_max = 4,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.268, -0.5, -0.268, 0.268, 0.167, 0.268},
 	visual = "mesh",
 	mesh = "mobs_bunny.b3d",

chicken.lua

@@ -9,7 +9,7 @@ mobs:register_mob("mobs_animal:chicken", {
 	passive = true,
 	hp_min = 5,
 	hp_max = 10,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.3, -0.75, -0.3, 0.3, 0.1, 0.3},
 	visual = "mesh",
 	mesh = "mobs_chicken.b3d",
@@ -20,7 +20,10 @@ mobs:register_mob("mobs_animal:chicken", {
 	},
 	child_texture = {{"mobs_chick.png"}},
 	makes_footstep_sound = true,
-	sounds = {random = "mobs_chicken"},
+	sounds = {
+		random = "mobs_chicken",
+		replace = "default_dig_crumbly"
+	},
 	walk_velocity = 1,
 	run_velocity = 3,
 	runaway = true,

cow.lua

@@ -1,6 +1,15 @@
 
 local S = minetest.get_translator("mobs_animal")
 
+-- should cows eat grass blocks and mess up the environment?
+
+local eat_gb = minetest.settings:get_bool("mobs_animal.eat_grass_block")
+local replace_what = { {"group:grass", "mobs:dung", 0} }
+
+if eat_gb then
+	table.insert(replace_what, {"default:dirt_with_grass", "default:dirt", -1})
+end
+
 -- Cow by sirrobzeroone
 
 mobs:register_mob("mobs_animal:cow", {
@@ -10,9 +19,9 @@ mobs:register_mob("mobs_animal:cow", {
 	attack_npcs = false,
 	reach = 2,
 	damage = 4,
-	hp_min = 5,
+	hp_min = 10,
 	hp_max = 20,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.2, 0.4},
 	visual = "mesh",
 	mesh = "mobs_cow.b3d",
@@ -21,7 +30,10 @@ mobs:register_mob("mobs_animal:cow", {
 		{"mobs_cow2.png"}
 	},
 	makes_footstep_sound = true,
-	sounds = {random = "mobs_cow"},
+	sounds = {
+		random = "mobs_cow",
+		replace = "default_dig_crumbly"
+	},
 	walk_velocity = 1,
 	run_velocity = 2,
 	jump = true,
@@ -41,7 +53,7 @@ mobs:register_mob("mobs_animal:cow", {
 		walk_start = 85, 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
+		die_start = 165, die_end = 185, die_speed = 25, die_loop = false
 	},
 	follow = {
 		"farming:wheat", "default:grass_1", "farming:barley",
@@ -49,10 +61,20 @@ mobs:register_mob("mobs_animal:cow", {
 	},
 	view_range = 8,
 	replace_rate = 10,
-	replace_what = {
+	replace_what = replace_what,
-		{"group:grass", "mobs:dung", 0},
+--[[
-		{"default:dirt_with_grass", "default:dirt", -1}
+	pick_up = {"default:grass_1", "default:dry_grass_1"},
-	},
+	on_pick_up = function(self, entity)
+
+		local istack = ItemStack(entity.itemstring)
+
+		print("-- took", istack:get_name())
+
+		istack:take_item(1)
+
+		return istack
+	end,
+]]
 --	stay_near = {{"farming:straw", "group:grass"}, 10},
 	fear_height = 2,
 

kitten.lua

@@ -28,7 +28,7 @@ mobs:register_mob("mobs_animal:kitten", {
 	passive = false,
 	hp_min = 5,
 	hp_max = 10,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3},
 	visual = "mesh",
 	visual_size = {x = 0.5, y = 0.5},

locale/mobs_animal.ru.tr

@@ -1,50 +1,49 @@
 # textdomain:mobs_animal
-@1 Sheep=@1 овца
+@1 Sheep=@1 Овца
 Bee=Пчела
-Beehive=Улей
+Beehive=Пчелиный Улей
 Black=Черная
 Blue=Синяя
 Brown=Коричневая
-Bucket of Milk=Ведро молока
+Bucket of Milk=Ведро Молока
 Bunny=Кролик
 Butter=Масло
 Cheese=Сыр
-Cheese Block=Блок сыра
+Cheese Block=Блок Сыра
 Chicken=Курица
-Chicken Egg=Куриное яйцо
+Chicken Egg=Куриное Яйцо
-Cooked Chicken=Приготовленная курятина
+Cooked Chicken=Приготовленная Курятина
-Cooked Mutton=Приготовленная баранина
+Cooked Mutton=Приготовленная Баранина
-Cooked Porkchop=Приготовленные свиные отбивные
+Cooked Porkchop=Приготовленные Отбивные
-Cooked Rabbit=Приготовленная крольчатина
+Cooked Rabbit=Приготовленная Крольчатина
-Cooked Rat=Приготовленная крыса
+Cooked Rat=Приготовленная Крыса
 Cow=Корова
-Cow already milked!=Корову уже подоили!
+Cow already milked!=Корова уже подоена!
 Cyan=Голубая
 Dark Green=Темно-зеленая
 Dark Grey=Темно-серая
 Feather=Перо
 Fried Egg=Яичница
-Glass of Milk=Стакан молока
+Glass of Milk=Стакан Молока
 Green=Зеленая
 Grey=Серая
 Hairball=Комочек шерсти
 Honey=Мёд
-Honey Block=Блок мёда
+Honey Block=Блок Мёда
 Kitten=Котенок
 Magenta=Пурпурная
 Orange=Оранжевая
 Panda=Панда
 Penguin=Пингвин
 Pink=Розовая
-Rabbit Hide=Кроличья шкурка
+Rabbit Hide=Кроличья Шкурка
 Rat=Крыса
-Raw Chicken=Сырая курятина
+Raw Chicken=Сырая Курятина
-Raw Mutton=Сырая баранина
+Raw Mutton=Сырая Баранина
-Raw Porkchop=Свиные отбивные
+Raw Porkchop=Свиные Отбивные
-Raw Rabbit=Сырая крольчатина
+Raw Rabbit=Сырая Крольчатина
 Red=Красная
 Violet=Фиолетовая
 Warthog=Бородавочник
 White=Белая
-Yellow=Желтая
+Yellow=Желтая
-#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.uk.tr

@@ -0,0 +1,52 @@
+# textdomain:mobs_animal
+Mobs Animal=Моби Тварини
+Add farm animals and a few extra into your world.=Додає свійських тварин і трохи додаткового контенту у світ.
+Adds farm animals.=Додає свійських тварин.
+@1 Sheep=@1 вівця
+Bee=Бджола
+Beehive=Бджолиний вулик
+Black=Чорна
+Blue=Синя
+Brown=Коричнева
+Bucket of Milk=Відро молока
+Bunny=Кролик
+Butter=Масло
+Cheese=Твердий сир
+Cheese Block=Блок твердого сиру
+Chicken=Курка
+Chicken Egg=Яйце курки
+Cooked Chicken=Приготовлена ​​курятина
+Cooked Mutton=Приготовлена ​​баранина
+Cooked Porkchop=Приготовлені відбивні
+Cooked Rabbit=Приготовлена ​​крольчатина
+Cooked Rat=Приготовлений пацюк
+Cow=Корова
+Cow already milked!=Корова вже подоєна!
+Cyan=Блакитна
+Dark Green=Темно-зелена
+Dark Grey=Темно-сіра
+Feather=Перо
+Fried Egg=Яєшня
+Glass of Milk=Склянка молока
+Green=Зелена
+Grey=Сіра
+Hairball=Купка шерсті
+Honey=Мед
+Honey Block=Блок меду
+Kitten=Кошеня
+Magenta=Пурпурна
+Orange=Помаранчева
+Panda=Панда
+Penguin=Пінгвін
+Pink=Рожева
+Rabbit Hide=Кроляча шкірка
+Rat=Пацюк
+Raw Chicken=Сира курятина
+Raw Mutton=Сира баранина
+Raw Porkchop=Свинячі відбивні
+Raw Rabbit=Сира крольчатина
+Red=Червона
+Violet=Фіолетова
+Warthog=Бородавочник
+White=Біла
+Yellow=Жовта

panda.lua

@@ -15,7 +15,7 @@ mobs:register_mob("mobs_animal:panda", {
 	damage = 3,
 	hp_min = 10,
 	hp_max = 24,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.4, -0.45, -0.4, 0.4, 0.45, 0.4},
 	visual = "mesh",
 	mesh = "mobs_panda.b3d",

penguin.lua

@@ -10,7 +10,7 @@ stepheight = 0.6,
 	reach = 1,
 	hp_min = 5,
 	hp_max = 10,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.2, -0.0, -0.2,  0.2, 0.5, 0.2},
 	visual = "mesh",
 	mesh = "mobs_penguin.b3d",

rat.lua

@@ -9,13 +9,14 @@ mobs:register_mob("mobs_animal:rat", {
 	passive = true,
 	hp_min = 1,
 	hp_max = 4,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.2, -1, -0.2, 0.2, -0.8, 0.2},
 	visual = "mesh",
 	mesh = "mobs_rat.b3d",
 	textures = {
 		{"mobs_rat.png"},
-		{"mobs_rat2.png"}
+		{"mobs_rat2.png"},
+		{"mobs_rat3.png"}
 	},
 	makes_footstep_sound = false,
 	sounds = {random = "mobs_rat"},

settingtypes.txt

@@ -9,3 +9,5 @@ mobs_animal.rat (Enable Rat) bool true
 mobs_animal.sheep (Enable Sheep) bool true
 mobs_animal.warthog (Enable Warthog) bool true
 mobs_animal.hairball (Enable Kitten Hairball drops) bool true
+
+mobs_animal.eat_grass_block (Enable Cow/Sheep eating grass blocks) bool false

sheep.lua

@@ -4,6 +4,15 @@
 local S = minetest.get_translator("mobs_animal")
 local random = math.random
 
+-- should sheep eat grass blocks and mess up the environment?
+
+local eat_gb = minetest.settings:get_bool("mobs_animal.eat_grass_block")
+local replace_what = { {"group:grass", "air", -1} }
+
+if eat_gb then
+	table.insert(replace_what, {"default:dirt_with_grass", "default:dirt", -2})
+end
+
 -- sheep colour table
 
 local all_colours = {
@@ -44,10 +53,7 @@ for _, col in ipairs(all_colours) do
 
 			for _2, col2 in ipairs(all_colours) do
 
-				if col2[1] == colr then
+				if col2[1] == colr then colr = col2[3] ; break end
-					colr = col2[3]
-					break
-				end
 			end
 		end
 
@@ -59,8 +65,7 @@ for _, col in ipairs(all_colours) do
 		local col_text = "^[multiply:" .. col_override
 
 		if gotten then
-			wool_shave_text = shav_text
+			wool_shave_text = shav_text ; col_text = ""
-			col_text = ""
 		end
 
 		-- results in unneccesary brackets for shaved but these are ignored by engine
@@ -80,8 +85,8 @@ for _, col in ipairs(all_colours) do
 		type = "animal",
 		passive = true,
 		hp_min = 8,
-		hp_max = 10,
+		hp_max = 12,
-		armor = 200,
+		armor = 100,
 		collisionbox = {-0.5, -1, -0.5, 0.5, 0.3, 0.5},
 		visual = "mesh",
 		mesh = "mobs_sheep.b3d",
@@ -90,7 +95,10 @@ for _, col in ipairs(all_colours) do
 		},
 		gotten_texture = {"mobs_sheep_base.png^mobs_sheep_shaved.png"},
 		makes_footstep_sound = true,
-		sounds = {random = "mobs_sheep"},
+		sounds = {
+			random = "mobs_sheep",
+			replace = "default_dig_crumbly"
+		},
 		walk_velocity = 1,
 		run_velocity = 2,
 		runaway = true,
@@ -116,10 +124,7 @@ for _, col in ipairs(all_colours) do
 		},
 		view_range = 8,
 		replace_rate = 10,
-		replace_what = {
+		replace_what = replace_what,
-			{"group:grass", "air", -1},
-			{"default:dirt_with_grass", "default:dirt", -2}
-		},
 		fear_height = 3,
 
 		on_replace = function(self, pos, oldnode, newnode)
@@ -276,6 +281,7 @@ for _, col in ipairs(all_colours) do
 
 				self.gotten = true -- shaved
 				self.drops = drops_gotten
+				self.food = 0 -- reset food
 
 				local obj = minetest.add_item(
 					self.object:get_pos(),
@@ -283,9 +289,7 @@ for _, col in ipairs(all_colours) do
 				)
 
 				if obj then
-
+					obj:set_velocity({x = random(-1, 1), y = 5, z = random(-1, 1)})
-					obj:set_velocity({
-							x = random(-1, 1), y = 5, z = random(-1, 1)})
 				end
 
 				item:add_wear(650) -- 100 uses

warthog.lua

@@ -13,9 +13,9 @@ mobs:register_mob("mobs_animal:pumba", {
 	attack_npcs = false,
 	reach = 2,
 	damage = 2,
-	hp_min = 5,
+	hp_min = 10,
 	hp_max = 15,
-	armor = 200,
+	armor = 100,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.95, 0.4},
 	visual = "mesh",
 	mesh = "mobs_pumba.b3d",