mirror of
https://github.com/JohnBreaux/Boat-Battle.git
synced 2024-11-15 13:25:58 +00:00
06b8711a08
* 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 commitf099ed6c80. * 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 commit104ffaab0a, reversing changes made to63dec75688. * 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>
56 lines
1.7 KiB
GDScript
56 lines
1.7 KiB
GDScript
extends Control
|
|
|
|
signal game_ready
|
|
|
|
onready var Ships = ["2Ship", "3ShipA", "3ShipB", "4Ship", "5Ship"]
|
|
|
|
onready var Victory = preload("res://scenes/Game/Player.tscn")
|
|
|
|
class ShipData:
|
|
var Position: Vector2
|
|
var Length: int
|
|
var Orientation: bool # (True = vertical) (False = horizontal)
|
|
|
|
# Called when the node enters the scene tree for the first time.
|
|
func _ready():
|
|
# Moves the focus to this menu
|
|
if find_next_valid_focus(): find_next_valid_focus().grab_focus()
|
|
|
|
|
|
func _on_Confirm_Placement_pressed():
|
|
# Make the button noise
|
|
AudioBus.emit_signal("button_clicked")
|
|
var valid = true
|
|
for ship in Ships:
|
|
# validate_placement returns the x-axis distance from the board
|
|
# if this is more than zero, the ship is invalid
|
|
if get_node(ship).validate_placement():
|
|
valid = false
|
|
print ("Placement: ", valid)
|
|
if valid == false:
|
|
get_node("PlaceShipDialog").popup()
|
|
else:
|
|
#Saves the location of ships and length of ship into an array
|
|
var shipLocation = []
|
|
for ship in Ships:
|
|
var location = ShipData.new()
|
|
location.Position = get_node(ship).position
|
|
location.Length = get_node(ship).get("ship_length")
|
|
location.Orientation = get_node(ship).get("vertical")
|
|
shipLocation.append(location)
|
|
|
|
#print out the array for testing
|
|
for x in shipLocation:
|
|
print("Ship Length: ", x.Length, ", Ship Orientation: ", x.Orientation, ", Ship Position: ", x.Position)
|
|
|
|
# Return the shipLocation array to those listening on game_ready
|
|
emit_signal("game_ready", shipLocation)
|
|
queue_free()
|
|
return valid # Replace with function body.
|
|
|
|
func _on_Clear_pressed():
|
|
AudioBus.emit_signal("button_clicked")
|
|
for ship in Ships:
|
|
get_node(ship).clear()
|
|
pass # Replace with function body.
|