Fix indentation in witch.lua
This commit is contained in:
cora
parent
729906866f
commit
3e351a6e10
@ -10,136 +10,130 @@ local S = minetest.get_translator("mobs_mc")
|
||||
--###################
|
||||
|
||||
local potion_props = {
|
||||
visual = "wielditem",
|
||||
visual_size = { x = 0.3 / 5, y = 0.3 / 5, },
|
||||
physical = false,
|
||||
pointable = false,
|
||||
wield_item = "mcl_potions:water",
|
||||
visual = "wielditem",
|
||||
visual_size = { x = 0.3 / 5, y = 0.3 / 5, },
|
||||
physical = false,
|
||||
pointable = false,
|
||||
wield_item = "mcl_potions:water",
|
||||
}
|
||||
|
||||
local witch_potion_entity = {
|
||||
initial_properties = potion_props,
|
||||
on_step = function (self, dtime)
|
||||
local parent = self.object:get_attach ()
|
||||
if not parent then
|
||||
self.object:remove ()
|
||||
return
|
||||
end
|
||||
end,
|
||||
initial_properties = potion_props,
|
||||
on_step = function (self)
|
||||
local parent = self.object:get_attach ()
|
||||
if not parent then
|
||||
self.object:remove ()
|
||||
return
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
||||
local witch_base_drops = {
|
||||
{name = "mcl_potions:glass_bottle", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_nether:glowstone_dust", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_mobitems:gunpowder", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mesecons:redstone", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_mobitems:spider_eye", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_core:sugar", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_core:stick", chance = 4, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_potions:glass_bottle", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_nether:glowstone_dust", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_mobitems:gunpowder", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mesecons:redstone", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_mobitems:spider_eye", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_core:sugar", chance = 8, min = 0, max = 2, looting = "common",},
|
||||
{name = "mcl_core:stick", chance = 4, min = 0, max = 2, looting = "common",},
|
||||
}
|
||||
|
||||
minetest.register_entity ("mobs_mc:witch_potion", witch_potion_entity)
|
||||
|
||||
local function witch_equip_potion (self, potion)
|
||||
self:add_physics_factor ("walk_velocity", "mobs_mc:witch_potion_penalty", 0.75)
|
||||
self:add_physics_factor ("run_velocity", "mobs_mc:witch_potion_penalty", 0.75)
|
||||
self:add_physics_factor ("walk_velocity", "mobs_mc:witch_potion_penalty", 0.75)
|
||||
self:add_physics_factor ("run_velocity", "mobs_mc:witch_potion_penalty", 0.75)
|
||||
|
||||
self._held_potion = potion
|
||||
local object = minetest.add_entity (self.object:get_pos (),
|
||||
"mobs_mc:witch_potion")
|
||||
if object then
|
||||
object:set_properties ({ wield_item = potion, })
|
||||
object:set_attach (self.object, "body",
|
||||
{ x = 0, y = 1.65, z = 1.2, },
|
||||
vector.zero ())
|
||||
self._held_potion_object = object
|
||||
end
|
||||
-- Must wait 1.5 seconds before consuming this potion.
|
||||
self._witch_potion_check = 0
|
||||
-- Arrange that there be a chance of the potion being dropped with
|
||||
-- this witch.
|
||||
local copy = table.copy (witch_base_drops)
|
||||
copy[#copy] = { name = potion, chance = 11, min = 1, max = 1, }
|
||||
self.drops = copy
|
||||
self._held_potion = potion
|
||||
local object = minetest.add_entity (self.object:get_pos (), "mobs_mc:witch_potion")
|
||||
if object then
|
||||
object:set_properties ({ wield_item = potion, })
|
||||
object:set_attach (self.object, "body", { x = 0, y = 1.65, z = 1.2, }, vector.zero ())
|
||||
self._held_potion_object = object
|
||||
end
|
||||
-- Must wait 1.5 seconds before consuming this potion.
|
||||
self._witch_potion_check = 0
|
||||
-- Arrange that there be a chance of the potion being dropped with
|
||||
-- this witch.
|
||||
local copy = table.copy (witch_base_drops)
|
||||
copy[#copy] = { name = potion, chance = 11, min = 1, max = 1, }
|
||||
self.drops = copy
|
||||
end
|
||||
|
||||
local function witch_consume_potion (self, potion)
|
||||
self:remove_physics_factor ("walk_velocity", "mobs_mc:witch_potion_penalty")
|
||||
self:remove_physics_factor ("run_velocity", "mobs_mc:witch_potion_penalty")
|
||||
mcl_potions.consume_potion (self.object, potion, 0, 0)
|
||||
if self._held_potion_object then
|
||||
self._held_potion_object:remove ()
|
||||
self._held_potion_object = nil
|
||||
end
|
||||
-- Reset the timer.
|
||||
self._witch_potion_check = 0
|
||||
self._held_potion = nil
|
||||
-- Play a sound.
|
||||
local sound = {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = 1 + math.random (-10, 10) * 0.005,
|
||||
object = self.object,
|
||||
}
|
||||
minetest.sound_play ("survival_thirst_drink", sound, true)
|
||||
self.drops = witch_base_drops
|
||||
self:remove_physics_factor ("walk_velocity", "mobs_mc:witch_potion_penalty")
|
||||
self:remove_physics_factor ("run_velocity", "mobs_mc:witch_potion_penalty")
|
||||
mcl_potions.consume_potion (self.object, potion, 0, 0)
|
||||
if self._held_potion_object then self._held_potion_object:remove ()
|
||||
self._held_potion_object = nil
|
||||
end
|
||||
-- Reset the timer.
|
||||
self._witch_potion_check = 0
|
||||
self._held_potion = nil
|
||||
-- Play a sound.
|
||||
local sound = {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = 1 + math.random (-10, 10) * 0.005,
|
||||
object = self.object,
|
||||
}
|
||||
minetest.sound_play ("survival_thirst_drink", sound, true)
|
||||
self.drops = witch_base_drops
|
||||
end
|
||||
|
||||
local witch_potion_items = {
|
||||
{
|
||||
{
|
||||
potion = "mcl_potions:water_breathing",
|
||||
test = function (self)
|
||||
local head_nodedef = minetest.registered_nodes[self.head_in]
|
||||
return (not mcl_potions.has_effect (self.object,
|
||||
"water_breathing")
|
||||
and head_nodedef and head_nodedef.drowning > 0)
|
||||
local head_nodedef = minetest.registered_nodes[self.head_in]
|
||||
return (not mcl_potions.has_effect (self.object, "water_breathing") and head_nodedef and head_nodedef.drowning > 0)
|
||||
end,
|
||||
chance = 15,
|
||||
},
|
||||
{
|
||||
},
|
||||
{
|
||||
potion = "mcl_potions:fire_resistance",
|
||||
test = function (self)
|
||||
return (mcl_burning.is_burning (self.object)
|
||||
and not mcl_potions.has_effect (self.object,
|
||||
"fire_resistance"))
|
||||
return (mcl_burning.is_burning (self.object)
|
||||
and not mcl_potions.has_effect (self.object,
|
||||
"fire_resistance"))
|
||||
end,
|
||||
chance = 15,
|
||||
},
|
||||
{
|
||||
},
|
||||
{
|
||||
potion = "mcl_potions:healing",
|
||||
test = function (self)
|
||||
return self.health < self.object:get_properties ().hp_max
|
||||
return self.health < self.object:get_properties ().hp_max
|
||||
end,
|
||||
chance = 5,
|
||||
},
|
||||
{
|
||||
},
|
||||
{
|
||||
potion = "mcl_potions:swiftness",
|
||||
test = function (self)
|
||||
if self.attack then
|
||||
if self.attack then
|
||||
if mcl_potions.has_effect (self.object, "swiftness") then
|
||||
return false
|
||||
return false
|
||||
end
|
||||
local pos = self.attack:get_pos ()
|
||||
local dist
|
||||
= pos and vector.distance (pos, self.object:get_pos ())
|
||||
= pos and vector.distance (pos, self.object:get_pos ())
|
||||
if pos and dist > 11 then
|
||||
return true
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
end,
|
||||
chance = 50,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local function check_behind (self, obj_pos, target_pos)
|
||||
local look_dir = self.object:get_yaw ()
|
||||
local v = { z = math.cos (look_dir), y = 0, x = -math.sin (look_dir), }
|
||||
v = vector.normalize (v)
|
||||
local x = vector.direction (obj_pos, target_pos)
|
||||
local look_dir = self.object:get_yaw ()
|
||||
local v = { z = math.cos (look_dir), y = 0, x = -math.sin (look_dir), }
|
||||
v = vector.normalize (v)
|
||||
local x = vector.direction (obj_pos, target_pos)
|
||||
|
||||
-- Dot product.
|
||||
return vector.dot (v, x) <= 0
|
||||
-- Dot product.
|
||||
return vector.dot (v, x) <= 0
|
||||
end
|
||||
|
||||
mcl_mobs.register_mob("mobs_mc:witch", {
|
||||
@ -199,51 +193,46 @@ mcl_mobs.register_mob("mobs_mc:witch", {
|
||||
avoid_distance = 6,
|
||||
_witch_potion_check = 0,
|
||||
do_attack = function (self, obj)
|
||||
local l = obj:get_luaentity ()
|
||||
-- Raid participants should never attack comrades in arms.
|
||||
if self.raidmob and l and l.raidmob then
|
||||
local l = obj:get_luaentity ()
|
||||
-- Raid participants should never attack comrades in arms.
|
||||
if self.raidmob and l and l.raidmob then
|
||||
return
|
||||
end
|
||||
mcl_mobs.mob_class.do_attack (self, obj)
|
||||
end
|
||||
mcl_mobs.mob_class.do_attack (self, obj)
|
||||
end,
|
||||
attack_players_and_npcs = function (self)
|
||||
end,
|
||||
attack_specific = function (self)
|
||||
local attack_players = self:attack_players_allowed ()
|
||||
if self.state == "attack" then
|
||||
local attack_players = self:attack_players_allowed ()
|
||||
if self.state == "attack" then
|
||||
-- A target has already been selected.
|
||||
return
|
||||
end
|
||||
|
||||
-- Ordinary witches only attack players, but witches
|
||||
-- spawned in raids also seek out nearby illagers
|
||||
-- participating in raids to heal them.
|
||||
|
||||
local pos = self.object:get_pos ()
|
||||
local objs
|
||||
= minetest.get_objects_inside_radius (pos, self.view_range)
|
||||
table.shuffle (objs)
|
||||
for _, obj in pairs (objs) do
|
||||
if self:line_of_sight (pos, obj:get_pos(), 2) then
|
||||
local l = obj:get_luaentity ()
|
||||
if attack_players and obj:is_player ()
|
||||
and (not self._player_cooldown or not self.raidmob) then
|
||||
self:do_attack (obj)
|
||||
break
|
||||
elseif self.raidmob and l and l.raidmob
|
||||
and (l.name == "mobs_mc:pillager"
|
||||
or l.name == "mobs_mc:vindicator"
|
||||
or l.name == "mobs_mc:evoker") then
|
||||
if not self._illager_cooldown then
|
||||
-- Prohibit selecting illager targets
|
||||
-- again for a period of 5 seconds.
|
||||
self._illager_cooldown = 0
|
||||
self:do_attack (obj)
|
||||
break
|
||||
end
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- Ordinary witches only attack players, but witches
|
||||
-- spawned in raids also seek out nearby illagers
|
||||
-- participating in raids to heal them.
|
||||
|
||||
local pos = self.object:get_pos ()
|
||||
local objs = minetest.get_objects_inside_radius (pos, self.view_range)
|
||||
table.shuffle (objs)
|
||||
for _, obj in pairs (objs) do
|
||||
if self:line_of_sight (pos, obj:get_pos(), 2) then
|
||||
local l = obj:get_luaentity ()
|
||||
if attack_players and obj:is_player () and (not self._player_cooldown or not self.raidmob) then
|
||||
self:do_attack (obj)
|
||||
break
|
||||
elseif self.raidmob and l and l.raidmob and (l.name == "mobs_mc:pillager" or l.name == "mobs_mc:vindicator" or l.name == "mobs_mc:evoker") then
|
||||
if not self._illager_cooldown then
|
||||
-- Prohibit selecting illager targets
|
||||
-- again for a period of 5 seconds.
|
||||
self._illager_cooldown = 0
|
||||
self:do_attack (obj)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
deal_damage = function(self, damage, mcl_reason)
|
||||
local factor = 1
|
||||
@ -251,102 +240,94 @@ mcl_mobs.register_mob("mobs_mc:witch", {
|
||||
self.health = self.health - factor*damage
|
||||
end,
|
||||
do_custom = function (self, dtime)
|
||||
-- Increment illager cooldown period and ascertain whether
|
||||
-- it has elapsed. Minecraft's period appears to be 200
|
||||
-- ticks divided by two, i.e., 5 seconds.
|
||||
if self._illager_cooldown then
|
||||
self._illager_cooldown = self._illager_cooldown + dtime
|
||||
if self._illager_cooldown >= 5 then
|
||||
self._illager_cooldown = nil
|
||||
-- Increment illager cooldown period and ascertain whether
|
||||
-- it has elapsed. Minecraft's period appears to be 200
|
||||
-- ticks divided by two, i.e., 5 seconds.
|
||||
if self._illager_cooldown then
|
||||
self._illager_cooldown = self._illager_cooldown + dtime
|
||||
if self._illager_cooldown >= 5 then
|
||||
self._illager_cooldown = nil
|
||||
end
|
||||
end
|
||||
-- Check for potions to consume every minecraft tick.
|
||||
if self._held_potion then
|
||||
self._witch_potion_check = self._witch_potion_check + dtime
|
||||
if self._witch_potion_check < 1.5 then
|
||||
return
|
||||
end
|
||||
-- Finish consuming this potion.
|
||||
witch_consume_potion (self, self._held_potion)
|
||||
end
|
||||
end
|
||||
-- Check for potions to consume every minecraft tick.
|
||||
if self._held_potion then
|
||||
self._witch_potion_check = self._witch_potion_check + dtime
|
||||
if self._witch_potion_check < 1.5 then
|
||||
return
|
||||
if self._witch_potion_check < 0.05 then
|
||||
return
|
||||
end
|
||||
-- Finish consuming this potion.
|
||||
witch_consume_potion (self, self._held_potion)
|
||||
end
|
||||
self._witch_potion_check = self._witch_potion_check + dtime
|
||||
if self._witch_potion_check < 0.05 then
|
||||
return
|
||||
end
|
||||
self._witch_potion_check = 0
|
||||
for _, item in ipairs (witch_potion_items) do
|
||||
local random = math.random (1, 100)
|
||||
if item.chance >= random and item.test (self) then
|
||||
witch_equip_potion (self, item.potion)
|
||||
break
|
||||
self._witch_potion_check = 0
|
||||
for _, item in ipairs (witch_potion_items) do
|
||||
local random = math.random (1, 100)
|
||||
if item.chance >= random and item.test (self) then
|
||||
witch_equip_potion (self, item.potion)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
shoot_arrow = function(self, p, vec)
|
||||
local effect_potion = "mcl_potions:harming_splash"
|
||||
local target_hp, target_pos
|
||||
local effect_potion = "mcl_potions:harming_splash"
|
||||
local target_hp, target_pos
|
||||
|
||||
if not self.attack or self._held_potion then
|
||||
return
|
||||
end
|
||||
|
||||
-- Throw splash potions of harming at players by default.
|
||||
-- If they've yet to receive poison and are at 4 hearts or
|
||||
-- better, throw poison, and if they are beyond 8 blocks,
|
||||
-- try to slow them with slowness potion. If players
|
||||
-- approach too near, disable them with weakness 25% of
|
||||
-- the time.
|
||||
local entity
|
||||
target_hp = self.attack:is_player () and self.attack:get_hp ()
|
||||
target_pos = self.attack:get_pos ()
|
||||
if not target_hp then
|
||||
entity = self.attack:get_luaentity ()
|
||||
target_hp = entity.is_mob and entity.health or 0
|
||||
end
|
||||
|
||||
-- Ref: https://minecraft.fandom.com/wiki/Witch#Behavior
|
||||
local pos = self.object:get_pos ()
|
||||
local dist = vector.distance (target_pos, pos)
|
||||
if entity
|
||||
and (entity.name == "mobs_mc:pillager"
|
||||
or entity.name == "mobs_mc:vindicator"
|
||||
or entity.name == "mobs_mc:evoker") then
|
||||
-- If it's a raid mob who is being attacked, give it
|
||||
-- either regeneration or instant health subject to
|
||||
-- its remaining health.
|
||||
if target_hp and target_hp <= 4.0 then
|
||||
effect_potion = "mcl_potions:healing_splash"
|
||||
else
|
||||
effect_potion = "mcl_potions:regeneration_splash"
|
||||
if not self.attack or self._held_potion then
|
||||
return
|
||||
end
|
||||
elseif dist >= 8
|
||||
and not mcl_potions.has_effect (self.attack, "slowness") then
|
||||
effect_potion = "mcl_potions:slowness_splash"
|
||||
elseif target_hp >= 8 and not mcl_potions.has_effect (self.attack,
|
||||
"poison") then
|
||||
effect_potion = "mcl_potions:poison_splash"
|
||||
elseif dist <= 3
|
||||
and not mcl_potions.has_effect (self.attack, "weakness")
|
||||
and math.random (1, 4) == 1 then
|
||||
effect_potion = "mcl_potions:weakness_splash"
|
||||
end
|
||||
|
||||
-- Adjust for deceleration and entity movement.
|
||||
local eye_height = self.attack:get_properties ().eye_height or 0
|
||||
local movement = self.attack:get_velocity ()
|
||||
movement.y = 0 -- But don't compensate for vertical movement.
|
||||
local pos_adj = target_pos + movement
|
||||
-- Throw splash potions of harming at players by default.
|
||||
-- If they've yet to receive poison and are at 4 hearts or
|
||||
-- better, throw poison, and if they are beyond 8 blocks,
|
||||
-- try to slow them with slowness potion. If players
|
||||
-- approach too near, disable them with weakness 25% of
|
||||
-- the time.
|
||||
local entity
|
||||
target_hp = self.attack:is_player () and self.attack:get_hp ()
|
||||
target_pos = self.attack:get_pos ()
|
||||
if not target_hp then
|
||||
entity = self.attack:get_luaentity ()
|
||||
target_hp = entity.is_mob and entity.health or 0
|
||||
end
|
||||
|
||||
-- But never throw potions behind oneself.
|
||||
if not check_behind (self, pos, pos_adj) then
|
||||
target_pos = pos_adj
|
||||
end
|
||||
-- Ref: https://minecraft.fandom.com/wiki/Witch#Behavior
|
||||
local pos = self.object:get_pos ()
|
||||
local dist = vector.distance (target_pos, pos)
|
||||
if entity and (entity.name == "mobs_mc:pillager" or entity.name == "mobs_mc:vindicator" or entity.name == "mobs_mc:evoker") then
|
||||
-- If it's a raid mob who is being attacked, give it
|
||||
-- either regeneration or instant health subject to
|
||||
-- its remaining health.
|
||||
if target_hp and target_hp <= 4.0 then
|
||||
effect_potion = "mcl_potions:healing_splash"
|
||||
else
|
||||
effect_potion = "mcl_potions:regeneration_splash"
|
||||
end
|
||||
elseif dist >= 8 and not mcl_potions.has_effect (self.attack, "slowness") then
|
||||
effect_potion = "mcl_potions:slowness_splash"
|
||||
elseif target_hp >= 8 and not mcl_potions.has_effect (self.attack, "poison") then
|
||||
effect_potion = "mcl_potions:poison_splash"
|
||||
elseif dist <= 3 and not mcl_potions.has_effect (self.attack, "weakness") and math.random (1, 4) == 1 then
|
||||
effect_potion = "mcl_potions:weakness_splash"
|
||||
end
|
||||
|
||||
target_pos.y = target_pos.y + eye_height
|
||||
local d = vector.subtract (target_pos, p)
|
||||
d.y = d.y + vector.length (d) * 0.2
|
||||
mcl_potions.throw_splash (effect_potion, vector.normalize (d), p,
|
||||
self.object, 0, 0)
|
||||
-- Adjust for deceleration and entity movement.
|
||||
local eye_height = self.attack:get_properties ().eye_height or 0
|
||||
local movement = self.attack:get_velocity ()
|
||||
movement.y = 0 -- But don't compensate for vertical movement.
|
||||
local pos_adj = target_pos + movement
|
||||
|
||||
-- But never throw potions behind oneself.
|
||||
if not check_behind (self, pos, pos_adj) then
|
||||
target_pos = pos_adj
|
||||
end
|
||||
|
||||
target_pos.y = target_pos.y + eye_height
|
||||
local d = vector.subtract (target_pos, p)
|
||||
d.y = d.y + vector.length (d) * 0.2
|
||||
mcl_potions.throw_splash (effect_potion, vector.normalize (d), p, self.object, 0, 0)
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user