projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OK, warp flight between quadrants works now.
[super-star-trek.git]
/
src
/
sst.py
diff --git
a/src/sst.py
b/src/sst.py
index c006da46d3916b2812738a4fdee8cd156c6ed502..aa22fe10418a10d26f86d952bd3a65b574e164df 100644
(file)
--- a/
src/sst.py
+++ b/
src/sst.py
@@
-173,7
+173,7
@@
Also, the nav subsystem (enabling automatic course
setting) can be damaged separately from the main computer (which
handles weapons targeting, ETA calculation, and self-destruct).
"""
setting) can be damaged separately from the main computer (which
handles weapons targeting, ETA calculation, and self-destruct).
"""
-import os,
sys, math, curses, time, atexit, readline, cPickle, random, getopt
+import os,
sys,math,curses,time,atexit,readline,cPickle,random,getopt,copy
SSTDOC = "/usr/share/doc/sst/sst.doc"
DOC_NAME = "sst.doc"
SSTDOC = "/usr/share/doc/sst/sst.doc"
DOC_NAME = "sst.doc"
@@
-262,7
+262,6
@@
class planet:
def __str__(self):
return self.name
def __str__(self):
return self.name
-NOPLANET = None
class quadrant:
def __init__(self):
self.stars = None
class quadrant:
def __init__(self):
self.stars = None
@@
-454,7
+453,7
@@
class gamestate:
self.casual = 0 # causalties
self.nhelp = 0 # calls for help
self.nkinks = 0 # count of energy-barrier crossings
self.casual = 0 # causalties
self.nhelp = 0 # calls for help
self.nkinks = 0 # count of energy-barrier crossings
- self.iplnet =
0
# planet # in quadrant
+ self.iplnet =
None
# planet # in quadrant
self.inplan = 0 # initial planets
self.nenhere = 0 # number of enemies in quadrant
self.irhere = 0 # Romulans in quadrant
self.inplan = 0 # initial planets
self.nenhere = 0 # number of enemies in quadrant
self.irhere = 0 # Romulans in quadrant
@@
-888,7
+887,7
@@
def movescom(iq, avoid):
game.state.planets[i].crystals == "present":
# destroy the planet
game.state.planets[i].pclass = "destroyed"
game.state.planets[i].crystals == "present":
# destroy the planet
game.state.planets[i].pclass = "destroyed"
- game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = N
OPLANET
+ game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = N
one
if communicating():
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
if communicating():
announce()
prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports"))
@@
-1261,7
+1260,7
@@
def ram(ibumpd, ienm, w):
proutn("***")
crmshp()
prout(_(" heavily damaged."))
proutn("***")
crmshp()
prout(_(" heavily damaged."))
- icas = 10
.0+20.0*random.random(
)
+ icas = 10
+ random.randrange(20
)
prout(_("***Sickbay reports %d casualties"), icas)
game.casual += icas
game.state.crew -= icas
prout(_("***Sickbay reports %d casualties"), icas)
game.casual += icas
game.state.crew -= icas
@@
-1420,9
+1419,9
@@
def torpedo(course, r, incoming, i, n):
crmena(True, iquad, sector, w)
prout(_(" destroyed."))
game.state.nplankl += 1
crmena(True, iquad, sector, w)
prout(_(" destroyed."))
game.state.nplankl += 1
- game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
OPLANET
- game.
state.planets[game.iplnet].pclass = destroyed
- game.iplnet =
0
+ game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
one
+ game.
iplnet.pclass = "destroyed"
+ game.iplnet =
None
invalidate(game.plnet)
game.quad[w.x][w.y] = IHDOT
if game.landed:
invalidate(game.plnet)
game.quad[w.x][w.y] = IHDOT
if game.landed:
@@
-1433,9
+1432,9
@@
def torpedo(course, r, incoming, i, n):
crmena(True, iquad, sector, w)
prout(_(" destroyed."))
game.state.nworldkl += 1
crmena(True, iquad, sector, w)
prout(_(" destroyed."))
game.state.nworldkl += 1
- game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
OPLANET
- game.
state.planets[game.iplnet].pclass = destroyed
- game.iplnet =
0
+ game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
one
+ game.
iplnet.pclass = "destroyed"
+ game.iplnet =
None
invalidate(game.plnet)
game.quad[w.x][w.y] = IHDOT
if game.landed:
invalidate(game.plnet)
game.quad[w.x][w.y] = IHDOT
if game.landed:
@@
-1528,7
+1527,6
@@
def fry(hit):
# a critical hit occured
if hit < (275.0-25.0*game.skill)*(1.0+0.5*random.random()):
return
# a critical hit occured
if hit < (275.0-25.0*game.skill)*(1.0+0.5*random.random()):
return
-
ncrit = 1.0 + hit/(500.0+100.0*random.random())
proutn(_("***CRITICAL HIT--"))
# Select devices and cause damage
ncrit = 1.0 + hit/(500.0+100.0*random.random())
proutn(_("***CRITICAL HIT--"))
# Select devices and cause damage
@@
-1565,42
+1563,32
@@
def attack(torps_ok):
hitmax=0.0; hittot=0.0; chgfac=1.0
jay = coord()
where = "neither"
hitmax=0.0; hittot=0.0; chgfac=1.0
jay = coord()
where = "neither"
-
# game could be over at this point, check
if game.alldone:
return
# game could be over at this point, check
if game.alldone:
return
-
if idebug:
prout("=== ATTACK!")
if idebug:
prout("=== ATTACK!")
-
- # Tholian gewts to move before attacking
+ # Tholian gets to move before attacking
if game.ithere:
movetholian()
if game.ithere:
movetholian()
-
# if you have just entered the RNZ, you'll get a warning
if game.neutz: # The one chance not to be attacked
game.neutz = False
return
# if you have just entered the RNZ, you'll get a warning
if game.neutz: # The one chance not to be attacked
game.neutz = False
return
-
# commanders get a chance to tac-move towards you
if (((game.comhere or game.ishere) and not game.justin) or game.skill == SKILL_EMERITUS) and torps_ok:
moveklings()
# commanders get a chance to tac-move towards you
if (((game.comhere or game.ishere) and not game.justin) or game.skill == SKILL_EMERITUS) and torps_ok:
moveklings()
-
# if no enemies remain after movement, we're done
if game.nenhere==0 or (game.nenhere==1 and thing == game.quadrant and not iqengry):
return
# if no enemies remain after movement, we're done
if game.nenhere==0 or (game.nenhere==1 and thing == game.quadrant and not iqengry):
return
-
# set up partial hits if attack happens during shield status change
pfac = 1.0/game.inshld
if game.shldchg:
chgfac = 0.25+0.5*random.random()
# set up partial hits if attack happens during shield status change
pfac = 1.0/game.inshld
if game.shldchg:
chgfac = 0.25+0.5*random.random()
-
skip(1)
skip(1)
-
# message verbosity control
if game.skill <= SKILL_FAIR:
where = "sector"
# message verbosity control
if game.skill <= SKILL_FAIR:
where = "sector"
-
for loop in range(game.nenhere):
if game.kpower[loop] < 0:
continue; # too weak to attack
for loop in range(game.nenhere):
if game.kpower[loop] < 0:
continue; # too weak to attack
@@
-1724,7
+1712,6
@@
def attack(torps_ok):
def deadkl(w, type, mv):
# kill a Klingon, Tholian, Romulan, or Thingy
# Added mv to allow enemy to "move" before dying
def deadkl(w, type, mv):
# kill a Klingon, Tholian, Romulan, or Thingy
# Added mv to allow enemy to "move" before dying
-
crmena(True, type, sector, mv)
# Decide what kind of enemy it is and update appropriately
if type == IHR:
crmena(True, type, sector, mv)
# Decide what kind of enemy it is and update appropriately
if type == IHR:
@@
-1767,7
+1754,6
@@
def deadkl(w, type, mv):
unschedule(FSCDBAS)
else:
prout("*** Internal error, deadkl() called on %s\n" % type)
unschedule(FSCDBAS)
else:
prout("*** Internal error, deadkl() called on %s\n" % type)
-
# For each kind of enemy, finish message to player
prout(_(" destroyed."))
game.quad[w.x][w.y] = IHDOT
# For each kind of enemy, finish message to player
prout(_(" destroyed."))
game.quad[w.x][w.y] = IHDOT
@@
-1924,7
+1910,6
@@
def overheat(rpow):
def checkshctrl(rpow):
# check shield control
def checkshctrl(rpow):
# check shield control
-
skip(1)
if random.random() < 0.998:
prout(_("Shields lowered."))
skip(1)
if random.random() < 0.998:
prout(_("Shields lowered."))
@@
-2015,7
+2000,6
@@
def phasers():
ifast = False; no = False; itarg = True; msgflag = True
automode = "NOTSET"
key=0
ifast = False; no = False; itarg = True; msgflag = True
automode = "NOTSET"
key=0
-
skip(1)
# SR sensors and Computer are needed fopr automode
if damaged(DSRSENS) or damaged(DCOMPTR):
skip(1)
# SR sensors and Computer are needed fopr automode
if damaged(DSRSENS) or damaged(DCOMPTR):
@@
-2039,8
+2023,8
@@
def phasers():
return
prout(_("Weapons Officer Sulu- \"High-speed shield control enabled, sir.\""))
ifast = True
return
prout(_("Weapons Officer Sulu- \"High-speed shield control enabled, sir.\""))
ifast = True
-
- #
Original code so convoluted, I re-did it all
+ # Original code so convoluted, I re-did it all
+ #
(That was Tom Almy talking about the C code, I think -- ESR)
while automode=="NOTSET":
key=scan()
if key == IHALPHA:
while automode=="NOTSET":
key=scan()
if key == IHALPHA:
@@
-2263,8
+2247,6
@@
def phasers():
# only have one FDISTR/FENSLV/FREPRO sequence going at any given time
# BSD Trek, from which we swiped the idea, can have up to 5.
# only have one FDISTR/FENSLV/FREPRO sequence going at any given time
# BSD Trek, from which we swiped the idea, can have up to 5.
-import math
-
def unschedule(evtype):
# remove an event from the schedule
game.future[evtype].date = FOREVER
def unschedule(evtype):
# remove an event from the schedule
game.future[evtype].date = FOREVER
@@
-2296,7
+2278,6
@@
def cancelrest():
game.resting = False
game.optime = 0.0
return True
game.resting = False
game.optime = 0.0
return True
-
return False
def events():
return False
def events():
@@
-2498,7
+2479,7
@@
def events():
if game.state.remcom == 0:
unschedule(FTBEAM)
continue
if game.state.remcom == 0:
unschedule(FTBEAM)
continue
- i = random.rand
om()*game.state.remcom+1.0
+ i = random.rand
range(game.state.remcom)
yank = square(game.state.kcmdr[i].x-game.quadrant.x) + square(game.state.kcmdr[i].y-game.quadrant.y)
if istract or game.condition == "docked" or yank == 0:
# Drats! Have to reschedule
yank = square(game.state.kcmdr[i].x-game.quadrant.x) + square(game.state.kcmdr[i].y-game.quadrant.y)
if istract or game.condition == "docked" or yank == 0:
# Drats! Have to reschedule
@@
-2627,8
+2608,8
@@
def events():
# supernova'ed, and which has some Klingons in it
w = randplace(GALSIZE)
q = game.state.galaxy[w.x][w.y]
# supernova'ed, and which has some Klingons in it
w = randplace(GALSIZE)
q = game.state.galaxy[w.x][w.y]
- if not (game.quadrant == w or q.planet == N
OPLANET
or \
- not
game.state.planets[q.planet]
.inhabited or \
+ if not (game.quadrant == w or q.planet == N
one
or \
+ not
q.planet
.inhabited or \
q.supernova or q.status!=secure or q.klingons<=0):
break
else:
q.supernova or q.status!=secure or q.klingons<=0):
break
else:
@@
-2711,7
+2692,7
@@
def events():
prout(_("launched a warship from %s.") % q.planet)
else:
prout(_("Uhura- Starfleet reports increased Klingon activity"))
prout(_("launched a warship from %s.") % q.planet)
else:
prout(_("Uhura- Starfleet reports increased Klingon activity"))
- if q.planet != N
OPLANET
:
+ if q.planet != N
one
:
proutn(_("near %s") % q.planet)
prout(_("in Quadrant %s.") % w)
proutn(_("near %s") % q.planet)
prout(_("in Quadrant %s.") % w)
@@
-2734,9
+2715,7
@@
def wait():
proutn(_("Are you sure? "))
if ja() == False:
return
proutn(_("Are you sure? "))
if ja() == False:
return
-
# Alternate resting periods (events) with attacks
# Alternate resting periods (events) with attacks
-
game.resting = True
while True:
if delay <= 0:
game.resting = True
while True:
if delay <= 0:
@@
-2779,12
+2758,10
@@
def nova(nov):
# star goes nova
course = (0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5)
newc = coord(); scratch = coord()
# star goes nova
course = (0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5)
newc = coord(); scratch = coord()
-
if random.random() < 0.05:
# Wow! We've supernova'ed
supernova(False, nov)
return
if random.random() < 0.05:
# Wow! We've supernova'ed
supernova(False, nov)
return
-
# handle initial nova
game.quad[nov.x][nov.y] = IHDOT
crmena(False, IHSTAR, sector, nov)
# handle initial nova
game.quad[nov.x][nov.y] = IHDOT
crmena(False, IHSTAR, sector, nov)
@@
-2826,12
+2803,12
@@
def nova(nov):
prout(_(" novas."))
game.quad[scratch.x][scratch.y] = IHDOT
elif iquad == IHP: # Destroy planet
prout(_(" novas."))
game.quad[scratch.x][scratch.y] = IHDOT
elif iquad == IHP: # Destroy planet
- game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
OPLANET
+ game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = N
one
game.state.nplankl += 1
crmena(True, IHP, sector, scratch)
prout(_(" destroyed."))
game.state.nplankl += 1
crmena(True, IHP, sector, scratch)
prout(_(" destroyed."))
- game.
state.planets[game.iplnet].pclass = destroyed
- game.iplnet =
0
+ game.
iplnet.pclass = "destroyed"
+ game.iplnet =
None
invalidate(game.plnet)
if game.landed:
finish(FPNOVA)
invalidate(game.plnet)
if game.landed:
finish(FPNOVA)
@@
-2925,7
+2902,7
@@
def nova(nov):
game.optime = 10.0*game.dist/16.0
skip(1)
prout(_("Force of nova displaces starship."))
game.optime = 10.0*game.dist/16.0
skip(1)
prout(_("Force of nova displaces starship."))
- imove(True)
+ imove(
novapush=
True)
game.optime = 10.0*game.dist/16.0
return
game.optime = 10.0*game.dist/16.0
return
@@
-2933,7
+2910,6
@@
def supernova(induced, w=None):
# star goes supernova
num = 0; npdead = 0
nq = coord()
# star goes supernova
num = 0; npdead = 0
nq = coord()
-
if w != None:
nq = w
else:
if w != None:
nq = w
else:
@@
-2946,7
+2922,7
@@
def supernova(induced, w=None):
stars += game.state.galaxy[nq.x][nq.y].stars
if stars == 0:
return # nothing to supernova exists
stars += game.state.galaxy[nq.x][nq.y].stars
if stars == 0:
return # nothing to supernova exists
- num = random.rand
om()*stars
+ 1
+ num = random.rand
range(stars)
+ 1
for nq.x in range(GALSIZE):
for nq.y in range(GALSIZE):
num -= game.state.galaxy[nq.x][nq.y].stars
for nq.x in range(GALSIZE):
for nq.y in range(GALSIZE):
num -= game.state.galaxy[nq.x][nq.y].stars
@@
-2958,7
+2934,6
@@
def supernova(induced, w=None):
proutn("=== Super nova here?")
if ja() == True:
nq = game.quadrant
proutn("=== Super nova here?")
if ja() == True:
nq = game.quadrant
-
if not nq == game.quadrant or game.justin:
# it isn't here, or we just entered (treat as enroute)
if communicating():
if not nq == game.quadrant or game.justin:
# it isn't here, or we just entered (treat as enroute)
if communicating():
@@
-2968,7
+2943,7
@@
def supernova(induced, w=None):
else:
ns = coord()
# we are in the quadrant!
else:
ns = coord()
# we are in the quadrant!
- num = random.rand
om()* game.state.galaxy[nq.x][nq.y].stars
+ 1
+ num = random.rand
range(game.state.galaxy[nq.x][nq.y].stars)
+ 1
for ns.x in range(QUADSIZE):
for ns.y in range(QUADSIZE):
if game.quad[ns.x][ns.y]==IHSTAR:
for ns.x in range(QUADSIZE):
for ns.y in range(QUADSIZE):
if game.quad[ns.x][ns.y]==IHSTAR:
@@
-2977,7
+2952,6
@@
def supernova(induced, w=None):
break
if num==0:
break
break
if num==0:
break
-
skip(1)
prouts(_("***RED ALERT! RED ALERT!"))
skip(1)
skip(1)
prouts(_("***RED ALERT! RED ALERT!"))
skip(1)
@@
-3017,7
+2991,7
@@
def supernova(induced, w=None):
# Destroy planets
for loop in range(game.inplan):
if game.state.planets[loop].w == nq:
# Destroy planets
for loop in range(game.inplan):
if game.state.planets[loop].w == nq:
- game.state.planets[loop].pclass =
destroyed
+ game.state.planets[loop].pclass =
"destroyed"
npdead += 1
# Destroy any base in supernovaed quadrant
if game.state.rembase:
npdead += 1
# Destroy any base in supernovaed quadrant
if game.state.rembase:
@@
-3129,7
+3103,6
@@
def badpoints():
badpt += 200.0
return badpt
badpt += 200.0
return badpt
-
def finish(ifin):
# end the game, with appropriate notfications
igotit = False
def finish(ifin):
# end the game, with appropriate notfications
igotit = False
@@
-3340,7
+3313,6
@@
def finish(ifin):
def score():
# compute player's score
timused = game.state.date - game.indate
def score():
# compute player's score
timused = game.state.date - game.indate
-
iskill = game.skill
if (timused == 0 or (game.state.remkl + game.state.remcom + game.state.nscrem) != 0) and timused < 5.0:
timused = 5.0
iskill = game.skill
if (timused == 0 or (game.state.remkl + game.state.remcom + game.state.nscrem) != 0) and timused < 5.0:
timused = 5.0
@@
-3439,7
+3411,6
@@
def plaque():
winner = cgetline()
# The 38 below must be 64 for 132-column paper
nskip = 38 - len(winner)/2
winner = cgetline()
# The 38 below must be 64 for 132-column paper
nskip = 38 - len(winner)/2
-
fp.write("\n\n\n\n")
# --------DRAW ENTERPRISE PICTURE.
fp.write(" EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n" )
fp.write("\n\n\n\n")
# --------DRAW ENTERPRISE PICTURE.
fp.write(" EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n" )
@@
-3552,7
+3523,6
@@
def iostart():
setwnd(fullscreen_window)
textcolor(DEFAULT)
setwnd(fullscreen_window)
textcolor(DEFAULT)
-
def waitfor():
"wait for user action -- OK to do nothing if on a TTY"
if game.options & OPTION_CURSES:
def waitfor():
"wait for user action -- OK to do nothing if on a TTY"
if game.options & OPTION_CURSES:
@@
-3625,13
+3595,13
@@
def prout(line):
def prouts(line):
"print slowly!"
for c in line:
def prouts(line):
"print slowly!"
for c in line:
-
curses.delay_output(30
)
+
time.sleep(0.03
)
proutn(c)
if game.options & OPTION_CURSES:
wrefresh(curwnd)
else:
sys.stdout.flush()
proutn(c)
if game.options & OPTION_CURSES:
wrefresh(curwnd)
else:
sys.stdout.flush()
-
curses.delay_output(300
)
+
time.sleep(0.03
)
def cgetline():
"Get a line of input."
def cgetline():
"Get a line of input."
@@
-3731,7
+3701,7
@@
def drawmaps(mode):
setwnd(report_window)
report_window.clear()
report_window.move(0, 0)
setwnd(report_window)
report_window.clear()
report_window.move(0, 0)
- status(
0
)
+ status()
setwnd(lrscan_window)
lrscan_window.clear()
lrscan_window.move(0, 0)
setwnd(lrscan_window)
lrscan_window.clear()
lrscan_window.move(0, 0)
@@
-3751,7
+3721,7
@@
def boom(w):
srscan_window.attron(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.x][w.y])
#sound(500)
srscan_window.attron(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.x][w.y])
#sound(500)
- #
delay(100
0)
+ #
time.sleep(1.
0)
#nosound()
srscan_window.attroff(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.x][w.y])
#nosound()
srscan_window.attroff(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.x][w.y])
@@
-3787,18
+3757,18
@@
def tracktorpedo(w, l, i, n, iquad):
if not damaged(DSRSENS) or game.condition=="docked":
if i != 1 and l == 1:
drawmaps(2)
if not damaged(DSRSENS) or game.condition=="docked":
if i != 1 and l == 1:
drawmaps(2)
-
curses.delay_output(400
)
+
time.sleep(0.4
)
if (iquad==IHDOT) or (iquad==IHBLANK):
put_srscan_sym(w, '+')
#sound(l*10)
if (iquad==IHDOT) or (iquad==IHBLANK):
put_srscan_sym(w, '+')
#sound(l*10)
- #
curses.delay_output(100
)
+ #
time.sleep(0.1
)
#nosound()
put_srscan_sym(w, iquad)
else:
curwnd.attron(curses.A_REVERSE)
put_srscan_sym(w, iquad)
#sound(500)
#nosound()
put_srscan_sym(w, iquad)
else:
curwnd.attron(curses.A_REVERSE)
put_srscan_sym(w, iquad)
#sound(500)
- #
curses.delay_output(100
0)
+ #
time.sleep(1.
0)
#nosound()
curwnd.attroff(curses.A_REVERSE)
put_srscan_sym(w, iquad)
#nosound()
curwnd.attroff(curses.A_REVERSE)
put_srscan_sym(w, iquad)
@@
-3822,8
+3792,8
@@
def prstat(txt, data):
skip(1)
setwnd(status_window)
else:
skip(1)
setwnd(status_window)
else:
- proutn(" " *
NSYM - len(tx
))
-
v
proutn(data)
+ proutn(" " *
(NSYM - len(txt)
))
+ proutn(data)
skip(1)
if game.options & OPTION_CURSES:
setwnd(report_window)
skip(1)
if game.options & OPTION_CURSES:
setwnd(report_window)
@@
-3836,7
+3806,7
@@
def imove(novapush):
trbeam = False
def no_quad_change():
trbeam = False
def no_quad_change():
- # No quadrant change -- compute new av
g
enemy distances
+ # No quadrant change -- compute new av
erage
enemy distances
game.quad[game.sector.x][game.sector.y] = game.ship
if game.nenhere:
for m in range(game.nenhere):
game.quad[game.sector.x][game.sector.y] = game.ship
if game.nenhere:
for m in range(game.nenhere):
@@
-3851,12
+3821,10
@@
def imove(novapush):
newcnd()
drawmaps(0)
setwnd(message_window)
newcnd()
drawmaps(0)
setwnd(message_window)
-
w.x = w.y = 0
if game.inorbit:
prout(_("Helmsman Sulu- \"Leaving standard orbit.\""))
game.inorbit = False
w.x = w.y = 0
if game.inorbit:
prout(_("Helmsman Sulu- \"Leaving standard orbit.\""))
game.inorbit = False
-
angle = ((15.0 - game.direc) * 0.5235988)
deltax = -math.sin(angle)
deltay = math.cos(angle)
angle = ((15.0 - game.direc) * 0.5235988)
deltax = -math.sin(angle)
deltay = math.cos(angle)
@@
-3864,10
+3832,8
@@
def imove(novapush):
bigger = math.fabs(deltax)
else:
bigger = math.fabs(deltay)
bigger = math.fabs(deltax)
else:
bigger = math.fabs(deltay)
-
deltay /= bigger
deltax /= bigger
deltay /= bigger
deltax /= bigger
-
# If tractor beam is to occur, don't move full distance
if game.state.date+game.optime >= scheduled(FTBEAM):
trbeam = True
# If tractor beam is to occur, don't move full distance
if game.state.date+game.optime >= scheduled(FTBEAM):
trbeam = True
@@
-3878,14
+3844,13
@@
def imove(novapush):
game.quad[game.sector.x][game.sector.y] = IHDOT
x = game.sector.x
y = game.sector.y
game.quad[game.sector.x][game.sector.y] = IHDOT
x = game.sector.x
y = game.sector.y
- n = 10.0*game.dist*bigger+0.5
-
+ n = int(10.0*game.dist*bigger+0.5)
if n > 0:
for m in range(1, n+1):
x += deltax
y += deltay
if n > 0:
for m in range(1, n+1):
x += deltax
y += deltay
- w.x =
x + 0.5
- w.y =
y + 0.5
+ w.x =
int(round(x))
+ w.y =
int(round(y))
if not VALID_SECTOR(w.x, w.y):
# Leaving quadrant -- allow final enemy attack
# Don't do it if being pushed by Nova
if not VALID_SECTOR(w.x, w.y):
# Leaving quadrant -- allow final enemy attack
# Don't do it if being pushed by Nova
@@
-3904,31
+3869,30
@@
def imove(novapush):
if game.alldone:
return
# compute final position -- new quadrant and sector
if game.alldone:
return
# compute final position -- new quadrant and sector
- x =
QUADSIZE*(game.quadrant.x-1
)+game.sector.x
- y =
QUADSIZE*(game.quadrant.y-1
)+game.sector.y
- w.x =
x+10.0*game.dist*bigger*deltax+0.5
- w.y =
y+10.0*game.dist*bigger*deltay+0.5
+ x =
(QUADSIZE*game.quadrant.x
)+game.sector.x
+ y =
(QUADSIZE*game.quadrant.y
)+game.sector.y
+ w.x =
int(round(x+10.0*game.dist*bigger*deltax))
+ w.y =
int(round(y+10.0*game.dist*bigger*deltay))
# check for edge of galaxy
kinks = 0
while True:
# check for edge of galaxy
kinks = 0
while True:
- kink =
0
- if w.x <
=
0:
- w.x = -w.x
+ 1
- kink =
1
- if w.y <
=
0:
- w.y = -w.y
+ 1
- kink =
1
- if w.x > GALSIZE*QUADSIZE:
- w.x = (GALSIZE*QUADSIZE*2)
+1
- w.x
- kink =
1
- if w.y > GALSIZE*QUADSIZE:
- w.y = (GALSIZE*QUADSIZE*2)
+1
- w.y
- kink =
1
+ kink =
False
+ if w.x < 0:
+ w.x = -w.x
+ kink =
True
+ if w.y < 0:
+ w.y = -w.y
+ kink =
True
+ if w.x >
=
GALSIZE*QUADSIZE:
+ w.x = (GALSIZE*QUADSIZE*2) - w.x
+ kink =
True
+ if w.y >
=
GALSIZE*QUADSIZE:
+ w.y = (GALSIZE*QUADSIZE*2) - w.y
+ kink =
True
if kink:
if kink:
- kinks = 1
- if not kink:
- break
-
+ kinks += 1
+ else:
+ break
if kinks:
game.nkinks += 1
if game.nkinks == 3:
if kinks:
game.nkinks += 1
if game.nkinks == 3:
@@
-3942,10
+3906,10
@@
def imove(novapush):
# Compute final position in new quadrant
if trbeam: # Don't bother if we are to be beamed
return
# Compute final position in new quadrant
if trbeam: # Don't bother if we are to be beamed
return
- game.quadrant.x =
(w.x+(QUADSIZE-1))
/QUADSIZE
- game.quadrant.y =
(w.y+(QUADSIZE-1))
/QUADSIZE
- game.sector.x = w.x -
QUADSIZE*(game.quadrant.x-1
)
- game.sector.y = w.y -
QUADSIZE*(game.quadrant.y-1
)
+ game.quadrant.x =
w.x
/QUADSIZE
+ game.quadrant.y =
w.y
/QUADSIZE
+ game.sector.x = w.x -
(QUADSIZE*game.quadrant.x
)
+ game.sector.y = w.y -
(QUADSIZE*game.quadrant.y
)
skip(1)
prout(_("Entering Quadrant %s.") % game.quadrant)
game.quad[game.sector.x][game.sector.y] = game.ship
skip(1)
prout(_("Entering Quadrant %s.") % game.quadrant)
game.quad[game.sector.x][game.sector.y] = game.ship
@@
-3958,7
+3922,7
@@
def imove(novapush):
# object encountered in flight path
stopegy = 50.0*game.dist/game.optime
game.dist = distance(game.sector, w) / (QUADSIZE * 1.0)
# object encountered in flight path
stopegy = 50.0*game.dist/game.optime
game.dist = distance(game.sector, w) / (QUADSIZE * 1.0)
- if iquad in (IHT
.
IHK, OHC, IHS, IHR, IHQUEST):
+ if iquad in (IHT
,
IHK, OHC, IHS, IHR, IHQUEST):
game.sector = w
ram(False, iquad, game.sector)
final = game.sector
game.sector = w
ram(False, iquad, game.sector)
final = game.sector
@@
-4039,8
+4003,7
@@
def dock(verbose):
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""))
attackreport(False)
game.iseenit = True
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""))
attackreport(False)
game.iseenit = True
-
-#
+
# This program originally required input in terms of a (clock)
# direction and distance. Somewhere in history, it was changed to
# cartesian coordinates. So we need to convert. Probably
# This program originally required input in terms of a (clock)
# direction and distance. Somewhere in history, it was changed to
# cartesian coordinates. So we need to convert. Probably
@@
-4048,25
+4011,20
@@
def dock(verbose):
# pain if the computer isn't working! Manual mode is still confusing
# because it involves giving x and y motions, yet the coordinates
# are always displayed y - x, where +y is downward!
# pain if the computer isn't working! Manual mode is still confusing
# because it involves giving x and y motions, yet the coordinates
# are always displayed y - x, where +y is downward!
-#
-def getcd(isprobe, akey):
- # get course and distance
- irowq=game.quadrant.x; icolq=game.quadrant.y; key=0
+def getcourse(isprobe, akey):
+ # get course and distance
+ key = 0
+ dquad = copy.copy(game.quadrant)
navmode = "unspecified"
itemp = "curt"
navmode = "unspecified"
itemp = "curt"
-
incr
= coord()
+
dsect
= coord()
iprompt = False
iprompt = False
-
- # Get course direction and distance. If user types bad values, return
- # with DIREC = -1.0.
- game.direc = -1.0
-
if game.landed and not isprobe:
prout(_("Dummy! You can't leave standard orbit until you"))
proutn(_("are back aboard the ship."))
chew()
if game.landed and not isprobe:
prout(_("Dummy! You can't leave standard orbit until you"))
proutn(_("are back aboard the ship."))
chew()
- return
+ return
False
while navmode == "unspecified":
if damaged(DNAVSYS):
if isprobe:
while navmode == "unspecified":
if damaged(DNAVSYS):
if isprobe:
@@
-4083,7
+4041,6
@@
def getcd(isprobe, akey):
akey = -1
else:
key = scan()
akey = -1
else:
key = scan()
-
if key == IHEOL:
proutn(_("Manual or automatic- "))
iprompt = True
if key == IHEOL:
proutn(_("Manual or automatic- "))
iprompt = True
@@
-4100,7
+4057,7
@@
def getcd(isprobe, akey):
else:
huh()
chew()
else:
huh()
chew()
- return
+ return
False
else: # numeric
if isprobe:
prout(_("(Manual navigation assumed.)"))
else: # numeric
if isprobe:
prout(_("(Manual navigation assumed.)"))
@@
-4108,7
+4065,6
@@
def getcd(isprobe, akey):
prout(_("(Manual movement assumed.)"))
navmode = "manual"
break
prout(_("(Manual movement assumed.)"))
navmode = "manual"
break
-
if navmode == "automatic":
while key == IHEOL:
if isprobe:
if navmode == "automatic":
while key == IHEOL:
if isprobe:
@@
-4118,52
+4074,53
@@
def getcd(isprobe, akey):
chew()
iprompt = True
key = scan()
chew()
iprompt = True
key = scan()
-
if key != IHREAL:
huh()
if key != IHREAL:
huh()
- return
- xi = int(
aaitem-0.05)
+ return
False
+ xi = int(
round(aaitem))-1
key = scan()
if key != IHREAL:
huh()
key = scan()
if key != IHREAL:
huh()
- return
- xj = int(
aaitem-0.5)
+ return
False
+ xj = int(
round(aaitem))-1
key = scan()
if key == IHREAL:
# both quadrant and sector specified
key = scan()
if key == IHREAL:
# both quadrant and sector specified
- xk =
aaitem
+ xk =
int(round(aaitem))-1
key = scan()
if key != IHREAL:
huh()
key = scan()
if key != IHREAL:
huh()
- return
- xl = aaitem
-
- irowq = xi + 0.5
- icolq = xj + 0.5
- incr.y = xk + 0.5
- incr.x = xl + 0.5
+ return False
+ xl = int(round(aaitem))-1
+ dquad.x = xi
+ dquad.y = xj
+ dsect.y = xk
+ dsect.x = xl
else:
else:
+ # only one pair of numbers was specified
if isprobe:
# only quadrant specified -- go to center of dest quad
if isprobe:
# only quadrant specified -- go to center of dest quad
- irowq = xi + 0.5
- icolq = xj + 0.5
- incr.y = incr.x = 5
+ dquad.x = xi
+ dquad.y = xj
+ dsect.y = dsect.x = 4 # preserves 1-origin behavior
else:
else:
- incr.y = xi + 0.5
- incr.x = xj + 0.5
+ # only sector specified
+ dsect.y = xi
+ dsect.x = xj
itemp = "normal"
itemp = "normal"
- if not VALID_QUADRANT(
icolq,irowq) or not VALID_SECTOR(incr.x,incr
.y):
+ if not VALID_QUADRANT(
dquad.y,dquad.x) or not VALID_SECTOR(dsect.x,dsect
.y):
huh()
huh()
- return
+ return
False
skip(1)
if not isprobe:
if itemp > "curt":
if iprompt:
skip(1)
if not isprobe:
if itemp > "curt":
if iprompt:
- prout(_("Helmsman Sulu- \"Course locked in for Sector %s.\"") %
incr
)
+ prout(_("Helmsman Sulu- \"Course locked in for Sector %s.\"") %
dsect
)
else:
prout(_("Ensign Chekov- \"Course laid in, Captain.\""))
else:
prout(_("Ensign Chekov- \"Course laid in, Captain.\""))
- deltax = icolq - game.quadrant.y + 0.1*(incr.x-game.sector.y)
- deltay = game.quadrant.x - irowq + 0.1*(game.sector.x-incr.y)
+ # the actual deltas get computed here
+ deltax = dquad.y-game.quadrant.y + 0.1*(dsect.x-game.sector.y)
+ deltay = game.quadrant.x-dquad.x + 0.1*(game.sector.x-dsect.y)
else: # manual
while key == IHEOL:
proutn(_("X and Y displacements- "))
else: # manual
while key == IHEOL:
proutn(_("X and Y displacements- "))
@@
-4173,26
+4130,27
@@
def getcd(isprobe, akey):
itemp = "verbose"
if key != IHREAL:
huh()
itemp = "verbose"
if key != IHREAL:
huh()
- return
+ return
False
deltax = aaitem
key = scan()
if key != IHREAL:
huh()
deltax = aaitem
key = scan()
if key != IHREAL:
huh()
- return
+ return
False
deltay = aaitem
# Check for zero movement
if deltax == 0 and deltay == 0:
chew()
deltay = aaitem
# Check for zero movement
if deltax == 0 and deltay == 0:
chew()
- return
+ return
False
if itemp == "verbose" and not isprobe:
skip(1)
prout(_("Helmsman Sulu- \"Aye, Sir.\""))
if itemp == "verbose" and not isprobe:
skip(1)
prout(_("Helmsman Sulu- \"Aye, Sir.\""))
+ # Course actually laid in.
game.dist = math.sqrt(deltax*deltax + deltay*deltay)
game.direc = math.atan2(deltax, deltay)*1.90985932
if game.direc < 0.0:
game.direc += 12.0
chew()
game.dist = math.sqrt(deltax*deltax + deltay*deltay)
game.direc = math.atan2(deltax, deltay)*1.90985932
if game.direc < 0.0:
game.direc += 12.0
chew()
- return
+ return
True
def impulse():
# move under impulse power
def impulse():
# move under impulse power
@@
-4203,13
+4161,11
@@
def impulse():
prout(_("Engineer Scott- \"The impulse engines are damaged, Sir.\""))
return
if game.energy > 30.0:
prout(_("Engineer Scott- \"The impulse engines are damaged, Sir.\""))
return
if game.energy > 30.0:
- getcd(False, 0)
- if game.direc == -1.0:
+ if not getcourse(isprobe=False, akey=0):
return
power = 20.0 + 100.0*game.dist
else:
power = 30.0
return
power = 20.0 + 100.0*game.dist
else:
power = 30.0
-
if power >= game.energy:
# Insufficient power for trip
skip(1)
if power >= game.energy:
# Insufficient power for trip
skip(1)
@@
-4232,7
+4188,7
@@
def impulse():
if ja() == False:
return
# Activate impulse engines and pay the cost
if ja() == False:
return
# Activate impulse engines and pay the cost
- imove(False)
+ imove(
novapush=
False)
game.ididit = True
if game.alldone:
return
game.ididit = True
if game.alldone:
return
@@
-4259,12
+4215,9
@@
def warp(timewarp):
prout(_("Engineer Scott- \"Sorry, Captain. Until this damage"))
prout(_(" is repaired, I can only give you warp 4.\""))
return
prout(_("Engineer Scott- \"Sorry, Captain. Until this damage"))
prout(_(" is repaired, I can only give you warp 4.\""))
return
-
- # Read in course and distance
- getcd(False, 0)
- if game.direc == -1.0:
+ # Read in course and distance
+ if not getcourse(isprobe=False, akey=0):
return
return
-
# Make sure starship has enough energy for the trip
power = (game.dist+0.05)*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)
if power >= game.energy:
# Make sure starship has enough energy for the trip
power = (game.dist+0.05)*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)
if power >= game.energy:
@@
-4341,10
+4294,8
@@
def warp(timewarp):
if game.quad[ix][iy] != IHDOT:
blooey = False
twarp = False
if game.quad[ix][iy] != IHDOT:
blooey = False
twarp = False
-
-
# Activate Warp Engines and pay the cost
# Activate Warp Engines and pay the cost
- imove(False)
+ imove(
novapush=
False)
if game.alldone:
return
game.energy -= game.dist*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)
if game.alldone:
return
game.energy -= game.dist*game.warpfac*game.warpfac*game.warpfac*(game.shldup+1)
@@
-4405,7
+4356,6
@@
def setwarp():
def atover(igrab):
# cope with being tossed out of quadrant by supernova or yanked by beam
def atover(igrab):
# cope with being tossed out of quadrant by supernova or yanked by beam
-
chew()
# is captain on planet?
if game.landed:
chew()
# is captain on planet?
if game.landed:
@@
-4432,13
+4382,11
@@
def atover(igrab):
game.icrystl = True
if igrab:
return
game.icrystl = True
if igrab:
return
-
# Check to see if captain in shuttle craft
if game.icraft:
finish(FSTRACTOR)
if game.alldone:
return
# Check to see if captain in shuttle craft
if game.icraft:
finish(FSTRACTOR)
if game.alldone:
return
-
# Inform captain of attempt to reach safety
skip(1)
while True:
# Inform captain of attempt to reach safety
skip(1)
while True:
@@
-4567,7
+4515,6
@@
def probe():
prout(_("Uhura- \"The previous probe is still reporting data, Sir.\""))
return
key = scan()
prout(_("Uhura- \"The previous probe is still reporting data, Sir.\""))
return
key = scan()
-
if key == IHEOL:
# slow mode, so let Kirk know how many probes there are left
if game.nprobes == 1:
if key == IHEOL:
# slow mode, so let Kirk know how many probes there are left
if game.nprobes == 1:
@@
-4577,7
+4524,6
@@
def probe():
proutn(_("Are you sure you want to fire a probe? "))
if ja() == False:
return
proutn(_("Are you sure you want to fire a probe? "))
if ja() == False:
return
-
game.isarmed = False
if key == IHALPHA and citem == "armed":
game.isarmed = True
game.isarmed = False
if key == IHALPHA and citem == "armed":
game.isarmed = True
@@
-4585,8
+4531,7
@@
def probe():
elif key == IHEOL:
proutn(_("Arm NOVAMAX warhead? "))
game.isarmed = ja()
elif key == IHEOL:
proutn(_("Arm NOVAMAX warhead? "))
game.isarmed = ja()
- getcd(True, key)
- if game.direc == -1.0:
+ if not getcourse(isprobe=True, akey=key):
return
game.nprobes -= 1
angle = ((15.0 - game.direc) * 0.5235988)
return
game.nprobes -= 1
angle = ((15.0 - game.direc) * 0.5235988)
@@
-4596,7
+4541,6
@@
def probe():
bigger = math.fabs(game.probeinx)
else:
bigger = math.fabs(game.probeiny)
bigger = math.fabs(game.probeinx)
else:
bigger = math.fabs(game.probeiny)
-
game.probeiny /= bigger
game.probeinx /= bigger
game.proben = 10.0*game.dist*bigger +0.5
game.probeiny /= bigger
game.probeinx /= bigger
game.proben = 10.0*game.dist*bigger +0.5
@@
-4629,7
+4573,6
@@
def mayday():
# yell for help from nearest starbase
# There's more than one way to move in this game!
line = 0
# yell for help from nearest starbase
# There's more than one way to move in this game!
line = 0
-
chew()
# Test for conditions which prevent calling for help
if game.condition == "docked":
chew()
# Test for conditions which prevent calling for help
if game.condition == "docked":
@@
-4768,7
+4711,7
@@
def abandon():
if not (game.options & OPTION_WORLDS) and not damaged(DTRANSP):
prout(_("Remainder of ship's complement beam down"))
prout(_("to nearest habitable planet."))
if not (game.options & OPTION_WORLDS) and not damaged(DTRANSP):
prout(_("Remainder of ship's complement beam down"))
prout(_("to nearest habitable planet."))
- elif q.planet != N
OPLANET
and not damaged(DTRANSP):
+ elif q.planet != N
one
and not damaged(DTRANSP):
prout(_("Remainder of ship's complement beam down to %s.") %
q.planet)
else:
prout(_("Remainder of ship's complement beam down to %s.") %
q.planet)
else:
@@
-4845,7
+4788,7
@@
def survey():
prout(_("Spock- \"Planet report follows, Captain.\""))
skip(1)
for i in range(game.inplan):
prout(_("Spock- \"Planet report follows, Captain.\""))
skip(1)
for i in range(game.inplan):
- if game.state.planets[i].pclass ==
destroyed
:
+ if game.state.planets[i].pclass ==
"destroyed"
:
continue
if (game.state.planets[i].known != "unknown" \
and not game.state.planets[i].inhabited) \
continue
if (game.state.planets[i].known != "unknown" \
and not game.state.planets[i].inhabited) \
@@
-4896,23
+4839,26
@@
def sensor():
if game.options & OPTION_TTY:
prout(_("Short range sensors damaged."))
return
if game.options & OPTION_TTY:
prout(_("Short range sensors damaged."))
return
- if
not is_valid(game.plnet)
:
+ if
game.iplnet == None
:
if game.options & OPTION_TTY:
prout(_("Spock- \"No planet in this quadrant, Captain.\""))
return
if game.options & OPTION_TTY:
prout(_("Spock- \"No planet in this quadrant, Captain.\""))
return
- if game.
state.planets[game.iplnet]
.known == "unknown":
+ if game.
iplnet
.known == "unknown":
prout(_("Spock- \"Sensor scan for Quadrant %s-") % game.quadrant)
skip(1)
prout(_(" Planet at Sector %s is of class %s.") %
prout(_("Spock- \"Sensor scan for Quadrant %s-") % game.quadrant)
skip(1)
prout(_(" Planet at Sector %s is of class %s.") %
- (
sector,game.plnet, game.state.planets[game.iplnet]
))
- if game.
state.planets[game.iplnet]
.known=="shuttle_down":
+ (
game.plnet, game.iplnet.pclass
))
+ if game.
iplnet
.known=="shuttle_down":
prout(_(" Sensors show Galileo still on surface."))
proutn(_(" Readings indicate"))
prout(_(" Sensors show Galileo still on surface."))
proutn(_(" Readings indicate"))
- if game.
state.planets[game.iplnet].crystals != present
:
+ if game.
iplnet.crystals != "present"
:
proutn(_(" no"))
prout(_(" dilithium crystals present.\""))
proutn(_(" no"))
prout(_(" dilithium crystals present.\""))
- if game.state.planets[game.iplnet].known == "unknown":
- game.state.planets[game.iplnet].known = "known"
+ if game.iplnet.known == "unknown":
+ game.iplnet.known = "known"
+ elif game.iplnet.inhabited:
+ prout(_("Spock- \"The inhabited planet %s ") % game.iplnet.name)
+ prout(_(" is located at Sector %s, Captain.\"") % game.plnet)
def beam():
# use the transporter
def beam():
# use the transporter
@@
-4921,7
+4867,7
@@
def beam():
skip(1)
if damaged(DTRANSP):
prout(_("Transporter damaged."))
skip(1)
if damaged(DTRANSP):
prout(_("Transporter damaged."))
- if not damaged(DSHUTTL) and (game.
state.planets[game.iplnet]
.known=="shuttle_down" or game.iscraft == "onship"):
+ if not damaged(DSHUTTL) and (game.
iplnet
.known=="shuttle_down" or game.iscraft == "onship"):
skip(1)
proutn(_("Spock- \"May I suggest the shuttle craft, Sir?\" "))
if ja() == True:
skip(1)
proutn(_("Spock- \"May I suggest the shuttle craft, Sir?\" "))
if ja() == True:
@@
-4934,12
+4880,12
@@
def beam():
if game.shldup:
prout(_("Impossible to transport through shields."))
return
if game.shldup:
prout(_("Impossible to transport through shields."))
return
- if game.
state.planets[game.iplnet]
.known=="unknown":
+ if game.
iplnet
.known=="unknown":
prout(_("Spock- \"Captain, we have no information on this planet"))
prout(_(" and Starfleet Regulations clearly state that in this situation"))
prout(_(" you may not go down.\""))
return
prout(_("Spock- \"Captain, we have no information on this planet"))
prout(_(" and Starfleet Regulations clearly state that in this situation"))
prout(_(" you may not go down.\""))
return
- if not game.landed and game.
state.planets[game.iplnet].crystals==absent
:
+ if not game.landed and game.
iplnet.crystals=="absent"
:
prout(_("Spock- \"Captain, I fail to see the logic in"))
prout(_(" exploring a planet with no dilithium crystals."))
proutn(_(" Are you sure this is wise?\" "))
prout(_("Spock- \"Captain, I fail to see the logic in"))
prout(_(" exploring a planet with no dilithium crystals."))
proutn(_(" Are you sure this is wise?\" "))
@@
-4956,7
+4902,7
@@
def beam():
prout(_("Engineering to bridge--"))
prout(_(" Captain, we have enough energy only to transport you down to"))
prout(_(" the planet, but there wouldn't be an energy for the trip back."))
prout(_("Engineering to bridge--"))
prout(_(" Captain, we have enough energy only to transport you down to"))
prout(_(" the planet, but there wouldn't be an energy for the trip back."))
- if game.
state.planets[game.iplnet]
.known == "shuttle_down":
+ if game.
iplnet
.known == "shuttle_down":
prout(_(" Although the Galileo shuttle craft may still be on a surface."))
proutn(_(" Are you sure this is wise?\" "))
if ja() == False:
prout(_(" Although the Galileo shuttle craft may still be on a surface."))
proutn(_(" Are you sure this is wise?\" "))
if ja() == False:
@@
-4964,7
+4910,7
@@
def beam():
return
if game.landed:
# Coming from planet
return
if game.landed:
# Coming from planet
- if game.
state.planets[game.iplnet]
.known=="shuttle_down":
+ if game.
iplnet
.known=="shuttle_down":
proutn(_("Spock- \"Wouldn't you rather take the Galileo?\" "))
if ja() == True:
chew()
proutn(_("Spock- \"Wouldn't you rather take the Galileo?\" "))
if ja() == True:
chew()
@@
-4998,7
+4944,7
@@
def beam():
game.energy -= nrgneed
skip(2)
prout(_("Transport complete."))
game.energy -= nrgneed
skip(2)
prout(_("Transport complete."))
- if game.landed and game.
state.planets[game.iplnet]
.known=="shuttle_down":
+ if game.landed and game.
iplnet
.known=="shuttle_down":
prout(_("The shuttle craft Galileo is here!"))
if not game.landed and game.imine:
game.icrystl = True
prout(_("The shuttle craft Galileo is here!"))
if not game.landed and game.imine:
game.icrystl = True
@@
-5013,10
+4959,10
@@
def mine():
if not game.landed:
prout(_("Mining party not on planet."))
return
if not game.landed:
prout(_("Mining party not on planet."))
return
- if game.
state.planets[game.iplnet].crystals == mined
:
+ if game.
iplnet.crystals == "mined"
:
prout(_("This planet has already been strip-mined for dilithium."))
return
prout(_("This planet has already been strip-mined for dilithium."))
return
- elif game.
state.planets[game.iplnet].crystals == absent
:
+ elif game.
iplnet.crystals == "absent"
:
prout(_("No dilithium crystals on this planet."))
return
if game.imine:
prout(_("No dilithium crystals on this planet."))
return
if game.imine:
@@
-5028,11
+4974,11
@@
def mine():
skip(1)
prout(_("there's no reason to mine more at this time."))
return
skip(1)
prout(_("there's no reason to mine more at this time."))
return
- game.optime = (0.1+0.2*random.random())*game.
state.planets[game.iplnet]
.pclass
+ game.optime = (0.1+0.2*random.random())*game.
iplnet
.pclass
if consumeTime():
return
prout(_("Mining operation complete."))
if consumeTime():
return
prout(_("Mining operation complete."))
- game.
state.planets[game.iplnet].crystals = mined
+ game.
iplnet.crystals = "mined"
game.imine = game.ididit = True
def usecrystals():
game.imine = game.ididit = True
def usecrystals():
@@
-5087,7
+5033,7
@@
def shuttle():
skip(1)
if damaged(DSHUTTL):
if game.damage[DSHUTTL] == -1.0:
skip(1)
if damaged(DSHUTTL):
if game.damage[DSHUTTL] == -1.0:
- if game.inorbit and game.
state.planets[game.iplnet]
.known == "shuttle_down":
+ if game.inorbit and game.
iplnet
.known == "shuttle_down":
prout(_("Ye Faerie Queene has no shuttle craft bay to dock it at."))
else:
prout(_("Ye Faerie Queene had no shuttle craft."))
prout(_("Ye Faerie Queene has no shuttle craft bay to dock it at."))
else:
prout(_("Ye Faerie Queene had no shuttle craft."))
@@
-5100,16
+5046,16
@@
def shuttle():
crmshp()
prout(_(" not in standard orbit."))
return
crmshp()
prout(_(" not in standard orbit."))
return
- if (game.
state.planets[game.iplnet]
.known != "shuttle_down") and game.iscraft != "onship":
+ if (game.
iplnet
.known != "shuttle_down") and game.iscraft != "onship":
prout(_("Shuttle craft not currently available."))
return
prout(_("Shuttle craft not currently available."))
return
- if not game.landed and game.
state.planets[game.iplnet]
.known=="shuttle_down":
+ if not game.landed and game.
iplnet
.known=="shuttle_down":
prout(_("You will have to beam down to retrieve the shuttle craft."))
return
if game.shldup or game.condition == "docked":
prout(_("Shuttle craft cannot pass through shields."))
return
prout(_("You will have to beam down to retrieve the shuttle craft."))
return
if game.shldup or game.condition == "docked":
prout(_("Shuttle craft cannot pass through shields."))
return
- if game.
state.planets[game.iplnet]
.known=="unknown":
+ if game.
iplnet
.known=="unknown":
prout(_("Spock- \"Captain, we have no information on this planet"))
prout(_(" and Starfleet Regulations clearly state that in this situation"))
prout(_(" you may not fly down.\""))
prout(_("Spock- \"Captain, we have no information on this planet"))
prout(_(" and Starfleet Regulations clearly state that in this situation"))
prout(_(" you may not fly down.\""))
@@
-5141,7
+5087,7
@@
def shuttle():
skip(1)
if consumeTime():
return
skip(1)
if consumeTime():
return
- game.
state.planets[game.iplnet]
.known="shuttle_down"
+ game.
iplnet
.known="shuttle_down"
prout(_("Trip complete."))
return
else:
prout(_("Trip complete."))
return
else:
@@
-5151,7
+5097,7
@@
def shuttle():
skip(1)
prouts(_("The short hop begins . . ."))
skip(1)
skip(1)
prouts(_("The short hop begins . . ."))
skip(1)
- game.
state.planets[game.iplnet]
.known="known"
+ game.
iplnet
.known="known"
game.icraft = True
skip(1)
game.landed = False
game.icraft = True
skip(1)
game.landed = False
@@
-5177,7
+5123,7
@@
def shuttle():
game.iscraft = "offship"
if consumeTime():
return
game.iscraft = "offship"
if consumeTime():
return
- game.
state.planets[game.iplnet]
.known = "shuttle_down"
+ game.
iplnet
.known = "shuttle_down"
game.landed = True
game.icraft = False
prout(_("Trip complete."))
game.landed = True
game.icraft = False
prout(_("Trip complete."))
@@
-5186,7
+5132,6
@@
def shuttle():
def deathray():
# use the big zapper
r = random.random()
def deathray():
# use the big zapper
r = random.random()
-
game.ididit = False
skip(1)
chew()
game.ididit = False
skip(1)
chew()
@@
-5445,7
+5390,7
@@
def chart():
prout(_("(Last surveillance update %d stardates ago).") % ((int)(game.state.date-game.lastchart)))
prout(" 1 2 3 4 5 6 7 8")
for i in range(GALSIZE):
prout(_("(Last surveillance update %d stardates ago).") % ((int)(game.state.date-game.lastchart)))
prout(" 1 2 3 4 5 6 7 8")
for i in range(GALSIZE):
- proutn("%d |" % (i))
+ proutn("%d |" % (i
+1
))
for j in range(GALSIZE):
if (game.options & OPTION_SHOWME) and i == game.quadrant.x and j == game.quadrant.y:
proutn("<")
for j in range(GALSIZE):
if (game.options & OPTION_SHOWME) and i == game.quadrant.x and j == game.quadrant.y:
proutn("<")
@@
-5484,13
+5429,13
@@
def sectscan(goodScan, i, j):
else:
proutn("- ")
else:
proutn("- ")
-def status(req):
+def status(req
=0
):
# print status report lines
if not req or req == 1:
prstat(_("Stardate"), _("%.1f, Time Left %.2f") \
% (game.state.date, game.state.remtime))
# print status report lines
if not req or req == 1:
prstat(_("Stardate"), _("%.1f, Time Left %.2f") \
% (game.state.date, game.state.remtime))
-
el
if not req or req == 2:
+ if not req or req == 2:
if game.condition != "docked":
newcnd()
dam = 0
if game.condition != "docked":
newcnd()
dam = 0
@@
-5498,43
+5443,43
@@
def status(req):
if game.damage[t]>0:
dam += 1
prstat(_("Condition"), _("%s, %i DAMAGES") % (game.condition.upper(), dam))
if game.damage[t]>0:
dam += 1
prstat(_("Condition"), _("%s, %i DAMAGES") % (game.condition.upper(), dam))
-
el
if not req or req == 3:
+ if not req or req == 3:
prstat(_("Position"), "%s , %s" % (game.quadrant, game.sector))
prstat(_("Position"), "%s , %s" % (game.quadrant, game.sector))
-
el
if not req or req == 4:
+ if not req or req == 4:
if damaged(DLIFSUP):
if game.condition == "docked":
if damaged(DLIFSUP):
if game.condition == "docked":
- s
printf(s, _("DAMAGED, Base provides")
)
+ s
= _("DAMAGED, Base provides"
)
else:
else:
- s
printf(s, _("DAMAGED, reserves=%4.2f") % game.lsupres)
+ s
= _("DAMAGED, reserves=%4.2f") % game.lsupres
else:
else:
- s
printf(s, _("ACTIVE")
)
+ s
= _("ACTIVE"
)
prstat(_("Life Support"), s)
prstat(_("Life Support"), s)
-
el
if not req or req == 5:
- prstat(_("Warp Factor"), "%.1f" %
(game.warpfac)
)
-
el
if not req or req == 6:
+ if not req or req == 5:
+ prstat(_("Warp Factor"), "%.1f" %
game.warpfac
)
+ if not req or req == 6:
extra = ""
if game.icrystl and (game.options & OPTION_SHOWME):
extra = _(" (have crystals)")
extra = ""
if game.icrystl and (game.options & OPTION_SHOWME):
extra = _(" (have crystals)")
- prstat(_("Energy"), "%.2f%s" %
game.energy, extra
)
-
el
if not req or req == 7:
+ prstat(_("Energy"), "%.2f%s" %
(game.energy, extra)
)
+ if not req or req == 7:
prstat(_("Torpedoes"), "%d" % (game.torps))
prstat(_("Torpedoes"), "%d" % (game.torps))
-
el
if not req or req == 8:
+ if not req or req == 8:
if damaged(DSHIELD):
if damaged(DSHIELD):
- s
trcpy(s, _("DAMAGED,")
)
+ s
= _("DAMAGED,"
)
elif game.shldup:
elif game.shldup:
- s
trcpy(s, _("UP,")
)
+ s
= _("UP,"
)
else:
else:
- s
trcpy(s, _("DOWN,")
)
+ s
= _("DOWN,"
)
data = _(" %d%% %.1f units") \
% (int((100.0*game.shield)/game.inshld + 0.5), game.shield)
data = _(" %d%% %.1f units") \
% (int((100.0*game.shield)/game.inshld + 0.5), game.shield)
- prstat(_("Shields"), s)
-
el
if not req or req == 9:
+ prstat(_("Shields"), s
+data
)
+ if not req or req == 9:
prstat(_("Klingons Left"), "%d" \
% (game.state.remkl + game.state.remcom + game.state.nscrem))
prstat(_("Klingons Left"), "%d" \
% (game.state.remkl + game.state.remcom + game.state.nscrem))
-
el
if not req or req == 10:
+ if not req or req == 10:
if game.options & OPTION_WORLDS:
plnet = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet
if game.options & OPTION_WORLDS:
plnet = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet
- if plnet
!= NOPLANET and game.state.planets[plnet]
.inhabited:
+ if plnet
and plnet
.inhabited:
prstat(_("Major system"), plnet.name)
else:
prout(_("Sector is uninhabited"))
prstat(_("Major system"), plnet.name)
else:
prout(_("Sector is uninhabited"))
@@
-5574,7
+5519,7
@@
def srscan():
if game.condition != "docked":
newcnd()
for i in range(QUADSIZE):
if game.condition != "docked":
newcnd()
for i in range(QUADSIZE):
- proutn("%2d " % (i))
+ proutn("%2d " % (i
+1
))
for j in range(QUADSIZE):
sectscan(goodScan, i, j)
skip(1)
for j in range(QUADSIZE):
sectscan(goodScan, i, j)
skip(1)
@@
-5615,14
+5560,12
@@
def eta():
w2.y = 0
else:
w2.y=QUADSIZE-1
w2.y = 0
else:
w2.y=QUADSIZE-1
-
if not VALID_QUADRANT(w1.x, w1.y) or not VALID_SECTOR(w2.x, w2.y):
huh()
return
game.dist = math.sqrt(square(w1.y-game.quadrant.y+0.1*(w2.y-game.sector.y))+
square(w1.x-game.quadrant.x+0.1*(w2.x-game.sector.x)))
wfl = False
if not VALID_QUADRANT(w1.x, w1.y) or not VALID_SECTOR(w2.x, w2.y):
huh()
return
game.dist = math.sqrt(square(w1.y-game.quadrant.y+0.1*(w2.y-game.sector.y))+
square(w1.x-game.quadrant.x+0.1*(w2.x-game.sector.x)))
wfl = False
-
if prompt:
prout(_("Answer \"no\" if you don't know the value:"))
while True:
if prompt:
prout(_("Answer \"no\" if you don't know the value:"))
while True:
@@
-5770,9
+5713,6
@@
def visual():
# Code from setup.c begins here
# Code from setup.c begins here
-def filelength(fd):
- return os.fstat(fd).st_size
-
def prelim():
# issue a historically correct banner
skip(2)
def prelim():
# issue a historically correct banner
skip(2)
@@
-5902,7
+5842,6
@@
device = (
def setup(needprompt):
# prepare to play, set up cosmos
w = coord()
def setup(needprompt):
# prepare to play, set up cosmos
w = coord()
-
# Decide how many of everything
if choose(needprompt):
return # frozen game
# Decide how many of everything
if choose(needprompt):
return # frozen game
@@
-5939,7
+5878,7
@@
def setup(needprompt):
for j in range(GALSIZE):
quad = game.state.galaxy[i][j]
quad.charted = 0
for j in range(GALSIZE):
quad = game.state.galaxy[i][j]
quad.charted = 0
- quad.planet = N
OPLANET
+ quad.planet = N
one
quad.romulans = 0
quad.klingons = 0
quad.starbase = False
quad.romulans = 0
quad.klingons = 0
quad.starbase = False
@@
-6032,7
+5971,7
@@
def setup(needprompt):
for i in range(game.inplan):
while True:
w = randplace(GALSIZE)
for i in range(game.inplan):
while True:
w = randplace(GALSIZE)
- if game.state.galaxy[w.x][w.y].planet == N
OPLANET
:
+ if game.state.galaxy[w.x][w.y].planet == N
one
:
break
new = planet()
new.w = w
break
new = planet()
new.w = w
@@
-6124,7
+6063,7
@@
def choose(needprompt):
if aaitem == 0:
chew()
continue # We don't want a blank entry
if aaitem == 0:
chew()
continue # We don't want a blank entry
- game.tourn = int(
aaitem
)
+ game.tourn = int(
round(aaitem)
)
random.seed(aaitem)
break
if isit("saved") or isit("frozen"):
random.seed(aaitem)
break
if isit("saved") or isit("frozen"):
@@
-6273,10
+6212,8
@@
def newqad(shutup):
game.klhere = q.klingons
game.irhere = q.romulans
game.nenhere = game.klhere + game.irhere
game.klhere = q.klingons
game.irhere = q.romulans
game.nenhere = game.klhere + game.irhere
-
# Position Starship
game.quad[game.sector.x][game.sector.y] = game.ship
# Position Starship
game.quad[game.sector.x][game.sector.y] = game.ship
-
if q.klingons:
w.x = w.y = 0 # quiet a gcc warning
# Position ordinary Klingons
if q.klingons:
w.x = w.y = 0 # quiet a gcc warning
# Position ordinary Klingons
@@
-6291,7
+6228,6
@@
def newqad(shutup):
game.quad[w.x][w.y] = IHC
game.kpower[game.klhere] = 950.0+400.0*random.random()+50.0*game.skill
game.comhere = True
game.quad[w.x][w.y] = IHC
game.kpower[game.klhere] = 950.0+400.0*random.random()+50.0*game.skill
game.comhere = True
-
# If we need a super-commander, promote a Klingon
if same(game.quadrant, game.state.kscmdr):
game.quad[game.ks[0].x][game.ks[0].y] = IHS
# If we need a super-commander, promote a Klingon
if same(game.quadrant, game.state.kscmdr):
game.quad[game.ks[0].x][game.ks[0].y] = IHS
@@
-6307,9
+6243,8
@@
def newqad(shutup):
# If quadrant needs a starbase, put it in
if q.starbase:
game.base = dropin(IHB)
# If quadrant needs a starbase, put it in
if q.starbase:
game.base = dropin(IHB)
-
# If quadrant needs a planet, put it in
# If quadrant needs a planet, put it in
- if q.planet
!= NOPLANET
:
+ if q.planet:
game.iplnet = q.planet
if not q.planet.inhabited:
game.plnet = dropin(IHP)
game.iplnet = q.planet
if not q.planet.inhabited:
game.plnet = dropin(IHP)
@@
-6331,7
+6266,6
@@
def newqad(shutup):
skip(1)
prout(_("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE."))
prout(_("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!"))
skip(1)
prout(_("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE."))
prout(_("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!"))
-
if shutup==0:
# Put in THING if needed
global thing
if shutup==0:
# Put in THING if needed
global thing
@@
-6347,7
+6281,6
@@
def newqad(shutup):
skip(1)
prout(_("Mr. Spock- \"Captain, this is most unusual."))
prout(_(" Please examine your short-range scan.\""))
skip(1)
prout(_("Mr. Spock- \"Captain, this is most unusual."))
prout(_(" Please examine your short-range scan.\""))
-
# Decide if quadrant needs a Tholian; lighten up if skill is low
if game.options & OPTION_THOLIAN:
if (game.skill < SKILL_GOOD and random.random() <= 0.02) or \
# Decide if quadrant needs a Tholian; lighten up if skill is low
if game.options & OPTION_THOLIAN:
if (game.skill < SKILL_GOOD and random.random() <= 0.02) or \
@@
-6375,12
+6308,10
@@
def newqad(shutup):
if game.quad[QUADSIZE-1][QUADSIZE-1]==IHDOT:
game.quad[QUADSIZE-1][QUADSIZE-1] = 'X'
sortklings()
if game.quad[QUADSIZE-1][QUADSIZE-1]==IHDOT:
game.quad[QUADSIZE-1][QUADSIZE-1] = 'X'
sortklings()
-
# Put in a few black holes
for i in range(1, 3+1):
if random.random() > 0.5:
dropin(IHBLANK)
# Put in a few black holes
for i in range(1, 3+1):
if random.random() > 0.5:
dropin(IHBLANK)
-
# Take out X's in corners if Tholian present
if game.ithere:
if game.quad[0][0]=='X':
# Take out X's in corners if Tholian present
if game.ithere:
if game.quad[0][0]=='X':
@@
-6563,7
+6494,6
@@
def makemoves():
hitme = False
game.justin = False
game.optime = 0.0
hitme = False
game.justin = False
game.optime = 0.0
- i = -1
chew()
setwnd(prompt_window)
clrscr()
chew()
setwnd(prompt_window)
clrscr()
@@
-6576,16
+6506,20
@@
def makemoves():
clrscr()
setwnd(message_window)
clrscr()
clrscr()
setwnd(message_window)
clrscr()
- cmd = citem.upper()
- if cmd in commands:
+ candidates = filter(lambda x: x.startswith(citem.upper()),
+ commands)
+ if len(candidates) == 1:
+ cmd = candidates[0]
break
break
+ elif candidates and not (game.options & OPTION_PLAIN):
+ prout("Commands with that prefix: " + " ".join(candidates))
else:
listCommands()
continue
if cmd == "SRSCAN": # srscan
srscan()
elif cmd == "STATUS": # status
else:
listCommands()
continue
if cmd == "SRSCAN": # srscan
srscan()
elif cmd == "STATUS": # status
- status(
0
)
+ status()
elif cmd == "REQUEST": # status request
request()
elif cmd == "LRSCAN": # long range scan
elif cmd == "REQUEST": # status request
request()
elif cmd == "LRSCAN": # long range scan
@@
-6685,7
+6619,7
@@
def makemoves():
elif cmd == "SEED": # set random-number seed
key = scan()
if key == IHREAL:
elif cmd == "SEED": # set random-number seed
key = scan()
if key == IHREAL:
- seed = int(
aaitem
)
+ seed = int(
round(aaitem)
)
#ifdef BSD_BUG_FOR_BUG
# elif cmd == "VISUAL":
# visual() # perform visual scan
#ifdef BSD_BUG_FOR_BUG
# elif cmd == "VISUAL":
# visual() # perform visual scan
@@
-6731,22
+6665,17
@@
def cramen(cmd):
else: s = "Unknown??"
proutn(s)
else: s = "Unknown??"
proutn(s)
-def cramlc(loctype, w):
- # name a location
- if loctype == "quadrant":
- buf = _("Quadrant ")
- elif loctype == "sector":
- buf = _("Sector ")
- buf += ("%d - %d" % (w.x, w.y))
- return buf
-
def crmena(stars, enemy, loctype, w):
# print an enemy and his location
if stars:
proutn("***")
cramen(enemy)
proutn(_(" at "))
def crmena(stars, enemy, loctype, w):
# print an enemy and his location
if stars:
proutn("***")
cramen(enemy)
proutn(_(" at "))
- proutn(cramlc(loctype, w))
+ if loctype == "quadrant":
+ buf = _("Quadrant ")
+ elif loctype == "sector":
+ buf = _("Sector ")
+ proutn(buf + `w`)
def crmshp():
# print our ship name
def crmshp():
# print our ship name
@@
-6785,7
+6714,7
@@
def chew2():
def scan():
# Get a token from the user
def scan():
# Get a token from the user
- global inqueue, line, citem
+ global inqueue, line, citem
, aaitem
aaitem = 0.0
citem = ''
aaitem = 0.0
citem = ''
@@
-6915,13
+6844,13
@@
def debugme():
prout("Event %d canceled, no x coordinate." % (i))
unschedule(i)
continue
prout("Event %d canceled, no x coordinate." % (i))
unschedule(i)
continue
- w.x = int(
aaitem
)
+ w.x = int(
round(aaitem)
)
key = scan()
if key != IHREAL:
prout("Event %d canceled, no y coordinate." % (i))
unschedule(i)
continue
key = scan()
if key != IHREAL:
prout("Event %d canceled, no y coordinate." % (i))
unschedule(i)
continue
- w.y = int(
aaitem
)
+ w.y = int(
round(aaitem)
)
ev.quadrant = w
chew()
proutn("Induce supernova here? ")
ev.quadrant = w
chew()
proutn("Induce supernova here? ")
@@
-6937,14
+6866,12
@@
if __name__ == '__main__':
iqengry = False
game = gamestate()
idebug = 0
iqengry = False
game = gamestate()
idebug = 0
-
game.options = OPTION_ALL &~ (OPTION_IOMODES | OPTION_SHOWME | OPTION_PLAIN | OPTION_ALMY)
# Disable curses mode until the game logic is working.
# if os.getenv("TERM"):
# game.options |= OPTION_CURSES | OPTION_SHOWME
# else:
game.options |= OPTION_TTY
game.options = OPTION_ALL &~ (OPTION_IOMODES | OPTION_SHOWME | OPTION_PLAIN | OPTION_ALMY)
# Disable curses mode until the game logic is working.
# if os.getenv("TERM"):
# game.options |= OPTION_CURSES | OPTION_SHOWME
# else:
game.options |= OPTION_TTY
-
seed = time.time()
(options, arguments) = getopt.getopt(sys.argv[1:], "r:tx")
for (switch, val) in options:
seed = time.time()
(options, arguments) = getopt.getopt(sys.argv[1:], "r:tx")
for (switch, val) in options:
@@
-6980,13
+6907,11
@@
if __name__ == '__main__':
#setlinebuf(logfp)
logfp.write("seed %d\n" % (seed))
random.seed(seed)
#setlinebuf(logfp)
logfp.write("seed %d\n" % (seed))
random.seed(seed)
-
iostart()
if arguments:
inqueue = arguments
else:
inqueue = None
iostart()
if arguments:
inqueue = arguments
else:
inqueue = None
-
while True: # Play a game
setwnd(fullscreen_window)
clrscr()
while True: # Play a game
setwnd(fullscreen_window)
clrscr()
@@
-7000,7
+6925,6
@@
if __name__ == '__main__':
skip(1)
stars()
skip(1)
skip(1)
stars()
skip(1)
-
if game.tourn and game.alldone:
proutn(_("Do you want your score recorded?"))
if ja() == True:
if game.tourn and game.alldone:
proutn(_("Do you want your score recorded?"))
if ja() == True:
@@
-7012,4
+6936,3
@@
if __name__ == '__main__':
skip(1)
prout(_("May the Great Bird of the Galaxy roost upon your home planet."))
raise SysExit, 0
skip(1)
prout(_("May the Great Bird of the Galaxy roost upon your home planet."))
raise SysExit, 0
-