oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Removing dialog settings from core

Browse Source
This commit is contained in:
Balloonpopper
2022-11-23 11:30:32 +11:00
parent 62f48621a4
commit 028de087fd
8 changed files with 82 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/escoria-core/game/core-scripts/esc/commands/say.gd
View File

@@ -78,13 +78,6 @@ func validate(arguments: Array):
)
return false
if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE) == "" \
and arguments[2] == "":
escoria.logger.error(
self,
"[%s]: Project setting '%s' is not set. Please set a default dialog type."
% [get_command_name(), ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE]
)
return true

1
addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd
View File

@@ -422,7 +422,6 @@ func save_settings():
settings_res.sfx_volume = escoria.settings.sfx_volume
settings_res.speech_volume = escoria.settings.speech_volume
settings_res.fullscreen = escoria.settings.fullscreen
settings_res.skip_dialog = escoria.settings.skip_dialog
settings_res.custom_settings = escoria.settings.custom_settings
var directory: Directory = Directory.new()

3
addons/escoria-core/game/core-scripts/save_data/esc_savesettings.gd
View File

@@ -41,8 +41,5 @@ export var speech_volume: float = ProjectSettings.get_setting(
# True if game has to be fullscreen
export var fullscreen: bool = false
# True if skipping dialogs is allowed
export var skip_dialogs: bool = true
# Dictionary containing all user-defined settings.
export var custom_settings: Dictionary

9
addons/escoria-core/game/core-scripts/save_data/esc_settings_manager.gd
View File

@@ -103,10 +103,6 @@ func save_settings_resource_to_project_settings(settings: ESCSaveSettings):
ESCProjectSettingsManager.FULLSCREEN,
settings.fullscreen
)
ESCProjectSettingsManager.set_setting(
ESCProjectSettingsManager.SKIP_DIALOGS,
settings.skip_dialogs
)
custom_settings = settings.custom_settings
@@ -157,12 +153,11 @@ func get_settings() -> ESCSaveSettings:
settings.fullscreen = ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.FULLSCREEN
)
settings.skip_dialogs = ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.SKIP_DIALOGS
)
settings.custom_settings = custom_settings
return settings
# Save the game settings in the settings file.
func save_settings():