j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2025-02-04 12:28:35 +00:00
Code Issues Projects Releases Wiki Activity

Game logic (#14)

Browse Source 
* Create game classes

* Pushing what I've done of the game logic.

* Commented my code

Deals with ship placement on board and ship rotation on board

* Comment game logic code, and edit for style.

* Added Clear board button and Confirm Placement button

* Fix up some stuff

* Pass

* I accidentally the buttons + Fix some hitbox mistakes.

* Improve hitbox leniency, and don't allow ships to rotate into each other.

* Fixed Dialog Box that pops up for Confirm Placement

* Update Gameplay.tscn

* Partial fire functionality added.

Currently hides all ship placement UI and makes visible all fire functionality. The crosshair currently does not snap to a grid. The ships are saved in an area of location objects holding the length, orientation, and coordinates of the ship.

* Crosshair now snaps into place

* Created Sprites for 2Ship and 3ShipA

* Created Sprite for Ship3B

* Created Sprite for Ship4

* Created Sprite for Ship5

* Created Sprite for "Hit"

* Created Sprites for Ship2 Destroyed and Ship3A Destroyed

* Created Sprite for Ship3B Destroyed

* Created Sprite for Ship4 Destroyed

* Created Sprite for Ship5 Destroyed

* Created Sprite for "Miss"

* Fixed blurry pixel art

Changed texture rendering

* Added temporary title screen text

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

* Accidentally offset the Setup menu by a handful of pixels. Whoops.

* Setup: remove unused signal

* Comment on which parts of Game are only there for testing purposes.

* Fixed up the Title Screen text

imported font

* Fixed Crosshair pixel rendering

* Consolidate backgrounds

* Added more SFX sounds

* Created Sprite for Light Mode

* Fix null deref when entering singleplayer after exiting multiplayer

* Hien's work

* Revert "Hien's work"

This reverts commit f099ed6c80.

* Stuff

* Make git happy by pushing gdengine imports

* Put Background in main

* Removed option background

* Added Confirmation Dialog for Forfeit

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

This reverts commit 104ffaab0a, reversing
changes made to 63dec75688.

* Fix title screen never going (whoops

* Oops I made the background invisible

* removed option background again

* Added dark/light mode functionality

* Added signal for audio SFX

* Load the theme on startup

* Added Confirmation dialog for Forfeit

* Fixed Texture Rendering for Light Mode Background

* Sounds no longer scale linearly

* Remove unused resourse main.tres

* Added victory screen

Added a victory screen. Since there is no current way to win, there is a 'win' button added to the top left of the game screen. Once clicked, victory text will appear and the player will be given the option to return to the main menu.

* restart button is invisible

Co-authored-by: John Breaux <JohnBreaux@my.unt.edu>
Co-authored-by: JohnBreaux <89870642+JohnBreaux@users.noreply.github.com>
Co-authored-by: hpham474 <HienPham@my.unt.edu>
Co-authored-by: Chance Atkinson <chancewatkinson@gmail.com>
This commit is contained in:
tommy-l-ngo
2021-11-14 00:43:05 -06:00
committed by GitHub
parent 99bb051920
commit 06b8711a08
134 changed files with 1355 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
godot_ship/scenes/ships/2Ship.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
[ext_resource path="res://assets/game/2longShipS.png" type="Texture" id=2]
[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]
extents = Vector2( 16, 32 )
@@ -12,16 +12,18 @@ gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
[node name="2longShipS" type="Sprite" parent="."]
position = Vector2( 0, 16 )
[node name="2Ship_Sprite" type="Sprite" parent="."]
position = Vector2( -0.00390625, 15.622 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0.125, 16 )
scale = Vector2( 0.5, 0.75 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 0.125, 16 )
scale = Vector2( 0.5, 0.75 )
shape = SubResource( 1 )

8
godot_ship/scenes/ships/3ShipB.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
[ext_resource path="res://assets/game/3longShipBS.png" type="Texture" id=2]
[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]
extents = Vector2( 16, 48 )
@@ -12,13 +12,15 @@ gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
[node name="3longShipBS" type="Sprite" parent="."]
[node name="3ShipB_Sprite" type="Sprite" parent="."]
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2( 0.5, 0.833 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
scale = Vector2( 0.5, 0.833 )
shape = SubResource( 1 )

9
godot_ship/scenes/ships/3shipA.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
[ext_resource path="res://assets/game/3longShipAS.png" type="Texture" id=2]
[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]
extents = Vector2( 16, 48 )
@@ -12,13 +12,16 @@ gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
[node name="3longShipAS" type="Sprite" parent="."]
[node name="3ShipA_Sprite" type="Sprite" parent="."]
position = Vector2( -0.0212851, 0 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2( 0.5, 0.875 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
scale = Vector2( 0.5, 0.833 )
shape = SubResource( 1 )

12
godot_ship/scenes/ships/4Ship.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
[ext_resource path="res://assets/game/4longShipS.png" type="Texture" id=2]
[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]
extents = Vector2( 16, 64 )
@@ -12,16 +12,18 @@ gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
[node name="4longShipS" type="Sprite" parent="."]
[node name="4Ship_Sprite" type="Sprite" parent="."]
position = Vector2( 0, 16 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 1, 15 )
position = Vector2( 0, 16 )
scale = Vector2( 0.5, 0.875 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 1, 15 )
position = Vector2( 0, 16 )
scale = Vector2( 0.5, 0.875 )
shape = SubResource( 1 )

9
godot_ship/scenes/ships/5Ship.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://script/game/moveShip.gd" type="Script" id=1]
[ext_resource path="res://assets/game/5longShipS.png" type="Texture" id=2]
[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]
extents = Vector2( 16, 80 )
@@ -11,14 +11,15 @@ input_pickable = true
custom_integrator = true
script = ExtResource( 1 )
[node name="5longShipS" type="Sprite" parent="."]
[node name="5Ship_Sprite" type="Sprite" parent="."]
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
scale = Vector2( 0.5, 0.9 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
scale = Vector2( 0.5, 0.9 )
shape = SubResource( 1 )