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

Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.
This commit is contained in:
Shlomi Fish 2019-07-18 14:43:58 +03:00
parent c9de855dd8
commit 6d4a1191cc

View file

@ -317,6 +317,22 @@ class StackRegions(object):
self.init_info = self.info
@attr.s
class GameStacks(object):
talon = attr.ib(default=None)
waste = attr.ib(default=None)
foundations = attr.ib(factory=list)
rows = attr.ib(factory=list) # for getHightlightPilesStacks()
reserves = attr.ib(factory=list)
internals = attr.ib(factory=list)
def to_tuples(self):
self.foundations = tuple(self.foundations)
self.rows = tuple(self.rows)
self.reserves = tuple(self.reserves)
self.internals = tuple(self.internals)
class Game(object):
# for self.gstats.updated
U_PLAY = 0
@ -358,14 +374,7 @@ class Game(object):
self.stackdesc_list = []
self.demo_logo = None
self.pause_logo = None
self.s = Struct( # stacks
talon=None,
waste=None,
foundations=[],
rows=[],
reserves=[],
internals=[],
)
self.s = GameStacks()
self.sg = StackGroups()
self.regions = StackRegions()
self.init_size = (0, 0)
@ -389,11 +398,8 @@ class Game(object):
self.createSnGroups()
# convert stackgroups to tuples (speed)
self.allstacks = tuple(self.allstacks)
self.s.foundations = tuple(self.s.foundations)
self.s.rows = tuple(self.s.rows)
self.s.reserves = tuple(self.s.reserves)
self.s.internals = tuple(self.s.internals)
self.sg.to_tuples()
self.s.to_tuples()
# init the stack view
for stack in self.allstacks:
stack.prepareStack()