mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-22 03:04:09 -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:
parent
c9de855dd8
commit
6d4a1191cc
1 changed files with 18 additions and 12 deletions
|
@ -317,6 +317,22 @@ class StackRegions(object):
|
||||||
self.init_info = self.info
|
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):
|
class Game(object):
|
||||||
# for self.gstats.updated
|
# for self.gstats.updated
|
||||||
U_PLAY = 0
|
U_PLAY = 0
|
||||||
|
@ -358,14 +374,7 @@ class Game(object):
|
||||||
self.stackdesc_list = []
|
self.stackdesc_list = []
|
||||||
self.demo_logo = None
|
self.demo_logo = None
|
||||||
self.pause_logo = None
|
self.pause_logo = None
|
||||||
self.s = Struct( # stacks
|
self.s = GameStacks()
|
||||||
talon=None,
|
|
||||||
waste=None,
|
|
||||||
foundations=[],
|
|
||||||
rows=[],
|
|
||||||
reserves=[],
|
|
||||||
internals=[],
|
|
||||||
)
|
|
||||||
self.sg = StackGroups()
|
self.sg = StackGroups()
|
||||||
self.regions = StackRegions()
|
self.regions = StackRegions()
|
||||||
self.init_size = (0, 0)
|
self.init_size = (0, 0)
|
||||||
|
@ -389,11 +398,8 @@ class Game(object):
|
||||||
self.createSnGroups()
|
self.createSnGroups()
|
||||||
# convert stackgroups to tuples (speed)
|
# convert stackgroups to tuples (speed)
|
||||||
self.allstacks = tuple(self.allstacks)
|
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.sg.to_tuples()
|
||||||
|
self.s.to_tuples()
|
||||||
# init the stack view
|
# init the stack view
|
||||||
for stack in self.allstacks:
|
for stack in self.allstacks:
|
||||||
stack.prepareStack()
|
stack.prepareStack()
|
||||||
|
|
Loading…
Add table
Reference in a new issue