X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.py;h=09d838d2bdd3001cb5dc02f6cba62a807be8445f;hp=cfdfe383e254b43119b4b57a5a74f9b2b407969d;hb=57f572761a2e2d3e28fe5b4446942be1f97a7963;hpb=e56967f9f71423371cfe28a2ffa246a89042d531

diff --git a/src/sst.py b/src/sst.py
index cfdfe38..09d838d 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -1482,8 +1482,8 @@ def targetcheck(w):
 	return None
     return delta.bearing()
 
-def photon():
-    "Launch photon torpedo."
+def torps():
+    "Launch photon torpedo salvo."
     course = []
     game.ididit = False
     if damaged(DPHOTON):
@@ -3063,6 +3063,12 @@ curwnd = None
 
 def iostart():
     global stdscr, rows
+    "for some recent versions of python2, the following enables UTF8"
+    "for the older ones we probably need to set C locale, and the python3"
+    "has no problems at all"
+    if sys.version_info.major < 3:
+	import locale
+	locale.setlocale(locale.LC_ALL, "")
     gettext.bindtextdomain("sst", "/usr/local/share/locale")
     gettext.textdomain("sst")
     if not (game.options & OPTION_CURSES):
@@ -3148,7 +3154,7 @@ def skip(i):
 	if game.options & OPTION_CURSES:
             (y, x) = curwnd.getyx()
             (my, mx) = curwnd.getmaxyx()
-	    if curwnd == message_window and y >= my - 3:
+	    if curwnd == message_window and y >= my - 2:
 		pause_game()
 		clrscr()
 	    else:
@@ -4779,7 +4785,7 @@ def report():
     scanner.chew()
     s1 = "" and game.thawed and _("thawed ")
     s2 = {1:"short", 2:"medium", 4:"long"}[game.length]
-    s3 = (None, _("novice"). _("fair"),
+    s3 = (None, _("novice"), _("fair"),
           _("good"), _("expert"), _("emeritus"))[game.skill]
     prout(_("You %s a %s%s %s game.") % ((_("were playing"), _("are playing"))[game.alldone], s1, s2, s3))
     if game.skill>SKILL_GOOD and game.thawed and not game.alldone:
@@ -4873,7 +4879,8 @@ def lrscan(silent):
 		    proutn(" ***")
 		elif not silent:
 		    proutn(" %3d" % (game.state.chart[x][y].klingons*100 + game.state.chart[x][y].starbase * 10 + game.state.chart[x][y].stars))
-	prout(" ")
+	if not silent:
+	    prout(" ")
 
 def damagereport():
     "Damage report."
@@ -5741,7 +5748,7 @@ def setpassword():
 		break
     else:
         game.passwd = ""
-        for i in range(8):
+        for i in range(3):
 	    game.passwd += chr(ord('a')+randrange(26))
 
 # Code from sst.c begins here
@@ -5898,8 +5905,8 @@ def makemoves():
 	    phasers()
 	    if game.ididit:
 		hitme = True
-	elif cmd == "TORPEDO":		# photon torpedos
-	    photon()
+	elif cmd in ("TORPEDO", "PHOTONS"):	# photon torpedos
+	    torps()
 	    if game.ididit:
 		hitme = True
 	elif cmd == "MOVE":		# move under warp