mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-26 08:53:32 +08:00
Merge pull request #659 from VinniTR/patch-7
Power-ups affecting melee combat
This commit is contained in:
commit
5a9a5a190d
@ -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 None
|
||||
|
||||
# Only allow one hit per node per punch.
|
||||
if node and (node not in self._punched_nodes):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user