X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsst.py;h=9eaf77dc990a98fab700f7eb927dc613f1298a3c;hb=fcc0982757ef9c87939a9bff808e93064a28f688;hp=187bc18a016ae69300af240c5bdd92f6dbb29c32;hpb=a84cb603c99e0318fcbf80e75f88f0f3fbcca0aa;p=super-star-trek.git

diff --git a/src/sst.py b/src/sst.py
index 187bc18..9eaf77d 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -2326,7 +2326,7 @@ def events():
 		else:
 		    prout(_("Uhura- Starfleet reports increased Klingon activity"))
 		    if q.planet != None:
-			proutn(_("near %s") % q.planet)
+			proutn(_("near %s ") % q.planet)
 		    prout(_("in Quadrant %s.") % w)
 				
 def wait():
@@ -2904,8 +2904,6 @@ def score():
 	klship = 1
     else:
 	klship = 2
-    if not game.gamewon:
-	game.state.nromrem = 0 # None captured if no win
     iscore = 10*(game.inkling - game.state.remkl) \
              + 50*(game.incom - len(game.state.kcmdr)) \
              + ithperd + iwon \
@@ -2920,7 +2918,7 @@ def score():
     if game.inrom - game.state.nromrem:
 	prout(_("%6d Romulans destroyed                 %5d") %
 	      (game.inrom - game.state.nromrem, 20*(game.inrom - game.state.nromrem)))
-    if game.state.nromrem:
+    if game.state.nromrem and game.gamewon:
 	prout(_("%6d Romulans captured                  %5d") %
 	      (game.state.nromrem, game.state.nromrem))
     if game.inkling - game.state.remkl:
@@ -2943,7 +2941,7 @@ def score():
 	      (game.state.nplankl, -10*game.state.nplankl))
     if (game.options & OPTION_WORLDS) and game.state.nworldkl:
 	prout(_("%6d inhabited planets destroyed by your action   %5d") %
-	      (game.state.nplankl, -300*game.state.nworldkl))
+	      (game.state.nworldkl, -300*game.state.nworldkl))
     if game.state.basekl:
 	prout(_("%6d bases destroyed by your action     %5d") %
 	      (game.state.basekl, -100*game.state.basekl))
@@ -5473,7 +5471,7 @@ def choose():
     # Choose game options -- added by ESR for SST2K
     if scanner.next() != "IHALPHA":
 	scanner.chew()
-	proutn(_("Choose your game style (or just press enter): "))
+	proutn(_("Choose your game style (plain, almy, fancy or just press enter): "))
 	scanner.next()
     if scanner.sees("plain"):
 	# Approximates the UT FORTRAN version.
@@ -6199,8 +6197,12 @@ if __name__ == '__main__':
                 sys.stderr.write("usage: sst [-t] [-x] [startcommand...].\n")
                 raise SystemExit, 1
         # where to save the input in case of bugs
+        if "TMPDIR" in os.environ:
+            tmpdir = os.environ['TMPDIR']
+        else:
+            tmpdir = "/tmp"
         try:
-            logfp = open("/tmp/sst-input.log", "w")
+            logfp = open(os.path.join(tmpdir, "sst-input.log"), "w")
         except IOError:
             sys.stderr.write("sst: warning, can't open logfile\n")
             sys.exit(1)