X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=bd0582e9f370c18d768e22b93aecbda38c7a1472;hp=0bb0a5b430f77751d2d1aed41507fa3aa47ef9a3;hb=e66fcee3307eb7795a9c2c2cf606c451e603698c;hpb=e70b40fc0698a0d6d3d9eebb102c25064662da94

diff --git a/sst.py b/sst.py
index 0bb0a5b..bd0582e 100755
--- a/sst.py
+++ b/sst.py
@@ -27,8 +27,7 @@ try:
 except NameError:
     my_input = input
 
-
-version = "2.1"
+version = "2.2"
 
 docpath  	= (".", "doc/", "/usr/share/doc/sst/")
 
@@ -87,8 +86,6 @@ class Coord:
         return self.i >= 0 and self.i < QUADSIZE and self.j >= 0 and self.j < QUADSIZE
     def invalidate(self):
         self.i = self.j = None
-    def is_valid(self):
-        return self.i != None and self.j != None
     def __eq__(self, other):
         return other != None and self.i == other.i and self.j == other.j
     def __ne__(self, other):
@@ -173,6 +170,9 @@ class Quadrant:
         self.supernova = False
         self.charted = False
         self.status = "secure"        # Could be "secure", "distressed", "enslaved"
+    def __str__(self):
+        return "<Quadrant: %(klingons)d>" % self.__dict__
+    __repr__ = __str__
 
 class Page:
     def __init__(self):
@@ -193,10 +193,9 @@ def fill2d(size, fillfun):
 
 class Snapshot:
     def __init__(self):
-        self.snap = False        # snapshot taken
+        self.snap = False       # snapshot taken
         self.crew = 0           # crew complement
-        self.remkl = 0          # remaining klingons
-        self.nscrem = 0                # remaining super commanders
+        self.nscrem = 0         # remaining super commanders
         self.starkl = 0         # destroyed stars
         self.basekl = 0         # destroyed bases
         self.nromrem = 0        # Romulans remaining
@@ -213,6 +212,10 @@ class Snapshot:
         self.galaxy = fill2d(GALSIZE, lambda i_unused, j_unused: Quadrant())
         # the starchart
         self.chart = fill2d(GALSIZE, lambda i_unused, j_unused: Page())
+    def traverse(self):
+        for i in range(GALSIZE):
+            for j in range(GALSIZE):
+                yield (i, j, self.galaxy[i][j])
 
 class Event:
     def __init__(self):
@@ -415,17 +418,19 @@ class Gamestate:
         self.iscloaked = False  # Cloaking device on?
         self.ncviol = 0         # Algreon treaty violations
         self.isviolreported = False # We have been warned
+    def remkl(self):
+        return sum([q.klingons for (_i, _j, q) in list(self.state.traverse())])
     def recompute(self):
         # Stas thinks this should be (C expression):
-        # game.state.remkl + len(game.state.kcmdr) > 0 ?
-        #        game.state.remres/(game.state.remkl + 4*len(game.state.kcmdr)) : 99
+        # game.remkl() + len(game.state.kcmdr) > 0 ?
+        #        game.state.remres/(game.remkl() + 4*len(game.state.kcmdr)) : 99
         # 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.
-        self.state.remtime = self.state.remres/(self.state.remkl + 4*len(self.state.kcmdr))
+        self.state.remtime = self.state.remres/(self.remkl() + 4*len(self.state.kcmdr))
     def unwon(self):
         "Are there Klingons remaining?"
-        return self.state.remkl + len(self.state.kcmdr) + self.state.nscrem
+        return self.remkl() + len(self.state.kcmdr) + self.state.nscrem
 
 FWON = 0
 FDEPLETE = 1
@@ -759,7 +764,7 @@ def supercommander():
     if game.idebug:
         prout("== SUPERCOMMANDER")
     # Decide on being active or passive
-    avoid = ((game.incom - len(game.state.kcmdr) + game.inkling - game.state.remkl)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) or \
+    avoid = ((game.incom - len(game.state.kcmdr) + game.inkling - game.remkl())/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) or \
             (game.state.date-game.indate) < 3.0)
     if not game.iscate and avoid:
         # compute move away from Enterprise
@@ -1180,7 +1185,7 @@ def collision(rammed, enemy):
         game.damage[dev] += game.optime + extradm
     game.shldup = False
     prout(_("***Shields are down."))
-    if game.state.remkl + len(game.state.kcmdr) + game.state.nscrem:
+    if game.unwon():
         announce()
         damagereport()
     else:
@@ -1618,7 +1623,7 @@ def deadkl(w, etype, mv):
             if is_scheduled(FCDBAS) and game.battle == game.quadrant:
                 unschedule(FCDBAS)
         elif etype ==  'K':
-            game.state.remkl -= 1
+            pass
         elif etype ==  'S':
             game.state.nscrem -= 1
             game.state.kscmdr.invalidate()
@@ -2328,7 +2333,7 @@ def events():
                 return
         game.state.date = datemin
         # Decrement Federation resources and recompute remaining time
-        game.state.remres -= (game.state.remkl+4*len(game.state.kcmdr))*xtime
+        game.state.remres -= (game.remkl()+4*len(game.state.kcmdr))*xtime
         game.recompute()
         if game.state.remtime <= 0:
             finish(FDEPLETE)
@@ -2561,7 +2566,7 @@ def events():
             if q.klingons <= 0:
                 q.status = "secure"
                 continue
-            if game.state.remkl >= MAXKLGAME:
+            if game.remkl() >= MAXKLGAME:
                 continue                # full right now
             # reproduce one Klingon
             w = ev.quadrant
@@ -2583,7 +2588,6 @@ def events():
                 except JumpOut:
                     w = m
             # deliver the child
-            game.state.remkl += 1
             q.klingons += 1
             if game.quadrant == w:
                 game.klhere += 1
@@ -2839,7 +2843,6 @@ def supernova(w):
             stars()
             game.alldone = True
     # 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:
         # did in the Supercommander!
@@ -2850,10 +2853,8 @@ def supernova(w):
     survivors = filter(lambda w: w != nq, game.state.kcmdr)
     comkills = len(game.state.kcmdr) - len(survivors)
     game.state.kcmdr = survivors
-    kldead -= comkills
     if not game.state.kcmdr:
         unschedule(FTBEAM)
-    game.state.remkl -= kldead
     # destroy Romulans and planets in supernovaed quadrant
     nrmdead = game.state.galaxy[nq.i][nq.j].romulans
     game.state.galaxy[nq.i][nq.j].romulans = 0
@@ -3151,7 +3152,7 @@ def finish(ifin):
     game.alive = False
     if game.unwon() != 0:
         goodies = game.state.remres/game.inresor
-        baddies = (game.state.remkl + 2.0*len(game.state.kcmdr))/(game.inkling+2.0*game.incom)
+        baddies = (game.remkl() + 2.0*len(game.state.kcmdr))/(game.inkling+2.0*game.incom)
         if goodies/baddies >= randreal(1.0, 1.5):
             prout(_("As a result of your actions, a treaty with the Klingon"))
             prout(_("Empire has been signed. The terms of the treaty are"))
@@ -3188,7 +3189,7 @@ def score():
         klship = 1
     else:
         klship = 2
-    game.score = 10*(game.inkling - game.state.remkl) \
+    game.score = 10*(game.inkling - game.remkl()) \
              + 50*(game.incom - len(game.state.kcmdr)) \
              + ithperd + iwon \
              + 20*(game.inrom - game.state.nromrem) \
@@ -3206,9 +3207,9 @@ def score():
     if game.state.nromrem and game.gamewon:
         prout(_("%6d Romulans captured                  %5d") %
               (game.state.nromrem, game.state.nromrem))
-    if game.inkling - game.state.remkl:
+    if game.inkling - game.remkl():
         prout(_("%6d ordinary Klingons destroyed        %5d") %
-              (game.inkling - game.state.remkl, 10*(game.inkling - game.state.remkl)))
+              (game.inkling - game.remkl(), 10*(game.inkling - game.remkl())))
     if game.incom - len(game.state.kcmdr):
         prout(_("%6d Klingon commanders destroyed       %5d") %
               (game.incom - len(game.state.kcmdr), 50*(game.incom - len(game.state.kcmdr))))
@@ -3506,7 +3507,7 @@ def setwnd(wnd):
                 legend = "prompt"
             else:
                 legend = "unknown"
-            logfp.write("#curses: setwnd(%s)\n" % legend)
+            #logfp.write("#curses: setwnd(%s)\n" % legend)
         curwnd = wnd
         # Some curses implementations get confused when you try this.
         try:
@@ -3710,8 +3711,6 @@ def imove(icourse=None, noattack=False):
         # check for edge of galaxy
         kinks = 0
         while True:
-
-
             kink = False
             if icourse.final.i < 0:
                 icourse.final.i = -icourse.final.i
@@ -3854,7 +3853,7 @@ def dock(verbose):
     if game.inorbit:
         prout(_("You must first leave standard orbit."))
         return
-    if not game.base.is_valid() or abs(game.sector.i-game.base.i) > 1 or abs(game.sector.j-game.base.j) > 1:
+    if game.base is None or abs(game.sector.i-game.base.i) > 1 or abs(game.sector.j-game.base.j) > 1:
         prout(crmshp() + _(" not adjacent to base."))
         return
     if game.iscloaked:
@@ -4490,7 +4489,7 @@ def mayday():
             # found one -- finish up
             game.sector = w
             break
-    if not game.sector.is_valid():
+    if game.sector is None:
         prout(_("You have been lost in space..."))
         finish(FMATERIALIZE)
         return
@@ -4670,7 +4669,7 @@ def orbit():
     if damaged(DWARPEN) and damaged(DIMPULS):
         prout(_("Both warp and impulse engines damaged."))
         return
-    if not game.plnet.is_valid():
+    if game.plnet is None:
         prout("There is no planet in this sector.")
         return
     if abs(game.sector.i-game.plnet.i)>1 or abs(game.sector.j-game.plnet.j)>1:
@@ -5117,7 +5116,7 @@ def report():
                                                       (game.inkling + game.incom + game.inscom)))
     if game.incom - len(game.state.kcmdr):
         prout(_(", including %d Commander%s.") % (game.incom - len(game.state.kcmdr), (_("s"), "")[(game.incom - len(game.state.kcmdr))==1]))
-    elif game.inkling - game.state.remkl + (game.inscom - game.state.nscrem) > 0:
+    elif game.inkling - game.remkl() + (game.inscom - game.state.nscrem) > 0:
         prout(_(", but no Commanders."))
     else:
         prout(".")
@@ -5210,7 +5209,8 @@ def lrscan(silent):
                 if not silent and game.state.galaxy[x][y].supernova:
                     proutn(" ***")
                 elif not silent:
-                    proutn(" %3d" % (game.state.chart[x][y].klingons*100 + game.state.chart[x][y].starbase * 10 + game.state.chart[x][y].stars))
+                    cn = " %3d" % (game.state.chart[x][y].klingons*100 + game.state.chart[x][y].starbase * 10 + game.state.chart[x][y].stars)
+                    proutn(((3 - len(cn)) * '.') + cn)
         if not silent:
             prout(" ")
 
@@ -5734,7 +5734,7 @@ def setup():
         klumper = MAXKLQUAD
     while True:
         r = randreal()
-        klump = (1.0 - r*r)*klumper
+        klump = int((1.0 - r*r)*klumper)
         if klump > krem:
             klump = krem
         krem -= klump
@@ -5743,7 +5743,7 @@ def setup():
             if not game.state.galaxy[w.i][w.j].supernova and \
                game.state.galaxy[w.i][w.j].klingons + klump <= MAXKLQUAD:
                 break
-        game.state.galaxy[w.i][w.j].klingons += int(klump)
+        game.state.galaxy[w.i][w.j].klingons += klump
         if krem <= 0:
             break
     # Position Klingon Commander Ships
@@ -5955,7 +5955,7 @@ def choose():
     game.state.nscrem = game.inscom = (game.skill > SKILL_FAIR)
     game.state.remtime = 7.0 * game.length
     game.intime = game.state.remtime
-    game.state.remkl = game.inkling = int(2.0*game.intime*((game.skill+1 - 2*randreal())*game.skill*0.1+.15))
+    game.inkling = int(2.0*game.intime*((game.skill+1 - 2*randreal())*game.skill*0.1+.15))
     game.incom = min(MINCMDR, int(game.skill + 0.0625*game.inkling*randreal()))
     game.state.remres = (game.inkling+4*game.incom)*game.intime
     game.inresor = game.state.remres
@@ -6028,7 +6028,7 @@ def newqad():
             e = game.enemies[0]
             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)
+            game.iscate = (game.remkl() > 1)
     # Put in Romulans if needed
     for _i in range(q.romulans):
         Enemy('R', loc=dropin(), power=randreal(400.0,850.0)+50.0*game.skill)
@@ -6102,6 +6102,9 @@ def newqad():
             game.quad[QUADSIZE-1][0] = '.'
         if game.quad[QUADSIZE-1][QUADSIZE-1]=='X':
             game.quad[QUADSIZE-1][QUADSIZE-1] = '.'
+    # This should guarantee that replay games don't lose info about the chart
+    if (game.options & OPTION_AUTOSCAN) or replayfp:
+        lrscan(silent=True)
 
 def setpassword():
     "Set the self-destruct password."