diff options
| author |   BrickPi <ajmach6@gmail.com> | 2024-01-19 22:52:24 +0100 |
|---|---|---|
| committer | BrickPi <ajmach6@gmail.com> | 2024-01-21 16:25:06 +0100 |
| commit | 2940411cb33a64cd41c2d39ddf98aab54edc9f69 (patch) | |
| tree | 8cefa44e20d3fd26f7ba083454ffdcbb43c1d05f | |
| parent | fb2561bd998f211d2099f811a6b6b25a57118160 (diff) | |
Reorganise Asset File Structure
174 files changed, 179 insertions, 1732 deletions
diff --git a/game/art/economy/goods/good_canned_food.png b/game/art/economy/goods/good_canned_food.png Binary files differdeleted file mode 100644 index 2a75b98..0000000 --- a/game/art/economy/goods/good_canned_food.png +++ /dev/null diff --git a/game/art/economy/goods/good_canned_food.png.import b/game/art/economy/goods/good_canned_food.png.import deleted file mode 100644 index bc1c2c7..0000000 --- a/game/art/economy/goods/good_canned_food.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://1uru8eufge1w" -path="res://.godot/imported/good_canned_food.png-c83bafca536c627868b367290d5be590.image" - -[deps] - -source_file="res://art/economy/goods/good_canned_food.png" -dest_files=["res://.godot/imported/good_canned_food.png-c83bafca536c627868b367290d5be590.image"] - -[params] - diff --git a/game/art/economy/goods/good_coal.png b/game/art/economy/goods/good_coal.png Binary files differdeleted file mode 100644 index b7b64c9..0000000 --- a/game/art/economy/goods/good_coal.png +++ /dev/null diff --git a/game/art/economy/goods/good_coal.png.import b/game/art/economy/goods/good_coal.png.import deleted file mode 100644 index 0ffbf32..0000000 --- a/game/art/economy/goods/good_coal.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dlqk1fobuy2pd" -path="res://.godot/imported/good_coal.png-dd9ac68e2f68640bcc4557fcbaf0b3da.image" - -[deps] - -source_file="res://art/economy/goods/good_coal.png" -dest_files=["res://.godot/imported/good_coal.png-dd9ac68e2f68640bcc4557fcbaf0b3da.image"] - -[params] - diff --git a/game/art/economy/goods/good_grain.png b/game/art/economy/goods/good_grain.png Binary files differdeleted file mode 100644 index 5d3da10..0000000 --- a/game/art/economy/goods/good_grain.png +++ /dev/null diff --git a/game/art/economy/goods/good_grain.png.import b/game/art/economy/goods/good_grain.png.import deleted file mode 100644 index e0dfd07..0000000 --- a/game/art/economy/goods/good_grain.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://05vujlayrahi" -path="res://.godot/imported/good_grain.png-811eb0de77edb0e4e86191526fe884b5.image" - -[deps] - -source_file="res://art/economy/goods/good_grain.png" -dest_files=["res://.godot/imported/good_grain.png-811eb0de77edb0e4e86191526fe884b5.image"] - -[params] - diff --git a/game/art/economy/goods/good_iron.png b/game/art/economy/goods/good_iron.png Binary files differdeleted file mode 100644 index 2ebb946..0000000 --- a/game/art/economy/goods/good_iron.png +++ /dev/null diff --git a/game/art/economy/goods/good_iron.png.import b/game/art/economy/goods/good_iron.png.import deleted file mode 100644 index c4efa99..0000000 --- a/game/art/economy/goods/good_iron.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dahscanxyagx7" -path="res://.godot/imported/good_iron.png-7b28cebcb055d7448bc57fcd496889f7.image" - -[deps] - -source_file="res://art/economy/goods/good_iron.png" -dest_files=["res://.godot/imported/good_iron.png-7b28cebcb055d7448bc57fcd496889f7.image"] - -[params] - diff --git a/game/art/economy/goods/good_liquor.png b/game/art/economy/goods/good_liquor.png Binary files differdeleted file mode 100644 index 436ffca..0000000 --- a/game/art/economy/goods/good_liquor.png +++ /dev/null diff --git a/game/art/economy/goods/good_liquor.png.import b/game/art/economy/goods/good_liquor.png.import deleted file mode 100644 index d6182bc..0000000 --- a/game/art/economy/goods/good_liquor.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dialradcphprc" -path="res://.godot/imported/good_liquor.png-7562889384c3b4920fdcf6ef317ef1c3.image" - -[deps] - -source_file="res://art/economy/goods/good_liquor.png" -dest_files=["res://.godot/imported/good_liquor.png-7562889384c3b4920fdcf6ef317ef1c3.image"] - -[params] - diff --git a/game/art/economy/goods/good_machine_parts.png b/game/art/economy/goods/good_machine_parts.png Binary files differdeleted file mode 100644 index 146b042..0000000 --- a/game/art/economy/goods/good_machine_parts.png +++ /dev/null diff --git a/game/art/economy/goods/good_machine_parts.png.import b/game/art/economy/goods/good_machine_parts.png.import deleted file mode 100644 index bab3652..0000000 --- a/game/art/economy/goods/good_machine_parts.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://grn8ijhdoh1o" -path="res://.godot/imported/good_machine_parts.png-93ac404571481e2cf14b4227f7a1bc65.image" - -[deps] - -source_file="res://art/economy/goods/good_machine_parts.png" -dest_files=["res://.godot/imported/good_machine_parts.png-93ac404571481e2cf14b4227f7a1bc65.image"] - -[params] - diff --git a/game/art/economy/goods/good_wool.png b/game/art/economy/goods/good_wool.png Binary files differdeleted file mode 100644 index 6411787..0000000 --- a/game/art/economy/goods/good_wool.png +++ /dev/null diff --git a/game/art/economy/goods/good_wool.png.import b/game/art/economy/goods/good_wool.png.import deleted file mode 100644 index f6f5d69..0000000 --- a/game/art/economy/goods/good_wool.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://frnqx1u57djm" -path="res://.godot/imported/good_wool.png-6dba23c951e5cb3cc74ce81f890cf7e8.image" - -[deps] - -source_file="res://art/economy/goods/good_wool.png" -dest_files=["res://.godot/imported/good_wool.png-6dba23c951e5cb3cc74ce81f890cf7e8.image"] - -[params] - diff --git a/game/art/missing_image.png b/game/art/missing_image.png Binary files differdeleted file mode 100644 index 827ebc0..0000000 --- a/game/art/missing_image.png +++ /dev/null diff --git a/game/art/missing_image.png.import b/game/art/missing_image.png.import deleted file mode 100644 index ebd0f62..0000000 --- a/game/art/missing_image.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://decjt4kqgicns" -path="res://.godot/imported/missing_image.png-be2f5a08706e6e130ac40e14320043cb.image" - -[deps] - -source_file="res://art/missing_image.png" -dest_files=["res://.godot/imported/missing_image.png-be2f5a08706e6e130ac40e14320043cb.image"] - -[params] - diff --git a/game/art/technology/README.md b/game/art/technology/README.md deleted file mode 100644 index 15015e3..0000000 --- a/game/art/technology/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -# Goods Icons Completed Requirements - -## Icon Art -- UI-137, UI-141, UI-154, UI-155, UI-156, UI-160, UI-179 - -## File Loading -- FS-39, FS-40, FS-41, FS-42, FS-43, FS-44, FS-45, FS-46, FS-47, FS-48, FS-49, FS-50, -- FS-51, FS-52, FS-53, FS-54, FS-55, FS-56, FS-57, FS-58, FS-59, FS-60, FS-61, FS-62, -- FS-63, FS-64, FS-65, FS-66, FS-67, FS-68, FS-69, FS-70, FS-71, FS-72, FS-73, FS-74, -- FS-75, FS-76, FS-77, FS-78, FS-79, FS-80, FS-81, FS-82, FS-83, FS-84, FS-85, FS-86 diff --git a/game/art/technology/army/Army Decision Making.png b/game/art/technology/army/Army Decision Making.png Binary files differdeleted file mode 100644 index 69f5966..0000000 --- a/game/art/technology/army/Army Decision Making.png +++ /dev/null diff --git a/game/art/technology/army/Army Decision Making.png.import b/game/art/technology/army/Army Decision Making.png.import deleted file mode 100644 index 736bee3..0000000 --- a/game/art/technology/army/Army Decision Making.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dckthf8dux76m" -path="res://.godot/imported/Army Decision Making.png-de56087375aabbf13116266546faa432.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Army Decision Making.png" -dest_files=["res://.godot/imported/Army Decision Making.png-de56087375aabbf13116266546faa432.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Army NCO Training.png b/game/art/technology/army/Army NCO Training.png Binary files differdeleted file mode 100644 index bc0b03d..0000000 --- a/game/art/technology/army/Army NCO Training.png +++ /dev/null diff --git a/game/art/technology/army/Army NCO Training.png.import b/game/art/technology/army/Army NCO Training.png.import deleted file mode 100644 index b12590b..0000000 --- a/game/art/technology/army/Army NCO Training.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctfu58uqxj5pf" -path="res://.godot/imported/Army NCO Training.png-821f0f46c556e9cf3b61fa3790f53961.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Army NCO Training.png" -dest_files=["res://.godot/imported/Army NCO Training.png-821f0f46c556e9cf3b61fa3790f53961.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Army Professionalism.png b/game/art/technology/army/Army Professionalism.png Binary files differdeleted file mode 100644 index d344136..0000000 --- a/game/art/technology/army/Army Professionalism.png +++ /dev/null diff --git a/game/art/technology/army/Army Professionalism.png.import b/game/art/technology/army/Army Professionalism.png.import deleted file mode 100644 index 5ca9b32..0000000 --- a/game/art/technology/army/Army Professionalism.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://43kk6efdupms" -path="res://.godot/imported/Army Professionalism.png-3303d162aeb25fa8cead9cd12a151bdf.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Army Professionalism.png" -dest_files=["res://.godot/imported/Army Professionalism.png-3303d162aeb25fa8cead9cd12a151bdf.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Army Risk Management.png b/game/art/technology/army/Army Risk Management.png Binary files differdeleted file mode 100644 index ccf7499..0000000 --- a/game/art/technology/army/Army Risk Management.png +++ /dev/null diff --git a/game/art/technology/army/Army Risk Management.png.import b/game/art/technology/army/Army Risk Management.png.import deleted file mode 100644 index 7e3af00..0000000 --- a/game/art/technology/army/Army Risk Management.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dxjxl36ycaagx" -path="res://.godot/imported/Army Risk Management.png-d4c5a789328eafcefc15f4290af86b0d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Army Risk Management.png" -dest_files=["res://.godot/imported/Army Risk Management.png-d4c5a789328eafcefc15f4290af86b0d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Bolt-action Rifle.png b/game/art/technology/army/Bolt-action Rifle.png Binary files differdeleted file mode 100644 index f6d3cd9..0000000 --- a/game/art/technology/army/Bolt-action Rifle.png +++ /dev/null diff --git a/game/art/technology/army/Bolt-action Rifle.png.import b/game/art/technology/army/Bolt-action Rifle.png.import deleted file mode 100644 index dd05df0..0000000 --- a/game/art/technology/army/Bolt-action Rifle.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dnbo2i4corwsf" -path="res://.godot/imported/Bolt-action Rifle.png-4952029366c5c5fa7365f610175bc54d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Bolt-action Rifle.png" -dest_files=["res://.godot/imported/Bolt-action Rifle.png-4952029366c5c5fa7365f610175bc54d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Breech-Loaded Rifles.png b/game/art/technology/army/Breech-Loaded Rifles.png Binary files differdeleted file mode 100644 index cc73316..0000000 --- a/game/art/technology/army/Breech-Loaded Rifles.png +++ /dev/null diff --git a/game/art/technology/army/Breech-Loaded Rifles.png.import b/game/art/technology/army/Breech-Loaded Rifles.png.import deleted file mode 100644 index 15eb654..0000000 --- a/game/art/technology/army/Breech-Loaded Rifles.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dri3wrewyf13r" -path="res://.godot/imported/Breech-Loaded Rifles.png-0a1a7219ca3c5265d85a580eb205a6c1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Breech-Loaded Rifles.png" -dest_files=["res://.godot/imported/Breech-Loaded Rifles.png-0a1a7219ca3c5265d85a580eb205a6c1.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Bronze Muzzle-loaded Artillery.png b/game/art/technology/army/Bronze Muzzle-loaded Artillery.png Binary files differdeleted file mode 100644 index b6f02b1..0000000 --- a/game/art/technology/army/Bronze Muzzle-loaded Artillery.png +++ /dev/null diff --git a/game/art/technology/army/Bronze Muzzle-loaded Artillery.png.import b/game/art/technology/army/Bronze Muzzle-loaded Artillery.png.import deleted file mode 100644 index 7baa8c4..0000000 --- a/game/art/technology/army/Bronze Muzzle-loaded Artillery.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bx2w63j11of83" -path="res://.godot/imported/Bronze Muzzle-loaded Artillery.png-a206f30df41008ce524d81461e3f725a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Bronze Muzzle-loaded Artillery.png" -dest_files=["res://.godot/imported/Bronze Muzzle-loaded Artillery.png-a206f30df41008ce524d81461e3f725a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Deep Defense System.png b/game/art/technology/army/Deep Defense System.png Binary files differdeleted file mode 100644 index 370ec1f..0000000 --- a/game/art/technology/army/Deep Defense System.png +++ /dev/null diff --git a/game/art/technology/army/Deep Defense System.png.import b/game/art/technology/army/Deep Defense System.png.import deleted file mode 100644 index 810c88b..0000000 --- a/game/art/technology/army/Deep Defense System.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dihxim0oemat6" -path="res://.godot/imported/Deep Defense System.png-1ef6b4036bbfd0934f46f40fb02d30ac.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Deep Defense System.png" -dest_files=["res://.godot/imported/Deep Defense System.png-1ef6b4036bbfd0934f46f40fb02d30ac.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Flintlock Rifles.png b/game/art/technology/army/Flintlock Rifles.png Binary files differdeleted file mode 100644 index 17a806e..0000000 --- a/game/art/technology/army/Flintlock Rifles.png +++ /dev/null diff --git a/game/art/technology/army/Flintlock Rifles.png.import b/game/art/technology/army/Flintlock Rifles.png.import deleted file mode 100644 index 65894cd..0000000 --- a/game/art/technology/army/Flintlock Rifles.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://786ytfkafkyd" -path="res://.godot/imported/Flintlock Rifles.png-59fc48db6543edee17194c6fd6c10eef.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Flintlock Rifles.png" -dest_files=["res://.godot/imported/Flintlock Rifles.png-59fc48db6543edee17194c6fd6c10eef.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Indirect Artillery Fire.png b/game/art/technology/army/Indirect Artillery Fire.png Binary files differdeleted file mode 100644 index 5b2009f..0000000 --- a/game/art/technology/army/Indirect Artillery Fire.png +++ /dev/null diff --git a/game/art/technology/army/Indirect Artillery Fire.png.import b/game/art/technology/army/Indirect Artillery Fire.png.import deleted file mode 100644 index 50931c0..0000000 --- a/game/art/technology/army/Indirect Artillery Fire.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b8xmx42ik0nhs" -path="res://.godot/imported/Indirect Artillery Fire.png-8d6eaed9cd7edcdbef53d4d1251ed9f7.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Indirect Artillery Fire.png" -dest_files=["res://.godot/imported/Indirect Artillery Fire.png-8d6eaed9cd7edcdbef53d4d1251ed9f7.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Infiltration.png b/game/art/technology/army/Infiltration.png Binary files differdeleted file mode 100644 index 8d21243..0000000 --- a/game/art/technology/army/Infiltration.png +++ /dev/null diff --git a/game/art/technology/army/Infiltration.png.import b/game/art/technology/army/Infiltration.png.import deleted file mode 100644 index a6697b3..0000000 --- a/game/art/technology/army/Infiltration.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bsfdmmu60tc3n" -path="res://.godot/imported/Infiltration.png-57a5e43cb820964cecd846278423621f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Infiltration.png" -dest_files=["res://.godot/imported/Infiltration.png-57a5e43cb820964cecd846278423621f.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Iron Breech-Loaded Artillery.png b/game/art/technology/army/Iron Breech-Loaded Artillery.png Binary files differdeleted file mode 100644 index 1f9da94..0000000 --- a/game/art/technology/army/Iron Breech-Loaded Artillery.png +++ /dev/null diff --git a/game/art/technology/army/Iron Breech-Loaded Artillery.png.import b/game/art/technology/army/Iron Breech-Loaded Artillery.png.import deleted file mode 100644 index 993627c..0000000 --- a/game/art/technology/army/Iron Breech-Loaded Artillery.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bbsx7rfndoftn" -path="res://.godot/imported/Iron Breech-Loaded Artillery.png-4bac252ba7934897b162ed696b4b7509.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Iron Breech-Loaded Artillery.png" -dest_files=["res://.godot/imported/Iron Breech-Loaded Artillery.png-4bac252ba7934897b162ed696b4b7509.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Iron Muzzle-Loaded Artillery.png b/game/art/technology/army/Iron Muzzle-Loaded Artillery.png Binary files differdeleted file mode 100644 index d5cc13f..0000000 --- a/game/art/technology/army/Iron Muzzle-Loaded Artillery.png +++ /dev/null diff --git a/game/art/technology/army/Iron Muzzle-Loaded Artillery.png.import b/game/art/technology/army/Iron Muzzle-Loaded Artillery.png.import deleted file mode 100644 index efa4e51..0000000 --- a/game/art/technology/army/Iron Muzzle-Loaded Artillery.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cq4kommomraba" -path="res://.godot/imported/Iron Muzzle-Loaded Artillery.png-5777c093343e4ec0cb88b085c086a1f7.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Iron Muzzle-Loaded Artillery.png" -dest_files=["res://.godot/imported/Iron Muzzle-Loaded Artillery.png-5777c093343e4ec0cb88b085c086a1f7.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Machine Gun.png b/game/art/technology/army/Machine Gun.png Binary files differdeleted file mode 100644 index 7ebf274..0000000 --- a/game/art/technology/army/Machine Gun.png +++ /dev/null diff --git a/game/art/technology/army/Machine Gun.png.import b/game/art/technology/army/Machine Gun.png.import deleted file mode 100644 index f6f3775..0000000 --- a/game/art/technology/army/Machine Gun.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cgnd44ys1m4cf" -path="res://.godot/imported/Machine Gun.png-e853bb6291451d02084e1823c7a0d98f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Machine Gun.png" -dest_files=["res://.godot/imported/Machine Gun.png-e853bb6291451d02084e1823c7a0d98f.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Military Directionism.png b/game/art/technology/army/Military Directionism.png Binary files differdeleted file mode 100644 index 93450c2..0000000 --- a/game/art/technology/army/Military Directionism.png +++ /dev/null diff --git a/game/art/technology/army/Military Directionism.png.import b/game/art/technology/army/Military Directionism.png.import deleted file mode 100644 index 17376e1..0000000 --- a/game/art/technology/army/Military Directionism.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dgx61xfpng6ka" -path="res://.godot/imported/Military Directionism.png-565e1e6381fc0f0d7fcb9195f249ca1a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Military Directionism.png" -dest_files=["res://.godot/imported/Military Directionism.png-565e1e6381fc0f0d7fcb9195f249ca1a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Military Logistics.png b/game/art/technology/army/Military Logistics.png Binary files differdeleted file mode 100644 index 22a954c..0000000 --- a/game/art/technology/army/Military Logistics.png +++ /dev/null diff --git a/game/art/technology/army/Military Logistics.png.import b/game/art/technology/army/Military Logistics.png.import deleted file mode 100644 index 0326305..0000000 --- a/game/art/technology/army/Military Logistics.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctoh8oq6afuki" -path="res://.godot/imported/Military Logistics.png-5748d86c74b85e45d6ee2d2f8d81f95a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Military Logistics.png" -dest_files=["res://.godot/imported/Military Logistics.png-5748d86c74b85e45d6ee2d2f8d81f95a.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Military Plans.png b/game/art/technology/army/Military Plans.png Binary files differdeleted file mode 100644 index 299200f..0000000 --- a/game/art/technology/army/Military Plans.png +++ /dev/null diff --git a/game/art/technology/army/Military Plans.png.import b/game/art/technology/army/Military Plans.png.import deleted file mode 100644 index d8e8b0a..0000000 --- a/game/art/technology/army/Military Plans.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bslr0m3ca74y6" -path="res://.godot/imported/Military Plans.png-1a32d460e676e358dde057d988d707ac.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Military Plans.png" -dest_files=["res://.godot/imported/Military Plans.png-1a32d460e676e358dde057d988d707ac.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Military Staff System.png b/game/art/technology/army/Military Staff System.png Binary files differdeleted file mode 100644 index eb07695..0000000 --- a/game/art/technology/army/Military Staff System.png +++ /dev/null diff --git a/game/art/technology/army/Military Staff System.png.import b/game/art/technology/army/Military Staff System.png.import deleted file mode 100644 index 844df8f..0000000 --- a/game/art/technology/army/Military Staff System.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bj6kw2ou4aoop" -path="res://.godot/imported/Military Staff System.png-094a056d8c546ed0da41d1f1dbcdb2a1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Military Staff System.png" -dest_files=["res://.godot/imported/Military Staff System.png-094a056d8c546ed0da41d1f1dbcdb2a1.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Military Statistics.png b/game/art/technology/army/Military Statistics.png Binary files differdeleted file mode 100644 index e9667e4..0000000 --- a/game/art/technology/army/Military Statistics.png +++ /dev/null diff --git a/game/art/technology/army/Military Statistics.png.import b/game/art/technology/army/Military Statistics.png.import deleted file mode 100644 index e495bd9..0000000 --- a/game/art/technology/army/Military Statistics.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c8oww2lsc5sfe" -path="res://.godot/imported/Military Statistics.png-4941c660e22242166acf00038144df37.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Military Statistics.png" -dest_files=["res://.godot/imported/Military Statistics.png-4941c660e22242166acf00038144df37.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Muzzle-loaded Rifles.png b/game/art/technology/army/Muzzle-loaded Rifles.png Binary files differdeleted file mode 100644 index 3277b7b..0000000 --- a/game/art/technology/army/Muzzle-loaded Rifles.png +++ /dev/null diff --git a/game/art/technology/army/Muzzle-loaded Rifles.png.import b/game/art/technology/army/Muzzle-loaded Rifles.png.import deleted file mode 100644 index 5c79afd..0000000 --- a/game/art/technology/army/Muzzle-loaded Rifles.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c1n4hwwt4jwv0" -path="res://.godot/imported/Muzzle-loaded Rifles.png-37ff916f6889925dc68e88b1251f14d7.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Muzzle-loaded Rifles.png" -dest_files=["res://.godot/imported/Muzzle-loaded Rifles.png-37ff916f6889925dc68e88b1251f14d7.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Point Defense System.png b/game/art/technology/army/Point Defense System.png Binary files differdeleted file mode 100644 index 97f406a..0000000 --- a/game/art/technology/army/Point Defense System.png +++ /dev/null diff --git a/game/art/technology/army/Point Defense System.png.import b/game/art/technology/army/Point Defense System.png.import deleted file mode 100644 index b5b5b1c..0000000 --- a/game/art/technology/army/Point Defense System.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ckfv5gbcfij5m" -path="res://.godot/imported/Point Defense System.png-cdd4b2bbbf74fe5b0ebe7d2306d9d468.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Point Defense System.png" -dest_files=["res://.godot/imported/Point Defense System.png-cdd4b2bbbf74fe5b0ebe7d2306d9d468.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Post-Napoleonic Thought.png b/game/art/technology/army/Post-Napoleonic Thought.png Binary files differdeleted file mode 100644 index d6a7e0e..0000000 --- a/game/art/technology/army/Post-Napoleonic Thought.png +++ /dev/null diff --git a/game/art/technology/army/Post-Napoleonic Thought.png.import b/game/art/technology/army/Post-Napoleonic Thought.png.import deleted file mode 100644 index 2e963fc..0000000 --- a/game/art/technology/army/Post-Napoleonic Thought.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bw2bidtorexob" -path="res://.godot/imported/Post-Napoleonic Thought.png-0c345d9286a8a1fd4b7bcbae60ec0250.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Post-Napoleonic Thought.png" -dest_files=["res://.godot/imported/Post-Napoleonic Thought.png-0c345d9286a8a1fd4b7bcbae60ec0250.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Steel Breech-Loaded Artillery.png b/game/art/technology/army/Steel Breech-Loaded Artillery.png Binary files differdeleted file mode 100644 index b1dadea..0000000 --- a/game/art/technology/army/Steel Breech-Loaded Artillery.png +++ /dev/null diff --git a/game/art/technology/army/Steel Breech-Loaded Artillery.png.import b/game/art/technology/army/Steel Breech-Loaded Artillery.png.import deleted file mode 100644 index 92e374e..0000000 --- a/game/art/technology/army/Steel Breech-Loaded Artillery.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cx15ctmi52kv1" -path="res://.godot/imported/Steel Breech-Loaded Artillery.png-2fdc9e71a5204d6d657b8ca9b4cfb3a0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Steel Breech-Loaded Artillery.png" -dest_files=["res://.godot/imported/Steel Breech-Loaded Artillery.png-2fdc9e71a5204d6d657b8ca9b4cfb3a0.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/Strategic Mobility.png b/game/art/technology/army/Strategic Mobility.png Binary files differdeleted file mode 100644 index db72a35..0000000 --- a/game/art/technology/army/Strategic Mobility.png +++ /dev/null diff --git a/game/art/technology/army/Strategic Mobility.png.import b/game/art/technology/army/Strategic Mobility.png.import deleted file mode 100644 index 890b896..0000000 --- a/game/art/technology/army/Strategic Mobility.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cac2g1uui35d5" -path="res://.godot/imported/Strategic Mobility.png-ceaba1342f52e5251521c79dcbf79951.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/Strategic Mobility.png" -dest_files=["res://.godot/imported/Strategic Mobility.png-ceaba1342f52e5251521c79dcbf79951.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/technology/army/The Command Principle.png b/game/art/technology/army/The Command Principle.png Binary files differdeleted file mode 100644 index 2cc7a23..0000000 --- a/game/art/technology/army/The Command Principle.png +++ /dev/null diff --git a/game/art/technology/army/The Command Principle.png.import b/game/art/technology/army/The Command Principle.png.import deleted file mode 100644 index 94c991f..0000000 --- a/game/art/technology/army/The Command Principle.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://r3vxso20jcuf" -path="res://.godot/imported/The Command Principle.png-def1e8cd5ae5294984c171ffa624d74d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/technology/army/The Command Principle.png" -dest_files=["res://.godot/imported/The Command Principle.png-def1e8cd5ae5294984c171ffa624d74d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/terrain/desert_rocky.png b/game/art/terrain/desert_rocky.png Binary files differdeleted file mode 100644 index f7f9155..0000000 --- a/game/art/terrain/desert_rocky.png +++ /dev/null diff --git a/game/art/terrain/desert_rocky.png.import b/game/art/terrain/desert_rocky.png.import deleted file mode 100644 index 258f6d4..0000000 --- a/game/art/terrain/desert_rocky.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://ketdtpxlpwti" -path="res://.godot/imported/desert_rocky.png-2c26845e144e1e8b9c55419654df6654.image" - -[deps] - -source_file="res://art/terrain/desert_rocky.png" -dest_files=["res://.godot/imported/desert_rocky.png-2c26845e144e1e8b9c55419654df6654.image"] - -[params] - diff --git a/game/art/terrain/desert_smooth.png b/game/art/terrain/desert_smooth.png Binary files differdeleted file mode 100644 index 4e977cd..0000000 --- a/game/art/terrain/desert_smooth.png +++ /dev/null diff --git a/game/art/terrain/desert_smooth.png.import b/game/art/terrain/desert_smooth.png.import deleted file mode 100644 index 890bd4b..0000000 --- a/game/art/terrain/desert_smooth.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://d3fh2rgcv2do4" -path="res://.godot/imported/desert_smooth.png-58a5349b112e9e97cf3426b380f022ef.image" - -[deps] - -source_file="res://art/terrain/desert_smooth.png" -dest_files=["res://.godot/imported/desert_smooth.png-58a5349b112e9e97cf3426b380f022ef.image"] - -[params] - diff --git a/game/art/terrain/farmlands.png b/game/art/terrain/farmlands.png Binary files differdeleted file mode 100644 index 3702ad0..0000000 --- a/game/art/terrain/farmlands.png +++ /dev/null diff --git a/game/art/terrain/farmlands.png.import b/game/art/terrain/farmlands.png.import deleted file mode 100644 index 898bb2a..0000000 --- a/game/art/terrain/farmlands.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://b4ra6msfwd8fd" -path="res://.godot/imported/farmlands.png-821213ab9dba19cea6f6c966b3a3760b.image" - -[deps] - -source_file="res://art/terrain/farmlands.png" -dest_files=["res://.godot/imported/farmlands.png-821213ab9dba19cea6f6c966b3a3760b.image"] - -[params] - diff --git a/game/art/terrain/mountains.png b/game/art/terrain/mountains.png Binary files differdeleted file mode 100644 index 301ee23..0000000 --- a/game/art/terrain/mountains.png +++ /dev/null diff --git a/game/art/terrain/mountains.png.import b/game/art/terrain/mountains.png.import deleted file mode 100644 index e403b45..0000000 --- a/game/art/terrain/mountains.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dnj50p7o03s3q" -path="res://.godot/imported/mountains.png-f1ab7d9b0a0deb485923c40b1cfb258e.image" - -[deps] - -source_file="res://art/terrain/mountains.png" -dest_files=["res://.godot/imported/mountains.png-f1ab7d9b0a0deb485923c40b1cfb258e.image"] - -[params] - diff --git a/game/art/terrain/ocean.png b/game/art/terrain/ocean.png Binary files differdeleted file mode 100644 index 3e52011..0000000 --- a/game/art/terrain/ocean.png +++ /dev/null diff --git a/game/art/terrain/ocean.png.import b/game/art/terrain/ocean.png.import deleted file mode 100644 index e72a174..0000000 --- a/game/art/terrain/ocean.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://bvh4qt04mk8km" -path="res://.godot/imported/ocean.png-3d7e213c3fca805d033e0d3bf567fc01.image" - -[deps] - -source_file="res://art/terrain/ocean.png" -dest_files=["res://.godot/imported/ocean.png-3d7e213c3fca805d033e0d3bf567fc01.image"] - -[params] - diff --git a/game/art/units/Artillery.png b/game/art/units/Artillery.png Binary files differdeleted file mode 100644 index b4f8983..0000000 --- a/game/art/units/Artillery.png +++ /dev/null diff --git a/game/art/units/Artillery.png.import b/game/art/units/Artillery.png.import deleted file mode 100644 index 5775e85..0000000 --- a/game/art/units/Artillery.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6q1scxdbxppv" -path="res://.godot/imported/Artillery.png-a510c953fca66ca6ad75d3de82213d2d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/units/Artillery.png" -dest_files=["res://.godot/imported/Artillery.png-a510c953fca66ca6ad75d3de82213d2d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/units/Guard.png b/game/art/units/Guard.png Binary files differdeleted file mode 100644 index edc5eef..0000000 --- a/game/art/units/Guard.png +++ /dev/null diff --git a/game/art/units/Guard.png.import b/game/art/units/Guard.png.import deleted file mode 100644 index 859533b..0000000 --- a/game/art/units/Guard.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bcwqdjag2ebjl" -path="res://.godot/imported/Guard.png-e33328551a8b0c631b2c45a2eacf7946.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/units/Guard.png" -dest_files=["res://.godot/imported/Guard.png-e33328551a8b0c631b2c45a2eacf7946.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/units/Infantry.png b/game/art/units/Infantry.png Binary files differdeleted file mode 100644 index e136f31..0000000 --- a/game/art/units/Infantry.png +++ /dev/null diff --git a/game/art/units/Infantry.png.import b/game/art/units/Infantry.png.import deleted file mode 100644 index e971024..0000000 --- a/game/art/units/Infantry.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://djapkkohviqg8" -path="res://.godot/imported/Infantry.png-2f36f0119ae261a77a92edb77e583aa5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/units/Infantry.png" -dest_files=["res://.godot/imported/Infantry.png-2f36f0119ae261a77a92edb77e583aa5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/units/Irregular.png b/game/art/units/Irregular.png Binary files differdeleted file mode 100644 index 3692f2b..0000000 --- a/game/art/units/Irregular.png +++ /dev/null diff --git a/game/art/units/Irregular.png.import b/game/art/units/Irregular.png.import deleted file mode 100644 index c5afc1f..0000000 --- a/game/art/units/Irregular.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://k85dqi6f5h5b" -path="res://.godot/imported/Irregular.png-3def289eafc49bf0792a13dcfc57644e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://art/units/Irregular.png" -dest_files=["res://.godot/imported/Irregular.png-3def289eafc49bf0792a13dcfc57644e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/game/art/OpenVic.icns b/game/assets/OpenVic.icns Binary files differindex 7bf9475..7bf9475 100644 --- a/game/art/OpenVic.icns +++ b/game/assets/OpenVic.icns diff --git a/game/art/OpenVic.ico b/game/assets/OpenVic.ico Binary files differindex a90ede9..a90ede9 100644 --- a/game/art/OpenVic.ico +++ b/game/assets/OpenVic.ico diff --git a/game/art/OpenVicLogo.png b/game/assets/OpenVicLogo.png Binary files differindex 3e01ae7..3e01ae7 100644 --- a/game/art/OpenVicLogo.png +++ b/game/assets/OpenVicLogo.png diff --git a/game/art/OpenVicLogo.png.import b/game/assets/OpenVicLogo.png.import index 29d6ea1..41fceef 100644 --- a/game/art/OpenVicLogo.png.import +++ b/game/assets/OpenVicLogo.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dtvtn4q1nyuf4" -path="res://.godot/imported/OpenVicLogo.png-899f6fd63c93d404c53c1e477316005f.ctex" +path="res://.godot/imported/OpenVicLogo.png-0aaf52efad17b32f948393254453e998.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://art/OpenVicLogo.png" -dest_files=["res://.godot/imported/OpenVicLogo.png-899f6fd63c93d404c53c1e477316005f.ctex"] +source_file="res://assets/OpenVicLogo.png" +dest_files=["res://.godot/imported/OpenVicLogo.png-0aaf52efad17b32f948393254453e998.ctex"] [params] diff --git a/game/default_bus_layout.tres b/game/assets/audio/default_bus_layout.tres index d6f0c67..d6f0c67 100644 --- a/game/default_bus_layout.tres +++ b/game/assets/audio/default_bus_layout.tres diff --git a/game/audio/music/Brunels_Waltz_2.mp3 b/game/assets/audio/music/Brunels_Waltz_2.mp3 Binary files differindex 307c232..307c232 100644 --- a/game/audio/music/Brunels_Waltz_2.mp3 +++ b/game/assets/audio/music/Brunels_Waltz_2.mp3 diff --git a/game/assets/audio/music/Brunels_Waltz_2.mp3.import b/game/assets/audio/music/Brunels_Waltz_2.mp3.import new file mode 100644 index 0000000..330150d --- /dev/null +++ b/game/assets/audio/music/Brunels_Waltz_2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://jv2gmmla7efh" +path="res://.godot/imported/Brunels_Waltz_2.mp3-17abdb438a46e962e0273b6ab39c7aa3.mp3str" + +[deps] + +source_file="res://assets/audio/music/Brunels_Waltz_2.mp3" +dest_files=["res://.godot/imported/Brunels_Waltz_2.mp3-17abdb438a46e962e0273b6ab39c7aa3.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/game/audio/music/Deliverance.mp3 b/game/assets/audio/music/Deliverance.mp3 Binary files differindex 3e7b5b8..3e7b5b8 100644 --- a/game/audio/music/Deliverance.mp3 +++ b/game/assets/audio/music/Deliverance.mp3 diff --git a/game/assets/audio/music/Deliverance.mp3.import b/game/assets/audio/music/Deliverance.mp3.import new file mode 100644 index 0000000..637b69c --- /dev/null +++ b/game/assets/audio/music/Deliverance.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b3l1dxak84lmw" +path="res://.godot/imported/Deliverance.mp3-0264fb830021deee28ca32727509f775.mp3str" + +[deps] + +source_file="res://assets/audio/music/Deliverance.mp3" +dest_files=["res://.godot/imported/Deliverance.mp3-0264fb830021deee28ca32727509f775.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/game/audio/music/The_Crown.mp3 b/game/assets/audio/music/The_Crown.mp3 Binary files differindex c97f422..c97f422 100644 --- a/game/audio/music/The_Crown.mp3 +++ b/game/assets/audio/music/The_Crown.mp3 diff --git a/game/assets/audio/music/The_Crown.mp3.import b/game/assets/audio/music/The_Crown.mp3.import new file mode 100644 index 0000000..bda61a3 --- /dev/null +++ b/game/assets/audio/music/The_Crown.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cvlvbcifaif0p" +path="res://.godot/imported/The_Crown.mp3-b8423b4ee5c30ef0aca5eaf31e995301.mp3str" + +[deps] + +source_file="res://assets/audio/music/The_Crown.mp3" +dest_files=["res://.godot/imported/The_Crown.mp3-b8423b4ee5c30ef0aca5eaf31e995301.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/game/audio/sfx/click.ogg b/game/assets/audio/sfx/click.ogg Binary files differindex db6685c..db6685c 100644 --- a/game/audio/sfx/click.ogg +++ b/game/assets/audio/sfx/click.ogg diff --git a/game/assets/audio/sfx/click.ogg.import b/game/assets/audio/sfx/click.ogg.import new file mode 100644 index 0000000..9b38650 --- /dev/null +++ b/game/assets/audio/sfx/click.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ba28aehsahrqp" +path="res://.godot/imported/click.ogg-3cad29b0a7122f4b91444dafe5dd3781.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/sfx/click.ogg" +dest_files=["res://.godot/imported/click.ogg-3cad29b0a7122f4b91444dafe5dd3781.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/game/theme/assets/OpenVicFINALREALTRANS.png b/game/assets/graphics/OpenVicFINALREALTRANS.png Binary files differindex 446814f..446814f 100644 --- a/game/theme/assets/OpenVicFINALREALTRANS.png +++ b/game/assets/graphics/OpenVicFINALREALTRANS.png diff --git a/game/theme/assets/OpenVicFINALREALTRANS.png.import b/game/assets/graphics/OpenVicFINALREALTRANS.png.import index 6963753..ca4dc46 100644 --- a/game/theme/assets/OpenVicFINALREALTRANS.png.import +++ b/game/assets/graphics/OpenVicFINALREALTRANS.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxys0wg0f0ic5" -path="res://.godot/imported/OpenVicFINALREALTRANS.png-be4facd2c0164660117ada12fd221f10.ctex" +path="res://.godot/imported/OpenVicFINALREALTRANS.png-443dfc781007e99206ca1887ccc7c222.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/assets/OpenVicFINALREALTRANS.png" -dest_files=["res://.godot/imported/OpenVicFINALREALTRANS.png-be4facd2c0164660117ada12fd221f10.ctex"] +source_file="res://assets/graphics/OpenVicFINALREALTRANS.png" +dest_files=["res://.godot/imported/OpenVicFINALREALTRANS.png-443dfc781007e99206ca1887ccc7c222.ctex"] [params] diff --git a/game/splash_assets/globe.png b/game/assets/graphics/globe.png Binary files differindex f925d35..f925d35 100644 --- a/game/splash_assets/globe.png +++ b/game/assets/graphics/globe.png diff --git a/game/splash_assets/globe.png.import b/game/assets/graphics/globe.png.import index 784d8e8..66e8d25 100644 --- a/game/splash_assets/globe.png.import +++ b/game/assets/graphics/globe.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://oirhxlyiogv8" -path="res://.godot/imported/globe.png-00352f839f02a64dea5126a54e3e9b2b.ctex" +path="res://.godot/imported/globe.png-40121d8f0a76141eff4542e4039b7b7f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://splash_assets/globe.png" -dest_files=["res://.godot/imported/globe.png-00352f839f02a64dea5126a54e3e9b2b.ctex"] +source_file="res://assets/graphics/globe.png" +dest_files=["res://.godot/imported/globe.png-40121d8f0a76141eff4542e4039b7b7f.ctex"] [params] diff --git a/game/theme/assets/loading_screen.png b/game/assets/graphics/loading_screen.png Binary files differindex 03e6945..03e6945 100644 --- a/game/theme/assets/loading_screen.png +++ b/game/assets/graphics/loading_screen.png diff --git a/game/theme/assets/loading_screen.png.import b/game/assets/graphics/loading_screen.png.import index 4fded7a..71dcf20 100644 --- a/game/theme/assets/loading_screen.png.import +++ b/game/assets/graphics/loading_screen.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://doji17mxxmikl" -path="res://.godot/imported/loading_screen.png-0c00ad5005bd6e8f8d33b24c232d736d.ctex" +path="res://.godot/imported/loading_screen.png-3c8df680e2159383ecaef618d5797afc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/assets/loading_screen.png" -dest_files=["res://.godot/imported/loading_screen.png-0c00ad5005bd6e8f8d33b24c232d736d.ctex"] +source_file="res://assets/graphics/loading_screen.png" +dest_files=["res://.godot/imported/loading_screen.png-3c8df680e2159383ecaef618d5797afc.ctex"] [params] diff --git a/game/theme/assets/main_menu_background.png b/game/assets/graphics/main_menu_background.png Binary files differindex 7d64b9f..7d64b9f 100644 --- a/game/theme/assets/main_menu_background.png +++ b/game/assets/graphics/main_menu_background.png diff --git a/game/theme/assets/main_menu_background.png.import b/game/assets/graphics/main_menu_background.png.import index 965fff2..867b71c 100644 --- a/game/theme/assets/main_menu_background.png.import +++ b/game/assets/graphics/main_menu_background.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dapuqgpjs56bs" -path="res://.godot/imported/main_menu_background.png-d397f96448c7ec02ba7a3775a5bc8e5d.ctex" +path="res://.godot/imported/main_menu_background.png-f3284dcecedd52f772bd63910ac19827.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/assets/main_menu_background.png" -dest_files=["res://.godot/imported/main_menu_background.png-d397f96448c7ec02ba7a3775a5bc8e5d.ctex"] +source_file="res://assets/graphics/main_menu_background.png" +dest_files=["res://.godot/imported/main_menu_background.png-f3284dcecedd52f772bd63910ac19827.ctex"] [params] diff --git a/game/theme/assets/main_menu_border_paper.png b/game/assets/graphics/main_menu_border_paper.png Binary files differindex 0693ce5..0693ce5 100644 --- a/game/theme/assets/main_menu_border_paper.png +++ b/game/assets/graphics/main_menu_border_paper.png diff --git a/game/theme/assets/main_menu_border_paper.png.import b/game/assets/graphics/main_menu_border_paper.png.import index b833b97..002765b 100644 --- a/game/theme/assets/main_menu_border_paper.png.import +++ b/game/assets/graphics/main_menu_border_paper.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://q25s41oavuxw" -path="res://.godot/imported/main_menu_border_paper.png-c8549470cf4010a1002e278047308eb5.ctex" +path="res://.godot/imported/main_menu_border_paper.png-cbcf0dc36994e5ae2aa92424bd0c6642.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/assets/main_menu_border_paper.png" -dest_files=["res://.godot/imported/main_menu_border_paper.png-c8549470cf4010a1002e278047308eb5.ctex"] +source_file="res://assets/graphics/main_menu_border_paper.png" +dest_files=["res://.godot/imported/main_menu_border_paper.png-cbcf0dc36994e5ae2aa92424bd0c6642.ctex"] [params] diff --git a/game/theme/assets/main_menu_button.png b/game/assets/graphics/main_menu_button.png Binary files differindex b84c8a3..b84c8a3 100644 --- a/game/theme/assets/main_menu_button.png +++ b/game/assets/graphics/main_menu_button.png diff --git a/game/theme/assets/main_menu_button.png.import b/game/assets/graphics/main_menu_button.png.import index 8f2dcfd..964f054 100644 --- a/game/theme/assets/main_menu_button.png.import +++ b/game/assets/graphics/main_menu_button.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c0p34i3d3b0pw" -path="res://.godot/imported/main_menu_button.png-364b1e885596ca0f849f184a08457deb.ctex" +path="res://.godot/imported/main_menu_button.png-d4d0451b1b623ca9a691f8591605a5ec.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/assets/main_menu_button.png" -dest_files=["res://.godot/imported/main_menu_button.png-364b1e885596ca0f849f184a08457deb.ctex"] +source_file="res://assets/graphics/main_menu_button.png" +dest_files=["res://.godot/imported/main_menu_button.png-d4d0451b1b623ca9a691f8591605a5ec.ctex"] [params] diff --git a/game/splash_assets/ovgear.png b/game/assets/graphics/ovgear.png Binary files differindex d18b437..d18b437 100644 --- a/game/splash_assets/ovgear.png +++ b/game/assets/graphics/ovgear.png diff --git a/game/splash_assets/ovgear.png.import b/game/assets/graphics/ovgear.png.import index ee67bb8..204ae30 100644 --- a/game/splash_assets/ovgear.png.import +++ b/game/assets/graphics/ovgear.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://hlouxrjm7pqy" -path="res://.godot/imported/ovgear.png-b0a02a64494ec794cdac3fbababcd544.ctex" +path="res://.godot/imported/ovgear.png-4cba9c9fb71873ce0a4dcefb139d0fb0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://splash_assets/ovgear.png" -dest_files=["res://.godot/imported/ovgear.png-b0a02a64494ec794cdac3fbababcd544.ctex"] +source_file="res://assets/graphics/ovgear.png" +dest_files=["res://.godot/imported/ovgear.png-4cba9c9fb71873ce0a4dcefb139d0fb0.ctex"] [params] diff --git a/game/splash_assets/splash_end.png b/game/assets/graphics/splash_end.png Binary files differindex ac7b1da..ac7b1da 100644 --- a/game/splash_assets/splash_end.png +++ b/game/assets/graphics/splash_end.png diff --git a/game/splash_assets/splash_end.png.import b/game/assets/graphics/splash_end.png.import index 64a7f9a..cc6620d 100644 --- a/game/splash_assets/splash_end.png.import +++ b/game/assets/graphics/splash_end.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://deef5hufq0j61" -path="res://.godot/imported/splash_end.png-967b7882642610d3be0d67e2695b1564.ctex" +path="res://.godot/imported/splash_end.png-a7c0b4199037c1eacdf4a8a0858a224f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://splash_assets/splash_end.png" -dest_files=["res://.godot/imported/splash_end.png-967b7882642610d3be0d67e2695b1564.ctex"] +source_file="res://assets/graphics/splash_end.png" +dest_files=["res://.godot/imported/splash_end.png-a7c0b4199037c1eacdf4a8a0858a224f.ctex"] [params] diff --git a/game/splash_assets/splash_image.png b/game/assets/graphics/splash_image.png Binary files differindex 5f7cff9..5f7cff9 100644 --- a/game/splash_assets/splash_image.png +++ b/game/assets/graphics/splash_image.png diff --git a/game/splash_assets/splash_image.png.import b/game/assets/graphics/splash_image.png.import index ce7e72c..d541498 100644 --- a/game/splash_assets/splash_image.png.import +++ b/game/assets/graphics/splash_image.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cgdnixsyh7bja" -path="res://.godot/imported/splash_image.png-e2810276ec1ba470c15ca32f0eb76f88.ctex" +path="res://.godot/imported/splash_image.png-115d893c425a3d40a494ad3a64f97c4c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://splash_assets/splash_image.png" -dest_files=["res://.godot/imported/splash_image.png-e2810276ec1ba470c15ca32f0eb76f88.ctex"] +source_file="res://assets/graphics/splash_image.png" +dest_files=["res://.godot/imported/splash_image.png-115d893c425a3d40a494ad3a64f97c4c.ctex"] [params] diff --git a/game/splash_assets/splash_startup.ogv b/game/assets/graphics/splash_startup.ogv Binary files differindex 950d9a6..950d9a6 100644 --- a/game/splash_assets/splash_startup.ogv +++ b/game/assets/graphics/splash_startup.ogv diff --git a/game/theme/credits_menu.tres b/game/assets/graphics/theme/credits_menu.tres index c07f1b6..c07f1b6 100644 --- a/game/theme/credits_menu.tres +++ b/game/assets/graphics/theme/credits_menu.tres diff --git a/game/theme/default_theme.tres b/game/assets/graphics/theme/default_theme.tres index dd8d310..dd8d310 100644 --- a/game/theme/default_theme.tres +++ b/game/assets/graphics/theme/default_theme.tres diff --git a/game/theme/game_session_menu.tres b/game/assets/graphics/theme/game_session_menu.tres index 68847d4..df92aec 100644 --- a/game/theme/game_session_menu.tres +++ b/game/assets/graphics/theme/game_session_menu.tres @@ -1,9 +1,9 @@ [gd_resource type="Theme" load_steps=11 format=3 uid="uid://cqrfmjt5yeti7"] -[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="1_7med2"] +[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://assets/graphics/theme/main_menu_button_normal.tres" id="1_7med2"] [ext_resource type="Script" path="res://src/Game/Theme/StyleBoxWithSound.gd" id="2_oj3dv"] [ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="3_j823n"] -[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="4_lno5s"] +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://assets/graphics/main_menu_button.png" id="4_lno5s"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jvvyi"] content_margin_left = 20.0 diff --git a/game/theme/main_menu.tres b/game/assets/graphics/theme/main_menu.tres index e25da4d..d79184c 100644 --- a/game/theme/main_menu.tres +++ b/game/assets/graphics/theme/main_menu.tres @@ -2,10 +2,10 @@ [ext_resource type="Script" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_axke7"] [ext_resource type="Script" path="res://src/Game/Theme/TextureSetting.gd" id="2_7bwl2"] -[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_cpatd"] -[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_sl60o"] -[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="5_xj7ql"] -[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="6_dx0aj"] +[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://assets/graphics/main_menu_background.png" id="3_cpatd"] +[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://assets/graphics/main_menu_border_paper.png" id="4_sl60o"] +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://assets/graphics/main_menu_button.png" id="5_xj7ql"] +[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://assets/graphics/theme/main_menu_button_normal.tres" id="6_dx0aj"] [ext_resource type="Script" path="res://src/Game/Theme/StyleBoxWithSound.gd" id="7_qo00e"] [ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="8_etuft"] diff --git a/game/theme/assets/main_menu_button_normal.tres b/game/assets/graphics/theme/main_menu_button_normal.tres index 3521264..fe54f1d 100644 --- a/game/theme/assets/main_menu_button_normal.tres +++ b/game/assets/graphics/theme/main_menu_button_normal.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://blwilunhmyvpq"] -[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="1_o43lq"] +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://assets/graphics/main_menu_button.png" id="1_o43lq"] [resource] content_margin_left = 20.0 diff --git a/game/theme/options_menu.tres b/game/assets/graphics/theme/options_menu.tres index 58c12ab..91c6ee4 100644 --- a/game/theme/options_menu.tres +++ b/game/assets/graphics/theme/options_menu.tres @@ -2,8 +2,8 @@ [ext_resource type="Script" path="res://src/Game/Theme/StyleBoxCombinedTexture.gd" id="1_6eqg5"] [ext_resource type="Script" path="res://src/Game/Theme/TextureSetting.gd" id="2_d0e1t"] -[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_t863y"] -[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_ljte1"] +[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://assets/graphics/main_menu_background.png" id="3_t863y"] +[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://assets/graphics/main_menu_border_paper.png" id="4_ljte1"] [sub_resource type="Resource" id="Resource_hxpog"] script = ExtResource("2_d0e1t") diff --git a/game/localisation/README.md b/game/assets/localisation/README.md index 909e380..909e380 100644 --- a/game/localisation/README.md +++ b/game/assets/localisation/README.md diff --git a/game/common/credits.csv b/game/assets/localisation/credits.csv index c5cd021..c5cd021 100644 --- a/game/common/credits.csv +++ b/game/assets/localisation/credits.csv diff --git a/game/common/credits.csv.import b/game/assets/localisation/credits.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/common/credits.csv.import +++ b/game/assets/localisation/credits.csv.import diff --git a/game/localisation/en_GB/goods.csv b/game/assets/localisation/locales/en_GB/goods.csv index 9d41b6a..9d41b6a 100644 --- a/game/localisation/en_GB/goods.csv +++ b/game/assets/localisation/locales/en_GB/goods.csv diff --git a/game/localisation/en_GB/goods.csv.import b/game/assets/localisation/locales/en_GB/goods.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_GB/goods.csv.import +++ b/game/assets/localisation/locales/en_GB/goods.csv.import diff --git a/game/localisation/en_GB/mapmodes.csv b/game/assets/localisation/locales/en_GB/mapmodes.csv index f3e6417..f3e6417 100644 --- a/game/localisation/en_GB/mapmodes.csv +++ b/game/assets/localisation/locales/en_GB/mapmodes.csv diff --git a/game/localisation/en_GB/mapmodes.csv.import b/game/assets/localisation/locales/en_GB/mapmodes.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_GB/mapmodes.csv.import +++ b/game/assets/localisation/locales/en_GB/mapmodes.csv.import diff --git a/game/localisation/en_GB/menus.csv b/game/assets/localisation/locales/en_GB/menus.csv index 6001a9d..08ac0fe 100644 --- a/game/localisation/en_GB/menus.csv +++ b/game/assets/localisation/locales/en_GB/menus.csv @@ -1,4 +1,8 @@ +;; Error Messages +ERROR_ASSET_PATH_NOT_FOUND;Failed to find Victoria II! +ERROR_ASSET_PATH_NOT_FOUND_MESSAGE;OpenVic couldn't find a copy of Victoria II installed on your computer! If you do have Victoria II installed, please specify the path to your game directory with the "search-path" command line option. + ;; Main Menu MAINMENU_TITLE;OpenVic MAINMENU_NEW_GAME;New Game diff --git a/game/localisation/en_GB/menus.csv.import b/game/assets/localisation/locales/en_GB/menus.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_GB/menus.csv.import +++ b/game/assets/localisation/locales/en_GB/menus.csv.import diff --git a/game/localisation/en_GB/provinces.csv b/game/assets/localisation/locales/en_GB/provinces.csv index 39cdae7..39cdae7 100644 --- a/game/localisation/en_GB/provinces.csv +++ b/game/assets/localisation/locales/en_GB/provinces.csv diff --git a/game/localisation/en_GB/provinces.csv.import b/game/assets/localisation/locales/en_GB/provinces.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_GB/provinces.csv.import +++ b/game/assets/localisation/locales/en_GB/provinces.csv.import diff --git a/game/localisation/en_GB/regions.csv b/game/assets/localisation/locales/en_GB/regions.csv index 70abd1c..70abd1c 100644 --- a/game/localisation/en_GB/regions.csv +++ b/game/assets/localisation/locales/en_GB/regions.csv diff --git a/game/localisation/en_GB/regions.csv.import b/game/assets/localisation/locales/en_GB/regions.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_GB/regions.csv.import +++ b/game/assets/localisation/locales/en_GB/regions.csv.import diff --git a/game/localisation/en_US/menus.csv b/game/assets/localisation/locales/en_US/menus.csv index 1312f3b..1312f3b 100644 --- a/game/localisation/en_US/menus.csv +++ b/game/assets/localisation/locales/en_US/menus.csv diff --git a/game/localisation/en_US/menus.csv.import b/game/assets/localisation/locales/en_US/menus.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/en_US/menus.csv.import +++ b/game/assets/localisation/locales/en_US/menus.csv.import diff --git a/game/localisation/fr_FR/menus.csv b/game/assets/localisation/locales/fr_FR/menus.csv index fe0c5c4..fe0c5c4 100644 --- a/game/localisation/fr_FR/menus.csv +++ b/game/assets/localisation/locales/fr_FR/menus.csv diff --git a/game/localisation/fr_FR/menus.csv.import b/game/assets/localisation/locales/fr_FR/menus.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/fr_FR/menus.csv.import +++ b/game/assets/localisation/locales/fr_FR/menus.csv.import diff --git a/game/localisation/ru_RU/goods.csv b/game/assets/localisation/locales/ru_RU/goods.csv index 3f8a30c..3f8a30c 100644 --- a/game/localisation/ru_RU/goods.csv +++ b/game/assets/localisation/locales/ru_RU/goods.csv diff --git a/game/localisation/ru_RU/goods.csv.import b/game/assets/localisation/locales/ru_RU/goods.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/ru_RU/goods.csv.import +++ b/game/assets/localisation/locales/ru_RU/goods.csv.import diff --git a/game/localisation/ru_RU/mapmodes.csv b/game/assets/localisation/locales/ru_RU/mapmodes.csv index 946f29f..946f29f 100644 --- a/game/localisation/ru_RU/mapmodes.csv +++ b/game/assets/localisation/locales/ru_RU/mapmodes.csv diff --git a/game/localisation/ru_RU/mapmodes.csv.import b/game/assets/localisation/locales/ru_RU/mapmodes.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/ru_RU/mapmodes.csv.import +++ b/game/assets/localisation/locales/ru_RU/mapmodes.csv.import diff --git a/game/localisation/ru_RU/menus.csv b/game/assets/localisation/locales/ru_RU/menus.csv index 76605d3..76605d3 100644 --- a/game/localisation/ru_RU/menus.csv +++ b/game/assets/localisation/locales/ru_RU/menus.csv diff --git a/game/localisation/ru_RU/menus.csv.import b/game/assets/localisation/locales/ru_RU/menus.csv.import index 8dd0c09..8dd0c09 100644 --- a/game/localisation/ru_RU/menus.csv.import +++ b/game/assets/localisation/locales/ru_RU/menus.csv.import diff --git a/game/common/quotes.txt b/game/assets/localisation/quotes.txt index 49af5b5..49af5b5 100644 --- a/game/common/quotes.txt +++ b/game/assets/localisation/quotes.txt diff --git a/game/audio/music/Brunels_Waltz_2.mp3.import b/game/audio/music/Brunels_Waltz_2.mp3.import deleted file mode 100644 index bca8e72..0000000 --- a/game/audio/music/Brunels_Waltz_2.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://jv2gmmla7efh" -path="res://.godot/imported/Brunels_Waltz_2.mp3-9089b7cea8551690620c78deb2f5893e.mp3str" - -[deps] - -source_file="res://audio/music/Brunels_Waltz_2.mp3" -dest_files=["res://.godot/imported/Brunels_Waltz_2.mp3-9089b7cea8551690620c78deb2f5893e.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/game/audio/music/Deliverance.mp3.import b/game/audio/music/Deliverance.mp3.import deleted file mode 100644 index 673eba8..0000000 --- a/game/audio/music/Deliverance.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://b3l1dxak84lmw" -path="res://.godot/imported/Deliverance.mp3-503781482297f95faeb04be77c6c4a8e.mp3str" - -[deps] - -source_file="res://audio/music/Deliverance.mp3" -dest_files=["res://.godot/imported/Deliverance.mp3-503781482297f95faeb04be77c6c4a8e.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/game/audio/music/The_Crown.mp3.import b/game/audio/music/The_Crown.mp3.import deleted file mode 100644 index 85dd783..0000000 --- a/game/audio/music/The_Crown.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://cvlvbcifaif0p" -path="res://.godot/imported/The_Crown.mp3-cac26a6fb3ac34d1dc06e96fb0b873c1.mp3str" - -[deps] - -source_file="res://audio/music/The_Crown.mp3" -dest_files=["res://.godot/imported/The_Crown.mp3-cac26a6fb3ac34d1dc06e96fb0b873c1.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/game/audio/sfx/click.ogg.import b/game/audio/sfx/click.ogg.import deleted file mode 100644 index bd62a60..0000000 --- a/game/audio/sfx/click.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://ba28aehsahrqp" -path="res://.godot/imported/click.ogg-384bcd712738d3bf739a83a5627efe9f.oggvorbisstr" - -[deps] - -source_file="res://audio/sfx/click.ogg" -dest_files=["res://.godot/imported/click.ogg-384bcd712738d3bf739a83a5627efe9f.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/game/common/goods.json b/game/common/goods.json deleted file mode 100644 index 959011a..0000000 --- a/game/common/goods.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "good_ammunition": { "category": "military", "base_price": 17.50, "colour": [208, 202, 127], "default_available": false }, - "good_small_arms": { "category": "military", "base_price": 37.00, "colour": [189, 118, 22], "default_available": false }, - "good_artillery": { "category": "military", "base_price": 60.00, "colour": [145, 130, 86], "default_available": false }, - "good_canned_food": { "category": "military", "base_price": 16.00, "colour": [255, 39, 12] }, - "good_tanks": { "category": "military", "base_price": 98.00, "colour": [55, 41, 9], "default_available": false }, - "good_aeroplanes": { "category": "military", "base_price": 110.00, "colour": [221, 213, 182], "default_available": false }, - - "good_coal": { "category": "raw", "base_price": 2.30, "colour": [11, 29, 77] }, - "good_cotton": { "category": "raw", "base_price": 2.00, "colour": [255, 255, 255] }, - "good_dye": { "category": "raw", "base_price": 12.00, "colour": [69, 0, 182] }, - "good_iron": { "category": "raw", "base_price": 3.50, "colour": [111, 111, 111] }, - "good_oil": { "category": "raw", "base_price": 12.00, "colour": [0, 0, 0] }, - "good_precious_metal": { "category": "raw", "base_price": 8.00, "colour": [253, 199, 110], "tradeable": false, "money": true }, - "good_rubber": { "category": "raw", "base_price": 7.00, "colour": [123, 110, 86] }, - "good_silk": { "category": "raw", "base_price": 10.00, "colour": [125, 158, 43] }, - "good_sulphur": { "category": "raw", "base_price": 6.00, "colour": [181, 228, 102] }, - "good_timber": { "category": "raw", "base_price": 0.90, "colour": [146, 72, 17] }, - "good_tropical_wood": { "category": "raw", "base_price": 5.40, "colour": [213, 177, 118] }, - "good_wool": { "category": "raw", "base_price": 0.70, "colour": [234, 195, 158] }, - - "good_steel": { "category": "industrial", "base_price": 4.70, "colour": [95, 128, 147], "default_available": false }, - "good_cement": { "category": "industrial", "base_price": 16.00, "colour": [185, 187, 164] }, - "good_machine_parts": { "category": "industrial", "base_price": 36.50, "colour": [177, 198, 196], "default_available": false }, - "good_glass": { "category": "industrial", "base_price": 2.90, "colour": [201, 200, 199] }, - "good_fuel": { "category": "industrial", "base_price": 25.00, "colour": [145, 110, 89], "default_available": false }, - "good_fertilizer": { "category": "industrial", "base_price": 10.00, "colour": [133, 101, 35] }, - "good_explosives": { "category": "industrial", "base_price": 20.00, "colour": [192, 68, 20], "default_available": false }, - "good_clipper_convoys": { "category": "industrial", "base_price": 42.00, "colour": [21, 65, 30], "default_available": false, "overseas_maintenance": true }, - "good_steamer_convoys": { "category": "industrial", "base_price": 65.00, "colour": [76, 18, 0], "default_available": false, "overseas_maintenance": true }, - "good_electric_gears": { "category": "industrial", "base_price": 16.00, "colour": [255, 255, 0], "default_available": false }, - "good_fabric": { "category": "industrial", "base_price": 1.80, "colour": [186, 50, 40] }, - "good_lumber": { "category": "industrial", "base_price": 1.00, "colour": [180, 94, 26] }, - - "good_paper": { "category": "consumer", "base_price": 3.40, "colour": [216, 185, 77] }, - "good_cattle": { "category": "consumer", "base_price": 2.00, "colour": [84, 227, 40] }, - "good_fish": { "category": "consumer", "base_price": 1.50, "colour": [128, 98, 73] }, - "good_fruit": { "category": "consumer", "base_price": 1.80, "colour": [255, 0, 0] }, - "good_grain": { "category": "consumer", "base_price": 2.20, "colour": [219, 157, 36] }, - "good_tobacco": { "category": "consumer", "base_price": 1.10, "colour": [100, 69, 30] }, - "good_tea": { "category": "consumer", "base_price": 2.60, "colour": [201, 135, 15] }, - "good_coffee": { "category": "consumer", "base_price": 2.10, "colour": [27, 19, 7] }, - "good_opium": { "category": "consumer", "base_price": 3.20, "colour": [114, 162, 47] }, - "good_automobiles": { "category": "consumer", "base_price": 70.00, "colour": [61, 67, 64], "default_available": false }, - "good_telephones": { "category": "consumer", "base_price": 16.00, "colour": [123, 112, 54], "default_available": false }, - "good_wine": { "category": "consumer", "base_price": 9.70, "colour": [123, 0, 54] }, - "good_liquor": { "category": "consumer", "base_price": 6.40, "colour": [76, 5, 0] }, - "good_regular_clothes": { "category": "consumer", "base_price": 5.80, "colour": [217, 17, 19] }, - "good_luxury_clothes": { "category": "consumer", "base_price": 65.00, "colour": [234, 227, 40] }, - "good_furniture": { "category": "consumer", "base_price": 4.90, "colour": [173, 129, 40] }, - "good_luxury_furniture": { "category": "consumer", "base_price": 59.00, "colour": [225, 140, 184] }, - "good_radios": { "category": "consumer", "base_price": 16.00, "colour": [129, 63, 6], "default_available": false} -} diff --git a/game/common/map/provinces.json b/game/common/map/provinces.json deleted file mode 100644 index 637a687..0000000 --- a/game/common/map/provinces.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "prov_britain": [150, 0, 0], - "prov_ireland": [23, 147, 31], - "prov_iceland": "343D91", - "prov_corsica": "FFD800", - "prov_sardinia": "00FFFF", - "prov_sicily": "FFA13D", - "prov_malta": "96E6FF", - "prov_cyprus": "FFE682", - "prov_greenland": "7A66FF", - "prov_baleares": "FF9E21", - "prov_gotland": "8300FF", - "prov_crete": "FF3523", - "prov_jan_mayen": "003FFF", - "prov_faroes": "964B00", - "prov_mann": "935575", - "prov_shetlands": "916F7D", - "prov_orkney": "8E1C70", - "prov_channel_islands": "8C6267", - "prov_madiera": "87580C", - "prov_canarias": "843740", - "prov_sjaeland": "820B02", - "prov_bornholm": "7F512F", - "prov_bear_island": "AE2AD6", - "prov_pantelleria": "FFA575", - "prov_iberia": "FF425D", - "prov_scandinavia": "005F32", - "prov_jutland": "B7004B", - "prov_fyn": "B55C63", - "prov_hiiumaa": "52FFB2", - "prov_saaremaa": "B5E31D", - "prov_italy": "47872C", - "prov_elba": "333333", - "prov_france": "0B0BC6", - "prov_netherlands": "FF472C", - "prov_belgium": "8C6A16", - "prov_luxembourg": "8FB7C6", - "prov_switzerland": "A50000", - "prov_balkans": "00FF5D", - "prov_crimea": "752179", - "prov_germany": "303030", - "prov_poland": "C90043", - "prov_baltics": "6327C4", - "prov_finland": "E8E8E8", - "prov_aland": "8769B3", - "prov_ukraine": "C1CB00", - "prov_russia": "006311", - - "prov_north_america": "A114FF", - - "prov_victoria": "59FF93", - "prov_calgary": "EA00C7", - "prov_saskatoon": "4F8E0F", - "prov_winnipeg": "EA4F12", - "prov_ottawa": "FF0000", - "prov_quebec": "6430AD", - "prov_new_brunswick": "53AF3B", - "prov_prince_edward_island": "BF4E11", - "prov_nova_scotia": "BC0F34", - "prov_labrador": "FF2D5E", - "prov_newfoundland": "1115FF", - "prov_whitehorse": "256B2D", - "prov_yellowknife": "A0133B", - "prov_iqaluit": "C1AE00", - - "prov_cuba": "1E29FF", - "prov_bermuda": "FF2370", - "prov_jamaica": "329600", - "prov_hispaniola": "742B7C", - "prov_aleutians": "FF07AC", - "prov_bahamas": "824261", - "prov_turks_and_caicos": "7F4424", - "prov_puerto_rico": "0D7C57", - "prov_barbados": "747A48", - "prov_grenada": "32774B", - "prov_st_vincent": "535C75", - "prov_st_lucia": "E15CEE", - "prov_martinique": "EDB274", - "prov_dominica": "EAE77E", - "prov_guadeloupe": "E8279E", - "prov_montserrat": "80AAE5", - "prov_antigua": "E2AEB9", - "prov_barbuda": "E0966D", - "prov_st_kitts": "DD85DA", - "prov_west_virgin_islands": "304716", - "prov_east_virgin_islands": "44321E", - "prov_cayman_islands": "FF7900", - "prov_angulia": "FF3D57", - "prov_central_america": "005B5E", - "prov_mexico": "3BA533", - - "prov_south_america": "2F7A22", - "prov_galapagos": "638293", - "prov_falklands": "91451F", - "prov_south_georgia": "8E8B8E", - - "prov_africa": "7F3300", - "prov_madagascar": "790091", - "prov_socotra": "89801A", - "prov_mauritius": "1C8400", - "prov_reunion": "7D821F", - "prov_comoros": "7F5731", - "prov_sao_tome": "FFAFE8", - "prov_fernando_po": "FF665B", - "prov_cape_verde": "00FF48", - "prov_ascension": "7C3B3E", - "prov_st_helena": "7A6C48", - "prov_tristan_da_cunha": "77680E", - "prov_seychelles": "EF68FF", - "prov_prince_edward_islands": "826F68", - "prov_kerguelen_islands": "671F7F", - "prov_heard_island": "7C4244", - "prov_egypt": "A5815B", - "prov_morocco": "D44509", - - "prov_middle_east": "615EA8", - "prov_ceylon": "FF6A00", - "prov_formosa": "82B1FF", - "prov_sakhalin": "006421", - "prov_maldives": "DC0000", - "prov_hainan": "688785", - "prov_hokkaido": "BA0DB5", - "prov_diego_garcia": "752268", - "prov_philippines": "FFA5AD", - "prov_india": "720041", - "prov_andamans": "706054", - "prov_nicobar_islands": "30006B", - "prov_indochina": "007272", - "prov_korea": "1E2570", - "prov_okinawa": "216D38", - "prov_yaeyama": "6B120A", - "prov_kyushu": "9E2521", - "prov_shikoku": "6F9B61", - "prov_japan": "99581B", - "prov_kurils": "992B15", - "prov_manchuria": "B79900", - "prov_china": "B57A53", - "prov_central_asia": "00B2B2", - "prov_siberia": "000EAF", - "prov_iran": "703E1D", - "prov_anatolia": "A81000", - - "prov_oceania": "FF4C00", - "prov_indonesia": "A56A9E", - "prov_north_island": "DB41AF", - "prov_south_island": "D86E47", - "prov_tasmania": "D6BF2C", - "prov_australia": "5BB1D3", - "prov_hawaii": "008C5D", - - "prov_aral_sea": "AA61C6", - "prov_caspian_sea": "00C413", - "prov_lake_ladoga": "462A64", - "prov_lake_ontario": "46CD64", - "prov_lake_erie": "9F2663", - "prov_lake_huron": "9FC6EA", - "prov_lake_michigan": "9FC62A", - "prov_lake_superior": "9F352A", - "prov_lake_baikal": "B51453", - "prov_lake_woods": "9F892A", - "prov_lake_manitoba": "FF0071", - "prov_reindeer_lake": "FF7DFF", - "prov_lake_ronge": "D9FF51", - "prov_lake_athabasca": "FF7D3D", - "prov_great_slave_lake": "49FF6B", - "prov_great_bear_lake": "FFC6C9", - - "prov_azov_sea": "3E33FF", - "prov_black_sea": "3EE1FF", - "prov_marmara_sea": "00009D", - "prov_agean_sea": "0019FF", - "prov_ionian_sea": "003A9D", - "prov_adriatic_sea": "00E3FF", - "prov_tyrrhenian_sea": "0935FF", - "prov_east_mediterranean": "00BBFF", - "prov_central_mediterranean": "3A5FDC", - "prov_west_mediterranean": "93C5FF", - "prov_ligurian_sea": "0000B0", - "prov_balearic_sea": "001BFF", - "prov_alboran_sea": "3E98FF", - "prov_gulf_bothnia": "52E39D", - "prov_gulf_finland": "0935C2", - "prov_gulf_riga": "004987", - "prov_baltic_sea": "5BC5CB", - "prov_danish_straits": "004DB0", - "prov_english_channel": "0079FF", - "prov_irish_sea": "544DFF", - "prov_biscay_bay": "93EEFF", - "prov_north_sea": "31BBFF", - "prov_red_sea": "0952FF", - "prov_arabian_sea": "00007E", - "prov_persian_gulf": "3EA3FF", - "prov_andaman_sea": "0092FF", - "prov_bay_bengal": "4075FF", - "prov_okhotsk_sea": "66C5FF", - "prov_japan_sea": "3A92DC", - "prov_east_china_sea": "0066CB", - "prov_south_china_sea": "3EEEFF", - "prov_philippine_sea": "210066", - "prov_celebes_sea": "0066BB", - "prov_java_sea": "3E33C9", - "prov_banda_sea": "73A3FF", - "prov_arafura_sea": "0000D4", - "prov_gulf_mexico": "00639D", - "prov_caribbean_sea": "00C2DA", - "prov_mozambique_channel": "098FFF", - "prov_zanj_sea": "93B5FF", - "prov_kara_sea": "49FFFF", - "prov_barents_sea": "3A40DC", - "prov_norwegian_sea": "000087", - "prov_greenland_sea": "33EEFF", - "prov_labrador_sea": "003787", - "prov_hudson_bay": "93F7FF", - "prov_gulf_st_lawrence": "4DF7FF", - "prov_gulf_alaska": "2C2F87", - "prov_gulf_california": "2C2FCF", - "prov_east_siberian_sea": "52E3FF", - "prov_sargasso_sea": "0019DA", - "prov_gulf_guinea": "008BDA", - "prov_celtic_sea": "0050B0", - "prov_argentine_sea": "0082B0", - "prov_chilean_sea": "47FFFF", - "prov_north_atlantic": "00B3FF", - "prov_central_atlantic": "68C5FF", - "prov_south_atlantic": "004DDA", - "prov_indian_ocean": "000066", - "prov_great_australian_bight": "3A75FF", - "prov_tasman_sea": "002CD4", - "prov_coral_sea": "8919FF", - "prov_melanesia": "3AA8FF", - "prov_micronesia": "0098CB", - "prov_polynesia": "003EDA", - "prov_north_pacific": "00EECF", - "prov_south_pacific": "03B3FF", - "prov_bering_sea": "0049DA", - "prov_chukchi_sea": "0087A5", - "prov_beaufort_sea": "93BEFF" -} diff --git a/game/common/map/provinces.png b/game/common/map/provinces.png Binary files differdeleted file mode 100644 index be5b52e..0000000 --- a/game/common/map/provinces.png +++ /dev/null diff --git a/game/common/map/provinces.png.import b/game/common/map/provinces.png.import deleted file mode 100644 index 1e521e3..0000000 --- a/game/common/map/provinces.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dlri3ubsvspku" -path="res://.godot/imported/provinces.png-ccb48ce493cb913f98015dfe13c030ff.image" - -[deps] - -source_file="res://common/map/provinces.png" -dest_files=["res://.godot/imported/provinces.png-ccb48ce493cb913f98015dfe13c030ff.image"] - -[params] - diff --git a/game/common/map/regions.json b/game/common/map/regions.json deleted file mode 100644 index 5bb67e2..0000000 --- a/game/common/map/regions.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "region_europe": ["prov_britain", "prov_ireland", "prov_iceland", "prov_corsica", "prov_sardinia", "prov_sicily", "prov_malta", "prov_cyprus", "prov_greenland", "prov_baleares", "prov_gotland", "prov_crete", "prov_jan_mayen", "prov_faroes", "prov_mann", "prov_shetlands", "prov_orkney", "prov_channel_islands", "prov_madiera", "prov_canarias", "prov_sjaeland", "prov_bornholm", "prov_bear_island", "prov_pantelleria", "prov_iberia", "prov_scandinavia", "prov_jutland", "prov_fyn", "prov_hiiumaa", "prov_saaremaa", "prov_italy", "prov_elba", "prov_france", "prov_netherlands", "prov_belgium", "prov_luxembourg", "prov_switzerland", "prov_balkans", "prov_crimea", "prov_germany", "prov_poland", "prov_baltics", "prov_finland", "prov_aland", "prov_ukraine", "prov_russia"], - - "region_north_america": ["prov_north_america", "prov_cuba", "prov_bermuda", "prov_jamaica", "prov_hispaniola", "prov_aleutians", "prov_bahamas", "prov_turks_and_caicos", "prov_puerto_rico", "prov_barbados", "prov_grenada", "prov_st_vincent", "prov_st_lucia", "prov_martinique", "prov_dominica", "prov_guadeloupe", "prov_montserrat", "prov_antigua", "prov_barbuda", "prov_st_kitts", "prov_west_virgin_islands", "prov_east_virgin_islands", "prov_cayman_islands", "prov_angulia", "prov_central_america", "prov_mexico", "prov_victoria", "prov_calgary", "prov_saskatoon", "prov_winnipeg", "prov_ottawa", "prov_quebec", "prov_new_brunswick", "prov_prince_edward_island", "prov_nova_scotia", "prov_labrador", "prov_newfoundland", "prov_whitehorse", "prov_yellowknife", "prov_iqaluit"], - - "region_south_america": ["prov_south_america", "prov_galapagos", "prov_falklands", "prov_south_georgia"], - - "region_africa": ["prov_africa", "prov_madagascar", "prov_socotra", "prov_mauritius", "prov_reunion", "prov_comoros", "prov_sao_tome", "prov_fernando_po", "prov_cape_verde", "prov_ascension", "prov_st_helena", "prov_tristan_da_cunha", "prov_seychelles", "prov_prince_edward_islands", "prov_kerguelen_islands", "prov_heard_island", "prov_egypt", "prov_morocco"], - - "region_asia": ["prov_middle_east", "prov_ceylon", "prov_formosa", "prov_sakhalin", "prov_maldives", "prov_hainan", "prov_hokkaido", "prov_diego_garcia", "prov_philippines", "prov_india", "prov_andamans", "prov_nicobar_islands", "prov_indochina", "prov_korea", "prov_okinawa", "prov_yaeyama", "prov_kyushu", "prov_shikoku", "prov_japan", "prov_kurils", "prov_manchuria", "prov_china", "prov_central_asia", "prov_siberia", "prov_iran", "prov_anatolia"], - - "region_oceania": ["prov_indonesia", "prov_north_island", "prov_south_island", "prov_tasmania", "prov_australia", "prov_hawaii", "prov_oceania"] -} diff --git a/game/common/map/terrain.json b/game/common/map/terrain.json deleted file mode 100644 index 60596c9..0000000 --- a/game/common/map/terrain.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ocean.png": "204080", - "farmlands.png": [88, 170, 37], - "mountains.png": "584B25", - "desert_rocky.png": "A06C38", - "desert_smooth.png": "BAA644" -} diff --git a/game/common/map/terrain.png b/game/common/map/terrain.png Binary files differdeleted file mode 100644 index 6e7ca0a..0000000 --- a/game/common/map/terrain.png +++ /dev/null diff --git a/game/common/map/terrain.png.import b/game/common/map/terrain.png.import deleted file mode 100644 index dffdc93..0000000 --- a/game/common/map/terrain.png.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="image" -type="Image" -uid="uid://dku2vjaty102l" -path="res://.godot/imported/terrain.png-d7b8d6bd02c5e028be54cfe630df9caa.image" - -[deps] - -source_file="res://common/map/terrain.png" -dest_files=["res://.godot/imported/terrain.png-d7b8d6bd02c5e028be54cfe630df9caa.image"] - -[params] - diff --git a/game/common/map/water.json b/game/common/map/water.json deleted file mode 100644 index fda53a9..0000000 --- a/game/common/map/water.json +++ /dev/null @@ -1,6 +0,0 @@ - -[ - "prov_aral_sea", "prov_caspian_sea", "prov_lake_ladoga", "prov_lake_ontario", "prov_lake_erie", "prov_lake_huron", "prov_lake_michigan", "prov_lake_superior", "prov_lake_baikal", "prov_lake_woods", "prov_lake_manitoba", "prov_reindeer_lake", "prov_lake_ronge", "prov_lake_athabasca", "prov_great_slave_lake", "prov_great_bear_lake", - - "prov_azov_sea", "prov_black_sea", "prov_marmara_sea", "prov_agean_sea", "prov_ionian_sea", "prov_adriatic_sea", "prov_tyrrhenian_sea", "prov_east_mediterranean", "prov_central_mediterranean", "prov_west_mediterranean", "prov_ligurian_sea", "prov_balearic_sea", "prov_alboran_sea", "prov_gulf_bothnia", "prov_gulf_finland", "prov_gulf_riga", "prov_baltic_sea", "prov_danish_straits", "prov_english_channel", "prov_irish_sea", "prov_biscay_bay", "prov_north_sea", "prov_red_sea", "prov_arabian_sea", "prov_persian_gulf", "prov_andaman_sea", "prov_bay_bengal", "prov_okhotsk_sea", "prov_japan_sea", "prov_east_china_sea", "prov_south_china_sea", "prov_philippine_sea", "prov_celebes_sea", "prov_java_sea", "prov_banda_sea", "prov_arafura_sea", "prov_gulf_mexico", "prov_caribbean_sea", "prov_mozambique_channel", "prov_zanj_sea", "prov_kara_sea", "prov_barents_sea", "prov_norwegian_sea", "prov_greenland_sea", "prov_labrador_sea", "prov_hudson_bay", "prov_gulf_st_lawrence", "prov_gulf_alaska", "prov_gulf_california", "prov_east_siberian_sea", "prov_sargasso_sea", "prov_gulf_guinea", "prov_celtic_sea", "prov_argentine_sea", "prov_chilean_sea", "prov_north_atlantic", "prov_central_atlantic", "prov_south_atlantic", "prov_indian_ocean", "prov_great_australian_bight", "prov_tasman_sea", "prov_coral_sea", "prov_melanesia", "prov_micronesia", "prov_polynesia", "prov_north_pacific", "prov_south_pacific", "prov_bering_sea", "prov_chukchi_sea", "prov_beaufort_sea" -] diff --git a/game/export_presets.cfg b/game/export_presets.cfg index 8c90602..585743d 100644 --- a/game/export_presets.cfg +++ b/game/export_presets.cfg @@ -6,20 +6,19 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="common/*" +include_filter="*.txt" exclude_filter="" export_path="export/Linux-x86_64/OpenVic.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.0.options] custom_template/debug="" custom_template/release="" -debug/export_console_script=1 +debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true @@ -38,6 +37,7 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +debug/export_console_script=1 [preset.1] @@ -47,20 +47,19 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="common/*" +include_filter="*.txt" exclude_filter="" export_path="export/Windows/OpenVic.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.1.options] custom_template/debug="" custom_template/release="" -debug/export_console_script=1 +debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true @@ -68,9 +67,6 @@ texture_format/etc=false texture_format/etc2=false binary_format/architecture="x86_64" codesign/enable=false -codesign/identity_type=0 -codesign/identity="" -codesign/password="" codesign/timestamp=true codesign/timestamp_server_url="" codesign/digest_algorithm=1 @@ -83,10 +79,11 @@ application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="" -application/product_name="" +application/product_name="OpenVic" application/file_description="" application/copyright="" application/trademarks="" +application/export_angle=0 ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -104,6 +101,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" +debug/export_console_script=1 [preset.2] @@ -113,21 +111,21 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="common/*" +include_filter="*.txt" exclude_filter="" export_path="export/MacOS/OpenVic.app" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_encryption_key="" [preset.2.options] +export/distribution_type=1 binary_format/architecture="universal" custom_template/debug="" custom_template/release="" -debug/export_console_script=1 +debug/export_console_wrapper=1 application/icon="" application/icon_interpolation=4 application/bundle_identifier="com.openvic.openvic" @@ -137,13 +135,21 @@ application/short_version="0.1" application/version="0.1" application/copyright="" application/copyright_localized={} -display/high_res=false +application/min_macos_version="10.15" +application/export_angle=0 +display/high_res=true +xcode/platform_build="14C18" +xcode/sdk_version="13.1" +xcode/sdk_build="22C55" +xcode/sdk_name="macosx13.1" +xcode/xcode_version="1420" +xcode/xcode_build="14C18" codesign/codesign=0 +codesign/installer_identity="" +codesign/apple_team_id="" codesign/identity="" -codesign/certificate_file="" -codesign/certificate_password="" codesign/entitlements/custom_file="" -codesign/entitlements/allow_jit_code_execution=false +codesign/entitlements/allow_jit_code_execution=true codesign/entitlements/allow_unsigned_executable_memory=false codesign/entitlements/allow_dyld_environment_variables=false codesign/entitlements/disable_library_validation=false @@ -164,15 +170,10 @@ codesign/entitlements/app_sandbox/files_downloads=0 codesign/entitlements/app_sandbox/files_pictures=0 codesign/entitlements/app_sandbox/files_music=0 codesign/entitlements/app_sandbox/files_movies=0 +codesign/entitlements/app_sandbox/files_user_selected=0 codesign/entitlements/app_sandbox/helper_executables=[] codesign/custom_options=PackedStringArray() notarization/notarization=0 -notarization/apple_id_name="" -notarization/apple_id_password="" -notarization/apple_team_id="" -notarization/api_uuid="" -notarization/api_key="" -notarization/api_key_id="" privacy/microphone_usage_description="" privacy/microphone_usage_description_localized={} privacy/camera_usage_description="" @@ -206,3 +207,5 @@ open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +debug/export_console_script=1 +notarization/apple_team_id="" diff --git a/game/icon.svg b/game/icon.svg deleted file mode 100644 index adc26df..0000000 --- a/game/icon.svg +++ /dev/null @@ -1 +0,0 @@ -<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><g transform="translate(32 32)"><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99z" fill="#363d52"/><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99zm0 4h96c6.64 0 12 5.35 12 11.99v95.98c0 6.64-5.35 11.99-12 11.99h-96c-6.64 0-12-5.35-12-11.99v-95.98c0-6.64 5.36-11.99 12-11.99z" fill-opacity=".4"/></g><g stroke-width="9.92746" transform="matrix(.10073078 0 0 .10073078 12.425923 2.256365)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 919.24059 771.67186)"/><path d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 104.69892 525.90697)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 784.07144 817.24284)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 389.21484 625.67104)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 367.36686 631.05679)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 511.99336 724.73954)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 634.78706 625.67104)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 656.64056 631.05679)"/></g></svg> diff --git a/game/icon.svg.import b/game/icon.svg.import deleted file mode 100644 index 00642a8..0000000 --- a/game/icon.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bgxnxy7o5x7bq" -path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://icon.svg" -dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/game/project.godot b/game/project.godot index d71668c..5a727ca 100644 --- a/game/project.godot +++ b/game/project.godot @@ -17,12 +17,16 @@ config/use_custom_user_dir=true config/features=PackedStringArray("4.2", "Forward Plus") boot_splash/bg_color=Color(0, 0, 0, 0) boot_splash/show_image=false -boot_splash/image="res://splash_assets/splash_image.png" -config/icon="res://art/OpenVicLogo.png" -config/macos_native_icon="res://art/OpenVic.icns" -config/windows_native_icon="res://art/OpenVic.ico" +boot_splash/image="res://assets/graphics/splash_image.png" +config/icon="res://assets/OpenVicLogo.png" +config/macos_native_icon="res://assets/OpenVic.icns" +config/windows_native_icon="res://assets/OpenVic.ico" config/project_settings_override.template="user://settings.cfg" +[audio] + +buses/default_bus_layout="res://assets/audio/default_bus_layout.tres" + [autoload] Resolution="*res://src/Game/Autoload/Resolution.gd" @@ -56,7 +60,7 @@ enabled=PackedStringArray("res://addons/keychain/plugin.cfg", "res://addons/open [gui] -theme/custom="res://theme/default_theme.tres" +theme/custom="res://assets/graphics/theme/default_theme.tres" [input] @@ -133,7 +137,7 @@ locale/country_short_name={ "United Kingdom": "UK", "United States of America": "USA" } -locale/localisation_path="res://localisation" +locale/localisation_path="res://assets/localisation/locales" [memory] 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") |
