Parallel cleanups in the C and scratch Python code.

diff --git a/src/ai.c b/src/ai.c
index 9d9da5db244a60cd4038cf2256c04fb791df2e41..80465ba11e33fb9574d0f24a8a2c1fde5ace37ba 100644 (file)
--- a/src/ai.c
+++ b/src/ai.c
@@ -10,8 +10,8 @@ static bool tryexit(coord look, int ienm, int loccom, bool irun)
     iq.y = game.quadrant.y+(look.y+(QUADSIZE-1))/QUADSIZE - 1;
     if (!VALID_QUADRANT(iq.x,iq.y) ||
        game.state.galaxy[iq.x][iq.y].supernova ||
-       game.state.galaxy[iq.x][iq.y].klingons > 8)
-       return false; /* no can do -- neg energy, supernovae, or >8 Klingons */
+       game.state.galaxy[iq.x][iq.y].klingons > MAXKLQUAD-1)
+       return false; /* no can do -- neg energy, supernovae, or >MAXKLQUAD-1 Klingons */
     if (ienm == IHR) return false; /* Romulans cannot escape! */
     if (!irun) {
        /* avoid intruding on another commander's territory */
@@ -155,7 +155,7 @@ static void movebaddy(coord com, int loccom, feature ienm)
                motion -= game.skill*(2.0-square(Rand()));
        }
        if (idebug)
-           proutn("=== MOTION = %1.2f, FORCES = %1.2f, ", motion, forces);
+           proutn("=== MOTION = %d, FORCES = %1.2f, ", motion, forces);
        /* don't move if no motion */
        if (motion==0) return;
        /* Limit motion according to skill */
@@ -296,7 +296,7 @@ static bool movescom(coord iq, bool flag, bool *ipage)
 
     if (same(iq, game.quadrant) || !VALID_QUADRANT(iq.x, iq.y) ||
        game.state.galaxy[iq.x][iq.y].supernova ||
-       game.state.galaxy[iq.x][iq.y].klingons > 8) 
+       game.state.galaxy[iq.x][iq.y].klingons > MAXKLQUAD-1) 
        return 1;
     if (flag) {
        /* Avoid quadrants with bases if we want to avoid Enterprise */
@@ -413,7 +413,7 @@ void scom(bool *ipage)
            ibq = game.state.baseq[i];
            if (same(ibq, game.quadrant) || same(ibq, game.battle) ||
                game.state.galaxy[ibq.x][ibq.y].supernova ||
-               game.state.galaxy[ibq.x][ibq.y].klingons > 8) 
+               game.state.galaxy[ibq.x][ibq.y].klingons > MAXKLQUAD-1) 
                continue;
            /* if there is a commander, an no other base is appropriate,
               we will take the one with the commander */

diff --git a/src/finish.c b/src/finish.c
index d39257422299a0ba4aa61eb6bb4d4291753537df..a014e6c91688c6101320db494e5bd5ff6ad8f670 100644 (file)
--- a/src/finish.c
+++ b/src/finish.c
@@ -219,7 +219,7 @@ void finish(FINTYPE ifin)
        break;
     case FMATERIALIZE:
        prout(_("Starbase was unable to re-materialize your starship."));
-       prout(_("Sic transit gloria muntdi"));
+       prout(_("Sic transit gloria mundi"));
        break;
     case FPHASER:
        proutn(_("The "));

diff --git a/src/sst.py b/src/sst.py
index 8e3842f045b30132845080f2486ee6301c5b8593..5d69d911dcf3d514ad98dbeb79ea859940ca1689 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -1,5 +1,15 @@
 """
 sst.py =-- Super Star Trek in Python
+
+Control flow of this translation is pretty much identical to the C version
+(and thus like the ancestral FORTRAN) but the data structures are
+radically different -- the Python code makes heavy use of objects.
+
+Note that the game.quad, game.snap.galaxy and game.snap.chart members
+are not actually arrays but dictioaries indixed by coord tuples.  Be setting
+the hash of a coord exual to the hash of a literal tuple containing its
+coordinate data, we ensure these can be indexed both ways.
+
 """
 import math
 
@@ -15,6 +25,11 @@ MAXKLGAME    = 127
 MAXKLQUAD      = 9
 FOREVER        = 1e30
 
+# These macros hide the difference between 0-origin and 1-origin addressing.
+# They're a step towards de-FORTRANizing the code.
+def VALID_QUADRANT(x,y): ((x)>=1 and (x)<=GALSIZE and (y)>=1 and (y)<=GALSIZE)
+def VALID_SECTOR(x, y):        ((x)>=1 and (x)<=QUADSIZE and (y)>=1 and (y)<=QUADSIZE)
+
 # These types have not been dealt with yet 
 IHQUEST = '?',
 IHWEB = '#',
@@ -49,11 +64,17 @@ class feature:
     "A feature in the current quadrant (ship, star, black hole, etc)." 
     def __init__(self):
         self.type = None       # name of feature type
-        self.location = None   # location
+        self.sector = None     # sector location
     def distance(self):
-        return self.location.distance(game.sector)
+        return self.sector.distance(game.sector)
     def __str__(self):
         return self.name[0]
+    def sectormove(self, dest):
+        "Move this feature within the current quadrant." 
+        if self.sector:
+            game.quad[self.sector] = None
+        game.quad[dest] = self
+        self.sector = dest
 
 empty = None   # Value of empty space in game.quad
 
@@ -73,12 +94,6 @@ class ship(feature):
             game.remkl -= 1
         elif self.type == "Romulan":
             game.romrem -= 1
-    def sectormove(self, dest):
-        "Move this ship within the current quadrant." 
-        if self.location:
-            game.quad[self.location] = None
-        game.quad[dest] = self
-        self.location = dest
 
 class planet(feature):
     "A planet.  May be inhabited or not, may hold dilithium crystals or not."
@@ -116,13 +131,17 @@ class blackhole(feature):
         return '*'
 
 class starbase(feature):
-    "Starbases also have no features."
-    def __init(self):
+    "Starbases also have no features, just a location."
+    def __init(self, quadrant):
         feature.__init__(self)
+        self.quadrant = quadrant
+        game.state.bases.append(self)
     def __del__(self):
-        game.state.bases.remove(self.location)
+        game.state.bases.remove(self)
     def __str__(self):
         return 'B'
+    def __del__(self):
+        feature.__del__(self)
 
 class quadrant:
     def __init__(self):
@@ -158,7 +177,6 @@ class snapshot:
        self.remkl = None       # remaining klingons
        self.remcom = None      # remaining commanders
        self.nscrem = None      # remaining super commanders
-       self.rembase = None     # remaining bases
        self.starkl = None      # destroyed stars
        self.basekl = None      # destroyed bases
        self.nromrem = None     # Romulans remaining
@@ -291,8 +309,8 @@ def tryexit(look, ship, irun):
     iq.y = game.quadrant.y+(look.y+(QUADSIZE-1))/QUADSIZE - 1
     if not valid_quadrant(iq) or \
        game.state.galaxy[iq].supernova or \
-        game.state.galaxy[iq].klingons > 8:
-       return False;   # no can do -- neg energy, supernovae, or >8 Klingons
+        game.state.galaxy[iq].klingons > MAXKLQUAD-1:
+       return False;   # no can do -- neg energy, supernovae, or >MAXKLQUAD-1 Klingons
     if ship.type == "Romulan":
         return False   # Romulans cannot escape
     if not irun:
@@ -530,7 +548,7 @@ def movescom(ship, avoid):
     global ipage
     if game.state.kscmdr == game.quadrant or \
        game.state.galaxy[iq].supernova or \
-        game.state.galaxy[iq].klingons > 8: 
+        game.state.galaxy[iq].klingons > MAXKLQUAD-1: 
        return True
     if avoid:
        # Avoid quadrants with bases if we want to avoid Enterprise
@@ -595,7 +613,7 @@ def scom():
        # without too many Klingons, and not already under attack.
         nearest = filter(game.starbases,
                          lambda x: game.state.galaxy[x].supernova \
-                         and game.state.galaxy[x].klingons <= 8)
+                         and game.state.galaxy[x].klingons <= MAXKLQUAD-1)
         if game.quadrant in nearest:
             nearest.remove(game.quadrant)
         if game.battle in nearest:
@@ -636,7 +654,7 @@ def scom():
                iq.x = game.state.kscmdr.x
                movescom(iq, passive)
     # check for a base
-    if game.state.rembase == 0:
+    if len(game.state.bases) == 0:
        unschedule("FSCMOVE")
     else:
         for ibq in game.bases: