diff --git a/godot_ship/script/game/Gameplay/Board.gd b/godot_ship/script/game/Gameplay/Board.gd index 6e6e3aa..d9a2f0b 100644 --- a/godot_ship/script/game/Gameplay/Board.gd +++ b/godot_ship/script/game/Gameplay/Board.gd @@ -8,10 +8,13 @@ var top_board # Opponent board var ships # list of Ships var ship_count # number of 'active' (un-sunk) ships +# a board is square. This is its side lengths +var board_len = 10 + # Called when the node enters the scene tree for the first time. func _ready(): ships = [] - shipCount = 0 + ship_count = 0 # TODO: What state? func getState(): @@ -26,21 +29,26 @@ func getBottomBoard(): pass func getShipCount(): - pass + return ship_count func _init(): # Initialize the bottom_board to a 10x10 array - for i in range(10): + for _row in range(board_len): bottom_board.append([]) - for _i in range(0, 10): - bottom_board[i].resize(10) + for column in bottom_board: + column.resize(10) # Initialize the top_board to a 10x10 array - for i in range(10): + for _row in range(board_len): top_board.append([]) - for _i in range(0, 10): - top_board[i].resize(10) + for column in top_board: + column.resize(board_len) # worldspace_to_boardspace: convert a Vector2 in world-space to board-space func worldspace_to_boardspace(coordinate:Vector2): # subtract 36 to get the position relative to (0,0) on the board, and integer divide by 32 return Vector2(int(coordinate.x - 36) >> 5, int(coordinate.y-36) >> 5) + +# Coordinates of ship's center. Ship extends [-(size-1 >> 1), (size/2 >> 1)] +func shiptoboard(ship:Ship): + for i in range (ship.) + pass \ No newline at end of file diff --git a/godot_ship/script/game/Gameplay/Player.gd b/godot_ship/script/game/Gameplay/Player.gd index bb122bd..ca89ece 100644 --- a/godot_ship/script/game/Gameplay/Player.gd +++ b/godot_ship/script/game/Gameplay/Player.gd @@ -6,7 +6,7 @@ var Board = "res://script/game/Gameplay/Board.gd" # Player ID of this player var pid # board (an instance of the Board class) -var board +onready var board = Board.new() # Called when the node enters the scene tree for the first time. func _ready():