projects
/
super-star-trek.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63a85c0
)
Get rid of some magic numbers, simplify the scanner.
author
Eric S. Raymond
<esr@thyrsus.com>
Tue, 10 Oct 2006 16:14:13 +0000
(16:14 +0000)
committer
Eric S. Raymond
<esr@thyrsus.com>
Tue, 10 Oct 2006 16:14:13 +0000
(16:14 +0000)
src/sst.py
patch
|
blob
|
history
diff --git
a/src/sst.py
b/src/sst.py
index 3e7f2c2a94f4de890e9624e57917445909e53624..17f4dab736e1cd2303fc023b2d9ee5a833c0aa12 100644
(file)
--- a/
src/sst.py
+++ b/
src/sst.py
@@
-653,7
+653,6
@@
def tryexit(enemy, look, irun):
break
return True; # success
break
return True; # success
-#
# The bad-guy movement algorithm:
#
# 1. Enterprise has "force" based on condition of phaser and photon torpedoes.
# The bad-guy movement algorithm:
#
# 1. Enterprise has "force" based on condition of phaser and photon torpedoes.
@@
-691,7
+690,6
@@
def tryexit(enemy, look, irun):
# retreat, especially at high skill levels.
#
# 5. Motion is limited to skill level, except for SC hi-tailing it out.
# retreat, especially at high skill levels.
#
# 5. Motion is limited to skill level, except for SC hi-tailing it out.
-#
def movebaddy(enemy):
"Tactical movement for the bad guys."
def movebaddy(enemy):
"Tactical movement for the bad guys."
@@
-904,7
+902,7
@@
def supercommander():
if not game.iscate and avoid:
# compute move away from Enterprise
idelta = game.state.kscmdr-game.quadrant
if not game.iscate and avoid:
# compute move away from Enterprise
idelta = game.state.kscmdr-game.quadrant
- if
math.sqrt(idelta.i*idelta.i+idelta.j*idelta.j
) > 2.0:
+ if
idelta.distance(
) > 2.0:
# circulate in space
idelta.i = game.state.kscmdr.j-game.quadrant.j
idelta.j = game.quadrant.i-game.state.kscmdr.i
# circulate in space
idelta.i = game.state.kscmdr.j-game.quadrant.j
idelta.j = game.quadrant.i-game.state.kscmdr.i
@@
-3904,8
+3902,8
@@
def getcourse(isprobe):
prout(_("Ensign Chekov- \"Course laid in, Captain.\""))
# the actual deltas get computed here
delta = coord()
prout(_("Ensign Chekov- \"Course laid in, Captain.\""))
# the actual deltas get computed here
delta = coord()
- delta.j = dquad.j-game.quadrant.j +
0.1*(dsect.j-game.sector.j
)
- delta.i = game.quadrant.i-dquad.i +
0.1*(game.sector.i-dsect.i
)
+ delta.j = dquad.j-game.quadrant.j +
(dsect.j-game.sector.j)/(QUADSIZE*1.0
)
+ delta.i = game.quadrant.i-dquad.i +
(game.sector.i-dsect.i)/(QUADSIZE*1.0
)
else: # manual
while key == "IHEOL":
proutn(_("X and Y displacements- "))
else: # manual
while key == "IHEOL":
proutn(_("X and Y displacements- "))
@@
-5291,8
+5289,8
@@
def eta():
if not VALID_QUADRANT(w1.i, w1.j) or not VALID_SECTOR(w2.i, w2.j):
huh()
return
if not VALID_QUADRANT(w1.i, w1.j) or not VALID_SECTOR(w2.i, w2.j):
huh()
return
- game.dist = math.sqrt((w1.j-game.quadrant.j+
0.1*(w2.j-game.sector.j
))**2+
- (w1.i-game.quadrant.i+
0.1*(w2.i-game.sector.i
))**2)
+ game.dist = math.sqrt((w1.j-game.quadrant.j+
(w2.j-game.sector.j)/(QUADSIZE*1.0
))**2+
+ (w1.i-game.quadrant.i+
(w2.i-game.sector.i)/(QUADSIZE*1.0
))**2)
wfl = False
if prompt:
prout(_("Answer \"no\" if you don't know the value:"))
wfl = False
if prompt:
prout(_("Answer \"no\" if you don't know the value:"))
@@
-5443,11
+5441,11
@@
systnames = (
_("Tellar Prime (Miracht)"), # TOS: "Journey to Babel"
_("Vulcan (T'Khasi)"), # many episodes
_("Medusa"), # TOS: "Is There in Truth No Beauty?"
_("Tellar Prime (Miracht)"), # TOS: "Journey to Babel"
_("Vulcan (T'Khasi)"), # many episodes
_("Medusa"), # TOS: "Is There in Truth No Beauty?"
- _("Argelius II (Nelphia)"),# TOS: "Wolf in the Fold" ("IV" in BSD)
+ _("Argelius II (Nelphia)"),
# TOS: "Wolf in the Fold" ("IV" in BSD)
_("Ardana"), # TOS: "The Cloud Minders"
_("Catulla (Cendo-Prae)"), # TOS: "The Way to Eden"
_("Gideon"), # TOS: "The Mark of Gideon"
_("Ardana"), # TOS: "The Cloud Minders"
_("Catulla (Cendo-Prae)"), # TOS: "The Way to Eden"
_("Gideon"), # TOS: "The Mark of Gideon"
- _("Aldebaran III"), # TOS: "The Deadly Years"
+ _("Aldebaran III"),
# TOS: "The Deadly Years"
_("Alpha Majoris I"), # TOS: "Wolf in the Fold"
_("Altair IV"), # TOS: "Amok Time
_("Ariannus"), # TOS: "Let That Be Your Last Battlefield"
_("Alpha Majoris I"), # TOS: "Wolf in the Fold"
_("Altair IV"), # TOS: "Amok Time
_("Ariannus"), # TOS: "Let That Be Your Last Battlefield"
@@
-5708,8
+5706,6
@@
def choose():
if not scanner.inqueue: # Can start with command line options
proutn(_("Would you like a regular, tournament, or saved game? "))
scanner.next()
if not scanner.inqueue: # Can start with command line options
proutn(_("Would you like a regular, tournament, or saved game? "))
scanner.next()
- if len(scanner.token)==0: # Try again
- continue
if scanner.sees("tournament"):
while scanner.next() == "IHEOL":
proutn(_("Type in tournament number-"))
if scanner.sees("tournament"):
while scanner.next() == "IHEOL":
proutn(_("Type in tournament number-"))
@@
-6323,10
+6319,6
@@
class sstscanner:
# Demand input for next scan
self.inqueue = []
self.real = self.token = None
# Demand input for next scan
self.inqueue = []
self.real = self.token = None
- def chew2(self):
- # return "IHEOL" next time
- self.inqueue = ["IHEOL"]
- self.real = self.token = None
def sees(self, s):
# compares s to item and returns true if it matches to the length of s
return s.startswith(self.token)
def sees(self, s):
# compares s to item and returns true if it matches to the length of s
return s.startswith(self.token)
@@
-6530,7
+6522,8
@@
if __name__ == '__main__':
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:
- scanner.chew2()
+ scanner.chew()
+ scanner.push("\n")
freeze(False)
scanner.chew()
proutn(_("Do you want to play again? "))
freeze(False)
scanner.chew()
proutn(_("Do you want to play again? "))
@@
-6545,4
+6538,3
@@
if __name__ == '__main__':
if logfp:
logfp.close()
print ""
if logfp:
logfp.close()
print ""
- pass