X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=22a02919b78fe66be09d52e508f2cc9e0c1ead37;hp=bacb5f7e3ff2fa38ba505f0ceff1792822574e4f;hb=6e6032d311be62b5afa823aebf8c035c50dedbae;hpb=8c22a3f7ad732500cac40fd383b31e08bc1251a7

diff --git a/sst.py b/sst.py
index bacb5f7..22a0291 100755
--- a/sst.py
+++ b/sst.py
@@ -273,6 +273,8 @@ class Enemy:
     def __init__(self, etype=None, loc=None, power=None):
         self.type = etype
         self.location = Coord()
+        self.kdist = None
+        self.kavgd = None
         if loc:
             self.move(loc)
         self.power = power	# enemy energy level
@@ -379,6 +381,7 @@ class Gamestate:
         self.score = 0.0	# overall score
         self.perdate = 0.0	# rate of kills
         self.idebug = False	# Debugging instrumentation enabled?
+        self.statekscmdr = None # No SuperCommander coordinates yet.
     def recompute(self):
         # Stas thinks this should be (C expression): 
         # game.state.remkl + len(game.state.kcmdr) > 0 ?
@@ -1271,6 +1274,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
 	    return None
 	break
     skip(1)
+    setwnd(message_window)
     prout(_("Torpedo missed."))
     return None
 
@@ -2051,8 +2055,8 @@ def events():
             else:
                 prout(_("(Shields not currently useable.)"))
         newqad()
-        # Adjust finish time to time of tractor beaming 
-        fintim = game.state.date+game.optime
+        # Adjust finish time to time of tractor beaming? 
+        # fintim = game.state.date+game.optime
         attack(torps_ok=False)
         if not game.state.kcmdr:
             unschedule(FTBEAM)
@@ -3859,7 +3863,7 @@ def impulse():
 	scanner.chew()
 	return
     # Make sure enough time is left for the trip 
-    game.optime = course.dist/0.095
+    game.optime = course.distance/0.095
     if game.optime >= game.state.remtime:
 	prout(_("First Officer Spock- \"Captain, our speed under impulse"))
 	prout(_("power is only 0.95 sectors per stardate. Are you sure"))
@@ -3871,9 +3875,9 @@ def impulse():
     game.ididit = True
     if game.alldone:
 	return
-    power = 20.0 + 100.0*course.dist
+    power = 20.0 + 100.0*course.distance
     game.energy -= power
-    game.optime = course.dist/0.095
+    game.optime = course.distance/0.095
     if game.energy <= 0:
 	finish(FNRG)
     return
@@ -3909,7 +3913,7 @@ def warp(wcourse, involuntary):
 	    skip(1)
 	    prout(_("Engineering to bridge--"))
 	    if not game.shldup or 0.5*wcourse.power(game.warpfac) > game.energy:
-		iwarp = (game.energy/(wcourse.dist+0.05)) ** 0.333333333
+		iwarp = (game.energy/(wcourse.distance+0.05)) ** 0.333333333
 		if iwarp <= 0:
 		    prout(_("We can't do it, Captain. We don't have enough energy."))
 		else:
@@ -6396,6 +6400,7 @@ if __name__ == '__main__':
         if logfp:
             logfp.write("# seed %s\n" % seed)
             logfp.write("# options %s\n" % " ".join(arguments))
+            logfp.write("# SST2K version %s\n" % version)
             logfp.write("# recorded by %s@%s on %s\n" % \
                     (getpass.getuser(),socket.gethostname(),time.ctime()))
         random.seed(seed)