daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor improvements and file reorganizing

Browse Source
This commit is contained in:
VoidTwo
2021-11-28 02:52:03 -06:00
parent c4c0c3d02f
commit ffe3312b86
14 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Enemies/Glowing Ghost.tscn
View File

@@ -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]

22
GUI/Main Menu.gd
View File

@@ -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

15
GUI/Main Menu.tscn
View File

@@ -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"]

2
GUI/Splash Screen.tscn
View File

@@ -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 )

15
Music/Interface/main-menu.mp3.import
View File

@@ -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

0
Music/Interface/main-menu.mp3 → Music/Main_Menu.mp3
View File

15
Music/Main_Menu.mp3.import Normal file
View File

@@ -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

0
Music/Interface/splash.wav → Music/Splash_Screen.wav
View File

6
Music/Interface/splash.wav.import → Music/Splash_Screen.wav.import
View File

@@ -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]

6
Player/Player.gd
View File

@@ -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

0
Resources/Level_5_Enemy_Ghost_Occluder.tres → Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres
View File

21
Sounds/Interface/menu-select.wav.import
View File

@@ -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

0
Sounds/Interface/menu-select.wav → Sounds/Menu_Button_Hover.wav
View File

21
Sounds/Menu_Button_Hover.wav.import Normal file
View File

@@ -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