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

Merge pull request #457 from vishal332008/master

Browse Source 
Update spaz.py
This commit is contained in:
Eric Froemling 2022-07-06 21:46:25 -07:00 committed by GitHub
commit 1967943484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/src/ba_data/python/ba/_plugin.py
View File

@ -119,7 +119,7 @@ class PluginSubsystem:
) )
_ba.log( _ba.log(
f'{len(disappeared_plugs)} plugin(s) no longer found:' f'{len(disappeared_plugs)} plugin(s) no longer found:'
f' {disappeared_plugs}', f' {str(disappeared_plugs)[1:-1]}.',
to_server=False) to_server=False)
for goneplug in disappeared_plugs: for goneplug in disappeared_plugs:
del _ba.app.config['Plugins'][goneplug] del _ba.app.config['Plugins'][goneplug]

2
assets/src/ba_data/python/bastd/actor/spaz.py
View File

@ -606,6 +606,7 @@ class Spaz(ba.Actor):
""" """
assert self.node assert self.node
self.node.boxing_gloves = True self.node.boxing_gloves = True
self._has_boxing_gloves = True
if self._demo_mode: # Preserve old behavior. if self._demo_mode: # Preserve old behavior.
self._punch_power_scale = 1.7 self._punch_power_scale = 1.7
self._punch_cooldown = 300 self._punch_cooldown = 300
@ -754,7 +755,6 @@ class Spaz(ba.Actor):
ba.WeakCall(self._bomb_wear_off), ba.WeakCall(self._bomb_wear_off),
timeformat=ba.TimeFormat.MILLISECONDS)) timeformat=ba.TimeFormat.MILLISECONDS))
elif msg.poweruptype == 'punch': elif msg.poweruptype == 'punch':
self._has_boxing_gloves = True
tex = PowerupBoxFactory.get().tex_punch tex = PowerupBoxFactory.get().tex_punch
self._flash_billboard(tex) self._flash_billboard(tex)
self.equip_boxing_gloves() self.equip_boxing_gloves()