Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Iron golem fixes' (#3309) from gldrk/MineClone2:master into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3309
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
hardcore_mode_test
ancientmarinerdev 2023-01-22 00:45:53 +00:00
parent 995679d7ae 5412206743
commit ce7d493890
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mods/ENTITIES/mcl_mobs/combat.lua
View File

@ -746,7 +746,7 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
local name = hitter:get_player_name() or "" local name = hitter:get_player_name() or ""
-- attack puncher and call other mobs for help -- attack puncher
if self.passive == false if self.passive == false
and self.state ~= "flop" and self.state ~= "flop"
and (self.child == false or self.type == "monster") and (self.child == false or self.type == "monster")
@ -758,37 +758,37 @@ function mob_class:on_punch(hitter, tflp, tool_capabilities, dir)
self:do_attack(hitter) self:do_attack(hitter)
self._aggro= true self._aggro= true
end end
end
-- alert others to the attack -- alert others to the attack
local objs = minetest.get_objects_inside_radius(hitter:get_pos(), self.view_range) local objs = minetest.get_objects_inside_radius(hitter:get_pos(), self.view_range)
local obj = nil local obj = nil
for n = 1, #objs do for n = 1, #objs do
obj = objs[n]:get_luaentity() obj = objs[n]:get_luaentity()
if obj then if obj then
-- only alert members of same mob or friends -- only alert members of same mob or friends
if obj.group_attack if obj.group_attack
and obj.state ~= "attack" and obj.state ~= "attack"
and obj.owner ~= name then and obj.owner ~= name then
if obj.name == self.name then if obj.name == self.name then
obj:do_attack(hitter) obj:do_attack(hitter)
elseif type(obj.group_attack) == "table" then elseif type(obj.group_attack) == "table" then
for i=1, #obj.group_attack do for i=1, #obj.group_attack do
if obj.name == obj.group_attack[i] then if obj.group_attack[i] == self.name then
obj._aggro = true obj._aggro = true
obj:do_attack(hitter) obj:do_attack(hitter)
break break
end
end end
end end
end end
end
-- have owned mobs attack player threat -- have owned mobs attack player threat
if obj.owner == name and obj.owner_loyal then if obj.owner == name and obj.owner_loyal then
obj:do_attack(self.object) obj:do_attack(self.object)
end
end end
end end
end end

4
mods/ENTITIES/mobs_mc/iron_golem.lua
View File

@ -15,7 +15,7 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
description = S("Iron Golem"), description = S("Iron Golem"),
type = "npc", type = "npc",
spawn_class = "passive", spawn_class = "passive",
passive = true, passive = false,
hp_min = 100, hp_min = 100,
hp_max = 100, hp_max = 100,
breath_max = -1, breath_max = -1,
@ -42,7 +42,7 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", {
damage = 14, damage = 14,
knock_back = false, knock_back = false,
reach = 3, reach = 3,
group_attack = true, group_attack = { "mobs_mc:villager" },
attacks_monsters = true, attacks_monsters = true,
attack_type = "dogfight", attack_type = "dogfight",
_got_poppy = false, _got_poppy = false,