diff options
| author |   Spartan322 <Megacake1234@gmail.com> | 2023-07-06 22:28:55 +0200 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2023-07-09 01:24:10 +0200 |
| commit | 86bee7b44c7cc7adaef8cdf441667a99223dd98a (patch) | |
| tree | 5004d04dbe607dedf273afdee7dff783f4d980ed /game/src/Game/Menu | |
| parent | 5838c2508682bc3f6e35e44056f9ba229bca4571 (diff) | |
Add GameLoader Autoload to handle global loading data
Remove GameDebug, Localization, and ShaderManager from Events.gd
Renamed OptionsSingleton class_name to OptionsEventsObject
Add Events.Loader to handle Loader events (which are global signals)
Make GameDebug singleton with static functions and property
Make Localization functions static
Move ShaderManager variable to GameLoader
Move Events._define_filepaths_dict to GameLoader.define_filepaths_dict
Move game initialization from LoadingScreen.gd and Events.gd to GameStart.gd
Attach GameStart.gd to GameStart.tscn root
Make LoadingScreen generalized and so it is reusable
Remove class_name from LoaderingScreen.gd
Diffstat (limited to 'game/src/Game/Menu')
| -rw-r--r-- | game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd | 2 | ||||
| -rw-r--r-- | game/src/Game/Menu/OptionMenu/ResolutionSelector.gd | 4 | ||||
| -rw-r--r-- | game/src/Game/Menu/OptionMenu/SettingRevertDialog.gd | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd b/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd index 028b3df..c3beaf6 100644 --- a/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd +++ b/game/src/Game/Menu/OptionMenu/MonitorDisplaySelector.gd @@ -15,7 +15,7 @@ func _notification(what : int): func _update_monitor_options_text() -> void: for index in get_item_count(): - set_item_text(index, tr("OPTIONS_VIDEO_MONITOR").format({ "index": Events.Localisation.tr_number(index + 1) })) + set_item_text(index, tr("OPTIONS_VIDEO_MONITOR").format({ "index": Localisation.tr_number(index + 1) })) func _on_option_selected(index : int, by_user : bool) -> void: if _valid_index(index): diff --git a/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd b/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd index 2791ecb..f843815 100644 --- a/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd +++ b/game/src/Game/Menu/OptionMenu/ResolutionSelector.gd @@ -53,8 +53,8 @@ func _update_resolution_options_text() -> void: display_name += "_NAMED" if resolution_value == default_value: display_name += "_DEFAULT" - format_dict["width"] = Events.Localisation.tr_number(resolution_value.x) - format_dict["height"] = Events.Localisation.tr_number(resolution_value.y) + format_dict["width"] = Localisation.tr_number(resolution_value.x) + format_dict["height"] = Localisation.tr_number(resolution_value.y) display_name = tr(display_name).format(format_dict) set_item_text(index, display_name) diff --git a/game/src/Game/Menu/OptionMenu/SettingRevertDialog.gd b/game/src/Game/Menu/OptionMenu/SettingRevertDialog.gd index 8cde621..5e2b81f 100644 --- a/game/src/Game/Menu/OptionMenu/SettingRevertDialog.gd +++ b/game/src/Game/Menu/OptionMenu/SettingRevertDialog.gd @@ -22,7 +22,7 @@ func _notification(what): if not visible: _revert_node = null func _process(_delta) -> void: - dialog_text = tr(dialog_text_key).format({ "time": Events.Localisation.tr_number(int(timer.time_left)) }) + dialog_text = tr(dialog_text_key).format({ "time": Localisation.tr_number(int(timer.time_left)) }) func _on_canceled_or_close_requested() -> void: timer.stop() |