From: Eric S. Raymond Date: Fri, 13 Oct 2006 10:32:35 +0000 (+0000) Subject: Compute final member in course object. X-Git-Tag: 2.0~70 X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=76792f9f5beee85ed19fbce8f3487c3a7863bb20 Compute final member in course object. --- diff --git a/src/sst.py b/src/sst.py index 28203dd..6d2d8f5 100644 --- a/src/sst.py +++ b/src/sst.py @@ -3641,12 +3641,8 @@ def imove(course=None, novapush=False): attack(torps_ok=False) if game.alldone: return - # compute final position -- new quadrant and sector - x = (QUADSIZE*game.quadrant.i)+game.sector.i - y = (QUADSIZE*game.quadrant.j)+game.sector.j - w.i = int(round(x+QUADSIZE*course.distance*bigger*deltax)) - w.j = int(round(y+QUADSIZE*course.distance*bigger*deltay)) # check for edge of galaxy + w = course.final kinks = 0 while True: kink = False @@ -3940,7 +3936,7 @@ class course: bigger = max(abs(self.increment.i), abs(self.increment.j)) self.increment /= bigger self.moves = int(round(10*self.distance*bigger)) - self.final = self.location + distance*bigger*self.increment + self.final = (self.location + self.moves*self.increment).roundtogrid() def next(self, grain=1): "Next step on course." self.moves -=1