Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests 1 Releases Packages Activity Actions

Drafts: refactor to use same pack/pick number logic (#8039);

Browse source
This commit is contained in:
Oleg Agafonov 2021-07-23 16:18:56 +04:00
parent 400acae0c1
commit 06ae494c5b
10 changed files with 41 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/main/java/mage/game/draft/RichManCubeBoosterDraft.java
View file

@ -23,14 +23,17 @@ public class RichManCubeBoosterDraft extends DraftImpl {
@Override
public void start() {
cardNum = 0;
while (!isAbort() && cardNum < 36) {
cardNum = 1;
boosterNum = 1;
while (!isAbort() && cardNum <= 36) {
openBooster();
cardNum = 0;
cardNum = 1;
fireUpdatePlayersEvent();
while (!isAbort() && pickCards()) {
passLeft();
fireUpdatePlayersEvent();
}
boosterNum++;
}
resetBufferedCards();
this.fireEndDraftEvent();
@ -74,7 +77,6 @@ public class RichManCubeBoosterDraft extends DraftImpl {
@Override
protected boolean pickCards() {
cardNum++;
for (DraftPlayer player : players.values()) {
if (cardNum > 36) {
return false;
@ -82,6 +84,7 @@ public class RichManCubeBoosterDraft extends DraftImpl {
player.setPicking();
player.getPlayer().pickCard(player.getBooster(), player.getDeck(), this);
}
cardNum++;
synchronized (this) {
while (!donePicking()) {
try {
@ -96,12 +99,7 @@ public class RichManCubeBoosterDraft extends DraftImpl {
@Override
public void firePickCardEvent(UUID playerId) {
DraftPlayer player = players.get(playerId);
if (cardNum > 36) {
cardNum = 36;
}
if (cardNum <= 0) {
cardNum = 1;
}
int cardNum = Math.min(36, this.cardNum);
// richman uses custom times
int time = (int) Math.ceil(customProfiTimes[cardNum - 1] * timing.getCustomTimeoutFactor());