projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert hittem fix, kill crediting, and the m m .1 scanner tweak.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index cef7b8f13b4a9e2c2e3f63dd71f2806ee125c2fa..e64abfa65386a6170d0318fccecedd1e2eff7af6 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-261,12
+261,12
@@
DDSP = 15
DCLOAK = 16
NDEVICES = 17 # Number of devices
DCLOAK = 16
NDEVICES = 17 # Number of devices
-SKILL_NONE
= 0
-SKILL_NOVICE
= 1
-SKILL_FAIR
= 2
-SKILL_GOOD
= 3
-SKILL_EXPERT
= 4
-SKILL_EMERITUS
= 5
+SKILL_NONE = 0
+SKILL_NOVICE = 1
+SKILL_FAIR = 2
+SKILL_GOOD = 3
+SKILL_EXPERT = 4
+SKILL_EMERITUS = 5
def damaged(dev):
return (game.damage[dev] != 0.0)
def damaged(dev):
return (game.damage[dev] != 0.0)
@@
-274,8
+274,8
@@
def communicating():
return not damaged(DRADIO) or game.condition=="docked"
# Define future events
return not damaged(DRADIO) or game.condition=="docked"
# Define future events
-FSPY
= 0 # Spy event happens always (no future[] entry)
- # can cause SC to tractor beam Enterprise
+FSPY = 0 # Spy event happens always (no future[] entry)
+
# can cause SC to tractor beam Enterprise
FSNOVA = 1 # Supernova
FTBEAM = 2 # Commander tractor beams Enterprise
FSNAP = 3 # Snapshot for time warp
FSNOVA = 1 # Supernova
FTBEAM = 2 # Commander tractor beams Enterprise
FSNAP = 3 # Snapshot for time warp
@@
-284,10
+284,10
@@
FCDBAS = 5 # Commander destroys base
FSCMOVE = 6 # Supercommander moves (might attack base)
FSCDBAS = 7 # Supercommander destroys base
FDSPROB = 8 # Move deep space probe
FSCMOVE = 6 # Supercommander moves (might attack base)
FSCDBAS = 7 # Supercommander destroys base
FDSPROB = 8 # Move deep space probe
-FDISTR
= 9 # Emit distress call from an inhabited world
-FENSLV
= 10
# Inhabited word is enslaved */
-FREPRO
= 11
# Klingons build a ship in an enslaved system
-NEVENTS
= 12
+FDISTR = 9 # Emit distress call from an inhabited world
+FENSLV
= 10
# Inhabited word is enslaved */
+FREPRO
= 11
# Klingons build a ship in an enslaved system
+NEVENTS = 12
# Abstract out the event handling -- underlying data structures will change
# when we implement stateful events
# Abstract out the event handling -- underlying data structures will change
# when we implement stateful events
@@
-421,6
+421,9
@@
class Gamestate:
# after killing the last klingon when score is shown -- perhaps also
# if the only remaining klingon is SCOM.
self.state.remtime = self.state.remres/(self.state.remkl + 4*len(self.state.kcmdr))
# after killing the last klingon when score is shown -- perhaps also
# if the only remaining klingon is SCOM.
self.state.remtime = self.state.remres/(self.state.remkl + 4*len(self.state.kcmdr))
+ def unwon(self):
+ "Are there Klingons remaining?"
+ return self.state.remkl + len(self.state.kcmdr) + self.state.nscrem
FWON = 0
FDEPLETE = 1
FWON = 0
FDEPLETE = 1
@@
-1507,7
+1510,7
@@
def attack(torps_ok):
dispersion = (randreal()+randreal())*0.5 - 0.5
dispersion += 0.002*enemy.power*dispersion
hit = torpedo(enemy.location, pcourse, dispersion, number=1, nburst=1)
dispersion = (randreal()+randreal())*0.5 - 0.5
dispersion += 0.002*enemy.power*dispersion
hit = torpedo(enemy.location, pcourse, dispersion, number=1, nburst=1)
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
) == 0:
+ if
game.unwon(
) == 0:
finish(FWON) # Klingons did themselves in!
if game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova or game.alldone:
return # Supernova or finished
finish(FWON) # Klingons did themselves in!
if game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova or game.alldone:
return # Supernova or finished
@@
-1622,7
+1625,7
@@
def deadkl(w, etype, mv):
unschedule(FSCDBAS)
# For each kind of enemy, finish message to player
prout(_(" destroyed."))
unschedule(FSCDBAS)
# For each kind of enemy, finish message to player
prout(_(" destroyed."))
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
) == 0:
+ if
game.unwon(
) == 0:
return
game.recompute()
# Remove enemy ship from arrays describing local conditions
return
game.recompute()
# Remove enemy ship from arrays describing local conditions
@@
-1745,7
+1748,7
@@
def torps():
torpedo(game.sector, tcourse[i], dispersion, number=i, nburst=n)
if game.alldone or game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova:
return
torpedo(game.sector, tcourse[i], dispersion, number=i, nburst=n)
if game.alldone or game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova:
return
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)<=0:
+ if
game.unwon(
)<=0:
finish(FWON)
def overheat(rpow):
finish(FWON)
def overheat(rpow):
@@
-1825,7
+1828,7
@@
def hittem(hits):
skip(1)
if kpow == 0:
deadkl(w, ienm, w)
skip(1)
if kpow == 0:
deadkl(w, ienm, w)
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)==0:
+ if
game.unwon(
)==0:
finish(FWON)
if game.alldone:
return
finish(FWON)
if game.alldone:
return
@@
-2127,23
+2130,25
@@
def capture():
# intelligent design
# x = 300 + 25*skill;
x = game.energy / (weakest.power * len(klingons))
# intelligent design
# x = 300 + 25*skill;
x = game.energy / (weakest.power * len(klingons))
- x *= 2.5; # would originally have been equivalent of 1.4,
+ #prout(_("Stats: energy = %s, kpower = %s, klingons = %s")
+ # % (game.energy, weakest.power, len(klingons)))
+ x *= 2.5 # would originally have been equivalent of 1.4,
# but we want command to work more often, more humanely */
# but we want command to work more often, more humanely */
- #prout(_("Prob = %
d (%.4f)\n", i,
x))
+ #prout(_("Prob = %
.4f" %
x))
# x = 100; // For testing, of course!
# x = 100; // For testing, of course!
- if x
>
randreal(100):
+ if x
<
randreal(100):
# guess what, he surrendered!!! */
prout(_("Klingon captain at %s surrenders.") % weakest.location)
i = randreal(200)
if i > 0:
# guess what, he surrendered!!! */
prout(_("Klingon captain at %s surrenders.") % weakest.location)
i = randreal(200)
if i > 0:
- prout(_("%d Klingons commit suicide rather than be taken captive.") %
200 - i
)
- if i > brigfree:
- prout(_("%d Klingons die because there is no room for them in the brig.") %
i-brigfree
)
- i = brigfree
- brigfree -= i
+ prout(_("%d Klingons commit suicide rather than be taken captive.") %
(200 - i)
)
+ if i >
game.
brigfree:
+ prout(_("%d Klingons die because there is no room for them in the brig.") %
(i-brigfree)
)
+ i =
game.
brigfree
+
game.
brigfree -= i
prout(_("%d captives taken") % i)
deadkl(weakest.location, weakest.type, game.sector)
prout(_("%d captives taken") % i)
deadkl(weakest.location, weakest.type, game.sector)
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)<=0:
+ if
game.unwon(
)<=0:
finish(FWON)
return
finish(FWON)
return
@@
-2867,7
+2872,7
@@
def supernova(w):
if game.quadrant == nq or communicating():
game.state.galaxy[nq.i][nq.j].supernova = True
# If supernova destroys last Klingons give special message
if game.quadrant == nq or communicating():
game.state.galaxy[nq.i][nq.j].supernova = True
# If supernova destroys last Klingons give special message
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)==0 and not nq == game.quadrant:
+ if
game.unwon(
)==0 and not nq == game.quadrant:
skip(2)
if w is None:
prout(_("Lucky you!"))
skip(2)
if w is None:
prout(_("Lucky you!"))
@@
-2941,7
+2946,7
@@
def killrate():
return 0
else:
starting = (game.inkling + game.incom + game.inscom)
return 0
else:
starting = (game.inkling + game.incom + game.inscom)
- remaining =
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)
+ remaining =
game.unwon(
)
return (starting - remaining)/elapsed
def badpoints():
return (starting - remaining)/elapsed
def badpoints():
@@
-3035,7
+3040,7
@@
def finish(ifin):
prout(_("conquered. Your starship is now Klingon property,"))
prout(_("and you are put on trial as a war criminal. On the"))
proutn(_("basis of your record, you are "))
prout(_("conquered. Your starship is now Klingon property,"))
prout(_("and you are put on trial as a war criminal. On the"))
proutn(_("basis of your record, you are "))
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)*3.0 > (game.inkling + game.incom + game.inscom):
+ if
game.unwon(
)*3.0 > (game.inkling + game.incom + game.inscom):
prout(_("acquitted."))
skip(1)
prout(_("LIVE LONG AND PROSPER."))
prout(_("acquitted."))
skip(1)
prout(_("LIVE LONG AND PROSPER."))
@@
-3142,7
+3147,7
@@
def finish(ifin):
elif game.ship == 'E':
game.ship = 'F'
game.alive = False
elif game.ship == 'E':
game.ship = 'F'
game.alive = False
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
) != 0:
+ if
game.unwon(
) != 0:
goodies = game.state.remres/game.inresor
baddies = (game.state.remkl + 2.0*len(game.state.kcmdr))/(game.inkling+2.0*game.incom)
if goodies/baddies >= randreal(1.0, 1.5):
goodies = game.state.remres/game.inresor
baddies = (game.state.remkl + 2.0*len(game.state.kcmdr))/(game.inkling+2.0*game.incom)
if goodies/baddies >= randreal(1.0, 1.5):
@@
-3168,7
+3173,7
@@
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
- if (timused == 0 or
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
) != 0) and timused < 5.0:
+ if (timused == 0 or
game.unwon(
) != 0) and timused < 5.0:
timused = 5.0
game.perdate = killrate()
ithperd = 500*game.perdate + 0.5
timused = 5.0
game.perdate = killrate()
ithperd = 500*game.perdate + 0.5
@@
-3538,7
+3543,7
@@
def clrscr():
linecount = 0
def textcolor(color=DEFAULT):
linecount = 0
def textcolor(color=DEFAULT):
- if
game.options & OPTION_COLOR
:
+ if
(game.options & OPTION_COLOR) and (game.options & OPTION_CURSES)
:
if color == DEFAULT:
curwnd.attrset(0)
elif color == BLACK:
if color == DEFAULT:
curwnd.attrset(0)
elif color == BLACK:
@@
-3575,7
+3580,7
@@
def textcolor(color=DEFAULT):
curwnd.attron(curses.color_pair(curses.COLOR_WHITE) | curses.A_BOLD)
def highvideo():
curwnd.attron(curses.color_pair(curses.COLOR_WHITE) | curses.A_BOLD)
def highvideo():
- if
game.options & OPTION_COLOR
:
+ if
(game.options & OPTION_COLOR) and (game.options & OPTION_CURSES)
:
curwnd.attron(curses.A_REVERSE)
#
curwnd.attron(curses.A_REVERSE)
#
@@
-3612,7
+3617,7
@@
def put_srscan_sym(w, sym):
def boom(w):
"Enemy fall down, go boom."
if game.options & OPTION_CURSES:
def boom(w):
"Enemy fall down, go boom."
if game.options & OPTION_CURSES:
- drawmaps(
2
)
+ drawmaps(
0
)
setwnd(srscan_window)
srscan_window.attron(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.i][w.j])
setwnd(srscan_window)
srscan_window.attron(curses.A_REVERSE)
put_srscan_sym(w, game.quad[w.i][w.j])
@@
-3882,7
+3887,7
@@
def dock(verbose):
prout(_("%d captured Klingons transferred to base") % (game.brigcapacity-game.brigfree))
game.kcaptured += game.brigcapacity-game.brigfree
game.brigfree = game.brigcapacity
prout(_("%d captured Klingons transferred to base") % (game.brigcapacity-game.brigfree))
game.kcaptured += game.brigcapacity-game.brigfree
game.brigfree = game.brigcapacity
- if
not damaged(DRADIO
) and \
+ if
communicating(
) and \
((is_scheduled(FCDBAS) or game.isatb == 1) and not game.iseenit):
# get attack report from base
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""))
((is_scheduled(FCDBAS) or game.isatb == 1) and not game.iseenit):
# get attack report from base
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""))
@@
-4342,7
+4347,7
@@
def atover(igrab):
# Repeat if another snova
if not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova:
break
# Repeat if another snova
if not game.state.galaxy[game.quadrant.i][game.quadrant.j].supernova:
break
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)==0:
+ if
game.unwon(
)==0:
finish(FWON) # Snova killed remaining enemy.
def timwrp():
finish(FWON) # Snova killed remaining enemy.
def timwrp():
@@
-5024,7
+5029,7
@@
def deathray():
while len(game.enemies) > 0:
deadkl(game.enemies[1].location, game.quad[game.enemies[1].location.i][game.enemies[1].location.j],game.enemies[1].location)
prout(_("Ensign Chekov- \"Congratulations, Captain!\""))
while len(game.enemies) > 0:
deadkl(game.enemies[1].location, game.quad[game.enemies[1].location.i][game.enemies[1].location.j],game.enemies[1].location)
prout(_("Ensign Chekov- \"Congratulations, Captain!\""))
- if
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
) == 0:
+ if
game.unwon(
) == 0:
finish(FWON)
if (game.options & OPTION_PLAIN) == 0:
prout(_("Spock- \"Captain, I believe the `Experimental Death Ray'"))
finish(FWON)
if (game.options & OPTION_PLAIN) == 0:
prout(_("Spock- \"Captain, I believe the `Experimental Death Ray'"))
@@
-5116,7
+5121,7
@@
def report():
if game.tourn:
prout(_("This is tournament game %d.") % game.tourn)
prout(_("Your secret password is \"%s\"") % game.passwd)
if game.tourn:
prout(_("This is tournament game %d.") % game.tourn)
prout(_("Your secret password is \"%s\"") % game.passwd)
- proutn(_("%d of %d Klingons have been killed") % (((game.inkling + game.incom + game.inscom) -
(game.state.remkl + len(game.state.kcmdr) + game.state.nscrem
)),
+ proutn(_("%d of %d Klingons have been killed") % (((game.inkling + game.incom + game.inscom) -
game.unwon(
)),
(game.inkling + game.incom + game.inscom)))
if game.incom - len(game.state.kcmdr):
prout(_(", including %d Commander%s.") % (game.incom - len(game.state.kcmdr), (_("s"), "")[(game.incom - len(game.state.kcmdr))==1]))
(game.inkling + game.incom + game.inscom)))
if game.incom - len(game.state.kcmdr):
prout(_(", including %d Commander%s.") % (game.incom - len(game.state.kcmdr), (_("s"), "")[(game.incom - len(game.state.kcmdr))==1]))
@@
-5248,7
+5253,7
@@
def chart():
scanner.chew()
if (game.options & OPTION_AUTOSCAN):
lrscan(silent=True)
scanner.chew()
if (game.options & OPTION_AUTOSCAN):
lrscan(silent=True)
- if
not damaged(DRADIO
):
+ if
communicating(
):
rechart()
if game.lastchart < game.state.date and game.condition == "docked":
prout(_("Spock- \"I revised the Star Chart from the starbase's records.\""))
rechart()
if game.lastchart < game.state.date and game.condition == "docked":
prout(_("Spock- \"I revised the Star Chart from the starbase's records.\""))
@@
-5348,8
+5353,7
@@
def status(req=0):
% (int((100.0*game.shield)/game.inshld + 0.5), game.shield)
prstat(_("Shields"), s+data)
if not req or req == 9:
% (int((100.0*game.shield)/game.inshld + 0.5), game.shield)
prstat(_("Shields"), s+data)
if not req or req == 9:
- prstat(_("Klingons Left"), "%d" \
- % (game.state.remkl+len(game.state.kcmdr)+game.state.nscrem))
+ prstat(_("Klingons Left"), "%d" % game.unwon())
if not req or req == 10:
if game.options & OPTION_WORLDS:
plnet = game.state.galaxy[game.quadrant.i][game.quadrant.j].planet
if not req or req == 10:
if game.options & OPTION_WORLDS:
plnet = game.state.galaxy[game.quadrant.i][game.quadrant.j].planet
@@
-5385,7
+5389,7
@@
def srscan():
prout(_(" [Using Base's sensors]"))
else:
prout(_(" Short-range scan"))
prout(_(" [Using Base's sensors]"))
else:
prout(_(" Short-range scan"))
- if goodScan and
not damaged(DRADIO
):
+ if goodScan and
communicating(
):
game.state.chart[game.quadrant.i][game.quadrant.j].klingons = game.state.galaxy[game.quadrant.i][game.quadrant.j].klingons
game.state.chart[game.quadrant.i][game.quadrant.j].starbase = game.state.galaxy[game.quadrant.i][game.quadrant.j].starbase
game.state.chart[game.quadrant.i][game.quadrant.j].stars = game.state.galaxy[game.quadrant.i][game.quadrant.j].stars
game.state.chart[game.quadrant.i][game.quadrant.j].klingons = game.state.galaxy[game.quadrant.i][game.quadrant.j].klingons
game.state.chart[game.quadrant.i][game.quadrant.j].starbase = game.state.galaxy[game.quadrant.i][game.quadrant.j].starbase
game.state.chart[game.quadrant.i][game.quadrant.j].stars = game.state.galaxy[game.quadrant.i][game.quadrant.j].stars
@@
-6279,6
+6283,8
@@
def makemoves():
huh()
else:
break
huh()
else:
break
+ if game.options & OPTION_CURSES:
+ prout("COMMAND> %s" % cmd)
if cmd == "SRSCAN": # srscan
srscan()
elif cmd == "STATUS": # status
if cmd == "SRSCAN": # srscan
srscan()
elif cmd == "STATUS": # status