diff options
Diffstat (limited to 'game')
25 files changed, 61 insertions, 49 deletions
diff --git a/game/addons/openvic2-plugin/ReleaseExportEditorPlugin.gd b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd index 4e03788..ac6c5bc 100644 --- a/game/addons/openvic2-plugin/ReleaseExportEditorPlugin.gd +++ b/game/addons/openvic-plugin/ReleaseExportEditorPlugin.gd @@ -6,7 +6,7 @@ var _repo_tag : StringName = "<tag missing>" var _repo_release_name : StringName = "<release name missing>" func _get_name(): - return "OpenVic2-ReleaseExportEditorPlugin" + return "OpenVic-ReleaseExportEditorPlugin" func _export_file(path: String, type: String, features: PackedStringArray) -> void: if path != "res://src/Utility/GIT_INFO.gd": return @@ -29,7 +29,7 @@ var _cached_hash : StringName = &"" func _get_commit_hash() -> StringName: if not _cached_hash.is_empty(): return _cached_hash - var git_hash := OS.get_environment("OPENVIC2_COMMIT") + var git_hash := OS.get_environment("OPENVIC_COMMIT") if not git_hash.is_empty(): _cached_hash = git_hash return git_hash @@ -69,7 +69,7 @@ func _get_commit_hash() -> StringName: return git_hash func _try_get_tag() -> StringName: - var result : StringName = OS.get_environment("OPENVIC2_TAG") + var result : StringName = OS.get_environment("OPENVIC_TAG") if result.is_empty(): var git_output := [] if OS.execute("git", ["describe", "--tags", "--abbrev=0"], git_output) == -1: @@ -97,7 +97,7 @@ func _get_tag(): print("Tag: " + _repo_tag) func _get_release_name(): - var result : StringName = OS.get_environment("OPENVIC2_RELEASE") + var result : StringName = OS.get_environment("OPENVIC_RELEASE") if result.is_empty(): result = _try_get_tag() if not result.is_empty(): diff --git a/game/addons/openvic2-plugin/openvic2-plugin.gd b/game/addons/openvic-plugin/openvic-plugin.gd index 8cfa4e8..dec0312 100644 --- a/game/addons/openvic2-plugin/openvic2-plugin.gd +++ b/game/addons/openvic-plugin/openvic-plugin.gd @@ -1,7 +1,7 @@ @tool extends EditorPlugin -const ReleaseExportEditorPlugin := preload("res://addons/openvic2-plugin/ReleaseExportEditorPlugin.gd") +const ReleaseExportEditorPlugin := preload("res://addons/openvic-plugin/ReleaseExportEditorPlugin.gd") var release_export_editor_plugin := ReleaseExportEditorPlugin.new() func _enter_tree() -> void: diff --git a/game/addons/openvic-plugin/plugin.cfg b/game/addons/openvic-plugin/plugin.cfg new file mode 100644 index 0000000..ee8ef07 --- /dev/null +++ b/game/addons/openvic-plugin/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="OpenVicPlugin" +description="" +author="" +version="" +script="openvic-plugin.gd" diff --git a/game/addons/openvic2-plugin/plugin.cfg b/game/addons/openvic2-plugin/plugin.cfg deleted file mode 100644 index b3e5611..0000000 --- a/game/addons/openvic2-plugin/plugin.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[plugin] - -name="OpenVic2Plugin" -description="" -author="" -version="" -script="openvic2-plugin.gd" diff --git a/game/bin/openvic.gdextension b/game/bin/openvic.gdextension new file mode 100644 index 0000000..574394c --- /dev/null +++ b/game/bin/openvic.gdextension @@ -0,0 +1,14 @@ +[configuration] + +entry_symbol = "openvic_library_init" + +[libraries] + +linux.x86_64.debug = "res://bin/openvic/libopenvic.linux.template_debug.x86_64.so" +linux.x86_64.release = "res://bin/openvic/libopenvic.linux.template_release.x86_64.so" +linux.debug.arm64 = "res://bin/openvic/libopenvic.linux.template_debug.arm64.so" +linux.release.arm64 = "res://bin/openvic/libopenvic.linux.template_release.arm64.so" +windows.x86_64.debug = "res://bin/openvic/libopenvic.windows.template_debug.x86_64.dll" +windows.x86_64.release = "res://bin/openvic/libopenvic.windows.template_release.x86_64.dll" +macos.debug = "res://bin/openvic/libopenvic.macos.template_debug.framework" +macos.release = "res://bin/openvic/libopenvic.macos.template_release.framework" diff --git a/game/bin/openvic2.gdextension b/game/bin/openvic2.gdextension deleted file mode 100644 index 0a12191..0000000 --- a/game/bin/openvic2.gdextension +++ /dev/null @@ -1,14 +0,0 @@ -[configuration] - -entry_symbol = "openvic2_library_init" - -[libraries] - -linux.x86_64.debug = "res://bin/openvic2/libopenvic2.linux.template_debug.x86_64.so" -linux.x86_64.release = "res://bin/openvic2/libopenvic2.linux.template_release.x86_64.so" -linux.debug.arm64 = "res://bin/openvic2/libopenvic2.linux.template_debug.arm64.so" -linux.release.arm64 = "res://bin/openvic2/libopenvic2.linux.template_release.arm64.so" -windows.x86_64.debug = "res://bin/openvic2/libopenvic2.windows.template_debug.x86_64.dll" -windows.x86_64.release = "res://bin/openvic2/libopenvic2.windows.template_release.x86_64.dll" -macos.debug = "res://bin/openvic2/libopenvic2.macos.template_debug.framework" -macos.release = "res://bin/openvic2/libopenvic2.macos.template_release.framework" diff --git a/game/common/credits.csv b/game/common/credits.csv index 2500efe..c5cd021 100644 --- a/game/common/credits.csv +++ b/game/common/credits.csv @@ -1,4 +1,4 @@ -Title,OpenVic2 +Title,OpenVic Project Lead,FakeByte Project Lead,joethepro36 Project Lead,Catylist diff --git a/game/export_presets.cfg b/game/export_presets.cfg index 4a031ea..8c90602 100644 --- a/game/export_presets.cfg +++ b/game/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="common/*" exclude_filter="" -export_path="export/Linux-x86_64/OpenVic2.x86_64" +export_path="export/Linux-x86_64/OpenVic.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -49,7 +49,7 @@ custom_features="" export_filter="all_resources" include_filter="common/*" exclude_filter="" -export_path="export/Windows/OpenVic2.exe" +export_path="export/Windows/OpenVic.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -115,7 +115,7 @@ custom_features="" export_filter="all_resources" include_filter="common/*" exclude_filter="" -export_path="export/MacOS/OpenVic2.app" +export_path="export/MacOS/OpenVic.app" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -130,7 +130,7 @@ custom_template/release="" debug/export_console_script=1 application/icon="" application/icon_interpolation=4 -application/bundle_identifier="com.openvic2.openvic2" +application/bundle_identifier="com.openvic.openvic" application/signature="" application/app_category="Games" application/short_version="0.1" diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv index e4e61f2..0ae1509 100644 --- a/game/localisation/en_GB/menus.csv +++ b/game/localisation/en_GB/menus.csv @@ -1,6 +1,6 @@ ,, Main Menu -MAINMENU_TITLE,OpenVic2 +MAINMENU_TITLE,OpenVic MAINMENU_NEW_GAME,New Game MAINMENU_CONTINUE,Continue MAINMENU_MULTIPLAYER,Multiplayer diff --git a/game/localisation/en_US/menus.csv b/game/localisation/en_US/menus.csv index 50342ee..0e86438 100644 --- a/game/localisation/en_US/menus.csv +++ b/game/localisation/en_US/menus.csv @@ -1,6 +1,6 @@ ,, Main Menu -MAINMENU_TITLE,OpenVic2 +MAINMENU_TITLE,OpenVic MAINMENU_NEW_GAME,New Game MAINMENU_CONTINUE,Continue MAINMENU_MULTIPLAYER,Multiplayer diff --git a/game/localisation/fr_FR/menus.csv b/game/localisation/fr_FR/menus.csv index f265e3a..44dd10f 100644 --- a/game/localisation/fr_FR/menus.csv +++ b/game/localisation/fr_FR/menus.csv @@ -1,6 +1,6 @@ ,, Main Menu -MAINMENU_TITLE,OpenVic2 +MAINMENU_TITLE,OpenVic MAINMENU_NEW_GAME,Nouveau Jeu MAINMENU_CONTINUE,Continuer MAINMENU_MULTIPLAYER,Multijouer diff --git a/game/project.godot b/game/project.godot index f0b3e36..441001d 100644 --- a/game/project.godot +++ b/game/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/name="OpenVic2" +config/name="OpenVic" config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines." run/main_scene="res://src/GameStart.tscn" config/features=PackedStringArray("4.0", "Forward Plus") @@ -40,7 +40,7 @@ window/stretch/aspect="ignore" [editor_plugins] -enabled=PackedStringArray("res://addons/keychain/plugin.cfg", "res://addons/openvic2-plugin/plugin.cfg") +enabled=PackedStringArray("res://addons/keychain/plugin.cfg", "res://addons/openvic-plugin/plugin.cfg") [gui] @@ -110,7 +110,7 @@ locale/localisation_path="res://localisation" limits/message_queue/max_size_kb=16384 -[openvic2] +[openvic] settings/settings_file_path="user://settings.cfg" data/saves_directory="user://saves" diff --git a/game/src/ArgumentParser.gd b/game/src/ArgumentParser.gd index 3f77919..f1ee371 100644 --- a/game/src/ArgumentParser.gd +++ b/game/src/ArgumentParser.gd @@ -1,7 +1,7 @@ @tool extends Node -const argument_setting_path := &"openvic2/data/arguments" +const argument_setting_path := &"openvic/data/arguments" @export var option_array : Array[ArgumentOption] = [ ArgumentOption.new( @@ -215,7 +215,7 @@ func _print_help(): var project_name : StringName = ProjectSettings.get_setting_with_override(&"application/config/name") var project_version : String = _GIT_INFO_.tag var project_hash : String = _GIT_INFO_.short_hash - var project_website : String = "https://openvic2.com" + var project_website : String = "https://openvic.com" var project_description : String = ProjectSettings.get_setting_with_override(&"application/config/description") print_rich( """ diff --git a/game/src/Autoload/Events/GameDebug.gd b/game/src/Autoload/Events/GameDebug.gd index 4e8931f..df7a23a 100644 --- a/game/src/Autoload/Events/GameDebug.gd +++ b/game/src/Autoload/Events/GameDebug.gd @@ -14,8 +14,8 @@ func _init(): set_debug_mode(true) func set_debug_mode(value : bool) -> void: - ProjectSettings.set_setting("openvic2/debug/enabled", value) + ProjectSettings.set_setting("openvic/debug/enabled", value) print("Set debug mode to: ", value) func is_debug_mode() -> bool: - return ProjectSettings.get_setting("openvic2/debug/enabled", false) + return ProjectSettings.get_setting("openvic/debug/enabled", false) diff --git a/game/src/Autoload/Events/Options.gd b/game/src/Autoload/Events/Options.gd index 6b9e089..fbeccef 100644 --- a/game/src/Autoload/Events/Options.gd +++ b/game/src/Autoload/Events/Options.gd @@ -16,7 +16,7 @@ func save_settings_to_file() -> void: func try_reset_settings() -> void: reset_settings.emit() -const settings_file_path_setting : String = "openvic2/settings/settings_file_path" +const settings_file_path_setting : String = "openvic/settings/settings_file_path" const settings_file_path_default : String = "user://settings.cfg" var _settings_file_path : String = ProjectSettings.get_setting(settings_file_path_setting, settings_file_path_default) diff --git a/game/src/Autoload/SaveManager.gd b/game/src/Autoload/SaveManager.gd index c653b2c..fb7806b 100644 --- a/game/src/Autoload/SaveManager.gd +++ b/game/src/Autoload/SaveManager.gd @@ -2,7 +2,7 @@ extends Node # Requirements # * FS-28 -const save_directory_setting := &"openvic2/data/saves_directory" +const save_directory_setting := &"openvic/data/saves_directory" var current_save : SaveResource var current_session_tag : StringName diff --git a/game/src/CreditsMenu/CreditsMenu.gd b/game/src/CreditsMenu/CreditsMenu.gd index 0e9df6b..0db4d7d 100644 --- a/game/src/CreditsMenu/CreditsMenu.gd +++ b/game/src/CreditsMenu/CreditsMenu.gd @@ -169,7 +169,7 @@ func _add_licenses() -> void: license_list.add_child(HSeparator.new()) var license_info := { - "OpenVic2": ["GPLv3", "https://github.com/OpenVic2Project/OpenVic2/blob/main/LICENSE.md"], + "OpenVic": ["GPLv3", "https://github.com/OpenVicProject/OpenVic/blob/main/LICENSE.md"], "Godot": ["MIT", "https://github.com/godotengine/godot/blob/master/LICENSE.txt"], "FreeType": ["FreeType License", "https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT"], "ENet": ["MIT", "http://enet.bespin.org/License.html"], diff --git a/game/src/LobbyMenu/LobbyMenu.gd b/game/src/LobbyMenu/LobbyMenu.gd index 3cd3b40..db4f2ce 100644 --- a/game/src/LobbyMenu/LobbyMenu.gd +++ b/game/src/LobbyMenu/LobbyMenu.gd @@ -41,6 +41,9 @@ func _build_date_list() -> void: game_select_start_date.add_child(start_date) var _id_to_tag : Array[StringName] = [] + +# Requirements +# * FS-8 func _build_save_list() -> void: game_select_save_tab.add_tab("GAMELOBBY_SELECT_ALL") for save_name in SaveManager._save_dictionary: diff --git a/game/src/LobbyMenu/LobbyMenu.tscn b/game/src/LobbyMenu/LobbyMenu.tscn index 63a66d8..3b5796e 100644 --- a/game/src/LobbyMenu/LobbyMenu.tscn +++ b/game/src/LobbyMenu/LobbyMenu.tscn @@ -30,6 +30,7 @@ size_flags_horizontal = 3 layout_mode = 2 [node name="GameSelectScroll" type="ScrollContainer" parent="GameSelectPanel/VBoxContainer"] +editor_description = "UI-39" layout_mode = 2 size_flags_vertical = 3 horizontal_scroll_mode = 0 diff --git a/game/src/LobbyMenu/LobbyPanelButton.tscn b/game/src/LobbyMenu/LobbyPanelButton.tscn index 2ba6c99..f409a2e 100644 --- a/game/src/LobbyMenu/LobbyPanelButton.tscn +++ b/game/src/LobbyMenu/LobbyPanelButton.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" path="res://src/LobbyMenu/LobbyPanelButton.gd" id="1_327u2"] [node name="LobbyPanelButton" type="Container" node_paths=PackedStringArray("background_button", "name_label")] +editor_description = "UI-41" offset_right = 113.0 offset_bottom = 48.0 script = ExtResource("1_327u2") diff --git a/game/src/MusicConductor/MusicConductor.tscn b/game/src/MusicConductor/MusicConductor.tscn index 7194f0b..182de99 100644 --- a/game/src/MusicConductor/MusicConductor.tscn +++ b/game/src/MusicConductor/MusicConductor.tscn @@ -8,6 +8,6 @@ music_directory = "res://audio/music" first_song_name = "The_Crown" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -bus = &"Music" +bus = &"MUSIC_BUS" [connection signal="finished" from="AudioStreamPlayer" to="." method="_on_audio_stream_player_finished"] diff --git a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd b/game/src/OptionMenu/SettingNodes/SettingHSlider.gd index 4e7c9c9..6fa30ed 100644 --- a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd +++ b/game/src/OptionMenu/SettingNodes/SettingHSlider.gd @@ -20,12 +20,15 @@ func load_setting(file : ConfigFile): var load_value = file.get_value(section_name, setting_name, default_value) match typeof(load_value): TYPE_FLOAT, TYPE_INT: + if value == load_value: value_changed.emit(value) value = load_value return TYPE_STRING, TYPE_STRING_NAME: var load_string := load_value as String if load_string.is_valid_float(): - value = load_string.to_float() + load_value = load_string.to_float() + if value == load_value: value_changed.emit(value) + value = load_value return push_error("Setting value '%s' invalid for setting [%s] \"%s\"" % [load_value, section_name, setting_name]) value = default_value diff --git a/game/src/SaveLoadMenu/SaveLoadMenu.gd b/game/src/SaveLoadMenu/SaveLoadMenu.gd index abf1f8c..bff0bb5 100644 --- a/game/src/SaveLoadMenu/SaveLoadMenu.gd +++ b/game/src/SaveLoadMenu/SaveLoadMenu.gd @@ -24,6 +24,8 @@ func filter_for_tag(tag : StringName) -> void: else: child.hide() +# Requirements +# * UIFUN-78 func show_for_load() -> void: _label.text = "SAVELOADMENU_LOAD_TITLE" _save_load_button.text = "SAVELOADMENU_LOAD_BUTTON" @@ -31,6 +33,8 @@ func show_for_load() -> void: is_save_menu = false show() +# Requirements +# * UIFUN-77 func show_for_save() -> void: _label.text = "SAVELOADMENU_SAVE_TITLE" _save_load_button.text = "SAVELOADMENU_SAVE_BUTTON" @@ -72,7 +76,7 @@ func _on_delete_dialog_confirmed() -> void: _requested_node_to_delete.queue_free() # REQUIREMENTS: -# * UIFUNC-83 +# * UIFUN-83 func _on_overwrite_dialog_confirmed() -> void: SaveManager.add_or_replace_save(SaveManager.make_new_save(_submitted_text)) _on_close_button_pressed() diff --git a/game/src/SaveLoadMenu/SavePanelButton.tscn b/game/src/SaveLoadMenu/SavePanelButton.tscn index 3a71a57..d2d0a41 100644 --- a/game/src/SaveLoadMenu/SavePanelButton.tscn +++ b/game/src/SaveLoadMenu/SavePanelButton.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://src/SaveLoadMenu/SavePanelButton.gd" id="1_rtuo6"] [node name="SavePanelButton" type="Container" node_paths=PackedStringArray("country_flag", "date_label", "delete_button", "background_button", "name_label")] -editor_description = "UI-84, UI-91" +editor_description = "SS-18, UI-40, UI-84, UI-86, UI-91, UI-93" offset_right = 276.0 offset_bottom = 48.0 script = ExtResource("1_rtuo6") diff --git a/game/src/Utility/GIT_INFO.gd b/game/src/Utility/GIT_INFO.gd index dc02349..eddb7a1 100644 --- a/game/src/Utility/GIT_INFO.gd +++ b/game/src/Utility/GIT_INFO.gd @@ -1,4 +1,4 @@ -### IMPORTANT: IF LOCATION IS CHANGED, PLEASE UPDATE IN addon/openvic2-plugin/ReleaseExportEditorPlugin +### IMPORTANT: IF LOCATION IS CHANGED, PLEASE UPDATE IN addon/openvic-plugin/ReleaseExportEditorPlugin class_name _GIT_INFO_ extends RefCounted |