Fix #242

Author: BurnySc2

sc2/action.py

@@ -34,7 +34,6 @@ def combine_actions(action_iter: list[UnitCommand]):
             # Combine actions with no target, e.g. lift, burrowup, burrowdown, siege, unsiege, uproot spines
             cmd = raw_pb.ActionRawUnitCommand(
                 ability_id=ability.value,
-                # pyrefly: ignore
                 unit_tags={u.unit.tag for u in items},
                 queue_command=queue,
             )
@@ -62,7 +61,6 @@ def combine_actions(action_iter: list[UnitCommand]):
                 for u in items:
                     cmd = raw_pb.ActionRawUnitCommand(
                         ability_id=ability.value,
-                        # pyrefly: ignore
                         unit_tags={u.unit.tag},
                         queue_command=queue,
                     )
@@ -71,7 +69,6 @@ def combine_actions(action_iter: list[UnitCommand]):
                 for u in items:
                     cmd = raw_pb.ActionRawUnitCommand(
                         ability_id=ability.value,
-                        # pyrefly: ignore
                         unit_tags={u.unit.tag},
                         queue_command=queue,
                         target_world_space_pos=target.as_Point2D,
@@ -81,7 +78,6 @@ def combine_actions(action_iter: list[UnitCommand]):
                 for u in items:
                     cmd = raw_pb.ActionRawUnitCommand(
                         ability_id=ability.value,
-                        # pyrefly: ignore
                         unit_tags={u.unit.tag},
                         queue_command=queue,
                         target_unit_tag=target.tag,

sc2/client.py

@@ -382,7 +382,6 @@ async def toggle_autocast(self, units: list[Unit] | Units, ability: AbilityId) -
                         action_raw=raw_pb.ActionRaw(
                             toggle_autocast=raw_pb.ActionRawToggleAutocast(
                                 ability_id=ability.value,
-                                # pyrefly: ignore
                                 unit_tags=(u.tag for u in units),
                             )
                         )

sc2/game_state.py

@@ -280,33 +280,33 @@ def actions(self) -> list[ActionRawUnitCommand | ActionRawToggleAutocast | Actio
                     # Actions that have a point as target
                     actions.append(
                         ActionRawUnitCommand(
-                            game_loop,
-                            raw_unit_command.ability_id,
-                            list(raw_unit_command.unit_tags),
-                            raw_unit_command.queue_command,
-                            Point2.from_proto(raw_unit_command.target_world_space_pos),
+                            ability_id=raw_unit_command.ability_id,
+                            game_loop=game_loop,
+                            unit_tags=list(raw_unit_command.unit_tags),
+                            queue_command=raw_unit_command.queue_command,
+                            target_world_space_pos=Point2.from_proto(raw_unit_command.target_world_space_pos),
                         )
                     )
                 else:
                     # Actions that have a unit as target
                     actions.append(
                         ActionRawUnitCommand(
-                            game_loop,
-                            raw_unit_command.ability_id,
-                            list(raw_unit_command.unit_tags),
-                            raw_unit_command.queue_command,
-                            None,
-                            raw_unit_command.target_unit_tag,
+                            ability_id=raw_unit_command.ability_id,
+                            game_loop=game_loop,
+                            unit_tags=list(raw_unit_command.unit_tags),
+                            queue_command=raw_unit_command.queue_command,
+                            target_world_space_pos=None,
+                            target_unit_tag=raw_unit_command.target_unit_tag,
                         )
                     )
             elif action_raw.HasField("toggle_autocast"):
                 # Toggle autocast actions
                 raw_toggle_autocast_action = action_raw.toggle_autocast
                 actions.append(
                     ActionRawToggleAutocast(
-                        game_loop,
-                        raw_toggle_autocast_action.ability_id,
-                        list(raw_toggle_autocast_action.unit_tags),
+                        ability_id=raw_toggle_autocast_action.ability_id,
+                        game_loop=game_loop,
+                        unit_tags=list(raw_toggle_autocast_action.unit_tags),
                     )
                 )
             else:
@@ -340,6 +340,6 @@ def action_errors(self) -> list[ActionError]:
         """
         previous_frame_errors = self.previous_observation.action_errors if self.previous_observation else []
         return [
-            ActionError(error.ability_id, error.unit_tag, error.result)
+            ActionError(ability_id=error.ability_id, unit_tag=error.unit_tag, result=error.result)
             for error in chain(self.response_observation.action_errors, previous_frame_errors)
         ]