make spinoff-test-plus should now work; woohoo!

This commit is contained in:
Eric 2023-06-06 14:40:59 -07:00
parent daf0c86de0
commit 6d9b9b78b8
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 91 additions and 45 deletions

88
.efrocachemap generated
View File

@ -4072,50 +4072,50 @@
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b",
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877",
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/04/99/c47163190272477365210ff9eee6",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/5b/6e/618add5bc5a060eede7c7b0cf32b",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/82/21/0fab4e58571186740416a037ff59",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a8/3d/867c69eb5ce91010a8a44df27dbf",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ce/b2/b64c1035517e80223c73a4b0519a",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/84/ce/13d9ea8a53d4c6dc9b69006b7b9d",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/62/d6/86b22c5ac23653e5b7f88851de19",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/26/97/c51262aa8486b4e55ddd4dd8356f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/93/b9/99d319be31de789d7a9ddf869fe4",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/af/aa/98c3c9c570ce1559be90a85ef679",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/02/b228bc84231bd2c5ad1c29aaa4f5",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d5/6e/db06edfd67461eb0fa7ec36ecad9",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f1/47/8b052b5f99623a20a17b5a386a02",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/58/96/c17aaee0cb4e34cddf7c26e343be",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/bc/c2/4fdc00ed8159d07e28205122d911",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1a/d6/0f779e390f3cf2d6dbf02e46817f",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/92/4e/c1afdd4eed5b3bd6f9bd34e7326d",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/fd/33/5d2dd5d29a92bc89b0e0f2ae747a",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/cc/5d/9939b79656bc1c27f426aec865fb",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/dd/25/81229ca25a29b6ae13d5aa12b581",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/af/f2/dddc001c9f901bf96dc2cf6dab3d",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/99/a5/cab0099c2fab04dd4184f47a4b98",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/24/0f/2707e0f7178de0d2004f844511a6",
"build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2c/54/6d95abc0d57b2f2e885e661f5bfb",
"build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/78/cc/e3de51af7ad7c79ca4e90b1c55b4",
"build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/31/c7/8f9eb75e8d9db37555a14372adcd",
"build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/84/6b/6fbe0f830b5dcdca7c0c2d6ef020",
"build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ec/f3/d86a92d6b3a040d3f16fb6d881dc",
"build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/75/e6/2383026bdc24e21f96d70117677b",
"build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/96/38/c45d3e41db2c711d728ed7e88754",
"build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/9d/66/edefaf87b7273f964564688318bb",
"build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ac/b8/7dde6891d1746dfaae863701121c",
"build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2a/11/1042aeebe235a6f23765053708f7",
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c4/76/269cb4108fc91861800c7e08a50e",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ac/c4/cab5bbf5d7e977e843a4749c8aea",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8d/58/9ad0751e7428f393005b09399682",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/05/70/de2f00c3f50b2368dff1600d82a0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/fd/b0/42b1efb0c35570002c6064aa920d",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/95/28/d36f318fce36ead598b674dcccf3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/c9/5b/42af29d9337b8e79bc8447d354a8",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/82/8a/183737a2e13d6ae02f3847679aa1",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ae/ae/8fd6ae4349f7ae4755aa201782f6",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e6/70/286aeeb48f26fa00c74d424f2190",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/f5/40/94e3aa7d2688ed24e3284a3a6789",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/9f/3b/58131e0fa8d16b6216f613862b7e",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f1/ee/e12f976468ec74d73ac0fdb1ead3",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d1/df/24a1cdc6e948ba59c7f3049008d6",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7d/e1/b2f0ce9c6c627f74529192b3b109",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/5d/19/a9111fa261821316bdb1a63686d2",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/9c/b2/007fa32c1d9910a2b6d71b7e4de1",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d9/06/051a35ea54a1ca1d6f1256da1c23",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/87/10/a3af2cedad809ac1a2788196f222",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/5d/aa/8e093984b04ca9b281c16a318d1a",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/6a/76/3075a31de439beccbd10c2c3f146",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8c/2f/b9f4b8d1e93509d62d2f6247fc2f",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c8/07/53759e168da972045b7339cd3622",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/b8/26/224a69bb8ae1acdf1c8539a97c6a",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/e3/eb/804fdb11f4665f22bab47b4bf33b",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/3a/cc/0bf846a40574ee41c07139013988",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/66/75/b292d4fe3780f0686805b0759a14",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/53/3f/80615207af3b67420a6c9b56c8f4",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/6a/0b/45fad49022fa353d12180f253069",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/9f/ae/bf244f48bc347cbd7ca7b45d503a",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/92/18/d9e884f448a6cf658aa8dcc94060",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/ed/f8d8ce08728b131bc7aa4eef68c5",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/71/91/9f054aa21607dbf2beeb951ce2b5",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f1/de/dfb9e770ea8e22e51d44fdf420f0",
"build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/5b/b8/922f6a007e4572a0e10496f646b4",
"build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/de/e6/cb1b1b8be77d3d10d1575c491d80",
"build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f4/3f/f049a4bf04a5590caf6773ede160",
"build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ab/69/69229ae54785bacaa805dcb61f32",
"build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/df/f0/b0c037a4b182cd3cd3b294477bd0",
"build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/74/6c/b794767db8b9ed811b2c6e26a2ff",
"build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/dc/08/7f59dbc1bbd2485d9e22d41fc869",
"build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/79/e5/3db09dd0fb4498afbfabefb5480d",
"build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a1/37/d293b58ac45b038f4ff29762308a",
"build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/56/25/1fa2625de28827af199a95070db9",
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a8/3d/51cbe50290096fda531e53b20ec2",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4c/5c/9ff93f6ef35ca107956bb0e081de",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/cc/89/18b9d6d000ff6ee1b55f5bc1a46a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/68/d6/1c5ca65403ff20bd010ec4703243",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/e8/0b/14dfabcba60f0f7bd85d5b7eb11c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/c5/d1/58ef21c5b5f8ec82c1369a34c57f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/0e/da/d221dae06de59730b82f37c0c9e3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/dc/21/12f3d6c0e7f6ed433416eafad0a3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ce/a1/5dc03c0fef87a8a3f788f7fdee3d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/2b/8b/1fc591dd174bb537884d7ddea803",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/e6/75/4c6b08a5212c8f51563cdfdf034e",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd",

View File

@ -13,6 +13,8 @@ from batools.featureset import FeatureSet
fset = FeatureSet.get_active()
fset.requirements = {'base'}
fset.soft_requirements = {'classic'}
fset.internal = True
# We provide 'babase.app.plus'.

View File

@ -7,9 +7,12 @@ import random
import logging
from typing import TYPE_CHECKING
from efro.dataclassio import dataclass_from_dict
import _babase
import _bauiv1
import _bascenev1
import bascenev1
from babase._general import Call
from babase._appsubsystem import AppSubsystem
from babase._general import AppTime
import _baclassic
@ -387,7 +390,6 @@ class ClassicSubsystem(AppSubsystem):
"""Attempt to cleanly get back to the main menu."""
# pylint: disable=cyclic-import
from baclassic import _benchmark
from babase import Call
from bastd.mainmenu import MainMenuSession
plus = _babase.app.plus
@ -636,3 +638,45 @@ class ClassicSubsystem(AppSubsystem):
) -> float:
"""(internal)"""
return _baclassic.value_test(arg, change, absolute)
def set_master_server_source(self, source: int) -> None:
"""(internal)"""
_bascenev1.set_master_server_source(source)
def get_game_port(self) -> int:
"""(internal)"""
return _bascenev1.get_game_port()
def v2_upgrade_window(self, login_name: str, code: str) -> None:
"""(internal)"""
from bastd.ui.v2upgrade import V2UpgradeWindow
V2UpgradeWindow(login_name, code)
def account_link_code_window(self, data: dict[str, Any]) -> None:
"""(internal)"""
from bastd.ui.account.link import AccountLinkCodeWindow
AccountLinkCodeWindow(data)
def server_dialog(self, delay: float, data: dict[str, Any]) -> None:
"""(internal)"""
from bastd.ui.serverdialog import (
ServerDialogData,
ServerDialogWindow,
)
try:
sddata = dataclass_from_dict(ServerDialogData, data)
except Exception:
sddata = None
logging.warning(
'Got malformatted ServerDialogData: %s',
data,
)
if sddata is not None:
_babase.apptimer(
delay,
Call(ServerDialogWindow, sddata),
)