Skip to content

Commit bb4a040

Browse files
authored
Merge pull request #506 from OpenVicProject/improve-file-structure
Reorganise file structure to promote navigability and standard patterns
2 parents bd25a57 + c4ba2e4 commit bb4a040

File tree

231 files changed

+204
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+204
-182
lines changed

docs/project-file-structure.md

Lines changed: 44 additions & 22 deletions

game/assets/graphics/theme/main_menu.tres

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_resource type="Theme" load_steps=36 format=3 uid="uid://qoi3oec48jp0"]
22

3-
[ext_resource type="Script" uid="uid://d2etcw6vfl0k3" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_axke7"]
4-
[ext_resource type="Script" uid="uid://bho74dnf1rq0x" path="res://src/Game/Theme/TextureSetting.gd" id="2_7bwl2"]
3+
[ext_resource type="Script" uid="uid://d2etcw6vfl0k3" path="res://src/UI/Shared/Theme/StyleBoxCombinedTexture.gd" id="1_axke7"]
4+
[ext_resource type="Script" uid="uid://bho74dnf1rq0x" path="res://src/UI/Shared/Theme/TextureSetting.gd" id="2_7bwl2"]
55
[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://assets/graphics/main_menu_background.png" id="3_cpatd"]
66
[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://assets/graphics/main_menu_border_paper.png" id="4_sl60o"]
77
[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://assets/graphics/main_menu_button.png" id="5_xj7ql"]

game/assets/graphics/theme/options_menu.tres

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_resource type="Theme" load_steps=8 format=3 uid="uid://fbxssqcg1s0m"]
22

3-
[ext_resource type="Script" uid="uid://d2etcw6vfl0k3" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_6eqg5"]
4-
[ext_resource type="Script" uid="uid://bho74dnf1rq0x" path="res://src/Game/Theme/TextureSetting.gd" id="2_d0e1t"]
3+
[ext_resource type="Script" uid="uid://d2etcw6vfl0k3" path="res://src/UI/Shared/Theme/StyleBoxCombinedTexture.gd" id="1_6eqg5"]
4+
[ext_resource type="Script" uid="uid://bho74dnf1rq0x" path="res://src/UI/Shared/Theme/TextureSetting.gd" id="2_d0e1t"]
55
[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://assets/graphics/main_menu_background.png" id="3_t863y"]
66
[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://assets/graphics/main_menu_border_paper.png" id="4_ljte1"]
77

game/project.godot

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config_version=5
1212

1313
config/name="OpenVic"
1414
config/description="A faithful recreation of Victoria 2: Heart of Darkness with a focus on enhancing performance, multiplayer stability, and modability for modern machines."
15-
run/main_scene="res://src/Game/GameStart.tscn"
15+
run/main_scene="res://src/Systems/Startup/GameStart.tscn"
1616
config/use_custom_user_dir=true
1717
config/features=PackedStringArray("4.4", "Forward Plus")
1818
boot_splash/bg_color=Color(0, 0, 0, 0)
@@ -29,17 +29,17 @@ buses/default_bus_layout="res://assets/audio/default_bus_layout.tres"
2929

3030
[autoload]
3131

32-
Resolution="*res://src/Game/Autoload/Resolution.gd"
33-
ArgumentParser="*res://src/Game/Autoload/Argument/ArgumentParser.tscn"
34-
WindowOverride="*res://src/Game/Autoload/WindowOverride.gd"
35-
Events="*res://src/Game/Autoload/Events.gd"
36-
GameLoader="*res://src/Game/Autoload/GameLoader.gd"
37-
SoundManager="*res://src/Game/Autoload/SoundManager.gd"
38-
MusicConductor="*res://src/Game/MusicConductor/MusicConductor.tscn"
32+
Resolution="*res://src/Autoload/Resolution.gd"
33+
ArgumentParser="*res://src/Autoload/Argument/ArgumentParser.tscn"
34+
WindowOverride="*res://src/Autoload/WindowOverride.gd"
35+
GuiScale="*res://src/Autoload/GuiScale.gd"
36+
Events="*res://src/Autoload/Events/Events.gd"
37+
GameLoader="*res://src/Autoload/GameLoader.gd"
38+
SoundManager="*res://src/Autoload/SoundManager.gd"
39+
MusicManager="*res://src/Autoload/MusicManager/MusicManager.tscn"
40+
SaveManager="*res://src/Autoload/SaveManager.gd"
41+
CursorManager="*res://src/Autoload/CursorManager.gd"
3942
Keychain="*res://addons/keychain/Keychain.gd"
40-
GuiScale="*res://src/Game/Autoload/GuiScale.gd"
41-
SaveManager="*res://src/Game/Autoload/SaveManager.gd"
42-
CursorManager="*res://src/Game/Autoload/CursorManager.gd"
4343

4444
[display]
4545

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

game/src/Game/Autoload/Argument/ArgumentParser.tscn renamed to game/src/Autoload/Argument/ArgumentParser.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_scene load_steps=8 format=3 uid="uid://dayjmgc34tqo6"]
22

3-
[ext_resource type="Script" uid="uid://d22wlfmqvy2yg" path="res://src/Game/Autoload/Argument/ArgumentParser.gd" id="1_pc7xr"]
4-
[ext_resource type="Script" uid="uid://dtugawg7cc5k1" path="res://src/Game/Autoload/Argument/ArgumentOption.gd" id="2_4hguj"]
3+
[ext_resource type="Script" uid="uid://d22wlfmqvy2yg" path="res://src/Autoload/Argument/ArgumentParser.gd" id="1_pc7xr"]
4+
[ext_resource type="Script" uid="uid://dtugawg7cc5k1" path="res://src/Autoload/Argument/ArgumentOption.gd" id="2_4hguj"]
55

66
[sub_resource type="Resource" id="Resource_tq3y4"]
77
script = ExtResource("2_4hguj")

0 commit comments

Comments
 (0)