UI: improved skips and stops for declare blocker step:

* added options to STOP skip on any or zero blockers available;
 * added auto-stop before declare blockers step (e.g. user can cast instants and crew abilities);
This commit is contained in:
Oleg Agafonov 2019-03-29 18:10:00 +04:00
parent 6606b586a4
commit ff640a942e
4 changed files with 126 additions and 44 deletions

View file

@ -10,8 +10,9 @@ public class UserSkipPrioritySteps implements Serializable {
final SkipPrioritySteps yourTurn;
final SkipPrioritySteps opponentTurn;
boolean stopOnDeclareAttackersDuringSkipAction = true;
boolean stopOnDeclareBlockerIfNoneAvailable = true;
boolean stopOnDeclareAttackers = true;
boolean stopOnDeclareBlockersWithZeroPermanents = false;
boolean stopOnDeclareBlockersWithAnyPermanents = true;
boolean stopOnAllMainPhases = true;
boolean stopOnAllEndPhases = true;
boolean stopOnStackNewObjects = true;
@ -29,20 +30,28 @@ public class UserSkipPrioritySteps implements Serializable {
return opponentTurn;
}
public boolean isStopOnDeclareBlockerIfNoneAvailable() {
return stopOnDeclareBlockerIfNoneAvailable;
public boolean isStopOnDeclareBlockersWithZeroPermanents() {
return stopOnDeclareBlockersWithZeroPermanents;
}
public void setStopOnDeclareBlockerIfNoneAvailable(boolean stopOnDeclareBlockerIfNoneAvailable) {
this.stopOnDeclareBlockerIfNoneAvailable = stopOnDeclareBlockerIfNoneAvailable;
public void setStopOnDeclareBlockersWithZeroPermanents(boolean stopOnDeclareBlockersWithZeroPermanents) {
this.stopOnDeclareBlockersWithZeroPermanents = stopOnDeclareBlockersWithZeroPermanents;
}
public boolean isStopOnDeclareAttackersDuringSkipAction() {
return stopOnDeclareAttackersDuringSkipAction;
public boolean isStopOnDeclareAttackers() {
return stopOnDeclareAttackers;
}
public void setStopOnDeclareAttackersDuringSkipActions(boolean stopOnDeclareAttackersDuringSkipActions) {
this.stopOnDeclareAttackersDuringSkipAction = stopOnDeclareAttackersDuringSkipActions;
this.stopOnDeclareAttackers = stopOnDeclareAttackersDuringSkipActions;
}
public boolean isStopOnDeclareBlockersWithAnyPermanents() {
return stopOnDeclareBlockersWithAnyPermanents;
}
public void setStopOnDeclareBlockersWithAnyPermanents(boolean stopOnDeclareBlockersWithAnyPermanents) {
this.stopOnDeclareBlockersWithAnyPermanents = stopOnDeclareBlockersWithAnyPermanents;
}
public boolean isStopOnAllMainPhases() {