diff --git a/credits.toml b/credits.toml index c3a827c..7f27439 100644 --- a/credits.toml +++ b/credits.toml @@ -141,3 +141,16 @@ name = "LuminousDragonGames" [[people.credits]] credit = "2 seamless lava tiles" link = "https://opengameart.org/content/2-seamless-lava-tiles" + +[[people]] +name = "Hitctrl & Tausdei & Insidnys & glitchart" +[[people.credits]] +credit = "The eternal sands, Level 1 Explorer, chill jungle ambient & Caryil The Desert of Dreams" +link = "https://opengameart.org/content/the-eternal-sands-level-1-explorer-chill-jungle-ambient-caryil-the-desert-of-dreams-hitctrl" + +[[people]] +name = "iamoneabe" +link = "https://allmylinks.com/iamoneabe" +[[people.credits]] +credit = "Desert Loop" +link = "https://opengameart.org/content/desert-loop" diff --git a/godot/maps/forgotten_desert.tres b/godot/maps/forgotten_desert.tres index 4eed72b..137a21e 100644 --- a/godot/maps/forgotten_desert.tres +++ b/godot/maps/forgotten_desert.tres @@ -1,7 +1,8 @@ [gd_resource type="MapResource" format=3 uid="uid://cx24es6d4pm7f"] -[ext_resource type="Texture2D" uid="uid://cdmjqr6rv0224" path="res://maps/grand_forge/icon.png" id="1_tp6of"] -[ext_resource type="AudioStream" uid="uid://vyfd1ojs3200" path="res://raw_assets/music/Act of War.mp3" id="2_oda74"] +[ext_resource type="Texture2D" uid="uid://2p76k2mvtnu8" path="res://maps/forgotten_desert/icon.png" id="1_tp6of"] +[ext_resource type="AudioStream" uid="uid://h0p5513qsww" path="res://raw_assets/music/the_eternal_sandsmix.ogg" id="2_oda74"] +[ext_resource type="AudioStream" uid="uid://n2sc18m7vmw4" path="res://raw_assets/music/desert_loop.mp3" id="3_djfrh"] [ext_resource type="PackedScene" uid="uid://dga2e132re8aj" path="res://maps/forgotten_desert/forgotten_desert.tscn" id="3_tp6of"] [ext_resource type="TeamResource" uid="uid://p2fqqnaejjn7" path="res://maps/teams/blue_team.tres" id="4_5mkdi"] [ext_resource type="TeamResource" uid="uid://db4b3sjsftg15" path="res://maps/teams/red_ream.tres" id="5_hd5qa"] @@ -10,5 +11,5 @@ name = "Forgotten Desert" scene = ExtResource("3_tp6of") teams = Array[TeamResource]([ExtResource("4_5mkdi"), ExtResource("5_hd5qa")]) -music = Array[AudioStream]([ExtResource("2_oda74")]) +music = Array[AudioStream]([ExtResource("2_oda74"), ExtResource("3_djfrh")]) icon = ExtResource("1_tp6of") diff --git a/godot/maps/forgotten_desert/forgotten_desert_static.scn b/godot/maps/forgotten_desert/forgotten_desert_static.scn index 6e69311..6650541 100644 Binary files a/godot/maps/forgotten_desert/forgotten_desert_static.scn and b/godot/maps/forgotten_desert/forgotten_desert_static.scn differ diff --git a/godot/maps/forgotten_desert/icon.png b/godot/maps/forgotten_desert/icon.png new file mode 100644 index 0000000..01b2d47 Binary files /dev/null and b/godot/maps/forgotten_desert/icon.png differ diff --git a/godot/maps/forgotten_desert/icon.png.import b/godot/maps/forgotten_desert/icon.png.import new file mode 100644 index 0000000..7eccd53 --- /dev/null +++ b/godot/maps/forgotten_desert/icon.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2p76k2mvtnu8" +path.s3tc="res://.godot/imported/icon.png-b6d7ece3d1bba019bc6f0ce332a38af1.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://maps/forgotten_desert/icon.png" +dest_files=["res://.godot/imported/icon.png-b6d7ece3d1bba019bc6f0ce332a38af1.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=0 diff --git a/godot/maps/textures/str_stonebrk4.png.import b/godot/maps/textures/str_stonebrk4.png.import index 12828cf..958f970 100644 --- a/godot/maps/textures/str_stonebrk4.png.import +++ b/godot/maps/textures/str_stonebrk4.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://buofag4vjn06a" -path="res://.godot/imported/str_stonebrk4.png-497103fe240d1e1efbd7257bf722836d.ctex" +path.s3tc="res://.godot/imported/str_stonebrk4.png-497103fe240d1e1efbd7257bf722836d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://maps/textures/str_stonebrk4.png" -dest_files=["res://.godot/imported/str_stonebrk4.png-497103fe240d1e1efbd7257bf722836d.ctex"] +dest_files=["res://.godot/imported/str_stonebrk4.png-497103fe240d1e1efbd7257bf722836d.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/godot/maps/textures/str_stonegen1.png.import b/godot/maps/textures/str_stonegen1.png.import index d51cbaa..b7d9792 100644 --- a/godot/maps/textures/str_stonegen1.png.import +++ b/godot/maps/textures/str_stonegen1.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://ucivt65gl7di" -path="res://.godot/imported/str_stonegen1.png-6cbb545215685fd2d57ac1d2672f40c3.ctex" +path.s3tc="res://.godot/imported/str_stonegen1.png-6cbb545215685fd2d57ac1d2672f40c3.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://maps/textures/str_stonegen1.png" -dest_files=["res://.godot/imported/str_stonegen1.png-6cbb545215685fd2d57ac1d2672f40c3.ctex"] +dest_files=["res://.godot/imported/str_stonegen1.png-6cbb545215685fd2d57ac1d2672f40c3.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/godot/maps/textures/str_wasteland2.png.import b/godot/maps/textures/str_wasteland2.png.import index 78bfc90..7ca93f3 100644 --- a/godot/maps/textures/str_wasteland2.png.import +++ b/godot/maps/textures/str_wasteland2.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://xsgjjle6hteb" -path="res://.godot/imported/str_wasteland2.png-1dbdec51cef6391aeabcb698166e5c75.ctex" +path.s3tc="res://.godot/imported/str_wasteland2.png-1dbdec51cef6391aeabcb698166e5c75.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://maps/textures/str_wasteland2.png" -dest_files=["res://.godot/imported/str_wasteland2.png-1dbdec51cef6391aeabcb698166e5c75.ctex"] +dest_files=["res://.godot/imported/str_wasteland2.png-1dbdec51cef6391aeabcb698166e5c75.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/godot/maps/textures/str_wasteland6.png.import b/godot/maps/textures/str_wasteland6.png.import index a7131ba..0cf552e 100644 --- a/godot/maps/textures/str_wasteland6.png.import +++ b/godot/maps/textures/str_wasteland6.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://b4sebu2u6maqa" -path="res://.godot/imported/str_wasteland6.png-ff51f1986d117ea410b0ab6820a5fb5f.ctex" +path.s3tc="res://.godot/imported/str_wasteland6.png-ff51f1986d117ea410b0ab6820a5fb5f.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://maps/textures/str_wasteland6.png" -dest_files=["res://.godot/imported/str_wasteland6.png-ff51f1986d117ea410b0ab6820a5fb5f.ctex"] +dest_files=["res://.godot/imported/str_wasteland6.png-ff51f1986d117ea410b0ab6820a5fb5f.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/godot/raw_assets/music/desert_loop.mp3 b/godot/raw_assets/music/desert_loop.mp3 new file mode 100644 index 0000000..75700a0 Binary files /dev/null and b/godot/raw_assets/music/desert_loop.mp3 differ diff --git a/godot/raw_assets/music/desert_loop.mp3.import b/godot/raw_assets/music/desert_loop.mp3.import new file mode 100644 index 0000000..72ec88c --- /dev/null +++ b/godot/raw_assets/music/desert_loop.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://n2sc18m7vmw4" +path="res://.godot/imported/desert_loop.mp3-84c86a4d7247fc7db27f099976512ffe.mp3str" + +[deps] + +source_file="res://raw_assets/music/desert_loop.mp3" +dest_files=["res://.godot/imported/desert_loop.mp3-84c86a4d7247fc7db27f099976512ffe.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/raw_assets/music/the_eternal_sandsmix.ogg b/godot/raw_assets/music/the_eternal_sandsmix.ogg new file mode 100644 index 0000000..581b0c6 Binary files /dev/null and b/godot/raw_assets/music/the_eternal_sandsmix.ogg differ diff --git a/godot/raw_assets/music/the_eternal_sandsmix.ogg.import b/godot/raw_assets/music/the_eternal_sandsmix.ogg.import new file mode 100644 index 0000000..b70e981 --- /dev/null +++ b/godot/raw_assets/music/the_eternal_sandsmix.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://h0p5513qsww" +path="res://.godot/imported/the_eternal_sandsmix.ogg-e952bbd50a9a0ae9137936570211a1eb.oggvorbisstr" + +[deps] + +source_file="res://raw_assets/music/the_eternal_sandsmix.ogg" +dest_files=["res://.godot/imported/the_eternal_sandsmix.ogg-e952bbd50a9a0ae9137936570211a1eb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4