projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix strange bug in warp code.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index bf13aa9d436cfc54a46e97c2a891facee1b7eb2c..e140f259a97cb64e1041c515e5010a49df41f352 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-3530,7
+3530,7
@@
def imove(icourse=None, noattack=False):
if icourse.origin.quadrant() != icourse.location.quadrant():
newquadrant(noattack)
break
if icourse.origin.quadrant() != icourse.location.quadrant():
newquadrant(noattack)
break
- elif check_collision(
icourse,
w):
+ elif check_collision(w):
print "Collision detected"
break
else:
print "Collision detected"
break
else:
@@
-3901,7
+3901,7
@@
def warp(wcourse, involuntary):
twarp = False
wcourse.reset()
# Activate Warp Engines and pay the cost
twarp = False
wcourse.reset()
# Activate Warp Engines and pay the cost
- imove(course, noattack=False)
+ imove(
w
course, noattack=False)
if game.alldone:
return
game.energy -= wcourse.power(game.warpfac)
if game.alldone:
return
game.energy -= wcourse.power(game.warpfac)
@@
-5549,7
+5549,7
@@
def choose():
return True
if scanner.sees("regular"):
break
return True
if scanner.sees("regular"):
break
- proutn(_("What is \"%s\"?") % scanner.token)
+ proutn(_("What is \"%s\"?
") % scanner.token)
scanner.chew()
while game.length==0 or game.skill==SKILL_NONE:
if scanner.next() == "IHALPHA":
scanner.chew()
while game.length==0 or game.skill==SKILL_NONE:
if scanner.next() == "IHALPHA":