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:
d7bb5ec
)
Uncollide a name.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 17 Aug 2023 17:50:28 +0000
(13:50 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 17 Aug 2023 17:50:28 +0000
(13:50 -0400)
sst
patch
|
blob
|
history
diff --git
a/sst
b/sst
index 6d59b2cee6182d9d83178f6eea1f428c8a4c892c..192d067b14a9e4ecc8888a7dda0ee651c9f9ec6b 100755
(executable)
--- a/
sst
+++ b/
sst
@@
-1282,7
+1282,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):
- if not track.next
tok
():
+ if not track.next
step
():
break
w = track.sector()
if not w.valid_sector():
break
w = track.sector()
if not w.valid_sector():
@@
-1306,7
+1306,7
@@
def torpedo(origin, bearing, dispersion, number, nburst):
# 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)
# 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.next
tok
()
+ displacement.next
step
()
bumpto = displacement.sector()
if not bumpto.valid_sector():
return hit
bumpto = displacement.sector()
if not bumpto.valid_sector():
return hit
@@
-1348,7
+1348,7
@@
def torpedo(origin, bearing, dispersion, number, nburst):
return None
proutn(crmena(True, iquad, "sector", w))
displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5, origin=w)
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.next
tok
()
+ displacement.next
step
()
bumpto = displacement.sector()
if game.quad[bumpto.i][bumpto.j] == ' ':
prout(_(" buffeted into black hole."))
bumpto = displacement.sector()
if game.quad[bumpto.i][bumpto.j] == ' ':
prout(_(" buffeted into black hole."))
@@
-2550,7
+2550,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 not game.probe.next
tok
():
+ if not game.probe.next
step
():
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
@@
-3887,7
+3887,7
@@
def imove(icourse=None, noattack=False):
# Move out
game.quad[game.sector.i][game.sector.j] = '.'
for _m in range(icourse.moves):
# Move out
game.quad[game.sector.i][game.sector.j] = '.'
for _m in range(icourse.moves):
- icourse.next
tok
()
+ icourse.next
step
()
w = icourse.sector()
if icourse.origin.quadrant() != icourse.location.quadrant():
newquadrant(noattack)
w = icourse.sector()
if icourse.origin.quadrant() != icourse.location.quadrant():
newquadrant(noattack)
@@
-4118,7
+4118,7
@@
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
tok
(self):
+ def next
step
(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
@@
-4267,7
+4267,7
@@
def warp(wcourse, involuntary):
look = wcourse.moves
while look > 0:
look -= 1
look = wcourse.moves
while look > 0:
look -= 1
- wcourse.next
tok
()
+ wcourse.next
step
()
w = wcourse.sector()
if not w.valid_sector():
break
w = wcourse.sector()
if not w.valid_sector():
break