projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New tests are working well eniugh that we can flush the old ones.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index 07317a04faee98b4f6fb831087fedb577ff37281..8466a481dbf7caec731003ee5aa64a52f0baa3b3 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-1738,7
+1738,11
@@
def torps():
proutn(_("Number of torpedoes to fire- "))
continue # Go back around to get a number
else: # key == "IHREAL"
proutn(_("Number of torpedoes to fire- "))
continue # Go back around to get a number
else: # key == "IHREAL"
- n = scanner.int()
+ try:
+ n = scanner.int()
+ except TypeError:
+ huh()
+ return
if n <= 0: # abort command
scanner.chew()
return
if n <= 0: # abort command
scanner.chew()
return
@@
-2068,6
+2072,7
@@
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
@@
-2083,7
+2088,6
@@
def phasers():
scanner.chew()
key = "IHEOL"
hits[k] = 0 # prevent overflow -- thanks to Alexei Voitenko
scanner.chew()
key = "IHEOL"
hits[k] = 0 # prevent overflow -- thanks to Alexei Voitenko
- k += 1
continue
if key == "IHEOL":
scanner.chew()
continue
if key == "IHEOL":
scanner.chew()
@@
-2113,7
+2117,8
@@
def phasers():
# abort out
scanner.chew()
return
# abort out
scanner.chew()
return
- hits[k] = scanner.real
+ print("k is %d" % k)
+ hits.append(scanner.real)
rpow += scanner.real
# If total requested is too much, inform and start over
if rpow > avail:
rpow += scanner.real
# If total requested is too much, inform and start over
if rpow > avail:
@@
-2121,7
+2126,6
@@
def phasers():
scanner.chew()
return
key = scanner.nexttok() # scan for next value
scanner.chew()
return
key = scanner.nexttok() # scan for next value
- k += 1
if rpow == 0.0:
# zero energy -- abort
scanner.chew()
if rpow == 0.0:
# zero energy -- abort
scanner.chew()