Further wither adjustments

This commit is contained in:
the-real-herowl 2023-08-09 11:43:00 +02:00 committed by the-real-herowl
parent a1b6819756
commit c9dc12b081
3 changed files with 64 additions and 10 deletions

View File

@ -35,14 +35,16 @@ local function remove_schem(pos, schem)
end end
end end
local function wither_spawn(pos) local function wither_spawn(pos, player)
for _, d in pairs(dim) do for _, d in pairs(dim) do
for i = 0, 2 do for i = 0, 2 do
local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i}) local p = vector.add(pos, {x = 0, y = -2, z = 0, [d] = -i})
local schem = wither_spawn_schems[d] local schem = wither_spawn_schems[d]
if check_schem(p, schem) then if check_schem(p, schem) then
remove_schem(p, schem) remove_schem(p, schem)
minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither") local wither = minetest.add_entity(vector.add(p, {x = 0, y = 1, z = 0, [d] = 1}), "mobs_mc:wither")
local witherer = wither:get_luaentity()
witherer._spawner = player
local objects = minetest.get_objects_inside_radius(pos, 20) local objects = minetest.get_objects_inside_radius(pos, 20)
for _, players in ipairs(objects) do for _, players in ipairs(objects) do
if players:is_player() then if players:is_player() then
@ -59,7 +61,7 @@ local old_on_place = wither_head.on_place
function wither_head.on_place(itemstack, placer, pointed) function wither_head.on_place(itemstack, placer, pointed)
local n = minetest.get_node(vector.offset(pointed.above,0,-1,0)) local n = minetest.get_node(vector.offset(pointed.above,0,-1,0))
if n and n.name == "mcl_nether:soul_sand" then if n and n.name == "mcl_nether:soul_sand" then
minetest.after(0, wither_spawn, pointed.above) minetest.after(0, wither_spawn, pointed.above, placer)
end end
return old_on_place(itemstack, placer, pointed) return old_on_place(itemstack, placer, pointed)
end end

View File

@ -59,7 +59,7 @@ mcl_mobs.register_mob("mobs_mc:wither", {
arrow = "mobs_mc:wither_skull", arrow = "mobs_mc:wither_skull",
reach = 5, reach = 5,
shoot_interval = 0.5, shoot_interval = 0.5,
shoot_offset = -1, shoot_offset = -0.5,
animation = { animation = {
walk_speed = 12, run_speed = 12, stand_speed = 12, walk_speed = 12, run_speed = 12, stand_speed = 12,
stand_start = 0, stand_end = 20, stand_start = 0, stand_end = 20,
@ -69,14 +69,40 @@ mcl_mobs.register_mob("mobs_mc:wither", {
harmed_by_heal = true, harmed_by_heal = true,
is_boss = true, is_boss = true,
do_custom = function(self) do_custom = function(self)
local rand_factor
if self._spawner then
local pos = self.object:get_pos()
local spw = self._spawner:get_pos()
local dist = vector.distance(pos, spw)
if dist > 60 then -- teleport to the player who spawned the wither
local R = 10
pos.x = spw.x + math.random(-r, r)
pos.y = spw.y + math.random(-r, r)
pos.z = spw.z + math.random(-r, r)
self.object:set_pos(pos)
end
else
-- TODO implement a death timer here?
end
if self.health < (self.hp_max / 2) then if self.health < (self.hp_max / 2) then
self.base_texture = "mobs_mc_wither_half_health.png" self.base_texture = "mobs_mc_wither_half_health.png"
self.fly = false self.fly = false
self.object:set_properties({textures={self.base_texture}}) self.armor = {undead = 80, fleshy = 80} -- TODO replace with changed arrow resistance
self.armor = {undead = 80, fleshy = 80} rand_factor = 3
self.arrow = "mobs_mc:wither_skull_strong" else
self.base_texture = "mobs_mc_wither.png"
self.fly = true
self.armor = {undead = 80, fleshy = 100} -- TODO replace with changed arrow resistance
rand_factor = 10
end end
self.object:set_properties({textures={self.base_texture}})
mcl_bossbars.update_boss(self.object, "Wither", "dark_purple") mcl_bossbars.update_boss(self.object, "Wither", "dark_purple")
if math.random(1, rand_factor) < 2 then
self.arrow = "mobs_mc:wither_skull_strong"
else
self.arrow = "mobs_mc:wither_skull"
end
-- TODO implement regeneration at rate 1 HP per second
end, end,
on_spawn = function(self) on_spawn = function(self)
minetest.sound_play("mobs_mc_wither_spawn", {object=self.object, gain=1.0, max_hear_distance=64}) minetest.sound_play("mobs_mc_wither_spawn", {object=self.object, gain=1.0, max_hear_distance=64})
@ -89,7 +115,7 @@ local wither_rose_soil = { "group:grass_block", "mcl_core:dirt", "mcl_core:coars
mcl_mobs.register_arrow("mobs_mc:wither_skull", { mcl_mobs.register_arrow("mobs_mc:wither_skull", {
visual = "cube", visual = "cube",
visual_size = {x = 0.75, y = 0.75}, visual_size = {x = 0.3, y = 0.3},
textures = { textures = {
"mobs_mc_wither_projectile.png^[verticalframe:6:0", -- top "mobs_mc_wither_projectile.png^[verticalframe:6:0", -- top
"mobs_mc_wither_projectile.png^[verticalframe:6:1", -- bottom "mobs_mc_wither_projectile.png^[verticalframe:6:1", -- bottom
@ -109,6 +135,9 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull", {
}, nil) }, nil)
mcl_mobs.effect_functions["withering"](player, 0.5, 10) mcl_mobs.effect_functions["withering"](player, 0.5, 10)
mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1) mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1)
if player:get_hp() <= 0 then
self._shooter:get_luaentity().health = self._shooter:get_luaentity().health + 5
end
end, end,
hit_mob = function(self, mob) hit_mob = function(self, mob)
@ -120,6 +149,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull", {
mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1) mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1)
local l = mob:get_luaentity() local l = mob:get_luaentity()
if l and l.health - 8 <= 0 then if l and l.health - 8 <= 0 then
self._shooter:get_luaentity().health = self._shooter:get_luaentity().health + 5
local n = minetest.find_node_near(mob:get_pos(),2,wither_rose_soil) local n = minetest.find_node_near(mob:get_pos(),2,wither_rose_soil)
if n then if n then
local p = vector.offset(n,0,1,0) local p = vector.offset(n,0,1,0)
@ -139,7 +169,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull", {
}) })
mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", { mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
visual = "cube", visual = "cube",
visual_size = {x = 0.75, y = 0.75}, visual_size = {x = 0.35, y = 0.35},
textures = { textures = {
"mobs_mc_wither_projectile_strong.png^[verticalframe:6:0", -- top "mobs_mc_wither_projectile_strong.png^[verticalframe:6:0", -- top
"mobs_mc_wither_projectile_strong.png^[verticalframe:6:1", -- bottom "mobs_mc_wither_projectile_strong.png^[verticalframe:6:1", -- bottom
@ -148,7 +178,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
"mobs_mc_wither_projectile_strong.png^[verticalframe:6:4", -- back "mobs_mc_wither_projectile_strong.png^[verticalframe:6:4", -- back
"mobs_mc_wither_projectile_strong.png^[verticalframe:6:5", -- front "mobs_mc_wither_projectile_strong.png^[verticalframe:6:5", -- front
}, },
velocity = 3, velocity = 4,
rotate = 90, rotate = 90,
-- direct hit -- direct hit
@ -164,6 +194,9 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
else else
mcl_mobs.mob_class.safe_boom(self, pos, 1) --need to call it this way bc self is the "arrow" object here mcl_mobs.mob_class.safe_boom(self, pos, 1) --need to call it this way bc self is the "arrow" object here
end end
if player:get_hp() <= 0 then
self._shooter:get_luaentity().health = self._shooter:get_luaentity().health + 5
end
end, end,
hit_mob = function(self, mob) hit_mob = function(self, mob)
@ -180,6 +213,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
end end
local l = mob:get_luaentity() local l = mob:get_luaentity()
if l and l.health - 8 <= 0 then if l and l.health - 8 <= 0 then
self._shooter:get_luaentity().health = self._shooter:get_luaentity().health + 5
local n = minetest.find_node_near(mob:get_pos(),2,wither_rose_soil) local n = minetest.find_node_near(mob:get_pos(),2,wither_rose_soil)
if n then if n then
local p = vector.offset(n,0,1,0) local p = vector.offset(n,0,1,0)

View File

@ -474,6 +474,24 @@ mcl_mobs.effect_functions["heal"] = mcl_potions.healing_func
mcl_mobs.effect_functions["bad_omen"] = mcl_potions.bad_omen_func mcl_mobs.effect_functions["bad_omen"] = mcl_potions.bad_omen_func
mcl_mobs.effect_functions["withering"] = mcl_potions.withering_func mcl_mobs.effect_functions["withering"] = mcl_potions.withering_func
-- give withering when standing in wither rose
local etime = 0
minetest.register_globalstep(function(dtime)
etime = dtime + etime
if etime < 0.5 then return end
etime = 0
for _,pl in pairs(minetest.get_connected_players()) do
local n = minetest.find_node_near(pl:get_pos(),0.4,"mcl_flowers:wither_rose",true)
if n then mcl_potions.withering_func(pl, 1, 2) end
end
for _,ent in pairs(minetest.luaentities) do
if ent.object:get_pos() and ent.is_mob then
local n = minetest.find_node_near(ent.object:get_pos(),0.4,"mcl_flowers:wither_rose",true)
if n then mcl_potions.withering_func(ent.object, 1, 2) end
end
end
end)
mcl_wip.register_wip_item("mcl_potions:night_vision") mcl_wip.register_wip_item("mcl_potions:night_vision")
mcl_wip.register_wip_item("mcl_potions:night_vision_plus") mcl_wip.register_wip_item("mcl_potions:night_vision_plus")
mcl_wip.register_wip_item("mcl_potions:night_vision_splash") mcl_wip.register_wip_item("mcl_potions:night_vision_splash")