aboutsummaryrefslogtreecommitdiff
path: root/game/src/Game
diff options
context:
space:
mode:
Diffstat (limited to 'game/src/Game')
-rw-r--r--game/src/Game/Autoload/SoundManager.gd2
-rw-r--r--game/src/Game/GameSession/GameSessionMenu.tscn2
-rw-r--r--game/src/Game/GameStart.gd11
-rw-r--r--game/src/Game/GameStart.tscn6
-rw-r--r--game/src/Game/LoadingScreen.gd9
-rw-r--r--game/src/Game/LoadingScreen.tscn6
-rw-r--r--game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn6
-rw-r--r--game/src/Game/Menu/MainMenu/MainMenu.tscn4
-rw-r--r--game/src/Game/Menu/OptionMenu/OptionsMenu.tscn2
-rw-r--r--game/src/Game/MusicConductor/MusicConductor.tscn2
10 files changed, 24 insertions, 26 deletions
diff --git a/game/src/Game/Autoload/SoundManager.gd b/game/src/Game/Autoload/SoundManager.gd
index a8a8e80..35c715c 100644
--- a/game/src/Game/Autoload/SoundManager.gd
+++ b/game/src/Game/Autoload/SoundManager.gd
@@ -3,7 +3,7 @@ extends Node
# REQUIREMENTS:
# * SS-68
-const _audio_directory_path : StringName = &"res://audio/sfx/"
+const _audio_directory_path : StringName = &"res://assets/audio/sfx/"
var _loaded_sound : Dictionary = {}
diff --git a/game/src/Game/GameSession/GameSessionMenu.tscn b/game/src/Game/GameSession/GameSessionMenu.tscn
index 196a5d8..af81f09 100644
--- a/game/src/Game/GameSession/GameSessionMenu.tscn
+++ b/game/src/Game/GameSession/GameSessionMenu.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://dvdynl6eir40o"]
-[ext_resource type="Theme" uid="uid://cqrfmjt5yeti7" path="res://theme/game_session_menu.tres" id="1_2onog"]
+[ext_resource type="Theme" uid="uid://cqrfmjt5yeti7" path="res://assets/graphics/theme/game_session_menu.tres" id="1_2onog"]
[ext_resource type="Script" path="res://src/Game/GameSession/GameSessionMenu.gd" id="1_usq6o"]
[ext_resource type="PackedScene" uid="uid://o4u142w4qkln" path="res://src/Game/GameMenu.tscn" id="2_xi6a4"]
diff --git a/game/src/Game/GameStart.gd b/game/src/Game/GameStart.gd
index 3a98dca..857fea9 100644
--- a/game/src/Game/GameStart.gd
+++ b/game/src/Game/GameStart.gd
@@ -42,11 +42,8 @@ func _save_setting(file : ConfigFile) -> void:
file.set_value(section_name, setting_name, _settings_base_path)
func _load_compatibility_mode() -> void:
- # Set this to your Vic2 install dir or a mod's dir to enable compatibility mode
- # (this won't work for mods which rely on vanilla map assets, copy missing assets
- # into the mod's dir for a temporary fix)
- # Usage: OpenVic --compatibility-mode <path>
-
+ # To test mods, set your base path to Victoria II and then pass mods in reverse order with --mod="mod" for each mod.
+
var arg_base_path : String = ArgumentParser.get_argument(&"base-path", "")
var arg_search_path : String = ArgumentParser.get_argument(&"search-path", "")
@@ -70,9 +67,7 @@ func _load_compatibility_mode() -> void:
# and if not also search for a Steam install
actual_base_path = GameSingleton.search_for_game_path("..")
if not actual_base_path:
- var title : String = "Failed to find game asset path!"
- var msg : String = "The path can be specified with the \"base-path\" command line option."
- OS.alert(msg, title)
+ OS.alert(tr("ERROR_ASSET_PATH_NOT_FOUND_MESSAGE"), tr("ERROR_ASSET_PATH_NOT_FOUND"))
get_tree().quit()
return
diff --git a/game/src/Game/GameStart.tscn b/game/src/Game/GameStart.tscn
index 189e72f..eccddc9 100644
--- a/game/src/Game/GameStart.tscn
+++ b/game/src/Game/GameStart.tscn
@@ -3,9 +3,9 @@
[ext_resource type="Script" path="res://src/Game/GameStart.gd" id="1_e0cos"]
[ext_resource type="PackedScene" uid="uid://3kktdpfnc0sn" path="res://src/Game/LoadingScreen.tscn" id="2_h0oiw"]
[ext_resource type="Script" path="res://src/Game/SplashContainer.gd" id="2_xmcgv"]
-[ext_resource type="Texture2D" uid="uid://deef5hufq0j61" path="res://splash_assets/splash_end.png" id="3_qfv12"]
-[ext_resource type="Texture2D" uid="uid://cgdnixsyh7bja" path="res://splash_assets/splash_image.png" id="4_5b6yq"]
-[ext_resource type="VideoStream" path="res://splash_assets/splash_startup.ogv" id="5_8euyy"]
+[ext_resource type="Texture2D" uid="uid://deef5hufq0j61" path="res://assets/graphics/splash_end.png" id="3_qfv12"]
+[ext_resource type="Texture2D" uid="uid://cgdnixsyh7bja" path="res://assets/graphics/splash_image.png" id="4_5b6yq"]
+[ext_resource type="VideoStream" path="res://assets/graphics/splash_startup.ogv" id="5_8euyy"]
[node name="GameStartup" type="Control" node_paths=PackedStringArray("loading_screen")]
layout_mode = 3
diff --git a/game/src/Game/LoadingScreen.gd b/game/src/Game/LoadingScreen.gd
index c1bfdc6..2b96bed 100644
--- a/game/src/Game/LoadingScreen.gd
+++ b/game/src/Game/LoadingScreen.gd
@@ -1,6 +1,6 @@
extends Control
-@export var quote_file_path : String = "res://common/quotes.txt"
+@export var quote_file_path : String = "res://assets/localisation/quotes.txt"
@export_subgroup("Nodes")
@export var progress_bar: ProgressBar
@@ -15,7 +15,10 @@ func start_loading_screen(thread_safe_function : Callable) -> void:
await ready
# set first quote
progress_bar.value = 0
- quote_label.text = quotes[randi() % quotes.size()]
+ if quotes.size() > 0:
+ quote_label.text = quotes[randi() % quotes.size()]
+ else:
+ quote_label.text = "NO QUOTES DEFINED!"
if thread != null and thread.is_started():
thread.wait_to_finish()
@@ -26,7 +29,7 @@ func try_update_loading_screen(percent_complete: float, quote_should_change := f
# forces the function to behave as if deferred
await get_tree().process_frame
progress_bar.value = percent_complete
- if quote_should_change:
+ if quote_should_change and quotes.size() > 0:
quote_label.text = quotes[randi() % quotes.size()]
func _ready() -> void:
diff --git a/game/src/Game/LoadingScreen.tscn b/game/src/Game/LoadingScreen.tscn
index 01b6856..aa84cc3 100644
--- a/game/src/Game/LoadingScreen.tscn
+++ b/game/src/Game/LoadingScreen.tscn
@@ -1,9 +1,9 @@
[gd_scene load_steps=11 format=3 uid="uid://3kktdpfnc0sn"]
[ext_resource type="Script" path="res://src/Game/LoadingScreen.gd" id="1_b0p3w"]
-[ext_resource type="Texture2D" uid="uid://doji17mxxmikl" path="res://theme/assets/loading_screen.png" id="2_ny153"]
-[ext_resource type="Texture2D" uid="uid://hlouxrjm7pqy" path="res://splash_assets/ovgear.png" id="3_avohi"]
-[ext_resource type="Texture2D" uid="uid://oirhxlyiogv8" path="res://splash_assets/globe.png" id="4_eyeeb"]
+[ext_resource type="Texture2D" uid="uid://doji17mxxmikl" path="res://assets/graphics/loading_screen.png" id="2_ny153"]
+[ext_resource type="Texture2D" uid="uid://hlouxrjm7pqy" path="res://assets/graphics/ovgear.png" id="3_avohi"]
+[ext_resource type="Texture2D" uid="uid://oirhxlyiogv8" path="res://assets/graphics/globe.png" id="4_eyeeb"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_3fggo"]
texture = ExtResource("2_ny153")
diff --git a/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn b/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn
index df9d0b2..76f3b75 100644
--- a/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn
+++ b/game/src/Game/Menu/CreditsMenu/CreditsMenu.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://c8knthxkwj1uj"]
-[ext_resource type="Theme" uid="uid://stfxt4hpsify" path="res://theme/credits_menu.tres" id="1_7y4l8"]
+[ext_resource type="Theme" uid="uid://stfxt4hpsify" path="res://assets/graphics/theme/credits_menu.tres" id="1_7pmpu"]
[ext_resource type="Script" path="res://src/Game/Menu/CreditsMenu/CreditsMenu.gd" id="1_csd7i"]
[ext_resource type="PackedScene" uid="uid://ddjbee5gj6bkv" path="res://src/Game/Menu/CreditsMenu/GodotEngineButton.tscn" id="3_fl02a"]
@@ -12,9 +12,9 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
-theme = ExtResource("1_7y4l8")
+theme = ExtResource("1_7pmpu")
script = ExtResource("1_csd7i")
-core_credits_path = "res://common/credits.csv"
+core_credits_path = "res://assets/localisation/credits.csv"
godot_engine_scene = ExtResource("3_fl02a")
label_variants_project = &"ProjectLabel"
label_variants_role = &"RoleLabel"
diff --git a/game/src/Game/Menu/MainMenu/MainMenu.tscn b/game/src/Game/Menu/MainMenu/MainMenu.tscn
index 3e48460..a9f8c54 100644
--- a/game/src/Game/Menu/MainMenu/MainMenu.tscn
+++ b/game/src/Game/Menu/MainMenu/MainMenu.tscn
@@ -1,8 +1,8 @@
[gd_scene load_steps=6 format=3 uid="uid://bp5n3mlu45ygw"]
-[ext_resource type="Theme" uid="uid://qoi3oec48jp0" path="res://theme/main_menu.tres" id="1_1yri4"]
+[ext_resource type="Theme" uid="uid://qoi3oec48jp0" path="res://assets/graphics/theme/main_menu.tres" id="1_1yri4"]
[ext_resource type="Script" path="res://src/Game/Menu/MainMenu/MainMenu.gd" id="2_nm1fq"]
-[ext_resource type="Texture2D" uid="uid://dxys0wg0f0ic5" path="res://theme/assets/OpenVicFINALREALTRANS.png" id="3_58ess"]
+[ext_resource type="Texture2D" uid="uid://dxys0wg0f0ic5" path="res://assets/graphics/OpenVicFINALREALTRANS.png" id="3_58ess"]
[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/Game/LocaleButton.tscn" id="3_amonp"]
[ext_resource type="PackedScene" uid="uid://cen7wkmn6og66" path="res://src/Game/Menu/MainMenu/ReleaseInfoBox.tscn" id="3_km0er"]
diff --git a/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn b/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn
index 3185f63..a363792 100644
--- a/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn
+++ b/game/src/Game/Menu/OptionMenu/OptionsMenu.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://cnbfxjy1m6wja"]
-[ext_resource type="Theme" uid="uid://fbxssqcg1s0m" path="res://theme/options_menu.tres" id="1_0up1d"]
+[ext_resource type="Theme" uid="uid://fbxssqcg1s0m" path="res://assets/graphics/theme/options_menu.tres" id="1_0up1d"]
[ext_resource type="Script" path="res://src/Game/Menu/OptionMenu/OptionsMenu.gd" id="1_tlein"]
[ext_resource type="PackedScene" uid="uid://bq3awxxjn1tuw" path="res://src/Game/Menu/OptionMenu/VideoTab.tscn" id="2_ji8xr"]
[ext_resource type="PackedScene" uid="uid://cbtgwpx2wxi33" path="res://src/Game/Menu/OptionMenu/SoundTab.tscn" id="3_4w35t"]
diff --git a/game/src/Game/MusicConductor/MusicConductor.tscn b/game/src/Game/MusicConductor/MusicConductor.tscn
index a943f24..add392c 100644
--- a/game/src/Game/MusicConductor/MusicConductor.tscn
+++ b/game/src/Game/MusicConductor/MusicConductor.tscn
@@ -4,7 +4,7 @@
[node name="MusicConductor" type="Node" node_paths=PackedStringArray("_audio_stream_player")]
script = ExtResource("1_56t1b")
-music_directory = "res://audio/music"
+music_directory = "res://assets/audio/music"
first_song_name = "The_Crown"
_audio_stream_player = NodePath("AudioStreamPlayer")
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100