Major restructuring to better support object-oriented design of the main game logic and UI. This was necessary, I swear.

godot_ship/scenes/Game/Fire.tscn

@@ -0,0 +1,47 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/game/RedCrosshair.png" type="Texture" id=1]
+[ext_resource path="res://script/game/Gameplay/Fire.gd" type="Script" id=2]
+[ext_resource path="res://script/game/Gameplay/Crosshair.gd" type="Script" id=3]
+[ext_resource path="res://assets/game/board_blue.png" type="Texture" id=4]
+
+[node name="Fire" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_pivot_offset = Vector2( 147.423, 85.3825 )
+mouse_filter = 2
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="board_blue" type="Sprite" parent="."]
+position = Vector2( 18, 18 )
+texture = ExtResource( 4 )
+centered = false
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="Crosshair" type="Sprite" parent="."]
+texture = ExtResource( 1 )
+script = ExtResource( 3 )
+
+[node name="Fire" type="Button" parent="."]
+margin_left = 443.545
+margin_top = 264.473
+margin_right = 528.545
+margin_bottom = 318.473
+text = "FIRE"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="FireDialog" type="AcceptDialog" parent="."]
+pause_mode = 2
+margin_right = 83.0
+margin_bottom = 58.0
+dialog_text = "You can't fire outside the board"
+
+[connection signal="pressed" from="Fire" to="." method="_on_Fire_pressed"]
+[connection signal="confirmed" from="FireDialog" to="." method="_on_FireDialog_confirmed"]

godot_ship/scenes/Game/Game.tscn

@@ -0,0 +1,42 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://script/title screen/Title-Screen-Background.png" type="Texture" id=1]
+[ext_resource path="res://script/game/Gameplay/Game.gd" type="Script" id=3]
+
+[node name="Game" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+mouse_filter = 2
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Background" type="Sprite" parent="."]
+show_behind_parent = true
+position = Vector2( 321.081, 179.931 )
+texture = ExtResource( 1 )
+flip_h = true
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="Buttons" type="VBoxContainer" parent="."]
+anchor_left = 0.912
+anchor_top = 0.932
+anchor_right = 0.912
+anchor_bottom = 0.932
+margin_left = -3.68005
+margin_top = -4.52002
+margin_right = 49.3199
+margin_bottom = 15.48
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Forfeit" type="Button" parent="Buttons"]
+margin_right = 53.0
+margin_bottom = 20.0
+text = "Forfeit"
+
+[connection signal="pressed" from="Buttons/Forfeit" to="." method="_on_Forfeit_pressed"]

godot_ship/scenes/Game/Setup.tscn

@@ -1,17 +1,14 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://assets/game/board_blue.png" type="Texture" id=1]
-[ext_resource path="res://script/title screen/Title-Screen-Background.png" type="Texture" id=2]
-[ext_resource path="res://script/game/Gameplay.gd" type="Script" id=3]
-[ext_resource path="res://scenes/ships/2Ship.tscn" type="PackedScene" id=4]
-[ext_resource path="res://scenes/ships/5Ship.tscn" type="PackedScene" id=5]
-[ext_resource path="res://scenes/ships/3ShipB.tscn" type="PackedScene" id=6]
-[ext_resource path="res://scenes/ships/3shipA.tscn" type="PackedScene" id=7]
-[ext_resource path="res://scenes/ships/4Ship.tscn" type="PackedScene" id=8]
-[ext_resource path="res://assets/game/RedCrosshair.png" type="Texture" id=9]
-[ext_resource path="res://script/game/Gameplay/Crosshair.gd" type="Script" id=10]
+[ext_resource path="res://scenes/ships/3ShipB.tscn" type="PackedScene" id=4]
+[ext_resource path="res://scenes/ships/3shipA.tscn" type="PackedScene" id=5]
+[ext_resource path="res://scenes/ships/4Ship.tscn" type="PackedScene" id=6]
+[ext_resource path="res://scenes/ships/5Ship.tscn" type="PackedScene" id=7]
+[ext_resource path="res://scenes/ships/2Ship.tscn" type="PackedScene" id=8]
+[ext_resource path="res://script/game/Setup.gd" type="Script" id=10]
 
-[node name="Game" type="Control"]
+[node name="Setup" type="Control"]
 anchor_top = 0.00123732
 anchor_right = 1.0
 anchor_bottom = 0.890237
@@ -19,7 +16,8 @@ margin_left = -0.5
 margin_top = 0.740086
 margin_right = -0.5
 margin_bottom = 40.7
-script = ExtResource( 3 )
+mouse_filter = 2
+script = ExtResource( 10 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -32,38 +30,6 @@ __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="Title-Screen-Background" type="Sprite" parent="."]
-show_behind_parent = true
-position = Vector2( 321.081, 179.931 )
-texture = ExtResource( 2 )
-flip_h = true
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Crosshair" type="Sprite" parent="."]
-visible = false
-texture = ExtResource( 9 )
-script = ExtResource( 10 )
-
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
-anchor_left = 0.912
-anchor_top = 0.932
-anchor_right = 0.912
-anchor_bottom = 0.932
-margin_left = -3.68005
-margin_top = -4.52002
-margin_right = 49.3199
-margin_bottom = 15.48
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Forfeit" type="Button" parent="VBoxContainer"]
-margin_right = 53.0
-margin_bottom = 20.0
-text = "Forfeit"
-
 [node name="ConfirmationDialog" type="ConfirmationDialog" parent="."]
 margin_left = 199.156
 margin_top = 155.6
@@ -75,32 +41,32 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="2Ship" parent="." instance=ExtResource( 4 )]
-position = Vector2( 529.802, 70.7151 )
+[node name="2Ship" parent="." instance=ExtResource( 8 )]
+position = Vector2( 490.802, 90.7151 )
 collision_layer = 3
 contacts_reported = 1
 contact_monitor = true
 
-[node name="3ShipA" parent="." instance=ExtResource( 7 )]
-position = Vector2( 434.236, 114.21 )
+[node name="3ShipA" parent="." instance=ExtResource( 5 )]
+position = Vector2( 429.236, 124.21 )
 collision_layer = 3
 contacts_reported = 1
 contact_monitor = true
 
-[node name="3ShipB" parent="." instance=ExtResource( 6 )]
-position = Vector2( 443.216, 266.865 )
+[node name="3ShipB" parent="." instance=ExtResource( 4 )]
+position = Vector2( 427.216, 248.865 )
 collision_layer = 3
 contacts_reported = 1
 contact_monitor = true
 
-[node name="4Ship" parent="." instance=ExtResource( 8 )]
-position = Vector2( 522.911, 218.599 )
+[node name="4Ship" parent="." instance=ExtResource( 6 )]
+position = Vector2( 491.911, 217.599 )
 collision_layer = 3
 contacts_reported = 1
 contact_monitor = true
 
-[node name="5Ship" parent="." instance=ExtResource( 5 )]
-position = Vector2( 607.096, 211.864 )
+[node name="5Ship" parent="." instance=ExtResource( 7 )]
+position = Vector2( 557.096, 213.864 )
 collision_layer = 3
 contacts_reported = 1
 contact_monitor = true
@@ -125,17 +91,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Fire" type="Button" parent="."]
-visible = false
-margin_left = 443.545
-margin_top = 264.473
-margin_right = 528.545
-margin_bottom = 318.473
-text = "FIRE"
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="PlaceShipDialog" type="AcceptDialog" parent="."]
 anchor_left = 0.5
 anchor_top = 0.5
@@ -150,15 +105,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="FireDialog" type="AcceptDialog" parent="."]
-pause_mode = 2
-margin_right = 83.0
-margin_bottom = 58.0
-dialog_text = "You can't fire outside the board"
-
-[connection signal="pressed" from="VBoxContainer/Forfeit" to="." method="_on_Forfeit_pressed"]
 [connection signal="about_to_show" from="ConfirmationDialog" to="." method="_on_ConfirmationDialog_about_to_show"]
 [connection signal="pressed" from="Confirm Placement" to="." method="_on_Confirm_Placement_pressed"]
 [connection signal="pressed" from="Clear" to="." method="_on_Clear_pressed"]
-[connection signal="pressed" from="Fire" to="." method="_on_Fire_pressed"]
-[connection signal="confirmed" from="FireDialog" to="." method="_on_FireDialog_confirmed"]

godot_ship/scenes/Main.tscn

@@ -1,11 +1,11 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://script/game/Main.gd" type="Script" id=5]
+[ext_resource path="res://script/Main.gd" type="Script" id=5]
 
 [node name="Main" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-mouse_filter = 1
+mouse_filter = 2
 script = ExtResource( 5 )
 __meta__ = {
 "_edit_use_anchors_": false

godot_ship/scenes/MultiplayerController.tscn

@@ -1,6 +0,0 @@
-[gd_scene format=2]
-
-[node name="Control" type="Control"]
-__meta__ = {
-"_edit_use_anchors_": false
-}

godot_ship/scenes/ships/2Ship.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
+[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1]
 [ext_resource path="res://assets/game/2Ship.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]

godot_ship/scenes/ships/3ShipB.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
+[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1]
 [ext_resource path="res://assets/game/3ShipB.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]
@@ -16,7 +16,7 @@ script = ExtResource( 1 )
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-scale = Vector2( 0.9, 0.966 )
+scale = Vector2( 0.5, 0.833 )
 shape = SubResource( 1 )
 
 [node name="Area2D" type="Area2D" parent="."]

godot_ship/scenes/ships/3shipA.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
+[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1]
 [ext_resource path="res://assets/game/3ShipA.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]

godot_ship/scenes/ships/4Ship.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
+[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1]
 [ext_resource path="res://assets/game/4Ship.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]

godot_ship/scenes/ships/5Ship.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
+[ext_resource path="res://script/game/SetupShip.gd" type="Script" id=1]
 [ext_resource path="res://assets/game/5Ship.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]