gitea-mirror/basic-computer-games
1
0
Fork 0
mirror of https://github.com/coding-horror/basic-computer-games.git synced 2026-01-06 01:57:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up debug statements and program flow. Fixed a couple of bugs from testing

Browse Source
This commit is contained in:
Todd Kaiser
2021-03-16 18:19:01 -06:00
parent 8bea3b92f4
commit e6e6a52646
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
77 Salvo/python/salvo.py
View File

@@ -147,8 +147,24 @@ def input_coord():
return x, y return x, y
# TODO: add an optional starting coordinate for testing # generate_ship_coordinates
# purposes #
# given a ship from the SHIPS array, generate
# the coordinates of the ship. the starting point
# of the ship's first coordinate is generated randomly.
# once the starting coordinates are determined, the
# possible directions of the ship, accounting for the
# edges of the board, are determined. once possible
# directions are found, a direction is randomly
# determined and the remaining coordinates are
# generated by adding or substraction from the starting
# coordinates as determined by direction.
#
# arguments:
# ship - index into the SHIPS array
#
# returns:
# array of sets of coordinates (x,y)
def generate_ship_coordinates(ship): def generate_ship_coordinates(ship):
# randomly generate starting x,y coordinates # randomly generate starting x,y coordinates
start_x, start_y = random_x_y() start_x, start_y = random_x_y()
@@ -273,16 +289,16 @@ def generate_board():
# given a board and x, y coordinates, # given a board and x, y coordinates,
# execute a shot. returns True if the shot # execute a shot. returns True if the shot
# is valid, False if not # is valid, False if not
def execute_shot(board, x, y): def execute_shot(turn, board, x, y):
global current_turn global current_turn
square = board[x-1][y-1] square = board[x-1][y-1]
if square is not None: if square is not None:
if square >= 0 and square < len(SHIPS): if square >= 0 and square < len(SHIPS):
if active_turn == PLAYER: if turn == COMPUTER:
print("YOU HIT MY", SHIPS[square][0])
else:
print("I HIT YOUR", SHIPS[square][0]) print("I HIT YOUR", SHIPS[square][0])
else:
print("YOU HIT MY", SHIPS[square][0])
board[x-1][y-1] = 10 + current_turn board[x-1][y-1] = 10 + current_turn
@@ -328,7 +344,10 @@ def initialize_game():
# print out the title 'screen' # print out the title 'screen'
print('{0:>38}'.format("SALVO")) print('{0:>38}'.format("SALVO"))
print('{0:>57s}'.format("CREATIVE COMPUTING MORRISTOWN, NEW JERSEY")) print('{0:>57s}'.format("CREATIVE COMPUTING MORRISTOWN, NEW JERSEY"))
print('\n\n') print('')
print('{0:>52s}'.format("ORIGINAL BY LAWRENCE SIEGEL, 1973"))
print('{0:>56s}'.format("PYTHON 3 PORT BY TODD KAISER, MARCH 2021"))
print('\n')
# ask the player for ship coordinates # ask the player for ship coordinates
print("ENTER COORDINATES FOR...") print("ENTER COORDINATES FOR...")
@@ -468,7 +487,7 @@ def execute_turn(turn):
valid_shot = True valid_shot = True
for shot in shots: for shot in shots:
execute_shot(board, shot[0], shot[1]) execute_shot(turn, board, shot[0], shot[1])
if turn == COMPUTER: if turn == COMPUTER:
if print_computer_shots: if print_computer_shots:
print(shot[0], shot[1]) print(shot[0], shot[1])
@@ -507,10 +526,11 @@ while not game_over:
print("\n") print("\n")
print("TURN", current_turn) print("TURN", current_turn)
print("computer")
print_board(computer_board) # print("computer")
print("player") # print_board(computer_board)
print_board(player_board) # print("player")
# print_board(player_board)
if execute_turn(first_turn) == 0: if execute_turn(first_turn) == 0:
game_over = True game_over = True