Commit 07ece6c
committed
fix(draft): conspiracy cards work in custom cube drafts
- CustomLimited.parse(): merge DeckSection.Conspiracy into the card pool
so cards like Backup Plan appear in packs alongside regular cards.
- GauntletMini.startRound(): call assignConspiracies() on each player
before starting the match (LoadDraftScreen already did this; Gauntlet
mode was the missing path).
- FDeckEditor CatalogPage: pass forceCreateIfAbsent=true to
getPageForSection() in onCardActivated() and buildMenu() so the
Conspiracy tab is created on demand when a conspiracy card is drafted.
- BackupPlanService.initializeExtraHands(): guard each extra-hand draw
with a library-size check to prevent a turn-0 game loss when a player
holds multiple Backup Plans. Use getMaxHandSize() instead of hardcoded 7.1 parent be880ac commit 07ece6c
4 files changed
Lines changed: 25 additions & 4 deletions
File tree
- forge-game/src/main/java/forge/game/extrahands
- forge-gui-mobile/src/forge/deck
- forge-gui/src/main/java/forge/gamemodes/limited
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
32 | 39 | | |
33 | 40 | | |
34 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1806 | 1806 | | |
1807 | 1807 | | |
1808 | 1808 | | |
1809 | | - | |
| 1809 | + | |
1810 | 1810 | | |
1811 | 1811 | | |
1812 | 1812 | | |
| |||
1835 | 1835 | | |
1836 | 1836 | | |
1837 | 1837 | | |
1838 | | - | |
| 1838 | + | |
1839 | 1839 | | |
1840 | 1840 | | |
1841 | 1841 | | |
| |||
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
121 | 122 | | |
122 | 123 | | |
123 | 124 | | |
124 | | - | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
125 | 135 | | |
126 | 136 | | |
127 | 137 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
142 | 146 | | |
143 | 147 | | |
144 | 148 | | |
| |||
0 commit comments