X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.py;h=fe29b948d11870230dff7c043789bc50e9474b44;hp=3c40cabcea1d7137a8344bd64f96ecacfd83c259;hb=8daf76bb73f4194657e8c215f542a14ea162eeda;hpb=e67cf36a789c4ab1cd905a9a08e91d219395f538 diff --git a/src/sst.py b/src/sst.py index 3c40cab..fe29b94 100644 --- a/src/sst.py +++ b/src/sst.py @@ -1,246 +1,75 @@ #!/usr/bin/env python """ -sst.py =-- Super Star Trek in Python - -This code is a Python translation of a C translation of a FORTRAN original. -The FORTRANness still shows in many ways, notably the use of a lot of -parallel arrays where a more modern language would use structures -or objects. (However, 1-origin array indexing was fixed.) - -Dave Matuszek says: - -SRSCAN, MOVE, PHASERS, CALL, STATUS, IMPULSE, PHOTONS, ABANDON, -LRSCAN, WARP, SHIELDS, DESTRUCT, CHART, REST, DOCK, QUIT, and DAMAGE -were in the original non-"super" version of UT FORTRAN Star Trek. - -Tholians were not in the original. Dave is dubious about their merits. -(They are now controlled by OPTION_THOLIAN and turned off if the game -type is "plain".) - -Planets and dilithium crystals were not in the original. Dave is OK -with this idea. (It's now controlled by OPTION_PLANETS and turned -off if the game type is "plain".) +sst.py -- Super Star Trek 2K -Dave says the bit about the Galileo getting turned into a -McDonald's is "consistant with our original vision". (This has been -left permanently enabled, as it can only happen if OPTION_PLANETS -is on.) +SST2K is a Python translation of a C translation of a FORTRAN +original dating back to 1973. Beautiful Python it is not, but it +works. Translation by Eric S. Raymond; original game by David Matuszek +and Paul Reynolds, with modifications by Don Smith, Tom Almy, +Stas Sergeev, and Eric S. Raymond. -Dave also says the Space Thingy should not be preserved across saved -games, so you can't prove to others that you've seen it. He says it -shouldn't fire back, either. It should do nothing except scream and -disappear when hit by photon torpedos. It's OK that it may move -when attacked, but it didn't in the original. (Whether the Thingy -can fire back is now controlled by OPTION_THINGY and turned off if the -game type is "plain" or "almy". The no-save behavior has been restored.) - -The Faerie Queen, black holes, and time warping were in the original. - -Here are Tom Almy's changes: - -In early 1997, I got the bright idea to look for references to -"Super Star Trek" on the World Wide Web. There weren't many hits, -but there was one that came up with 1979 Fortran sources! This -version had a few additional features that mine didn't have, -however mine had some feature it didn't have. So I merged its -features that I liked. I also took a peek at the DECUS version (a -port, less sources, to the PDP-10), and some other variations. - -1, Compared to the original UT version, I've changed the "help" command to -"call" and the "terminate" command to "quit" to better match -user expectations. The DECUS version apparently made those changes -as well as changing "freeze" to "save". However I like "freeze". -(Both "freeze" and "save" work in SST2K.) - -2. The experimental deathray originally had only a 5% chance of -success, but could be used repeatedly. I guess after a couple -years of use, it was less "experimental" because the 1979 -version had a 70% success rate. However it was prone to breaking -after use. I upgraded the deathray, but kept the original set of -failure modes (great humor!). (Now controlled by OPTION_DEATHRAY -and turned off if game type is "plain".) - -3. The 1979 version also mentions srscan and lrscan working when -docked (using the starbase's scanners), so I made some changes here -to do this (and indicating that fact to the player), and then realized -the base would have a subspace radio as well -- doing a Chart when docked -updates the star chart, and all radio reports will be heard. The Dock -command will also give a report if a base is under attack. - -4. Tholian Web from the 1979 version. (Now controlled by -OPTION_THOLIAN and turned off if game type is "plain".) - -5. Enemies can ram the Enterprise. (Now controlled by OPTION_RAMMING -and turned off if game type is "plain".) - -6. Regular Klingons and Romulans can move in Expert and Emeritus games. -This code could use improvement. (Now controlled by OPTION_MVBADDY -and turned off if game type is "plain".) - -7. The deep-space probe feature from the DECUS version. (Now controlled -by OPTION_PROBE and turned off if game type is "plain"). - -8. 'emexit' command from the 1979 version. - -9. Bugfix: Klingon commander movements are no longer reported if long-range -sensors are damaged. - -10. Bugfix: Better base positioning at startup (more spread out). -That made sense to add because most people abort games with -bad base placement. - -In June 2002, I fixed two known bugs and a documentation typo. -In June 2004 I fixed a number of bugs involving: 1) parsing invalid -numbers, 2) manual phasers when SR scan is damaged and commander is -present, 3) time warping into the future, 4) hang when moving -klingons in crowded quadrants. (These fixes are in SST2K.) - -Here are Stas Sergeev's changes: - -1. The Space Thingy can be shoved, if you ram it, and can fire back if -fired upon. (Now controlled by OPTION_THINGY and turned off if game -type is "plain" or "almy".) - -2. When you are docked, base covers you with an almost invincible shield. -(A commander can still ram you, or a Romulan can destroy the base, -or a SCom can even succeed with direct attack IIRC, but this rarely -happens.) (Now controlled by OPTION_BASE and turned off if game -type is "plain" or "almy".) - -3. Ramming a black hole is no longer instant death. There is a -chance you might get timewarped instead. (Now controlled by -OPTION_BLKHOLE and turned off if game type is "plain" or "almy".) - -4. The Tholian can be hit with phasers. - -5. SCom can't escape from you if no more enemies remain -(without this, chasing SCom can take an eternity). - -6. Probe target you enter is now the destination quadrant. Before I don't -remember what it was, but it was something I had difficulty using. - -7. Secret password is now autogenerated. - -8. "Plaque" is adjusted for A4 paper :-) - -9. Phasers now tells you how much energy needed, but only if the computer -is alive. - -10. Planets are auto-scanned when you enter the quadrant. - -11. Mining or using crystals in presense of enemy now yields an attack. -There are other minor adjustments to what yields an attack -and what does not. - -12. "freeze" command reverts to "save", most people will understand this -better anyway. (SST2K recognizes both.) - -13. Screen-oriented interface, with sensor scans always up. (SST2K -supports both screen-oriented and TTY modes.) - -Eric Raymond's changes: - -Mainly, I translated this C code out of FORTRAN into C -- created #defines -for a lot of magic numbers and refactored the heck out of it. - -1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good. - -2. Status report now indicates when dilithium crystals are on board. - -3. Per Dave Matuszek's remarks, Thingy state is never saved across games. - -4. Added game option selection so you can play a close (but not bug-for- -bug identical) approximation of older versions. - -5. Half the quadrants now have inhabited planets, from which one -cannot mine dilithium (there will still be the same additional number -of dilithium-bearing planets). Torpedoing an inhabited world is *bad*. -There is BSD-Trek-like logic for Klingons to attack and enslave -inhabited worlds, producing more ships (only is skill is 'good' or -better). (Controlled by OPTION_WORLDS and turned off if game -type is "plain" or "almy".) - -6. User input is now logged so we can do regression testing. - -7. More BSD-Trek features: You can now lose if your entire crew -dies in battle. When abandoning ship in a game with inhabited -worlds enabled, they must have one in the quadrant to beam down -to; otherwise they die in space and this counts heavily against -your score. Docking at a starbase replenishes your crew. - -8. Still more BSD-Trek: we now have a weighted damage table. -Also, the nav subsystem (enabling automatic course -setting) can be damaged separately from the main computer (which -handles weapons targeting, ETA calculation, and self-destruct). - -After these features were added, I translated this into Python and added -more: - -9. A long-range scan is done silently whenever you call CHART; thus -the LRSCAN command is no longer needed. (Controlled by OPTION_AUTOSCAN -and turned off if game type is "plain" or "almy".) +See the doc/HACKING file in the distribution for designers notes and advice +ion how to modify (and how not to modify!) this code. """ -import os,sys,math,curses,time,atexit,readline,cPickle,random,getopt,copy +import os, sys, math, curses, time, readline, cPickle, random, copy, gettext, getpass SSTDOC = "/usr/share/doc/sst/sst.doc" DOC_NAME = "sst.doc" -# Stub to be replaced -def _(str): return str - -PHASEFAC = 2.0 -GALSIZE = 8 -NINHAB = (GALSIZE * GALSIZE / 2) -MAXUNINHAB = 10 -PLNETMAX = (NINHAB + MAXUNINHAB) -QUADSIZE = 10 -BASEMIN = 2 -BASEMAX = (GALSIZE * GALSIZE / 12) -MAXKLGAME = 127 -MAXKLQUAD = 9 -FULLCREW = 428 # BSD Trek was 387, that's wrong -FOREVER = 1e30 -MAXBURST = 3 -MINCMDR = 10 - -# These functions hide the difference between 0-origin and 1-origin addressing. -def VALID_QUADRANT(x, y): return ((x)>=0 and (x)=0 and (y)=0 and (x)=0 and (y)=0 and self.i=0 and self.j=0 and self.i=0 and self.j %s" % (self, (self / QUADSIZE).roundtogrid()) + return self.roundtogrid() / QUADSIZE + def sector(self): + return self.roundtogrid() % QUADSIZE def scatter(self): s = coord() s.i = self.i + randrange(-1, 2) s.j = self.j + randrange(-1, 2) return s - def __hash__(self): - return hash((x, y)) def __str__(self): if self.i == None or self.j == None: return "Nowhere" @@ -340,9 +173,9 @@ class snapshot: self.baseq = [] # Base quadrant coordinates self.kcmdr = [] # Commander quadrant coordinates self.kscmdr = coord() # Supercommander quadrant coordinates - # the galaxy (subscript 0 not used) + # the galaxy self.galaxy = fill2d(GALSIZE, lambda i, j: quadrant()) - # the starchart (subscript 0 not used) + # the starchart self.chart = fill2d(GALSIZE, lambda i, j: page()) class event: @@ -368,6 +201,7 @@ OPTION_WORLDS = 0x00000800 # logic for inhabited worlds (ESR, 2006) OPTION_AUTOSCAN = 0x00001000 # automatic LRSCAN before CHART (ESR, 2006) OPTION_PLAIN = 0x01000000 # user chose plain game OPTION_ALMY = 0x02000000 # user chose Almy variant +OPTION_COLOR = 0x04000000 # enable color display (experimental, ESR, 2010) # Define devices DSRSENS = 0 @@ -414,39 +248,37 @@ FENSLV = 10 # Inhabited word is enslaved */ FREPRO = 11 # Klingons build a ship in an enslaved system NEVENTS = 12 -# -# abstract out the event handling -- underlying data structures will change -# when we implement stateful events -# +# Abstract out the event handling -- underlying data structures will change +# when we implement stateful events def findevent(evtype): return game.future[evtype] class enemy: def __init__(self, type=None, loc=None, power=None): self.type = type - self.kloc = coord() + self.location = coord() if loc: self.move(loc) - self.kpower = power # enemy energy level + self.power = power # enemy energy level game.enemies.append(self) def move(self, loc): - motion = (loc != self.kloc) - if self.kloc.i is not None and self.kloc.j is not None: + motion = (loc != self.location) + if self.location.i is not None and self.location.j is not None: if motion: - if self.type == IHT: - game.quad[self.kloc.i][self.kloc.j] = IHWEB + if self.type == 'T': + game.quad[self.location.i][self.location.j] = '#' else: - game.quad[self.kloc.i][self.kloc.j] = IHDOT + game.quad[self.location.i][self.location.j] = '.' if loc: - self.kloc = copy.copy(loc) - game.quad[self.kloc.i][self.kloc.j] = self.type + self.location = copy.copy(loc) + game.quad[self.location.i][self.location.j] = self.type self.kdist = self.kavgd = (game.sector - loc).distance() else: - self.kloc = coord() + self.location = coord() self.kdist = self.kavgd = None game.enemies.remove(self) return motion def __repr__(self): - return "<%s,%s.%f>" % (self.type, self.kloc, self.kpower) # For debugging + return "<%s,%s.%f>" % (self.type, self.location, self.power) # For debugging class gamestate: def __init__(self): @@ -466,7 +298,6 @@ class gamestate: self.base = None # position of base in current quadrant self.battle = None # base coordinates being attacked self.plnet = None # location of planet in quadrant - self.probec = None # current probe quadrant self.gamewon = False # Finished! self.ididit = False # action taken -- allows enemy to attack self.alive = False # we are alive (not killed) @@ -507,9 +338,8 @@ class gamestate: self.iplnet = None # planet # in quadrant self.inplan = 0 # initial planets self.irhere = 0 # Romulans in quadrant - self.isatb = 0 # =1 if super commander is attacking base + self.isatb = 0 # =2 if super commander is attacking base self.tourn = None # tournament number - self.proben = 0 # number of moves for probe self.nprobes = 0 # number of probes available self.inresor = 0.0 # initial resources self.intime = 0.0 # initial time @@ -520,19 +350,12 @@ class gamestate: self.energy = 0.0 # energy level self.shield = 0.0 # shield level self.warpfac = 0.0 # warp speed - self.wfacsq = 0.0 # squared warp factor self.lsupres = 0.0 # life support reserves - self.dist = 0.0 # movement distance - self.direc = 0.0 # movement direction self.optime = 0.0 # time taken by current operation - self.docfac = 0.0 # repair factor when docking (constant?) self.damfac = 0.0 # damage factor self.lastchart = 0.0 # time star chart was last updated self.cryprob = 0.0 # probability that crystal will work - self.probex = 0.0 # location of probe - self.probey = 0.0 # - self.probeinx = 0.0 # probe x,y increment - self.probeiny = 0.0 # + self.probe = None # object holding probe course info self.height = 0.0 # height of orbit around planet def recompute(self): # Stas thinks this should be (C expression): @@ -542,28 +365,7 @@ class gamestate: # after killing the last klingon when score is shown -- perhaps also # if the only remaining klingon is SCOM. game.state.remtime = game.state.remres/(game.state.remkl + 4*len(game.state.kcmdr)) -# From enumerated type 'feature' -IHR = 'R' -IHK = 'K' -IHC = 'C' -IHS = 'S' -IHSTAR = '*' -IHP = 'P' -IHW = '@' -IHB = 'B' -IHBLANK = ' ' -IHDOT = '.' -IHQUEST = '?' -IHE = 'E' -IHF = 'F' -IHT = 'T' -IHWEB = '#' -IHMATER0 = '-' -IHMATER1 = 'o' -IHMATER2 = '0' - - -# From enumerated type 'FINTYPE' + FWON = 0 FDEPLETE = 1 FLIFESUP = 2 @@ -587,34 +389,25 @@ FTRIBBLE = 19 FHOLE = 20 FCREW = 21 -# Log the results of pulling random numbers so we can check determinism. - -import traceback - def withprob(p): - v = random.random() - #logfp.write("# withprob(%s) -> %f (%s) at %s\n" % (p, v, v %s at %s\n" % (args, v, traceback.extract_stack()[-2][1:])) - return v + return random.randrange(*args) def randreal(*args): v = random.random() if len(args) == 1: - v *= args[0] # returns from [0, args[0]) + v *= args[0] # from [0, args[0]) elif len(args) == 2: - v = args[0] + v*(args[1]-args[0]) # returns from [args[0], args[1]) - #logfp.write("# randreal%s -> %s at %s\n" % (args, v, traceback.extract_stack()[-2][1:])) + v = args[0] + v*(args[1]-args[0]) # from [args[0], args[1]) return v # Code from ai.c begins here def welcoming(iq): "Would this quadrant welcome another Klingon?" - return VALID_QUADRANT(iq.i,iq.j) and \ + return iq.valid_quadrant() and \ not game.state.galaxy[iq.i][iq.j].supernova and \ game.state.galaxy[iq.i][iq.j].klingons < MAXKLQUAD @@ -625,24 +418,24 @@ def tryexit(enemy, look, irun): iq.j = game.quadrant.j+(look.j+(QUADSIZE-1))/QUADSIZE - 1 if not welcoming(iq): return False; - if enemy.type == IHR: + if enemy.type == 'R': return False; # Romulans cannot escape! if not irun: # avoid intruding on another commander's territory - if enemy.type == IHC: + if enemy.type == 'C': if iq in game.state.kcmdr: return False # refuse to leave if currently attacking starbase if game.battle == game.quadrant: return False # don't leave if over 1000 units of energy - if enemy.kpower > 1000.0: + if enemy.power > 1000.0: return False # emit escape message and move out of quadrant. # we know this if either short or long range sensors are working if not damaged(DSRSENS) or not damaged(DLRSENS) or \ game.condition == "docked": - prout(crmena(True, enemy.type, "sector", enemy.kloc) + \ + prout(crmena(True, enemy.type, "sector", enemy.location) + \ (_(" escapes to Quadrant %s (and regains strength).") % q)) # handle local matters related to escape enemy.move(None) @@ -652,7 +445,7 @@ def tryexit(enemy, look, irun): # Handle global matters related to escape game.state.galaxy[game.quadrant.i][game.quadrant.j].klingons -= 1 game.state.galaxy[iq.i][iq.j].klingons += 1 - if enemy.type==IHS: + if enemy.type=='S': game.iscate = False game.ientesc = False game.isatb = 0 @@ -666,7 +459,6 @@ def tryexit(enemy, look, irun): break return True; # success -# # The bad-guy movement algorithm: # # 1. Enterprise has "force" based on condition of phaser and photon torpedoes. @@ -704,7 +496,6 @@ def tryexit(enemy, look, irun): # retreat, especially at high skill levels. # # 5. Motion is limited to skill level, except for SC hi-tailing it out. -# def movebaddy(enemy): "Tactical movement for the bad guys." @@ -718,13 +509,13 @@ def movebaddy(enemy): dist1 = enemy.kdist mdist = int(dist1 + 0.5); # Nearest integer distance # If SC, check with spy to see if should hi-tail it - if enemy.type==IHS and \ - (enemy.kpower <= 500.0 or (game.condition=="docked" and not damaged(DPHOTON))): + if enemy.type=='S' and \ + (enemy.power <= 500.0 or (game.condition=="docked" and not damaged(DPHOTON))): irun = True motion = -QUADSIZE else: # decide whether to advance, retreat, or hold position - forces = enemy.kpower+100.0*len(game.enemies)+400*(nbaddys-1) + forces = enemy.power+100.0*len(game.enemies)+400*(nbaddys-1) if not game.shldup: forces += 1000; # Good for enemy if shield is down! if not damaged(DPHASER) or not damaged(DPHOTON): @@ -759,10 +550,7 @@ def movebaddy(enemy): else: motion = game.skill # calculate preferred number of steps - if motion < 0: - nsteps = -motion - else: - nsteps = motion + nsteps = abs(int(motion)) if motion > 0 and nsteps > mdist: nsteps = mdist; # don't overshoot if nsteps > QUADSIZE: @@ -772,22 +560,13 @@ def movebaddy(enemy): if idebug: proutn("NSTEPS = %d:" % nsteps) # Compute preferred values of delta X and Y - m = game.sector - enemy.kloc + m = game.sector - enemy.location if 2.0 * abs(m.i) < abs(m.j): m.i = 0 - if 2.0 * abs(m.j) < abs(game.sector.i-enemy.kloc.i): + if 2.0 * abs(m.j) < abs(game.sector.i-enemy.location.i): m.j = 0 - if m.i != 0: - if m.i*motion < 0: - m.i = -1 - else: - m.i = 1 - if m.j != 0: - if m.j*motion < 0: - m.j = -1 - else: - m.j = 1 - next = enemy.kloc + m = (motion * m).sgn() + next = enemy.location # main move loop for ll in range(nsteps): if idebug: @@ -795,13 +574,13 @@ def movebaddy(enemy): # Check if preferred position available look = next + m if m.i < 0: - krawlx = 1 + krawli = 1 else: - krawlx = -1 + krawli = -1 if m.j < 0: - krawly = 1 + krawlj = 1 else: - krawly = -1 + krawlj = -1 success = False attempts = 0; # Settle mysterious hang problem while attempts < 20 and not success: @@ -809,29 +588,29 @@ def movebaddy(enemy): if look.i < 0 or look.i >= QUADSIZE: if motion < 0 and tryexit(enemy, look, irun): return - if krawlx == m.i or m.j == 0: + if krawli == m.i or m.j == 0: break - look.i = next.i + krawlx - krawlx = -krawlx + look.i = next.i + krawli + krawli = -krawli elif look.j < 0 or look.j >= QUADSIZE: if motion < 0 and tryexit(enemy, look, irun): return - if krawly == m.j or m.i == 0: + if krawlj == m.j or m.i == 0: break - look.j = next.j + krawly - krawly = -krawly - elif (game.options & OPTION_RAMMING) and game.quad[look.i][look.j] != IHDOT: + look.j = next.j + krawlj + krawlj = -krawlj + elif (game.options & OPTION_RAMMING) and game.quad[look.i][look.j] != '.': # See if enemy should ram ship if game.quad[look.i][look.j] == game.ship and \ - (enemy.type == IHC or enemy.type == IHS): + (enemy.type == 'C' or enemy.type == 'S'): collision(rammed=True, enemy=enemy) return - if krawlx != m.i and m.j != 0: - look.i = next.i + krawlx - krawlx = -krawlx - elif krawly != m.j and m.i != 0: - look.j = next.j + krawly - krawly = -krawly + if krawli != m.i and m.j != 0: + look.i = next.i + krawli + krawli = -krawli + elif krawlj != m.j and m.i != 0: + look.j = next.j + krawlj + krawlj = -krawlj else: break; # we have failed else: @@ -846,7 +625,7 @@ def movebaddy(enemy): skip(1) if enemy.move(next): if not damaged(DSRSENS) or game.condition == "docked": - proutn(_("*** %s from Sector %s") % (cramen(enemy.type), enemy.kloc)) + proutn(_("*** %s from Sector %s") % (cramen(enemy.type), enemy.location)) if enemy.kdist < dist1: proutn(_(" advances to ")) else: @@ -861,11 +640,11 @@ def moveklings(): # and do move if game.quadrant in game.state.kcmdr: for enemy in game.enemies: - if enemy.type == IHC: + if enemy.type == 'C': movebaddy(enemy) if game.state.kscmdr==game.quadrant: for enemy in game.enemies: - if enemy.type == IHS: + if enemy.type == 'S': movebaddy(enemy) break # If skill level is high, move other Klingons and Romulans too! @@ -873,7 +652,7 @@ def moveklings(): # commander(s) do. if game.skill >= SKILL_EXPERT and (game.options & OPTION_MVBADDY): for enemy in game.enemies: - if enemy.type in (IHK, IHR): + if enemy.type in ('K', 'R'): movebaddy(enemy) game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) @@ -881,21 +660,21 @@ def movescom(iq, avoid): "Commander movement helper." # Avoid quadrants with bases if we want to avoid Enterprise if not welcoming(iq) or (avoid and iq in game.state.baseq): - return True + return False if game.justin and not game.iscate: - return True + return False # do the move game.state.galaxy[game.state.kscmdr.i][game.state.kscmdr.j].klingons -= 1 game.state.kscmdr = iq game.state.galaxy[game.state.kscmdr.i][game.state.kscmdr.j].klingons += 1 if game.state.kscmdr==game.quadrant: - # SC has scooted, Remove him from current quadrant + # SC has scooted, remove him from current quadrant game.iscate=False game.isatb=0 game.ientesc = False unschedule(FSCDBAS) for enemy in game.enemies: - if enemy.type == IHS: + if enemy.type == 'S': break enemy.move(None) game.klhere -= 1 @@ -915,7 +694,7 @@ def movescom(iq, avoid): proutn(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr) prout(_(" by the Super-commander.\"")) break - return False; # looks good! + return True; # looks good! def supercommander(): "Move the Super Commander." @@ -929,7 +708,7 @@ def supercommander(): if not game.iscate and avoid: # compute move away from Enterprise idelta = game.state.kscmdr-game.quadrant - if math.sqrt(idelta.i*idelta.i+idelta.j*idelta.j) > 2.0: + if idelta.distance() > 2.0: # circulate in space idelta.i = game.state.kscmdr.j-game.quadrant.j idelta.j = game.quadrant.i-game.state.kscmdr.i @@ -973,24 +752,24 @@ def supercommander(): # there was what looked like a bug in the Almy C code here, # but it might be this translation is just wrong. iq = game.state.kscmdr + idelta - if movescom(iq, avoid): + if not movescom(iq, avoid): # failed -- try some other maneuvers if idelta.i==0 or idelta.j==0: # attempt angle move if idelta.i != 0: iq.j = game.state.kscmdr.j + 1 - if movescom(iq, avoid): + if not movescom(iq, avoid): iq.j = game.state.kscmdr.j - 1 movescom(iq, avoid) - else: + elif idelta.j != 0: iq.i = game.state.kscmdr.i + 1 - if movescom(iq, avoid): + if not movescom(iq, avoid): iq.i = game.state.kscmdr.i - 1 movescom(iq, avoid) else: # try moving just in x or y iq.j = game.state.kscmdr.j - if movescom(iq, avoid): + if not movescom(iq, avoid): iq.j = game.state.kscmdr.j + idelta.j iq.i = game.state.kscmdr.i movescom(iq, avoid) @@ -998,7 +777,7 @@ def supercommander(): if len(game.state.baseq) == 0: unschedule(FSCMOVE) else: - for (i, ibq) in enumerate(game.state.baseq): + for ibq in game.state.baseq: if ibq == game.state.kscmdr and game.state.kscmdr == game.battle: # attack the base if avoid: @@ -1041,13 +820,13 @@ def movetholian(): if not game.tholian or game.justin: return id = coord() - if game.tholian.kloc.i == 0 and game.tholian.kloc.j == 0: + if game.tholian.location.i == 0 and game.tholian.location.j == 0: id.i = 0; id.j = QUADSIZE-1 - elif game.tholian.kloc.i == 0 and game.tholian.kloc.j == QUADSIZE-1: + elif game.tholian.location.i == 0 and game.tholian.location.j == QUADSIZE-1: id.i = QUADSIZE-1; id.j = QUADSIZE-1 - elif game.tholian.kloc.i == QUADSIZE-1 and game.tholian.kloc.j == QUADSIZE-1: + elif game.tholian.location.i == QUADSIZE-1 and game.tholian.location.j == QUADSIZE-1: id.i = QUADSIZE-1; id.j = 0 - elif game.tholian.kloc.i == QUADSIZE-1 and game.tholian.kloc.j == 0: + elif game.tholian.location.i == QUADSIZE-1 and game.tholian.location.j == 0: id.i = 0; id.j = 0 else: # something is wrong! @@ -1055,34 +834,34 @@ def movetholian(): prout("***Internal error: Tholian in a bad spot.") return # do nothing if we are blocked - if game.quad[id.i][id.j] not in (IHDOT, IHWEB): + if game.quad[id.i][id.j] not in ('.', '#'): return - here = copy.copy(game.tholian.kloc) - delta = (id - game.tholian.kloc).sgn() + here = copy.copy(game.tholian.location) + delta = (id - game.tholian.location).sgn() # move in x axis while here.i != id.i: here.i += delta.i - if game.quad[here.i][here.j]==IHDOT: + if game.quad[here.i][here.j]=='.': game.tholian.move(here) # move in y axis while here.j != id.j: here.j += delta.j - if game.quad[here.i][here.j]==IHDOT: + if game.quad[here.i][here.j]=='.': game.tholian.move(here) # check to see if all holes plugged for i in range(QUADSIZE): - if game.quad[0][i]!=IHWEB and game.quad[0][i]!=IHT: + if game.quad[0][i]!='#' and game.quad[0][i]!='T': return - if game.quad[QUADSIZE][i]!=IHWEB and game.quad[QUADSIZE][i]!=IHT: + if game.quad[QUADSIZE-1][i]!='#' and game.quad[QUADSIZE-1][i]!='T': return - if game.quad[i][0]!=IHWEB and game.quad[i][0]!=IHT: + if game.quad[i][0]!='#' and game.quad[i][0]!='T': return - if game.quad[i][QUADSIZE]!=IHWEB and game.quad[i][QUADSIZE]!=IHT: + if game.quad[i][QUADSIZE-1]!='#' and game.quad[i][QUADSIZE-1]!='T': return # All plugged up -- Tholian splits - game.quad[game.tholian.kloc.i][game.tholian.kloc.j]=IHWEB - dropin(IHBLANK) - prout(crmena(True, IHT, "sector", game.tholian) + _(" completes web.")) + game.quad[game.tholian.location.i][game.tholian.location.j]='#' + dropin(' ') + prout(crmena(True, 'T', "sector", game.tholian) + _(" completes web.")) game.tholian.move(None) return @@ -1096,7 +875,7 @@ def doshield(shraise): action = "SHUP" else: key = scanner.next() - if key == IHALPHA: + if key == "IHALPHA": if scanner.sees("transfer"): action = "NRG" else: @@ -1110,7 +889,6 @@ def doshield(shraise): if action=="NONE": proutn(_("Do you wish to change shield energy? ")) if ja() == True: - proutn(_("Energy to transfer to shields- ")) action = "NRG" elif damaged(DSHIELD): prout(_("Shields damaged and down.")) @@ -1155,24 +933,25 @@ def doshield(shraise): game.ididit = True return elif action == "NRG": - while scanner.next() != IHREAL: + while scanner.next() != "IHREAL": scanner.chew() proutn(_("Energy to transfer to shields- ")) + nrg = scanner.real scanner.chew() - if scanner.real == 0: + if nrg == 0: return - if scanner.real > game.energy: + if nrg > game.energy: prout(_("Insufficient ship energy.")) return game.ididit = True - if game.shield+scanner.real >= game.inshld: + if game.shield+nrg >= game.inshld: prout(_("Shield energy maximized.")) - if game.shield+scanner.real > game.inshld: + if game.shield+nrg > game.inshld: prout(_("Excess energy requested returned to ship energy")) game.energy -= game.inshld-game.shield game.shield = game.inshld return - if scanner.real < 0.0 and game.energy-scanner.real > game.inenrg: + if nrg < 0.0 and game.energy-nrg > game.inenrg: # Prevent shield drain loophole skip(1) prout(_("Engineering to bridge--")) @@ -1180,50 +959,28 @@ def doshield(shraise): prout(_(" I can't drain the shields.")) game.ididit = False return - if game.shield+scanner.real < 0: + if game.shield+nrg < 0: prout(_("All shield energy transferred to ship.")) game.energy += game.shield game.shield = 0.0 return proutn(_("Scotty- \"")) - if scanner.real > 0: + if nrg > 0: prout(_("Transferring energy to shields.\"")) else: prout(_("Draining energy from shields.\"")) - game.shield += scanner.real - game.energy -= scanner.real + game.shield += nrg + game.energy -= nrg return def randdevice(): "Choose a device to damage, at random." - # Quoth Eric Allman in the code of BSD-Trek: - # "Under certain conditions you can get a critical hit. This - # sort of hit damages devices. The probability that a given - # device is damaged depends on the device. Well protected - # devices (such as the computer, which is in the core of the - # ship and has considerable redundancy) almost never get - # damaged, whereas devices which are exposed (such as the - # warp engines) or which are particularly delicate (such as - # the transporter) have a much higher probability of being - # damaged." - # - # This is one place where OPTION_PLAIN does not restore the - # original behavior, which was equiprobable damage across - # all devices. If we wanted that, we'd return randrange(NDEVICES) - # and have done with it. Also, in the original game, DNAVYS - # and DCOMPTR were the same device. - # - # Instead, we use a table of weights similar to the one from BSD Trek. - # BSD doesn't have the shuttle, shield controller, death ray, or probes. - # We don't have a cloaking device. The shuttle got the allocation - # for the cloaking device, then we shaved a half-percent off - # everything to have some weight to give DSHCTRL/DDRAY/DDSP. weights = ( 105, # DSRSENS: short range scanners 10.5% 105, # DLRSENS: long range scanners 10.5% 120, # DPHASER: phasers 12.0% 120, # DPHOTON: photon torpedoes 12.0% - 25, # DLIFSUP: life support 2.5% + 25, # DLIFSUP: life support 2.5% 65, # DWARPEN: warp drive 6.5% 70, # DIMPULS: impulse engines 6.5% 145, # DSHIELD: deflector shields 14.5% @@ -1232,11 +989,12 @@ def randdevice(): 15, # DCOMPTR: computer 1.5% 20, # NAVCOMP: navigation system 2.0% 75, # DTRANSP: transporter 7.5% - 20, # DSHCTRL: high-speed shield controller 2.0% + 20, # DSHCTRL: high-speed shield controller 2.0% 10, # DDRAY: death ray 1.0% 30, # DDSP: deep-space probes 3.0% ) - idx = randrange(1000) # weights must sum to 1000 + assert(sum(weights) == 1000) + idx = randrange(1000) sum = 0 for (i, w) in enumerate(weights): sum += w @@ -1252,16 +1010,16 @@ def collision(rammed, enemy): skip(2) proutn("***") proutn(crmshp()) - hardness = {IHR:1.5, IHC:2.0, IHS:2.5, IHT:0.5, IHQUEST:4.0}.get(enemy.type, 1.0) + hardness = {'R':1.5, 'C':2.0, 'S':2.5, 'T':0.5, '?':4.0}.get(enemy.type, 1.0) if rammed: proutn(_(" rammed by ")) else: proutn(_(" rams ")) - proutn(crmena(False, enemy.type, "sector", enemy.kloc)) + proutn(crmena(False, enemy.type, "sector", enemy.location)) if rammed: proutn(_(" (original position)")) skip(1) - deadkl(enemy.kloc, enemy.type, game.sector) + deadkl(enemy.location, enemy.type, game.sector) proutn("***" + crmship() + " heavily damaged.") icas = randrange(10, 30) prout(_("***Sickbay reports %d casualties"), icas) @@ -1287,156 +1045,146 @@ def collision(rammed, enemy): finish(FWON) return -def torpedo(origin, course, dispersion, number, nburst): +def torpedo(origin, bearing, dispersion, number, nburst): "Let a photon torpedo fly" - shoved = False - ac = course + 0.25*dispersion - angle = (15.0-ac)*0.5235988 - bullseye = (15.0 - course)*0.5235988 - delta = coord(-math.sin(angle), math.cos(angle)) - bigger = max(abs(delta.i), abs(delta.j)) - delta /= bigger - x = origin.i; y = origin.j - w = coord(0, 0); jw = coord(0, 0) if not damaged(DSRSENS) or game.condition=="docked": setwnd(srscan_window) else: setwnd(message_window) + ac = bearing + 0.25*dispersion # dispersion is a random variable + bullseye = (15.0 - bearing)*0.5235988 + track = course(bearing=ac, distance=QUADSIZE, origin=cartesian(origin)) + bumpto = coord(0, 0) # Loop to move a single torpedo - for step in range(1, 15+1): - x += delta.i - y += delta.j - w = coord(x, y).snaptogrid() - if not VALID_SECTOR(w.i, w.j): + setwnd(message_window) + for step in range(1, QUADSIZE*2): + if not track.next(): break + w = track.sector() + if not w.valid_sector(): break iquad=game.quad[w.i][w.j] tracktorpedo(origin, w, step, number, nburst, iquad) - if iquad==IHDOT: + if iquad=='.': continue # hit something - setwnd(message_window) - if damaged(DSRSENS) and not game.condition=="docked": + if not damaged(DSRSENS) or game.condition == "docked": skip(1); # start new line after text track - if iquad in (IHE, IHF): # Hit our ship + if iquad in ('E', 'F'): # Hit our ship skip(1) prout(_("Torpedo hits %s.") % crmshp()) hit = 700.0 + randreal(100) - \ - 1000.0 * (w-origin).distance() * math.fabs(math.sin(bullseye-angle)) + 1000.0 * (w-origin).distance() * math.fabs(math.sin(bullseye-track.angle)) newcnd(); # we're blown out of dock - # We may be displaced. if game.landed or game.condition=="docked": return hit # Cheat if on a planet - ang = angle + 2.5*(randreal()-0.5) - temp = math.fabs(math.sin(ang)) - if math.fabs(math.cos(ang)) > temp: - temp = math.fabs(math.cos(ang)) - xx = -math.sin(ang)/temp - yy = math.cos(ang)/temp - jw.i = int(w.i+xx+0.5) - jw.j = int(w.j+yy+0.5) - if not VALID_SECTOR(jw.i, jw.j): + # In the C/FORTRAN version, dispersion was 2.5 radians, which + # is 143 degrees, which is almost exactly 4.8 clockface units + displacement = course(track.bearing+randreal(-2.4,2.4), distance=2**0.5) + displacement.next() + bumpto = displacement.sector() + if not bumpto.valid_sector(): return hit - if game.quad[jw.i][jw.j]==IHBLANK: + if game.quad[bumpto.i][bumpto.j]==' ': finish(FHOLE) return hit - if game.quad[jw.i][jw.j]!=IHDOT: + if game.quad[bumpto.i][bumpto.j]!='.': # can't move into object return hit - game.sector = jw + game.sector = bumpto proutn(crmshp()) - shoved = True - elif iquad in (IHC, IHS): # Hit a commander - if withprob(0.05): + game.quad[w.i][w.j]='.' + game.quad[bumpto.i][bumpto.j]=iquad + prout(_(" displaced by blast to Sector %s ") % bumpto) + for enemy in game.enemies: + enemy.kdist = enemy.kavgd = (game.sector-enemy.location).distance() + game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) + return None + elif iquad in ('C', 'S', 'R', 'K'): # Hit a regular enemy + # find the enemy + if iquad in ('C', 'S') and withprob(0.05): prout(crmena(True, iquad, "sector", w) + _(" uses anti-photon device;")) prout(_(" torpedo neutralized.")) return None - elif iquad in (IHR, IHK): # Hit a regular enemy - # find the enemy for enemy in game.enemies: - if w == enemy.kloc: + if w == enemy.location: break - kp = math.fabs(enemy.kpower) + kp = math.fabs(enemy.power) h1 = 700.0 + randrange(100) - \ - 1000.0 * (w-origin).distance() * math.fabs(math.sin(bullseye-angle)) + 1000.0 * (w-origin).distance() * math.fabs(math.sin(bullseye-track.angle)) h1 = math.fabs(h1) if kp < h1: h1 = kp - if enemy.kpower < 0: - enemy.kpower -= -h1 + if enemy.power < 0: + enemy.power -= -h1 else: - enemy.kpower -= h1 - if enemy.kpower == 0: + enemy.power -= h1 + if enemy.power == 0: deadkl(w, iquad, w) return None proutn(crmena(True, iquad, "sector", w)) - # If enemy damaged but not destroyed, try to displace - ang = angle + 2.5*(randreal()-0.5) - temp = math.fabs(math.sin(ang)) - if math.fabs(math.cos(ang)) > temp: - temp = math.fabs(math.cos(ang)) - xx = -math.sin(ang)/temp - yy = math.cos(ang)/temp - jw.i = int(w.i+xx+0.5) - jw.j = int(w.j+yy+0.5) - if not VALID_SECTOR(jw.i, jw.j): + displacement = course(track.bearing+randreal(-2.4,2.4), distance=2**0.5) + displacement.next() + bumpto = displacement.sector() + if not bumpto.valid_sector(): prout(_(" damaged but not destroyed.")) return - if game.quad[jw.i][jw.j]==IHBLANK: + if game.quad[bumpto.i][bumpto.j] == ' ': prout(_(" buffeted into black hole.")) - deadkl(w, iquad, jw) - return None - if game.quad[jw.i][jw.j]!=IHDOT: - # can't move into object + deadkl(w, iquad, bumpto) + if game.quad[bumpto.i][bumpto.j] != '.': prout(_(" damaged but not destroyed.")) - return None - proutn(_(" damaged--")) - enemy.kloc = jw - shoved = True - break - elif iquad == IHB: # Hit a base + else: + prout(_(" damaged-- displaced by blast to Sector %s ")%bumpto) + 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() + game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) + return None + elif iquad == 'B': # Hit a base skip(1) prout(_("***STARBASE DESTROYED..")) game.state.baseq = filter(lambda x: x != game.quadrant, game.state.baseq) - game.quad[w.i][w.j]=IHDOT + game.quad[w.i][w.j]='.' game.base.invalidate() game.state.galaxy[game.quadrant.i][game.quadrant.j].starbase -= 1 game.state.chart[game.quadrant.i][game.quadrant.j].starbase -= 1 game.state.basekl += 1 newcnd() return None - elif iquad == IHP: # Hit a planet + elif iquad == 'P': # Hit a planet prout(crmena(True, iquad, "sector", w) + _(" destroyed.")) game.state.nplankl += 1 game.state.galaxy[game.quadrant.i][game.quadrant.j].planet = None game.iplnet.pclass = "destroyed" game.iplnet = None game.plnet.invalidate() - game.quad[w.i][w.j] = IHDOT + game.quad[w.i][w.j] = '.' if game.landed: # captain perishes on planet finish(FDPLANET) return None - elif iquad == IHW: # Hit an inhabited world -- very bad! + elif iquad == '@': # Hit an inhabited world -- very bad! prout(crmena(True, iquad, "sector", w) + _(" destroyed.")) game.state.nworldkl += 1 game.state.galaxy[game.quadrant.i][game.quadrant.j].planet = None game.iplnet.pclass = "destroyed" game.iplnet = None game.plnet.invalidate() - game.quad[w.i][w.j] = IHDOT + game.quad[w.i][w.j] = '.' if game.landed: # captain perishes on planet finish(FDPLANET) - prout(_("You have just destroyed an inhabited planet.")) - prout(_("Celebratory rallies are being held on the Klingon homeworld.")) + prout(_("The torpedo destroyed an inhabited planet.")) return None - elif iquad == IHSTAR: # Hit a star + elif iquad == '*': # Hit a star if withprob(0.9): nova(w) else: - prout(crmena(True, IHSTAR, "sector", w) + _(" unaffected by photon blast.")) + prout(crmena(True, '*', "sector", w) + _(" unaffected by photon blast.")) return None - elif iquad == IHQUEST: # Hit a thingy + elif iquad == '?': # Hit a thingy if not (game.options & OPTION_THINGY) or withprob(0.3): skip(1) prouts(_("AAAAIIIIEEEEEEEEAAAAAAAAUUUUUGGGGGHHHHHHHHHHHH!!!")) @@ -1454,32 +1202,32 @@ def torpedo(origin, course, dispersion, number, nburst): thing.angry = True shoved = True return None - elif iquad == IHBLANK: # Black hole + elif iquad == ' ': # Black hole skip(1) - prout(crmena(True, IHBLANK, "sector", w) + _(" swallows torpedo.")) + prout(crmena(True, ' ', "sector", w) + _(" swallows torpedo.")) return None - elif iquad == IHWEB: # hit the web + elif iquad == '#': # hit the web skip(1) prout(_("***Torpedo absorbed by Tholian web.")) return None - elif iquad == IHT: # Hit a Tholian + elif iquad == 'T': # Hit a Tholian h1 = 700.0 + randrange(100) - \ 1000.0 * (w-origin).distance() * math.fabs(math.sin(bullseye-angle)) h1 = math.fabs(h1) if h1 >= 600: - game.quad[w.i][w.j] = IHDOT + game.quad[w.i][w.j] = '.' deadkl(w, iquad, w) game.tholian = None return None skip(1) - proutn(crmena(True, IHT, "sector", w)) + proutn(crmena(True, 'T', "sector", w)) if withprob(0.05): prout(_(" survives photon blast.")) return None prout(_(" disappears.")) game.tholian.move(None) - game.quad[w.i][w.j] = IHWEB - dropin(IHBLANK) + game.quad[w.i][w.j] = '#' + dropin(' ') return None else: # Problem! skip(1) @@ -1488,16 +1236,6 @@ def torpedo(origin, course, dispersion, number, nburst): skip(1) return None break - if curwnd!=message_window: - setwnd(message_window) - if shoved: - game.quad[w.i][w.j]=IHDOT - game.quad[jw.i][jw.j]=iquad - prout(_(" displaced by blast to Sector %s ") % jw) - for ll in range(len(game.enemies)): - game.enemies[ll].kdist = game.enemies[ll].kavgd = (game.sector-game.enemies[ll].kloc).distance() - game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) - return None skip(1) prout(_("Torpedo missed.")) return None; @@ -1565,43 +1303,43 @@ def attack(torps_ok): if game.skill <= SKILL_FAIR: where = "sector" for enemy in game.enemies: - if enemy.kpower < 0: + if enemy.power < 0: continue; # too weak to attack # compute hit strength and diminish shield power r = randreal() # Increase chance of photon torpedos if docked or enemy energy is low if game.condition == "docked": r *= 0.25 - if enemy.kpower < 500: + if enemy.power < 500: r *= 0.25; - if enemy.type==IHT or (enemy.type==IHQUEST and not thing.angry): + if enemy.type=='T' or (enemy.type=='?' and not thing.angry): continue # different enemies have different probabilities of throwing a torp usephasers = not torps_ok or \ - (enemy.type == IHK and r > 0.0005) or \ - (enemy.type==IHC and r > 0.015) or \ - (enemy.type==IHR and r > 0.3) or \ - (enemy.type==IHS and r > 0.07) or \ - (enemy.type==IHQUEST and r > 0.05) + (enemy.type == 'K' and r > 0.0005) or \ + (enemy.type=='C' and r > 0.015) or \ + (enemy.type=='R' and r > 0.3) or \ + (enemy.type=='S' and r > 0.07) or \ + (enemy.type=='?' and r > 0.05) if usephasers: # Enemy uses phasers if game.condition == "docked": continue; # Don't waste the effort! attempt = True; # Attempt to attack dustfac = randreal(0.8, 0.85) - hit = enemy.kpower*math.pow(dustfac,enemy.kavgd) - enemy.kpower *= 0.75 + hit = enemy.power*math.pow(dustfac,enemy.kavgd) + enemy.power *= 0.75 else: # Enemy uses photon torpedo - #course2 = (enemy.kloc-game.sector).bearing() - course = 1.90985*math.atan2(game.sector.j-enemy.kloc.j, enemy.kloc.i-game.sector.i) + # We should be able to make the bearing() method work here + course = 1.90985*math.atan2(game.sector.j-enemy.location.j, enemy.location.i-game.sector.i) hit = 0 proutn(_("***TORPEDO INCOMING")) if not damaged(DSRSENS): - proutn(_(" From ") + crmena(False, enemy.type, where, enemy.kloc)) + proutn(_(" From ") + crmena(False, enemy.type, where, enemy.location)) attempt = True prout(" ") dispersion = (randreal()+randreal())*0.5 - 0.5 - dispersion += 0.002*enemy.kpower*dispersion - hit = torpedo(enemy.kloc, course, dispersion, number=1, nburst=1) + dispersion += 0.002*enemy.power*dispersion + hit = torpedo(enemy.location, course, dispersion, number=1, nburst=1) if (game.state.remkl + len(game.state.kcmdr) + game.state.nscrem)==0: finish(FWON); # Klingons did themselves in! if game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova or game.alldone: @@ -1634,7 +1372,7 @@ def attack(torps_ok): if (damaged(DSRSENS) and usephasers) or game.skill<=SKILL_FAIR: proutn(_(" on the ") + crmshp()) if not damaged(DSRSENS) and usephasers: - prout(_(" from ") + crmena(False, enemy.type, where, enemy.kloc)) + prout(_(" from ") + crmena(False, enemy.type, where, enemy.location)) skip(1) # Decide if hit is critical if hit > hitmax: @@ -1683,32 +1421,32 @@ def deadkl(w, type, mv): # Added mv to allow enemy to "move" before dying proutn(crmena(True, type, "sector", mv)) # Decide what kind of enemy it is and update appropriately - if type == IHR: - # chalk up a Romulan + if type == 'R': + # Chalk up a Romulan game.state.galaxy[game.quadrant.i][game.quadrant.j].romulans -= 1 game.irhere -= 1 game.state.nromrem -= 1 - elif type == IHT: + elif type == 'T': # Killed a Tholian game.tholian = None - elif type == IHQUEST: + elif type == '?': # Killed a Thingy global thing thing = None else: - # Some type of a Klingon + # Killed some type of Klingon game.state.galaxy[game.quadrant.i][game.quadrant.j].klingons -= 1 game.klhere -= 1 - if type == IHC: + if type == 'C': game.state.kcmdr.remove(game.quadrant) unschedule(FTBEAM) if game.state.kcmdr: schedule(FTBEAM, expran(1.0*game.incom/len(game.state.kcmdr))) if is_scheduled(FCDBAS) and game.battle == game.quadrant: unschedule(FCDBAS) - elif type == IHK: + elif type == 'K': game.state.remkl -= 1 - elif type == IHS: + elif type == 'S': game.state.nscrem -= 1 game.state.kscmdr.invalidate() game.isatb = 0 @@ -1722,14 +1460,14 @@ def deadkl(w, type, mv): game.recompute() # Remove enemy ship from arrays describing local conditions for e in game.enemies: - if e.kloc == w: + if e.location == w: e.move(None) break return def targetcheck(w): "Return None if target is invalid, otherwise return a course angle." - if not VALID_SECTOR(w.i, w.j): + if not w.valid_sector(): huh() return None delta = coord() @@ -1743,7 +1481,7 @@ def targetcheck(w): prout(_(" the Captain's psychological profile.\"")) scanner.chew() return None - return 1.90985932*math.atan2(delta.j, delta.i) + return delta.bearing() def photon(): "Launch photon torpedo." @@ -1760,15 +1498,15 @@ def photon(): # First, get torpedo count while True: scanner.next() - if scanner.token == IHALPHA: + if scanner.token == "IHALPHA": huh() return - elif scanner.token == IHEOL or not scanner.waiting(): + elif scanner.token == "IHEOL" or not scanner.waiting(): prout(_("%d torpedoes left.") % game.torps) scanner.chew() proutn(_("Number of torpedoes to fire- ")) continue # Go back around to get a number - else: # key == IHREAL + else: # key == "IHREAL" n = scanner.int() if n <= 0: # abort command scanner.chew() @@ -1785,24 +1523,24 @@ def photon(): target = [] for i in range(n): key = scanner.next() - if i==0 and key == IHEOL: + if i==0 and key == "IHEOL": break; # no coordinate waiting, we will try prompting - if i==1 and key == IHEOL: + if i==1 and key == "IHEOL": # direct all torpedoes at one target while i < n: - target.append(targets[0]) + target.append(target[0]) course.append(course[0]) i += 1 break - scanner.push(key) + scanner.push(scanner.token) target.append(scanner.getcoord()) if target[-1] == None: return - course.append(targetcheck(target[1])) - if course[i] == None: + course.append(targetcheck(target[-1])) + if course[-1] == None: return scanner.chew() - if i == 0: + if len(target) == 0: # prompt for each one for i in range(n): proutn(_("Target sector for torpedo number %d- ") % (i+1)) @@ -1895,16 +1633,16 @@ def hittem(hits): continue dustfac = randreal(0.9, 1.0) hit = wham*math.pow(dustfac,game.enemies[kk].kdist) - kpini = game.enemies[kk].kpower + kpini = game.enemies[kk].power kp = math.fabs(kpini) if PHASEFAC*hit < kp: kp = PHASEFAC*hit - if game.enemies[kk].kpower < 0: - game.enemies[kk].kpower -= -kp + if game.enemies[kk].power < 0: + game.enemies[kk].power -= -kp else: - game.enemies[kk].kpower -= kp - kpow = game.enemies[kk].kpower - w = game.enemies[kk].kloc + game.enemies[kk].power -= kp + kpow = game.enemies[kk].power + w = game.enemies[kk].location if hit > 0.005: if not damaged(DSRSENS): boom(w) @@ -1912,7 +1650,7 @@ def hittem(hits): else: proutn(_("Very small hit on ")) ienm = game.quad[w.i][w.j] - if ienm==IHQUEST: + if ienm=='?': thing.angry = True proutn(crmena(False, ienm, "sector", w)) skip(1) @@ -1928,7 +1666,7 @@ def hittem(hits): if kpow>0 and withprob(0.9) and kpow <= randreal(0.4, 0.8)*kpini: prout(_("***Mr. Spock- \"Captain, the vessel at Sector %s")%w) prout(_(" has just lost its firepower.\"")) - game.enemies[kk].kpower = -kpow + game.enemies[kk].power = -kpow kk += 1 return @@ -1966,12 +1704,12 @@ def phasers(): # (That was Tom Almy talking about the C code, I think -- ESR) while automode=="NOTSET": key=scanner.next() - if key == IHALPHA: + if key == "IHALPHA": if scanner.sees("manual"): if len(game.enemies)==0: prout(_("There is no enemy present to select.")) scanner.chew() - key = IHEOL + key = "IHEOL" automode="AUTOMATIC" else: automode = "MANUAL" @@ -1989,7 +1727,7 @@ def phasers(): else: huh() return - elif key == IHREAL: + elif key == "IHREAL": if len(game.enemies)==0: prout(_("Energy will be expended into space.")) automode = "AUTOMATIC" @@ -1998,7 +1736,7 @@ def phasers(): else: automode = "AUTOMATIC" else: - # IHEOL + # "IHEOL" if len(game.enemies)==0: prout(_("Energy will be expended into space.")) automode = "AUTOMATIC" @@ -2011,29 +1749,29 @@ def phasers(): if ifast: avail -= 200.0 if automode == "AUTOMATIC": - if key == IHALPHA and scanner.sees("no"): + if key == "IHALPHA" and scanner.sees("no"): no = True key = scanner.next() - if key != IHREAL and len(game.enemies) != 0: + if key != "IHREAL" and len(game.enemies) != 0: prout(_("Phasers locked on target. Energy available: %.2f")%avail) irec=0 while True: scanner.chew() if not kz: for i in range(len(game.enemies)): - irec += math.fabs(game.enemies[i].kpower)/(PHASEFAC*math.pow(0.90,game.enemies[i].kdist))*randreal(1.01, 1.06) + 1.0 + irec += math.fabs(game.enemies[i].power)/(PHASEFAC*math.pow(0.90,game.enemies[i].kdist))*randreal(1.01, 1.06) + 1.0 kz=1 proutn(_("%d units required. ") % irec) scanner.chew() proutn(_("Units to fire= ")) key = scanner.next() - if key!=IHREAL: + if key!="IHREAL": return rpow = scanner.real if rpow > avail: proutn(_("Energy available= %.2f") % avail) skip(1) - key = IHEOL + key = "IHEOL" if not rpow > avail: break if rpow<=0: @@ -2041,7 +1779,7 @@ def phasers(): scanner.chew() return key=scanner.next() - if key == IHALPHA and scanner.sees("no"): + if key == "IHALPHA" and scanner.sees("no"): no = True if ifast: game.energy -= 200; # Go and do it! @@ -2057,7 +1795,7 @@ def phasers(): hits.append(0.0) if powrem <= 0: continue - hits[i] = math.fabs(game.enemies[i].kpower)/(PHASEFAC*math.pow(0.90,game.enemies[i].kdist)) + hits[i] = math.fabs(game.enemies[i].power)/(PHASEFAC*math.pow(0.90,game.enemies[i].kdist)) over = randreal(1.01, 1.06) * hits[i] temp = powrem powrem -= hits[i] + over @@ -2080,7 +1818,7 @@ def phasers(): prout(_("%d expended on empty space.") % int(extra)) elif automode == "FORCEMAN": scanner.chew() - key = IHEOL + key = "IHEOL" if damaged(DCOMPTR): prout(_("Battle computer damaged, manual fire only.")) else: @@ -2094,7 +1832,7 @@ def phasers(): elif automode == "MANUAL": rpow = 0.0 for k in range(len(game.enemies)): - aim = game.enemies[k].kloc + aim = game.enemies[k].location ienm = game.quad[aim.i][aim.j] if msgflag: proutn(_("Energy available= %.2f") % (avail-0.006)) @@ -2102,17 +1840,17 @@ def phasers(): msgflag = False rpow = 0.0 if damaged(DSRSENS) and \ - not game.sector.distance(aim)<2**0.5 and ienm in (IHC, IHS): + not game.sector.distance(aim)<2**0.5 and ienm in ('C', 'S'): prout(cramen(ienm) + _(" can't be located without short range scan.")) scanner.chew() - key = IHEOL + key = "IHEOL" hits[k] = 0; # prevent overflow -- thanks to Alexei Voitenko k += 1 continue - if key == IHEOL: + if key == "IHEOL": scanner.chew() if itarg and k > kz: - irec=(abs(game.enemies[k].kpower)/(PHASEFAC*math.pow(0.9,game.enemies[k].kdist))) * randreal(1.01, 1.06) + 1.0 + irec=(abs(game.enemies[k].power)/(PHASEFAC*math.pow(0.9,game.enemies[k].kdist))) * randreal(1.01, 1.06) + 1.0 kz = k proutn("(") if not damaged(DCOMPTR): @@ -2122,14 +1860,14 @@ def phasers(): proutn(") ") proutn(_("units to fire at %s- ") % crmena(False, ienm, "sector", aim)) key = scanner.next() - if key == IHALPHA and scanner.sees("no"): + if key == "IHALPHA" and scanner.sees("no"): no = True key = scanner.next() continue - if key == IHALPHA: + if key == "IHALPHA": huh() return - if key == IHEOL: + if key == "IHEOL": if k==1: # Let me say I'm baffled by this msgflag = True continue @@ -2150,7 +1888,7 @@ def phasers(): # zero energy -- abort scanner.chew() return - if key == IHALPHA and scanner.sees("no"): + if key == "IHALPHA" and scanner.sees("no"): no = True game.energy -= rpow scanner.chew() @@ -2166,7 +1904,7 @@ def phasers(): if ifast: skip(1) if no == 0: - if withprob(0.99): + if withprob(0.01): prout(_("Sulu- \"Sir, the high-speed shield control has malfunctioned . . .")) prouts(_(" CLICK CLICK POP . . .")) prout(_(" No response, sir!")) @@ -2279,7 +2017,7 @@ def events(): # Handle case where base is in same quadrant as starship if game.battle == game.quadrant: game.state.chart[game.battle.i][game.battle.j].starbase = False - game.quad[game.base.i][game.base.j] = IHDOT + game.quad[game.base.i][game.base.j] = '.' game.base.invalidate() newcnd() skip(1) @@ -2359,7 +2097,7 @@ def events(): # Fix devices repair = xtime if game.condition == "docked": - repair /= game.docfac + repair /= DOCKFAC # Don't fix Deathray here for l in range(NDEVICES): if game.damage[l] > 0.0 and l != DDRAY: @@ -2382,7 +2120,7 @@ def events(): game.optime -= xtime if evcode == FSNOVA: # Supernova announce() - supernova(False) + supernova(None) schedule(FSNOVA, expran(0.5*game.intime)) if game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: return @@ -2429,12 +2167,14 @@ def events(): for ibq in game.state.baseq: for cmdr in game.state.kcmdr: if ibq == cmdr and ibq != game.quadrant and ibq != game.state.kscmdr: - raise "foundit" - except "foundit": - # no match found -- try later - schedule(FBATTAK, expran(0.3*game.intime)) - unschedule(FCDBAS) - continue + raise ibq + else: + # no match found -- try later + schedule(FBATTAK, expran(0.3*game.intime)) + unschedule(FCDBAS) + continue + except coord: + pass # commander + starbase combination found -- launch attack game.battle = ibq schedule(FCDBAS, randreal(1.0, 4.0)) @@ -2482,45 +2222,36 @@ def events(): supercommander() elif evcode == FDSPROB: # Move deep space probe schedule(FDSPROB, 0.01) - game.probex += game.probeinx - game.probey += game.probeiny - i = (int)(game.probex/QUADSIZE +0.05) - j = (int)(game.probey/QUADSIZE + 0.05) - if game.probec.i != i or game.probec.j != j: - game.probec.i = i - game.probec.j = j - if not VALID_QUADRANT(i, j) or \ - game.state.galaxy[game.probec.i][game.probec.j].supernova: + if not game.probe.next(): + if not game.probe.quadrant().valid_quadrant() or \ + game.state.galaxy[game.probe.quadrant().i][game.probe.quadrant().j].supernova: # Left galaxy or ran into supernova - if comunicating(): + if communicating(): announce() skip(1) proutn(_("Lt. Uhura- \"The deep space probe ")) - if not VALID_QUADRANT(j, i): - proutn(_("has left the galaxy")) + if not game.probe.quadrant().valid_quadrant(): + prout(_("has left the galaxy.\"")) else: - proutn(_("is no longer transmitting")) - prout(".\"") + prout(_("is no longer transmitting.\"")) unschedule(FDSPROB) continue - if not communicating(): - announce() + if communicating(): + #announce() skip(1) - proutn(_("Lt. Uhura- \"The deep space probe is now in Quadrant %s.\"") % game.probec) - pdest = game.state.galaxy[game.probec.i][game.probec.j] - # Update star chart if Radio is working or have access to radio + prout(_("Lt. Uhura- \"The deep space probe is now in Quadrant %s.\"") % game.probe.quadrant()) + pdest = game.state.galaxy[game.probe.quadrant().i][game.probe.quadrant().j] if communicating(): - chp = game.state.chart[game.probec.i][game.probec.j] + chp = game.state.chart[game.probe.quadrant().i][game.probe.quadrant().j] chp.klingons = pdest.klingons chp.starbase = pdest.starbase chp.stars = pdest.stars pdest.charted = True - game.proben -= 1 # One less to travel - if game.proben == 0 and game.isarmed and pdest.stars: - # lets blow the sucker! - supernova(True, game.probec) + game.probe.moves -= 1 # One less to travel + if game.probe.arrived() and game.isarmed and pdest.stars: + supernova(game.probe) # fire in the hole! unschedule(FDSPROB) - if game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: + if game.state.galaxy[game.quadrant().i][game.quadrant().j].supernova: return elif evcode == FDISTR: # inhabited system issues distress call unschedule(FDISTR) @@ -2583,14 +2314,15 @@ def events(): continue # full right now # reproduce one Klingon w = ev.quadrant + m = coord() if game.klhere >= MAXKLQUAD: try: # this quadrant not ok, pick an adjacent one - for i in range(w.i - 1, w.i + 2): - for j in range(w.j - 1, w.j + 2): - if not VALID_QUADRANT(i, j): + for m.i in range(w.i - 1, w.i + 2): + for m.j in range(w.j - 1, w.j + 2): + if not m.valid_quadrant(): continue - q = game.state.galaxy[w.i][w.j] + q = game.state.galaxy[m.i][m.j] # check for this quad ok (not full & no snova) if q.klingons >= MAXKLQUAD or q.supernova: continue @@ -2598,7 +2330,7 @@ def events(): else: continue # search for eligible quadrant failed except "FOUNDIT": - w.i = i; w.j = j + w = m # deliver the child game.state.remkl += 1 q.klingons += 1 @@ -2607,7 +2339,6 @@ def events(): game.enemies.append(newkling()) # recompute time left game.recompute() - # report the disaster if we can if communicating(): if game.quadrant == w: prout(_("Spock- sensors indicate the Klingons have")) @@ -2615,7 +2346,7 @@ def events(): else: prout(_("Uhura- Starfleet reports increased Klingon activity")) if q.planet != None: - proutn(_("near %s") % q.planet) + proutn(_("near %s ") % q.planet) prout(_("in Quadrant %s.") % w) def wait(): @@ -2623,11 +2354,11 @@ def wait(): game.ididit = False while True: key = scanner.next() - if key != IHEOL: + if key != "IHEOL": break proutn(_("How long? ")) scanner.chew() - if key != IHREAL: + if key != "IHREAL": huh() return origTime = delay = scanner.real @@ -2669,24 +2400,17 @@ def wait(): game.resting = False game.optime = 0 -# A nova occurs. It is the result of having a star hit with a -# photon torpedo, or possibly of a probe warhead going off. -# Stars that go nova cause stars which surround them to undergo -# the same probabilistic process. Klingons next to them are -# destroyed. And if the starship is next to it, it gets zapped. -# If the zap is too much, it gets destroyed. - 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(); neighbor = coord(); bump = coord(0, 0) if withprob(0.05): # Wow! We've supernova'ed - supernova(False, nov) + supernova(game.quadrant) return # handle initial nova - game.quad[nov.i][nov.j] = IHDOT - prout(crmena(False, IHSTAR, "sector", nov) + _(" novas.")) + game.quad[nov.i][nov.j] = '.' + prout(crmena(False, '*', "sector", nov) + _(" novas.")) game.state.galaxy[game.quadrant.i][game.quadrant.j].stars -= 1 game.state.starkl += 1 # Set up queue to recursively trigger adjacent stars @@ -2700,48 +2424,48 @@ def nova(nov): if offset.j==0 and offset.i==0: continue neighbor = start + offset - if not VALID_SECTOR(neighbor.j, neighbor.i): + if not neighbor.valid_sector(): continue iquad = game.quad[neighbor.i][neighbor.j] # Empty space ends reaction - if iquad in (IHDOT, IHQUEST, IHBLANK, IHT, IHWEB): + if iquad in ('.', '?', ' ', 'T', '#'): pass - elif iquad == IHSTAR: # Affect another star + elif iquad == '*': # Affect another star if withprob(0.05): # This star supernovas - supernova(False) + supernova(game.quadrant) return else: hits.append(neighbor) game.state.galaxy[game.quadrant.i][game.quadrant.j].stars -= 1 game.state.starkl += 1 - proutn(crmena(True, IHSTAR, "sector", neighbor)) + proutn(crmena(True, '*', "sector", neighbor)) prout(_(" novas.")) - game.quad[neighbor.i][neighbor.j] = IHDOT + game.quad[neighbor.i][neighbor.j] = '.' kount += 1 - elif iquad in (IHP, IHW): # Destroy planet + elif iquad in ('P', '@'): # Destroy planet game.state.galaxy[game.quadrant.i][game.quadrant.j].planet = None - if iquad == IHP: + if iquad == 'P': game.state.nplankl += 1 else: game.state.worldkl += 1 - prout(crmena(True, IHB, "sector", neighbor) + _(" destroyed.")) + prout(crmena(True, 'B', "sector", neighbor) + _(" destroyed.")) game.iplnet.pclass = "destroyed" game.iplnet = None game.plnet.invalidate() if game.landed: finish(FPNOVA) return - game.quad[neighbor.i][neighbor.j] = IHDOT - elif iquad == IHB: # Destroy base + game.quad[neighbor.i][neighbor.j] = '.' + elif iquad == 'B': # Destroy base game.state.galaxy[game.quadrant.i][game.quadrant.j].starbase = False game.state.baseq = filter(lambda x: x!= game.quadrant, game.state.baseq) game.base.invalidate() game.state.basekl += 1 newcnd() - prout(crmena(True, IHB, "sector", neighbor) + _(" destroyed.")) - game.quad[neighbor.i][neighbor.j] = IHDOT - elif iquad in (IHE, IHF): # Buffet ship + prout(crmena(True, 'B', "sector", neighbor) + _(" destroyed.")) + game.quad[neighbor.i][neighbor.j] = '.' + elif iquad in ('E', 'F'): # Buffet ship prout(_("***Starship buffeted by nova.")) if game.shldup: if game.shield >= 2000.0: @@ -2760,61 +2484,60 @@ def nova(nov): return # add in course nova contributes to kicking starship bump += (game.sector-hits[mm]).sgn() - elif iquad == IHK: # kill klingon + elif iquad == 'K': # kill klingon deadkl(neighbor, iquad, neighbor) - elif iquad in (IHC,IHS,IHR): # Damage/destroy big enemies + elif iquad in ('C','S','R'): # Damage/destroy big enemies for ll in range(len(game.enemies)): - if game.enemies[ll].kloc == neighbor: + if game.enemies[ll].location == neighbor: break - game.enemies[ll].kpower -= 800.0 # If firepower is lost, die - if game.enemies[ll].kpower <= 0.0: + game.enemies[ll].power -= 800.0 # If firepower is lost, die + if game.enemies[ll].power <= 0.0: deadkl(neighbor, iquad, neighbor) break newc = neighbor + neighbor - hits[mm] proutn(crmena(True, iquad, "sector", neighbor) + _(" damaged")) - if not VALID_SECTOR(newc.i, newc.j): + if not newc.valid_sector(): # can't leave quadrant skip(1) break iquad1 = game.quad[newc.i][newc.j] - if iquad1 == IHBLANK: - proutn(_(", blasted into ") + crmena(False, IHBLANK, "sector", newc)) + if iquad1 == ' ': + proutn(_(", blasted into ") + crmena(False, ' ', "sector", newc)) skip(1) deadkl(neighbor, iquad, newc) break - if iquad1 != IHDOT: + if iquad1 != '.': # can't move into something else skip(1) break proutn(_(", buffeted to Sector %s") % newc) - game.quad[neighbor.i][neighbor.j] = IHDOT + game.quad[neighbor.i][neighbor.j] = '.' game.quad[newc.i][newc.j] = iquad game.enemies[ll].move(newc) # Starship affected by nova -- kick it away. - game.dist = kount*0.1 - game.direc = course[3*(bump.i+1)+bump.j+2] - if game.direc == 0.0: - game.dist = 0.0 - if game.dist == 0.0: + dist = kount*0.1 + direc = course[3*(bump.i+1)+bump.j+2] + if direc == 0.0: + dist = 0.0 + if dist == 0.0: return - game.optime = 10.0*game.dist/16.0 + course = course(bearing=direc, distance=dist) + game.optime = course.time(warp=4) skip(1) prout(_("Force of nova displaces starship.")) - imove(novapush=True) - game.optime = 10.0*game.dist/16.0 + imove(course, noattack=True) + game.optime = course.time(warp=4) return -def supernova(induced, w=None): +def supernova(w): "Star goes supernova." num = 0; npdead = 0 - nq = coord() if w != None: - nq = w + nq = copy.copy(w) else: + # Scheduled supernova -- select star at random. stars = 0 - # Scheduled supernova -- select star - # logic changed here so that we won't favor quadrants in top - # left of universe + nq = coord() for nq.i in range(GALSIZE): for nq.j in range(GALSIZE): stars += game.state.galaxy[nq.i][nq.j].stars @@ -2844,7 +2567,7 @@ def supernova(induced, w=None): num = randrange(game.state.galaxy[nq.i][nq.j].stars) + 1 for ns.i in range(QUADSIZE): for ns.j in range(QUADSIZE): - if game.quad[ns.i][ns.j]==IHSTAR: + if game.quad[ns.i][ns.j]=='*': num -= 1 if num==0: break @@ -2860,7 +2583,7 @@ def supernova(induced, w=None): skip(1) stars() game.alldone = True - # destroy any Klingons in supernovaed quadrant + # destroy any Klingons in supernovaed quadrant kldead = game.state.galaxy[nq.i][nq.j].klingons game.state.galaxy[nq.i][nq.j].klingons = 0 if nq == game.state.kscmdr: @@ -2888,7 +2611,7 @@ def supernova(induced, w=None): # Destroy any base in supernovaed quadrant game.state.baseq = filter(lambda x: x != nq, game.state.baseq) # If starship caused supernova, tally up destruction - if induced: + if w != 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 @@ -2898,7 +2621,7 @@ def supernova(induced, w=None): # If supernova destroys last Klingons give special message if (game.state.remkl + len(game.state.kcmdr) + game.state.nscrem)==0 and not nq == game.quadrant: skip(2) - if not induced: + if w == None: prout(_("Lucky you!")) proutn(_("A supernova in %s has just destroyed the last Klingons.") % nq) finish(FWON) @@ -2951,7 +2674,7 @@ def selfdestruct(): def kaboom(): stars() - if game.ship==IHE: + if game.ship=='E': prouts("***") prouts(_("********* Entropy of %s maximized *********") % crmshp()) skip(1) @@ -2961,8 +2684,8 @@ def kaboom(): whammo = 25.0 * game.energy l=1 while l <= len(game.enemies): - if game.enemies[l].kpower*game.enemies[l].kdist <= whammo: - deadkl(game.enemies[l].kloc, game.quad[game.enemies[l].kloc.i][game.enemies[l].kloc.j], game.enemies[l].kloc) + 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) l += 1 finish(FDILITHIUM) @@ -2985,7 +2708,7 @@ def badpoints(): 45.0*game.nhelp +\ 100.0*game.state.basekl +\ 3.0*game.abandoned - if game.ship == IHF: + if game.ship == 'F': badpt += 100.0 elif game.ship == None: badpt += 200.0 @@ -3157,10 +2880,10 @@ def finish(ifin): prout(_("You are crushed into extremely dense matter.")) elif ifin == FCREW: prout(_("Your last crew member has died.")) - if game.ship == IHF: + if game.ship == 'F': game.ship = None - elif game.ship == IHE: - game.ship = IHF + elif game.ship == 'E': + game.ship = 'F' game.alive = False if (game.state.remkl + len(game.state.kcmdr) + game.state.nscrem) != 0: goodies = game.state.remres/game.inresor @@ -3195,14 +2918,12 @@ def score(): iwon = 0 if game.gamewon: iwon = 100*game.skill - if game.ship == IHE: + if game.ship == 'E': klship = 0 - elif game.ship == IHF: + elif game.ship == 'F': klship = 1 else: klship = 2 - if not game.gamewon: - game.state.nromrem = 0 # None captured if no win iscore = 10*(game.inkling - game.state.remkl) \ + 50*(game.incom - len(game.state.kcmdr)) \ + ithperd + iwon \ @@ -3217,7 +2938,7 @@ def score(): if game.inrom - game.state.nromrem: prout(_("%6d Romulans destroyed %5d") % (game.inrom - game.state.nromrem, 20*(game.inrom - game.state.nromrem))) - if game.state.nromrem: + if game.state.nromrem and game.gamewon: prout(_("%6d Romulans captured %5d") % (game.state.nromrem, game.state.nromrem)) if game.inkling - game.state.remkl: @@ -3240,7 +2961,7 @@ def score(): (game.state.nplankl, -10*game.state.nplankl)) if (game.options & OPTION_WORLDS) and game.state.nworldkl: prout(_("%6d inhabited planets destroyed by your action %5d") % - (game.state.nplankl, -300*game.state.nworldkl)) + (game.state.nworldkl, -300*game.state.nworldkl)) if game.state.basekl: prout(_("%6d bases destroyed by your action %5d") % (game.state.basekl, -100*game.state.basekl)) @@ -3320,7 +3041,7 @@ def plaque(): fp.write(_("Emeritus level\n\n")) else: fp.write(_(" Cheat level\n\n")) - timestring = ctime() + timestring = time.ctime() fp.write(_(" This day of %.6s %.4s, %.8s\n\n") % (timestring+4, timestring+20, timestring+11)) fp.write(_(" Your score: %d\n\n") % iscore) @@ -3341,27 +3062,10 @@ message_window = None prompt_window = None curwnd = None -def outro(): - "Wrap up, either normally or due to signal" - if game.options & OPTION_CURSES: - #clear() - #curs_set(1) - #refresh() - #resetterm() - #echo() - curses.endwin() - sys.stdout.write('\n') - if logfp: - logfp.close() - def iostart(): global stdscr, rows - #setlocale(LC_ALL, "") - #bindtextdomain(PACKAGE, LOCALEDIR) - #textdomain(PACKAGE) - if atexit.register(outro): - sys.stderr.write("Unable to register outro(), exiting...\n") - raise SysExit,1 + gettext.bindtextdomain("sst", "/usr/local/share/locale") + gettext.textdomain("sst") if not (game.options & OPTION_CURSES): ln_env = os.getenv("LINES") if ln_env: @@ -3371,19 +3075,19 @@ def iostart(): else: stdscr = curses.initscr() stdscr.keypad(True) - #saveterm() curses.nonl() curses.cbreak() - curses.start_color() - curses.init_pair(curses.COLOR_BLACK, curses.COLOR_BLACK, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_GREEN, curses.COLOR_GREEN, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_RED, curses.COLOR_RED, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_CYAN, curses.COLOR_CYAN, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_WHITE, curses.COLOR_WHITE, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_MAGENTA, curses.COLOR_MAGENTA, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_BLUE, curses.COLOR_BLUE, curses.COLOR_BLACK) - curses.init_pair(curses.COLOR_YELLOW, curses.COLOR_YELLOW, curses.COLOR_BLACK) - #noecho() + if game.options & OPTION_COLOR: + curses.start_color(); + curses.use_default_colors() + curses.init_pair(curses.COLOR_BLACK, curses.COLOR_BLACK, -1); + curses.init_pair(curses.COLOR_GREEN, curses.COLOR_GREEN, -1); + curses.init_pair(curses.COLOR_RED, curses.COLOR_RED, -1); + curses.init_pair(curses.COLOR_CYAN, curses.COLOR_CYAN, -1); + curses.init_pair(curses.COLOR_WHITE, curses.COLOR_WHITE, -1); + curses.init_pair(curses.COLOR_MAGENTA, curses.COLOR_MAGENTA, -1); + curses.init_pair(curses.COLOR_BLUE, curses.COLOR_BLUE, -1); + curses.init_pair(curses.COLOR_YELLOW, curses.COLOR_YELLOW, -1); global fullscreen_window, srscan_window, report_window, status_window global lrscan_window, message_window, prompt_window (rows, columns) = stdscr.getmaxyx() @@ -3396,24 +3100,23 @@ def iostart(): prompt_window = curses.newwin(1, 0, rows-2, 0) message_window.scrollok(True) setwnd(fullscreen_window) - textcolor(DEFAULT) - -def textcolor(color): - "Set text foreground color. Presently a stub." - pass # FIXME def ioend(): - "Wrap up I/O. Presently a stub." - pass + "Wrap up I/O." + if game.options & OPTION_CURSES: + stdscr.keypad(False) + curses.echo() + curses.nocbreak() + curses.endwin() def waitfor(): "Wait for user action -- OK to do nothing if on a TTY" if game.options & OPTION_CURSES: - stsdcr.getch() + stdscr.getch() def announce(): skip(1) - prouts(_("[ANOUNCEMENT ARRIVING...]")) + prouts(_("[ANNOUNCEMENT ARRIVING...]")) skip(1) def pause_game(): @@ -3425,7 +3128,7 @@ def pause_game(): if game.options & OPTION_CURSES: drawmaps(0) setwnd(prompt_window) - prompt_window.wclear() + prompt_window.clear() prompt_window.addstr(prompt) prompt_window.getstr() prompt_window.clear() @@ -3450,7 +3153,10 @@ def skip(i): pause_game() clrscr() else: - proutn("\n") + try: + curwnd.move(y+1, 0) + except curses.error: + pass else: global linecount linecount += 1 @@ -3479,7 +3185,7 @@ def prouts(line): time.sleep(0.03) proutn(c) if game.options & OPTION_CURSES: - wrefresh(curwnd) + curwnd.refresh() else: sys.stdout.flush() if not replayfp or replayfp.closed: @@ -3517,8 +3223,8 @@ def setwnd(wnd): def clreol(): "Clear to end of line -- can be a no-op in tty mode" if game.options & OPTION_CURSES: - wclrtoeol(curwnd) - wrefresh(curwnd) + curwnd.clrtoeol() + curwnd.refresh() def clrscr(): "Clear screen -- can be a no-op in tty mode." @@ -3528,12 +3234,48 @@ def clrscr(): curwnd.move(0, 0) curwnd.refresh() linecount = 0 - + +def textcolor(color=DEFAULT): + if game.options & OPTION_COLOR: + if color == DEFAULT: + curwnd.attrset(0); + elif color == BLACK: + curwnd.attron(curses.color_pair(curses.COLOR_BLACK)); + elif color == BLUE: + curwnd.attron(curses.color_pair(curses.COLOR_BLUE)); + elif color == GREEN: + curwnd.attron(curses.color_pair(curses.COLOR_GREEN)); + elif color == CYAN: + curwnd.attron(curses.color_pair(curses.COLOR_CYAN)); + elif color == RED: + curwnd.attron(curses.color_pair(curses.COLOR_RED)); + elif color == MAGENTA: + curwnd.attron(curses.color_pair(curses.COLOR_MAGENTA)); + elif color == BROWN: + curwnd.attron(curses.color_pair(curses.COLOR_YELLOW)); + elif color == LIGHTGRAY: + curwnd.attron(curses.color_pair(curses.COLOR_WHITE)); + elif color == DARKGRAY: + curwnd.attron(curses.color_pair(curses.COLOR_BLACK) | curses.A_BOLD); + elif color == LIGHTBLUE: + curwnd.attron(curses.color_pair(curses.COLOR_BLUE) | curses.A_BOLD); + elif color == LIGHTGREEN: + curwnd.attron(curses.color_pair(curses.COLOR_GREEN) | curses.A_BOLD); + elif color == LIGHTCYAN: + curwnd.attron(curses.color_pair(curses.COLOR_CYAN) | curses.A_BOLD); + elif color == LIGHTRED: + curwnd.attron(curses.color_pair(curses.COLOR_RED) | curses.A_BOLD); + elif color == LIGHTMAGENTA: + curwnd.attron(curses.color_pair(curses.COLOR_MAGENTA) | curses.A_BOLD); + elif color == YELLOW: + curwnd.attron(curses.color_pair(curses.COLOR_YELLOW) | curses.A_BOLD); + elif color == WHITE: + curwnd.attron(curses.color_pair(curses.COLOR_WHITE) | curses.A_BOLD); + def highvideo(): - "Set highlight video, if this is reasonable." - if game.options & OPTION_CURSES: - curwnd.attron(curses.A_REVERSE) - + if game.options & OPTION_COLOR: + curwnd.attron(curses.A_REVERSE) + # # Things past this point have policy implications. # @@ -3598,7 +3340,7 @@ def tracktorpedo(origin, w, step, i, n, iquad): if step == 1: if n != 1: skip(1) - proutn(_("Track for %s torpedo number %d- ") % (game.quad[origin.i][origin.j],i+1)) + proutn(_("Track for torpedo number %d- ") % (i+1)) else: skip(1) proutn(_("Torpedo track- ")) @@ -3610,7 +3352,7 @@ def tracktorpedo(origin, w, step, i, n, iquad): if i != 0 and step == 1: drawmaps(2) time.sleep(0.4) - if (iquad==IHDOT) or (iquad==IHBLANK): + if (iquad=='.') or (iquad==' '): put_srscan_sym(w, '+') #sound(step*10) #time.sleep(0.1) @@ -3652,180 +3394,151 @@ def prstat(txt, data): # Code from moving.c begins here -def imove(novapush): +def imove(course=None, noattack=False): "Movement execution for warp, impulse, supernova, and tractor-beam events." - w = coord(); final = coord() - trbeam = False + w = coord() - def no_quad_change(): - # No quadrant change -- compute new average enemy distances - game.quad[game.sector.i][game.sector.j] = game.ship - if game.enemies: + def newquadrant(noattack): + # Leaving quadrant -- allow final enemy attack + # Don't do it if being pushed by Nova + if len(game.enemies) != 0 and not noattack: + newcnd() for enemy in game.enemies: - finald = (w-enemy.kloc).distance() + finald = (w - enemy.location).distance() enemy.kavgd = 0.5 * (finald + enemy.kdist) - enemy.kdist = finald - game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) - if not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: + # Stas Sergeev added the condition + # that attacks only happen if Klingons + # are present and your skill is good. + if game.skill > SKILL_GOOD and game.klhere > 0 and not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: attack(torps_ok=False) - for enemy in game.enemies: - enemy.kavgd = enemy.kdist - newcnd() - drawmaps(0) - setwnd(message_window) - w.i = w.j = 0 + if game.alldone: + return + # check for edge of galaxy + kinks = 0 + while True: + kink = False + if course.final.i < 0: + course.final.i = -course.final.i + kink = True + if course.final.j < 0: + course.final.j = -course.final.j + kink = True + if course.final.i >= GALSIZE*QUADSIZE: + course.final.i = (GALSIZE*QUADSIZE*2) - course.final.i + kink = True + if course.final.j >= GALSIZE*QUADSIZE: + course.final.j = (GALSIZE*QUADSIZE*2) - course.final.j + kink = True + if kink: + kinks += 1 + else: + break + if kinks: + game.nkinks += 1 + if game.nkinks == 3: + # Three strikes -- you're out! + finish(FNEG3) + return + skip(1) + prout(_("YOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER")) + prout(_("AT THE EDGE OF THE GALAXY. THE THIRD TIME YOU TRY THIS,")) + prout(_("YOU WILL BE DESTROYED.")) + # Compute final position in new quadrant + if trbeam: # Don't bother if we are to be beamed + return + game.quadrant = course.final.quadrant() + game.sector = course.final.sector() + skip(1) + prout(_("Entering Quadrant %s.") % game.quadrant) + game.quad[game.sector.i][game.sector.j] = game.ship + newqad() + if game.skill>SKILL_NOVICE: + attack(torps_ok=False) + + def check_collision(h): + iquad = game.quad[h.i][h.j] + if iquad != '.': + # object encountered in flight path + stopegy = 50.0*course.distance/game.optime + if iquad in ('T', 'K', 'C', 'S', 'R', '?'): + for enemy in game.enemies: + if enemy.location == game.sector: + break + collision(rammed=False, enemy=enemy) + return True + elif iquad == ' ': + skip(1) + prouts(_("***RED ALERT! RED ALERT!")) + skip(1) + proutn("***" + crmshp()) + proutn(_(" pulled into black hole at Sector %s") % h) + # Getting pulled into a black hole was certain + # death in Almy's original. Stas Sergeev added a + # possibility that you'll get timewarped instead. + n=0 + for m in range(NDEVICES): + if game.damage[m]>0: + n += 1 + probf=math.pow(1.4,(game.energy+game.shield)/5000.0-1.0)*math.pow(1.3,1.0/(n+1)-1.0) + if (game.options & OPTION_BLKHOLE) and withprob(1-probf): + timwrp() + else: + finish(FHOLE) + return True + else: + # something else + skip(1) + proutn(crmshp()) + if iquad == '#': + prout(_(" encounters Tholian web at %s;") % h) + else: + prout(_(" blocked by object at %s;") % h) + proutn(_("Emergency stop required ")) + prout(_("%2d units of energy.") % int(stopegy)) + game.energy -= stopegy + if game.energy <= 0: + finish(FNRG) + return True + return False + + trbeam = False if game.inorbit: prout(_("Helmsman Sulu- \"Leaving standard orbit.\"")) game.inorbit = False - angle = ((15.0 - game.direc) * 0.5235988) - deltax = -math.sin(angle) - deltay = math.cos(angle) - if math.fabs(deltax) > math.fabs(deltay): - bigger = math.fabs(deltax) - else: - bigger = math.fabs(deltay) - deltay /= bigger - deltax /= bigger # If tractor beam is to occur, don't move full distance if game.state.date+game.optime >= scheduled(FTBEAM): trbeam = True game.condition = "red" - game.dist = game.dist*(scheduled(FTBEAM)-game.state.date)/game.optime + 0.1 + course.distance = course.distance*(scheduled(FTBEAM)-game.state.date)/game.optime + 0.1 game.optime = scheduled(FTBEAM) - game.state.date + 1e-5 - # Move within the quadrant - game.quad[game.sector.i][game.sector.j] = IHDOT - x = game.sector.i - y = game.sector.j - n = int(10.0*game.dist*bigger+0.5) - if n > 0: - for m in range(1, n+1): - x += deltax - y += deltay - w.i = int(round(x)) - w.j = int(round(y)) - if not VALID_SECTOR(w.i, w.j): - # Leaving quadrant -- allow final enemy attack - # Don't do it if being pushed by Nova - if len(game.enemies) != 0 and not novapush: - newcnd() - for enemy in game.enemies: - finald = (w - enemy.kloc).distance() - enemy.kavgd = 0.5 * (finald + enemy.kdist) - # - # Stas Sergeev added the condition - # that attacks only happen if Klingons - # are present and your skill is good. - # - if game.skill > SKILL_GOOD and game.klhere > 0 and not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: - attack(torps_ok=False) - if game.alldone: - return - # compute final position -- new quadrant and sector - x = (QUADSIZE*game.quadrant.i)+game.sector.i - y = (QUADSIZE*game.quadrant.j)+game.sector.j - w.i = int(round(x+10.0*game.dist*bigger*deltax)) - w.j = int(round(y+10.0*game.dist*bigger*deltay)) - # check for edge of galaxy - kinks = 0 - while True: - kink = False - if w.i < 0: - w.i = -w.i - kink = True - if w.j < 0: - w.j = -w.j - kink = True - if w.i >= GALSIZE*QUADSIZE: - w.i = (GALSIZE*QUADSIZE*2) - w.i - kink = True - if w.j >= GALSIZE*QUADSIZE: - w.j = (GALSIZE*QUADSIZE*2) - w.j - kink = True - if kink: - kinks += 1 - else: - break - if kinks: - game.nkinks += 1 - if game.nkinks == 3: - # Three strikes -- you're out! - finish(FNEG3) - return - skip(1) - prout(_("YOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER")) - prout(_("AT THE EDGE OF THE GALAXY. THE THIRD TIME YOU TRY THIS,")) - prout(_("YOU WILL BE DESTROYED.")) - # Compute final position in new quadrant - if trbeam: # Don't bother if we are to be beamed - return - game.quadrant.i = w.i/QUADSIZE - game.quadrant.j = w.j/QUADSIZE - game.sector.i = w.i - (QUADSIZE*game.quadrant.i) - game.sector.j = w.j - (QUADSIZE*game.quadrant.j) - skip(1) - prout(_("Entering Quadrant %s.") % game.quadrant) - game.quad[game.sector.i][game.sector.j] = game.ship - newqad() - if game.skill>SKILL_NOVICE: - attack(torps_ok=False) - return - iquad = game.quad[w.i][w.j] - if iquad != IHDOT: - # object encountered in flight path - stopegy = 50.0*game.dist/game.optime - game.dist = (game.sector - w).distance() / (QUADSIZE * 1.0) - if iquad in (IHT, IHK, IHC, IHS, IHR, IHQUEST): - game.sector = w - for enemy in game.enemies: - if enemy.kloc == game.sector: - break - collision(rammed=False, enemy=enemy) - final = game.sector - elif iquad == IHBLANK: - skip(1) - prouts(_("***RED ALERT! RED ALERT!")) - skip(1) - proutn("***" + crmshp()) - proutn(_(" pulled into black hole at Sector %s") % w) - # - # Getting pulled into a black hole was certain - # death in Almy's original. Stas Sergeev added a - # possibility that you'll get timewarped instead. - # - n=0 - for m in range(NDEVICES): - if game.damage[m]>0: - n += 1 - probf=math.pow(1.4,(game.energy+game.shield)/5000.0-1.0)*math.pow(1.3,1.0/(n+1)-1.0) - if (game.options & OPTION_BLKHOLE) and withprob(1-probf): - timwrp() - else: - finish(FHOLE) - return - else: - # something else - skip(1) - proutn(crmshp()) - if iquad == IHWEB: - prout(_(" encounters Tholian web at %s;") % w) - else: - prout(_(" blocked by object at %s;") % w) - proutn(_("Emergency stop required ")) - prout(_("%2d units of energy.") % int(stopegy)) - game.energy -= stopegy - final.i = int(round(deltax)) - final.j = int(round(deltay)) - game.sector = final - if game.energy <= 0: - finish(FNRG) - return - # We're here! - no_quad_change() - return - game.dist = (game.sector - w).distance() / (QUADSIZE * 1.0) - game.sector = w - final = game.sector - no_quad_change() + # Move out + game.quad[game.sector.i][game.sector.j] = '.' + for m in range(course.moves): + course.next() + w = course.sector() + if course.origin.quadrant() != course.location.quadrant(): + newquadrant(noattack) + break + elif check_collision(w): + print "Collision detected" + break + else: + game.sector = w + # We're in destination quadrant -- compute new average enemy distances + game.quad[game.sector.i][game.sector.j] = game.ship + if game.enemies: + for enemy in game.enemies: + finald = (w-enemy.location).distance() + enemy.kavgd = 0.5 * (finald + enemy.kdist) + enemy.kdist = finald + game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) + if not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova: + attack(torps_ok=False) + for enemy in game.enemies: + enemy.kavgd = enemy.kdist + newcnd() + drawmaps(0) + setwnd(message_window) return def dock(verbose): @@ -3856,16 +3569,16 @@ 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 -# "manual" input should still be done this way -- it's a real -# 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 getcourse(isprobe, akey): + +def cartesian(loc1=None, loc2=None): + if loc1 is None: + return game.quadrant * QUADSIZE + game.sector + elif loc2 is None: + return game.quadrant * QUADSIZE + loc1 + else: + return loc1 * QUADSIZE + loc2 + +def getcourse(isprobe): "Get a course and distance from the user." key = 0 dquad = copy.copy(game.quadrant) @@ -3877,7 +3590,7 @@ def getcourse(isprobe, akey): prout(_("Dummy! You can't leave standard orbit until you")) proutn(_("are back aboard the ship.")) scanner.chew() - return False + raise TrekError while navmode == "unspecified": if damaged(DNAVSYS): if isprobe: @@ -3886,19 +3599,14 @@ def getcourse(isprobe, akey): prout(_("Computer damaged; manual movement only")) scanner.chew() navmode = "manual" - key = IHEOL + key = "IHEOL" break - if isprobe and akey != -1: - # For probe launch, use pre-scanned value first time - key = akey - akey = -1 - else: - key = scanner.next() - if key == IHEOL: + key = scanner.next() + if key == "IHEOL": proutn(_("Manual or automatic- ")) iprompt = True scanner.chew() - elif key == IHALPHA: + elif key == "IHALPHA": if scanner.sees("manual"): navmode = "manual" key = scanner.next() @@ -3910,7 +3618,7 @@ def getcourse(isprobe, akey): else: huh() scanner.chew() - return False + raise TrekError else: # numeric if isprobe: prout(_("(Manual navigation assumed.)")) @@ -3918,8 +3626,9 @@ def getcourse(isprobe, akey): prout(_("(Manual movement assumed.)")) navmode = "manual" break + delta = coord() if navmode == "automatic": - while key == IHEOL: + while key == "IHEOL": if isprobe: proutn(_("Target quadrant or quadrant§or- ")) else: @@ -3927,28 +3636,28 @@ def getcourse(isprobe, akey): scanner.chew() iprompt = True key = scanner.next() - if key != IHREAL: + if key != "IHREAL": huh() - return False + raise TrekError xi = int(round(scanner.real))-1 key = scanner.next() - if key != IHREAL: + if key != "IHREAL": huh() - return False + raise TrekError xj = int(round(scanner.real))-1 key = scanner.next() - if key == IHREAL: + if key == "IHREAL": # both quadrant and sector specified xk = int(round(scanner.real))-1 key = scanner.next() - if key != IHREAL: + if key != "IHREAL": huh() - return False + raise TrekError xl = int(round(scanner.real))-1 dquad.i = xi dquad.j = xj - dsect.j = xk - dsect.i = xl + dsect.i = xk + dsect.j = xl else: # only one pair of numbers was specified if isprobe: @@ -3958,12 +3667,12 @@ def getcourse(isprobe, akey): dsect.j = dsect.i = 4 # preserves 1-origin behavior else: # only sector specified - dsect.j = xi - dsect.i = xj + dsect.i = xi + dsect.j = xj itemp = "normal" - if not VALID_QUADRANT(dquad.j,dquad.i) or not VALID_SECTOR(dsect.i,dsect.j): + if not dquad.valid_quadrant() or not dsect.valid_sector(): huh() - return False + raise TrekError skip(1) if not isprobe: if itemp > "curt": @@ -3972,39 +3681,77 @@ def getcourse(isprobe, akey): else: prout(_("Ensign Chekov- \"Course laid in, Captain.\"")) # the actual deltas get computed here - delta = coord() - delta.i = dquad.j-game.quadrant.j + 0.1*(dsect.i-game.sector.j) - delta.j = game.quadrant.i-dquad.i + 0.1*(game.sector.i-dsect.j) + delta.j = dquad.j-game.quadrant.j + (dsect.j-game.sector.j)/(QUADSIZE*1.0) + delta.i = game.quadrant.i-dquad.i + (game.sector.i-dsect.i)/(QUADSIZE*1.0) else: # manual - while key == IHEOL: + while key == "IHEOL": proutn(_("X and Y displacements- ")) scanner.chew() iprompt = True key = scanner.next() itemp = "verbose" - if key != IHREAL: + if key != "IHREAL": huh() - return False + raise TrekError delta.j = scanner.real key = scanner.next() - if key != IHREAL: + if key != "IHREAL": huh() - return False + raise TrekError delta.i = scanner.real # Check for zero movement if delta.i == 0 and delta.j == 0: scanner.chew() - return False + raise TrekError if itemp == "verbose" and not isprobe: skip(1) prout(_("Helmsman Sulu- \"Aye, Sir.\"")) - # Course actually laid in. - game.dist = delta.distance() - game.direc = delta.bearing() - if game.direc < 0.0: - game.direc += 12.0 scanner.chew() - return True + return course(bearing=delta.bearing(), distance=delta.distance()) + +class course: + def __init__(self, bearing, distance, origin=None): + self.distance = distance + self.bearing = bearing + if origin is None: + self.origin = cartesian(game.quadrant, game.sector) + else: + self.origin = origin + # The bearing() code we inherited from FORTRAN is actually computing + # clockface directions! + if self.bearing < 0.0: + self.bearing += 12.0 + self.angle = ((15.0 - self.bearing) * 0.5235988) + if origin is None: + self.origin = cartesian(game.quadrant, game.sector) + else: + self.origin = cartesian(game.quadrant, origin) + self.increment = coord(-math.sin(self.angle), math.cos(self.angle)) + bigger = max(abs(self.increment.i), abs(self.increment.j)) + self.increment /= bigger + self.moves = int(round(10*self.distance*bigger)) + self.reset() + self.final = (self.location + self.moves*self.increment).roundtogrid() + def reset(self): + self.location = self.origin + self.step = 0 + def arrived(self): + return self.location.roundtogrid() == self.final + def next(self): + "Next step on course." + self.step += 1 + self.nextlocation = self.location + self.increment + samequad = (self.location.quadrant() == self.nextlocation.quadrant()) + self.location = self.nextlocation + return samequad + def quadrant(self): + return self.location.quadrant() + def sector(self): + return self.location.sector() + def power(self, warp): + return self.distance*(warp**3)*(game.shldup+1) + def time(self, warp): + return 10.0*self.distance/warp**2 def impulse(): "Move under impulse power." @@ -4015,9 +3762,11 @@ def impulse(): prout(_("Engineer Scott- \"The impulse engines are damaged, Sir.\"")) return if game.energy > 30.0: - if not getcourse(isprobe=False, akey=0): + try: + course = getcourse(isprobe=False) + except TrekError: return - power = 20.0 + 100.0*game.dist + power = 20.0 + 100.0*course.distance else: power = 30.0 if power >= game.energy: @@ -4034,7 +3783,7 @@ def impulse(): scanner.chew() return # Make sure enough time is left for the trip - game.optime = game.dist/0.095 + game.optime = course.dist/0.095 if game.optime >= game.state.remtime: prout(_("First Officer Spock- \"Captain, our speed under impulse")) prout(_("power is only 0.95 sectors per stardate. Are you sure")) @@ -4042,26 +3791,26 @@ def impulse(): if ja() == False: return # Activate impulse engines and pay the cost - imove(novapush=False) + imove(course, noattack=False) game.ididit = True if game.alldone: return - power = 20.0 + 100.0*game.dist + power = 20.0 + 100.0*course.dist game.energy -= power - game.optime = game.dist/0.095 + game.optime = course.dist/0.095 if game.energy <= 0: finish(FNRG) return -def warp(timewarp): +def warp(course, involuntary): "ove under warp drive." blooey = False; twarp = False - if not timewarp: # Not WARPX entry + if not involuntary: # Not WARPX entry game.ididit = False if game.damage[DWARPEN] > 10.0: scanner.chew() skip(1) - prout(_("Engineer Scott- \"The impulse engines are damaged, Sir.\"")) + prout(_("Engineer Scott- \"The warp engines are damaged, Sir.\"")) return if damaged(DWARPEN) and game.warpfac > 4.0: scanner.chew() @@ -4069,18 +3818,22 @@ 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 - if not getcourse(isprobe=False, akey=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: + # Read in course and distance + if course==None: + try: + course = getcourse(isprobe=False) + except TrekError: + return + # Make sure starship has enough energy for the trip + # Note: this formula is slightly different from the C version, + # and lets you skate a bit closer to the edge. + if course.power(game.warpfac) >= game.energy: # Insufficient power for trip game.ididit = False skip(1) prout(_("Engineering to bridge--")) if not game.shldup or 0.5*power > game.energy: - iwarp = math.pow((game.energy/(game.dist+0.05)), 0.333333333) + iwarp = (game.energy/(course.dist+0.05)) ** 0.333333333 if iwarp <= 0: prout(_("We can't do it, Captain. We don't have enough energy.")) else: @@ -4092,10 +3845,9 @@ def warp(timewarp): prout(".") else: prout(_("We haven't the energy to go that far with the shields up.")) - return - + return # Make sure enough time is left for the trip - game.optime = 10.0*game.dist/game.wfacsq + game.optime = course.time(game.warpfac) if game.optime >= 0.8*game.state.remtime: skip(1) prout(_("First Officer Spock- \"Captain, I compute that such")) @@ -4111,12 +3863,12 @@ def warp(timewarp): if game.warpfac > 6.0: # Decide if engine damage will occur # ESR: Seems wrong. Probability of damage goes *down* with distance? - prob = game.dist*(6.0-game.warpfac)**2/66.666666666 + prob = course.distance*(6.0-game.warpfac)**2/66.666666666 if prob > randreal(): blooey = True - game.dist = randreal(game.dist) + course.distance = randreal(course.distance) # Decide if time warp will occur - if 0.5*game.dist*math.pow(7.0,game.warpfac-10.0) > randreal(): + if 0.5*course.distance*math.pow(7.0,game.warpfac-10.0) > randreal(): twarp = True if idebug and game.warpfac==10 and not twarp: blooey = False @@ -4126,36 +3878,23 @@ def warp(timewarp): if blooey or twarp: # If time warp or engine damage, check path # If it is obstructed, don't do warp or damage - angle = ((15.0-game.direc)*0.5235998) - deltax = -math.sin(angle) - deltay = math.cos(angle) - if math.fabs(deltax) > math.fabs(deltay): - bigger = math.fabs(deltax) - else: - bigger = math.fabs(deltay) - deltax /= bigger - deltay /= bigger - n = 10.0 * game.dist * bigger +0.5 - x = game.sector.i - y = game.sector.j - for l in range(1, n+1): - x += deltax - ix = x + 0.5 - y += deltay - iy = y +0.5 - if not VALID_SECTOR(ix, iy): - break - if game.quad[ix][iy] != IHDOT: + for m in range(course.moves): + course.next() + w = course.sector() + if not w.valid_sector(): + break + if game.quad[w.i][w.j] != '.': blooey = False twarp = False + course.reset() # Activate Warp Engines and pay the cost - imove(novapush=False) + imove(course, noattack=False) if game.alldone: return - game.energy -= game.dist*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1) + game.energy -= course.power(game.warpfac) if game.energy <= 0: finish(FNRG) - game.optime = 10.0*game.dist/game.wfacsq + game.optime = course.time(game.warpfac) if twarp: timwrp() if blooey: @@ -4171,12 +3910,12 @@ def setwarp(): "Change the warp factor." while True: key=scanner.next() - if key != IHEOL: + if key != "IHEOL": break scanner.chew() proutn(_("Warp factor- ")) scanner.chew() - if key != IHREAL: + if key != "IHREAL": huh() return if game.damage[DWARPEN] > 10.0: @@ -4194,7 +3933,6 @@ def setwarp(): return oldfac = game.warpfac game.warpfac = scanner.real - game.wfacsq=game.warpfac*game.warpfac if game.warpfac <= oldfac or game.warpfac <= 6.0: prout(_("Helmsman Sulu- \"Warp factor %d, Captain.\"") % int(game.warpfac)) @@ -4251,7 +3989,6 @@ def atover(igrab): prouts(_(" a supernova.")) skip(2) prout(_("***Emergency automatic override attempts to hurl ")+crmshp()) - skip(1) prout(_("safely out of quadrant.")) if not damaged(DRADIO): game.state.galaxy[game.quadrant.i][game.quadrant.j].charted = True @@ -4262,18 +3999,15 @@ def atover(igrab): finish(FSNOVAED) return game.warpfac = randreal(6.0, 8.0) - game.wfacsq = game.warpfac * game.warpfac prout(_("Warp factor set to %d") % int(game.warpfac)) power = 0.75*game.energy - game.dist = power/(game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)) - distreq = randreal(math.sqrt(2)) - if distreq < game.dist: - game.dist = distreq - game.optime = 10.0*game.dist/game.wfacsq - game.direc = randreal(12) # How dumb! + dist = power/(game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)) + dist = max(dist, randreal(math.sqrt(2))) + bugout = course(bearing=randreal(12), distance=dist) # How dumb! + game.optime = bugout.time(game.warpfac) game.justin = False game.inorbit = False - warp(True) + warp(bugout, involuntary=True) if not game.justin: # This is bad news, we didn't leave quadrant. if game.alldone: @@ -4310,27 +4044,26 @@ def timwrp(): unschedule(FCDBAS) unschedule(FSCDBAS) game.battle.invalidate() - # Make sure Galileo is consistant -- Snapshot may have been taken # when on planet, which would give us two Galileos! gotit = False for l in range(game.inplan): if game.state.planets[l].known == "shuttle_down": gotit = True - if game.iscraft == "onship" and game.ship==IHE: + if game.iscraft == "onship" and game.ship=='E': prout(_("Chekov- \"Security reports the Galileo has disappeared, Sir!")) game.iscraft = "offship" # Likewise, if in the original time the Galileo was abandoned, but # was on ship earlier, it would have vanished -- let's restore it. if game.iscraft == "offship" and not gotit and game.damage[DSHUTTL] >= 0.0: - prout(_("Checkov- \"Security reports the Galileo has reappeared in the dock!\"")) + prout(_("Chekov- \"Security reports the Galileo has reappeared in the dock!\"")) game.iscraft = "onship" # There used to be code to do the actual reconstrction here, # but the starchart is now part of the snapshotted galaxy state. prout(_("Spock has reconstructed a correct star chart from memory")) else: # Go forward in time - game.optime = -0.5*game.intime*math.log(randreal()) + game.optime = expran(0.5*game.intime) prout(_("You are traveling forward in time %d stardates.") % int(game.optime)) # cheat to make sure no tractor beams occur during time warp postpone(FTBEAM, game.optime) @@ -4344,7 +4077,7 @@ def probe(): if game.nprobes == 0: scanner.chew() skip(1) - if game.ship == IHE: + if game.ship == 'E': prout(_("Engineer Scott- \"We have no more deep space probes, Sir.\"")) else: prout(_("Ye Faerie Queene has no deep space probes.")) @@ -4364,8 +4097,7 @@ def probe(): prout(_("Uhura- \"The previous probe is still reporting data, Sir.\"")) return key = scanner.next() - if key == IHEOL: - # slow mode, so let Kirk know how many probes there are left + if key == "IHEOL": if game.nprobes == 1: prout(_("1 probe left.")) else: @@ -4374,50 +4106,24 @@ def probe(): if ja() == False: return game.isarmed = False - if key == IHALPHA and scanner.token == "armed": + if key == "IHALPHA" and scanner.token == "armed": game.isarmed = True key = scanner.next() - elif key == IHEOL: + elif key == "IHEOL": proutn(_("Arm NOVAMAX warhead? ")) game.isarmed = ja() - if not getcourse(isprobe=True, akey=key): - return + elif key == "IHREAL": # first element of course + scanner.push(scanner.token) + try: + game.probe = getcourse(isprobe=True) + except TrekError: + return game.nprobes -= 1 - angle = ((15.0 - game.direc) * 0.5235988) - game.probeinx = -math.sin(angle) - game.probeiny = math.cos(angle) - if math.fabs(game.probeinx) > math.fabs(game.probeiny): - 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 - game.probex = game.quadrant.i*QUADSIZE + game.sector.i - 1 # We will use better packing than original - game.probey = game.quadrant.j*QUADSIZE + game.sector.j - 1 - game.probec = game.quadrant schedule(FDSPROB, 0.01) # Time to move one sector prout(_("Ensign Chekov- \"The deep space probe is launched, Captain.\"")) game.ididit = True return -# Here's how the mayday code works: -# -# First, the closest starbase is selected. If there is a a starbase -# in your own quadrant, you are in good shape. This distance takes -# quadrant distances into account only. -# -# A magic number is computed based on the distance which acts as the -# probability that you will be rematerialized. You get three tries. -# -# When it is determined that you should be able to be rematerialized -# (i.e., when the probability thing mentioned above comes up -# positive), you are put into that quadrant (anywhere). Then, we try -# to see if there is a spot adjacent to the star- base. If not, you -# can't be rematerialized!!! Otherwise, it drops you there. It only -# tries five times to find a spot to drop you. After that, it's your -# problem. - def mayday(): "Yell for help from nearest starbase." # There's more than one way to move in this game! @@ -4450,13 +4156,13 @@ def mayday(): game.quadrant = ibq newqad() # dematerialize starship - game.quad[game.sector.i][game.sector.j]=IHDOT + game.quad[game.sector.i][game.sector.j]='.' proutn(_("Starbase in Quadrant %s responds--%s dematerializes") \ % (game.quadrant, crmshp())) game.sector.invalidate() for m in range(1, 5+1): w = game.base.scatter() - if VALID_SECTOR(w.i,w.j) and game.quad[w.i][w.j]==IHDOT: + if w.valid_sector() and game.quad[w.i][w.j]=='.': # found one -- finish up game.sector = w break @@ -4471,52 +4177,34 @@ def mayday(): elif m == 2: proutn(_("2nd")) elif m == 3: proutn(_("3rd")) proutn(_(" attempt to re-materialize ") + crmshp()) - game.quad[ix][iy]=(IHMATER0,IHMATER1,IHMATER2)[m-1] - textcolor("red") + game.quad[ix][iy]=('-','o','O')[m-1] + textcolor(RED) warble() if randreal() > probf: break prout(_("fails.")) + textcolor(DEFAULT) curses.delay_output(500) - textcolor(None) if m > 3: - game.quad[ix][iy]=IHQUEST + game.quad[ix][iy]='?' game.alive = False drawmaps(1) setwnd(message_window) finish(FMATERIALIZE) return game.quad[ix][iy]=game.ship - textcolor("green") + textcolor(GREEN); prout(_("succeeds.")) - textcolor(None) + textcolor(DEFAULT); dock(False) skip(1) prout(_("Lt. Uhura- \"Captain, we made it!\"")) -# Abandon Ship (the BSD-Trek description) -# -# The ship is abandoned. If your current ship is the Faire -# Queene, or if your shuttlecraft is dead, you're out of -# luck. You need the shuttlecraft in order for the captain -# (that's you!!) to escape. -# -# Your crew can beam to an inhabited starsystem in the -# quadrant, if there is one and if the transporter is working. -# If there is no inhabited starsystem, or if the transporter -# is out, they are left to die in outer space. -# -# If there are no starbases left, you are captured by the -# Klingons, who torture you mercilessly. However, if there -# is at least one starbase, you are returned to the -# Federation in a prisoner of war exchange. Of course, this -# can't happen unless you have taken some prisoners. - def abandon(): "Abandon ship." scanner.chew() if game.condition=="docked": - if game.ship!=IHE: + if game.ship!='E': prout(_("You cannot abandon Ye Faerie Queene.")) return else: @@ -4574,11 +4262,11 @@ def abandon(): newqad() while True: # position next to base by trial and error - game.quad[game.sector.i][game.sector.j] = IHDOT + game.quad[game.sector.i][game.sector.j] = '.' for l in range(QUADSIZE): game.sector = game.base.scatter() - if VALID_SECTOR(game.sector.i, game.sector.j) and \ - game.quad[game.sector.i][game.sector.j] == IHDOT: + if game.sector.valid_sector() and \ + game.quad[game.sector.i][game.sector.j] == '.': break if l < QUADSIZE+1: break # found a spot @@ -4586,7 +4274,7 @@ def abandon(): game.sector.j=QUADSIZE/2 newqad() # Get new commission - game.quad[game.sector.i][game.sector.j] = game.ship = IHF + game.quad[game.sector.i][game.sector.j] = game.ship = 'F' game.state.crew = FULLCREW prout(_("Starfleet puts you in command of another ship,")) prout(_("the Faerie Queene, which is antiquated but,")) @@ -4606,7 +4294,6 @@ def abandon(): game.lsupres=game.inlsr=3.0 game.shldup=False game.warpfac=5.0 - game.wfacsq=25.0 return # Code from planets.c begins here. @@ -4847,7 +4534,7 @@ def usecrystals(): skip(1) prouts(_("Scotty- \"Keep your fingers crossed, Sir!\"")) skip(1) - if with(game.cryprob): + if withprob(game.cryprob): prouts(_(" \"Activating now! - - No good! It's***")) skip(2) prouts(_("***RED ALERT! RED A*L********************************")) @@ -4970,7 +4657,7 @@ def deathray(): game.ididit = False skip(1) scanner.chew() - if game.ship != IHE: + if game.ship != 'E': prout(_("Ye Faerie Queene has no death ray.")) return if len(game.enemies)==0: @@ -5006,7 +4693,7 @@ def deathray(): prouts(_("Sulu- \"Captain! It's working!\"")) skip(2) while len(game.enemies) > 0: - deadkl(game.enemies[1].kloc, game.quad[game.enemies[1].kloc.i][game.enemies[1].kloc.j],game.enemies[1].kloc) + 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.state.remkl + len(game.state.kcmdr) + game.state.nscrem) == 0: finish(FWON) @@ -5054,8 +4741,8 @@ def deathray(): prout(_(" Mr. Sulu.")) for i in range(QUADSIZE): for j in range(QUADSIZE): - if game.quad[i][j] == IHDOT: - game.quad[i][j] = IHQUEST + if game.quad[i][j] == '.': + game.quad[i][j] = '?' prout(_(" Captain, our quadrant is now infested with")) prouts(_(" - - - - - - *THINGS*.")) skip(1) @@ -5129,7 +4816,7 @@ def report(): prout(_("%d casualt%s suffered so far.") % (game.casual, ("y", "ies")[game.casual!=1])) if game.nhelp: prout(_("There were %d call%s for help.") % (game.nhelp, ("" , _("s"))[game.nhelp!=1])) - if game.ship == IHE: + if game.ship == 'E': proutn(_("You have ")) if game.nprobes: proutn("%d" % (game.nprobes)) @@ -5174,7 +4861,7 @@ def lrscan(silent): if not silent: proutn(" ") for y in range(game.quadrant.j-1, game.quadrant.j+2): - if not VALID_QUADRANT(x, y): + if not coord(x, y).valid_quadrant(): if not silent: proutn(" -1") else: @@ -5193,7 +4880,6 @@ def damagereport(): "Damage report." jdam = False scanner.chew() - for i in range(NDEVICES): if damaged(i): if not jdam: @@ -5202,7 +4888,7 @@ def damagereport(): jdam = True prout(" %-26s\t%8.2f\t\t%8.2f" % (device[i], game.damage[i]+0.05, - game.docfac*game.damage[i]+0.005)) + DOCKFAC*game.damage[i]+0.005)) if not jdam: prout(_("All devices functional.")) @@ -5257,16 +4943,15 @@ def chart(): def sectscan(goodScan, i, j): "Light up an individual dot in a sector." if goodScan or (abs(i-game.sector.i)<= 1 and abs(j-game.sector.j) <= 1): - if (game.quad[i][j]==IHMATER0) or (game.quad[i][j]==IHMATER1) or (game.quad[i][j]==IHMATER2) or (game.quad[i][j]==IHE) or (game.quad[i][j]==IHF): - if game.condition == "red": textcolor("red") - elif game.condition == "green": textcolor("green") - elif game.condition == "yellow": textcolor("yellow") - elif game.condition == "docked": textcolor("cyan") - elif game.condition == "dead": textcolor("brown") - if game.quad[i][j] != game.ship: - highvideo() + textcolor({"green":GREEN, + "yellow":YELLOW, + "red":RED, + "docked":CYAN, + "dead":BROWN}[game.condition]) + if game.quad[i][j] != game.ship: + highvideo(); proutn("%c " % game.quad[i][j]) - textcolor(None) + textcolor(DEFAULT) else: proutn("- ") @@ -5278,11 +4963,8 @@ def status(req=0): if not req or req == 2: if game.condition != "docked": newcnd() - dam = 0 - for t in range(NDEVICES): - if game.damage[t]>0: - dam += 1 - prstat(_("Condition"), _("%s, %i DAMAGES") % (game.condition.upper(), dam)) + prstat(_("Condition"), _("%s, %i DAMAGES") % \ + (game.condition.upper(), sum(map(lambda x: x > 0, game.damage)))) if not req or req == 3: prstat(_("Position"), "%s , %s" % (game.quadrant, game.sector)) if not req or req == 4: @@ -5315,7 +4997,7 @@ def status(req=0): prstat(_("Shields"), s+data) if not req or req == 9: prstat(_("Klingons Left"), "%d" \ - % (game.state.remkl + len(game.state.kcmdr) + game.state.nscrem)) + % (game.state.remkl+len(game.state.kcmdr)+game.state.nscrem)) if not req or req == 10: if game.options & OPTION_WORLDS: plnet = game.state.galaxy[game.quadrant.i][game.quadrant.j].planet @@ -5329,7 +5011,7 @@ def status(req=0): def request(): "Request specified status data, a historical relic from slow TTYs." requests = ("da","co","po","ls","wa","en","to","sh","kl","sy", "ti") - while scanner.next() == IHEOL: + while scanner.next() == "IHEOL": proutn(_("Information desired? ")) scanner.chew() if scanner.token in requests: @@ -5364,7 +5046,7 @@ def srscan(): for j in range(QUADSIZE): sectscan(goodScan, i, j) skip(1) - + def eta(): "Use computer to get estimated time of arrival for a warp jump." w1 = coord(); w2 = coord() @@ -5373,21 +5055,21 @@ def eta(): prout(_("COMPUTER DAMAGED, USE A POCKET CALCULATOR.")) skip(1) return - if scanner.next() != IHREAL: + if scanner.next() != "IHREAL": prompt = True scanner.chew() proutn(_("Destination quadrant and/or sector? ")) - if scanner.next()!=IHREAL: + if scanner.next()!="IHREAL": huh() return w1.j = int(scanner.real-0.5) - if scanner.next() != IHREAL: + if scanner.next() != "IHREAL": huh() return w1.i = int(scanner.real-0.5) - if scanner.next() == IHREAL: + if scanner.next() == "IHREAL": w2.j = int(scanner.real-0.5) - if scanner.next() != IHREAL: + if scanner.next() != "IHREAL": huh() return w2.i = int(scanner.real-0.5) @@ -5400,22 +5082,22 @@ def eta(): w2.j = 0 else: w2.j=QUADSIZE-1 - if not VALID_QUADRANT(w1.i, w1.j) or not VALID_SECTOR(w2.i, w2.j): + if not w1.valid_quadrant() or not w2.valid_sector(): huh() return - game.dist = math.sqrt((w1.j-game.quadrant.j+0.1*(w2.j-game.sector.j))**2+ - (w1.i-game.quadrant.i+0.1*(w2.i-game.sector.i))**2) + dist = math.sqrt((w1.j-game.quadrant.j+(w2.j-game.sector.j)/(QUADSIZE*1.0))**2+ + (w1.i-game.quadrant.i+(w2.i-game.sector.i)/(QUADSIZE*1.0))**2) wfl = False if prompt: prout(_("Answer \"no\" if you don't know the value:")) while True: scanner.chew() proutn(_("Time or arrival date? ")) - if scanner.next()==IHREAL: + if scanner.next()=="IHREAL": ttime = scanner.real if ttime > game.state.date: ttime -= game.state.date # Actually a star date - twarp=(math.floor(math.sqrt((10.0*game.dist)/ttime)*10.0)+1.0)/10.0 + twarp=(math.floor(math.sqrt((10.0*dist)/ttime)*10.0)+1.0)/10.0 if ttime <= 1e-10 or twarp > 10: prout(_("We'll never make it, sir.")) scanner.chew() @@ -5425,7 +5107,7 @@ def eta(): break scanner.chew() proutn(_("Warp factor? ")) - if scanner.next()== IHREAL: + if scanner.next()== "IHREAL": wfl = True twarp = scanner.real if twarp<1.0 or twarp > 10.0: @@ -5435,15 +5117,15 @@ def eta(): prout(_("Captain, certainly you can give me one of these.")) while True: scanner.chew() - ttime = (10.0*game.dist)/twarp**2 - tpower = game.dist*twarp*twarp*twarp*(game.shldup+1) + ttime = (10.0*dist)/twarp**2 + tpower = dist*twarp*twarp*twarp*(game.shldup+1) if tpower >= game.energy: prout(_("Insufficient energy, sir.")) if not game.shldup or tpower > game.energy*2.0: if not wfl: return proutn(_("New warp factor to try? ")) - if scanner.next() == IHREAL: + if scanner.next() == "IHREAL": wfl = True twarp = scanner.real if twarp<1.0 or twarp > 10.0: @@ -5476,7 +5158,7 @@ def eta(): (scheduled(FCDBAS) 10.0: @@ -5501,18 +5183,17 @@ def prelim(): def freeze(boss): "Save game." if boss: - scanner.token = "emsave.trk" - else: + scanner.push("emsave.trk") + key = scanner.next() + if key == "IHEOL": + proutn(_("File name: ")) key = scanner.next() - if key == IHEOL: - proutn(_("File name: ")) - key = scanner.next() - if key != IHALPHA: - huh() - return - scanner.chew() - if '.' not in scanner.token: - scanner.token += ".trk" + if key != "IHALPHA": + huh() + return + scanner.chew() + if '.' not in scanner.token: + scanner.token += ".trk" try: fp = open(scanner.token, "wb") except IOError: @@ -5525,10 +5206,10 @@ def thaw(): "Retrieve saved game." game.passwd[0] = '\0' key = scanner.next() - if key == IHEOL: + if key == "IHEOL": proutn(_("File name: ")) key = scanner.next() - if key != IHALPHA: + if key != "IHALPHA": huh() return True scanner.chew() @@ -5555,11 +5236,11 @@ systnames = ( _("Tellar Prime (Miracht)"), # TOS: "Journey to Babel" _("Vulcan (T'Khasi)"), # many episodes _("Medusa"), # TOS: "Is There in Truth No Beauty?" - _("Argelius II (Nelphia)"),# TOS: "Wolf in the Fold" ("IV" in BSD) + _("Argelius II (Nelphia)"), # TOS: "Wolf in the Fold" ("IV" in BSD) _("Ardana"), # TOS: "The Cloud Minders" _("Catulla (Cendo-Prae)"), # TOS: "The Way to Eden" _("Gideon"), # TOS: "The Mark of Gideon" - _("Aldebaran III"), # TOS: "The Deadly Years" + _("Aldebaran III"), # TOS: "The Deadly Years" _("Alpha Majoris I"), # TOS: "Wolf in the Fold" _("Altair IV"), # TOS: "Amok Time _("Ariannus"), # TOS: "Let That Be Your Last Battlefield" @@ -5621,13 +5302,11 @@ def setup(): if choose(): return # frozen game # Prepare the Enterprise - game.alldone = game.gamewon = False - game.ship = IHE + game.alldone = game.gamewon = game.shldchg = game.shldup = False + game.ship = 'E' game.state.crew = FULLCREW game.energy = game.inenrg = 5000.0 game.shield = game.inshld = 2500.0 - game.shldchg = False - game.shldup = False game.inlsr = 4.0 game.lsupres = 4.0 game.quadrant = randplace(GALSIZE) @@ -5635,7 +5314,6 @@ def setup(): game.torps = game.intorps = 10 game.nprobes = randrange(2, 5) game.warpfac = 5.0 - game.wfacsq = game.warpfac * game.warpfac for i in range(NDEVICES): game.damage[i] = 0.0 # Set up assorted game parameters @@ -5648,7 +5326,6 @@ def setup(): game.iscraft = "onship" game.landed = False game.alive = True - game.docfac = 0.25 # Starchart is functional but we've never seen it game.lastchart = FOREVER # Put stars in the galaxy @@ -5814,19 +5491,15 @@ def setup(): def choose(): "Choose your game type." - global thing while True: - game.tourn = 0 + game.tourn = game.length = 0 game.thawed = False game.skill = SKILL_NONE - game.length = 0 if not scanner.inqueue: # Can start with command line options proutn(_("Would you like a regular, tournament, or saved game? ")) scanner.next() - if len(scanner.token)==0: # Try again - continue if scanner.sees("tournament"): - while scanner.next() == IHEOL: + while scanner.next() == "IHEOL": proutn(_("Type in tournament number-")) if scanner.real == 0: scanner.chew() @@ -5852,7 +5525,7 @@ def choose(): proutn(_("What is \"%s\"?") % scanner.token) scanner.chew() while game.length==0 or game.skill==SKILL_NONE: - if scanner.next() == IHALPHA: + if scanner.next() == "IHALPHA": if scanner.sees("short"): game.length = 1 elif scanner.sees("medium"): @@ -5880,9 +5553,9 @@ def choose(): elif game.skill == SKILL_NONE: proutn(_("Are you a Novice, Fair, Good, Expert, or Emeritus player? ")) # Choose game options -- added by ESR for SST2K - if scanner.next() != IHALPHA: + if scanner.next() != "IHALPHA": scanner.chew() - proutn(_("Choose your game style (or just press enter): ")) + proutn(_("Choose your game style (plain, almy, fancy or just press enter): ")) scanner.next() if scanner.sees("plain"): # Approximates the UT FORTRAN version. @@ -5892,10 +5565,11 @@ def choose(): # Approximates Tom Almy's version. game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS) game.options |= OPTION_ALMY - elif scanner.sees("fancy"): + elif scanner.sees("fancy") or scanner.sees("\n"): pass elif len(scanner.token): proutn(_("What is \"%s\"?") % scanner.token) + game.options &=~ OPTION_COLOR setpassword() if game.passwd == "debug": idebug = True @@ -5924,7 +5598,7 @@ def dropin(iquad=None): "Drop a feature on a random dot in the current quadrant." while True: w = randplace(QUADSIZE) - if game.quad[w.i][w.j] == IHDOT: + if game.quad[w.i][w.j] == '.': break if iquad is not None: game.quad[w.i][w.j] = iquad @@ -5942,7 +5616,7 @@ def newcnd(): def newkling(): "Drop new Klingon into current quadrant." - return enemy(IHK, loc=dropin(), power=randreal(300,450)+25.0*game.skill) + return enemy('K', loc=dropin(), power=randreal(300,450)+25.0*game.skill) def newqad(): "Set up a new state of quadrant, for when we enter or re-enter it." @@ -5951,7 +5625,7 @@ def newqad(): game.neutz = game.inorbit = game.landed = False game.ientesc = game.iseenit = False # Create a blank quadrant - game.quad = fill2d(QUADSIZE, lambda i, j: IHDOT) + game.quad = fill2d(QUADSIZE, lambda i, j: '.') if game.iscate: # Attempt to escape Super-commander, so tbeam back! game.iscate = False @@ -5973,28 +5647,28 @@ def newqad(): for cmdr in game.state.kcmdr: if cmdr == game.quadrant: e = game.enemies[game.klhere-1] - game.quad[e.kloc.i][e.kloc.j] = IHC - e.kpower = randreal(950,1350) + 50.0*game.skill + game.quad[e.location.i][e.location.j] = 'C' + e.power = randreal(950,1350) + 50.0*game.skill break # If we need a super-commander, promote a Klingon if game.quadrant == game.state.kscmdr: e = game.enemies[0] - game.quad[e.kloc.i][e.kloc.j] = IHS - e.kpower = randreal(1175.0, 1575.0) + 125.0*game.skill + game.quad[e.location.i][e.location.j] = 'S' + e.power = randreal(1175.0, 1575.0) + 125.0*game.skill game.iscate = (game.state.remkl > 1) # Put in Romulans if needed for i in range(q.romulans): - enemy(IHR, loc=dropin(), power=randreal(400.0,850.0)+50.0*game.skill) + enemy('R', loc=dropin(), power=randreal(400.0,850.0)+50.0*game.skill) # If quadrant needs a starbase, put it in if q.starbase: - game.base = dropin(IHB) + game.base = dropin('B') # If quadrant needs a planet, put it in if q.planet: game.iplnet = q.planet if not q.planet.inhabited: - game.plnet = dropin(IHP) + game.plnet = dropin('P') else: - game.plnet = dropin(IHW) + game.plnet = dropin('@') # Check for condition newcnd() # Check for RNZ @@ -6009,7 +5683,7 @@ def newqad(): prout(_("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!")) # Put in THING if needed if thing == game.quadrant: - enemy(type=IHQUEST, loc=dropin(), + enemy(type='?', loc=dropin(), power=randreal(6000,6500.0)+250.0*game.skill) if not damaged(DSRSENS): skip(1) @@ -6024,37 +5698,37 @@ def newqad(): while True: w.i = withprob(0.5) * (QUADSIZE-1) w.j = withprob(0.5) * (QUADSIZE-1) - if game.quad[w.i][w.j] == IHDOT: + if game.quad[w.i][w.j] == '.': break - game.tholian = enemy(type=IHT, loc=w, + game.tholian = enemy(type='T', loc=w, power=randrange(100, 500) + 25.0*game.skill) # Reserve unoccupied corners - if game.quad[0][0]==IHDOT: + if game.quad[0][0]=='.': game.quad[0][0] = 'X' - if game.quad[0][QUADSIZE-1]==IHDOT: + if game.quad[0][QUADSIZE-1]=='.': game.quad[0][QUADSIZE-1] = 'X' - if game.quad[QUADSIZE-1][0]==IHDOT: + if game.quad[QUADSIZE-1][0]=='.': game.quad[QUADSIZE-1][0] = 'X' - if game.quad[QUADSIZE-1][QUADSIZE-1]==IHDOT: + if game.quad[QUADSIZE-1][QUADSIZE-1]=='.': game.quad[QUADSIZE-1][QUADSIZE-1] = 'X' game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist)) # And finally the stars for i in range(q.stars): - dropin(IHSTAR) + dropin('*') # Put in a few black holes for i in range(1, 3+1): if withprob(0.5): - dropin(IHBLANK) + dropin(' ') # Take out X's in corners if Tholian present if game.tholian: if game.quad[0][0]=='X': - game.quad[0][0] = IHDOT + game.quad[0][0] = '.' if game.quad[0][QUADSIZE-1]=='X': - game.quad[0][QUADSIZE-1] = IHDOT + game.quad[0][QUADSIZE-1] = '.' if game.quad[QUADSIZE-1][0]=='X': - game.quad[QUADSIZE-1][0] = IHDOT + game.quad[QUADSIZE-1][0] = '.' if game.quad[QUADSIZE-1][QUADSIZE-1]=='X': - game.quad[QUADSIZE-1][QUADSIZE-1] = IHDOT + game.quad[QUADSIZE-1][QUADSIZE-1] = '.' def setpassword(): "Set the self-destruct password." @@ -6117,30 +5791,32 @@ commands = { def listCommands(): "Generate a list of legal commands." - proutn(_("LEGAL COMMANDS ARE:")) - for (k, key) in enumerate(commands): + prout(_("LEGAL COMMANDS ARE:")) + emitted = 0 + for key in commands: if not commands[key] or (commands[key] & game.options): - if k % 5 == 0: + proutn("%-12s " % key) + emitted += 1 + if emitted % 5 == 4: skip(1) - proutn("%-12s " % key) skip(1) def helpme(): "Browse on-line help." key = scanner.next() while True: - if key == IHEOL: + if key == "IHEOL": setwnd(prompt_window) proutn(_("Help on what command? ")) key = scanner.next() setwnd(message_window) - if key == IHEOL: + if key == "IHEOL": return if scanner.token in commands or scanner.token == "ABBREV": break skip(1) listCommands() - key = IHEOL + key = "IHEOL" scanner.chew() skip(1) cmd = scanner.token.upper() @@ -6157,10 +5833,8 @@ def helpme(): proutn(_(" current directory or to ")) proutn(SSTDOC) prout(".\"") - # # This used to continue: "You need to find SST.DOC and put # it in the current directory." - # return while True: linebuf = fp.readline() @@ -6189,13 +5863,12 @@ def makemoves(): drawmaps(1) while True: # get a command hitme = False - game.justin = False - game.optime = 0.0 + game.optime = game.justin = False scanner.chew() setwnd(prompt_window) clrscr() proutn("COMMAND> ") - if scanner.next() == IHEOL: + if scanner.next() == "IHEOL": if game.options & OPTION_CURSES: makechart() continue @@ -6232,7 +5905,7 @@ def makemoves(): if game.ididit: hitme = True elif cmd == "MOVE": # move under warp - warp(False) + warp(course=None, involuntary=False) elif cmd == "SHIELDS": # shields doshield(shraise=False) if game.ididit: @@ -6341,18 +6014,18 @@ def makemoves(): def cramen(type): "Emit the name of an enemy or feature." - if type == IHR: s = _("Romulan") - elif type == IHK: s = _("Klingon") - elif type == IHC: s = _("Commander") - elif type == IHS: s = _("Super-commander") - elif type == IHSTAR: s = _("Star") - elif type == IHP: s = _("Planet") - elif type == IHB: s = _("Starbase") - elif type == IHBLANK: s = _("Black hole") - elif type == IHT: s = _("Tholian") - elif type == IHWEB: s = _("Tholian web") - elif type == IHQUEST: s = _("Stranger") - elif type == IHW: s = _("Inhabited World") + if type == 'R': s = _("Romulan") + elif type == 'K': s = _("Klingon") + elif type == 'C': s = _("Commander") + elif type == 'S': s = _("Super-commander") + elif type == '*': s = _("Star") + elif type == 'P': s = _("Planet") + elif type == 'B': s = _("Starbase") + elif type == ' ': s = _("Black hole") + elif type == 'T': s = _("Tholian") + elif type == '#': s = _("Tholian web") + elif type == '?': s = _("Stranger") + elif type == '@': s = _("Inhabited World") else: s = "Unknown??" return s @@ -6370,7 +6043,7 @@ def crmena(stars, enemy, loctype, w): def crmshp(): "Emit our ship name." - return{IHE:_("Enterprise"),IHF:_("Faerie Queene")}.get(game.ship,"Ship???") + return{'E':_("Enterprise"),'F':_("Faerie Queene")}.get(game.ship,"Ship???") def stars(): "Emit a line of stars" @@ -6406,40 +6079,36 @@ class sstscanner: clrscr() if line == '': return None - # Skip leading white space - line = line.lstrip() if not line: continue else: - self.inqueue = line.lstrip().split() + [IHEOL] + self.inqueue = line.lstrip().split() + ["\n"] # From here on in it's all looking at the queue self.token = self.inqueue.pop(0) - if self.token == IHEOL: - self.type = IHEOL - return IHEOL + if self.token == "\n": + self.type = "IHEOL" + return "IHEOL" try: self.real = float(self.token) - self.type = IHREAL - return IHREAL + self.type = "IHREAL" + return "IHREAL" except ValueError: pass # Treat as alpha self.token = self.token.lower() - self.type = IHALPHA + self.type = "IHALPHA" self.real = None - return IHALPHA - def push(self, tok): + return "IHALPHA" + def append(self, tok): self.inqueue.append(tok) + def push(self, tok): + self.inqueue.insert(0, tok) def waiting(self): return self.inqueue def chew(self): # Demand input for next scan self.inqueue = [] self.real = self.token = None - def chew2(self): - # return IHEOL next time - self.inqueue = [IHEOL] - self.real = self.token = None def sees(self, s): # compares s to item and returns true if it matches to the length of s return s.startswith(self.token) @@ -6449,27 +6118,29 @@ class sstscanner: def getcoord(self): s = coord() scanner.next() - if scanner.type != IHREAL: + if scanner.type != "IHREAL": huh() return None s.i = scanner.int()-1 scanner.next() - if scanner.type != IHREAL: + if scanner.type != "IHREAL": huh() return None s.j = scanner.int()-1 return s + def __repr__(str): + return "" % (scanner.token, scanner.type, scanner.inqueue) def ja(): "Yes-or-no confirmation." scanner.chew() while True: scanner.next() - scanner.chew() if scanner.token == 'y': return True if scanner.token == 'n': return False + scanner.chew() proutn(_("Please answer with \"y\" or \"n\": ")) def huh(): @@ -6505,7 +6176,7 @@ def debugme(): proutn("Kill %s?" % device[i]) scanner.chew() key = scanner.next() - if key == IHALPHA and scanner.sees("y"): + if key == "IHALPHA" and scanner.sees("y"): game.damage[i] = 10.0 proutn("Examine/change events? ") if ja() == True: @@ -6539,21 +6210,21 @@ def debugme(): if key == 'n': unschedule(i) scanner.chew() - elif key == IHREAL: + elif key == "IHREAL": ev = schedule(i, scanner.real) if i == FENSLV or i == FREPRO: scanner.chew() proutn("In quadrant- ") key = scanner.next() - # IHEOL says to leave coordinates as they are - if key != IHEOL: - if key != IHREAL: + # "IHEOL" says to leave coordinates as they are + if key != "IHEOL": + if key != "IHREAL": prout("Event %d canceled, no x coordinate." % (i)) unschedule(i) continue w.i = int(round(scanner.real)) key = scanner.next() - if key != IHREAL: + if key != "IHREAL": prout("Event %d canceled, no y coordinate." % (i)) unschedule(i) continue @@ -6566,6 +6237,7 @@ def debugme(): atover(True) if __name__ == '__main__': + import getopt, socket try: global line, thing, game, idebug game = None @@ -6574,11 +6246,10 @@ if __name__ == '__main__': game = gamestate() idebug = 0 game.options = OPTION_ALL &~ (OPTION_IOMODES | 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 + if os.getenv("TERM"): + game.options |= OPTION_CURSES + else: + game.options |= OPTION_TTY seed = int(time.time()) (options, arguments) = getopt.getopt(sys.argv[1:], "r:s:tx") for (switch, val) in options: @@ -6611,16 +6282,23 @@ if __name__ == '__main__': sys.stderr.write("usage: sst [-t] [-x] [startcommand...].\n") raise SystemExit, 1 # where to save the input in case of bugs + if "TMPDIR" in os.environ: + tmpdir = os.environ['TMPDIR'] + else: + tmpdir = "/tmp" try: - logfp = open("/usr/tmp/sst-input.log", "w") + logfp = open(os.path.join(tmpdir, "sst-input.log"), "w") except IOError: sys.stderr.write("sst: warning, can't open logfile\n") + sys.exit(1) if logfp: logfp.write("# seed %s\n" % seed) logfp.write("# options %s\n" % " ".join(arguments)) + logfp.write("# recorded by %s@%s on %s\n" % \ + (getpass.getuser(),socket.gethostname(),time.ctime())) random.seed(seed) scanner = sstscanner() - map(scanner.push, arguments) + map(scanner.append, arguments) try: iostart() while True: # Play a game @@ -6639,7 +6317,8 @@ if __name__ == '__main__': if game.tourn and game.alldone: proutn(_("Do you want your score recorded?")) if ja() == True: - scanner.chew2() + scanner.chew() + scanner.push("\n") freeze(False) scanner.chew() proutn(_("Do you want to play again? ")) @@ -6651,5 +6330,6 @@ if __name__ == '__main__': ioend() raise SystemExit, 0 except KeyboardInterrupt: - print"" - pass + if logfp: + logfp.close() + print ""