RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 15:47:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #659 from VinniTR/patch-7

Browse Source 
Power-ups affecting melee combat
This commit is contained in:
Eric Froemling 2024-03-01 16:52:28 -08:00 committed by GitHub
commit 5a9a5a190d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/ba_data/python/bascenev1lib/actor/spaz.py
View File

@ -13,7 +13,7 @@ from typing_extensions import override
import bascenev1 as bs import bascenev1 as bs
from bascenev1lib.actor.bomb import Bomb, Blast 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.actor.spazfactory import SpazFactory
from bascenev1lib.gameutils import SharedObjects from bascenev1lib.gameutils import SharedObjects
@ -1226,6 +1226,8 @@ class Spaz(bs.Actor):
if not self.node: if not self.node:
return None return None
node = bs.getcollision().opposingnode node = bs.getcollision().opposingnode
if node.getdelegate(PowerupBox):
return None
# Only allow one hit per node per punch. # Only allow one hit per node per punch.
if node and (node not in self._punched_nodes): if node and (node not in self._punched_nodes):