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

Merge pull request #17 from Dmitry450/master

Browse Source 
Fixed puck visibility in hockey
This commit is contained in:
Eric Froemling 2020-04-11 13:32:17 -07:00 committed by GitHub
commit c50ed3557d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/src/ba_data/python/bastd/game/capturetheflag.py
View File

@ -290,6 +290,9 @@ class CaptureTheFlagGame(ba.TeamGameActivity):
if (not team.gamedata['home_flag_at_base'] if (not team.gamedata['home_flag_at_base']
and flag.held_count == 0): and flag.held_count == 0):
time_out_counting_down = True time_out_counting_down = True
if flag.time_out_respawn_time is None:
flag.reset_return_times()
assert flag.time_out_respawn_time is not None
flag.time_out_respawn_time -= 1 flag.time_out_respawn_time -= 1
if flag.time_out_respawn_time <= 0: if flag.time_out_respawn_time <= 0:
flag.handlemessage(ba.DieMessage()) flag.handlemessage(ba.DieMessage())

2
assets/src/ba_data/python/bastd/game/elimination.py
View File

@ -59,7 +59,7 @@ class Icon(ba.Actor):
icon = player.get_icon() icon = player.get_icon()
self.node = ba.newnode('image', self.node = ba.newnode('image',
owner=self, delegate=self,
attrs={ attrs={
'texture': icon['texture'], 'texture': icon['texture'],
'tint_texture': icon['tint_texture'], 'tint_texture': icon['tint_texture'],

1
assets/src/ba_data/python/bastd/game/hockey.py
View File

@ -69,6 +69,7 @@ class Puck(ba.Actor):
'position': self._spawn_pos, 'position': self._spawn_pos,
'materials': pmats 'materials': pmats
}) })
ba.animate(self.node, "model_scale", {0: 0, 0.2: 1.3, 0.26: 1})
def handlemessage(self, msg: Any) -> Any: def handlemessage(self, msg: Any) -> Any:
if isinstance(msg, ba.DieMessage): if isinstance(msg, ba.DieMessage):

4
assets/src/ba_data/python/bastd/game/onslaught.py
View File

@ -430,11 +430,11 @@ class OnslaughtGame(ba.CoopGameActivity):
{'entries': [ {'entries': [
{'type': spazbot.ChargerBotProShielded, {'type': spazbot.ChargerBotProShielded,
'point': 'bottom_right'}, 'point': 'bottom_right'},
{'type': spazbot.ChargerBotProShielded, 'point': 'Bottom'} {'type': spazbot.ChargerBotProShielded, 'point': 'bottom'}
if player_count > 2 else None, if player_count > 2 else None,
{'type': spazbot.ChargerBotProShielded, {'type': spazbot.ChargerBotProShielded,
'point': 'bottom_left'}, 'point': 'bottom_left'},
{'type': spazbot.ChargerBotProShielded, 'point': 'Top'} {'type': spazbot.ChargerBotProShielded, 'point': 'top'}
if hard else None, if hard else None,
{'type': spazbot.BomberBotProStatic, {'type': spazbot.BomberBotProStatic,
'point': 'turret_top_middle'}, 'point': 'turret_top_middle'},