anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Allow to save and restore ms[0-9]+ deals.

Browse source
This commit is contained in:
Shlomi Fish 2016-11-09 21:25:41 +02:00
parent c28a9104c8
commit 53fa3e715f
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pysollib/game.py
View file

@ -42,7 +42,7 @@ from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE
from pysollib.settings import VERSION, VERSION_TUPLE from pysollib.settings import VERSION, VERSION_TUPLE
from pysollib.settings import DEBUG from pysollib.settings import DEBUG
from pysollib.gamedb import GI from pysollib.gamedb import GI
from pysollib.pysolrandom import PysolRandom, LCRandom31 from pysollib.pysolrandom import PysolRandom, LCRandom31, constructRandom, random__long2str, random__str2long
from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
from pysollib.pysoltk import CURSOR_WATCH from pysollib.pysoltk import CURSOR_WATCH
from pysollib.pysoltk import bind, wm_map from pysollib.pysoltk import bind, wm_map
@ -3134,11 +3134,8 @@ in the current implementation.''') % version)
game.version = version game.version = version
game.version_tuple = version_tuple game.version_tuple = version_tuple
# #
initial_seed = pload(long) initial_seed = random__long2str(pload(long))
if initial_seed <= 32000: game.random = constructRandom(initial_seed)
game.random = LCRandom31(initial_seed)
else:
game.random = PysolRandom(initial_seed)
state = pload() state = pload()
game.random.setstate(state) game.random.setstate(state)
#if not hasattr(game.random, "origin"): #if not hasattr(game.random, "origin"):
@ -3206,7 +3203,7 @@ in the current implementation.''') % version)
p.dump(self.GAME_VERSION) p.dump(self.GAME_VERSION)
p.dump(self.id) p.dump(self.id)
# #
p.dump(self.random.initial_seed) p.dump(random__str2long(self.random.getSeedStr()))
p.dump(self.random.getstate()) p.dump(self.random.getstate())
# #
p.dump(len(self.allstacks)) p.dump(len(self.allstacks))

6
pysollib/pysolrandom.py
View file

@ -49,6 +49,9 @@ class BasicRandom:
def __init__(self): def __init__(self):
self.seed_as_string = None self.seed_as_string = None
def getSeedStr(self):
return str(self.initial_seed)
def __str__(self): def __str__(self):
return self.str(self.initial_seed) return self.str(self.initial_seed)
@ -200,6 +203,9 @@ class LCRandom64(MFXRandom):
class LCRandom31(MFXRandom): class LCRandom31(MFXRandom):
MAX_SEED = 0x1ffffffffL # 33 bits MAX_SEED = 0x1ffffffffL # 33 bits
def getSeedStr(self):
return "ms" + str(self.initial_seed)
def str(self, seed): def str(self, seed):
return "%05d" % int(seed) return "%05d" % int(seed)