X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.py;h=00f6df3dfa65ec08b449a6fa8c933283ebca08ca;hp=c1785eee38962934c1ae1d4054bd2e0101dae32c;hb=c873e794bf5a029fef3a5ee5385cc0fec6220fa0;hpb=5a05f747cdf27b4ba7d26b60042051c1cc7ec147

diff --git a/src/sst.py b/src/sst.py
index c1785ee..00f6df3 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -870,7 +870,6 @@ def doshield(shraise):
 	if action=="NONE":
 	    proutn(_("Do you wish to change shield energy? "))
 	    if ja() == True:
-		proutn(_("Energy to transfer to shields- "))
 		action = "NRG"
 	    elif damaged(DSHIELD):
 		prout(_("Shields damaged and down."))
@@ -918,21 +917,22 @@ def doshield(shraise):
 	while scanner.next() != "IHREAL":
 	    scanner.chew()
 	    proutn(_("Energy to transfer to shields- "))
+        nrg = scanner.real
 	scanner.chew()
-	if scanner.real == 0:
+	if nrg == 0:
 	    return
-	if scanner.real > game.energy:
+	if nrg > game.energy:
 	    prout(_("Insufficient ship energy."))
 	    return
 	game.ididit = True
-	if game.shield+scanner.real >= game.inshld:
+	if game.shield+nrg >= game.inshld:
 	    prout(_("Shield energy maximized."))
-	    if game.shield+scanner.real > game.inshld:
+	    if game.shield+nrg > game.inshld:
 		prout(_("Excess energy requested returned to ship energy"))
 	    game.energy -= game.inshld-game.shield
 	    game.shield = game.inshld
 	    return
-	if scanner.real < 0.0 and game.energy-scanner.real > game.inenrg:
+	if nrg < 0.0 and game.energy-nrg > game.inenrg:
 	    # Prevent shield drain loophole 
 	    skip(1)
 	    prout(_("Engineering to bridge--"))
@@ -940,18 +940,18 @@ def doshield(shraise):
 	    prout(_("  I can't drain the shields."))
 	    game.ididit = False
 	    return
-	if game.shield+scanner.real < 0:
+	if game.shield+nrg < 0:
 	    prout(_("All shield energy transferred to ship."))
 	    game.energy += game.shield
 	    game.shield = 0.0
 	    return
 	proutn(_("Scotty- \""))
-	if scanner.real > 0:
+	if nrg > 0:
 	    prout(_("Transferring energy to shields.\""))
 	else:
 	    prout(_("Draining energy from shields.\""))
-	game.shield += scanner.real
-	game.energy -= scanner.real
+	game.shield += nrg
+	game.energy -= nrg
 	return
 
 def randdevice():
@@ -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.
@@ -6200,9 +6198,10 @@ if __name__ == '__main__':
                 raise SystemExit, 1
         # where to save the input in case of bugs
         try:
-            logfp = open("/usr/tmp/sst-input.log", "w")
+            logfp = open("/tmp/sst-input.log", "w")
         except IOError:
             sys.stderr.write("sst: warning, can't open logfile\n")
+            sys.exit(1)
         if logfp:
             logfp.write("# seed %s\n" % seed)
             logfp.write("# options %s\n" % " ".join(arguments))