projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Breadcrumb removal.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index a9900528bda3b4edf03feb28b2a3decdaa8ce7ff..925643bd70fde02a8cdacbd161da3d9cf4901312 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-12,6
+12,8
@@
See the doc/HACKING file in the distribution for designers notes and advice
on how to modify (and how not to modify!) this code.
"""
from __future__ import print_function, division
on how to modify (and how not to modify!) this code.
"""
from __future__ import print_function, division
+# Runs under Python 2 an Python 3. Preserve this property!
+# SPDX-License-Identifier: BSD-2-clause
import os, sys, math, curses, time, pickle, copy, gettext, getpass
import getopt, socket, locale
import os, sys, math, curses, time, pickle, copy, gettext, getpass
import getopt, socket, locale
@@
-36,43
+38,57
@@
docpath = (".", "doc/", "/usr/share/doc/sst/")
def _(st):
return gettext.gettext(st)
def _(st):
return gettext.gettext(st)
-# This is all encapsulated not just for logging but because someday
-# we'll probably want to replace it with something like an LCG that
-# can be forward-ported off Python.
-
-import random
+# Rolling our own LCG because Python changed its incompatibly in 3.2.
+# Thus, we need to have our own to be 2/3 polyglot, which will also
+# be helpful when we forwrard-port.
class randomizer:
class randomizer:
+ # LCG PRNG parameters tested against
+ # Knuth vol. 2. by the authors of ADVENT
+ LCG_A = 1093
+ LCG_C = 221587
+ LCG_M = 1048576
+
+ @staticmethod
+ def random():
+ old_x = game.lcg_x
+ game.lcg_x = (randomizer.LCG_A * game.lcg_x + randomizer.LCG_C) % randomizer.LCG_M
+ return old_x / randomizer.LCG_M;
+
@staticmethod
def withprob(p):
@staticmethod
def withprob(p):
- v = random.random()
- if logfp:
- logfp.write("#withprob(%.2f) -> %s\n" % (p, v < p))
+ v = random
izer
.random()
+
#
if logfp:
+
#
logfp.write("#withprob(%.2f) -> %s\n" % (p, v < p))
return v < p
@staticmethod
def integer(*args):
return v < p
@staticmethod
def integer(*args):
- s = random.randrange(*args)
- if logfp:
- logfp.write("#randrange%s -> %s\n" % (args, s))
- return s
+ v = randomizer.random()
+ if len(args) == 1:
+ v = int(v * args[0])
+ else:
+ v = args[0] + int(v * (args[1] - args[0]))
+ #if logfp:
+ # logfp.write("#integer%s -> %s\n" % (args, v))
+ return int(v)
@staticmethod
def real(*args):
@staticmethod
def real(*args):
- v = random.random()
+ v = random
izer
.random()
if len(args) == 1:
v *= args[0] # from [0, args[0])
elif len(args) == 2:
v = args[0] + v*(args[1]-args[0]) # from [args[0], args[1])
if len(args) == 1:
v *= args[0] # from [0, args[0])
elif len(args) == 2:
v = args[0] + v*(args[1]-args[0]) # from [args[0], args[1])
- if logfp:
- logfp.write("#real%s -> %f\n" % (args, v))
+
#
if logfp:
+
#
logfp.write("#real%s -> %f\n" % (args, v))
return v
@staticmethod
def seed(n):
return v
@staticmethod
def seed(n):
- if logfp:
- logfp.write("#seed(%d)\n" % n)
- random.seed(n)
+
#
if logfp:
+
#
logfp.write("#seed(%d)\n" % n)
+ game.lcg_x = n % randomizer.LCG_M
GALSIZE = 8 # Galaxy size in quadrants
NINHAB = (GALSIZE * GALSIZE // 2) # Number of inhabited worlds
GALSIZE = 8 # Galaxy size in quadrants
NINHAB = (GALSIZE * GALSIZE // 2) # Number of inhabited worlds
@@
-118,8
+134,8
@@
class JumpOut(Exception):
class Coord:
def __init__(self, x=None, y=None):
class Coord:
def __init__(self, x=None, y=None):
- self.i = x
- self.j = y
+ self.i = x
# Row
+ self.j = y
# Column
def valid_quadrant(self):
return self.i >= 0 and self.i < GALSIZE and self.j >= 0 and self.j < GALSIZE
def valid_sector(self):
def valid_quadrant(self):
return self.i >= 0 and self.i < GALSIZE and self.j >= 0 and self.j < GALSIZE
def valid_sector(self):
@@
-162,13
+178,13
@@
class Coord:
s = Coord()
if self.i == 0:
s.i = 0
s = Coord()
if self.i == 0:
s.i = 0
- elif s.i < 0:
- s.i =-1
+ elif s
elf
.i < 0:
+ s.i =
-1
else:
s.i = 1
if self.j == 0:
s.j = 0
else:
s.i = 1
if self.j == 0:
s.j = 0
- elif s.j < 0:
+ elif s
elf
.j < 0:
s.j = -1
else:
s.j = 1
s.j = -1
else:
s.j = 1
@@
-469,6
+485,7
@@
class Gamestate:
self.iscloaked = False # Cloaking device on?
self.ncviol = 0 # Algreon treaty violations
self.isviolreported = False # We have been warned
self.iscloaked = False # Cloaking device on?
self.ncviol = 0 # Algreon treaty violations
self.isviolreported = False # We have been warned
+ self.lcg_x = 0 # LCG generator value
def remkl(self):
return sum([q.klingons for (_i, _j, q) in list(self.state.traverse())])
def recompute(self):
def remkl(self):
return sum([q.klingons for (_i, _j, q) in list(self.state.traverse())])
def recompute(self):
@@
-1722,7
+1739,11
@@
def torps():
proutn(_("Number of torpedoes to fire- "))
continue # Go back around to get a number
else: # key == "IHREAL"
proutn(_("Number of torpedoes to fire- "))
continue # Go back around to get a number
else: # key == "IHREAL"
- n = scanner.int()
+ try:
+ n = scanner.int()
+ except TypeError:
+ huh()
+ return
if n <= 0: # abort command
scanner.chew()
return
if n <= 0: # abort command
scanner.chew()
return
@@
-2067,7
+2088,6
@@
def phasers():
scanner.chew()
key = "IHEOL"
hits[k] = 0 # prevent overflow -- thanks to Alexei Voitenko
scanner.chew()
key = "IHEOL"
hits[k] = 0 # prevent overflow -- thanks to Alexei Voitenko
- k += 1
continue
if key == "IHEOL":
scanner.chew()
continue
if key == "IHEOL":
scanner.chew()
@@
-2097,7
+2117,7
@@
def phasers():
# abort out
scanner.chew()
return
# abort out
scanner.chew()
return
- hits
[k] = scanner.real
+ hits
.append(scanner.real)
rpow += scanner.real
# If total requested is too much, inform and start over
if rpow > avail:
rpow += scanner.real
# If total requested is too much, inform and start over
if rpow > avail:
@@
-2105,7
+2125,6
@@
def phasers():
scanner.chew()
return
key = scanner.nexttok() # scan for next value
scanner.chew()
return
key = scanner.nexttok() # scan for next value
- k += 1
if rpow == 0.0:
# zero energy -- abort
scanner.chew()
if rpow == 0.0:
# zero energy -- abort
scanner.chew()
@@
-3861,7
+3880,7
@@
def imove(icourse=None, noattack=False):
newquadrant(noattack)
break
elif check_collision(w):
newquadrant(noattack)
break
elif check_collision(w):
- pr
int("Collision detected"
)
+ pr
out(_("Collision detected")
)
break
else:
game.sector = w
break
else:
game.sector = w