Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-28 13:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

non-tamable mobs will not send tame param to feed_tame func,

Browse Source 
changed event flow so it tries in order: heal, tame, breed, grow child
This commit is contained in:
SumianVoice 2022-07-19 14:05:04 +10:00 committed by cora
parent e5c1da4380
commit 9d52fed357
6 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -4371,7 +4371,7 @@ function mcl_mobs:feed_tame(self, clicker, feed_count, breed, tame, notake)
-- increase health
if self.health < self.hp_max then
if not consume_food and self.health < self.hp_max then
consume_food = true
self.health = min(self.health + 4, self.hp_max)
@ -4381,41 +4381,40 @@ function mcl_mobs:feed_tame(self, clicker, feed_count, breed, tame, notake)
self.object:set_hp(self.health)
end
update_tag(self)
-- make children grow quicker
if self.child == true then
consume_food = true
-- deduct 10% of the time to adulthood
self.hornytimer = self.hornytimer + ((CHILD_GROW_TIME - self.hornytimer) * 0.1)
end
-- feed and tame
self.food = (self.food or 0) + 1
if not self.child and self.food >= feed_count then
if self.food >= feed_count then
self.food = 0
if breed and self.hornytimer == 0 and not self.horny then
self.horny = true
consume_food = true
end
if tame then
self.tamed = true
if not self.owner or self.owner == "" then
self.owner = clicker:get_player_name()
consume_food = true
end
end
if breed and not self.child and not consume_food
and self.hornytimer == 0 and not self.horny then
self.horny = true
consume_food = true
end
-- make sound when fed so many times
mob_sound(self, "random", true)
end
update_tag(self)
-- make children grow quicker
if not consume_food and self.child == true then
consume_food = true
-- deduct 10% of the time to adulthood
self.hornytimer = self.hornytimer + ((CHILD_GROW_TIME - self.hornytimer) * 0.1)
end
-- if not in creative then take item if it was used
if not minetest.is_creative_enabled(clicker:get_player_name()) and consume_food then

2
mods/ENTITIES/mobs_mc/chicken.lua
View File

@ -74,7 +74,7 @@ mcl_mobs:register_mob("mobs_mc:chicken", {
fear_height = 4,
on_rightclick = function(self, clicker)
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
if mcl_mobs:protect(self, clicker) then return end
if mcl_mobs:capture_mob(self, clicker, 0, 60, 5, false, nil) then return end
end,

4
mods/ENTITIES/mobs_mc/cow+mooshroom.lua
View File

@ -48,7 +48,7 @@ local cow_def = {
run_end = 40,
},
on_rightclick = function(self, clicker)
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
if mcl_mobs:protect(self, clicker) then return end
if self.child then
@ -87,7 +87,7 @@ mooshroom_def.spawn_in_group_min = 4
mooshroom_def.spawn_in_group = 8
mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, {"mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } }
mooshroom_def.on_rightclick = function(self, clicker)
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
if mcl_mobs:protect(self, clicker) then return end
if self.child then

2
mods/ENTITIES/mobs_mc/pig.lua
View File

@ -99,7 +99,7 @@ mcl_mobs:register_mob("mobs_mc:pig", {
local wielditem = clicker:get_wielded_item()
-- Feed pig
if wielditem:get_name() ~= "mcl_mobitems:carrot_on_a_stick" then
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
end
if mcl_mobs:protect(self, clicker) then return end

2
mods/ENTITIES/mobs_mc/rabbit.lua
View File

@ -75,7 +75,7 @@ local rabbit = {
},
on_rightclick = function(self, clicker)
-- Feed, tame protect or capture
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
if mcl_mobs:protect(self, clicker) then return end
if mcl_mobs:capture_mob(self, clicker, 0, 50, 80, false, nil) then return end
end,

2
mods/ENTITIES/mobs_mc/sheep.lua
View File

@ -195,7 +195,7 @@ mcl_mobs:register_mob("mobs_mc:sheep", {
on_rightclick = function(self, clicker)
local item = clicker:get_wielded_item()
if mcl_mobs:feed_tame(self, clicker, 1, true, true) then return end
if mcl_mobs:feed_tame(self, clicker, 1, true, false) then return end
if mcl_mobs:protect(self, clicker) then return end
if item:get_name() == "mcl_tools:shears" and not self.gotten and not self.child then