diff --git a/games/default/files/mobs_animal/bear.lua b/games/default/files/mobs_animal/bear.lua index 6899a6ccb..b498ff1e5 100644 --- a/games/default/files/mobs_animal/bear.lua +++ b/games/default/files/mobs_animal/bear.lua @@ -78,7 +78,7 @@ mobs:register_mob("mobs_animal:bear", { end return end - mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + --mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) end, after_activate = function(self, staticdata, def, dtime) -- replace bear using the old directx model diff --git a/games/default/files/mobs_animal/bunny.lua b/games/default/files/mobs_animal/bunny.lua index d8f206278..92b60892a 100644 --- a/games/default/files/mobs_animal/bunny.lua +++ b/games/default/files/mobs_animal/bunny.lua @@ -50,7 +50,7 @@ mobs:register_mob("mobs_animal:bunny", { -- feed or tame if mobs:feed_tame(self, clicker, 4, true, true) then return end if mobs:protect(self, clicker) then return end - if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end + --if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end -- Monty Python tribute local item = clicker:get_wielded_item() diff --git a/games/default/files/mobs_animal/chicken.lua b/games/default/files/mobs_animal/chicken.lua index 988d52a6f..997ec01c4 100644 --- a/games/default/files/mobs_animal/chicken.lua +++ b/games/default/files/mobs_animal/chicken.lua @@ -41,7 +41,7 @@ mobs:register_mob("mobs_animal:chicken", { if mobs:feed_tame(self, clicker, 8, true, true) then return end if mobs:protect(self, clicker) then return end - if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end + --if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end end, do_custom = function(self, dtime) @@ -67,16 +67,16 @@ mobs:register_mob("mobs_animal:chicken", { max_hear_distance = 5, }) end, - after_activate = function(self, staticdata, def, dtime) - -- replace chicken using the old directx model - if self.mesh == "mobs_chicken.x" then - local pos = self.object:get_pos() - if pos then - minetest.add_entity(pos, self.name) - self.object:remove() - end + after_activate = function(self, staticdata, def, dtime) + -- replace chicken using the old directx model + if self.mesh == "mobs_chicken.x" then + local pos = self.object:get_pos() + if pos then + minetest.add_entity(pos, self.name) + self.object:remove() end - end, + end + end, }) mobs:spawn({ @@ -90,7 +90,7 @@ mobs:spawn({ day_toggle = true, }) -mobs:register_egg("mobs_animal:chicken", "Chicken", "mobs_chicken_egg_inv.png", 1) +mobs:register_egg("mobs_animal:chicken", "Chicken egg", "mobs_chicken_egg_inv.png", 1) mobs:alias_mob("mobs:chicken", "mobs_animal:chicken") -- compatibility @@ -118,7 +118,7 @@ mobs:register_arrow("mobs_animal:egg_entity", { hit_node = function(self, pos, node) - if math.random(1, 10) > 1 then + if math.random(1, 8) > 1 then return end @@ -210,7 +210,7 @@ end -- egg minetest.register_node(":mobs:egg", { - description = "Chicken Egg", + description = "Egg", tiles = {"mobs_chicken_egg.png"}, inventory_image = "mobs_chicken_egg.png", visual_scale = 0.7, diff --git a/games/default/files/mobs_animal/cow.lua b/games/default/files/mobs_animal/cow.lua index 62efe9f62..329f026af 100644 --- a/games/default/files/mobs_animal/cow.lua +++ b/games/default/files/mobs_animal/cow.lua @@ -67,7 +67,7 @@ mobs:register_mob("mobs_animal:cow", { end if mobs:protect(self, clicker) then return end - if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end + --if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end local tool = clicker:get_wielded_item() local name = clicker:get_player_name() diff --git a/games/default/files/mobs_animal/dog.lua b/games/default/files/mobs_animal/dog.lua index 8a49f9561..87f946d16 100644 --- a/games/default/files/mobs_animal/dog.lua +++ b/games/default/files/mobs_animal/dog.lua @@ -54,7 +54,7 @@ mobs:register_mob("mobs_animal:wolf", { end return end - mobs:capture_mob(self, clicker, 0, 0, 80, true, nil) + --mobs:capture_mob(self, clicker, 0, 0, 80, true, nil) end }) @@ -141,7 +141,7 @@ mobs:register_mob("mobs_animal:dog", { end return end - mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + --mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) end }) diff --git a/games/default/files/mobs_animal/kitten.lua b/games/default/files/mobs_animal/kitten.lua index 007018f5b..dc0db9de1 100644 --- a/games/default/files/mobs_animal/kitten.lua +++ b/games/default/files/mobs_animal/kitten.lua @@ -47,7 +47,7 @@ mobs:register_mob("mobs_animal:kitten", { if mobs:feed_tame(self, clicker, 4, true, true) then return end if mobs:protect(self, clicker) then return end - if mobs:capture_mob(self, clicker, 50, 50, 90, false, nil) then return end + --if mobs:capture_mob(self, clicker, 50, 50, 90, false, nil) then return end end }) diff --git a/games/default/files/mobs_animal/pig.lua b/games/default/files/mobs_animal/pig.lua index 87520bea1..b1c34cdff 100644 --- a/games/default/files/mobs_animal/pig.lua +++ b/games/default/files/mobs_animal/pig.lua @@ -46,7 +46,7 @@ mobs:register_mob("mobs_animal:pig", { }, on_rightclick = function (self, clicker) mobs:feed_tame(self, clicker, 8, true, true) - mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) + --mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) end, }) diff --git a/games/default/files/mobs_animal/sheep.lua b/games/default/files/mobs_animal/sheep.lua index 2813ef0d1..ca0b518aa 100644 --- a/games/default/files/mobs_animal/sheep.lua +++ b/games/default/files/mobs_animal/sheep.lua @@ -190,7 +190,7 @@ for _, col in ipairs(all_colours) do if mobs:protect(self, clicker) then return end --are we capturing? - if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end + --if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end end })