Document code fragility.

[super-star-trek.git] / sst.py

diff --git a/sst.py b/sst.py
index bd0582e9f370c18d768e22b93aecbda38c7a1472..763f903e969168606e852e5d186dabc510e852ed 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """
 sst.py -- Super Star Trek 2K
 
@@ -11,6 +11,8 @@ Stas Sergeev, and Eric S. Raymond.
 See the doc/HACKING file in the distribution for designers notes and advice
 on how to modify (and how not to modify!) this code.
 """
+from __future__ import print_function, division
+
 import os, sys, math, curses, time, pickle, random, copy, gettext, getpass
 import getopt, socket, locale
 
@@ -27,7 +29,7 @@ try:
 except NameError:
     my_input = input
 
-version = "2.2"
+version = "2.3"
 
 docpath        = (".", "doc/", "/usr/share/doc/sst/")
 
@@ -100,10 +102,16 @@ class Coord:
         return Coord(self.i*other, self.j*other)
     def __div__(self, other):
         return Coord(self.i/other, self.j/other)
+    def __truediv__(self, other):
+        return Coord(self.i/other, self.j/other)
+    def __floordiv__(self, other):
+        return Coord(self.i//other, self.j//other)
     def __mod__(self, other):
         return Coord(self.i % other, self.j % other)
-    def __rdiv__(self, other):
+    def __rtruediv__(self, other):
         return Coord(self.i/other, self.j/other)
+    def __rfloordiv__(self, other):
+        return Coord(self.i//other, self.j//other)
     def roundtogrid(self):
         return Coord(int(round(self.i)), int(round(self.j)))
     def distance(self, other=None):
@@ -116,16 +124,20 @@ class Coord:
         s = Coord()
         if self.i == 0:
             s.i = 0
+        elif s.i < 0:
+            s.i =-1
         else:
-            s.i = self.i / abs(self.i)
+            s.i = 1
         if self.j == 0:
             s.j = 0
+        elif s.j < 0:
+            s.j = -1
         else:
-            s.j = self.j / abs(self.j)
+            s.j = 1
         return s
     def quadrant(self):
         #print "Location %s -> %s" % (self, (self / QUADSIZE).roundtogrid())
-        return self.roundtogrid() / QUADSIZE
+        return self.roundtogrid() // QUADSIZE
     def sector(self):
         return self.roundtogrid() % QUADSIZE
     def scatter(self):
@@ -430,7 +442,7 @@ class Gamestate:
         self.state.remtime = self.state.remres/(self.remkl() + 4*len(self.state.kcmdr))
     def unwon(self):
         "Are there Klingons remaining?"
-        return self.remkl() + len(self.state.kcmdr) + self.state.nscrem
+        return self.remkl()
 
 FWON = 0
 FDEPLETE = 1
@@ -996,16 +1008,16 @@ def cloak():
         if game.condition == "docked":
             prout(_("You cannot cloak while docked."))
 
-       if game.state.date >= ALGERON and not game.isviolreported:
+        if game.state.date >= ALGERON and not game.isviolreported:
             prout(_("Spock- \"Captain, using the cloaking device is a violation"))
             prout(_("  of the Treaty of Algeron. Considering the alternatives,"))
             proutn(_("  are you sure this is wise? "))
             if not ja():
                 return
-       prout(_("Engineer Scott- \"Cloaking device has engaging, Sir...\""))
+        prout(_("Engineer Scott- \"Cloaking device has engaging, Sir...\""))
         attack(True)
-       prout(_("Engineer Scott- \"Cloaking device has engaged, Sir.\""))
-       game.iscloaked = True
+        prout(_("Engineer Scott- \"Cloaking device has engaged, Sir.\""))
+        game.iscloaked = True
 
         if game.irhere and game.state.date >= ALGERON and not game.isviolreported:
             prout(_("The Romulan ship discovers you are breaking the Treaty of Algeron!"))
@@ -2591,7 +2603,7 @@ def events():
             q.klingons += 1
             if game.quadrant == w:
                 game.klhere += 1
-                game.enemies.append(newkling())
+                newkling() # also adds it to game.enemies
             # recompute time left
             game.recompute()
             if communicating():
@@ -2850,7 +2862,9 @@ def supernova(w):
         game.iscate = False
         unschedule(FSCMOVE)
         unschedule(FSCDBAS)
-    survivors = filter(lambda w: w != nq, game.state.kcmdr)
+    # Changing this to [w for w in game.state.kcmdr if w != nq]
+    # causes regression-test failure
+    survivors = list(filter(lambda w: w != nq, game.state.kcmdr))
     comkills = len(game.state.kcmdr) - len(survivors)
     game.state.kcmdr = survivors
     if not game.state.kcmdr:
@@ -2937,9 +2951,9 @@ def kaboom():
     skip(1)
     if len(game.enemies) != 0:
         whammo = 25.0 * game.energy
-        for l in range(len(game.enemies)):
-            if game.enemies[l].power*game.enemies[l].kdist <= whammo:
-                deadkl(game.enemies[l].location, game.quad[game.enemies[l].location.i][game.enemies[l].location.j], game.enemies[l].location)
+        for e in game.enemies[::-1]:
+            if e.power*e.kdist <= whammo:
+                deadkl(e.location, game.quad[e.location.i][e.location.j], e.location)
     finish(FDILITHIUM)
 
 def killrate():
@@ -3189,7 +3203,8 @@ def score():
         klship = 1
     else:
         klship = 2
-    game.score = 10*(game.inkling - game.remkl()) \
+    dead_ordinaries= game.inkling - game.remkl() + len(game.state.kcmdr) + game.state.nscrem
+    game.score = 10*(dead_ordinaries)\
              + 50*(game.incom - len(game.state.kcmdr)) \
              + ithperd + iwon \
              + 20*(game.inrom - game.state.nromrem) \
@@ -3207,9 +3222,9 @@ def score():
     if game.state.nromrem and game.gamewon:
         prout(_("%6d Romulans captured                  %5d") %
               (game.state.nromrem, game.state.nromrem))
-    if game.inkling - game.remkl():
+    if dead_ordinaries:
         prout(_("%6d ordinary Klingons destroyed        %5d") %
-              (game.inkling - game.remkl(), 10*(game.inkling - game.remkl())))
+              (dead_ordinaries, 10*dead_ordinaries))
     if game.incom - len(game.state.kcmdr):
         prout(_("%6d Klingon commanders destroyed       %5d") %
               (game.incom - len(game.state.kcmdr), 50*(game.incom - len(game.state.kcmdr))))
@@ -5018,7 +5033,7 @@ def deathray():
         prouts(_("Sulu- \"Captain!  It's working!\""))
         skip(2)
         while len(game.enemies) > 0:
-            deadkl(game.enemies[1].location, game.quad[game.enemies[1].location.i][game.enemies[1].location.j],game.enemies[1].location)
+            deadkl(game.enemies[-1].location, game.quad[game.enemies[-1].location.i][game.enemies[-1].location.j],game.enemies[-1].location)
         prout(_("Ensign Chekov-  \"Congratulations, Captain!\""))
         if game.unwon() == 0:
             finish(FWON)