From 6cee63f44ff232468212e4f3e89abd745fe6f064 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Jan 2023 20:45:52 -0800 Subject: [PATCH] pubsync --- assets/.asset_manifest_public.json | 2 ++ assets/Makefile | 2 ++ assets/src/ba_data/python/bastd/actor/spaz.py | 5 ++-- .../python/bastd/ui/settings/advanced.py | 4 +--- .../python/bastd/ui/settings/plugins.py | 9 ++++---- .../bastd/ui/settings/pluginsettings.py | 23 ++++++++----------- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/assets/.asset_manifest_public.json b/assets/.asset_manifest_public.json index 895eda83..77b6d030 100644 --- a/assets/.asset_manifest_public.json +++ b/assets/.asset_manifest_public.json @@ -468,6 +468,7 @@ "ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-310.opt-1.pyc", "ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-310.opt-1.pyc", "ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-310.opt-1.pyc", + "ba_data/python/bastd/ui/settings/__pycache__/pluginsettings.cpython-310.opt-1.pyc", "ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-310.opt-1.pyc", "ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-310.opt-1.pyc", "ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-310.opt-1.pyc", @@ -484,6 +485,7 @@ "ba_data/python/bastd/ui/settings/keyboard.py", "ba_data/python/bastd/ui/settings/nettesting.py", "ba_data/python/bastd/ui/settings/plugins.py", + "ba_data/python/bastd/ui/settings/pluginsettings.py", "ba_data/python/bastd/ui/settings/remoteapp.py", "ba_data/python/bastd/ui/settings/testing.py", "ba_data/python/bastd/ui/settings/touchscreen.py", diff --git a/assets/Makefile b/assets/Makefile index 2776b045..7d845b7f 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -359,6 +359,7 @@ SCRIPT_TARGETS_PY_PUBLIC = \ build/ba_data/python/bastd/ui/settings/keyboard.py \ build/ba_data/python/bastd/ui/settings/nettesting.py \ build/ba_data/python/bastd/ui/settings/plugins.py \ + build/ba_data/python/bastd/ui/settings/pluginsettings.py \ build/ba_data/python/bastd/ui/settings/remoteapp.py \ build/ba_data/python/bastd/ui/settings/testing.py \ build/ba_data/python/bastd/ui/settings/touchscreen.py \ @@ -612,6 +613,7 @@ SCRIPT_TARGETS_PYC_PUBLIC = \ build/ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-310.opt-1.pyc \ + build/ba_data/python/bastd/ui/settings/__pycache__/pluginsettings.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-310.opt-1.pyc \ diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index 038ba00d..b276ff28 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -621,8 +621,9 @@ class Spaz(ba.Actor): self.node.curse_death_time = int( 1000.0 * (tval + self.curse_time) ) - self._curse_timer = ba.Timer(5.0, - ba.WeakCall(self.curse_explode)) + self._curse_timer = ba.Timer( + 5.0, ba.WeakCall(self.curse_explode) + ) def equip_boxing_gloves(self) -> None: """ diff --git a/assets/src/ba_data/python/bastd/ui/settings/advanced.py b/assets/src/ba_data/python/bastd/ui/settings/advanced.py index cde5d7b8..50384120 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/advanced.py +++ b/assets/src/ba_data/python/bastd/ui/settings/advanced.py @@ -672,9 +672,7 @@ class AdvancedSettingsWindow(ba.Window): self._save_state() ba.containerwidget(edit=self._root_widget, transition='out_left') ba.app.ui.set_main_menu_window( - PluginWindow( - origin_widget=self._plugins_button - ).get_root_widget() + PluginWindow(origin_widget=self._plugins_button).get_root_widget() ) def _on_promo_code_press(self) -> None: diff --git a/assets/src/ba_data/python/bastd/ui/settings/plugins.py b/assets/src/ba_data/python/bastd/ui/settings/plugins.py index 2a5e4ffe..d782eaf5 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/plugins.py +++ b/assets/src/ba_data/python/bastd/ui/settings/plugins.py @@ -125,7 +125,7 @@ class PluginWindow(ba.Window): ba.widget( edit=self._settings_button, up_widget=self._settings_button, - right_widget=self._settings_button + right_widget=self._settings_button, ) self._scrollwidget = ba.scrollwidget( @@ -206,7 +206,7 @@ class PluginWindow(ba.Window): edit=check, up_widget=self._back_button, left_widget=self._back_button, - right_widget=self._settings_button + right_widget=self._settings_button, ) if button is not None: ba.widget(edit=button, up_widget=self._back_button) @@ -237,11 +237,10 @@ class PluginWindow(ba.Window): def _open_settings(self) -> None: # pylint: disable=cyclic-import from bastd.ui.settings.pluginsettings import PluginSettingsWindow + ba.playsound(ba.getsound('swish')) - ba.containerwidget( - edit=self._root_widget,transition='out_left' - ) + ba.containerwidget(edit=self._root_widget, transition='out_left') ba.app.ui.set_main_menu_window( PluginSettingsWindow(transition='in_right').get_root_widget() ) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index a16b9377..72d0c0fd 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -11,13 +11,11 @@ import ba if TYPE_CHECKING: pass + class PluginSettingsWindow(ba.Window): """Plugin Settings Window""" - def __init__( - self, - transition: str = 'in_right' - ): + def __init__(self, transition: str = 'in_right'): scale_origin: tuple[float, float] | None self._transition_out = 'out_right' @@ -61,7 +59,7 @@ class PluginSettingsWindow(ba.Window): autoselect=True, label=ba.charstr(ba.SpecialChar.BACK), button_type='backSmall', - on_activate_call=self._do_back + on_activate_call=self._do_back, ) ba.containerwidget( edit=self._root_widget, cancel_button=self._back_button @@ -74,13 +72,13 @@ class PluginSettingsWindow(ba.Window): text=ba.Lstr(resource='pluginSettingsText'), color=ba.app.ui.title_color, h_align='center', - v_align='top' + v_align='top', ) self._y_position = 170 if uiscale is ba.UIScale.MEDIUM else 205 self._enable_plugins_button = ba.buttonwidget( parent=self._root_widget, - position=(65,self._y_position), + position=(65, self._y_position), size=(350, 60), autoselect=True, label=ba.Lstr(resource='pluginsEnableAllText'), @@ -91,7 +89,7 @@ class PluginSettingsWindow(ba.Window): self._y_position -= 70 self._disable_plugins_button = ba.buttonwidget( parent=self._root_widget, - position=(65,self._y_position), + position=(65, self._y_position), size=(350, 60), autoselect=True, label=ba.Lstr(resource='pluginsDisableAllText'), @@ -108,24 +106,23 @@ class PluginSettingsWindow(ba.Window): text=ba.Lstr(resource='AutoEnableNewPluginsText'), scale=1.0, maxwidth=430, - on_value_change_call=self._update_value + on_value_change_call=self._update_value, ) ba.widget( - edit=self._back_button, - down_widget=self._enable_plugins_button + edit=self._back_button, down_widget=self._enable_plugins_button ) ba.widget( edit=self._disable_plugins_button, - left_widget=self._disable_plugins_button + left_widget=self._disable_plugins_button, ) ba.widget( edit=self._enable_new_plugins_check_box, left_widget=self._enable_new_plugins_check_box, right_widget=self._enable_new_plugins_check_box, - down_widget=self._enable_new_plugins_check_box + down_widget=self._enable_new_plugins_check_box, ) def _enable_all_plugins(self) -> None: