Constructor for GuiDisplay4.
@@ -193,6 +197,9 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo *addMenu.
*/ private void addMenu() { + // Trigger Context Menu creation + triggerMenu = new TriggerReactionMenu(); + // Game Menu Creation Object[] obj = { HUMAN_DECKLIST_ACTION, @@ -716,15 +723,16 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo AllZone.getStack().addObserver(new Observer() { public void update(final Observable a, final Object b) { stackPanel.removeAll(); - MagicStack stack = AllZone.getStack(); + final MagicStack stack = AllZone.getStack(); int count = 1; JLabel label; for (int i = stack.size() - 1; 0 <= i; i--) { + final int curI = i; label = new JLabel("" + (count++) + ". " + stack.peekInstance(i).getStackDescription()); //update card detail - final CardPanel cardPanel = new CardPanel(stack.peekInstance(i).getSourceCard()); + final CardPanel cardPanel = new CardPanel(stack.peekInstance().getSpellAbility().getSourceCard()); cardPanel.setLayout(new BorderLayout()); cardPanel.add(label); cardPanel.addMouseMotionListener(new MouseMotionAdapter() { @@ -734,6 +742,22 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo setCard(cardPanel.getCard()); } //mouseMoved }); + + cardPanel.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(final MouseEvent e) { + if(e.getButton() != MouseEvent.BUTTON3) + { + return; + } + if(!stack.peekInstance(curI).isOptionalTrigger()) + { + return; + } + triggerMenu.setTrigger(stack.peekAbility(curI).getSourceTrigger()); + triggerMenu.show(e.getComponent(),e.getX(),e.getY()); + } + }); stackPanel.add(cardPanel); } @@ -1684,5 +1708,74 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo } } } + + private class TriggerReactionMenu extends JPopupMenu { + private static final long serialVersionUID = 6665085414634139984L; + private int workTrigID; + + public TriggerReactionMenu() + { + super(); + + ForgeAction actAccept = new ForgeAction(LANG.GuiDisplay.TRIGGER.ALWAYSACCEPT) { + private static final long serialVersionUID = -3734674058185367612L; + + @Override + public final void actionPerformed(final ActionEvent e) { + AllZone.getTriggerHandler().setAlwaysAcceptTrigger(workTrigID); + } + }; + + ForgeAction actDecline = new ForgeAction(LANG.GuiDisplay.TRIGGER.ALWAYSDECLINE) { + private static final long serialVersionUID = -1983295769159971502L; + + @Override + public final void actionPerformed(final ActionEvent e) { + AllZone.getTriggerHandler().setAlwaysDeclineTrigger(workTrigID); + } + }; + + ForgeAction actAsk = new ForgeAction(LANG.GuiDisplay.TRIGGER.ALWAYSASK) { + private static final long serialVersionUID = 5045255351332940821L; + + @Override + public final void actionPerformed(final ActionEvent e) { + AllZone.getTriggerHandler().setAlwaysAskTrigger(workTrigID); + } + }; + + JCheckBoxMenuItem jcbmiAccept = new JCheckBoxMenuItem(actAccept); + JCheckBoxMenuItem jcbmiDecline = new JCheckBoxMenuItem(actDecline); + JCheckBoxMenuItem jcbmiAsk = new JCheckBoxMenuItem(actAsk); + + add(jcbmiAccept); + add(jcbmiDecline); + add(jcbmiAsk); + } + + public void setTrigger(final int trigID) + { + workTrigID = trigID; + + if(AllZone.getTriggerHandler().isAlwaysAccepted(trigID)) + { + ((JCheckBoxMenuItem)getComponent(0)).setState(true); + ((JCheckBoxMenuItem)getComponent(1)).setState(false); + ((JCheckBoxMenuItem)getComponent(2)).setState(false); + } + else if (AllZone.getTriggerHandler().isAlwaysDeclined(trigID)) + { + ((JCheckBoxMenuItem)getComponent(0)).setState(false); + ((JCheckBoxMenuItem)getComponent(1)).setState(true); + ((JCheckBoxMenuItem)getComponent(2)).setState(false); + } + else + { + ((JCheckBoxMenuItem)getComponent(0)).setState(false); + ((JCheckBoxMenuItem)getComponent(1)).setState(false); + ((JCheckBoxMenuItem)getComponent(2)).setState(true); + } + } + } } diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index 2db76765161..bad57155537 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -46,6 +46,7 @@ public abstract class SpellAbility { private boolean spell; private boolean trigger = false; + private boolean optionalTrigger = false; private int sourceTrigger = -1; private boolean mandatory = false; private boolean temporarilySuppressed = false; @@ -1141,6 +1142,14 @@ public abstract class SpellAbility { public boolean isTrigger() { return trigger; } + + public void setOptionalTrigger(final boolean optrigger) { + this.optionalTrigger = optrigger; + } + + public boolean isOptionalTrigger() { + return this.optionalTrigger; + } /** *setSourceTrigger.
diff --git a/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java b/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java index 28851b1310d..dae5cfaa548 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java +++ b/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java @@ -190,4 +190,8 @@ public class SpellAbility_StackInstance { public boolean isStateTrigger(int ID) { return ability.getSourceTrigger() == ID; } + + public boolean isOptionalTrigger() { + return ability.isOptionalTrigger(); + } } diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 6988d83566d..8fdbf5a87c3 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -453,6 +453,7 @@ public class TriggerHandler { sa[0].setStackDescription(sa[0].toString()); boolean mand = false; if (trigParams.containsKey("OptionalDecider")) { + sa[0].setOptionalTrigger(true); mand = false; decider[0] = AbilityFactory.getDefinedPlayers(host, trigParams.get("OptionalDecider"), sa[0]).get(0); } else { @@ -930,6 +931,16 @@ public class TriggerHandler { public int getSourceTrigger() { return sa[0].getSourceTrigger(); } + + @Override + public void setOptionalTrigger(boolean b) { + sa[0].setOptionalTrigger(b); + } + + @Override + public boolean isOptionalTrigger() { + return sa[0].isOptionalTrigger(); + } //////////////////////////////////////// //THIS ONE IS ALL THAT MATTERS @@ -945,14 +956,25 @@ public class TriggerHandler { if (decider[0] != null) { if (decider[0].isHuman()) { - StringBuilder buildQuestion = new StringBuilder("Use triggered ability of "); - buildQuestion.append(regtrig.getHostCard().getName()).append("(").append(regtrig.getHostCard().getUniqueNumber()).append(")?"); - buildQuestion.append("\r\n("); - buildQuestion.append(regtrig.getMapParams().get("TriggerDescription").replace("CARDNAME", regtrig.getHostCard().getName())); - buildQuestion.append(")"); - if (!GameActionUtil.showYesNoDialog(regtrig.getHostCard(), buildQuestion.toString())) { + if(triggersAlwaysAccept.contains(getSourceTrigger())) + { + //No need to do anything. + } + else if(triggersAlwaysDecline.contains(getSourceTrigger())) + { return; } + else + { + StringBuilder buildQuestion = new StringBuilder("Use triggered ability of "); + buildQuestion.append(regtrig.getHostCard().getName()).append("(").append(regtrig.getHostCard().getUniqueNumber()).append(")?"); + buildQuestion.append("\r\n("); + buildQuestion.append(regtrig.getMapParams().get("TriggerDescription").replace("CARDNAME", regtrig.getHostCard().getName())); + buildQuestion.append(")"); + if (!GameActionUtil.showYesNoDialog(regtrig.getHostCard(), buildQuestion.toString())) { + return; + } + } } else { // This isn't quite right, but better than canPlayAI if (!sa[0].doTrigger(isMandatory)) { @@ -1011,4 +1033,49 @@ public class TriggerHandler { } return true; } + + private final ArrayList