Working on the capture semantics.

Author: eriq-augustine

pacai/capture/bin.py

@@ -7,46 +7,11 @@
 import typing
 
 import pacai.capture.game
-import pacai.core.agentinfo
-import pacai.core.board
 import pacai.util.bin
-import pacai.util.alias
 
-DEFAULT_BOARD: str = 'classic-medium'
+DEFAULT_BOARD: str = 'capture-medium'
 DEFAULT_SPRITE_SHEET: str = 'pacman'
 
-def set_cli_args(parser: argparse.ArgumentParser, **kwargs) -> argparse.ArgumentParser:
-    """
-    Set Capture-specific CLI arguments.
-    This is a sibling to init_from_args(), as the arguments set here can be interpreted there.
-    """
-
-    # TEST
-    parser.add_argument('--pacman', dest = 'pacman', metavar = 'AGENT_TYPE',
-            action = 'store', type = str, default = pacai.util.alias.AGENT_USER_INPUT.short,
-            help = ('Select the agent type that PacMan will use (default: %(default)s).'
-                    + f' Builtin agents: {pacai.util.alias.AGENT_SHORT_NAMES}.'))
-
-    return parser
-
-def init_from_args(args: argparse.Namespace) -> tuple[dict[int, pacai.core.agentinfo.AgentInfo], list[int], dict[str, typing.Any]]:
-    """
-    Setup agents based on Capture rules.
-    """
-
-    base_agent_infos: dict[int, pacai.core.agentinfo.AgentInfo] = {}
-
-    # TEST
-
-    # Create base arguments for all possible agents.
-    for i in range(pacai.core.board.MAX_AGENTS):
-        if (i == 0):
-            base_agent_infos[i] = pacai.core.agentinfo.AgentInfo(name = args.pacman)
-        else:
-            base_agent_infos[i] = pacai.core.agentinfo.AgentInfo(name = args.ghosts)
-
-    return base_agent_infos, [], {}
-
 def get_additional_ui_options(args: argparse.Namespace) -> dict[str, typing.Any]:
     """ Get additional options for the UI. """
 
@@ -61,9 +26,7 @@ def main() -> int:
         description = "Play a game of Capture.",
         default_board = DEFAULT_BOARD,
         game_class = pacai.capture.game.Game,
-        custom_set_cli_args = set_cli_args,
         get_additional_ui_options = get_additional_ui_options,
-        custom_init_from_args = init_from_args,
     )
 
 if (__name__ == '__main__'):

pacai/capture/gamestate.py

@@ -55,7 +55,7 @@ def _team_side(self, agent_index: int = -1, position: pacai.core.board.Position
         if (position is None):
             raise ValueError("Could not find position.")
 
-        if (position.row < (self.board.width / 2)):
+        if (position.col < (self.board.width / 2)):
             return -1
 
         return 1
@@ -66,6 +66,13 @@ def _team_agent_indexes(self, team_modifier: int) -> list[int]:
         return [agent_index for agent_index in self.get_agent_indexes() if (self._team_modifier(agent_index) == team_modifier)]
 
     def is_scared(self, agent_index: int = -1) -> bool:
+        if (agent_index == -1):
+            agent_index = self.agent_index
+
+        # Dead agents have nothing to fear
+        if (self.get_agent_position(agent_index = agent_index) is None):
+            return False
+
         # Agents cannot be scared when on the opponent's side of the board.
         if (self._team_side(agent_index = agent_index) != self._team_modifier(agent_index = agent_index)):
             return False
@@ -86,7 +93,8 @@ def get_legal_actions(self, position: pacai.core.board.Position | None = None) -
         if (position is None):
             return [pacai.core.action.STOP]
 
-        return super().get_legal_actions(position)
+        # Call directly into pacai.core.gamestate.GameState because Pac-Man has special actions for ghosts.
+        return pacai.core.gamestate.GameState.get_legal_actions(self, position)
 
     def food_count(self, team_modifier: int = 0, agent_index: int = -1) -> int:
         """
@@ -228,6 +236,8 @@ def process_turn(self,  # pylint: disable=too-many-statements
             new_position = self.board.get_agent_initial_position(self.agent_index)
             if (new_position is None):
                 raise ValueError(f"Cannot find initial position for agent {self.agent_index}.")
+
+            self.board.place_marker(agent_marker, new_position)
         else:
             new_position = old_position.apply_action(action)
 
@@ -236,22 +246,31 @@ def process_turn(self,  # pylint: disable=too-many-statements
         if (old_position != new_position):
             interaction_markers = self.board.get(new_position)
 
-            # Since we are moving, pickup the agent from their current location.
+            # Since we are moving, pickup the agent from their current location and move them to their new location.
             if (old_position is not None):
                 self.board.remove_marker(agent_marker, old_position)
+                self.board.place_marker(agent_marker, new_position)
 
         died = False
 
         # Process actions for all the markers we are moving onto.
         for interaction_marker in interaction_markers:
             if (interaction_marker == pacai.pacman.board.MARKER_PELLET):
+                # Ignore our own food.
+                if (team_modifier == self._team_side(position = new_position)):
+                    continue
+
                 # Eat a food pellet.
                 self.board.remove_marker(interaction_marker, new_position)
                 self.score += team_modifier * FOOD_POINTS
 
                 if (self.food_count(team_modifier = team_modifier) == 0):
                     self.game_over = True
             elif (interaction_marker == pacai.pacman.board.MARKER_CAPSULE):
+                # Ignore our own capsules.
+                if (team_modifier == self._team_side(position = new_position)):
+                    continue
+
                 # Eat a power capsule, scare all enemy ghosts.
                 self.board.remove_marker(interaction_marker, new_position)
 
@@ -267,21 +286,21 @@ def process_turn(self,  # pylint: disable=too-many-statements
                     continue
 
                 # Check if anyone is scared.
-                self_scared = self.is_scared(agent_index)
+                self_scared = self.is_scared(self.agent_index)
                 other_scared = self.is_scared(other_agent_index)
 
                 # Check who is a ghost (agent's on their own side are a ghost).
-                # We know if we are a ghost if the other agent is a ghost or scared.
+                self_ghost = (team_modifier == self._team_side(agent_index = self.agent_index))
                 other_ghost = (other_team_modifier == self._team_side(agent_index = other_agent_index))
 
                 # Check who was eaten (and remove them), what team did the eating, and the points that should be awarded.
                 eating_team_modifier = 0
                 points = 0
 
-                if (self_scared or other_ghost):
+                if ((self_scared and self_ghost) or ((not other_scared) and other_ghost)):
                     # We got eaten, but our marker is already off the board.
                     died = True
-                    self._kill_agent(agent_index)
+                    self._kill_agent(self.agent_index)
 
                     eating_team_modifier = other_team_modifier
 
@@ -303,9 +322,9 @@ def process_turn(self,  # pylint: disable=too-many-statements
 
                 self.score += (eating_team_modifier * points)
 
-        # Move the agent to the new location if it did not die.
-        if (not died):
-            self.board.place_marker(agent_marker, new_position)
+        # The current agent has died, remove their marker.
+        if (died):
+            self.board.remove_marker(agent_marker, new_position)
 
         # Decrement the scared timer.
         if (self.agent_index in self.scared_timers):

pacai/resources/boards/capture-alley.board

@@ -3,15 +3,15 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%1%  .%.%.%   %.%      %.%%%     %   %
-%3% %.% %          %%% %     % % % % %
+%0%  .%.%.%   %.%      %.%%%     %   %
+%2% %.% %          %%% %     % % % % %
 % % % %   %%% %%% %%     %%%%% %.% % %
 % % % % % %.%  .%.%  %%% %     %.% % %
 % % % % % % % %%%%%  %.%   %%% %%% % %
 % % %   %.% % %        % % %.%   % % %
 % % %%% %%%   %.%  %%%%% % % % % % % %
 % % %.%     % %%%  %.%.  %.% % % % % %
 % % %.% %%%%%     %% %%% %%%   % % % %
-% % % % %     % %%%          % %.% %4%
-%   %     %%%.%      %.%   %.%.%.  %2%
+% % % % %     % %%%          % %.% %3%
+%   %     %%%.%      %.%   %.%.%.  %1%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-blox.board

@@ -3,7 +3,7 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%
-%1%%%%%%%%%%%%%%2%
+%0%%%%%%%%%%%%%%1%
 % %.....  .....% %
 % %.....  .....% %
 % %.% %%%%%% %.% %
@@ -20,5 +20,5 @@
 % %.....  .....% %
 % %.%% %  % %%.% %
 % % %% %  % %% % %
-%3%....    ....%4%
-%%%%%%%%%%%%%%%%%%
+%2%....    ....%3%
+%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-crowded.board

@@ -3,16 +3,16 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%               3%%2               %
+%               2%%1               %
 % %%%%%%%%%%%%%% %%%%%%%%%%%%%%%%% %
 % %.........   %   ..............% %
 % %........  %.%%%%%%%%.%%% %%.%%% %
 % %%%%.%%%%% %...  .%.....% %....% %
-%  ....%5%%%.%%%.  .......% %....  %
-%  ....% %.......  .%%%.%%%6%....  %
+%  ....%4%%%.%%%.  .......% %....  %
+%  ....% %.......  .%%%.%%%5%....  %
 % %....% %.....%.  ...% %%%%%.%%%% %
 % %%% %% %%%.%%%%%%%%.%  ........% %
 % %..............   %   .........% %
 % %%%%%%%%%%%%%%%%% %%%%%%%%%%%%%% %
-%               1%%4               %
+%               0%%3               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-default.board

@@ -3,8 +3,8 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   %. %.%.%       %     %.%.%4%
-% % %%       %%  %   %%%   %.%2%
+%   %. %.%.%       %     %.%.%3%
+% % %%       %%  %   %%%   %.%1%
 % % %. % %%%    %%%% .%..% % % %
 % % %% % ..% %   %   %%%%% % % %
 % %    %%%%% %%%   %%%.% o % % %
@@ -15,6 +15,6 @@
 % % % o %.%%%   %%% %%%%%    % %
 % % % %%%%%   %   % %.. % %% % %
 % % % %..%. %%%%    %%% % .% % %
-%1%.%   %%%   %  %%       %% % %
-%3%.%.%     %       %.%.% .%   %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%0%.%   %%%   %  %%       %% % %
+%2%.%.%     %       %.%.% .%   %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-distant.board

@@ -3,8 +3,8 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   %   %. %.%.%       %     %.%.%   %4%
-% % % % %%       %%  %   %%%   %.% % %2%
+%   %   %. %.%.%       %     %.%.%   %3%
+% % % % %%       %%  %   %%%   %.% % %1%
 % % % % %. % %%%    %%%% .%..% % % % % %
 % % % % %% % ..% %   %   %%%%% % % % % %
 % % % %    %%%%% %%%   %%%.% o % % % % %
@@ -15,6 +15,6 @@
 % % % % % o %.%%%   %%% %%%%%    % % % %
 % % % % % %%%%%   %   % %.. % %% % % % %
 % % % % % %..%. %%%%    %%% % .% % % % %
-%1% % %.%   %%%   %  %%       %% % % % %
-%3%   %.%.%     %       %.%.% .%   %   %
+%0% % %.%   %%%   %  %%       %% % % % %
+%2%   %.%.%     %       %.%.% .%   %   %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-fast.board

@@ -3,12 +3,12 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%   %.%%.%   %           %.%.%4%
-% % %      %    %%%% %%%   %.%2%
+%   %.%%.%   %           %.%.%3%
+% % %      %    %%%% %%%   %.%1%
 % % % %  %%% %       .%..%   % %
 % % % %  ..% %.%%%% %%%%%% % % %
 % % % %%%%%% %%%%.% %..  % % % %
 % %   %..%.       % %%%  % % % %
-%1%.%   %%% %%%%    %      % % %
-%3%.%.%           %   %.%%.%   %
+%0%.%   %%% %%%%    %      % % %
+%2%.%.%           %   %.%%.%   %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pacai/resources/boards/capture-jumbo.board

@@ -3,7 +3,7 @@
 }
 ---
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%1%o                %%%%%%                o%2%
+%0%o                %%%%%%                o%1%
 % % %%%%%%%%%%%%%%% %%%%%% %%%%%%%%%%%%%%% % %
 % % %.................%%.................% % %
 % % %.%%%%%%%%%%%%% %%%%%% %%%%%%%%%%%%%.% % %
@@ -21,7 +21,7 @@
 % %.%...%  ...%...% %    % %...%...  %...%.% %
 % %...%.. %.%.%.%.%...%%...%.%.%.%.% ..%...% %
 % %.%...% %.%.%...%.%.%%.%.%...%.%.% %...%.% %
-%3%...%.% %.%.% % %...%%...% % %.%.% %.%...%4%
+%2%...%.% %.%.% % %...%%...% % %.%.% %.%...%3%
 % %.%...% %...    %.%.%%.%.%    ...% %...%.% %
 % %...%.. %%%%% % %...%%...% % %%%%% ..%...% %
 % %.....%    %....%.%.%%.%.%....%    %.....% %

pacai/resources/boards/capture-medium.board

@@ -13,7 +13,7 @@
 %.%%.%.%%%%%%.%.%%.%
 %......      ......%
 % %%%%%%%%%%%%%%%% %
-%       1%%2       %
+%       0%%1       %
 %%%%%% %%%%%% %%%%%%
-%%%%%%  3%%4  %%%%%%
+%%%%%%  2%%3  %%%%%%
 %%%%%%%%%%%%%%%%%%%%