From 6b73fa6daed2f9f951fb3ca90b4b4ab8421e1b65 Mon Sep 17 00:00:00 2001 From: Grace <64430320+grace-sodunke@users.noreply.github.com> Date: Fri, 29 Mar 2024 17:30:44 +0000 Subject: [PATCH 1/5] Update arctic_scavengers.py --- games/arctic_scavengers/arctic_scavengers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/games/arctic_scavengers/arctic_scavengers.py b/games/arctic_scavengers/arctic_scavengers.py index f7bd2d0..6e604e7 100644 --- a/games/arctic_scavengers/arctic_scavengers.py +++ b/games/arctic_scavengers/arctic_scavengers.py @@ -241,8 +241,9 @@ def update_resource_gather(self, action : Action, available_actions : Available try: action_items = list(ast.literal_eval(str(action.openended_response))) except: - action_items = [[random.choice(player.cards["draw"])]] - types = [a for a in action_items[0][0].actions.keys()] + choice = random.choice(player.cards["draw"]) + action_items = [[choice]] + types = [a for a in choice.actions.keys()] if choice.actions else [] action_items.insert(0, random.choice(types + ["TRASH"])) # No random hiring or stopping From d590307d124ed9b78c45179a799303261bc056c5 Mon Sep 17 00:00:00 2001 From: Grace <64430320+grace-sodunke@users.noreply.github.com> Date: Fri, 29 Mar 2024 17:31:32 +0000 Subject: [PATCH 2/5] Update random_agent.py --- agents/random_agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/random_agent.py b/agents/random_agent.py index a958b45..81baaa4 100644 --- a/agents/random_agent.py +++ b/agents/random_agent.py @@ -7,5 +7,5 @@ class RandomAgent(Agent): agent_type_id : str = "random" def take_action(self, rules : Rules, observation: Observation, available_actions: AvailableActions, show_state : bool): - actions = list(available_actions.predefined.keys()) + actions = list(available_actions.predefined.keys()) + list(available_actions.openended.keys()) return Action(action_id=random.choice(actions)) \ No newline at end of file From 623d1f2605d5d7879cad45c7e92f06e254f13b3d Mon Sep 17 00:00:00 2001 From: Grace <64430320+grace-sodunke@users.noreply.github.com> Date: Thu, 4 Apr 2024 19:33:39 +0100 Subject: [PATCH 3/5] Update arctic_scavengers.py --- games/arctic_scavengers/arctic_scavengers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/games/arctic_scavengers/arctic_scavengers.py b/games/arctic_scavengers/arctic_scavengers.py index 6e604e7..176b4b9 100644 --- a/games/arctic_scavengers/arctic_scavengers.py +++ b/games/arctic_scavengers/arctic_scavengers.py @@ -240,6 +240,8 @@ def update_resource_gather(self, action : Action, available_actions : Available else: try: action_items = list(ast.literal_eval(str(action.openended_response))) + if len(action_items) == 0: + raise ValueError except: choice = random.choice(player.cards["draw"]) action_items = [[choice]] From 9ed40afca16504192797573a7aacdf16e0bff18e Mon Sep 17 00:00:00 2001 From: Grace <64430320+grace-sodunke@users.noreply.github.com> Date: Fri, 5 Apr 2024 00:07:03 +0100 Subject: [PATCH 4/5] Add files via upload --- games/arctic_scavengers/arctic_scavengers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/arctic_scavengers/arctic_scavengers.py b/games/arctic_scavengers/arctic_scavengers.py index 176b4b9..8f3f6a3 100644 --- a/games/arctic_scavengers/arctic_scavengers.py +++ b/games/arctic_scavengers/arctic_scavengers.py @@ -294,7 +294,7 @@ def update_resource_gather(self, action : Action, available_actions : Available break for card in player.cards["draw"]: if card.title == card_name: - if "MEDICINE" in card.actions: + if card.actions != None and "MEDICINE" in card.actions: med_currency += card.actions["MEDICINE"].value if food_cost > player.food or med_cost > med_currency: valid = False From 6366161c8a4617865350f5c29005e61b86cce4f0 Mon Sep 17 00:00:00 2001 From: Grace <64430320+grace-sodunke@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:06:11 +0100 Subject: [PATCH 5/5] Update arctic_scavengers.py --- games/arctic_scavengers/arctic_scavengers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/arctic_scavengers/arctic_scavengers.py b/games/arctic_scavengers/arctic_scavengers.py index 8f3f6a3..027b432 100644 --- a/games/arctic_scavengers/arctic_scavengers.py +++ b/games/arctic_scavengers/arctic_scavengers.py @@ -304,7 +304,7 @@ def update_resource_gather(self, action : Action, available_actions : Available mercenary_names.append(m[0].title) if action_items[2] not in mercenary_names: valid = False - if player.actions[id] > 0: # If action has already been taken + if id not in player.actions or player.actions[id] > 0: # If action has already been taken valid = False if self.show_state: print("Action already taken") if self.show_state: print(valid)