X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=sst;h=db52bfe47159bd9113cec34c94e549e1119ddf3a;hb=85ab264355ced9460243fb3345a02a4759474509;hp=307562cabe5da275300369f5331ce987acc3d567;hpb=65bfbb1f2182ac4ba33ae5739f00e231dd2b6ed2;p=super-star-trek.git

diff --git a/sst b/sst
index 307562c..db52bfe 100755
--- a/sst
+++ b/sst
@@ -1282,7 +1282,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
     # Loop to move a single torpedo
     setwnd(message_window)
     for step in range(1, QUADSIZE*2):
-        if not track.nexttok():
+        if not track.nextstep():
             break
         w = track.sector()
         if not w.valid_sector():
@@ -1306,7 +1306,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
             # In the C/FORTRAN version, dispersion was 2.5 radians, which
             # is 143 degrees, which is almost exactly 4.8 clockface units
             displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5)
-            displacement.nexttok()
+            displacement.nextstep()
             bumpto = displacement.sector()
             if not bumpto.valid_sector():
                 return hit
@@ -1348,7 +1348,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
                         return None
                     proutn(crmena(True, iquad, "sector", w))
                     displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5, origin=w)
-                    displacement.nexttok()
+                    displacement.nextstep()
                     bumpto = displacement.sector()
                     if game.quad[bumpto.i][bumpto.j] == ' ':
                         prout(_(" buffeted into black hole."))
@@ -2550,7 +2550,7 @@ def events():
                 supercommander()
         elif evcode == FDSPROB: # Move deep space probe
             schedule(FDSPROB, 0.01)
-            if not game.probe.nexttok():
+            if not game.probe.nextstep():
                 if not game.probe.quadrant().valid_quadrant() or \
                     game.state.galaxy[game.probe.quadrant().i][game.probe.quadrant().j].supernova:
                     # Left galaxy or ran into supernova
@@ -3887,7 +3887,7 @@ def imove(icourse=None, noattack=False):
     # Move out
     game.quad[game.sector.i][game.sector.j] = '.'
     for _m in range(icourse.moves):
-        icourse.nexttok()
+        icourse.nextstep()
         w = icourse.sector()
         if icourse.origin.quadrant() != icourse.location.quadrant():
             newquadrant(noattack)
@@ -4118,7 +4118,7 @@ class course:
         self.step = 0
     def arrived(self):
         return self.location.roundtogrid() == self.final
-    def nexttok(self):
+    def nextstep(self):
         "Next step on course."
         self.step += 1
         self.nextlocation = self.location + self.increment
@@ -4267,7 +4267,7 @@ def warp(wcourse, involuntary):
             look = wcourse.moves
             while look > 0:
                 look -= 1
-                wcourse.nexttok()
+                wcourse.nextstep()
                 w = wcourse.sector()
                 if not w.valid_sector():
                     break
@@ -6015,7 +6015,7 @@ def choose():
             return True
         if scanner.sees("regular"):
             break
-        proutn(_("What is \"%s\"? ") % scanner.token)
+        proutn(_("What game type is \"%s\"? ") % scanner.token)
         scanner.chew()
     while game.length==0 or game.skill==SKILL_NONE:
         if scanner.nexttok() == "IHALPHA":
@@ -6036,7 +6036,7 @@ def choose():
             elif scanner.sees("emeritus"):
                 game.skill = SKILL_EMERITUS
             else:
-                proutn(_("What is \""))
+                proutn(_("What skill level is is \""))
                 proutn(scanner.token)
                 prout("\"?")
         else:
@@ -6059,7 +6059,7 @@ def choose():
     elif scanner.sees("fancy") or scanner.sees("\n"):
         pass
     elif len(scanner.token):
-        proutn(_("What is \"%s\"?") % scanner.token)
+        proutn(_("What game style is \"%s\"?") % scanner.token)
     setpassword()
     if game.passwd == "debug":                # pragma: no cover
         game.idebug = True
@@ -6802,12 +6802,17 @@ if __name__ == '__main__':
                         raise SystemExit(1)
                     # pylint: disable=raise-missing-from
                     try:
-                        line = replayfp.readline().strip()
-                        (leader, __, seed) = line.split()
-                        # pylint: disable=eval-used
-                        seed = eval(seed)
-                        line = replayfp.readline().strip()
-                        arguments += line.split()[2:]
+                        while True:
+                            line = replayfp.readline().strip()
+                            print(line)
+                            if line == "#":
+                                break
+                            if line.startswith("# seed"):
+                                (__, __, seed) = line.split()
+                                # pylint: disable=eval-used
+                                seed = eval(seed)
+                            elif line.startswith("# arguments"):
+                                arguments += line.split()[2:]
                     except ValueError:                # pragma: no cover
                         sys.stderr.write("sst: replay file %s is ill-formed\n"% val)
                         raise SystemExit(1)
@@ -6847,6 +6852,7 @@ if __name__ == '__main__':
             logfp.write("# SST2K version %s\n" % version)
             logfp.write("# recorded by %s@%s on %s\n" % \
                     (getpass.getuser(),socket.getfqdn(),time.ctime()))
+            logfp.write("#\n")
         rnd.seed(seed)
         scanner = sstscanner()
         for arg in arguments: