Upload app.py

app.py

@@ -19,28 +19,16 @@ SHIPS = [
     {"name": "Destroyer", "size": 2, "symbol": ":speedboat:"}
 ]
 
- # Initialize difficulty in session state if not present
-if 'difficulty' not in st.session_state:
-    st.session_state.difficulty = "Beginner"
-
-# Add difficulty selector
-st.session_state.difficulty = st.selectbox(
-    "Select Difficulty",
-    ["Beginner", "Expert"],
-    index=0 if st.session_state.difficulty == "Beginner" else 1
-)
-
 # MongoDB Atlas Connection
 client = MongoClient(os.environ.get('MONGODB_ATLAS_URI'))
 db = client['battleship']
 games = db['games']
 
-region = 'us-east-1' if st.session_state.difficulty == "Begginer" else 'us-west-2'
 # AWS Bedrock Client Setup
 bedrock_runtime = boto3.client('bedrock-runtime',
                                aws_access_key_id=os.environ.get('AWS_ACCESS_KEY'),
                                aws_secret_access_key=os.environ.get('AWS_SECRET_KEY'),
-                               region_name=region)
+                               region_name="us-west-2")
 
 def get_bedrock_claude_move(board, openent_moves=None):
     """
@@ -79,6 +67,47 @@ def create_empty_board():
     """Create an empty game board."""
     return [[EMPTY for _ in range(BOARD_SIZE)] for _ in range(BOARD_SIZE)]
 
+def is_valid_position(row, col):
+    """Check if a position is within the board boundaries."""
+    return 0 <= row < BOARD_SIZE and 0 <= col < BOARD_SIZE
+
+def check_adjacent_cells(board, row, col):
+    """Check if any adjacent cells (including diagonals) contain a ship."""
+    for i in range(-1, 2):
+        for j in range(-1, 2):
+            if i == 0 and j == 0:
+                continue
+            new_row, new_col = row + i, col + j
+            if is_valid_position(new_row, new_col) and board[new_row][new_col] != EMPTY:
+                return False
+    return True
+
+def can_place_ship(board, row, col, size, direction):
+    """Check if a ship can be placed at the given position."""
+    if direction == 'horizontal':
+        if col + size > BOARD_SIZE:
+            return False
+        # Check the ship's cells and their adjacent cells
+        for i in range(-1, size + 1):
+            for j in range(-1, 2):
+                check_row = row + j
+                check_col = col + i
+                if is_valid_position(check_row, check_col):
+                    if board[check_row][check_col] != EMPTY:
+                        return False
+    else:  # vertical
+        if row + size > BOARD_SIZE:
+            return False
+        # Check the ship's cells and their adjacent cells
+        for i in range(-1, 2):
+            for j in range(-1, size + 1):
+                check_row = row + j
+                check_col = col + i
+                if is_valid_position(check_row, check_col):
+                    if board[check_row][check_col] != EMPTY:
+                        return False
+    return True
+
 def place_ships_randomly(board):
     """Place ships randomly on the board."""
     for ship in SHIPS:
@@ -91,17 +120,6 @@ def place_ships_randomly(board):
                 break
     return board
 
-def can_place_ship(board, row, col, size, direction):
-    """Check if a ship can be placed at the given position."""
-    if direction == 'horizontal':
-        if col + size > BOARD_SIZE:
-            return False
-        return all(board[row][col+i] == EMPTY for i in range(size))
-    else:
-        if row + size > BOARD_SIZE:
-            return False
-        return all(board[row+i][col] == EMPTY for i in range(size))
-
 def place_ship(board, row, col, size, direction, symbol):
     """Place a ship on the board."""
     if direction == 'horizontal':
@@ -113,6 +131,9 @@ def place_ship(board, row, col, size, direction, symbol):
 
 def initialize_game():
     """Initialize the game state."""
+    if 'difficulty' not in st.session_state:
+        st.session_state.difficulty = "Beginner"
+        
     if 'game_state' not in st.session_state:
         st.session_state.game_state = {
             'player_board': place_ships_randomly(create_empty_board()),
@@ -227,9 +248,18 @@ def opponent_turn():
 
 def main():
     """Main function to run the Battleship game."""
-    st.title('Battleship Game vs Bedrock 🏴‍☠️')
+    st.title('Battleship Game')
     
-   
+    # Initialize difficulty in session state if not present
+    if 'difficulty' not in st.session_state:
+        st.session_state.difficulty = "Beginner"
+    
+    # Add difficulty selector
+    st.session_state.difficulty = st.selectbox(
+        "Select Difficulty",
+        ["Beginner", "Expert"],
+        index=0 if st.session_state.difficulty == "Beginner" else 1
+    )
     
     initialize_game()
     if st.session_state.game_state['game_over']: