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

Better prompt messages for confirming optional triggers

Browse Source
This commit is contained in:
pfps
2017-01-20 20:19:31 +00:00
parent cc9e2caf2d
commit ab867a40ee
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ public abstract class PlayerController {
public abstract boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message);
public abstract boolean confirmBidAction(SpellAbility sa, PlayerActionConfirmMode bidlife, String string, int bid, Player winner);
public abstract boolean confirmStaticApplication(Card hostCard, GameEntity affected, String logic, String message);
public abstract boolean confirmTrigger(SpellAbility sa, Trigger regtrig, Map<String, String> triggerParams, boolean isMandatory);
public abstract boolean confirmTrigger(WrappedAbility sa, Map<String, String> triggerParams, boolean isMandatory);
public abstract Player chooseStartingPlayer(boolean isFirstGame);
public abstract CardCollection orderBlockers(Card attacker, CardCollection blockers);

2
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -440,7 +440,7 @@ public class WrappedAbility extends Ability {
TriggerHandler th = game.getTriggerHandler();
if (decider != null && !decider.getController().confirmTrigger(sa, regtrig, triggerParams, this.isMandatory())) {
if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) {
return;
}