projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add another test.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index 8466a481dbf7caec731003ee5aa64a52f0baa3b3..daf42f8648484ebda35c3046a79ab05644734a8c 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-12,6
+12,8
@@
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
on how to modify (and how not to modify!) this code.
"""
from __future__ import print_function, division
+# Runs under Python 2 an Python 3. Preserve this property!
+# SPDX-License-Identifier: BSD-2-clause
import os, sys, math, curses, time, pickle, copy, gettext, getpass
import getopt, socket, locale
import os, sys, math, curses, time, pickle, copy, gettext, getpass
import getopt, socket, locale
@@
-801,7
+803,7
@@
def movescom(iq, avoid):
if communicating():
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
if communicating():
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
- prout
n
(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr)
+ prout(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr)
prout(_(" by the Super-commander.\""))
break
return True # looks good!
prout(_(" by the Super-commander.\""))
break
return True # looks good!
@@
-907,7
+909,7
@@
def supercommander():
prout(_("Lt. Uhura- \"Captain, the starbase in Quadrant %s") \
% game.state.kscmdr)
prout(_(" reports that it is under attack from the Klingon Super-commander."))
prout(_("Lt. Uhura- \"Captain, the starbase in Quadrant %s") \
% game.state.kscmdr)
prout(_(" reports that it is under attack from the Klingon Super-commander."))
- prout
n
(_(" It can survive until stardate %d.\"") \
+ prout(_(" It can survive until stardate %d.\"") \
% int(scheduled(FSCDBAS)))
if not game.resting:
return
% int(scheduled(FSCDBAS)))
if not game.resting:
return
@@
-925,7
+927,7
@@
def supercommander():
return
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
return
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
- prout
n(_(" the Super-commander is in Quadrant %s,
") % game.state.kscmdr)
+ prout
(_(" the Super-commander is in Quadrant %s.
") % game.state.kscmdr)
return
def movetholian():
return
def movetholian():
@@
-950,7
+952,6
@@
def movetholian():
game.tholian.move(None)
prout("***Internal error: Tholian in a bad spot.")
return
game.tholian.move(None)
prout("***Internal error: Tholian in a bad spot.")
return
- print("Tholian moving from %s to %s" % (game.tholian.location, tid))
# do nothing if we are blocked
if game.quad[tid.i][tid.j] not in ('.', '#'):
return
# do nothing if we are blocked
if game.quad[tid.i][tid.j] not in ('.', '#'):
return
@@
-2072,7
+2073,6
@@
def phasers():
prout(_("Manual-fire-must-be-used"))
skip(1)
elif automode == "MANUAL":
prout(_("Manual-fire-must-be-used"))
skip(1)
elif automode == "MANUAL":
- print("****HERE WE ARE*** %d" % len(game.enemies))
rpow = 0.0
for k in range(len(game.enemies)):
aim = game.enemies[k].location
rpow = 0.0
for k in range(len(game.enemies)):
aim = game.enemies[k].location
@@
-2117,7
+2117,6
@@
def phasers():
# abort out
scanner.chew()
return
# abort out
scanner.chew()
return
- print("k is %d" % k)
hits.append(scanner.real)
rpow += scanner.real
# If total requested is too much, inform and start over
hits.append(scanner.real)
rpow += scanner.real
# If total requested is too much, inform and start over
@@
-3881,7
+3880,7
@@
def imove(icourse=None, noattack=False):
newquadrant(noattack)
break
elif check_collision(w):
newquadrant(noattack)
break
elif check_collision(w):
- pr
int("Collision detected"
)
+ pr
out(_("Collision detected")
)
break
else:
game.sector = w
break
else:
game.sector = w