diff --git a/credits.toml b/credits.toml index f952f01..c3a827c 100644 --- a/credits.toml +++ b/credits.toml @@ -90,6 +90,9 @@ link = "https://opengameart.org/content/cyber-implant-in-my-butt" [[people.credits]] credit = "Post Apocalyptic and CyberPunk Melodies" link = "https://opengameart.org/content/post-apocalyptic-and-cyberpunk-melodies" +[[people.credits]] +credit = "Act of War" +link = "https://opengameart.org/content/act-of-war" [[people]] name = "Matthew Pablo" diff --git a/godot/maps/grand_forge.tres b/godot/maps/grand_forge.tres index 6a72f7f..5d66d9d 100644 --- a/godot/maps/grand_forge.tres +++ b/godot/maps/grand_forge.tres @@ -1,8 +1,7 @@ [gd_resource type="MapResource" format=3 uid="uid://thctv276gw8d"] -[ext_resource type="AudioStream" uid="uid://d3tpaim4ia0xr" path="res://raw_assets/music/n-Dimensions (Main Theme - Retro Ver.mp3" id="2_vo2c7"] -[ext_resource type="AudioStream" uid="uid://dkgm7o8u0w550" path="res://raw_assets/music/Red Doors 2.0 (GameClosure Edition).mp3" id="3_jsc2a"] -[ext_resource type="AudioStream" uid="uid://dai8by348wqss" path="res://raw_assets/music/Thrust Sequence.mp3" id="4_2o4ll"] +[ext_resource type="Texture2D" uid="uid://cdmjqr6rv0224" path="res://maps/grand_forge/icon.png" id="1_jsc2a"] +[ext_resource type="AudioStream" uid="uid://vyfd1ojs3200" path="res://raw_assets/music/Act of War.mp3" id="2_byxos"] [ext_resource type="PackedScene" uid="uid://bbknih7aruq24" path="res://maps/grand_forge/grand_forge.tscn" id="4_5lu31"] [ext_resource type="TeamResource" uid="uid://p2fqqnaejjn7" path="res://maps/teams/blue_team.tres" id="5_vo2c7"] [ext_resource type="TeamResource" uid="uid://db4b3sjsftg15" path="res://maps/teams/red_ream.tres" id="6_jsc2a"] @@ -11,4 +10,5 @@ name = "Grand Forge" scene = ExtResource("4_5lu31") teams = Array[TeamResource]([ExtResource("5_vo2c7"), ExtResource("6_jsc2a")]) -music = Array[AudioStream]([ExtResource("2_vo2c7"), ExtResource("3_jsc2a"), ExtResource("4_2o4ll")]) +music = Array[AudioStream]([ExtResource("2_byxos")]) +icon = ExtResource("1_jsc2a") diff --git a/godot/maps/grand_forge/icon.png b/godot/maps/grand_forge/icon.png new file mode 100644 index 0000000..9ce76e8 Binary files /dev/null and b/godot/maps/grand_forge/icon.png differ diff --git a/godot/maps/grand_forge/icon.png.import b/godot/maps/grand_forge/icon.png.import new file mode 100644 index 0000000..37bf15e --- /dev/null +++ b/godot/maps/grand_forge/icon.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cdmjqr6rv0224" +path.s3tc="res://.godot/imported/icon.png-7eaef187600310eda04c535b2fa92265.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://maps/grand_forge/icon.png" +dest_files=["res://.godot/imported/icon.png-7eaef187600310eda04c535b2fa92265.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/raw_assets/music/Act of War.mp3 b/godot/raw_assets/music/Act of War.mp3 new file mode 100644 index 0000000..ae56492 Binary files /dev/null and b/godot/raw_assets/music/Act of War.mp3 differ diff --git a/godot/raw_assets/music/Act of War.mp3.import b/godot/raw_assets/music/Act of War.mp3.import new file mode 100644 index 0000000..668c6a9 --- /dev/null +++ b/godot/raw_assets/music/Act of War.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://vyfd1ojs3200" +path="res://.godot/imported/Act of War.mp3-80bffd0ab21c42dc7e0d67d3381fc892.mp3str" + +[deps] + +source_file="res://raw_assets/music/Act of War.mp3" +dest_files=["res://.godot/imported/Act of War.mp3-80bffd0ab21c42dc7e0d67d3381fc892.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4