From 4160d75b6a12e12971bfeedf84a047353a2ce908 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Thu, 9 Mar 2023 18:22:02 -0500
Subject: [PATCH] Minor cleanup of Aglet game.
---
html-src/rules/aglet.html | 2 +-
pysollib/games/numerica.py | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/html-src/rules/aglet.html b/html-src/rules/aglet.html
index 6eb33c7f..6544356e 100644
--- a/html-src/rules/aglet.html
+++ b/html-src/rules/aglet.html
@@ -16,4 +16,4 @@ the reserve can be moved to the foundations.
<p>
The foundation piles are built up by rank, regardless of
suit. The game is won if all cards are moved to the
-reserve.
+foundations.
diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py
index c817bac8..9f52ef94 100644
--- a/pysollib/games/numerica.py
+++ b/pysollib/games/numerica.py
@@ -994,10 +994,11 @@ class Aglet(Game):
decks = self.gameinfo.decks
l, s = Layout(self), self.s
- self.setSize(l.XM+(reserves+0.5+rows)*l.XS,
- l.YM+max(2*l.YS+7*l.YOFFSET, l.YS+playcards*l.YOFFSET))
+ self.setSize(l.XM + (reserves + 0.5+rows) * l.XS,
+ l.YM + max(2 * l.YS + 7 * l.YOFFSET,
+ l.YS + playcards * l.YOFFSET))
- x, y = self.width-l.XS, self.height-l.YS
+ x, y = l.XM, self.height-l.YS
s.talon = InitialDealTalonStack(x, y, self)
x, y = l.XM, l.YM
@@ -1007,12 +1008,12 @@ class Aglet(Game):
s.reserves.append(stack)
x += l.XS
- x, y = l.XM + (reserves+0.5+(rows-decks*4)/2.0)*l.XS, l.YM
+ x, y = l.XM + (reserves + 0.5 + (rows-decks * 4) / 2.0) * l.XS, l.YM
for i in range(4):
s.foundations.append(RK_FoundationStack(x, y, self, suit=ANY_SUIT))
x += l.XS
- x, y = l.XM+(reserves+0.5)*l.XS, l.YM+l.YS
+ x, y = l.XM+(reserves + 0.5) * l.XS, l.YM + l.YS
for i in range(rows):
s.rows.append(BasicRowStack(x, y, self, base_rank=NO_RANK))
x += l.XS