From f3033fffd2a8ab1f0f6d7724c904cd83fc96b8ac Mon Sep 17 00:00:00 2001 From: SpitfireX Date: Wed, 12 Aug 2015 19:07:48 +0200 Subject: merge conflict fixed --- main.py | 4 ++-- strategy.py | 48 ++++++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/main.py b/main.py index d747869..ee053ea 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ c.player.nick="test cell pls ignore" gui.set_client(c) # initialize strategy -strategy = Strategy() +strategy = Strategy(c) # main loop while True: @@ -46,7 +46,7 @@ while True: gui.draw_frame() if len(list(c.player.own_cells)) > 0: - target = strategy.process_frame(c) + target = strategy.process_frame() if gui.bot_input: c.send_target(target[0], target[1]) diff --git a/strategy.py b/strategy.py index 4f93343..e64fe92 100644 --- a/strategy.py +++ b/strategy.py @@ -4,23 +4,27 @@ import gui import random class Strategy: - def __init__(self): + def __init__(self, c): self.target = (0,0) self.has_target = False self.target_cell = None self.color = (0,0,0) - - def process_frame(self,c): + self.c = c + + def weight_cell(self, cell): + pass + + def process_frame(self): runaway = False - my_smallest = min(map(lambda cell : cell.mass, c.player.own_cells)) - my_largest = max(map(lambda cell : cell.mass, c.player.own_cells)) + my_smallest = min(map(lambda cell : cell.mass, self.c.player.own_cells)) + my_largest = max(map(lambda cell : cell.mass, self.c.player.own_cells)) # enemy/virus avoidance forbidden_intervals = [] - for cell in c.world.cells.values(): - relpos = ((cell.pos[0]-c.player.center[0]),(cell.pos[1]-c.player.center[1])) + for cell in self.c.world.cells.values(): + relpos = ((cell.pos[0]-self.c.player.center[0]),(cell.pos[1]-self.c.player.center[1])) dist = math.sqrt(relpos[0]**2+relpos[1]**2) if (not cell.is_virus and dist < 500+2*cell.size and cell.mass > 1.25 * my_smallest) or (cell.is_virus and dist < my_largest and cell.mass < my_largest): @@ -30,13 +34,13 @@ class Strategy: runaway = True # wall avoidance - if c.player.center[0] < c.world.top_left[1]+(c.player.total_size*2): + if self.c.player.center[0] < self.c.world.top_left[1]+(self.c.player.total_size*2): forbidden_intervals += [(0.5*pi, 1.5*pi)] - if c.player.center[0] > c.world.bottom_right[1]-(c.player.total_size*2): + if self.c.player.center[0] > self.c.world.bottom_right[1]-(self.c.player.total_size*2): forbidden_intervals += [(0,0.5*pi), (1.5*pi, 2*pi)] - if c.player.center[1] < c.world.top_left[0]+(c.player.total_size*2): + if self.c.player.center[1] < self.c.world.top_left[0]+(self.c.player.total_size*2): forbidden_intervals += [(pi, 2*pi)] - if c.player.center[1] > c.world.bottom_right[0]-(c.player.total_size*2): + if self.c.player.center[1] > self.c.world.bottom_right[0]-(self.c.player.total_size*2): forbidden_intervals += [(0, pi)] # if there's actually an enemy to avoid: @@ -49,37 +53,37 @@ class Strategy: (a,b) = find_largest_angle_interval(allowed_intervals) runaway_angle = (a+b)/2 - runaway_x, runaway_y = (c.player.center[0]+int(100*math.cos(runaway_angle))), (c.player.center[1]+int(100*math.sin(runaway_angle))) + runaway_x, runaway_y = (self.c.player.center[0]+int(100*math.cos(runaway_angle))), (self.c.player.center[1]+int(100*math.sin(runaway_angle))) self.target = (runaway_x, runaway_y) self.has_target = False self.target_cell = None self.color = (255,0,0) - print ("Running away: " + str((runaway_x-c.player.center[0], runaway_y-c.player.center[1]))) + print ("Running away: " + str((runaway_x-self.c.player.center[0], runaway_y-self.c.player.center[1]))) # a bit of debugging information for i in forbidden_intervals: - gui.draw_arc(c.player.center, c.player.total_size+10, i, (255,0,255)) + gui.draw_arc(self.c.player.center, self.c.player.total_size+10, i, (255,0,255)) # if however there's no enemy to avoid, chase food or jizz randomly around else: - def edible(cell): return (cell.is_food) or (cell.mass <= sorted(c.player.own_cells, key = lambda x: x.mass)[0].mass * 0.75) and not (cell.is_virus) + def edible(cell): return (cell.is_food) or (cell.mass <= sorted(self.c.player.own_cells, key = lambda x: x.mass)[0].mass * 0.75) and not (cell.is_virus) if self.target_cell != None: self.target = tuple(self.target_cell.pos) - if self.target_cell not in c.world.cells.values() or not edible(self.target_cell): + if self.target_cell not in self.c.world.cells.values() or not edible(self.target_cell): self.target_cell = None self.has_target = False print("target_cell does not exist any more") - elif self.target == tuple(c.player.center): + elif self.target == tuple(self.c.player.center): self.has_target = False print("Reached random destination") if not self.has_target: - food = list(filter(edible, c.world.cells.values())) + food = list(filter(edible, self.c.world.cells.values())) - def dist(cell): return math.sqrt((cell.pos[0]-c.player.center[0])**2 + (cell.pos[1]-c.player.center[1])**2) + def dist(cell): return math.sqrt((cell.pos[0]-self.c.player.center[0])**2 + (cell.pos[1]-self.c.player.center[1])**2) food = sorted(food, key = dist) if len(food) > 0: @@ -89,8 +93,8 @@ class Strategy: self.color = (0,0,255) print("Found food at: " + str(food[0].pos)) else: - rx = c.player.center[0] + random.randrange(-400, 401) - ry = c.player.center[1] + random.randrange(-400, 401) + rx = self.c.player.center[0] + random.randrange(-400, 401) + ry = self.c.player.center[1] + random.randrange(-400, 401) self.target = (rx, ry) self.has_target = True self.color = (0,255,0) @@ -98,6 +102,6 @@ class Strategy: # more debugging - gui.draw_line(c.player.center, self.target, self.color) + gui.draw_line(self.c.player.center, self.target, self.color) return self.target -- cgit v1.2.3