RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 07:23:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pubsync

Browse Source
This commit is contained in:
Eric 2023-01-17 20:45:52 -08:00
parent 097b8633c9
commit 6cee63f44f
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
6 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/.asset_manifest_public.json
View File

@ -468,6 +468,7 @@
"ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-310.opt-1.pyc", "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__/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__/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__/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__/testing.cpython-310.opt-1.pyc",
"ba_data/python/bastd/ui/settings/__pycache__/touchscreen.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/keyboard.py",
"ba_data/python/bastd/ui/settings/nettesting.py", "ba_data/python/bastd/ui/settings/nettesting.py",
"ba_data/python/bastd/ui/settings/plugins.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/remoteapp.py",
"ba_data/python/bastd/ui/settings/testing.py", "ba_data/python/bastd/ui/settings/testing.py",
"ba_data/python/bastd/ui/settings/touchscreen.py", "ba_data/python/bastd/ui/settings/touchscreen.py",

2
assets/Makefile
View File

@ -359,6 +359,7 @@ SCRIPT_TARGETS_PY_PUBLIC = \
build/ba_data/python/bastd/ui/settings/keyboard.py \ 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/nettesting.py \
build/ba_data/python/bastd/ui/settings/plugins.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/remoteapp.py \
build/ba_data/python/bastd/ui/settings/testing.py \ build/ba_data/python/bastd/ui/settings/testing.py \
build/ba_data/python/bastd/ui/settings/touchscreen.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__/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__/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__/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__/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__/testing.cpython-310.opt-1.pyc \
build/ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-310.opt-1.pyc \ build/ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-310.opt-1.pyc \

5
assets/src/ba_data/python/bastd/actor/spaz.py
View File

@ -621,8 +621,9 @@ class Spaz(ba.Actor):
self.node.curse_death_time = int( self.node.curse_death_time = int(
1000.0 * (tval + self.curse_time) 1000.0 * (tval + self.curse_time)
) )
self._curse_timer = ba.Timer(5.0, self._curse_timer = ba.Timer(
ba.WeakCall(self.curse_explode)) 5.0, ba.WeakCall(self.curse_explode)
)
def equip_boxing_gloves(self) -> None: def equip_boxing_gloves(self) -> None:
""" """

4
assets/src/ba_data/python/bastd/ui/settings/advanced.py
View File

@ -672,9 +672,7 @@ class AdvancedSettingsWindow(ba.Window):
self._save_state() self._save_state()
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( ba.app.ui.set_main_menu_window(
PluginWindow( PluginWindow(origin_widget=self._plugins_button).get_root_widget()
origin_widget=self._plugins_button
).get_root_widget()
) )
def _on_promo_code_press(self) -> None: def _on_promo_code_press(self) -> None:

9
assets/src/ba_data/python/bastd/ui/settings/plugins.py
View File

@ -125,7 +125,7 @@ class PluginWindow(ba.Window):
ba.widget( ba.widget(
edit=self._settings_button, edit=self._settings_button,
up_widget=self._settings_button, up_widget=self._settings_button,
right_widget=self._settings_button right_widget=self._settings_button,
) )
self._scrollwidget = ba.scrollwidget( self._scrollwidget = ba.scrollwidget(
@ -206,7 +206,7 @@ class PluginWindow(ba.Window):
edit=check, edit=check,
up_widget=self._back_button, up_widget=self._back_button,
left_widget=self._back_button, left_widget=self._back_button,
right_widget=self._settings_button right_widget=self._settings_button,
) )
if button is not None: if button is not None:
ba.widget(edit=button, up_widget=self._back_button) ba.widget(edit=button, up_widget=self._back_button)
@ -237,11 +237,10 @@ class PluginWindow(ba.Window):
def _open_settings(self) -> None: def _open_settings(self) -> None:
# pylint: disable=cyclic-import # pylint: disable=cyclic-import
from bastd.ui.settings.pluginsettings import PluginSettingsWindow from bastd.ui.settings.pluginsettings import PluginSettingsWindow
ba.playsound(ba.getsound('swish')) ba.playsound(ba.getsound('swish'))
ba.containerwidget( ba.containerwidget(edit=self._root_widget, transition='out_left')
edit=self._root_widget,transition='out_left'
)
ba.app.ui.set_main_menu_window( ba.app.ui.set_main_menu_window(
PluginSettingsWindow(transition='in_right').get_root_widget() PluginSettingsWindow(transition='in_right').get_root_widget()
) )

23
assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py
View File

@ -11,13 +11,11 @@ import ba
if TYPE_CHECKING: if TYPE_CHECKING:
pass pass
class PluginSettingsWindow(ba.Window): class PluginSettingsWindow(ba.Window):
"""Plugin Settings Window""" """Plugin Settings Window"""
def __init__( def __init__(self, transition: str = 'in_right'):
self,
transition: str = 'in_right'
):
scale_origin: tuple[float, float] | None scale_origin: tuple[float, float] | None
self._transition_out = 'out_right' self._transition_out = 'out_right'
@ -61,7 +59,7 @@ class PluginSettingsWindow(ba.Window):
autoselect=True, autoselect=True,
label=ba.charstr(ba.SpecialChar.BACK), label=ba.charstr(ba.SpecialChar.BACK),
button_type='backSmall', button_type='backSmall',
on_activate_call=self._do_back on_activate_call=self._do_back,
) )
ba.containerwidget( ba.containerwidget(
edit=self._root_widget, cancel_button=self._back_button edit=self._root_widget, cancel_button=self._back_button
@ -74,13 +72,13 @@ class PluginSettingsWindow(ba.Window):
text=ba.Lstr(resource='pluginSettingsText'), text=ba.Lstr(resource='pluginSettingsText'),
color=ba.app.ui.title_color, color=ba.app.ui.title_color,
h_align='center', h_align='center',
v_align='top' v_align='top',
) )
self._y_position = 170 if uiscale is ba.UIScale.MEDIUM else 205 self._y_position = 170 if uiscale is ba.UIScale.MEDIUM else 205
self._enable_plugins_button = ba.buttonwidget( self._enable_plugins_button = ba.buttonwidget(
parent=self._root_widget, parent=self._root_widget,
position=(65,self._y_position), position=(65, self._y_position),
size=(350, 60), size=(350, 60),
autoselect=True, autoselect=True,
label=ba.Lstr(resource='pluginsEnableAllText'), label=ba.Lstr(resource='pluginsEnableAllText'),
@ -91,7 +89,7 @@ class PluginSettingsWindow(ba.Window):
self._y_position -= 70 self._y_position -= 70
self._disable_plugins_button = ba.buttonwidget( self._disable_plugins_button = ba.buttonwidget(
parent=self._root_widget, parent=self._root_widget,
position=(65,self._y_position), position=(65, self._y_position),
size=(350, 60), size=(350, 60),
autoselect=True, autoselect=True,
label=ba.Lstr(resource='pluginsDisableAllText'), label=ba.Lstr(resource='pluginsDisableAllText'),
@ -108,24 +106,23 @@ class PluginSettingsWindow(ba.Window):
text=ba.Lstr(resource='AutoEnableNewPluginsText'), text=ba.Lstr(resource='AutoEnableNewPluginsText'),
scale=1.0, scale=1.0,
maxwidth=430, maxwidth=430,
on_value_change_call=self._update_value on_value_change_call=self._update_value,
) )
ba.widget( ba.widget(
edit=self._back_button, edit=self._back_button, down_widget=self._enable_plugins_button
down_widget=self._enable_plugins_button
) )
ba.widget( ba.widget(
edit=self._disable_plugins_button, edit=self._disable_plugins_button,
left_widget=self._disable_plugins_button left_widget=self._disable_plugins_button,
) )
ba.widget( ba.widget(
edit=self._enable_new_plugins_check_box, edit=self._enable_new_plugins_check_box,
left_widget=self._enable_new_plugins_check_box, left_widget=self._enable_new_plugins_check_box,
right_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: def _enable_all_plugins(self) -> None: