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

* Draft improves:

Browse source 
* added additional and improved timing options for pick timeouts (x1.0, x1.5, x2.0, see #8033);
 * added pick timing info in tables list (info column);
 * fixed that booster draft starts with wrong pick timeout (#8036);
This commit is contained in:
Oleg Agafonov 2021-07-22 23:14:08 +04:00
parent 214b688fdb
commit 400acae0c1
9 changed files with 71 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/game/draft/DraftImpl.java
View file

@ -1,4 +1,3 @@
package mage.game.draft;
import java.util.*;
@ -24,9 +23,8 @@ public abstract class DraftImpl implements Draft {
protected List<ExpansionSet> sets;
protected List<String> setCodes;
protected int boosterNum = 0;
protected int cardNum = 0;
protected int cardNum = 0; // increases +1 on first picking (so draft get 1 as first card number)
protected TimingOption timing;
protected int[] times = {75, 70, 65, 60, 55, 50, 45, 40, 35, 30, 25, 20, 15, 10, 5};
protected boolean abort = false;
protected boolean started = false;
@ -204,7 +202,6 @@ public abstract class DraftImpl implements Draft {
}
}
boosterNum++;
cardNum = 1;
fireUpdatePlayersEvent();
}
@ -270,7 +267,7 @@ public abstract class DraftImpl implements Draft {
if (cardNum > 15) {
cardNum = 15;
}
int time = times[cardNum - 1] * timing.getFactor();
int time = timing.getPickTimeout(cardNum);
playerQueryEventSource.pickCard(playerId, "Pick card", player.getBooster(), time);
}