Merge pull request #29 from sitiom/FinalArt

Finalize game changes

Assets/Sounds/Menu Navigate.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/Menu Navigate.ogg-f09f417bef5b0a514f758f8fb196770b.oggstr"
+
+[deps]
+
+source_file="res://Assets/Sounds/Menu Navigate.ogg"
+dest_files=[ "res://.import/Menu Navigate.ogg-f09f417bef5b0a514f758f8fb196770b.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

Assets/Sounds/NANI.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/NANI.ogg-9ac286e7d922faaca65783f7174c8b79.oggstr"
+
+[deps]
+
+source_file="res://Assets/Sounds/NANI.ogg"
+dest_files=[ "res://.import/NANI.ogg-9ac286e7d922faaca65783f7174c8b79.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

Assets/Sounds/arena_bgm.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/arena_bgm.wav-8991e60f1d87e463504cb80109b78f29.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/arena_bgm.wav"
+dest_files=[ "res://.import/arena_bgm.wav-8991e60f1d87e463504cb80109b78f29.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Assets/Sounds/sfx-weapon-singleshot2.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/sfx-weapon-singleshot2.ogg-7e38434f240c65113aceba6633964e2e.oggstr"
+
+[deps]
+
+source_file="res://Assets/Sounds/sfx-weapon-singleshot2.ogg"
+dest_files=[ "res://.import/sfx-weapon-singleshot2.ogg-7e38434f240c65113aceba6633964e2e.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

Assets/Sprites/Leaderboard button hovered-export.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Leaderboard button hovered-export.png-14ded54d1f9a65058e39bc79063728c4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Leaderboard button hovered-export.png"
+dest_files=[ "res://.import/Leaderboard button hovered-export.png-14ded54d1f9a65058e39bc79063728c4.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Sprites/Leaderboard button-export.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Leaderboard button-export.png-29ee2d4ebdd316bf1f8834b3543ef118.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Leaderboard button-export.png"
+dest_files=[ "res://.import/Leaderboard button-export.png-29ee2d4ebdd316bf1f8834b3543ef118.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Assets/Sprites/Leaderboard.png.import

@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2

Levels/Arena.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=15 format=2]
 
 [ext_resource path="res://Levels/map_tilese.tres" type="TileSet" id=1]
 [ext_resource path="res://Objects/Enemies/Roach/Roach.tscn" type="PackedScene" id=2]
@@ -13,6 +13,7 @@
 [ext_resource path="res://Objects/EnemySpawner.tscn" type="PackedScene" id=11]
 [ext_resource path="res://Objects/Enemies/Void/Void.tscn" type="PackedScene" id=12]
 [ext_resource path="res://Levels/Arena.cs" type="Script" id=13]
+[ext_resource path="res://Assets/Sounds/arena_bgm.wav" type="AudioStream" id=14]
 
 [node name="Arena" type="Node"]
 script = ExtResource( 13 )
@@ -53,7 +54,19 @@ scale = Vector2( 0.962824, 1 )
 Enemies = [ ExtResource( 7 ), ExtResource( 9 ), ExtResource( 2 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 12 ) ]
 
 [node name="Roach" parent="TestArena" instance=ExtResource( 2 )]
-position = Vector2( 500, 500 )
+position = Vector2( 142.936, 339.874 )
+
+[node name="Virus" parent="TestArena" instance=ExtResource( 4 )]
+position = Vector2( 257.65, 595.434 )
+
+[node name="Void" parent="TestArena" instance=ExtResource( 12 )]
+position = Vector2( 705.297, 490.211 )
+
+[node name="Spider" parent="TestArena" instance=ExtResource( 5 )]
+position = Vector2( 373.138, 170.175 )
+
+[node name="Computer" parent="TestArena" instance=ExtResource( 7 )]
+position = Vector2( -110.412, 516.134 )
 
 [node name="ModuleDropper" parent="." instance=ExtResource( 10 )]
 layer = 128
@@ -65,4 +78,14 @@ layer = 128
 layer = 126
 
 [node name="Shaders" parent="ShaderLayer" instance=ExtResource( 3 )]
+margin_left = 6.12128
+margin_top = -47.3051
+margin_right = 46.1213
+margin_bottom = -7.30511
 mouse_filter = 2
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+pause_mode = 2
+stream = ExtResource( 14 )
+volume_db = 0.8
+autoplay = true

Levels/Leaderboard.cs

@@ -20,6 +20,14 @@ public override void _EnterTree()
 			LoadLeaderboard();
 		}
 
+		public override void _Input(InputEvent @event)
+		{
+			if(Input.IsActionPressed("E")) 
+			{
+				GetTree().ChangeScene("res://Levels/Main Menu.tscn");
+			}
+		}
+
 		public void GetLeaderboard()
 		{
 			string uri = "http://dreamlo.com/lb/5f536936eb371809c4113b75/json";

Levels/Leaderboard.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://Assets/Themes/Classic311/Classic311.tres" type="Theme" id=1]
-[ext_resource path="res://Assets/Sprites/leaderboard.png" type="Texture" id=2]
+[ext_resource path="res://Assets/Sprites/Leaderboard.png" type="Texture" id=2]
 [ext_resource path="res://Assets/Jeebz-Regular.ttf" type="DynamicFontData" id=3]
 [ext_resource path="res://Levels/Leaderboard.cs" type="Script" id=5]
 [ext_resource path="res://Assets/Jeebz-Bold.ttf" type="DynamicFontData" id=6]
@@ -13,6 +13,10 @@ font_data = ExtResource( 3 )
 size = 7
 font_data = ExtResource( 6 )
 
+[sub_resource type="DynamicFont" id=3]
+size = 8
+font_data = ExtResource( 3 )
+
 [node name="Leaderboard" type="Control"]
 anchor_right = 1.0
 margin_left = -0.652466
@@ -110,3 +114,12 @@ align = 2
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="Label2" type="Label" parent="."]
+margin_left = 235.815
+margin_top = 166.134
+margin_right = 343.815
+margin_bottom = 180.134
+custom_fonts/font = SubResource( 3 )
+custom_colors/font_color = Color( 1, 1, 1, 1 )
+text = "Press [E] to go back"

Levels/Main Menu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://Assets/bitmgothic.medium.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://Assets/Themes/Classic311/Classic311.tres" type="Theme" id=2]
@@ -12,6 +12,9 @@
 [ext_resource path="res://Levels/Settings.tscn" type="PackedScene" id=10]
 [ext_resource path="res://Assets/Sprites/Settings hovered.png" type="Texture" id=11]
 [ext_resource path="res://Assets/Sprites/Settings.png" type="Texture" id=12]
+[ext_resource path="res://Assets/Sprites/Leaderboard button hovered-export.png" type="Texture" id=13]
+[ext_resource path="res://Assets/Sprites/Leaderboard button-export.png" type="Texture" id=14]
+[ext_resource path="res://Assets/Sounds/Menu Navigate.ogg" type="AudioStream" id=15]
 
 [sub_resource type="Animation" id=1]
 resource_name = "FadeIn"
@@ -55,10 +58,10 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 1.2, 1.5 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PoolRealArray( 0, 0.7, 1.1 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ Vector2( 300, 0 ), Vector2( 20, 0 ) ]
+"values": [ Vector2( 250, 0 ), Vector2( 300, 0 ), Vector2( 20, 0 ) ]
 }
 tracks/1/type = "value"
 tracks/1/path = NodePath("Mancer:rect_position")
@@ -67,10 +70,10 @@ tracks/1/loop_wrap = true
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 1.2, 1.5 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PoolRealArray( 0, 0.7, 1.1 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ Vector2( -300, 27 ), Vector2( 20, 27 ) ]
+"values": [ Vector2( -250, 27 ), Vector2( -300, 27 ), Vector2( 20, 27 ) ]
 }
 
 [sub_resource type="DynamicFont" id=4]
@@ -121,11 +124,23 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="Leaderboard" type="TextureButton" parent="."]
+margin_left = 100.211
+margin_top = 115.603
+margin_right = 736.211
+margin_bottom = 185.603
+rect_scale = Vector2( 0.2, 0.2 )
+texture_normal = ExtResource( 14 )
+texture_hover = ExtResource( 13 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="Quit" type="TextureButton" parent="."]
-margin_left = 128.879
-margin_top = 113.867
-margin_right = 428.879
-margin_bottom = 213.867
+margin_left = 130.293
+margin_top = 135.348
+margin_right = 430.293
+margin_bottom = 235.348
 rect_scale = Vector2( 0.2, 0.2 )
 texture_normal = ExtResource( 4 )
 texture_hover = ExtResource( 7 )
@@ -143,8 +158,8 @@ __meta__ = {
 }
 
 [node name="Debug" type="Label" parent="."]
-margin_left = 300.0
-margin_right = 580.0
+margin_left = 20.0
+margin_right = 300.0
 margin_bottom = 27.0
 custom_fonts/font = SubResource( 4 )
 custom_colors/font_color = Color( 0.207843, 0.207843, 0.380392, 1 )
@@ -157,9 +172,9 @@ __meta__ = {
 }
 
 [node name="Mancer" type="Label" parent="."]
-margin_left = -300.0
+margin_left = 20.0
 margin_top = 27.0
-margin_right = -19.9998
+margin_right = 300.0
 margin_bottom = 54.0
 custom_fonts/font = SubResource( 5 )
 custom_colors/font_color = Color( 0.207843, 0.207843, 0.380392, 1 )
@@ -189,9 +204,16 @@ __meta__ = {
 stream = ExtResource( 9 )
 
 [node name="SettingsDialog" parent="." instance=ExtResource( 10 )]
-visible = false
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 15 )
 [connection signal="animation_finished" from="MenuAnimPlayer" to="." method="_on_MenuAnimPlayer_animation_finished"]
+[connection signal="mouse_entered" from="Start" to="." method="_button_hovered"]
 [connection signal="pressed" from="Start" to="." method="_on_Start_pressed"]
+[connection signal="mouse_entered" from="Settings" to="." method="_button_hovered"]
 [connection signal="pressed" from="Settings" to="." method="_on_Settings_pressed"]
+[connection signal="mouse_entered" from="Leaderboard" to="." method="_button_hovered"]
+[connection signal="pressed" from="Leaderboard" to="." method="_on_Leaderboard_pressed"]
+[connection signal="mouse_entered" from="Quit" to="." method="_button_hovered"]
 [connection signal="pressed" from="Quit" to="." method="_on_Quit_pressed"]
 [connection signal="about_to_show" from="ConnectionFailedDialog" to="ConnectionFailedDialog" method="ConnectionFailedDialog_AboutToShow"]

Levels/Menu.cs

@@ -11,11 +11,10 @@ public override void _EnterTree()
 			GetNode<AnimationPlayer>("MenuAnimPlayer").Play("Transition");
 		}
 
-		public override void _ExitTree()
+		private void _button_hovered()
 		{
-			GetNode<AudioStreamPlayer>("/root/BackgroundMusic/MenuMusic").Stop();
+			GetNode<AudioStreamPlayer>("AudioStreamPlayer").Play();
 		}
-
 		private void _on_Start_pressed()
 		{
 			if (((RichPresence)GetNode("/root/RichPresence")).Client.CurrentUser != null)
@@ -35,6 +34,10 @@ private void _on_Settings_pressed()
 			GetNode<WindowDialog>("SettingsDialog").PopupCentered();
 		}
 
+		private void _on_Leaderboard_pressed()
+		{
+			GetTree().ChangeScene("res://Levels/Leaderboard.tscn");
+		}
 
 		private void _on_Quit_pressed()
 		{
@@ -49,6 +52,7 @@ private void _on_MenuAnimPlayer_animation_finished(string animName)
 			}
 			if (animName == "FadeOut")
 			{
+				GetNode<AudioStreamPlayer>("/root/BackgroundMusic/MenuMusic").Stop();
 				GetTree().ChangeScene("res://Levels/Arena.tscn");
 			}
 			if (animName == "Transition")