Regularize NEWS file format

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

diff --git a/sst.py b/sst.py
index 4864de7f534ebec2124b4490c0ffe948817201d9..17d85afd78591f109b4e91e53e57e67ec2095c46 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -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
 
@@ -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
@@ -3189,7 +3201,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 +3220,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))))