diff --git a/.efrocachemap b/.efrocachemap index a051f2a4..6ab1c512 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4135,16 +4135,16 @@ "assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f", "assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338", "assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f9/b8/7c7c7ad64d7325b193b870aa0633", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7d/04/d5dc7d084833227fc8d7c81d2a41", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/97/c9/d427faf63f2db1c472d2d19d2858", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a4/5c/1800421fa3603dbeaad09cce401e", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ec/48/6c83f2b8931114c2baad1d57a77f", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9f/52/0fd3a84f69aeaaa2057edc14ead1", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/55/e5/6360133eb2e30bcba373a3c779c1", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9a/33/3fdb8f82a0e1523fe1e863f715d0", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/46/72/eea6a1cfcab99efdfa0decbaa701", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/6a/da/845cd6692482a31508db158944b3", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e1/45/67ff8bcdf72782925bf35f871946", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/bf/c2/7423609789606dc09dfee1d6b95c" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4d/52/c1c1011ac6286950129ecfe641c2", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4f/46/90e28db5c4a563bda000e2df2807", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/dd/b5/c197989dd4e61498dda75f51759c", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b8/24/1da2eb6ecdbac963dc31fc258a1d", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f7/63/a9c21960f84b2d7f40418e66d4c8", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a2/8e/e489beaf13382d65c6c4a39e77e3", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/80/c4/4b4f75b4ae6d887f19ef2ec0f4b5", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/22/ba/e61af862b2d2c138a848583f74a6", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/d5/1a/7061d9ff66993841317369cce4dd", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/a4/9f/5f3308d5dda1d6f8fb3b51389e05", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/bc/0f/7fd42fceaa297e0e67ed18566d3e", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9b/c7/9756a8f6ef5237f1418cabfb6154" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 752efbab..87c63ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ - Fixed a case where an early fatal error could lead to a hung app and no error dialog. - Added environment variables which can override UI scale for testing. Set BA_FORCE_UI_SCALE to small, medium or large. - Added a ba.UIScale enum. The value at ba.app.uiscale replaces the old ba.app.interface_type, ba.app.small_ui, and ba.app.med_ui values. -- Emoji no longer display in-game with a washed-out appearance. If there are any places in-game where bright colored emoji become distracing, please holler. +- Emoji no longer display in-game with a washed-out appearance. If there are any places in-game where bright colored emoji become distracting, please holler. +- _ba.get_game_roster() now includes 'account_id' which is the validated account id of all clients (will be None until completes). Also a few keys are renamed: specString->spec_string and displayString->display_string. ### 1.5.19 (20123) - Cleaned up some bomb logic to avoid weird corner-cases such as land-mine explosions behaving like punches when set off by punches or bombs potentially resulting in multiple explosions when triggered by multiple other bombs simultaneously. Holler if anything explosion-related seems off now. diff --git a/assets/src/ba_data/python/ba/_servermode.py b/assets/src/ba_data/python/ba/_servermode.py index 653a1510..237a4c7d 100644 --- a/assets/src/ba_data/python/ba/_servermode.py +++ b/assets/src/ba_data/python/ba/_servermode.py @@ -138,7 +138,7 @@ class ServerController: for client in roster: if client['client_id'] == -1: continue - spec = json.loads(client['specString']) + spec = json.loads(client['spec_string']) name = spec['n'] players = ', '.join(n['name'] for n in client['players']) clientid = client['client_id'] diff --git a/assets/src/ba_data/python/bastd/ui/party.py b/assets/src/ba_data/python/bastd/ui/party.py index 74e6ad0e..6c46bf5e 100644 --- a/assets/src/ba_data/python/bastd/ui/party.py +++ b/assets/src/ba_data/python/bastd/ui/party.py @@ -285,7 +285,7 @@ class PartyWindow(ba.Window): p_str = p_str[:25] + '...' else: p_str = self._roster[index][ - 'displayString'] + 'display_string'] except Exception: ba.print_exception( 'Error calcing client name str.') diff --git a/docs/ba_module.md b/docs/ba_module.md index 20d09043..5a99e382 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -
This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!