diff --git a/.efrocachemap b/.efrocachemap
index c83c982e..75f3b25c 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -420,39 +420,39 @@
"assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/14/f1/4f2995d78fc20dd79dfb39c5d554",
"assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/57/ac/6ed0caecd25dc23688debed24c45",
"assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/32/08/38dac4a79ab2acee76a75d32a310",
- "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/5a/7d/3a4c37ada60b546b1ff1dfaa6d3e",
- "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/46/d2/ffaeb8d34e72e5d4baee7ffa2df8",
- "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/53/65/623cbd373025127bbce64ffb8979",
- "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/ce/d6/c90afebc5dfca2b43d2defc3a42c",
- "assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/0b/8a/eafc8bcf22576fa24fc8a697ecfe",
+ "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/0d/86/2973ec3ddaebaff01a35f68b99aa",
+ "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/4d/1d/113351f74102015ff852ee3e2e2b",
+ "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/49/92/dbd8af6861dd47b8bca51aa9533c",
+ "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/b0/0c/fd37e0f8449ab00a345ecea7bd4e",
+ "assets/build/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/8d/03/4f4d0d3f6b36e2b8728f13d73050",
"assets/build/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/66/bf/6e98398016da261296b8c306560e",
- "assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/e3/10/ace3a73616f1f36540e585e5bbce",
+ "assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/f8/63/106bcd08194d23cd8baa7d8be4fc",
"assets/build/ba_data/data/languages/danish.json": "https://files.ballistica.net/cache/ba1/3f/46/e4da3c1d2b0ebf916df55c608b28",
"assets/build/ba_data/data/languages/dutch.json": "https://files.ballistica.net/cache/ba1/d1/07/37b7adc3dbec7328d26c5325f212",
"assets/build/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/b6/92/f245bd6c11a4ab2eaff037b38cfe",
"assets/build/ba_data/data/languages/esperanto.json": "https://files.ballistica.net/cache/ba1/6e/fd/685a4e1da031474d47a1d9eb2731",
- "assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/c5/9b/e627b5c99b11ac88e85267a02244",
- "assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/d1/2d/47f4f84ca569a8b64bd500d4b36d",
+ "assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/c1/e9/0d7426afb8faa8b66c3b74b35e23",
+ "assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/9f/99/500019aa5bc3ea8dca84a06036bd",
"assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/17/82/e053185f86ba5c907185881273fb",
- "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/51/31/64479524c0ee990b3e97ffdca068",
- "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/32/a4/fae7a30ead18c6cb97db60dd9445",
- "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/f7/60/bfe1977d51b66db1084b123cd69e",
- "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/d6/43/599430105ffecff486da7fc32a4c",
- "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/93/0d/b511ed987ac27769204b624e73b4",
- "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/78/d3/16b37707d4ce4df826d0b0bc1766",
- "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/c1/14/b013ec0a6557533f0ff49f27d000",
- "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/cd/c1/82bf70c3ee4894791506f4da1a15",
- "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/01/c5/7c22c0221160c1e69a9575dc2501",
+ "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/93/36/177284765143e14ee6454a59ec0d",
+ "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/6d/38/ad3e051c2be890d5a01b6eeca52d",
+ "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/de/1b/d9a8e089566aa2951dc34c8c7173",
+ "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a1/c8/6b8d5a74aa4e69da65ee7ac2ad93",
+ "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/bf/d6/4341a67850096fae618968c327ae",
+ "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/51/fc/16596c8d421e4961eab3041303d7",
+ "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/e4/38/446b22f510f74f590cb990394d36",
+ "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/fd/6a/16e5602362974033afba3144e2c5",
+ "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/ce/f8/087671938e6d407d11d95565e67b",
"assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/f3/e5/c6d8fab0509451976c776265f0d0",
- "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/0e/10/fa4190be466cef00396b0431d492",
- "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/4a/5e/4dfa4cc4c95457afe99914da1148",
- "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/15/01/cab2f74365e69216a7eeeef51f98",
- "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/32/83/8fa66d906da02dde3a87f18999cb",
+ "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/4e/e1/f66f6fd33be9bcc380eee870eb74",
+ "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/91/1e/2846b8fab5260d1949562e7979be",
+ "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/02/f9/4a1e4b16c1c0db6e1a88fb7c2b1f",
+ "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/09/b2/83ece6ba1adb6763416c21fa3600",
"assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0",
- "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/5b/c4/2173bc10edea17ed3734f08a8c94",
- "assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/20/b3/b52d8c6db509c2c74a97e202e335",
- "assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/9b/b7/c9fd483742201911caeef3d89822",
- "assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/5c/1c/8af479b70c9e6595b338dbb563c5",
+ "assets/build/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/45/64/340df1c2eba4f6959d6fe1eec500",
+ "assets/build/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/3f/7b/ff6beb9428d90cf58879431b22b3",
+ "assets/build/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/45/54/68b15a87516627368891c11bf386",
+ "assets/build/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/7c/d8/b98949fc52015844cea496eaefb4",
"assets/build/ba_data/data/maps/big_g.json": "https://files.ballistica.net/cache/ba1/47/0a/a617cc85d927b576c4e6fc1091ed",
"assets/build/ba_data/data/maps/bridgit.json": "https://files.ballistica.net/cache/ba1/03/4b/57ee9b42854b26f23f81bd8c58ef",
"assets/build/ba_data/data/maps/courtyard.json": "https://files.ballistica.net/cache/ba1/03/38/344dd05bfef7bbdf464035ec5aa2",
@@ -3940,18 +3940,18 @@
"build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d9/58/78661f5aecd0da126b10201d0c5e",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/36/be/d706c897e778fa1b0ba439eff8c1",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/eb/15/84f0a16a78fee48970391300b957",
- "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/60/eb/4f65457cf792f721bbad617d9ad0",
- "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/71/f1/4f36fb59372af667d2fcfc16c6d8",
- "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7f/e6/13d77d7939fa00e57f16ed440f92",
- "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/2d/1132879368551cc7bd7fb407f0fd",
- "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/77/6e/d9920eeaa9b9adba4cb3f5e655f0",
- "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b9/02/ed3c91a260a476a66baab752e75c",
- "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/56/ca/d159a3a9dcb1f266413578651e16",
- "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c9/5e/9cc46cf58951c133917a04f04cd0",
- "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/90/84/390b6916bbf2b6710729a923ab7c",
- "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3e/f8/36ae7dc2ac79f3838999f66e1c87",
- "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/fe/a1/b217231f196dc175663d7b70b4a9",
- "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/95/7a/a961123e1b9bcd78a563759fd2cf",
+ "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/55/e9/1d7ebf19bfbc47974889363eacc1",
+ "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/1f/1e/cce12fea9454d5e5fa88b5cba302",
+ "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cc/bd/e74b8002d07a565860b3067a804b",
+ "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/99/4a/cb7c25faa9ceeadc9651ac2617fe",
+ "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/54/8f/e701c13b94299cf7e66adce6e9c9",
+ "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/c4/a3/3b7a6160632e0a1b3a21960b47b0",
+ "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bc/83/2fbbced397721e3643572505aa2c",
+ "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/61/7c/8e37cf1fe5ee7b833d4c42663b2c",
+ "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/34/2d/aaa1aeb9eb6a873816560c683443",
+ "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8e/92/cc0a3a7d6f41430f953d344aaa52",
+ "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/bd/bb/dfc2550d2ee5575442cd586a3f1c",
+ "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/88/bb/4e79f58ef4be9461bde0e74afa5e",
"build/prefab/lib/linux_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/54/e0/8c89d241ca37ae32c9b46ea71456",
"build/prefab/lib/linux_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e0/05/94ac67cbf2e665eeecfc77246caf",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0f/e1/be897ef0e73b0e52c59f3396e0cd",
@@ -3960,12 +3960,12 @@
"build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1f/b3/80375870a9ab83bbb63b50b03a73",
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5c/2e/a1b1f2126b3150c6f11e799c3805",
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b6/6b/37174b3a0d72a05f1bb3d904b78b",
- "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c4/c3/de4c713a14762b156cbc9f1dbacc",
- "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e8/a5/7341744d46bf83683f6d9113019a",
- "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/3b/c7/76236792620e2f0a7a5551b32a45",
- "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/6d/2f7220ea5ab89b23ffacc7497694",
- "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9f/46/d0cd8a310edfa84f124d11a295d7",
- "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d7/7d/5196bbacb6efbfd4fe70cc042553",
- "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/73/63/38d1af71edf49e29f802533058a0",
- "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d9/08/502699c51e7a36c1b60acec6be36"
+ "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/81/ce/4d05b03a2513007204a580065c1f",
+ "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/59/30/33d2be08161fe2c9201ce31c4c79",
+ "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d7/3b/d6a12c65ece8d1c900c27baf5dd1",
+ "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/07/b5/1e9e1de127e1a8ea30c0691a7ab2",
+ "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/58/aa/37666e766d6cb167e0d22eed4eaa",
+ "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5f/62/d4bc721f2d8a7c015cf8e8ebbde1",
+ "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a0/07/089c1147074e7749a2a3b5a5287b",
+ "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/bc/d4/1218648abbd827b398a92e52d565"
}
\ No newline at end of file
diff --git a/assets/src/ba_data/python/bastd/ui/gather/privatetab.py b/assets/src/ba_data/python/bastd/ui/gather/privatetab.py
index 78525556..941be6d2 100644
--- a/assets/src/ba_data/python/bastd/ui/gather/privatetab.py
+++ b/assets/src/ba_data/python/bastd/ui/gather/privatetab.py
@@ -256,7 +256,10 @@ class PrivateGatherTab(GatherTab):
self._debug_server_comm('querying private party state')
if _ba.get_account_state() == 'signed_in':
_ba.add_transaction(
- {'type': 'PRIVATE_PARTY_QUERY'},
+ {
+ 'type': 'PRIVATE_PARTY_QUERY',
+ 'expire_time': time.time() + 20,
+ },
callback=ba.WeakCall(
self._hosting_state_idle_response),
)
@@ -761,6 +764,7 @@ class PrivateGatherTab(GatherTab):
_ba.add_transaction(
{
'type': 'PRIVATE_PARTY_CONNECT',
+ 'expire_time': time.time() + 20,
'code': code
},
callback=ba.WeakCall(self._connect_response),
@@ -806,15 +810,19 @@ class PrivateGatherTab(GatherTab):
'type': 'PRIVATE_PARTY_START',
'config': dataclass_to_dict(self._hostingconfig),
'region_pings': ba.app.net.region_pings,
+ 'expire_time': time.time() + 20,
},
callback=ba.WeakCall(self._hosting_state_response))
_ba.run_transactions()
else:
self._last_action_send_time = time.time()
- _ba.add_transaction({'type': 'PRIVATE_PARTY_STOP'},
- callback=ba.WeakCall(
- self._hosting_state_response))
+ _ba.add_transaction(
+ {
+ 'type': 'PRIVATE_PARTY_STOP',
+ 'expire_time': time.time() + 20,
+ },
+ callback=ba.WeakCall(self._hosting_state_response))
_ba.run_transactions()
ba.playsound(ba.getsound('click01'))
diff --git a/docs/ba_module.md b/docs/ba_module.md
index 8d78ebf4..908eb8c1 100644
--- a/docs/ba_module.md
+++ b/docs/ba_module.md
@@ -1,5 +1,5 @@
-last updated on 2021-05-27 for Ballistica version 1.6.4 build 20369
+last updated on 2021-05-30 for Ballistica version 1.6.4 build 20369
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!
diff --git a/tools/bacommon/net.py b/tools/bacommon/net.py
index 13a2d455..1b5a7f26 100644
--- a/tools/bacommon/net.py
+++ b/tools/bacommon/net.py
@@ -39,7 +39,6 @@ class PrivateHostingState:
"""Combined state of whether we're hosting, whether we can, etc."""
unavailable_error: Optional[str] = None
party_code: Optional[str] = None
- able_to_host: bool = False
tickets_to_host_now: int = 0
minutes_until_free_host: Optional[float] = None
free_host_minutes_remaining: Optional[float] = None
diff --git a/tools/efro/dataclassio.py b/tools/efro/dataclassio.py
index c4c5ec36..5b9b449f 100644
--- a/tools/efro/dataclassio.py
+++ b/tools/efro/dataclassio.py
@@ -1340,5 +1340,12 @@ def _parse_annotated(anntype: Any) -> Tuple[Any, Optional[IOAttrs]]:
'Multiple IOAttrs instances found for a'
' single annotation; this is not supported.')
ioattrs = annarg
+
+ # I occasionally just throw a 'x' down when I mean IOAttrs('x');
+ # catch these mistakes.
+ elif isinstance(annarg, (str, int, float, bool)):
+ raise RuntimeError(
+ f'Raw {type(annarg)} found in Annotated[] entry:'
+ f' {anntype}; this is probably not what you intended.')
anntype = annargs[0]
return anntype, ioattrs