X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=e1a3b1513eaf3c72b74c3dc9787e4f2ee1b4c004;hp=fec64ec815c8793c23c046301674da5582bdebe8;hb=94623eb1f339928270ccf28ce22d67032a06b428;hpb=54df4096ced6cdbd61c349a728d00eb83f4ba295 diff --git a/sst.py b/sst.py index fec64ec..e1a3b15 100755 --- a/sst.py +++ b/sst.py @@ -803,7 +803,7 @@ def movescom(iq, avoid): if communicating(): announce() prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports")) - proutn(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr) + prout(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr) prout(_(" by the Super-commander.\"")) break return True # looks good! @@ -836,7 +836,7 @@ def supercommander(): sc = game.state.kscmdr for (i, base) in enumerate(game.state.baseq): basetbl.append((i, (base - sc).distance())) - if game.state.baseq > 1: + if len(game.state.baseq) > 1: basetbl.sort(key=lambda x: x[1]) # look for nearest base without a commander, no Enterprise, and # without too many Klingons, and not already under attack. @@ -909,7 +909,7 @@ def supercommander(): prout(_("Lt. Uhura- \"Captain, the starbase in Quadrant %s") \ % game.state.kscmdr) prout(_(" reports that it is under attack from the Klingon Super-commander.")) - proutn(_(" It can survive until stardate %d.\"") \ + prout(_(" It can survive until stardate %d.\"") \ % int(scheduled(FSCDBAS))) if not game.resting: return @@ -927,7 +927,7 @@ def supercommander(): return announce() prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports")) - proutn(_(" the Super-commander is in Quadrant %s,") % game.state.kscmdr) + prout(_(" the Super-commander is in Quadrant %s.") % game.state.kscmdr) return def movetholian(): @@ -952,7 +952,6 @@ def movetholian(): game.tholian.move(None) prout("***Internal error: Tholian in a bad spot.") return - print("Tholian moving from %s to %s" % (game.tholian.location, tid)) # do nothing if we are blocked if game.quad[tid.i][tid.j] not in ('.', '#'): return @@ -2074,7 +2073,6 @@ def phasers(): prout(_("Manual-fire-must-be-used")) skip(1) elif automode == "MANUAL": - print("****HERE WE ARE*** %d" % len(game.enemies)) rpow = 0.0 for k in range(len(game.enemies)): aim = game.enemies[k].location @@ -2119,7 +2117,6 @@ def phasers(): # abort out scanner.chew() return - print("k is %d" % k) hits.append(scanner.real) rpow += scanner.real # If total requested is too much, inform and start over @@ -3883,7 +3880,7 @@ def imove(icourse=None, noattack=False): newquadrant(noattack) break elif check_collision(w): - print("Collision detected") + prout(_("Collision detected")) break else: game.sector = w