Get rid of game.ithere, we just test whether there is a valid
coordinate object for the Tholian instead. Also, use deepcopy to make
snapshots.
def distance(self, other):
return math.sqrt((self.x - other.x)**2 + (self.y - other.y)**2)
def sgn(self):
def distance(self, other):
return math.sqrt((self.x - other.x)**2 + (self.y - other.y)**2)
def sgn(self):
- return coord(self.x / abs(x), self.y / abs(y));
+ s = coord()
+ if self.x == 0:
+ s.x = 0
+ else:
+ s.x = self.x / abs(self.x)
+ if self.y == 0:
+ s.y = 0
+ else:
+ s.y = self.y / abs(self.y)
+ return s
def __hash__(self):
return hash((x, y))
def __str__(self):
def __hash__(self):
return hash((x, y))
def __str__(self):
self.ishere = False # super-commander in quadrant
self.iscate = False # super commander is here
self.ientesc = False # attempted escape from supercommander
self.ishere = False # super-commander in quadrant
self.iscate = False # super commander is here
self.ientesc = False # attempted escape from supercommander
- self.ithere = False # Tholian is here
self.resting = False # rest time
self.icraft = False # Kirk in Galileo
self.landed = False # party on planet (true), on ship (false)
self.resting = False # rest time
self.icraft = False # Kirk in Galileo
self.landed = False # party on planet (true), on ship (false)
def movetholian():
# move the Tholian
def movetholian():
# move the Tholian
- if not game.ithere or game.justin:
+ if not game.tholian or game.justin:
if game.tholian.x == 0 and game.tholian.y == 0:
idx = 0; idy = QUADSIZE-1
elif game.tholian.x == 0 and game.tholian.y == QUADSIZE-1:
if game.tholian.x == 0 and game.tholian.y == 0:
idx = 0; idy = QUADSIZE-1
elif game.tholian.x == 0 and game.tholian.y == QUADSIZE-1:
# something is wrong!
game.ithere = False
return
# something is wrong!
game.ithere = False
return
# do nothing if we are blocked
if game.quad[idx][idy]!= IHDOT and game.quad[idx][idy]!= IHWEB:
return
game.quad[game.tholian.x][game.tholian.y] = IHWEB
# do nothing if we are blocked
if game.quad[idx][idy]!= IHDOT and game.quad[idx][idy]!= IHWEB:
return
game.quad[game.tholian.x][game.tholian.y] = IHWEB
if game.tholian.x != idx:
# move in x axis
im = math.fabs(idx - game.tholian.x)*1.0/(idx - game.tholian.x)
if game.tholian.x != idx:
# move in x axis
im = math.fabs(idx - game.tholian.x)*1.0/(idx - game.tholian.x)
dropin(IHBLANK)
crmena(True, IHT, "sector", game.tholian)
prout(_(" completes web."))
dropin(IHBLANK)
crmena(True, IHT, "sector", game.tholian)
prout(_(" completes web."))
h1 = math.fabs(h1)
if h1 >= 600:
game.quad[w.x][w.y] = IHDOT
h1 = math.fabs(h1)
if h1 >= 600:
game.quad[w.x][w.y] = IHDOT
deadkl(w, iquad, w)
return None
skip(1)
deadkl(w, iquad, w)
return None
skip(1)
return None
prout(_(" disappears."))
game.quad[w.x][w.y] = IHWEB
return None
prout(_(" disappears."))
game.quad[w.x][w.y] = IHWEB
game.nenhere -= 1
dropin(IHBLANK)
return None
game.nenhere -= 1
dropin(IHBLANK)
return None
if idebug:
prout("=== ATTACK!")
# Tholian gets to move before attacking
if idebug:
prout("=== ATTACK!")
# Tholian gets to move before attacking
movetholian()
# if you have just entered the RNZ, you'll get a warning
if game.neutz: # The one chance not to be attacked
movetholian()
# if you have just entered the RNZ, you'll get a warning
if game.neutz: # The one chance not to be attacked
game.state.nromrem -= 1
elif type == IHT:
# Killed a Tholian
game.state.nromrem -= 1
elif type == IHT:
# Killed a Tholian
elif type == IHQUEST:
# Killed a Thingy
global iqengry
elif type == IHQUEST:
# Killed a Thingy
global iqengry
def hittem(hits):
# register a phaser hit on Klingons and Romulans
def hittem(hits):
# register a phaser hit on Klingons and Romulans
- nenhr2=game.nenhere; kk=1
+ nenhr2 = game.nenhere; kk=1
w = coord()
skip(1)
for k in range(nenhr2):
w = coord()
skip(1)
for k in range(nenhr2):
def phasers():
# fire phasers
def phasers():
# fire phasers
kz = 0; k = 1; irec=0 # Cheating inhibitor
kz = 0; k = 1; irec=0 # Cheating inhibitor
- ifast = False; no = False; itarg = True; msgflag = True
+ ifast = False; no = False; itarg = True; msgflag = True; rpow=0
automode = "NOTSET"
key=0
skip(1)
automode = "NOTSET"
key=0
skip(1)
elif not itarg:
automode = "FORCEMAN"
else:
elif not itarg:
automode = "FORCEMAN"
else:
- proutn(_("Manual or automatic? "))
+ proutn(_("Manual or automatic? "))
+ chew()
avail = game.energy
if ifast:
avail -= 200.0
avail = game.energy
if ifast:
avail -= 200.0
extra = 0.0
powrem = rpow
for i in range(game.nenhere):
extra = 0.0
powrem = rpow
for i in range(game.nenhere):
if powrem <= 0:
continue
hits[i] = math.fabs(game.kpower[i])/(PHASEFAC*math.pow(0.90,game.kdist[i]))
if powrem <= 0:
continue
hits[i] = math.fabs(game.kpower[i])/(PHASEFAC*math.pow(0.90,game.kdist[i]))
hittem(hits)
game.ididit = True
if extra > 0 and not game.alldone:
hittem(hits)
game.ididit = True
if extra > 0 and not game.alldone:
proutn(_("*** Tholian web absorbs "))
if game.nenhere>0:
proutn(_("excess "))
proutn(_("*** Tholian web absorbs "))
if game.nenhere>0:
proutn(_("excess "))
w = coord(); hold = coord()
ev = event(); ev2 = event()
w = coord(); hold = coord()
ev = event(); ev2 = event()
# tractor beaming cases merge here
# tractor beaming cases merge here
announce()
game.optime = (10.0/(7.5*7.5))*yank # 7.5 is yank rate (warp 7.5)
skip(1)
announce()
game.optime = (10.0/(7.5*7.5))*yank # 7.5 is yank rate (warp 7.5)
skip(1)
game.iscraft = "removed"
else:
prout(_("Galileo, left on the planet surface, is well hidden."))
game.iscraft = "removed"
else:
prout(_("Galileo, left on the planet surface, is well hidden."))
game.quadrant = game.state.kscmdr
else:
game.quadrant = game.state.kcmdr[i]
game.quadrant = game.state.kscmdr
else:
game.quadrant = game.state.kcmdr[i]
game.resting = False
if not game.shldup:
if not damaged(DSHIELD) and game.shield > 0:
game.resting = False
if not game.shldup:
if not damaged(DSHIELD) and game.shield > 0:
- doshield(True) # raise shields
- game.shldchg=False
+ doshield(shraise=True) # raise shields
+ game.shldchg = False
else:
prout(_("(Shields not currently useable.)"))
newqad(False)
else:
prout(_("(Shields not currently useable.)"))
newqad(False)
(game.energy < 2500 or damaged(DPHASER)) and \
(game.torps < 5 or damaged(DPHOTON))):
# Tractor-beam her!
(game.energy < 2500 or damaged(DPHASER)) and \
(game.torps < 5 or damaged(DPHOTON))):
# Tractor-beam her!
- istract = True
- yank = distance(game.state.kscmdr, game.quadrant)
- ictbeam = True
- tractorbeam()
+ istract = ictbeam = True
+ tractorbeam(distance(game.state.kscmdr, game.quadrant))
else:
return
elif evcode == FTBEAM: # Tractor beam
else:
return
elif evcode == FTBEAM: # Tractor beam
unschedule(FTBEAM)
continue
i = random.randrange(game.state.remcom)
unschedule(FTBEAM)
continue
i = random.randrange(game.state.remcom)
- yank = square(game.state.kcmdr[i].x-game.quadrant.x) + square(game.state.kcmdr[i].y-game.quadrant.y)
+ yank = distance(game.state.kcmdr[i], game.quadrant)
if istract or game.condition == "docked" or yank == 0:
# Drats! Have to reschedule
schedule(FTBEAM,
game.optime + expran(1.5*game.intime/game.state.remcom))
continue
ictbeam = True
if istract or game.condition == "docked" or yank == 0:
# Drats! Have to reschedule
schedule(FTBEAM,
game.optime + expran(1.5*game.intime/game.state.remcom))
continue
ictbeam = True
elif evcode == FSNAP: # Snapshot of the universe (for time warp)
elif evcode == FSNAP: # Snapshot of the universe (for time warp)
- game.snapsht = game.state
+ game.snapsht = copy.deepcopy(game.state)
game.state.snap = True
schedule(FSNAP, expran(0.5 * game.intime))
elif evcode == FBATTAK: # Commander attacks starbase
game.state.snap = True
schedule(FSNAP, expran(0.5 * game.intime))
elif evcode == FBATTAK: # Commander attacks starbase
q = game.state.galaxy[w.x][w.y]
if not (game.quadrant == w or q.planet == None or \
not q.planet.inhabited or \
q = game.state.galaxy[w.x][w.y]
if not (game.quadrant == w or q.planet == None or \
not q.planet.inhabited or \
- q.supernova or q.status!=secure or q.klingons<=0):
+ q.supernova or q.status!="secure" or q.klingons<=0):
break
else:
# can't seem to find one; ignore this call
break
else:
# can't seem to find one; ignore this call
else:
line = raw_input()
if logfp:
else:
line = raw_input()
if logfp:
+ logfp.write(line + "\n")
return line
def setwnd(wnd):
return line
def setwnd(wnd):
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.iplnet.pclass
+ game.optime = (0.1+0.2*random.random())*(ord(game.iplnet.pclass)-ord("M"))
if consumeTime():
return
prout(_("Mining operation complete."))
if consumeTime():
return
prout(_("Mining operation complete."))
prout(_(" YOU'LL NEED IT."))
waitfor()
newqad(False)
prout(_(" YOU'LL NEED IT."))
waitfor()
newqad(False)
- if game.nenhere - (thing == game.quadrant) - game.ithere:
+ if game.nenhere - (thing == game.quadrant) - (game.tholian != None):
game.shldup = True
if game.neutz: # bad luck to start in a Romulan Neutral Zone
attack(False)
game.shldup = True
if game.neutz: # bad luck to start in a Romulan Neutral Zone
attack(False)
game.inorbit = False
game.landed = False
game.ientesc = False
game.inorbit = False
game.landed = False
game.ientesc = False
global iqengry
iqengry = False
game.iseenit = False
global iqengry
iqengry = False
game.iseenit = False
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
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):
+ if game.quadrant == game.state.kscmdr:
game.quad[game.ks[0].x][game.ks[0].y] = IHS
game.kpower[1] = 1175.0 + 400.0*random.random() + 125.0*game.skill
game.iscate = (game.state.remkl > 1)
game.quad[game.ks[0].x][game.ks[0].y] = IHS
game.kpower[1] = 1175.0 + 400.0*random.random() + 125.0*game.skill
game.iscate = (game.state.remkl > 1)
if (game.skill < SKILL_GOOD and random.random() <= 0.02) or \
(game.skill == SKILL_GOOD and random.random() <= 0.05) or \
(game.skill > SKILL_GOOD and random.random() <= 0.08):
if (game.skill < SKILL_GOOD and random.random() <= 0.02) or \
(game.skill == SKILL_GOOD and random.random() <= 0.05) or \
(game.skill > SKILL_GOOD and random.random() <= 0.08):
while True:
game.tholian.x = random.choice((0, QUADSIZE-1))
game.tholian.y = random.choice((0, QUADSIZE-1))
if game.quad[game.tholian.x][game.tholian.y] == IHDOT:
break
game.quad[game.tholian.x][game.tholian.y] = IHT
while True:
game.tholian.x = random.choice((0, QUADSIZE-1))
game.tholian.y = random.choice((0, QUADSIZE-1))
if game.quad[game.tholian.x][game.tholian.y] == IHDOT:
break
game.quad[game.tholian.x][game.tholian.y] = IHT
game.nenhere += 1
game.ks[game.nenhere] = game.tholian
game.kdist[game.nenhere] = game.kavgd[game.nenhere] = \
game.nenhere += 1
game.ks[game.nenhere] = game.tholian
game.kdist[game.nenhere] = game.kavgd[game.nenhere] = \
if random.random() > 0.5:
dropin(IHBLANK)
# Take out X's in corners if Tholian present
if random.random() > 0.5:
dropin(IHBLANK)
# Take out X's in corners if Tholian present
if game.quad[0][0]=='X':
game.quad[0][0] = IHDOT
if game.quad[0][QUADSIZE-1]=='X':
if game.quad[0][0]=='X':
game.quad[0][0] = IHDOT
if game.quad[0][QUADSIZE-1]=='X':
def sortklings():
# sort Klingons by distance from us
# The author liked bubble sort. So we will use it. :-(
def sortklings():
# sort Klingons by distance from us
# The author liked bubble sort. So we will use it. :-(
- if game.nenhere-(thing==game.quadrant)-game.ithere < 2:
+ if game.nenhere-(thing==game.quadrant)-(game.tholian!=None) < 2:
return
while True:
sw = False
return
while True:
sw = False
elif cmd == "MOVE": # move under warp
warp(False)
elif cmd == "SHIELDS": # shields
elif cmd == "MOVE": # move under warp
warp(False)
elif cmd == "SHIELDS": # shields
+ doshield(shraise=False)
if game.ididit:
hitme = True
game.shldchg = False
if game.ididit:
hitme = True
game.shldchg = False
proutn("***")
cramen(enemy)
proutn(_(" at "))
proutn("***")
cramen(enemy)
proutn(_(" at "))
if loctype == "quadrant":
buf = _("Quadrant ")
elif loctype == "sector":
if loctype == "quadrant":
buf = _("Quadrant ")
elif loctype == "sector":
projects / super-star-trek.git / commitdiff