X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=3bb83c1a87e9c12b7322722f40fd752c6ffe47a5;hp=0a7bd3e4762d1cb5343a4f5f6572cd5644470685;hb=8bc631d8e9468b57de2d1100e15b646acbde8cc0;hpb=c38d86074f6d71918c1c05a4ce3a26517cce6a66 diff --git a/sst.py b/sst.py index 0a7bd3e..3bb83c1 100755 --- a/sst.py +++ b/sst.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ sst.py -- Super Star Trek 2K @@ -11,6 +11,8 @@ Stas Sergeev, and Eric S. Raymond. 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 + import os, sys, math, curses, time, pickle, random, copy, gettext, getpass import getopt, socket, locale @@ -27,8 +29,7 @@ try: except NameError: my_input = input - -version = "2.1" +version = "2.3" docpath = (".", "doc/", "/usr/share/doc/sst/") @@ -87,10 +88,8 @@ class Coord: return self.i >= 0 and self.i < QUADSIZE and self.j >= 0 and self.j < QUADSIZE def invalidate(self): self.i = self.j = None - def is_valid(self): - return self.i != None and self.j != None def __eq__(self, other): - return other != None and self.i == other.i and self.j == other.j + return other is not None and self.i == other.i and self.j == other.j def __ne__(self, other): return other is None or self.i != other.i or self.j != other.j def __add__(self, other): @@ -103,10 +102,16 @@ class Coord: return Coord(self.i*other, self.j*other) def __div__(self, other): return Coord(self.i/other, self.j/other) + def __truediv__(self, other): + return Coord(self.i/other, self.j/other) + def __floordiv__(self, other): + return Coord(self.i//other, self.j//other) def __mod__(self, other): return Coord(self.i % other, self.j % other) - def __rdiv__(self, other): + def __rtruediv__(self, other): return Coord(self.i/other, self.j/other) + def __rfloordiv__(self, other): + return Coord(self.i//other, self.j//other) def roundtogrid(self): return Coord(int(round(self.i)), int(round(self.j))) def distance(self, other=None): @@ -119,16 +124,20 @@ class Coord: s = Coord() if self.i == 0: s.i = 0 + elif s.i < 0: + s.i =-1 else: - s.i = self.i / abs(self.i) + s.i = 1 if self.j == 0: s.j = 0 + elif s.j < 0: + s.j = -1 else: - s.j = self.j / abs(self.j) + s.j = 1 return s def quadrant(self): #print "Location %s -> %s" % (self, (self / QUADSIZE).roundtogrid()) - return self.roundtogrid() / QUADSIZE + return self.roundtogrid() // QUADSIZE def sector(self): return self.roundtogrid() % QUADSIZE def scatter(self): @@ -373,7 +382,7 @@ class Gamestate: self.thawed = False # thawed game self.condition = None # "green", "yellow", "red", "docked", "dead" self.iscraft = None # "onship", "offship", "removed" - self.skill = None # Player skill level + self.skill = SKILL_NONE # Player skill level self.inkling = 0 # initial number of klingons self.inbase = 0 # initial number of bases self.incom = 0 # initial number of commanders @@ -414,6 +423,7 @@ class Gamestate: self.score = 0.0 # overall score self.perdate = 0.0 # rate of kills self.idebug = False # Debugging instrumentation enabled? + self.cdebug = False # Debugging instrumentation for curses enabled? self.statekscmdr = None # No SuperCommander coordinates yet. self.brigcapacity = 400 # Enterprise brig capacity self.brigfree = 400 # How many klingons can we put in the brig? @@ -433,7 +443,7 @@ class Gamestate: self.state.remtime = self.state.remres/(self.remkl() + 4*len(self.state.kcmdr)) def unwon(self): "Are there Klingons remaining?" - return self.remkl() + len(self.state.kcmdr) + self.state.nscrem + return self.remkl() FWON = 0 FDEPLETE = 1 @@ -938,7 +948,7 @@ def movetholian(): def cloak(): "Change cloaking-device status." if game.ship == 'F': - prout(_("Ye Faerie Queene hath no cloaking device.")); + prout(_("Ye Faerie Queene hath no cloaking device.")) return key = scanner.nexttok() @@ -973,42 +983,42 @@ def cloak(): if not ja(): return action = "CLOFF" - if action == None: - return; + if action is None: + return if action == "CLOFF": if game.irhere and game.state.date >= ALGERON and not game.isviolreported: prout(_("Spock- \"Captain, the Treaty of Algeron is in effect.\n Are you sure this is wise?\"")) if not ja(): - return; - prout("Engineer Scott- \"Aye, Sir.\""); - game.iscloaked = False; + return + prout("Engineer Scott- \"Aye, Sir.\"") + game.iscloaked = False if game.irhere and game.state.date >= ALGERON and not game.isviolreported: prout(_("The Romulan ship discovers you are breaking the Treaty of Algeron!")) game.ncviol += 1 game.isviolreported = True #if (neutz and game.state.date >= ALGERON) finish(FCLOAK); - return; + return if action == "CLON": if damaged(DCLOAK): prout(_("Engineer Scott- \"The cloaking device is damaged, Sir.\"")) - return; + return if game.condition == "docked": prout(_("You cannot cloak while docked.")) - if game.state.date >= ALGERON and not game.isviolreported: + if game.state.date >= ALGERON and not game.isviolreported: prout(_("Spock- \"Captain, using the cloaking device is a violation")) prout(_(" of the Treaty of Algeron. Considering the alternatives,")) proutn(_(" are you sure this is wise? ")) if not ja(): return - prout(_("Engineer Scott- \"Cloaking device has engaging, Sir...\"")) + prout(_("Engineer Scott- \"Cloaking device has engaging, Sir...\"")) attack(True) - prout(_("Engineer Scott- \"Cloaking device has engaged, Sir.\"")) - game.iscloaked = True + prout(_("Engineer Scott- \"Cloaking device has engaged, Sir.\"")) + game.iscloaked = True if game.irhere and game.state.date >= ALGERON and not game.isviolreported: prout(_("The Romulan ship discovers you are breaking the Treaty of Algeron!")) @@ -1289,8 +1299,8 @@ def torpedo(origin, bearing, dispersion, number, nburst): enemy.location = bumpto game.quad[w.i][w.j] = '.' game.quad[bumpto.i][bumpto.j] = iquad - for enemy in game.enemies: - enemy.kdist = enemy.kavgd = (game.sector-enemy.location).distance() + for tenemy in game.enemies: + tenemy.kdist = tenemy.kavgd = (game.sector-tenemy.location).distance() sortenemies() break else: @@ -2106,12 +2116,12 @@ def phasers(): def capture(): game.ididit = False # Nothing if we fail - game.optime = 0.0; + game.optime = 0.0 # Make sure there is room in the brig */ if game.brigfree == 0: prout(_("Security reports the brig is already full.")) - return; + return if damaged(DRADIO): prout(_("Uhura- \"We have no subspace radio communication, sir.\"")) @@ -2141,7 +2151,7 @@ def capture(): # x = 300 + 25*skill; x = game.energy / (weakest.power * len(klingons)) #prout(_("Stats: energy = %s, kpower = %s, klingons = %s") - # % (game.energy, weakest.power, len(klingons))) + # % (game.energy, weakest.power, len(klingons))) x *= 2.5 # would originally have been equivalent of 1.4, # but we want command to work more often, more humanely */ #prout(_("Prob = %.4f" % x)) @@ -2153,7 +2163,7 @@ def capture(): if i > 0: prout(_("%d Klingons commit suicide rather than be taken captive.") % (200 - i)) if i > game.brigfree: - prout(_("%d Klingons die because there is no room for them in the brig.") % (i-brigfree)) + prout(_("%d Klingons die because there is no room for them in the brig.") % (i-game.brigfree)) i = game.brigfree game.brigfree -= i prout(_("%d captives taken") % i) @@ -2594,7 +2604,7 @@ def events(): q.klingons += 1 if game.quadrant == w: game.klhere += 1 - game.enemies.append(newkling()) + newkling() # also adds it to game.enemies # recompute time left game.recompute() if communicating(): @@ -2603,7 +2613,7 @@ def events(): prout(_("launched a warship from %s.") % q.planet) else: prout(_("Uhura- Starfleet reports increased Klingon activity")) - if q.planet != None: + if q.planet is not None: proutn(_("near %s ") % q.planet) prout(_("in Quadrant %s.") % w) @@ -2794,7 +2804,7 @@ def nova(nov): def supernova(w): "Star goes supernova." num = 0; npdead = 0 - if w != None: + if w is not None: nq = copy.copy(w) else: # Scheduled supernova -- select star at random. @@ -2853,8 +2863,10 @@ def supernova(w): game.iscate = False unschedule(FSCMOVE) unschedule(FSCDBAS) - survivors = filter(lambda w: w != nq, game.state.kcmdr) - comkills = len(game.state.kcmdr) - len(survivors) + # Changing this to [w for w in game.state.kcmdr if w != nq] + # causes regression-test failure + survivors = list(filter(lambda w: w != nq, game.state.kcmdr)) + #comkills = len(game.state.kcmdr) - len(survivors) game.state.kcmdr = survivors if not game.state.kcmdr: unschedule(FTBEAM) @@ -2870,7 +2882,7 @@ def supernova(w): # Destroy any base in supernovaed quadrant game.state.baseq = [x for x in game.state.baseq if x != nq] # If starship caused supernova, tally up destruction - if w != None: + if w is not None: game.state.starkl += game.state.galaxy[nq.i][nq.j].stars game.state.basekl += game.state.galaxy[nq.i][nq.j].starbase game.state.nplankl += npdead @@ -2940,9 +2952,9 @@ def kaboom(): skip(1) if len(game.enemies) != 0: whammo = 25.0 * game.energy - for l in range(len(game.enemies)): - if game.enemies[l].power*game.enemies[l].kdist <= whammo: - deadkl(game.enemies[l].location, game.quad[game.enemies[l].location.i][game.enemies[l].location.j], game.enemies[l].location) + for e in game.enemies[::-1]: + if e.power*e.kdist <= whammo: + deadkl(e.location, game.quad[e.location.i][e.location.j], e.location) finish(FDILITHIUM) def killrate(): @@ -3192,7 +3204,8 @@ def score(): klship = 1 else: klship = 2 - game.score = 10*(game.inkling - game.remkl()) \ + dead_ordinaries= game.inkling - game.remkl() + len(game.state.kcmdr) + game.state.nscrem + game.score = 10*(dead_ordinaries)\ + 50*(game.incom - len(game.state.kcmdr)) \ + ithperd + iwon \ + 20*(game.inrom - game.state.nromrem) \ @@ -3210,9 +3223,9 @@ def score(): if game.state.nromrem and game.gamewon: prout(_("%6d Romulans captured %5d") % (game.state.nromrem, game.state.nromrem)) - if game.inkling - game.remkl(): + if dead_ordinaries: prout(_("%6d ordinary Klingons destroyed %5d") % - (game.inkling - game.remkl(), 10*(game.inkling - game.remkl()))) + (dead_ordinaries, 10*dead_ordinaries)) if game.incom - len(game.state.kcmdr): prout(_("%6d Klingon commanders destroyed %5d") % (game.incom - len(game.state.kcmdr), 50*(game.incom - len(game.state.kcmdr)))) @@ -3250,11 +3263,11 @@ def score(): prout(_("%6d ship(s) lost or destroyed %5d") % (klship, -100*klship)) if game.ncviol > 0: - if ncviol == 1: + if game.ncviol == 1: prout(_("1 Treaty of Algeron violation -100")) else: prout(_("%6d Treaty of Algeron violations %5d\n") % - (ncviol, -100*ncviol)) + (game.ncviol, -100*game.ncviol)) if not game.alive: prout(_("Penalty for getting yourself killed -200")) if game.gamewon: @@ -3436,9 +3449,8 @@ def proutn(proutntline): if curwnd == message_window and y >= my - 2: pause_game() clrscr() - # Uncomment this to debug curses problems - #if logfp: - # logfp.write("#curses: at %s proutn(%s)\n" % ((y, x), repr(proutntline))) + if logfp and game.cdebug: + logfp.write("#curses: at %s proutn(%s)\n" % ((y, x), repr(proutntline))) curwnd.addstr(proutntline) curwnd.refresh() else: @@ -3492,8 +3504,7 @@ def setwnd(wnd): "Change windows -- OK for this to be a no-op in tty mode." global curwnd if game.options & OPTION_CURSES: - # Uncomment this to debug curses problems - if logfp: + if game.cdebug and logfp: if wnd == fullscreen_window: legend = "fullscreen" elif wnd == srscan_window: @@ -3510,7 +3521,7 @@ def setwnd(wnd): legend = "prompt" else: legend = "unknown" - #logfp.write("#curses: setwnd(%s)\n" % legend) + logfp.write("#curses: setwnd(%s)\n" % legend) curwnd = wnd # Some curses implementations get confused when you try this. try: @@ -3811,7 +3822,6 @@ def imove(icourse=None, noattack=False): # We can't be tractor beamed if cloaked, # so move the event into the future postpone(FTBEAM, game.optime + expran(1.5*game.intime/len(game.kcmdr))) - pass else: trbeam = True game.condition = "red" @@ -3856,7 +3866,7 @@ def dock(verbose): if game.inorbit: prout(_("You must first leave standard orbit.")) return - if not game.base.is_valid() or abs(game.sector.i-game.base.i) > 1 or abs(game.sector.j-game.base.j) > 1: + if game.base is None or abs(game.sector.i-game.base.i) > 1 or abs(game.sector.j-game.base.j) > 1: prout(crmshp() + _(" not adjacent to base.")) return if game.iscloaked: @@ -4492,7 +4502,7 @@ def mayday(): # found one -- finish up game.sector = w break - if not game.sector.is_valid(): + if game.sector is None: prout(_("You have been lost in space...")) finish(FMATERIALIZE) return @@ -4566,7 +4576,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 != None and not damaged(DTRANSP): + elif q.planet is not None and not damaged(DTRANSP): prout(_("Remainder of ship's complement beam down to %s.") % q.planet) else: @@ -4672,7 +4682,7 @@ def orbit(): if damaged(DWARPEN) and damaged(DIMPULS): prout(_("Both warp and impulse engines damaged.")) return - if not game.plnet.is_valid(): + if game.plnet is None: prout("There is no planet in this sector.") return if abs(game.sector.i-game.plnet.i)>1 or abs(game.sector.j-game.plnet.j)>1: @@ -5021,7 +5031,7 @@ def deathray(): prouts(_("Sulu- \"Captain! It's working!\"")) skip(2) while len(game.enemies) > 0: - deadkl(game.enemies[1].location, game.quad[game.enemies[1].location.i][game.enemies[1].location.j],game.enemies[1].location) + deadkl(game.enemies[-1].location, game.quad[game.enemies[-1].location.i][game.enemies[-1].location.j],game.enemies[-1].location) prout(_("Ensign Chekov- \"Congratulations, Captain!\"")) if game.unwon() == 0: finish(FWON) @@ -5142,7 +5152,7 @@ def report(): if game.casual: prout(_("%d casualt%s suffered so far.") % (game.casual, ("y", "ies")[game.casual!=1])) if game.brigcapacity != game.brigfree: - embriggened = brigcapacity-brigfree + embriggened = game.brigcapacity-game.brigfree if embriggened == 1: prout(_("1 Klingon in brig")) else: @@ -5299,7 +5309,7 @@ def sectscan(goodScan, i, j): 'C':LIGHTRED, 'R':LIGHTRED, 'T':LIGHTRED, - }.get(game.quad[i][j], DEFAULT)) + }.get(game.quad[i][j], DEFAULT)) proutn("%c " % game.quad[i][j]) textcolor(DEFAULT) else: @@ -5570,7 +5580,7 @@ def thaw(): fp = open(scanner.token, "rb") except IOError: prout(_("Can't thaw game in %s") % scanner.token) - return + return True game = pickle.load(fp) fp.close() scanner.chew() @@ -5856,7 +5866,7 @@ def setup(): clrscr() setwnd(message_window) newqad() - if len(game.enemies) - (thing == game.quadrant) - (game.tholian != None): + if len(game.enemies) - (thing == game.quadrant) - (game.tholian is not None): game.shldup = True if game.neutz: # bad luck to start in a Romulan Neutral Zone attack(torps_ok=False) @@ -6117,7 +6127,7 @@ def setpassword(): proutn(_("Please type in a secret password- ")) scanner.nexttok() game.passwd = scanner.token - if game.passwd != None: + if game.passwd is not None: break else: game.passwd = "" @@ -6653,7 +6663,7 @@ if __name__ == '__main__': else: game.options |= OPTION_TTY seed = int(time.time()) - (options, arguments) = getopt.getopt(sys.argv[1:], "r:s:txV") + (options, arguments) = getopt.getopt(sys.argv[1:], "cr:s:txV") replay = False for (switch, val) in options: if switch == '-r': @@ -6682,6 +6692,8 @@ if __name__ == '__main__': game.options &=~ OPTION_CURSES elif switch == '-x': game.idebug = True + elif switch == '-c': # Enable curses debugging - undocumented + game.cdebug = True elif switch == '-V': print("SST2K", version) raise SystemExit(0)