1
0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2025-02-04 12:28:35 +00:00

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

This commit is contained in:
2021-11-13 04:34:39 -06:00
parent b0995cbd0d
commit 1cb400361d
22 changed files with 251 additions and 241 deletions

View File

@@ -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"]

View File

@@ -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"]

View File

@@ -0,0 +1,110 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://assets/game/board_blue.png" type="Texture" id=1]
[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="Setup" type="Control"]
anchor_top = 0.00123732
anchor_right = 1.0
anchor_bottom = 0.890237
margin_left = -0.5
margin_top = 0.740086
margin_right = -0.5
margin_bottom = 40.7
mouse_filter = 2
script = ExtResource( 10 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="board_blue" type="Sprite" parent="."]
position = Vector2( 18, 18 )
texture = ExtResource( 1 )
centered = false
__meta__ = {
"_edit_lock_": true
}
[node name="ConfirmationDialog" type="ConfirmationDialog" parent="."]
margin_left = 199.156
margin_top = 155.6
margin_right = 458.156
margin_bottom = 225.6
rect_min_size = Vector2( 150, 52.5 )
window_title = "Are you sure you'd like to forfeit?"
__meta__ = {
"_edit_use_anchors_": false
}
[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( 5 )]
position = Vector2( 429.236, 124.21 )
collision_layer = 3
contacts_reported = 1
contact_monitor = true
[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( 6 )]
position = Vector2( 491.911, 217.599 )
collision_layer = 3
contacts_reported = 1
contact_monitor = true
[node name="5Ship" parent="." instance=ExtResource( 7 )]
position = Vector2( 557.096, 213.864 )
collision_layer = 3
contacts_reported = 1
contact_monitor = true
[node name="Confirm Placement" type="Button" parent="."]
margin_left = 409.0
margin_top = 331.0
margin_right = 543.0
margin_bottom = 351.0
text = "Confirm Placement"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Clear" type="Button" parent="."]
margin_left = 353.0
margin_top = 331.0
margin_right = 406.0
margin_bottom = 351.0
text = "Clear"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="PlaceShipDialog" type="AcceptDialog" parent="."]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -179.0
margin_top = -29.0
margin_right = 179.0
margin_bottom = 29.0
dialog_text = "You can't confirm placement until all ships are placed"
__meta__ = {
"_edit_use_anchors_": false
}
[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"]