# Loop to move a single torpedo
setwnd(message_window)
for step in range(1, QUADSIZE*2):
- if not track.nexttok():
+ if not track.nextstep():
break
w = track.sector()
if not w.valid_sector():
# In the C/FORTRAN version, dispersion was 2.5 radians, which
# is 143 degrees, which is almost exactly 4.8 clockface units
displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5)
- displacement.nexttok()
+ displacement.nextstep()
bumpto = displacement.sector()
if not bumpto.valid_sector():
return hit
return None
proutn(crmena(True, iquad, "sector", w))
displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5, origin=w)
- displacement.nexttok()
+ displacement.nextstep()
bumpto = displacement.sector()
if game.quad[bumpto.i][bumpto.j] == ' ':
prout(_(" buffeted into black hole."))
supercommander()
elif evcode == FDSPROB: # Move deep space probe
schedule(FDSPROB, 0.01)
- if not game.probe.nexttok():
+ if not game.probe.nextstep():
if not game.probe.quadrant().valid_quadrant() or \
game.state.galaxy[game.probe.quadrant().i][game.probe.quadrant().j].supernova:
# Left galaxy or ran into supernova
# Move out
game.quad[game.sector.i][game.sector.j] = '.'
for _m in range(icourse.moves):
- icourse.nexttok()
+ icourse.nextstep()
w = icourse.sector()
if icourse.origin.quadrant() != icourse.location.quadrant():
newquadrant(noattack)
self.step = 0
def arrived(self):
return self.location.roundtogrid() == self.final
- def nexttok(self):
+ def nextstep(self):
"Next step on course."
self.step += 1
self.nextlocation = self.location + self.increment
look = wcourse.moves
while look > 0:
look -= 1
- wcourse.nexttok()
+ wcourse.nextstep()
w = wcourse.sector()
if not w.valid_sector():
break
prouts(_("WHIRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR"))
skip(1)
dprob = 0.30
- # FIX-ME: This test looks inverted
- if not (game.options & OPTION_ALMY):
+ # Ugh. This test (For Tom Almy's death-ray upgrade) was inverted for a long time.
+ # Furthermore, somebody (ESR or Stas?) changed Tom Almy's 0.7 upgraded chance of
+ # working to 0.5.
+ if game.options & OPTION_ALMY:
dprob = 0.5
r = rnd.real()
if r > dprob:
return True
if scanner.sees("regular"):
break
- proutn(_("What is \"%s\"? ") % scanner.token)
+ proutn(_("What game type is \"%s\"? ") % scanner.token)
scanner.chew()
while game.length==0 or game.skill==SKILL_NONE:
if scanner.nexttok() == "IHALPHA":
elif scanner.sees("emeritus"):
game.skill = SKILL_EMERITUS
else:
- proutn(_("What is \""))
+ proutn(_("What skill level is is \""))
proutn(scanner.token)
prout("\"?")
else:
elif scanner.sees("fancy") or scanner.sees("\n"):
pass
elif len(scanner.token):
- proutn(_("What is \"%s\"?") % scanner.token)
+ proutn(_("What game style is \"%s\"?") % scanner.token)
setpassword()
if game.passwd == "debug": # pragma: no cover
game.idebug = True