From ffa383b1cd339c5e4f0fa2eef31bb39cd41f20ed Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 16 Jan 2025 12:23:41 -0800 Subject: [PATCH] latest polishing --- .efrocachemap | 72 +++++++++---------- .../ba_data/python/bascenev1lib/actor/flag.py | 6 +- src/assets/ba_data/python/bauiv1lib/chest.py | 18 +++-- 3 files changed, 52 insertions(+), 44 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 1b5a5a91..6b5950d6 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4126,42 +4126,42 @@ "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "e3a5178f4a9c07f5626866340fcd6761", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "520e3cdae54bcbe4a553d2a35b827256", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "ed0efbd3e89b971e6967a282d87fb60f", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c36431562e626820a1ecf2c419e46742", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "47e36c7c7f90d109de13b0b507d8ec05", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "78aaaabbe1f3fd97b0857e5a46e0002b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b00a7ba07f20b51f021e362c9b9916a0", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5482f7a7986f7724ccfb60c9d6a289f5", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "baeabc492c8cb31dac07a320bf4094ce", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4d6ec640e77368dc9223c6c5d41a9244", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9a0bd08b9a11d80a393258b2627e4161", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "8b60b06de182bd187561a0c1ea1bdf1c", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "186c9c33567737c015deac3689123448", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "c71a751f92d398685a9a3b9834d3a03c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "0a1f5d06fe2a506898eaa7438eb1e934", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ca72c9f8a170c5a1a9346df611680abc", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "40daac4bbc8990d5140f97e792bc4fb1", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "1c375e8003442dd3d059bc0baa260e61", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "40daac4bbc8990d5140f97e792bc4fb1", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "19af08729bed7249eaf9acd697966f3f", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "97d2486072bf3a83edb0250ea2d3e69e", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "19af08729bed7249eaf9acd697966f3f", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "97d2486072bf3a83edb0250ea2d3e69e", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "51884d81e2d7bdeb6b59a72f0247c8e1", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "51884d81e2d7bdeb6b59a72f0247c8e1", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "36bb6f32ab12e2a46b82155a93b2e527", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "88fc6cf69e715b4025bf960138094c67", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "869b621cc4e19e401d773ec304791c6d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ceb6642a0796ce20b8028c340d7c25d0", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3e2e0def5503d7551f8dbae46fa9df47", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "41e14d98470df303de936d6fbe8ed892", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9b53f17503f13cc248b900eea61bdfae", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "830ba578408a13c1cd0f1d2b767ec8b4", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "ddf1ca6a19c481c8da177ed4cbf7ff4f", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "1b62182e0466fe7324c8efd0a200a472", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "b02dbe8b27aa8652a4612adefa83455c", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "669565afb8f2b89074d436dd198a2419", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6c0cf52c55bcfd75e8e351c623fb3039", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "003a1b528c00fd3f8d9bf8369dd066e9", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "1c64c91bd31b9f835a629480e6987281", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "418668be72a86e15c736e3aed50a97de", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "c307f9abcf5044baa72e1c357b8a62fb", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ffb63c7a3354152fa4faeb722d7e55e1", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "ebf4618f4a78e0c7e3aaec8de7a4a1bc", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "cae3d890c467824753901c16099cd0b0", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "1ecd9e8c0fa10babf6dc6329ad819466", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "4061670ebc4762a19e3a50adf1e5c493", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "38c425b1717d8d49558b8a953e7b8a6f", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f74c0f0068ca85f16c24e03f241e4cf6", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "4e22ad07f0b128ea76c77afc5e99539d", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "b261c8140179fdaa56deeaff30b12e04", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "72f521386bbf1ddfdd22b77b75a177fa", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "b261c8140179fdaa56deeaff30b12e04", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "72f521386bbf1ddfdd22b77b75a177fa", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "6099ef66a7b84ee1e2e88ad13d58c642", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "98ed0b5b161a2306d1d83a38dd65e2f5", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "6099ef66a7b84ee1e2e88ad13d58c642", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "98ed0b5b161a2306d1d83a38dd65e2f5", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "b8c4ecf1d17b2831f0eb8ff7d9ed496c", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "ccb9b1af334e1594265fa9f68ae31937", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "b8c4ecf1d17b2831f0eb8ff7d9ed496c", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "ccb9b1af334e1594265fa9f68ae31937", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e3e116ce513eca674e13adf24fa55ba7", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "4d0c055d42e16cc0c311f32e53fead40", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bcdf7b0398aa50c9e83c219ef55de54b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "c47ea25a53a164af2aaddf7ec9b29a16", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "85f53f98450a37115aaa44b473833750", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6ee5194d5c46a44fab82e5f746afb096", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "2c687b0d011bffe747810304da0e210a", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "51a0190483fc7bac9ecb5ffde6a7eebb", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91", diff --git a/src/assets/ba_data/python/bascenev1lib/actor/flag.py b/src/assets/ba_data/python/bascenev1lib/actor/flag.py index 29f2a127..2e5120f9 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/flag.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/flag.py @@ -343,9 +343,9 @@ class Flag(bs.Actor): self.node.delete() if not msg.immediate: self.activity.handlemessage( - FlagDiedMessage(self, ( - msg.how is bs.DeathType.LEFT_GAME - )) + FlagDiedMessage( + self, (msg.how is bs.DeathType.LEFT_GAME) + ) ) elif isinstance(msg, bs.HitMessage): assert self.node diff --git a/src/assets/ba_data/python/bauiv1lib/chest.py b/src/assets/ba_data/python/bauiv1lib/chest.py index 2b0226ad..9daf0e65 100644 --- a/src/assets/ba_data/python/bauiv1lib/chest.py +++ b/src/assets/ba_data/python/bauiv1lib/chest.py @@ -126,7 +126,7 @@ class ChestWindow(bui.MainWindow): size=(0, 0), text='', maxwidth=700, - scale=0.7, + scale=0.8, color=(0.6, 0.5, 0.6), h_align='center', v_align='center', @@ -203,7 +203,9 @@ class ChestWindow(bui.MainWindow): if isinstance(response, Exception): self._error( - bui.Lstr(resource='internal.unavailableNoConnectionText') + # bui.Lstr(resource='internal.unavailableNoConnectionText') + 'Unable to complete this right now.\nPlease try again.', + minor=True, ) return @@ -223,7 +225,9 @@ class ChestWindow(bui.MainWindow): # Communication/local error: if isinstance(response, Exception): self._error( - bui.Lstr(resource='internal.unavailableNoConnectionText') + # bui.Lstr(resource='internal.unavailableNoConnectionText') + 'Unable to complete this right now.\nPlease try again.', + minor=True, ) return @@ -771,10 +775,14 @@ class ChestWindow(bui.MainWindow): widget.delete() bui.textwidget(edit=self._infotext, text='', color=(1, 1, 1)) - def _error(self, msg: str | bui.Lstr) -> None: + def _error(self, msg: str | bui.Lstr, minor: bool = False) -> None: """Put ourself in an error state with a visible error message.""" self._reset() - bui.textwidget(edit=self._infotext, text=msg, color=(1, 0, 0)) + bui.textwidget( + edit=self._infotext, + text=msg, + color=(1, 0.5, 0.5) if minor else (1, 0, 0), + ) def _show_about_chest_slots(self) -> None: # No-op if our ui is dead.