X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=ee6b58a2347e7f2999c26a10795c15598a5dcc6d;hp=742e104dbc77a726455b33242193ea97a4d41803;hb=a9a62a5eb526caf30fc14ba9a0b3a2bb107c15a3;hpb=0c5cf86d08ff17e7578232cd5fcbf54fbc9c6be9 diff --git a/sst.py b/sst.py index 742e104..ee6b58a 100755 --- a/sst.py +++ b/sst.py @@ -386,7 +386,7 @@ class Gamestate: # He says the existing expression is prone to divide-by-zero errors # 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)) + self.state.remtime = self.state.remres/(self.state.remkl + 4*len(self.state.kcmdr)) FWON = 0 FDEPLETE = 1 @@ -1099,7 +1099,8 @@ def torpedo(origin, bearing, dispersion, number, nburst): if iquad == '.': continue # hit something - if not damaged(DSRSENS) or game.condition == "docked": + setwnd(message_window) + if not damaged(DSRSENS) or game.condition == "docked": skip(1) # start new line after text track if iquad in ('E', 'F'): # Hit our ship skip(1) @@ -1111,7 +1112,7 @@ def torpedo(origin, bearing, dispersion, number, nburst): return hit # Cheat if on a planet # 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 = course(track.bearing+randreal(-2.4, 2.4), distance=2**0.5) displacement.next() bumpto = displacement.sector() if not bumpto.valid_sector(): @@ -1154,7 +1155,7 @@ def torpedo(origin, bearing, dispersion, number, nburst): deadkl(w, iquad, w) return None proutn(crmena(True, iquad, "sector", w)) - displacement = course(track.bearing+randreal(-2.4,2.4), distance=2**0.5) + displacement = course(track.bearing+randreal(-2.4, 2.4), distance=2**0.5) displacement.next() bumpto = displacement.sector() if not bumpto.valid_sector(): @@ -1361,7 +1362,7 @@ def attack(torps_ok): continue # Don't waste the effort! attempt = True # Attempt to attack dustfac = randreal(0.8, 0.85) - hit = enemy.power*math.pow(dustfac,enemy.kavgd) + hit = enemy.power*math.pow(dustfac, enemy.kavgd) enemy.power *= 0.75 else: # Enemy uses photon torpedo # We should be able to make the bearing() method work here @@ -1663,10 +1664,10 @@ def hittem(hits): w = Coord() skip(1) for (kk, wham) in enumerate(hits): - if wham==0: + if wham == 0: continue dustfac = randreal(0.9, 1.0) - hit = wham*math.pow(dustfac,game.enemies[kk].kdist) + hit = wham*math.pow(dustfac, game.enemies[kk].kdist) kpini = game.enemies[kk].power kp = math.fabs(kpini) if PHASEFAC*hit < kp: @@ -1707,10 +1708,16 @@ def hittem(hits): def phasers(): "Fire phasers at bad guys." hits = [] - kz = 0; k = 1; irec=0 # Cheating inhibitor - ifast = False; no = False; itarg = True; msgflag = True; rpow=0 + kz = 0 + k = 1 + irec = 0 # Cheating inhibitor + ifast = False + no = False + itarg = True + msgflag = True + rpow = 0 automode = "NOTSET" - key=0 + key = 0 skip(1) # SR sensors and Computer are needed for automode if damaged(DSRSENS) or damaged(DCOMPTR): @@ -1736,15 +1743,15 @@ def phasers(): ifast = True # Original code so convoluted, I re-did it all # (That was Tom Almy talking about the C code, I think -- ESR) - while automode=="NOTSET": - key=scanner.next() + while automode == "NOTSET": + key = scanner.next() if key == "IHALPHA": if scanner.sees("manual"): if len(game.enemies)==0: prout(_("There is no enemy present to select.")) scanner.chew() key = "IHEOL" - automode="AUTOMATIC" + automode = "AUTOMATIC" else: automode = "MANUAL" key = scanner.next() @@ -1788,18 +1795,18 @@ def phasers(): key = scanner.next() if key != "IHREAL" and len(game.enemies) != 0: prout(_("Phasers locked on target. Energy available: %.2f")%avail) - irec=0 + irec = 0 while True: scanner.chew() if not kz: for i in range(len(game.enemies)): - 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 + 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: @@ -1808,11 +1815,11 @@ def phasers(): key = "IHEOL" if not rpow > avail: break - if rpow<=0: + if rpow <= 0: # chicken out scanner.chew() return - key=scanner.next() + key = scanner.next() if key == "IHALPHA" and scanner.sees("no"): no = True if ifast: @@ -1829,7 +1836,7 @@ def phasers(): hits.append(0.0) if powrem <= 0: continue - hits[i] = math.fabs(game.enemies[i].power)/(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 @@ -1884,7 +1891,7 @@ def phasers(): if key == "IHEOL": scanner.chew() if itarg and k > kz: - irec=(abs(game.enemies[k].power)/(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): @@ -1993,11 +2000,13 @@ def events(): "Run through the event queue looking for things to do." i = 0 fintim = game.state.date + game.optime - yank=0 + yank = 0 ictbeam = False istract = False - w = Coord(); hold = Coord() - ev = Event(); ev2 = Event() + w = Coord() + hold = Coord() + ev = Event() + ev2 = Event() def tractorbeam(yank): "Tractor-beaming cases merge here." @@ -2119,7 +2128,7 @@ def events(): finish(FDEPLETE) return # Any crew left alive? - if game.state.crew <=0: + if game.state.crew <= 0: finish(FCREW) return # Is life support adequate? @@ -2163,7 +2172,7 @@ def events(): elif evcode == FSPY: # Check with spy to see if SC should tractor beam if game.state.nscrem == 0 or \ ictbeam or istract or \ - game.condition=="docked" or game.isatb==1 or game.iscate: + game.condition == "docked" or game.isatb == 1 or game.iscate: return if game.ientesc or \ (game.energy<2000 and game.torps<4 and game.shield < 1250) or \ @@ -2315,7 +2324,7 @@ def events(): # tell the captain about it if we can if communicating(): prout(_("Uhura- Captain, %s in Quadrant %s reports it is under attack") \ - % (q.planet, `w`)) + % (q.planet, repr(w))) prout(_("by a Klingon invasion fleet.")) if cancelrest(): return @@ -2346,7 +2355,7 @@ def events(): if q.klingons <= 0: q.status = "secure" continue - if game.state.remkl >=MAXKLGAME: + if game.state.remkl >= MAXKLGAME: continue # full right now # reproduce one Klingon w = ev.quadrant @@ -2457,7 +2466,7 @@ def nova(nov): start = hits.pop() for offset.i in range(-1, 1+1): for offset.j in range(-1, 1+1): - if offset.j==0 and offset.i==0: + if offset.j == 0 and offset.i == 0: continue neighbor = start + offset if not neighbor.valid_sector(): @@ -2484,7 +2493,7 @@ def nova(nov): if iquad == 'P': game.state.nplankl += 1 else: - game.state.worldkl += 1 + game.state.nworldkl += 1 prout(crmena(True, 'B', "sector", neighbor) + _(" destroyed.")) game.iplnet.pclass = "destroyed" game.iplnet = None @@ -3205,6 +3214,9 @@ def proutn(line): if curwnd == message_window and y >= my - 2: pause_game() clrscr() + # Uncomment this to debug curses problems + if logfp: + logfp.write("#curses: at %s proutn(%s)\n" % ((y, x), repr(line))) curwnd.addstr(line) curwnd.refresh() else: @@ -3254,6 +3266,25 @@ def setwnd(wnd): "Change windows -- OK for this to be a no-op in tty mode." global curwnd if game.options & OPTION_CURSES: + # Uncomment this to debug curses problems + if logfp: + if wnd == fullscreen_window: + legend = "fullscreen" + elif wnd == srscan_window: + legend = "srscan" + elif wnd == report_window: + legend = "report" + elif wnd == status_window: + legend = "status" + elif wnd == lrscan_window: + legend = "lrscan" + elif wnd == message_window: + legend = "message" + elif wnd == prompt_window: + legend = "prompt" + else: + legend = "unknown" + logfp.write("#curses: setwnd(%s)\n" % legend) curwnd = wnd curses.curs_set(wnd == fullscreen_window or wnd == message_window or wnd == prompt_window) @@ -6310,6 +6341,7 @@ if __name__ == '__main__': game.options |= OPTION_TTY seed = int(time.time()) (options, arguments) = getopt.getopt(sys.argv[1:], "r:s:txV") + replay = False for (switch, val) in options: if switch == '-r': try: @@ -6319,11 +6351,12 @@ if __name__ == '__main__': raise SystemExit, 1 try: line = replayfp.readline().strip() - (leader, key, seed) = line.split() + (leader, __, seed) = line.split() seed = eval(seed) sys.stderr.write("sst2k: seed set to %s\n" % seed) line = replayfp.readline().strip() arguments += line.split()[2:] + replay = True except ValueError: sys.stderr.write("sst: replay file %s is ill-formed\n"% val) raise SystemExit(1) @@ -6372,6 +6405,8 @@ if __name__ == '__main__': game.alldone = False else: makemoves() + if replay: + break skip(1) stars() skip(1)