j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic

Browse Source
This commit is contained in:
tommy-l-ngo 2021-11-14 00:44:20 -06:00
commit e5b7ac7662
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
godot_ship/scenes/Game/Game.tscn
View File

@ -46,5 +46,13 @@ __meta__ = {
"_editor_description_": "" "_editor_description_": ""
} }
[node name="Button" type="Button" parent="."]
margin_left = 599.361
margin_top = 2.97302
margin_right = 636.361
margin_bottom = 22.973
text = "Win"
[connection signal="pressed" from="Buttons/Forfeit" to="." method="_on_Forfeit_pressed"] [connection signal="pressed" from="Buttons/Forfeit" to="." method="_on_Forfeit_pressed"]
[connection signal="confirmed" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_confirmed"] [connection signal="confirmed" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_confirmed"]
[connection signal="button_down" from="Button" to="." method="_on_Button_button_down"]

5
godot_ship/scenes/Game/Victory.tscn
View File

@ -29,7 +29,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Button" type="Button" parent="."] [node name="exit_to_main" type="Button" parent="."]
margin_left = 541.0 margin_left = 541.0
margin_top = 327.85 margin_top = 327.85
margin_right = 636.0 margin_right = 636.0
@ -47,5 +47,6 @@ margin_right = 63.2202
margin_bottom = 357.41 margin_bottom = 357.41
text = "Restart" text = "Restart"
[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] [connection signal="button_down" from="exit_to_main" to="." method="_on_exit_to_main_button_down"]
[connection signal="pressed" from="exit_to_main" to="." method="_on_Button_pressed"]
[connection signal="button_down" from="Button2" to="." method="_on_restart_button_down"] [connection signal="button_down" from="Button2" to="." method="_on_restart_button_down"]

13
godot_ship/script/game/Victory.gd
View File

@ -15,16 +15,13 @@ func _ready():
#func _process(delta): #func _process(delta):
# pass # pass
# returns player(s) back to main menu
func _on_Button_pressed():
AudioBus.emit_signal("button_clicked")
#MessageBus.emit_signal("change_scene", "Title")
emit_signal("exit_main")
func _on_restart_button_down(): func _on_restart_button_down():
AudioBus.emit_signal("button_clicked") AudioBus.emit_signal("button_clicked")
#MessageBus.emit_signal("change_scene", "Multiplayer") #MessageBus.emit_signal("change_scene", "Multiplayer")
pass # Replace with function body. pass # Replace with function body.
# returns player(s) back to main menu
func _on_exit_to_main_button_down():
AudioBus.emit_signal("button_clicked")
#MessageBus.emit_signal("change_scene", "Title")
emit_signal("exit_main")