Get rid of some dead code.
[super-star-trek.git] / src / sst.py
index 3f78e233d47ea7047d40c5cd11cb9943ae6cf4ac..9093a8085282e65960fa9f7021d1be0ef16e5f6e 100644 (file)
@@ -262,7 +262,6 @@ class planet:
     def __str__(self):
         return self.name
 
-NOPLANET = None
 class quadrant:
     def __init__(self):
         self.stars = None
@@ -454,7 +453,7 @@ class gamestate:
         self.casual = 0                # causalties
         self.nhelp = 0         # calls for help
         self.nkinks = 0                # count of energy-barrier crossings
-        self.iplnet = 0                # planet # in quadrant
+        self.iplnet = None     # planet # in quadrant
         self.inplan = 0                # initial planets
         self.nenhere = 0       # number of enemies in quadrant
         self.irhere = 0                # Romulans in quadrant
@@ -888,7 +887,7 @@ def movescom(iq, avoid):
            game.state.planets[i].crystals == "present":
            # destroy the planet 
            game.state.planets[i].pclass = "destroyed"
-           game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET
+           game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = None
            if communicating():
                announce()
                prout(_("Lt. Uhura-  \"Captain, Starfleet Intelligence reports"))
@@ -1420,9 +1419,9 @@ def torpedo(course, r, incoming, i, n):
            crmena(True, iquad, sector, w)
            prout(_(" destroyed."))
            game.state.nplankl += 1
-           game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET
-           game.state.planets[game.iplnet].pclass = destroyed
-           game.iplnet = 0
+           game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = None
+           game.iplnet.pclass = "destroyed"
+           game.iplnet = None
            invalidate(game.plnet)
            game.quad[w.x][w.y] = IHDOT
            if game.landed:
@@ -1433,9 +1432,9 @@ def torpedo(course, r, incoming, i, n):
            crmena(True, iquad, sector, w)
            prout(_(" destroyed."))
            game.state.nworldkl += 1
-           game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET
-           game.state.planets[game.iplnet].pclass = destroyed
-           game.iplnet = 0
+           game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = None
+           game.iplnet.pclass = "destroyed"
+           game.iplnet = None
            invalidate(game.plnet)
            game.quad[w.x][w.y] = IHDOT
            if game.landed:
@@ -1528,7 +1527,6 @@ def fry(hit):
     # a critical hit occured 
     if hit < (275.0-25.0*game.skill)*(1.0+0.5*random.random()):
        return
-
     ncrit = 1.0 + hit/(500.0+100.0*random.random())
     proutn(_("***CRITICAL HIT--"))
     # Select devices and cause damage
@@ -1565,42 +1563,32 @@ def attack(torps_ok):
     hitmax=0.0; hittot=0.0; chgfac=1.0
     jay = coord()
     where = "neither"
-
     # game could be over at this point, check 
     if game.alldone:
        return
-
     if idebug:
        prout("=== ATTACK!")
-
-    # Tholian gewts to move before attacking 
+    # Tholian gets to move before attacking 
     if game.ithere:
        movetholian()
-
     # if you have just entered the RNZ, you'll get a warning 
     if game.neutz: # The one chance not to be attacked 
        game.neutz = False
        return
-
     # commanders get a chance to tac-move towards you 
     if (((game.comhere or game.ishere) and not game.justin) or game.skill == SKILL_EMERITUS) and torps_ok:
        moveklings()
-
     # if no enemies remain after movement, we're done 
     if game.nenhere==0 or (game.nenhere==1 and thing == game.quadrant and not iqengry):
        return
-
     # set up partial hits if attack happens during shield status change 
     pfac = 1.0/game.inshld
     if game.shldchg:
        chgfac = 0.25+0.5*random.random()
-
     skip(1)
-
     # message verbosity control 
     if game.skill <= SKILL_FAIR:
        where = "sector"
-
     for loop in range(game.nenhere):
        if game.kpower[loop] < 0:
            continue;   # too weak to attack 
@@ -1724,7 +1712,6 @@ def attack(torps_ok):
 def deadkl(w, type, mv):
     # kill a Klingon, Tholian, Romulan, or Thingy 
     # Added mv to allow enemy to "move" before dying 
-
     crmena(True, type, sector, mv)
     # Decide what kind of enemy it is and update appropriately 
     if type == IHR:
@@ -1767,7 +1754,6 @@ def deadkl(w, type, mv):
            unschedule(FSCDBAS)
        else:
            prout("*** Internal error, deadkl() called on %s\n" % type)
-
     # For each kind of enemy, finish message to player 
     prout(_(" destroyed."))
     game.quad[w.x][w.y] = IHDOT
@@ -1924,7 +1910,6 @@ def overheat(rpow):
 
 def checkshctrl(rpow):
     # check shield control 
-       
     skip(1)
     if random.random() < 0.998:
        prout(_("Shields lowered."))
@@ -2015,7 +2000,6 @@ def phasers():
     ifast = False; no = False; itarg = True; msgflag = True
     automode = "NOTSET"
     key=0
-
     skip(1)
     # SR sensors and Computer are needed fopr automode 
     if damaged(DSRSENS) or damaged(DCOMPTR):
@@ -2039,8 +2023,8 @@ def phasers():
            return
        prout(_("Weapons Officer Sulu-  \"High-speed shield control enabled, sir.\""))
        ifast = True
-               
-    # Original code so convoluted, I re-did it all 
+    # Original code so convoluted, I re-did it all
+    # (That was Tom Almy talking about the C code, I think -- ESR)
     while automode=="NOTSET":
        key=scan()
        if key == IHALPHA:
@@ -2263,8 +2247,6 @@ def phasers():
 # only have one FDISTR/FENSLV/FREPRO sequence going at any given time
 # BSD Trek, from which we swiped the idea, can have up to 5.
 
-import math
-
 def unschedule(evtype):
     # remove an event from the schedule 
     game.future[evtype].date = FOREVER
@@ -2296,7 +2278,6 @@ def cancelrest():
            game.resting = False
            game.optime = 0.0
            return True
-
     return False
 
 def events():
@@ -2627,8 +2608,8 @@ def events():
                # supernova'ed, and which has some Klingons in it
                w = randplace(GALSIZE)
                q = game.state.galaxy[w.x][w.y]
-                if not (game.quadrant == w or q.planet == NOPLANET or \
-                     not game.state.planets[q.planet].inhabited or \
+                if not (game.quadrant == w or q.planet == None or \
+                     not q.planet.inhabited or \
                      q.supernova or q.status!=secure or q.klingons<=0):
                     break
             else:
@@ -2711,7 +2692,7 @@ def events():
                    prout(_("launched a warship from %s.") % q.planet)
                else:
                    prout(_("Uhura- Starfleet reports increased Klingon activity"))
-                   if q.planet != NOPLANET:
+                   if q.planet != None:
                        proutn(_("near %s") % q.planet)
                    prout(_("in Quadrant %s.") % w)
                                
@@ -2734,9 +2715,7 @@ def wait():
        proutn(_("Are you sure? "))
        if ja() == False:
            return
-
     # Alternate resting periods (events) with attacks 
-
     game.resting = True
     while True:
        if delay <= 0:
@@ -2779,12 +2758,10 @@ def nova(nov):
     # star goes nova 
     course = (0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5)
     newc = coord(); scratch = coord()
-
     if random.random() < 0.05:
        # Wow! We've supernova'ed 
        supernova(False, nov)
        return
-
     # handle initial nova 
     game.quad[nov.x][nov.y] = IHDOT
     crmena(False, IHSTAR, sector, nov)
@@ -2826,12 +2803,12 @@ def nova(nov):
                        prout(_(" novas."))
                        game.quad[scratch.x][scratch.y] = IHDOT
                    elif iquad == IHP: # Destroy planet 
-                       game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET
+                       game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = None
                        game.state.nplankl += 1
                        crmena(True, IHP, sector, scratch)
                        prout(_(" destroyed."))
-                       game.state.planets[game.iplnet].pclass = destroyed
-                       game.iplnet = 0
+                       game.iplnet.pclass = "destroyed"
+                       game.iplnet = None
                        invalidate(game.plnet)
                        if game.landed:
                            finish(FPNOVA)
@@ -2933,7 +2910,6 @@ def supernova(induced, w=None):
     # star goes supernova 
     num = 0; npdead = 0
     nq = coord()
-
     if w != None: 
        nq = w
     else:
@@ -2958,7 +2934,6 @@ def supernova(induced, w=None):
            proutn("=== Super nova here?")
            if ja() == True:
                nq = game.quadrant
-
     if not nq == game.quadrant or game.justin:
        # it isn't here, or we just entered (treat as enroute) 
        if communicating():
@@ -2977,7 +2952,6 @@ def supernova(induced, w=None):
                        break
            if num==0:
                break
-
        skip(1)
        prouts(_("***RED ALERT!  RED ALERT!"))
        skip(1)
@@ -3017,7 +2991,7 @@ def supernova(induced, w=None):
     # Destroy planets 
     for loop in range(game.inplan):
        if game.state.planets[loop].w == nq:
-           game.state.planets[loop].pclass = destroyed
+           game.state.planets[loop].pclass = "destroyed"
            npdead += 1
     # Destroy any base in supernovaed quadrant 
     if game.state.rembase:
@@ -3129,7 +3103,6 @@ def badpoints():
         badpt += 200.0
     return badpt
 
-
 def finish(ifin):
     # end the game, with appropriate notfications 
     igotit = False
@@ -3340,7 +3313,6 @@ def finish(ifin):
 def score():
     # compute player's score 
     timused = game.state.date - game.indate
-
     iskill = game.skill
     if (timused == 0 or (game.state.remkl + game.state.remcom + game.state.nscrem) != 0) and timused < 5.0:
        timused = 5.0
@@ -3439,7 +3411,6 @@ def plaque():
     winner = cgetline()
     # The 38 below must be 64 for 132-column paper 
     nskip = 38 - len(winner)/2
-
     fp.write("\n\n\n\n")
     # --------DRAW ENTERPRISE PICTURE. 
     fp.write("                                       EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n" )
@@ -3552,7 +3523,6 @@ def iostart():
        setwnd(fullscreen_window)
        textcolor(DEFAULT)
 
-
 def waitfor():
     "wait for user action -- OK to do nothing if on a TTY"
     if game.options & OPTION_CURSES:
@@ -3712,9 +3682,6 @@ def highvideo():
     if game.options & OPTION_CURSES:
        curwnd.attron(curses.A_REVERSE)
  
-def commandhook(cmd, before):
-    pass
-
 #
 # Things past this point have policy implications.
 # 
@@ -3734,7 +3701,7 @@ def drawmaps(mode):
            setwnd(report_window)
            report_window.clear()
            report_window.move(0, 0)
-           status(0)
+           status()
            setwnd(lrscan_window)
            lrscan_window.clear()
            lrscan_window.move(0, 0)
@@ -3825,8 +3792,8 @@ def prstat(txt, data):
        skip(1)
        setwnd(status_window)
     else:
-        proutn(" " * NSYM - len(tx))
-    vproutn(data)
+        proutn(" " * (NSYM - len(txt)))
+    proutn(data)
     skip(1)
     if game.options & OPTION_CURSES:
        setwnd(report_window)
@@ -4042,8 +4009,7 @@ def dock(verbose):
        prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""))
        attackreport(False)
        game.iseenit = True
-
-# 
 # This program originally required input in terms of a (clock)
 # direction and distance. Somewhere in history, it was changed to
 # cartesian coordinates. So we need to convert.  Probably
@@ -4051,7 +4017,6 @@ def dock(verbose):
 # pain if the computer isn't working! Manual mode is still confusing
 # because it involves giving x and y motions, yet the coordinates
 # are always displayed y - x, where +y is downward!
-# 
 
 def getcd(isprobe, akey):
     # get course and distance 
@@ -4212,7 +4177,6 @@ def impulse():
        power = 20.0 + 100.0*game.dist
     else:
        power = 30.0
-
     if power >= game.energy:
        # Insufficient power for trip 
        skip(1)
@@ -4262,12 +4226,10 @@ def warp(timewarp):
            prout(_("Engineer Scott- \"Sorry, Captain. Until this damage"))
            prout(_("  is repaired, I can only give you warp 4.\""))
            return
-                       
-       # Read in course and distance 
+               # Read in course and distance 
        getcd(False, 0)
        if game.direc == -1.0:
            return
-
        # Make sure starship has enough energy for the trip 
        power = (game.dist+0.05)*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)
        if power >= game.energy:
@@ -4344,8 +4306,6 @@ def warp(timewarp):
                if game.quad[ix][iy] != IHDOT:
                    blooey = False
                    twarp = False
-                               
-
     # Activate Warp Engines and pay the cost 
     imove(False)
     if game.alldone:
@@ -4408,7 +4368,6 @@ def setwarp():
 
 def atover(igrab):
     # cope with being tossed out of quadrant by supernova or yanked by beam 
-
     chew()
     # is captain on planet? 
     if game.landed:
@@ -4435,13 +4394,11 @@ def atover(igrab):
                game.icrystl = True
     if igrab:
        return
-
     # Check to see if captain in shuttle craft 
     if game.icraft:
        finish(FSTRACTOR)
     if game.alldone:
        return
-
     # Inform captain of attempt to reach safety 
     skip(1)
     while True:
@@ -4570,7 +4527,6 @@ def probe():
            prout(_("Uhura- \"The previous probe is still reporting data, Sir.\""))
        return
     key = scan()
-
     if key == IHEOL:
        # slow mode, so let Kirk know how many probes there are left
         if game.nprobes == 1:
@@ -4580,7 +4536,6 @@ def probe():
        proutn(_("Are you sure you want to fire a probe? "))
        if ja() == False:
            return
-
     game.isarmed = False
     if key == IHALPHA and citem == "armed":
        game.isarmed = True
@@ -4599,7 +4554,6 @@ def probe():
        bigger = math.fabs(game.probeinx)
     else:
        bigger = math.fabs(game.probeiny)
-               
     game.probeiny /= bigger
     game.probeinx /= bigger
     game.proben = 10.0*game.dist*bigger +0.5
@@ -4632,7 +4586,6 @@ def mayday():
     # yell for help from nearest starbase 
     # There's more than one way to move in this game! 
     line = 0
-
     chew()
     # Test for conditions which prevent calling for help 
     if game.condition == "docked":
@@ -4771,7 +4724,7 @@ def abandon():
        if not (game.options & OPTION_WORLDS) and not damaged(DTRANSP):
            prout(_("Remainder of ship's complement beam down"))
            prout(_("to nearest habitable planet."))
-       elif q.planet != NOPLANET and not damaged(DTRANSP):
+       elif q.planet != None and not damaged(DTRANSP):
            prout(_("Remainder of ship's complement beam down to %s.") %
                    q.planet)
        else:
@@ -4848,7 +4801,7 @@ def survey():
     prout(_("Spock-  \"Planet report follows, Captain.\""))
     skip(1)
     for i in range(game.inplan):
-       if game.state.planets[i].pclass == destroyed:
+       if game.state.planets[i].pclass == "destroyed":
            continue
        if (game.state.planets[i].known != "unknown" \
             and not game.state.planets[i].inhabited) \
@@ -4899,23 +4852,25 @@ def sensor():
        if game.options & OPTION_TTY:
            prout(_("Short range sensors damaged."))
        return
-    if not is_valid(game.plnet):
+    if game.iplnet == None:
        if game.options & OPTION_TTY:
            prout(_("Spock- \"No planet in this quadrant, Captain.\""))
        return
-    if game.state.planets[game.iplnet].known == "unknown":
+    if game.iplnet.known == "unknown":
        prout(_("Spock-  \"Sensor scan for Quadrant %s-") % game.quadrant)
        skip(1)
        prout(_("         Planet at Sector %s is of class %s.") %
-             (sector,game.plnet, game.state.planets[game.iplnet]))
-       if game.state.planets[game.iplnet].known=="shuttle_down": 
+             (game.plnet, game.iplnet.pclass))
+       if game.iplnet.known=="shuttle_down": 
            prout(_("         Sensors show Galileo still on surface."))
        proutn(_("         Readings indicate"))
-       if game.state.planets[game.iplnet].crystals != present:
+       if game.iplnet.crystals != present:
            proutn(_(" no"))
        prout(_(" dilithium crystals present.\""))
-       if game.state.planets[game.iplnet].known == "unknown":
-           game.state.planets[game.iplnet].known = "known"
+       if game.iplnet.known == "unknown":
+           game.iplnet.known = "known"
+    elif game.iplnet.inhabited:
+        prout(_("Spock-  \"The inhabited planet %s is located at Sector %s, Captain.\"") % (game.iplnet.name, game.plnet))
 
 def beam():
     # use the transporter 
@@ -4924,7 +4879,7 @@ def beam():
     skip(1)
     if damaged(DTRANSP):
        prout(_("Transporter damaged."))
-       if not damaged(DSHUTTL) and (game.state.planets[game.iplnet].known=="shuttle_down" or game.iscraft == "onship"):
+       if not damaged(DSHUTTL) and (game.iplnet.known=="shuttle_down" or game.iscraft == "onship"):
            skip(1)
            proutn(_("Spock-  \"May I suggest the shuttle craft, Sir?\" "))
            if ja() == True:
@@ -4937,12 +4892,12 @@ def beam():
     if game.shldup:
        prout(_("Impossible to transport through shields."))
        return
-    if game.state.planets[game.iplnet].known=="unknown":
+    if game.iplnet.known=="unknown":
        prout(_("Spock-  \"Captain, we have no information on this planet"))
        prout(_("  and Starfleet Regulations clearly state that in this situation"))
        prout(_("  you may not go down.\""))
        return
-    if not game.landed and game.state.planets[game.iplnet].crystals==absent:
+    if not game.landed and game.iplnet.crystals=="absent":
        prout(_("Spock-  \"Captain, I fail to see the logic in"))
        prout(_("  exploring a planet with no dilithium crystals."))
        proutn(_("  Are you sure this is wise?\" "))
@@ -4959,7 +4914,7 @@ def beam():
            prout(_("Engineering to bridge--"))
            prout(_("  Captain, we have enough energy only to transport you down to"))
            prout(_("  the planet, but there wouldn't be an energy for the trip back."))
-           if game.state.planets[game.iplnet].known == "shuttle_down":
+           if game.iplnet.known == "shuttle_down":
                prout(_("  Although the Galileo shuttle craft may still be on a surface."))
            proutn(_("  Are you sure this is wise?\" "))
            if ja() == False:
@@ -4967,7 +4922,7 @@ def beam():
                return
     if game.landed:
        # Coming from planet 
-       if game.state.planets[game.iplnet].known=="shuttle_down":
+       if game.iplnet.known=="shuttle_down":
            proutn(_("Spock-  \"Wouldn't you rather take the Galileo?\" "))
            if ja() == True:
                chew()
@@ -5001,7 +4956,7 @@ def beam():
     game.energy -= nrgneed
     skip(2)
     prout(_("Transport complete."))
-    if game.landed and game.state.planets[game.iplnet].known=="shuttle_down":
+    if game.landed and game.iplnet.known=="shuttle_down":
        prout(_("The shuttle craft Galileo is here!"))
     if not game.landed and game.imine:
        game.icrystl = True
@@ -5016,10 +4971,10 @@ def mine():
     if not game.landed:
        prout(_("Mining party not on planet."))
        return
-    if game.state.planets[game.iplnet].crystals == mined:
+    if game.iplnet.crystals == "mined":
        prout(_("This planet has already been strip-mined for dilithium."))
        return
-    elif game.state.planets[game.iplnet].crystals == absent:
+    elif game.iplnet.crystals == "absent":
        prout(_("No dilithium crystals on this planet."))
        return
     if game.imine:
@@ -5031,11 +4986,11 @@ def mine():
        skip(1)
        prout(_("there's no reason to mine more at this time."))
        return
-    game.optime = (0.1+0.2*random.random())*game.state.planets[game.iplnet].pclass
+    game.optime = (0.1+0.2*random.random())*game.iplnet.pclass
     if consumeTime():
        return
     prout(_("Mining operation complete."))
-    game.state.planets[game.iplnet].crystals = mined
+    game.iplnet.crystals = "mined"
     game.imine = game.ididit = True
 
 def usecrystals():
@@ -5090,7 +5045,7 @@ def shuttle():
     skip(1)
     if damaged(DSHUTTL):
        if game.damage[DSHUTTL] == -1.0:
-           if game.inorbit and game.state.planets[game.iplnet].known == "shuttle_down":
+           if game.inorbit and game.iplnet.known == "shuttle_down":
                prout(_("Ye Faerie Queene has no shuttle craft bay to dock it at."))
            else:
                prout(_("Ye Faerie Queene had no shuttle craft."))
@@ -5103,16 +5058,16 @@ def shuttle():
        crmshp()
        prout(_(" not in standard orbit."))
        return
-    if (game.state.planets[game.iplnet].known != "shuttle_down") and game.iscraft != "onship":
+    if (game.iplnet.known != "shuttle_down") and game.iscraft != "onship":
        prout(_("Shuttle craft not currently available."))
        return
-    if not game.landed and game.state.planets[game.iplnet].known=="shuttle_down":
+    if not game.landed and game.iplnet.known=="shuttle_down":
        prout(_("You will have to beam down to retrieve the shuttle craft."))
        return
     if game.shldup or game.condition == "docked":
        prout(_("Shuttle craft cannot pass through shields."))
        return
-    if game.state.planets[game.iplnet].known=="unknown":
+    if game.iplnet.known=="unknown":
        prout(_("Spock-  \"Captain, we have no information on this planet"))
        prout(_("  and Starfleet Regulations clearly state that in this situation"))
        prout(_("  you may not fly down.\""))
@@ -5144,7 +5099,7 @@ def shuttle():
            skip(1)
            if consumeTime():
                return
-           game.state.planets[game.iplnet].known="shuttle_down"
+           game.iplnet.known="shuttle_down"
            prout(_("Trip complete."))
            return
        else:
@@ -5154,7 +5109,7 @@ def shuttle():
            skip(1)
            prouts(_("The short hop begins . . ."))
            skip(1)
-           game.state.planets[game.iplnet].known="known"
+           game.iplnet.known="known"
            game.icraft = True
            skip(1)
            game.landed = False
@@ -5180,7 +5135,7 @@ def shuttle():
        game.iscraft = "offship"
        if consumeTime():
            return
-       game.state.planets[game.iplnet].known = "shuttle_down"
+       game.iplnet.known = "shuttle_down"
        game.landed = True
        game.icraft = False
        prout(_("Trip complete."))
@@ -5455,14 +5410,14 @@ def chart():
            else:
                proutn(" ")
            if game.state.galaxy[i][j].supernova:
-               strcpy(buf, "***")
+               show = "***"
            elif not game.state.galaxy[i][j].charted and game.state.galaxy[i][j].starbase:
-               strcpy(buf, ".1.")
+               show = ".1."
            elif game.state.galaxy[i][j].charted:
-               sprintf(buf, "%3d" % (game.state.chart[i][j].klingons*100 + game.state.chart[i][j].starbase * 10 + game.state.chart[i][j].stars))
+               show = "%3d" % (game.state.chart[i][j].klingons*100 + game.state.chart[i][j].starbase * 10 + game.state.chart[i][j].stars)
            else:
-               strcpy(buf, "...")
-           proutn(buf)
+               show = "..."
+           proutn(show)
            if (game.options & OPTION_SHOWME) and i == game.quadrant.x and j == game.quadrant.y:
                proutn(">")
            else:
@@ -5487,13 +5442,13 @@ def sectscan(goodScan, i, j):
     else:
        proutn("- ")
 
-def status(req):
+def status(req=0):
     # print status report lines 
 
     if not req or req == 1:
        prstat(_("Stardate"), _("%.1f, Time Left %.2f") \
                % (game.state.date, game.state.remtime))
-    elif not req or req == 2:
+    if not req or req == 2:
        if game.condition != "docked":
            newcnd()
         dam = 0
@@ -5501,43 +5456,43 @@ def status(req):
            if game.damage[t]>0: 
                dam += 1
        prstat(_("Condition"), _("%s, %i DAMAGES") % (game.condition.upper(), dam))
-    elif not req or req == 3:
+    if not req or req == 3:
        prstat(_("Position"), "%s , %s" % (game.quadrant, game.sector))
-    elif not req or req == 4:
+    if not req or req == 4:
        if damaged(DLIFSUP):
            if game.condition == "docked":
-               sprintf(s, _("DAMAGED, Base provides"))
+               s = _("DAMAGED, Base provides")
            else:
-               sprintf(s, _("DAMAGED, reserves=%4.2f") % game.lsupres)
+               s = _("DAMAGED, reserves=%4.2f") % game.lsupres
        else:
-           sprintf(s, _("ACTIVE"))
+           s = _("ACTIVE")
        prstat(_("Life Support"), s)
-    elif not req or req == 5:
-       prstat(_("Warp Factor"), "%.1f" % (game.warpfac))
-    elif not req or req == 6:
+    if not req or req == 5:
+       prstat(_("Warp Factor"), "%.1f" % game.warpfac)
+    if not req or req == 6:
         extra = ""
         if game.icrystl and (game.options & OPTION_SHOWME):
             extra = _(" (have crystals)")
-       prstat(_("Energy"), "%.2f%s" % game.energy, extra)
-    elif not req or req == 7:
+       prstat(_("Energy"), "%.2f%s" % (game.energy, extra))
+    if not req or req == 7:
        prstat(_("Torpedoes"), "%d" % (game.torps))
-    elif not req or req == 8:
+    if not req or req == 8:
        if damaged(DSHIELD):
-           strcpy(s, _("DAMAGED,"))
+           s = _("DAMAGED,")
        elif game.shldup:
-           strcpy(s, _("UP,"))
+           s = _("UP,")
        else:
-           strcpy(s, _("DOWN,"))
+           s = _("DOWN,")
        data = _(" %d%% %.1f units") \
                % (int((100.0*game.shield)/game.inshld + 0.5), game.shield)
-       prstat(_("Shields"), s)
-    elif not req or req == 9:
+       prstat(_("Shields"), s+data)
+    if not req or req == 9:
         prstat(_("Klingons Left"), "%d" \
                % (game.state.remkl + game.state.remcom + game.state.nscrem))
-    elif not req or req == 10:
+    if not req or req == 10:
        if game.options & OPTION_WORLDS:
            plnet = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet
-           if plnet != NOPLANET and game.state.planets[plnet].inhabited:
+           if plnet and plnet.inhabited:
                prstat(_("Major system"), plnet.name)
            else:
                prout(_("Sector is uninhabited"))
@@ -5618,14 +5573,12 @@ def eta():
            w2.y = 0
        else:
            w2.y=QUADSIZE-1
-
     if not VALID_QUADRANT(w1.x, w1.y) or not VALID_SECTOR(w2.x, w2.y):
        huh()
        return
     game.dist = math.sqrt(square(w1.y-game.quadrant.y+0.1*(w2.y-game.sector.y))+
                square(w1.x-game.quadrant.x+0.1*(w2.x-game.sector.x)))
     wfl = False
-
     if prompt:
        prout(_("Answer \"no\" if you don't know the value:"))
     while True:
@@ -5773,9 +5726,6 @@ def visual():
 
 # Code from setup.c begins here
 
-def filelength(fd):
-    return os.fstat(fd).st_size
-
 def prelim():
     # issue a historically correct banner 
     skip(2)
@@ -5905,7 +5855,6 @@ device = (
 def setup(needprompt):
     # prepare to play, set up cosmos 
     w = coord()
-
     #  Decide how many of everything
     if choose(needprompt):
        return # frozen game
@@ -5942,7 +5891,7 @@ def setup(needprompt):
        for j in range(GALSIZE):
            quad = game.state.galaxy[i][j]
            quad.charted = 0
-           quad.planet = NOPLANET
+           quad.planet = None
            quad.romulans = 0
            quad.klingons = 0
            quad.starbase = False
@@ -6017,7 +5966,7 @@ def setup(needprompt):
             if not game.state.galaxy[w.x][w.y].supernova and \
                game.state.galaxy[w.x][w.y].klingons + klump <= MAXKLQUAD:
                 break
-       game.state.galaxy[w.x][w.y].klingons += klump
+       game.state.galaxy[w.x][w.y].klingons += int(klump)
         if krem <= 0:
             break
     # Position Klingon Commander Ships
@@ -6035,7 +5984,7 @@ def setup(needprompt):
     for i in range(game.inplan):
         while True:
             w = randplace(GALSIZE) 
-            if game.state.galaxy[w.x][w.y].planet == NOPLANET:
+            if game.state.galaxy[w.x][w.y].planet == None:
                 break
         new = planet()
        new.w = w
@@ -6276,10 +6225,8 @@ def newqad(shutup):
     game.klhere = q.klingons
     game.irhere = q.romulans
     game.nenhere = game.klhere + game.irhere
-
     # Position Starship
     game.quad[game.sector.x][game.sector.y] = game.ship
-
     if q.klingons:
        w.x = w.y = 0   # quiet a gcc warning 
        # Position ordinary Klingons
@@ -6294,7 +6241,6 @@ def newqad(shutup):
            game.quad[w.x][w.y] = IHC
            game.kpower[game.klhere] = 950.0+400.0*random.random()+50.0*game.skill
            game.comhere = True
-
        # If we need a super-commander, promote a Klingon
        if same(game.quadrant, game.state.kscmdr):
            game.quad[game.ks[0].x][game.ks[0].y] = IHS
@@ -6310,9 +6256,8 @@ def newqad(shutup):
     # If quadrant needs a starbase, put it in
     if q.starbase:
        game.base = dropin(IHB)
-       
     # If quadrant needs a planet, put it in
-    if q.planet != NOPLANET:
+    if q.planet:
        game.iplnet = q.planet
        if not q.planet.inhabited:
            game.plnet = dropin(IHP)
@@ -6334,7 +6279,6 @@ def newqad(shutup):
            skip(1)
            prout(_("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE."))
            prout(_("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!"))
-
     if shutup==0:
        # Put in THING if needed
         global thing
@@ -6350,7 +6294,6 @@ def newqad(shutup):
                skip(1)
                prout(_("Mr. Spock- \"Captain, this is most unusual."))
                prout(_("    Please examine your short-range scan.\""))
-
     # Decide if quadrant needs a Tholian; lighten up if skill is low 
     if game.options & OPTION_THOLIAN:
        if (game.skill < SKILL_GOOD and random.random() <= 0.02) or \
@@ -6378,12 +6321,10 @@ def newqad(shutup):
            if game.quad[QUADSIZE-1][QUADSIZE-1]==IHDOT:
                game.quad[QUADSIZE-1][QUADSIZE-1] = 'X'
     sortklings()
-
     # Put in a few black holes
     for i in range(1, 3+1):
        if random.random() > 0.5: 
            dropin(IHBLANK)
-
     # Take out X's in corners if Tholian present
     if game.ithere:
        if game.quad[0][0]=='X':
@@ -6491,7 +6432,7 @@ def listCommands():
     k = 0
     proutn(_("LEGAL COMMANDS ARE:"))
     for key in commands:
-       if ACCEPT(cmd):
+       if ACCEPT(key):
             if k % 5 == 0:
                 skip(1)
             proutn("%-12s " % key) 
@@ -6566,7 +6507,6 @@ def makemoves():
            hitme = False
            game.justin = False
            game.optime = 0.0
-           i = -1
            chew()
            setwnd(prompt_window)
            clrscr()
@@ -6579,15 +6519,20 @@ def makemoves():
            clrscr()
            setwnd(message_window)
            clrscr()
-            cmd = citem.upper()
-            if cmd not in commands:
+            candidates = filter(lambda x: x.startswith(citem.upper()),
+                                commands)
+            if len(candidates) == 1:
+                cmd = candidates[0]
+                break
+            elif candidates and not (game.options & OPTION_PLAIN):
+                prout("Commands with that prefix: " + " ".join(candidates))
+            else:
                 listCommands()
                 continue
-       commandhook(commands[i].name, True)
        if cmd == "SRSCAN":             # srscan
            srscan()
        elif cmd == "STATUS":           # status
-           status(0)
+           status()
        elif cmd == "REQUEST":          # status request 
            request()
        elif cmd == "LRSCAN":           # long range scan
@@ -6692,7 +6637,6 @@ def makemoves():
 #      elif cmd == "VISUAL":
 #          visual()                    # perform visual scan
 #endif
-       commandhook(commands[i].name, False)
        while True:
            if game.alldone:
                break           # Game has ended
@@ -6734,22 +6678,17 @@ def cramen(cmd):
     else: s = "Unknown??"
     proutn(s)
 
-def cramlc(loctype, w):
-    # name a location 
-    if loctype == "quadrant":
-       buf = _("Quadrant ")
-    elif loctype == "sector":
-       buf = _("Sector ")
-    buf += ("%d - %d" % (w.x, w.y))
-    return buf
-
 def crmena(stars, enemy, loctype, w):
     # print an enemy and his location 
     if stars:
        proutn("***")
     cramen(enemy)
     proutn(_(" at "))
-    proutn(cramlc(loctype, w))
+    if loctype == "quadrant":
+       buf = _("Quadrant ")
+    elif loctype == "sector":
+       buf = _("Sector ")
+    proutn(buf + `w`)
 
 def crmshp():
     # print our ship name 
@@ -6940,14 +6879,12 @@ if __name__ == '__main__':
     iqengry = False
     game = gamestate()
     idebug = 0
-
     game.options = OPTION_ALL &~ (OPTION_IOMODES | OPTION_SHOWME | OPTION_PLAIN | OPTION_ALMY)
     # Disable curses mode until the game logic is working.
     #    if os.getenv("TERM"):
     #  game.options |= OPTION_CURSES | OPTION_SHOWME
     #    else:
     game.options |= OPTION_TTY
-
     seed = time.time()
     (options, arguments) = getopt.getopt(sys.argv[1:], "r:tx")
     for (switch, val) in options:
@@ -6983,18 +6920,16 @@ if __name__ == '__main__':
        #setlinebuf(logfp)
        logfp.write("seed %d\n" % (seed))
     random.seed(seed)
-
     iostart()
     if arguments:
         inqueue = arguments
     else:
         inqueue = None
-
     while True: # Play a game 
        setwnd(fullscreen_window)
        clrscr()
        prelim()
-       setup(needprompt=not line)
+       setup(needprompt=not inqueue)
        if game.alldone:
            score()
            game.alldone = False
@@ -7003,7 +6938,6 @@ if __name__ == '__main__':
        skip(1)
        stars()
        skip(1)
-
        if game.tourn and game.alldone:
            proutn(_("Do you want your score recorded?"))
            if ja() == True:
@@ -7015,4 +6949,3 @@ if __name__ == '__main__':
     skip(1)
     prout(_("May the Great Bird of the Galaxy roost upon your home planet."))
     raise SysExit, 0
-