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 #91 from Benefit-Zebra/master

Browse Source 
Improving bomb.py
This commit is contained in:
Eric Froemling 2020-07-06 15:34:12 -07:00 committed by GitHub
commit db76b650e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
### 1.5.18 (20108) ### 1.5.18 (20108)
- A bit of project cleanup; tools/snippets is now tools/pcommand, etc. - A bit of project cleanup; tools/snippets is now tools/pcommand, etc.
- More minor bug fixes and crash/bug-logging improvements.. - More minor bug fixes and crash/bug-logging improvements.
### 1.5.17 (20102) ### 1.5.17 (20102)
- More cleanup to logging and crash reporting system. - More cleanup to logging and crash reporting system.

4
CONTRIBUTORS.md
View File

@ -10,3 +10,7 @@
### Roman Trapeznikov ### Roman Trapeznikov
- Bug fixes and code cleanup - Bug fixes and code cleanup
### Benefit-Zebra
- Unofficial BombSquad Bug Finder
- Code Cleanup

8
assets/src/ba_data/python/bastd/actor/bomb.py
View File

@ -1005,12 +1005,16 @@ class Bomb(ba.Actor):
ba.playsound(factory.activate_sound, 0.5, position=self.node.position) ba.playsound(factory.activate_sound, 0.5, position=self.node.position)
def _handle_hit(self, msg: ba.HitMessage) -> None: def _handle_hit(self, msg: ba.HitMessage) -> None:
ispunch = (msg.srcnode and msg.srcnode.getnodetype() == 'spaz') ispunched = (msg.srcnode and msg.srcnode.getnodetype() == 'spaz')
# Normal bombs are triggered by non-punch impacts; # Normal bombs are triggered by non-punch impacts;
# impact-bombs by all impacts. # impact-bombs by all impacts.
if (not self._exploded and not ispunch if not ispunched and (not self._exploded
or self.bomb_type in ['impact', 'land_mine']): or self.bomb_type in ['impact', 'land_mine']):
# We don't want to give the credit and points to player,
# who punched the bomb of other player in a chain reaction.
# And this will protect the bomb from getting hit_type 'punch'.
# Also lets change the owner of the bomb to whoever is setting # Also lets change the owner of the bomb to whoever is setting
# us off. (this way points for big chain reactions go to the # us off. (this way points for big chain reactions go to the
# person causing them). # person causing them).