From d3711b69a5181eefc1055e7b6e693039a34a0b31 Mon Sep 17 00:00:00 2001 From: Mental-Inferno Date: Sat, 22 Jan 2022 15:15:09 -0500 Subject: [PATCH] Fixed bug where cave spider poison effect would continue after respawn Also added knockback effect to cave spider attack and set default cave spider health to current Minecraft default. --- mods/ENTITIES/mobs_mc/spider.lua | 33 ++++++++++++++++-------- mods/PLAYER/mcl_refresh_status/README.md | 28 ++++++++++++++++++++ mods/PLAYER/mcl_refresh_status/init.lua | 3 +++ mods/PLAYER/mcl_refresh_status/mod.conf | 4 +++ 4 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 mods/PLAYER/mcl_refresh_status/README.md create mode 100644 mods/PLAYER/mcl_refresh_status/init.lua create mode 100644 mods/PLAYER/mcl_refresh_status/mod.conf diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index 2fed6dedf..49eff8ca1 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -77,6 +77,7 @@ local spider = { mobs:register_mob("mobs_mc:spider", spider) + --Cave Spider local cave_spider = { @@ -89,19 +90,19 @@ local cave_spider = { docile_by_day = true, rotate = 270, - --work-around for poison until punch augmentations are added to mob API - --works functionally but the jump while punching animation in gone + --[[work-around for poison until punch augmentations are added to mob API + works functionally but the jump while punching animation in gone--]] reach = 0.5, --makes it look like it's biting attack_type = "projectile", - arrow = "spider_venom", --ultra short range projectile to inflict poison effect - projectile_cooldown_min = 1, --if kept at 0.5, this mob can annhiliate you + arrow = "spider_venom", --ultra short range projectile to inflict poison effect + punch damage + projectile_cooldown_min = 1, projectile_cooldown_max = 1, shoot_arrow = function(self, pos, dir) local dmg = 2 mobs.shoot_projectile_handling("mobs_mc:spider_venom", pos, dir, self.object:get_yaw(), self.object, 1, dmg,nil,nil,nil,-0.6) end, - hp_min = 1, + hp_min = 12, --reflect Minecraft health hp_max = 12, ignores_cobwebs = true, xp_min = 5, @@ -126,7 +127,7 @@ local cave_spider = { }, base_pitch = 1.25, walk_velocity = 1.3, - run_velocity = 3.2, + run_velocity = 3.5, --Compenstaing for the loss of aility to leap while attacking jump = true, jump_height = 4, view_range = 16, @@ -168,15 +169,25 @@ mobs:register_arrow("mobs_mc:spider_venom", { full_punch_interval = 1.0, damage_groups = {fleshy = self._damage}, }, nil) + mcl_potions.poison_func(player, 0.5, 8) --modified cuz MC rate is an unessesarily bad fraction + local vel = player:get_velocity() + player:add_velocity({x=(vel.x * -1.5), y=6, z=(vel.z * -1.5)}) --"chaos knockback" effect (Temporary until I understand how to implement knockback for a projectile) end, hit_mob = function(self, mob) - mob:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups = {fleshy = self._damage}, - }, nil) - mcl_potions.poison_func(mob, 0.5, 8) --modified cuz MC rate is an unessesarily bad fraction + if mob ~= self then --due to low power of attack, spider can shoot itself while chasing a target + mob:punch(self.object, 1.0, { + full_punch_interval = 1.0, + damage_groups = {fleshy = self._damage}, + }, nil) + + if ((mob ~= "mobs_mc:cave_spider") and (mob ~= "mobs_mc:spider")) then --spider's don't have automatic immunity to poison yet so this is a stop gap solution + mcl_potions.poison_func(mob, 0.5, 8) --modified cuz MC rate is an unessesarily bad fraction + end + local vel = mob:get_velocity() + mob:add_velocity({x=(-1 * vel.z), y=6, z=(-1 * vel.x)}) --"chaos knockback" effect (Temporary until I understand how to implement knockback for a projectile) + end end, }) diff --git a/mods/PLAYER/mcl_refresh_status/README.md b/mods/PLAYER/mcl_refresh_status/README.md new file mode 100644 index 000000000..b214ffb75 --- /dev/null +++ b/mods/PLAYER/mcl_refresh_status/README.md @@ -0,0 +1,28 @@ +# Status Effect Refresh for Mineclone 5 + +This allows the use of status effect function from mcl_potions and prevents them +from continuing their effect after player respawn + +## Licensing +MIT License + +Copyright (c) 2022 Mental-Inferno + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/mods/PLAYER/mcl_refresh_status/init.lua b/mods/PLAYER/mcl_refresh_status/init.lua new file mode 100644 index 000000000..7b9bc4bd9 --- /dev/null +++ b/mods/PLAYER/mcl_refresh_status/init.lua @@ -0,0 +1,3 @@ +minetest.register_on_respawnplayer(function(player) + mcl_potions._reset_player_effects(player, true) +end) \ No newline at end of file diff --git a/mods/PLAYER/mcl_refresh_status/mod.conf b/mods/PLAYER/mcl_refresh_status/mod.conf new file mode 100644 index 000000000..f72f49ff2 --- /dev/null +++ b/mods/PLAYER/mcl_refresh_status/mod.conf @@ -0,0 +1,4 @@ +name = mcl_refresh_status +author = Mental-Inferno +description = Resets status-effects inflicted on player when player respawns +depends = mcl_potions