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 (from parent 1:
aac79ea
)
Prevent torpedo wraparound.
author
Eric S. Raymond
<esr@thyrsus.com>
Mon, 16 Oct 2006 12:39:48 +0000
(12:39 +0000)
committer
Eric S. Raymond
<esr@thyrsus.com>
Mon, 16 Oct 2006 12:39:48 +0000
(12:39 +0000)
src/sst.py
patch
|
blob
|
history
diff --git
a/src/sst.py
b/src/sst.py
index d6359835f6a56874a5419a875d0389341807ed80..87a057dce4a13dc39506acfcad29cc903ac7dc69 100644
(file)
--- a/
src/sst.py
+++ b/
src/sst.py
@@
-1276,7
+1276,7
@@
def torpedo(origin, bearing, dispersion, number, nburst):
# Loop to move a single torpedo
setwnd(message_window)
for step in range(1, QUADSIZE*2):
# Loop to move a single torpedo
setwnd(message_window)
for step in range(1, QUADSIZE*2):
- track.next()
+ if not track.next(): break
w = track.sector()
if not w.valid_sector():
break
w = track.sector()
if not w.valid_sector():
break
@@
-2449,7
+2449,7
@@
def events():
supercommander()
elif evcode == FDSPROB: # Move deep space probe
schedule(FDSPROB, 0.01)
supercommander()
elif evcode == FDSPROB: # Move deep space probe
schedule(FDSPROB, 0.01)
- if
game.probe.next(grain=QUADSIZE
):
+ if
not game.probe.next(
):
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
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
@@
-3927,17
+3927,13
@@
class course:
self.step = 0
def arrived(self):
return self.location.roundtogrid() == self.final
self.step = 0
def arrived(self):
return self.location.roundtogrid() == self.final
- def next(self
, grain=1
):
+ def next(self):
"Next step on course."
self.step += 1
self.nextlocation = self.location + self.increment
"Next step on course."
self.step += 1
self.nextlocation = self.location + self.increment
- oldloc = (self.location/grain).roundtogrid()
- newloc = (self.nextlocation/grain).roundtogrid()
+ samequad = (self.location.quadrant() == self.nextlocation.quadrant())
self.location = self.nextlocation
self.location = self.nextlocation
- if newloc != oldloc:
- return True
- else:
- return False
+ return samequad
def quadrant(self):
return self.location.quadrant()
def sector(self):
def quadrant(self):
return self.location.quadrant()
def sector(self):