From 48948f060dd80e57e2e01df016f16c4c613cef6c Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Jun 2023 22:01:08 -0700 Subject: [PATCH] make spinoff-test-scene_v1 should now pass --- .efrocachemap | 32 +++++++++---------- config/featuresets/featureset_scene_v1.py | 3 +- src/assets/ba_data/python/baclassic/_net.py | 2 ++ src/assets/ba_data/python/bascenev1/_lobby.py | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 7032260c..b0ce461f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4080,18 +4080,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/00/f1/983296ec4ecf069c174ded7d6e5d", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b7/38/a79b4fd357f9586f6f1f9a31cb6e", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/85/95/6c64b5f5bf1e1558d01cfa8c89ee", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/e2/f3/bd0fca834abbc706cdcc121df0d2", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/aa/5c/698f1eacae4732d73144e0cdff4d", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/43/0a/d9ec4e8c194e08bb2146af7a8d53", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8d/24/36d82f9aea5198e0674cd1f80e4d", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/aa/7f/66beb4dacfa426bf8f1644f79a4f", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ff/3a/216ae04c015938874c1a31db65c9", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1c/35/4c45906734c00dfc0dcc0c8189cd", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/39/17/b8b8e01b0c36b4f68ff546eca302", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/27/4c7232faab170704a57b7be15442", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/d3/3f9dc7c6f16e8247cecbe4398e16", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/89/3a/9a36daf94b5d576ab05b839668d5", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fc/18/c23b046de337751bb865e1339990", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/8a/9e/38c140317a81d1f7b3e5f8badf8b", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/ed/34/0bb29f2de46782c7372ecf5e3f2e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/28/5b/cb49185f4f34e07ada1dab8ca1b8", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/fc/32/86f631cb559888e84901b9f90982", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0a/a8/bfa215787ac45f95372fdfaefd03", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/77/e1/a1beb6525d16a58c37c47a7edfa5", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/3d/1a/ebc11fdfb17a45a73183f9d292e9", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/ca/0125a4173cead9f20ed4708b0a7f", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/1e/7a/b0fcb7d586eb58087ab5bb84e553", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b8/22/f9d3995d4d213cbc4fd7b2557065", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c5/5c/adaab9f771d775da294ac4098805", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ae/24/eaafd0f23ac832b592b1be8996a6", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/18/ec/e8627a4f475fdf832b715ff4400a", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/57/7c/5f0d634096ef11b0799685afd22e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/bd/22/55ce34cb2fc68b0c0b78fb76acf2", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ba/2c/b49589761585b340e5856b81df6e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/c5/4b/11d8b3530a5e2bf12f67ff21891a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/9f/2d/f341b595d55b5cb560ef6559963e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/f7/69/718641c9a7d8ba47497f58169ac4", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/47/a2/5e43714104aa68fa60d508f98518", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/b7/ef/6d0a654dc9b88d61a8102401442d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/d6/65/b27b037c7a74e76144f001e95d3e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/82/56/6418d82655eea56b28c89c5b340b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/c9/d6/1f01f67964236d68a6e44b2925a4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a1/b7/894d9e92ab239dee9009a8294fbf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/40/64/dc637d74def20adc1cd7f3902f57", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/8a/b8/41d23c85cf10583e5fc2e0001580", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/29/da/f32fdd76e918b8ee889199e78cc4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/bc/39/9efcbde9068d68eddc8f83e14ecf", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/42/50/4610cf8e572de50482a179e2da7d", "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", diff --git a/config/featuresets/featureset_scene_v1.py b/config/featuresets/featureset_scene_v1.py index cf907d36..2ded931d 100644 --- a/config/featuresets/featureset_scene_v1.py +++ b/config/featuresets/featureset_scene_v1.py @@ -12,5 +12,4 @@ from batools.featureset import FeatureSet # Grab the FeatureSet we should apply to. fset = FeatureSet.get_active() -fset.requirements = {'base'} -fset.soft_requirements = {'classic'} +fset.requirements = {'base', 'std', 'classic'} diff --git a/src/assets/ba_data/python/baclassic/_net.py b/src/assets/ba_data/python/baclassic/_net.py index 2241d967..74bb543c 100644 --- a/src/assets/ba_data/python/baclassic/_net.py +++ b/src/assets/ba_data/python/baclassic/_net.py @@ -94,6 +94,7 @@ class MasterServerV1CallThread(threading.Thread): + '?' + urllib.parse.urlencode(self._data) ) + assert url is not None response = urllib.request.urlopen( urllib.request.Request( url, @@ -105,6 +106,7 @@ class MasterServerV1CallThread(threading.Thread): ) elif self._request_type == 'post': url = plus.get_master_server_address() + '/' + self._request + assert url is not None response = urllib.request.urlopen( urllib.request.Request( url, diff --git a/src/assets/ba_data/python/bascenev1/_lobby.py b/src/assets/ba_data/python/bascenev1/_lobby.py index 2dd709cc..aa86aa8f 100644 --- a/src/assets/ba_data/python/bascenev1/_lobby.py +++ b/src/assets/ba_data/python/bascenev1/_lobby.py @@ -230,7 +230,7 @@ class Chooser: # To calc our random character we pick a random one out of our # unlocked list and then locate that character's index in the full # list. - char_index_offset = app.classic.lobby_random_char_index_offset + char_index_offset: int = app.classic.lobby_random_char_index_offset self._random_character_index = ( sessionplayer.inputdevice.id + char_index_offset ) % len(self._character_names)