From 9ef5a6f74981afcaddcc8ab966f9f383477dbe86 Mon Sep 17 00:00:00 2001
From: Chance Atkinson <chancewatkinson@gmail.com>
Date: Sun, 7 Nov 2021 00:35:34 -0500
Subject: [PATCH] Fixed volume slider and ship spawning

Previously tried adding a collision mesh to the ships to avoid stacking, but it caused the ships to slide to the right when they spawned. This issue has been resolved.

The volume slider now sets to a minimum to -60 dB so the audio only goes silent when set to the minimum. Also set the 'step' variable to 1 so that the slider could be more precise.
---
 godot_ship/scenes/Options.tscn      | 6 ++----
 godot_ship/scenes/ships/2Ship.tscn  | 8 ++++----
 godot_ship/scenes/ships/3ShipB.tscn | 6 +++---
 godot_ship/scenes/ships/3shipA.tscn | 6 +++---
 godot_ship/scenes/ships/4Ship.tscn  | 8 ++++----
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/godot_ship/scenes/Options.tscn b/godot_ship/scenes/Options.tscn
index 89a9372..decbdd9 100644
--- a/godot_ship/scenes/Options.tscn
+++ b/godot_ship/scenes/Options.tscn
@@ -68,9 +68,8 @@ 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 = -80.0
+min_value = -30.0
 max_value = 0.0
-step = 10.0
 tick_count = 11
 __meta__ = {
 "_edit_use_anchors_": false
@@ -100,9 +99,8 @@ 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 = -80.0
+min_value = -60.0
 max_value = 0.0
-step = 10.0
 tick_count = 11
 ticks_on_borders = true
 __meta__ = {
diff --git a/godot_ship/scenes/ships/2Ship.tscn b/godot_ship/scenes/ships/2Ship.tscn
index 4f00023..8647965 100644
--- a/godot_ship/scenes/ships/2Ship.tscn
+++ b/godot_ship/scenes/ships/2Ship.tscn
@@ -11,10 +11,10 @@ input_pickable = true
 custom_integrator = true
 script = ExtResource( 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, 16 )
-shape = SubResource( 1 )
-
 [node name="2longShipS" type="Sprite" parent="."]
 position = Vector2( 0, 16 )
 texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2( 0, 16.25 )
+shape = SubResource( 1 )
diff --git a/godot_ship/scenes/ships/3ShipB.tscn b/godot_ship/scenes/ships/3ShipB.tscn
index 980a4e5..6317e99 100644
--- a/godot_ship/scenes/ships/3ShipB.tscn
+++ b/godot_ship/scenes/ships/3ShipB.tscn
@@ -11,8 +11,8 @@ input_pickable = true
 custom_integrator = true
 script = ExtResource( 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
-
 [node name="3longShipBS" type="Sprite" parent="."]
 texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )
diff --git a/godot_ship/scenes/ships/3shipA.tscn b/godot_ship/scenes/ships/3shipA.tscn
index f3271a3..c0d40b5 100644
--- a/godot_ship/scenes/ships/3shipA.tscn
+++ b/godot_ship/scenes/ships/3shipA.tscn
@@ -11,8 +11,8 @@ input_pickable = true
 custom_integrator = true
 script = ExtResource( 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
-
 [node name="3longShipAS" type="Sprite" parent="."]
 texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )
diff --git a/godot_ship/scenes/ships/4Ship.tscn b/godot_ship/scenes/ships/4Ship.tscn
index 9961eb2..b4e7b7f 100644
--- a/godot_ship/scenes/ships/4Ship.tscn
+++ b/godot_ship/scenes/ships/4Ship.tscn
@@ -11,10 +11,10 @@ input_pickable = true
 custom_integrator = true
 script = ExtResource( 1 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, 16 )
-shape = SubResource( 1 )
-
 [node name="4longShipS" type="Sprite" parent="."]
 position = Vector2( 0, 16 )
 texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2( 1, 15 )
+shape = SubResource( 1 )