external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make end turn button meet player's expectations by skipping the attack phase and not requiring you to respond to triggers

Browse Source
This commit is contained in:
drdev
2014-08-10 04:19:54 +00:00
parent 3f6c4a2b75
commit 7d77e2007c
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -1131,11 +1131,6 @@ public class AiController {
sb.append("Computer just assigned ").append(element.getName()).append(" as an attacker."); sb.append("Computer just assigned ").append(element.getName()).append(" as an attacker.");
Log.debug(sb.toString()); Log.debug(sb.toString());
} }
// ai is about to attack, cancel all phase skipping
for (Player p : game.getPlayers()) {
p.getController().autoPassCancel();
}
return combat; return combat;
} }

4
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -92,8 +92,8 @@ public abstract class PlayerController {
autoPassUntilPhase = null; autoPassUntilPhase = null;
} }
public boolean mayAutoPass(PhaseType phase) { public boolean mayAutoPass() {
return phase.isBefore(autoPassUntilPhase); return autoPassUntilPhase != null && game.getPhaseHandler().getPhase().isBefore(autoPassUntilPhase);
} }
public boolean isAI() { public boolean isAI() {

5
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -344,11 +344,6 @@ public class TriggerHandler implements IGameStateObject {
private void runSingleTrigger(final Trigger regtrig, final Map<String, Object> runParams) { private void runSingleTrigger(final Trigger regtrig, final Map<String, Object> runParams) {
final Map<String, String> triggerParams = regtrig.getMapParams(); final Map<String, String> triggerParams = regtrig.getMapParams();
// Any trigger should cause the phase not to skip
for (Player p : game.getPlayers()) {
p.getController().autoPassCancel();
}
regtrig.setRunParams(runParams); regtrig.setRunParams(runParams);
// All tests passed, execute ability. // All tests passed, execute ability.

16
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -617,6 +617,10 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public void declareAttackers(Player attacker, Combat combat) { public void declareAttackers(Player attacker, Combat combat) {
if (mayAutoPass()) {
return; //don't prompt to declare attackers if user chose to end the turn
}
// This input should not modify combat object itself, but should return user choice // This input should not modify combat object itself, but should return user choice
InputAttack inpAttack = new InputAttack(attacker, combat); InputAttack inpAttack = new InputAttack(attacker, combat);
inpAttack.showAndWait(); inpAttack.showAndWait();
@@ -631,14 +635,12 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public SpellAbility chooseSpellAbilityToPlay() { public SpellAbility chooseSpellAbilityToPlay() {
PhaseType phase = game.getPhaseHandler().getPhase(); if (mayAutoPass()) {
return null; //avoid prompting for input if current phase is set to be auto-passed
boolean maySkipPriority = mayAutoPass(phase) || isUiSetToSkipPhase(game.getPhaseHandler().getPlayerTurn(), phase);
if (game.getStack().isEmpty() && maySkipPriority) {
return null;
} }
else {
autoPassCancel(); // probably cancel, since something has happened if (game.getStack().isEmpty() && isUiSetToSkipPhase(game.getPhaseHandler().getPlayerTurn(), game.getPhaseHandler().getPhase())) {
return null; //avoid prompt for input if stack is empty and player is set to skip the current phase
} }
InputPassPriority defaultInput = new InputPassPriority(player); InputPassPriority defaultInput = new InputPassPriority(player);