X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=e3959641877d691bc70a221b06d04a0783537c3d;hp=12f1bad0900bffbfc751773126266268ac1a3351;hb=708a55633712f9981231e80360ac5e3fe81b1d3b;hpb=63467e47a60fc5f8bfe4af21ad13c82bb5f4cd63 diff --git a/sst.py b/sst.py index 12f1bad..e395964 100755 --- a/sst.py +++ b/sst.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 """ sst.py -- Super Star Trek 2K @@ -12,13 +12,20 @@ See the doc/HACKING file in the distribution for designers notes and advice on how to modify (and how not to modify!) this code. """ from __future__ import print_function, division +# Runs under Python 2 an Python 3. Preserve this property! +# SPDX-License-Identifier: BSD-2-clause +# pylint: disable=line-too-long,superfluous-parens,too-many-lines,invalid-name,missing-function-docstring,missing-class-docstring,multiple-statements,too-many-branches,too-many-statements,too-many-locals,too-many-nested-blocks,too-many-return-statements,too-many-instance-attributes,global-statement,no-else-break,no-else-return,no-else-continue,too-few-public-methods,too-many-boolean-expressions + +# pylint: disable=multiple-imports import os, sys, math, curses, time, pickle, copy, gettext, getpass import getopt, socket, locale +import codecs # This import only works on Unixes. The intention is to enable # Ctrl-P, Ctrl-N, and friends in Cmd. try: + # pylint: disable=unused-import import readline except ImportError: pass @@ -29,7 +36,7 @@ try: except NameError: my_input = input -version = "2.4" +version = "2.7" docpath = (".", "doc/", "/usr/share/doc/sst/") @@ -42,7 +49,7 @@ def _(st): class randomizer: # LCG PRNG parameters tested against - # Knuth vol. 2. by the authors of ADVENT + # Knuth vol. 2. by the authors of ADVENT LCG_A = 1093 LCG_C = 221587 LCG_M = 1048576 @@ -51,7 +58,7 @@ class randomizer: def random(): old_x = game.lcg_x game.lcg_x = (randomizer.LCG_A * game.lcg_x + randomizer.LCG_C) % randomizer.LCG_M - return old_x / randomizer.LCG_M; + return old_x / randomizer.LCG_M @staticmethod def withprob(p): @@ -194,8 +201,8 @@ class Coord: return self.roundtogrid() % QUADSIZE def scatter(self): s = Coord() - s.i = self.i + rnd.range(-1, 2) - s.j = self.j + rnd.range(-1, 2) + s.i = self.i + rnd.integer(-1, 2) + s.j = self.j + rnd.integer(-1, 2) return s def __str__(self): if self.i is None or self.j is None: @@ -307,6 +314,7 @@ OPTION_CLOAK = 0x80004000 # Enable BSD-Trek capture (Almy, 2013). OPTION_PLAIN = 0x01000000 # user chose plain game OPTION_ALMY = 0x02000000 # user chose Almy variant OPTION_COLOR = 0x04000000 # enable color display (ESR, 2010) +OPTION_DOTFILL = 0x08000000 # fix dotfill glitch in chart (ESR, 2019) # Define devices DSRSENS = 0 @@ -801,7 +809,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! @@ -834,7 +842,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. @@ -907,7 +915,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 @@ -925,7 +933,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(): @@ -950,7 +958,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 @@ -1243,7 +1250,6 @@ def collision(rammed, enemy): damagereport() else: finish(FWON) - return def torpedo(origin, bearing, dispersion, number, nburst): "Let a photon torpedo fly" @@ -1328,7 +1334,7 @@ def torpedo(origin, bearing, dispersion, number, nburst): bumpto = displacement.sector() if not bumpto.valid_sector(): prout(_(" damaged but not destroyed.")) - return + return None if game.quad[bumpto.i][bumpto.j] == ' ': prout(_(" buffeted into black hole.")) deadkl(w, iquad, bumpto) @@ -1899,6 +1905,7 @@ def hittem(hits): return continue else: # decide whether or not to emasculate klingon + # pylint: disable=chained-comparison if kpow > 0 and rnd.withprob(0.9) and kpow <= rnd.real(0.4, 0.8)*kpini: prout(_("***Mr. Spock- \"Captain, the vessel at Sector %s")%w) prout(_(" has just lost its firepower.\"")) @@ -2087,7 +2094,6 @@ def phasers(): scanner.chew() key = "IHEOL" hits[k] = 0 # prevent overflow -- thanks to Alexei Voitenko - k += 1 continue if key == "IHEOL": scanner.chew() @@ -2117,7 +2123,7 @@ def phasers(): # abort out scanner.chew() return - hits[k] = scanner.real + hits.append(scanner.real) rpow += scanner.real # If total requested is too much, inform and start over if rpow > avail: @@ -2125,7 +2131,6 @@ def phasers(): scanner.chew() return key = scanner.nexttok() # scan for next value - k += 1 if rpow == 0.0: # zero energy -- abort scanner.chew() @@ -2858,7 +2863,7 @@ def supernova(w): for nq.i in range(GALSIZE): for nq.j in range(GALSIZE): nstars += game.state.galaxy[nq.i][nq.j].stars - if stars == 0: + if nstars == 0: return # nothing to supernova exists num = rnd.integer(nstars) + 1 for nq.i in range(GALSIZE): @@ -2872,7 +2877,7 @@ def supernova(w): proutn("=== Super nova here?") if ja(): nq = game.quadrant - if not nq == game.quadrant or game.justin: + if nq != game.quadrant or game.justin: # it isn't here, or we just entered (treat as enroute) if communicating(): skip(1) @@ -2935,7 +2940,7 @@ def supernova(w): if game.quadrant == nq or communicating(): game.state.galaxy[nq.i][nq.j].supernova = True # If supernova destroys last Klingons give special message - if game.unwon()==0 and not nq == game.quadrant: + if game.unwon()==0 and nq != game.quadrant: skip(2) if w is None: prout(_("Lucky you!")) @@ -3522,7 +3527,7 @@ def prouts(proutsline): def cgetline(): "Get a line of input." if game.options & OPTION_CURSES: - linein = curwnd.getstr() + "\n" + linein = codecs.decode(curwnd.getstr()) + "\n" curwnd.refresh() else: if replayfp and not replayfp.closed: @@ -3698,7 +3703,7 @@ def tracktorpedo(w, step, i, n, iquad): else: skip(1) proutn(_("Torpedo track- ")) - elif step==4 or step==9: + elif step in {4, 9}: skip(1) proutn("%s " % w) else: @@ -3706,7 +3711,7 @@ def tracktorpedo(w, step, i, n, iquad): if i != 0 and step == 1: drawmaps(2) time.sleep(0.4) - if (iquad=='.') or (iquad==' '): + if iquad in {'.', ' '}: put_srscan_sym(w, '+') #sound(step*10) #time.sleep(0.1) @@ -3881,7 +3886,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 @@ -3900,7 +3905,6 @@ def imove(icourse=None, noattack=False): newcnd() drawmaps(0) setwnd(message_window) - return def dock(verbose): "Dock our ship at a starbase." @@ -5160,6 +5164,7 @@ def attackreport(curt): def report(): # report on general game status scanner.chew() + # pylint: disable=consider-using-ternary s1 = (game.thawed and _("thawed ")) or "" s2 = {1:"short", 2:"medium", 4:"long"}[game.length] s3 = (None, _("novice"), _("fair"), @@ -5325,6 +5330,8 @@ def chart(): show = ".1." elif game.state.galaxy[i][j].charted: show = "%3d" % (game.state.chart[i][j].klingons*100 + game.state.chart[i][j].starbase * 10 + game.state.chart[i][j].stars) + if (game.options & OPTION_DOTFILL): + show = show.replace(" ", ".") else: show = "..." proutn(show) @@ -5354,6 +5361,8 @@ def sectscan(goodScan, i, j): 'C':LIGHTRED, 'R':LIGHTRED, 'T':LIGHTRED, + '@':LIGHTGREEN, + 'P':LIGHTGREEN, }.get(game.quad[i][j], DEFAULT)) proutn("%c " % game.quad[i][j]) textcolor(DEFAULT) @@ -5987,11 +5996,11 @@ def choose(): scanner.nexttok() if scanner.sees("plain"): # Approximates the UT FORTRAN version. - game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS | OPTION_COLOR | OPTION_CAPTURE | OPTION_CLOAK) + game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS | OPTION_COLOR | OPTION_CAPTURE | OPTION_CLOAK | OPTION_DOTFILL) game.options |= OPTION_PLAIN elif scanner.sees("almy"): # Approximates Tom Almy's version. - game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS | OPTION_COLOR) + game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS | OPTION_COLOR | OPTION_DOTFILL) game.options |= OPTION_ALMY elif scanner.sees("fancy") or scanner.sees("\n"): pass @@ -6055,6 +6064,7 @@ def newqad(): game.iplnet = None game.neutz = game.inorbit = game.landed = False game.ientesc = game.iseenit = game.isviolreported = False + game.tholian = None # Create a blank quadrant game.quad = fill2d(QUADSIZE, lambda i, j: '.') if game.iscate: @@ -6659,7 +6669,7 @@ def debugme(): proutn(legends[i]) if is_scheduled(i): proutn("%.2f" % (scheduled(i)-game.state.date)) - if i == FENSLV or i == FREPRO: + if i in {FENSLV, FREPRO}: ev = findevent(i) proutn(" in %s" % ev.quadrant) else: @@ -6672,7 +6682,7 @@ def debugme(): scanner.chew() elif key == "IHREAL": ev = schedule(i, scanner.real) - if i == FENSLV or i == FREPRO: + if i in {FENSLV, FREPRO}: scanner.chew() proutn("In quadrant- ") key = scanner.nexttok() @@ -6714,14 +6724,17 @@ if __name__ == '__main__': replay = False for (switch, val) in options: if switch == '-r': + # pylint: disable=raise-missing-from try: replayfp = open(val, "r") except IOError: sys.stderr.write("sst: can't open replay file %s\n" % val) raise SystemExit(1) + # pylint: disable=raise-missing-from try: line = replayfp.readline().strip() (leader, __, seed) = line.split() + # pylint: disable=eval-used seed = eval(seed) line = replayfp.readline().strip() arguments += line.split()[2:]