diff --git a/files/mobs/mobs_animal/README.txt b/files/mobs/mobs_animal/README.txt index daac687..c827f7d 100644 --- a/files/mobs/mobs_animal/README.txt +++ b/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 diff --git a/files/mobs/mobs_animal/dog.lua b/files/mobs/mobs_animal/dog.lua index b4d9e9d..f955574 100644 --- a/files/mobs/mobs_animal/dog.lua +++ b/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 diff --git a/files/mobs/mobs_animal/init.lua b/files/mobs/mobs_animal/init.lua index 5db715c..9114b0e 100644 --- a/files/mobs/mobs_animal/init.lua +++ b/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 diff --git a/files/mobs/mobs_animal/locale/mobs_animal.ru.tr b/files/mobs/mobs_animal/locale/mobs_animal.ru.tr index 5f38aa4..53597ce 100644 --- a/files/mobs/mobs_animal/locale/mobs_animal.ru.tr +++ b/files/mobs/mobs_animal/locale/mobs_animal.ru.tr @@ -12,6 +12,3 @@ Cat's Egg=Яйцо Спавна Кошки Pig=Свинья Pig Egg=Яйцо Спавна Свиньи - -Sheep=Овца -Sheep Egg=Яйцо Спавна Овцы diff --git a/files/mobs/mobs_animal/models/mobs_sheep.b3d b/files/mobs/mobs_animal/models/mobs_sheep.b3d deleted file mode 100644 index bcf2dfc..0000000 Binary files a/files/mobs/mobs_animal/models/mobs_sheep.b3d and /dev/null differ diff --git a/files/mobs/mobs_animal/models/mobs_sheep_shaved.b3d b/files/mobs/mobs_animal/models/mobs_sheep_shaved.b3d deleted file mode 100644 index 857b406..0000000 Binary files a/files/mobs/mobs_animal/models/mobs_sheep_shaved.b3d and /dev/null differ diff --git a/files/mobs/mobs_animal/sheep.lua b/files/mobs/mobs_animal/sheep.lua deleted file mode 100644 index e02967d..0000000 --- a/files/mobs/mobs_animal/sheep.lua +++ /dev/null @@ -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 -}) diff --git a/files/mobs/mobs_animal/textures/mobs_sheep.png b/files/mobs/mobs_animal/textures/mobs_sheep.png deleted file mode 100644 index c46159b..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_black.png b/files/mobs/mobs_animal/textures/mobs_sheep_black.png deleted file mode 100644 index 0f76c6a..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_black.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_blue.png b/files/mobs/mobs_animal/textures/mobs_sheep_blue.png deleted file mode 100644 index 8cb004f..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_blue.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_brown.png b/files/mobs/mobs_animal/textures/mobs_sheep_brown.png deleted file mode 100644 index fa5e7b1..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_brown.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_cyan.png b/files/mobs/mobs_animal/textures/mobs_sheep_cyan.png deleted file mode 100644 index 9d7efa9..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_cyan.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_dark_green.png b/files/mobs/mobs_animal/textures/mobs_sheep_dark_green.png deleted file mode 100644 index a25f421..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_dark_green.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_dark_grey.png b/files/mobs/mobs_animal/textures/mobs_sheep_dark_grey.png deleted file mode 100644 index cdbda58..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_dark_grey.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_green.png b/files/mobs/mobs_animal/textures/mobs_sheep_green.png deleted file mode 100644 index 041a2ce..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_green.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_grey.png b/files/mobs/mobs_animal/textures/mobs_sheep_grey.png deleted file mode 100644 index 5d8c20d..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_grey.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_magenta.png b/files/mobs/mobs_animal/textures/mobs_sheep_magenta.png deleted file mode 100644 index 8942226..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_magenta.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_orange.png b/files/mobs/mobs_animal/textures/mobs_sheep_orange.png deleted file mode 100644 index 9244ef9..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_orange.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_pink.png b/files/mobs/mobs_animal/textures/mobs_sheep_pink.png deleted file mode 100644 index bea5ee8..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_pink.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_red.png b/files/mobs/mobs_animal/textures/mobs_sheep_red.png deleted file mode 100644 index 6cd9fd0..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_red.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_shaved.png b/files/mobs/mobs_animal/textures/mobs_sheep_shaved.png deleted file mode 100644 index ddf10e3..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_shaved.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_violet.png b/files/mobs/mobs_animal/textures/mobs_sheep_violet.png deleted file mode 100644 index 9b82339..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_violet.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_white.png b/files/mobs/mobs_animal/textures/mobs_sheep_white.png deleted file mode 100644 index ac8b396..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_white.png and /dev/null differ diff --git a/files/mobs/mobs_animal/textures/mobs_sheep_yellow.png b/files/mobs/mobs_animal/textures/mobs_sheep_yellow.png deleted file mode 100644 index 8c1ff2d..0000000 Binary files a/files/mobs/mobs_animal/textures/mobs_sheep_yellow.png and /dev/null differ