projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document code fragility.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index 0a7bd3e4762d1cb5343a4f5f6572cd5644470685..763f903e969168606e852e5d186dabc510e852ed 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
2
"""
sst.py -- Super Star Trek 2K
"""
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.
"""
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
import os, sys, math, curses, time, pickle, random, copy, gettext, getpass
import getopt, socket, locale
@@
-27,8
+29,7
@@
try:
except NameError:
my_input = input
except NameError:
my_input = input
-
-version = "2.1"
+version = "2.3"
docpath = (".", "doc/", "/usr/share/doc/sst/")
docpath = (".", "doc/", "/usr/share/doc/sst/")
@@
-87,8
+88,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
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):
def __eq__(self, other):
return other != None and self.i == other.i and self.j == other.j
def __ne__(self, other):
@@
-103,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)
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 __mod__(self, other):
return Coord(self.i % other, self.j % other)
- def __rdiv__(self, other):
+ def __r
true
div__(self, other):
return Coord(self.i/other, self.j/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):
def roundtogrid(self):
return Coord(int(round(self.i)), int(round(self.j)))
def distance(self, other=None):
@@
-119,16
+124,20
@@
class Coord:
s = Coord()
if self.i == 0:
s.i = 0
s = Coord()
if self.i == 0:
s.i = 0
+ elif s.i < 0:
+ s.i =-1
else:
else:
- s.i =
self.i / abs(self.i)
+ s.i =
1
if self.j == 0:
s.j = 0
if self.j == 0:
s.j = 0
+ elif s.j < 0:
+ s.j = -1
else:
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 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):
def sector(self):
return self.roundtogrid() % QUADSIZE
def scatter(self):
@@
-433,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?"
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
FWON = 0
FDEPLETE = 1
@@
-999,16
+1008,16
@@
def cloak():
if game.condition == "docked":
prout(_("You cannot cloak while docked."))
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(_("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)
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!"))
if game.irhere and game.state.date >= ALGERON and not game.isviolreported:
prout(_("The Romulan ship discovers you are breaking the Treaty of Algeron!"))
@@
-2594,7
+2603,7
@@
def events():
q.klingons += 1
if game.quadrant == w:
game.klhere += 1
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():
# recompute time left
game.recompute()
if communicating():
@@
-2853,7
+2862,9
@@
def supernova(w):
game.iscate = False
unschedule(FSCMOVE)
unschedule(FSCDBAS)
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:
comkills = len(game.state.kcmdr) - len(survivors)
game.state.kcmdr = survivors
if not game.state.kcmdr:
@@
-2940,9
+2951,9
@@
def kaboom():
skip(1)
if len(game.enemies) != 0:
whammo = 25.0 * game.energy
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():
finish(FDILITHIUM)
def killrate():
@@
-3192,7
+3203,8
@@
def score():
klship = 1
else:
klship = 2
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) \
+ 50*(game.incom - len(game.state.kcmdr)) \
+ ithperd + iwon \
+ 20*(game.inrom - game.state.nromrem) \
@@
-3210,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.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") %
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))))
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))))
@@
-3856,7
+3868,7
@@
def dock(verbose):
if game.inorbit:
prout(_("You must first leave standard orbit."))
return
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:
prout(crmshp() + _(" not adjacent to base."))
return
if game.iscloaked:
@@
-4492,7
+4504,7
@@
def mayday():
# found one -- finish up
game.sector = w
break
# 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
prout(_("You have been lost in space..."))
finish(FMATERIALIZE)
return
@@
-4672,7
+4684,7
@@
def orbit():
if damaged(DWARPEN) and damaged(DIMPULS):
prout(_("Both warp and impulse engines damaged."))
return
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:
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:
@@
-5021,7
+5033,7
@@
def deathray():
prouts(_("Sulu- \"Captain! It's working!\""))
skip(2)
while len(game.enemies) > 0:
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)
prout(_("Ensign Chekov- \"Congratulations, Captain!\""))
if game.unwon() == 0:
finish(FWON)