Mobs_animal: update

files/mobs/mobs_animal/README.txt

@@ -1,13 +1,13 @@
 MultiCraft Game mod: mobs_animal
 ================================
-See ../license.txt for license information.
+See ../mobs_redo/license.txt for license information.
 
 Adds Peaceful Mobs
 
 License of source code
 ----------------------
 Copyright (C) 2016 TenPlus1
-Copyright (C) 2019 MultiCraft Development Team
+Copyright (C) 2019-2021 MultiCraft Development Team
 
 Credits:
 --------
@@ -25,7 +25,7 @@ Models in this mod is NOT free and can be used only as part of the official Mult
 Allowed to be used in non-official builds ONLY for personal use.
 
 * Exceptions:
-"Bear", "Wolf", "Kitten" and "Bunny" (MIT)
+"Wolf", "Kitten" and "Bunny" (MIT)
 "Pig" by MultiCraft Development Team (CC-BY-SA 4.0)
 
 License of textures

files/mobs/mobs_animal/dog.lua

@@ -114,7 +114,7 @@ mobs:register_mob("mobs_animal:dog", {
 
 mobs:spawn({
 	name = "mobs_animal:wolf",
-	mobs_animal.spawn_nodes,
+	nodes = mobs_animal.spawn_nodes,
 	chance = 20000,
 	min_height = 0,
 	day_toggle = true

files/mobs/mobs_animal/init.lua

@@ -18,8 +18,7 @@ mobs_animal.spawn_nodes = {
 
 local path = minetest.get_modpath("mobs_animal")
 local name = {
-	"bunny", "dog",
-	"kitten", "pig", "sheep"
+	"bunny", "dog", "kitten", "pig"
 }
 
 for _, mob in pairs(name) do

files/mobs/mobs_animal/locale/mobs_animal.ru.tr

@@ -12,6 +12,3 @@ Cat's Egg=Яйцо Спавна Кошки
 
 Pig=Свинья
 Pig Egg=Яйцо Спавна Свиньи
-
-Sheep=Овца
-Sheep Egg=Яйцо Спавна Овцы

files/mobs/mobs_animal/sheep.lua

@@ -1,190 +0,0 @@
-local S = mobs_animal.S
-
-local dyes = dye.dyes
-
-for i = 1, #dyes do
-	local name = unpack(dyes[i])
-
-	mobs:register_mob("mobs_animal:sheep_" .. name, {
-		description = S"Sheep",
-		stay_near = {"farming:straw", 10},
-		type = "animal",
-		passive = true,
-		hp_min = 6,
-		hp_max = 10,
-		collisionbox = {-0.4, -1, -0.4, 0.4, 0.3, 0.4},
-		visual = "mesh",
-		mesh = "mobs_sheep.b3d",
-		textures = {"mobs_sheep.png^mobs_sheep_" .. name .. ".png"},
-		gotten_texture = {"mobs_sheep.png^mobs_sheep_shaved.png"},
-		gotten_mesh = "mobs_sheep_shaved.b3d",
-		makes_footstep_sound = true,
-		sounds = {
-			random = "mobs_sheep",
-			damage = "mobs_sheep_angry"
-		},
-		runaway = true,
-		jump_height = 3,
-		drops = function(pos)
-			if rawget(_G, "experience") then
-				experience.add_orb(math.random(2, 4), pos)
-			end
-			return {
-				{name = "mobs:meat_raw"},
-				{name = "mobs:meat_raw", chance = 2},
-				{name = "wool:" .. name}
-			}
-		end,
-		animation = {
-			speed_normal = 15,	speed_run = 15,
-			stand_start = 0,	stand_end = 80,
-			walk_start = 81,	walk_end = 100
-		},
-		fear_height = 3,
-		follow = {"group:flora", "farming:wheat"},
-		replace_rate = 10,
-		replace_what = {
-			{"group:flora", "air", -1},
-			{"default:dirt_with_grass", "default:dirt", -2}
-		},
-
-		on_replace = function(self)
-			self.food = (self.food or 0) + 1
-
-			-- if the sheep replaces 8x grass, it will regrow wool
-			if self.food >= 8 and self.gotten then
-				self.food = 0
-				self.gotten = false
-
-				self.object:set_properties({
-					textures = {"mobs_sheep.png^mobs_sheep_" .. name .. ".png"},
-					mesh = "mobs_sheep.b3d"
-				})
-			end
-		end,
-
-		on_rightclick = function(self, clicker)
-			-- feed or tame
-			if mobs:feed_tame(self, clicker, 8, true, true) then
-				-- if feed 7x, the sheep regrow wool
-				if self.food and self.food > 6 then
-					self.gotten = false
-					self.object:set_properties({
-						textures = {"mobs_sheep.png^mobs_sheep_" .. name .. ".png"},
-						mesh = "mobs_sheep.b3d"
-					})
-				end
-				return
-			end
-
-			local item = clicker:get_wielded_item()
-			local itemname = item:get_name()
-			local player = clicker:get_player_name()
-			local pos = self.object:get_pos()
-
-			-- haircut
-			if itemname == "mobs:shears"
-					and not self.gotten
-					and not self.child
-					and self.tamed
-					and player == self.owner then
-				minetest.item_drop(
-					ItemStack("wool:" .. name .. " " .. math.random(3)), nil, pos)
-				item:add_wear(65535/100) -- 100 uses
-				clicker:set_wielded_item(item)
-				self.object:set_properties({
-					textures = {"mobs_sheep.png^mobs_sheep_shaved.png"},
-					mesh = "mobs_sheep_shaved.b3d"
-				})
-				self.gotten = true -- shaved
-				return
-			end
-
-			-- coloring
-			if itemname:find("dye:")
-					and not self.gotten
-					and not self.child
-					and self.tamed
-					and player == self.owner then
-				local color = itemname:split(":")[2]
-				if name == color then return end
-				local mob = minetest.add_entity(pos, "mobs_animal:sheep_" .. color)
-				local infotext, nametag = self.infotext or "", self.nametag or ""
-				self.object:remove()
-				local ent = mob:get_luaentity()
-				ent.object:set_properties({
-					infotext = infotext,
-					nametag = nametag
-				})
-				ent.infotext = infotext
-				ent.nametag = nametag
-				ent.owner = player
-				ent.tamed = true
-
-				-- take item
-				if not mobs.is_creative(player) or
-						not minetest.is_singleplayer() then
-					item:take_item()
-					clicker:set_wielded_item(item)
-				end
-				return
-			end
-
-		--	if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end
-		end
-	})
-
-	minetest.register_alias("mobs_animal:sheep_" .. name, "mobs_animal:sheep_white")
-end
-
-mobs:register_egg("mobs_animal:sheep_white", S"Sheep Egg", "wool_white.png", true)
-
-mobs:spawn({
-	name = "mobs_animal:sheep_white",
-	mobs_animal.spawn_nodes,
-	min_light = 7,
-	chance = 100000,
-	min_height = 0,
-	day_toggle = true
-})
-
-mobs:spawn({
-	name = "mobs_animal:sheep_grey",
-	mobs_animal.spawn_nodes,
-	min_light = 7,
-	chance = 100000,
-	min_height = 0,
-	day_toggle = true
-})
-
-mobs:spawn({
-	name = "mobs_animal:sheep_dark_grey",
-	mobs_animal.spawn_nodes,
-	min_light = 7,
-	chance = 100000,
-	min_height = 0,
-	day_toggle = true
-})
-
-local nodes = {
-	"default:dirt", "default:sand", "default:redsand",
-	"default:dirt_with_grass", "default:dirt_with_dry_grass"
-}
-
-mobs:spawn({
-	name = "mobs_animal:sheep_black",
-	nodes = nodes,
-	min_light = 7,
-	chance = 100000,
-	min_height = 0,
-	day_toggle = true
-})
-
-mobs:spawn({
-	name = "mobs_animal:sheep_brown",
-	nodes = nodes,
-	min_light = 7,
-	chance = 100000,
-	min_height = 0,
-	day_toggle = true
-})