old_contents: import stp.play as play
  import stp.tactic as tactic
  
  from rj_gameplay.tactic import capture_tactic, nmark_tactic, goalie_tactic, wall_tactic
  import stp.skill as skill
  import stp.role as role
  from stp.role.assignment.naive import NaiveRoleAssignment
  import stp.rc as rc
  from typing import Dict, Generic, Iterator, List, Optional, Tuple, Type, TypeVar
  
  class DefendRestart(play.IPlay):
  
      def __init__(self):
          # TODO: add chipper tactic here
          self.goalie = goalie_tactic.GoalieTactic()
          self.markers = nmark_tactic.NMarkTactic(3, True)
          self.wall = wall_tactic.WallTactic(2)
          self.role_assigner = NaiveRoleAssignment()
  
      def compute_props(self, prev_props):
          pass
  
      def tick(
          self,
          world_state: rc.WorldState,
          prev_results: role.assignment.FlatRoleResults,
          props,
      ) -> Tuple[Dict[Type[tactic.SkillEntry], List[role.RoleRequest]], List[tactic.SkillEntry]]:
  
          # Get role requests from all tactics and put them into a dictionary
          role_requests: play.RoleRequests = {}
          role_requests[self.markers] = (self.markers.get_requests(world_state, None))
          role_requests[self.goalie] = self.goalie.get_requests(world_state, None)
          role_requests[self.wall] = self.wall.get_requests(world_state, None)
  
          # Flatten requests and use role assigner on them
          flat_requests = play.flatten_requests(role_requests)
          flat_results = self.role_assigner.assign_roles(flat_requests, world_state, prev_results)
          role_results = play.unflatten_results(flat_results)
  
          # Get list of all skills with assigned roles from tactics
  
          skills = self.markers.tick(role_results[self.markers])
          skills += self.goalie.tick(role_results[self.goalie])
          skills += self.wall.tick(role_results[self.wall])
          skill_dict = {}
          skill_dict.update(role_results[self.markers])
          skill_dict.update(role_results[self.goalie])
          skill_dict.update(role_results[self.wall])
  
          return (skill_dict, skills)
  
      def is_done(self, world_state):
          return self.markers.is_done(world_state)
  
new_contents: import stp.play as play
  import stp.tactic as tactic
  
  from rj_gameplay.tactic import nmark_tactic, goalie_tactic, wall_tactic
  import stp.skill as skill
  import stp.role as role
  from stp.role.assignment.naive import NaiveRoleAssignment
  import stp.rc as rc
  from typing import Dict, Generic, Iterator, List, Optional, Tuple, Type, TypeVar
  
  class DefendRestart(play.IPlay):
  
      def __init__(self):
          # TODO: add chipper tactic here
          self.goalie = goalie_tactic.GoalieTactic()
          self.markers = nmark_tactic.NMarkTactic(3, True)
          self.wall = wall_tactic.WallTactic(2)
          self.role_assigner = NaiveRoleAssignment()
  
      def compute_props(self, prev_props):
          pass
  
      def tick(
          self,
          world_state: rc.WorldState,
          prev_results: role.assignment.FlatRoleResults,
          props,
      ) -> Tuple[Dict[Type[tactic.SkillEntry], List[role.RoleRequest]], List[tactic.SkillEntry]]:
  
          # Get role requests from all tactics and put them into a dictionary
          role_requests: play.RoleRequests = {}
          role_requests[self.markers] = (self.markers.get_requests(world_state, None))
          role_requests[self.goalie] = self.goalie.get_requests(world_state, None)
          role_requests[self.wall] = self.wall.get_requests(world_state, None)
  
          # Flatten requests and use role assigner on them
          flat_requests = play.flatten_requests(role_requests)
          flat_results = self.role_assigner.assign_roles(flat_requests, world_state, prev_results)
          role_results = play.unflatten_results(flat_results)
  
          # Get list of all skills with assigned roles from tactics
  
          skills = self.markers.tick(role_results[self.markers])
          skills += self.goalie.tick(role_results[self.goalie])
          skills += self.wall.tick(role_results[self.wall])
          skill_dict = {}
          skill_dict.update(role_results[self.markers])
          skill_dict.update(role_results[self.goalie])
          skill_dict.update(role_results[self.wall])
  
          return (skill_dict, skills)
  
      def is_done(self, world_state):
          return self.markers.is_done(world_state)
  
subject: fix imports in defend_restart