From 24270c1a2cbf464c9f34e71b62e37dab4eee677e Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:53:54 -0500 Subject: [PATCH 1/2] Power-ups no longer affect melee combat. --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index ad914b8c..3f1562a6 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -13,7 +13,7 @@ from typing_extensions import override import bascenev1 as bs from bascenev1lib.actor.bomb import Bomb, Blast -from bascenev1lib.actor.powerupbox import PowerupBoxFactory +from bascenev1lib.actor.powerupbox import PowerupBoxFactory, PowerupBox from bascenev1lib.actor.spazfactory import SpazFactory from bascenev1lib.gameutils import SharedObjects @@ -1226,6 +1226,8 @@ class Spaz(bs.Actor): if not self.node: return None node = bs.getcollision().opposingnode + if node.getdelegate(PowerupBox): + return # Only allow one hit per node per punch. if node and (node not in self._punched_nodes): From b7a7278139b5dcf54aa9039c124f327ead0dac28 Mon Sep 17 00:00:00 2001 From: VinniTR <71152012+VinniTR@users.noreply.github.com> Date: Fri, 26 Jan 2024 00:29:54 -0500 Subject: [PATCH 2/2] dale bobo --- src/assets/ba_data/python/bascenev1lib/actor/spaz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py index 3f1562a6..f5b017bb 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py @@ -1227,7 +1227,7 @@ class Spaz(bs.Actor): return None node = bs.getcollision().opposingnode if node.getdelegate(PowerupBox): - return + return None # Only allow one hit per node per punch. if node and (node not in self._punched_nodes):