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

godot_ship/scenes/AudioController.tscn

@@ -26,12 +26,15 @@ bus = "SFX"
 
 [node name="shipHitSFX" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )
+volume_db = -10.0
 bus = "SFX"
 
 [node name="shipMissedSFX" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 5 )
+volume_db = -5.0
 bus = "SFX"
 
 [node name="shipSunkSFX" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 6 )
+volume_db = -10.0
 bus = "SFX"

godot_ship/scenes/Debug Menu.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://main.tres" type="Theme" id=1]
 [ext_resource path="res://script/debug/debug_menu.gd" type="Script" id=2]
 [ext_resource path="res://script/debug/In.gd" type="Script" id=3]
 [ext_resource path="res://script/debug/Out.gd" type="Script" id=4]
@@ -9,7 +8,7 @@
 [node name="Debug" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme = ExtResource( 1 )
+theme = ExtResource( 5 )
 script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -51,6 +50,7 @@ focus_neighbour_right = NodePath(".")
 focus_neighbour_bottom = NodePath(".")
 focus_next = NodePath(".")
 focus_previous = NodePath(".")
+theme = ExtResource( 5 )
 max_length = 256
 placeholder_text = "By your command."
 caret_blink = true

godot_ship/scenes/Game/Victory.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://script/game/Victory.gd" type="Script" id=1]
+[ext_resource path="res://assets/font/Minecraft.ttf" type="DynamicFontData" id=2]
+
+[sub_resource type="DynamicFont" id=1]
+size = 40
+font_data = ExtResource( 2 )
+
+[node name="Victory" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Label" type="Label" parent="."]
+margin_left = 118.32
+margin_top = 44.5109
+margin_right = 260.32
+margin_bottom = 84.5109
+size_flags_vertical = 0
+custom_fonts/font = SubResource( 1 )
+text = "Victory"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Button" type="Button" parent="."]
+margin_left = 541.0
+margin_top = 327.85
+margin_right = 636.0
+margin_bottom = 353.85
+text = "Exit to Main"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Button2" type="Button" parent="."]
+visible = false
+margin_left = 2.22023
+margin_top = 337.41
+margin_right = 63.2202
+margin_bottom = 357.41
+text = "Restart"
+
+[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
+[connection signal="button_down" from="Button2" to="." method="_on_restart_button_down"]

godot_ship/scenes/Options.tscn

@@ -58,10 +58,9 @@ focus_neighbour_top = NodePath("../../../Back")
 focus_neighbour_bottom = NodePath("../../Volume Setting/Volume Slider")
 focus_next = NodePath("../../Volume Setting/Volume Slider")
 focus_previous = NodePath("../../../Back")
-min_value = -25.0
-max_value = 0.0
+max_value = 1.0
+step = 0.05
 tick_count = 10
-ticks_on_borders = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -90,10 +89,9 @@ focus_neighbour_top = NodePath("../../SFX Setting/SFX Slider")
 focus_neighbour_bottom = NodePath("../../../Buttons/Dark")
 focus_next = NodePath("../../../Buttons/Dark")
 focus_previous = NodePath("../../SFX Setting/SFX Slider")
-min_value = -50.0
-max_value = 0.0
+max_value = 1.0
+step = 0.05
 tick_count = 10
-ticks_on_borders = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -117,10 +115,9 @@ margin_left = 64.0
 margin_top = 48.0
 margin_right = 208.0
 margin_bottom = 64.0
-min_value = -50.0
-max_value = 0.0
+max_value = 1.0
+step = 0.05
 tick_count = 10
-ticks_on_borders = true
 __meta__ = {
 "_edit_use_anchors_": false
 }