RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 21:37:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix spurious CTF flag_return_touches log errors

Browse Source
This commit is contained in:
Eric 2024-03-15 13:49:00 -07:00
parent d9a20f6161
commit f6f95263a1
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.efrocachemap generated
View File

@ -421,7 +421,7 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "10df7f9f3de205aefdba9c1cfd11333b",
"build/assets/ba_data/data/langdata.json": "5e534cd5bb06b149a9ee4713e8d75577",
"build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c",
"build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151",
"build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a",
@ -4065,26 +4065,26 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "149d743d83a18e084cfbf58a84adb228",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "3fb406b63a8a0482e7a0e57c049752de",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "caf02452afe4e65975c7f9535b27683a",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4bf0689c2cbbe41addaf0520ae857191",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c9deccfc0bab6d7e75b21ef207426baf",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "0ccb34d6b0e586e56c06bf8c90742cc4",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "88dedfaea0f64ab39602180c9429b70b",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "efe59f8c0cc76591f61543df51b8d7ed",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8e9006c2565d7d1cea28f1876ff6e91c",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "c7a2d46627fd4975bfd5d761e740aacf",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "db46c7d9039414218a14946243768a31",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "903b31f9272e4aecb2f76c6cf124d1db",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "54eebc899be16cee3d4c9debe9aba1af",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "b0f2002c5f7ae9b8bf0f4fe35e605c3a",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "648bb4c704e0ccb2993bfd33f72f6114",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d5f348b8e877c332c3220b5c54401132",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "faa3604445246c6502c2f4d830952dfe",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "31fc0a8608d86d34cef0ca4925ea2169",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "3cb5ca8654dc223d5eae0f85427b8984",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a7213b62ea170e748745ded4526cb996",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "aff4f4ed3c7632315212878c9bfd41db",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "c5b8a89455932e54784830c3320b5547",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ffb96514e1f56af56ec8423fa7dff9d2",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8ddbc4c0bf72f21cae20b97112c998f8",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "2aef304e97b7a7a6efb0422150395b3b",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "365a17b83735ac688f273bf458962bf4",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b8a56ad0bc13aa39e557304c4b15c06f",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "8a194395a2d25232e02397a09816e818",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5a3993e59d989f58d3ed3100b97f63e0",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "63efabd180e84a3cd8d44f427671ad79",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "d2525592bc459b41ecc915e65058e828",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d5d8c6df24d117ff48dcbd4a1b934fc3",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "06c837822168039b0cbdbb63a5bb4bd3",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "90b4a005c41d482c3e51c7da9ab306ee",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "05a62ba9e4d8dc91de80cbeb18d44622",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "49b0b163e779691643720b44f44563d2",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "cfed19e557d4dd7ab7a1c92039bef8ca",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4670e91666540dbcc2909e9f8de3a2d5",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "58048dc1ad1f1329f35c3948040db414",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "db60223aab0a714d626651109e20c6f1",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.33 (build 21793, api 8, 2024-03-15)
### 1.7.33 (build 21794, api 8, 2024-03-15)
- Stress test input-devices are now a bit smarter; they won't press any buttons
while UIs are up (this could cause lots of chaos if it happened).
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the

2
src/assets/ba_data/python/baenv.py
View File

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21793
TARGET_BALLISTICA_BUILD = 21794
TARGET_BALLISTICA_VERSION = '1.7.33'

35
src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
View File

@ -527,7 +527,7 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
team.touch_return_timer = None
team.touch_return_timer_ticking = None
if team.flag_return_touches < 0:
logging.exception('CTF flag_return_touches < 0')
logging.error('CTF flag_return_touches < 0', stack_info=True)
def _handle_death_flag_capture(self, player: Player) -> None:
"""Handles flag values when a player dies or leaves the game."""
@ -536,22 +536,29 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
return
team = player.team
# For each "point" our player has touched theflag (Could be multiple),
# deduct one from both our player and
# the flag's return touches variable.
# For each "point" our player has touched theflag (Could be
# multiple), deduct one from both our player and the flag's
# return touches variable.
for _ in range(player.touching_own_flag):
# Deduct
player.touching_own_flag -= 1
team.flag_return_touches -= 1
# Update our flag's timer accordingly
# (Prevents immediate resets in case
# there might be more people touching it).
if team.flag_return_touches == 0:
team.touch_return_timer = None
team.touch_return_timer_ticking = None
# Safety check, just to be sure!
if team.flag_return_touches < 0:
logging.exception('CTF flag_return_touches < 0')
# (This was only incremented if we have non-zero
# return-times).
if float(self.flag_touch_return_time) > 0.0:
team.flag_return_touches -= 1
# Update our flag's timer accordingly
# (Prevents immediate resets in case
# there might be more people touching it).
if team.flag_return_touches == 0:
team.touch_return_timer = None
team.touch_return_timer_ticking = None
# Safety check, just to be sure!
if team.flag_return_touches < 0:
logging.error(
'CTF flag_return_touches < 0', stack_info=True
)
def _flash_base(self, team: Team, length: float = 2.0) -> None:
light = bs.newnode(

2
src/ballistica/shared/ballistica.cc
View File

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21793;
const int kEngineBuildNumber = 21794;
const char* kEngineVersion = "1.7.33";
const int kEngineApiVersion = 8;