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

Merge branch 'main' into tiff

Browse Source
This commit is contained in:
tiffanyfrias10
2021-12-05 20:05:14 -06:00
parent f3f0611980 0fcb62e094
commit 15b647a90a
115 changed files with 3371 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
GUI/HUD.gd
View File

@@ -1,6 +1,7 @@
extends CanvasLayer
signal add_currency(amount)
var weapon = "sword"
func _on_Add_Currency_pressed() -> void:
@@ -33,6 +34,7 @@ func _on_select_bow_pressed() -> void:
$'Weapon Selection/Sword'.set_visible(true)
$'Weapon Selection'.set_visible(false)
weapon = "bow"
return
@@ -46,6 +48,7 @@ func _on_select_javelin_pressed() -> void:
$'Weapon Selection/Sword'.set_visible(true)
$'Weapon Selection'.set_visible(false)
weapon = "javelin"
return
@@ -59,6 +62,7 @@ func _on_select_staff_pressed() -> void:
$'Weapon Selection/Sword'.set_visible(true)
$'Weapon Selection'.set_visible(false)
weapon = "staff"
return
@@ -72,4 +76,5 @@ func _on_select_sword_pressed() -> void:
$'Weapon Selection/Staff'.set_visible(true)
$'Weapon Selection'.set_visible(false)
weapon = "sword"
return

32
GUI/Level Select Menu.tscn
View File

@@ -11,7 +11,7 @@
[node name="Level Select Menu" type="Node"]
script = ExtResource( 7 )
[node name="MarginContainer" type="MarginContainer" parent="."]
[node name="Menu" type="CenterContainer" parent="."]
margin_left = 10.0
margin_top = 10.0
margin_right = 310.0
@@ -21,54 +21,50 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="CenterContainer" type="CenterContainer" parent="MarginContainer"]
margin_right = 300.0
margin_bottom = 160.0
[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/CenterContainer"]
[node name="Menu Options" type="HBoxContainer" parent="Menu"]
margin_left = 20.0
margin_top = 60.0
margin_right = 280.0
margin_bottom = 100.0
[node name="Hub World" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Hub World" type="TextureButton" parent="Menu/Menu Options"]
margin_right = 40.0
margin_bottom = 40.0
texture_normal = ExtResource( 6 )
[node name="Level 1" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Level 1" type="TextureButton" parent="Menu/Menu Options"]
margin_left = 44.0
margin_right = 84.0
margin_bottom = 40.0
texture_normal = ExtResource( 2 )
[node name="Level 2" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Level 2" type="TextureButton" parent="Menu/Menu Options"]
margin_left = 88.0
margin_right = 128.0
margin_bottom = 40.0
texture_normal = ExtResource( 4 )
[node name="Level 3" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Level 3" type="TextureButton" parent="Menu/Menu Options"]
margin_left = 132.0
margin_right = 172.0
margin_bottom = 40.0
texture_normal = ExtResource( 1 )
[node name="Level 4" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Level 4" type="TextureButton" parent="Menu/Menu Options"]
margin_left = 176.0
margin_right = 216.0
margin_bottom = 40.0
texture_normal = ExtResource( 3 )
[node name="Level 5" type="TextureButton" parent="MarginContainer/CenterContainer/HBoxContainer"]
[node name="Level 5" type="TextureButton" parent="Menu/Menu Options"]
margin_left = 220.0
margin_right = 260.0
margin_bottom = 40.0
texture_normal = ExtResource( 5 )
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Hub World" to="." method="_on_hub_world_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Level 1" to="." method="_on_level_1_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Level 2" to="." method="_on_level_2_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Level 3" to="." method="_on_level_3_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Level 4" to="." method="_on_level_4_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/HBoxContainer/Level 5" to="." method="_on_level_5_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Hub World" to="." method="_on_hub_world_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Level 1" to="." method="_on_level_1_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Level 2" to="." method="_on_level_2_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Level 3" to="." method="_on_level_3_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Level 4" to="." method="_on_level_4_button_pressed"]
[connection signal="pressed" from="Menu/Menu Options/Level 5" to="." method="_on_level_5_button_pressed"]

22
GUI/Main Menu.tscn
View File

@@ -44,7 +44,7 @@ __meta__ = {
[node name="Menu Elements" type="VBoxContainer" parent="Menu"]
margin_left = 42.0
margin_top = 11.0
margin_top = 10.0
margin_right = 257.0
margin_bottom = 149.0
alignment = 2
@@ -61,7 +61,7 @@ valign = 1
[node name="Menu Options" type="VBoxContainer" parent="Menu/Menu Elements"]
margin_top = 44.0
margin_right = 215.0
margin_bottom = 138.0
margin_bottom = 139.0
[node name="Continue" type="CenterContainer" parent="Menu/Menu Elements/Menu Options"]
margin_right = 215.0
@@ -79,19 +79,19 @@ texture_disabled = ExtResource( 6 )
[node name="New Game" type="CenterContainer" parent="Menu/Menu Elements/Menu Options"]
margin_top = 19.0
margin_right = 215.0
margin_bottom = 33.0
margin_bottom = 34.0
[node name="New Game Button" type="TextureButton" parent="Menu/Menu Elements/Menu Options/New Game"]
margin_left = 66.0
margin_right = 149.0
margin_bottom = 14.0
margin_bottom = 15.0
texture_normal = ExtResource( 5 )
texture_hover = ExtResource( 7 )
[node name="Settings" type="CenterContainer" parent="Menu/Menu Elements/Menu Options"]
margin_top = 37.0
margin_top = 38.0
margin_right = 215.0
margin_bottom = 56.0
margin_bottom = 57.0
[node name="Settings Button" type="TextureButton" parent="Menu/Menu Elements/Menu Options/Settings"]
margin_left = 77.0
@@ -101,9 +101,9 @@ texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 10 )
[node name="Credits" type="CenterContainer" parent="Menu/Menu Elements/Menu Options"]
margin_top = 60.0
margin_top = 61.0
margin_right = 215.0
margin_bottom = 75.0
margin_bottom = 76.0
[node name="Credits Button" type="TextureButton" parent="Menu/Menu Elements/Menu Options/Credits"]
margin_left = 82.0
@@ -113,9 +113,9 @@ texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 9 )
[node name="Quit" type="CenterContainer" parent="Menu/Menu Elements/Menu Options"]
margin_top = 79.0
margin_top = 80.0
margin_right = 215.0
margin_bottom = 94.0
margin_bottom = 95.0
[node name="Quit Button" type="TextureButton" parent="Menu/Menu Elements/Menu Options/Quit"]
margin_left = 90.0
@@ -127,7 +127,7 @@ texture_hover = ExtResource( 11 )
[node name="BGM" type="AudioStreamPlayer" parent="."]
pause_mode = 2
stream = ExtResource( 15 )
volume_db = -15.0
volume_db = -12.0
autoplay = true
[node name="Menu Button Hover" type="AudioStreamPlayer" parent="."]

2
GUI/Splash Screen.tscn
View File

@@ -14,5 +14,5 @@ script = ExtResource( 2 )
[node name="BGM" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 )
volume_db = -15.0
volume_db = -10.0
autoplay = true