diff --git a/Enemies/Glowing Ghost.tscn b/Enemies/Glowing Ghost.tscn index dfc5a1c..2dde561 100644 --- a/Enemies/Glowing Ghost.tscn +++ b/Enemies/Glowing Ghost.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Resources/Level_5_Enemy_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1] +[ext_resource path="res://Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1] [ext_resource path="res://Sprites/Assets/Light.png" type="Texture" id=2] [ext_resource path="res://Sprites/Enemies/Glowing_Ghost.png" type="Texture" id=3] diff --git a/GUI/Main Menu.gd b/GUI/Main Menu.gd index 793e366..a49d4bd 100644 --- a/GUI/Main Menu.gd +++ b/GUI/Main Menu.gd @@ -13,21 +13,27 @@ func _on_quit_button_pressed() -> void: return -func _on_Quit_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) +func _on_continue_button_mouse_entered() -> void: + if not $'Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer/Continue Button'.disabled: + $'Menu Button Hover'.play(0.0) return -func _on_Credits_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) +func _on_new_game_button_mouse_entered() -> void: + $'Menu Button Hover'.play(0.0) return -func _on_Settings_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) +func _on_settings_button_mouse_entered() -> void: + $'Menu Button Hover'.play(0.0) return -func _on_New_Game_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) +func _on_credits_button_mouse_entered() -> void: + $'Menu Button Hover'.play(0.0) + return + + +func _on_quit_button_mouse_entered() -> void: + $'Menu Button Hover'.play(0.0) return diff --git a/GUI/Main Menu.tscn b/GUI/Main Menu.tscn index 73b5aed..503ef36 100644 --- a/GUI/Main Menu.tscn +++ b/GUI/Main Menu.tscn @@ -14,8 +14,8 @@ [ext_resource path="res://Sprites/Menus/Main Menu/Main_Menu_Background.png" type="Texture" id=12] [ext_resource path="res://Resources/Ash.tres" type="DynamicFontData" id=13] [ext_resource path="res://GUI/Main Menu.gd" type="Script" id=14] -[ext_resource path="res://Music/Interface/main-menu.mp3" type="AudioStream" id=15] -[ext_resource path="res://Sounds/Interface/menu-select.wav" type="AudioStream" id=16] +[ext_resource path="res://Music/Main_Menu.mp3" type="AudioStream" id=15] +[ext_resource path="res://Sounds/Menu_Button_Hover.wav" type="AudioStream" id=16] [sub_resource type="DynamicFont" id=1] size = 20 @@ -130,13 +130,14 @@ stream = ExtResource( 15 ) volume_db = -14.136 autoplay = true -[node name="Menu-Select" type="AudioStreamPlayer" parent="."] +[node name="Menu Button Hover" type="AudioStreamPlayer" parent="."] stream = ExtResource( 16 ) volume_db = -15.146 -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_New_Game_Button_mouse_entered"] +[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer/Continue Button" to="." method="_on_continue_button_mouse_entered"] +[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_new_game_button_mouse_entered"] [connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_new_game_button_pressed"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer3/Settings Button" to="." method="_on_Settings_Button_mouse_entered"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer4/Credits Button" to="." method="_on_Credits_Button_mouse_entered"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_Quit_Button_mouse_entered"] +[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer3/Settings Button" to="." method="_on_settings_button_mouse_entered"] +[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer4/Credits Button" to="." method="_on_credits_button_mouse_entered"] +[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_quit_button_mouse_entered"] [connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_quit_button_pressed"] diff --git a/GUI/Splash Screen.tscn b/GUI/Splash Screen.tscn index 87c3f53..7b20a79 100644 --- a/GUI/Splash Screen.tscn +++ b/GUI/Splash Screen.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://Sprites/Assets/Splash_Screen.png" type="Texture" id=1] [ext_resource path="res://GUI/Splash Screen.gd" type="Script" id=2] -[ext_resource path="res://Music/Interface/splash.wav" type="AudioStream" id=3] +[ext_resource path="res://Music/Splash_Screen.wav" type="AudioStream" id=3] [node name="Splash Screen" type="Sprite"] self_modulate = Color( 1, 1, 1, 0 ) diff --git a/Music/Interface/main-menu.mp3.import b/Music/Interface/main-menu.mp3.import deleted file mode 100644 index 1ebd30c..0000000 --- a/Music/Interface/main-menu.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/main-menu.mp3-aab7bca33746995bd827b1be5c058ba3.mp3str" - -[deps] - -source_file="res://Music/Interface/main-menu.mp3" -dest_files=[ "res://.import/main-menu.mp3-aab7bca33746995bd827b1be5c058ba3.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/Music/Interface/main-menu.mp3 b/Music/Main_Menu.mp3 similarity index 100% rename from Music/Interface/main-menu.mp3 rename to Music/Main_Menu.mp3 diff --git a/Music/Main_Menu.mp3.import b/Music/Main_Menu.mp3.import new file mode 100644 index 0000000..034f42c --- /dev/null +++ b/Music/Main_Menu.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/Main_Menu.mp3-bcbeb06af5a268277e79865e6a90a5fe.mp3str" + +[deps] + +source_file="res://Music/Main_Menu.mp3" +dest_files=[ "res://.import/Main_Menu.mp3-bcbeb06af5a268277e79865e6a90a5fe.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/Music/Interface/splash.wav b/Music/Splash_Screen.wav similarity index 100% rename from Music/Interface/splash.wav rename to Music/Splash_Screen.wav diff --git a/Music/Interface/splash.wav.import b/Music/Splash_Screen.wav.import similarity index 50% rename from Music/Interface/splash.wav.import rename to Music/Splash_Screen.wav.import index fad9591..ee626b9 100644 --- a/Music/Interface/splash.wav.import +++ b/Music/Splash_Screen.wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/splash.wav-56b87e9c12b1da11cd6e9b9b251c6bbe.sample" +path="res://.import/Splash_Screen.wav-f452f261479ac5a6b452ea599a9625cd.sample" [deps] -source_file="res://Music/Interface/splash.wav" -dest_files=[ "res://.import/splash.wav-56b87e9c12b1da11cd6e9b9b251c6bbe.sample" ] +source_file="res://Music/Splash_Screen.wav" +dest_files=[ "res://.import/Splash_Screen.wav-f452f261479ac5a6b452ea599a9625cd.sample" ] [params] diff --git a/Player/Player.gd b/Player/Player.gd index 9a4c532..b6c9d17 100644 --- a/Player/Player.gd +++ b/Player/Player.gd @@ -67,6 +67,10 @@ func _input(event: InputEvent) -> void: yield(get_tree(), "idle_frame") img.flip_y() - if img.save_png('user://screenshot.png') != OK: + + var time: Dictionary = OS.get_datetime_from_unix_time(OS.get_unix_time()) + var time_msecs: int = OS.get_system_time_msecs() + + if img.save_png('user://Screenshot_%d%d%d_%d.png' % [time.year, time.month, time.day, time_msecs]) != OK: print('ERROR: Failed saving screenshot.') return diff --git a/Resources/Level_5_Enemy_Ghost_Occluder.tres b/Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres similarity index 100% rename from Resources/Level_5_Enemy_Ghost_Occluder.tres rename to Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres diff --git a/Sounds/Interface/menu-select.wav.import b/Sounds/Interface/menu-select.wav.import deleted file mode 100644 index f1df4ed..0000000 --- a/Sounds/Interface/menu-select.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/menu-select.wav-0365203aec745be2bb480afa89696728.sample" - -[deps] - -source_file="res://Sounds/Interface/menu-select.wav" -dest_files=[ "res://.import/menu-select.wav-0365203aec745be2bb480afa89696728.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 diff --git a/Sounds/Interface/menu-select.wav b/Sounds/Menu_Button_Hover.wav similarity index 100% rename from Sounds/Interface/menu-select.wav rename to Sounds/Menu_Button_Hover.wav diff --git a/Sounds/Menu_Button_Hover.wav.import b/Sounds/Menu_Button_Hover.wav.import new file mode 100644 index 0000000..f0d4ed8 --- /dev/null +++ b/Sounds/Menu_Button_Hover.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Menu_Button_Hover.wav-75f89d7289199347d0f0fb7d0f2abd1b.sample" + +[deps] + +source_file="res://Sounds/Menu_Button_Hover.wav" +dest_files=[ "res://.import/Menu_Button_Hover.wav-75f89d7289199347d0f0fb7d0f2abd1b.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