mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 04:38:00 +00:00
- CheckStyle.
This commit is contained in:
@@ -1436,7 +1436,7 @@ public class CombatUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TriggerType mode = trigger.getMode();
|
TriggerType mode = trigger.getMode();
|
||||||
if (mode == TriggerType.Attacks ) {
|
if (mode == TriggerType.Attacks) {
|
||||||
willTrigger = true;
|
willTrigger = true;
|
||||||
if (attacker.isAttacking()) {
|
if (attacker.isAttacking()) {
|
||||||
return false; // The trigger should have triggered already
|
return false; // The trigger should have triggered already
|
||||||
|
|||||||
@@ -204,8 +204,7 @@ public final class Constant {
|
|||||||
Sideboard(true),
|
Sideboard(true),
|
||||||
/** Ante. */
|
/** Ante. */
|
||||||
Ante(false);
|
Ante(false);
|
||||||
|
|
||||||
|
|
||||||
private final boolean holdsHiddenInfo;
|
private final boolean holdsHiddenInfo;
|
||||||
private Zone(boolean holdsHidden) {
|
private Zone(boolean holdsHidden) {
|
||||||
holdsHiddenInfo = holdsHidden;
|
holdsHiddenInfo = holdsHidden;
|
||||||
@@ -255,7 +254,7 @@ public final class Constant {
|
|||||||
|
|
||||||
public boolean isKnown() {
|
public boolean isKnown() {
|
||||||
return !holdsHiddenInfo;
|
return !holdsHiddenInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ public abstract class Trigger extends TriggerReplacementBase {
|
|||||||
|
|
||||||
/** The run params. */
|
/** The run params. */
|
||||||
private Map<String, Object> runParams;
|
private Map<String, Object> runParams;
|
||||||
|
|
||||||
private TriggerType mode;
|
private TriggerType mode;
|
||||||
|
|
||||||
/** The overriding ability. */
|
/** The overriding ability. */
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ public class TriggerHandler {
|
|||||||
// final String mode = mapParams.get("Mode");
|
// final String mode = mapParams.get("Mode");
|
||||||
final TriggerType type = TriggerType.smartValueOf(mapParams.get("Mode"));
|
final TriggerType type = TriggerType.smartValueOf(mapParams.get("Mode"));
|
||||||
ret = type.createTrigger(mapParams, host, intrinsic);
|
ret = type.createTrigger(mapParams, host, intrinsic);
|
||||||
//
|
//
|
||||||
// if (mode.equals("AbilityCast")) {
|
// if (mode.equals("AbilityCast")) {
|
||||||
// ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic);
|
// ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic);
|
||||||
// } else if (mode.equals("Always")) {
|
// } else if (mode.equals("Always")) {
|
||||||
@@ -328,7 +328,7 @@ public class TriggerHandler {
|
|||||||
if (this.suppressedModes.contains(mode)) {
|
if (this.suppressedModes.contains(mode)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Player playerAP = Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn();
|
final Player playerAP = Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn();
|
||||||
if (playerAP == null) {
|
if (playerAP == null) {
|
||||||
// This should only happen outside of games, so it's safe to just
|
// This should only happen outside of games, so it's safe to just
|
||||||
@@ -418,8 +418,7 @@ public class TriggerHandler {
|
|||||||
*/
|
*/
|
||||||
private boolean runSingleTrigger(final Trigger regtrig, final TriggerType mode, final Map<String, Object> runParams) {
|
private boolean runSingleTrigger(final Trigger regtrig, final TriggerType mode, final Map<String, Object> runParams) {
|
||||||
final Map<String, String> params = regtrig.getMapParams();
|
final Map<String, String> params = regtrig.getMapParams();
|
||||||
|
|
||||||
|
|
||||||
if (regtrig.getMode() != mode) {
|
if (regtrig.getMode() != mode) {
|
||||||
return false; // Not the right mode.
|
return false; // Not the right mode.
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,10 +16,9 @@ public enum TriggerType {
|
|||||||
Tapped(TriggerTaps.class),
|
Tapped(TriggerTaps.class),
|
||||||
Untaps(TriggerUntaps.class),
|
Untaps(TriggerUntaps.class),
|
||||||
Taps(TriggerTaps.class),
|
Taps(TriggerTaps.class),
|
||||||
|
|
||||||
ChangesZone(TriggerChangesZone.class),
|
ChangesZone(TriggerChangesZone.class),
|
||||||
|
|
||||||
|
|
||||||
Clashed(TriggerClashed.class),
|
Clashed(TriggerClashed.class),
|
||||||
TapsForMana(TriggerTapsForMana.class),
|
TapsForMana(TriggerTapsForMana.class),
|
||||||
CounterAdded(TriggerCounterAdded.class),
|
CounterAdded(TriggerCounterAdded.class),
|
||||||
@@ -48,7 +47,7 @@ public enum TriggerType {
|
|||||||
Discarded(TriggerDiscarded.class),
|
Discarded(TriggerDiscarded.class),
|
||||||
Shuffled(TriggerShuffled.class),
|
Shuffled(TriggerShuffled.class),
|
||||||
LandPlayed(TriggerLandPlayed.class);
|
LandPlayed(TriggerLandPlayed.class);
|
||||||
|
|
||||||
private final Class<? extends Trigger> classTrigger;
|
private final Class<? extends Trigger> classTrigger;
|
||||||
private TriggerType(Class<? extends Trigger> clasz) {
|
private TriggerType(Class<? extends Trigger> clasz) {
|
||||||
classTrigger = clasz;
|
classTrigger = clasz;
|
||||||
@@ -67,9 +66,9 @@ public enum TriggerType {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new RuntimeException("Element " + value + " not found in TriggerType enum" );
|
throw new RuntimeException("Element " + value + " not found in TriggerType enum");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO: Write javadoc for this method.
|
* TODO: Write javadoc for this method.
|
||||||
* @param mapParams
|
* @param mapParams
|
||||||
@@ -82,7 +81,7 @@ public enum TriggerType {
|
|||||||
Constructor<? extends Trigger>[] cc = (Constructor<? extends Trigger>[]) classTrigger.getDeclaredConstructors();
|
Constructor<? extends Trigger>[] cc = (Constructor<? extends Trigger>[]) classTrigger.getDeclaredConstructors();
|
||||||
for (Constructor<? extends Trigger> c : cc) {
|
for (Constructor<? extends Trigger> c : cc) {
|
||||||
Class<?>[] pp = c.getParameterTypes();
|
Class<?>[] pp = c.getParameterTypes();
|
||||||
if ( pp[0] == HashMap.class ) {
|
if (pp[0] == HashMap.class) {
|
||||||
try {
|
try {
|
||||||
Trigger res = c.newInstance(mapParams, host, intrinsic);
|
Trigger res = c.newInstance(mapParams, host, intrinsic);
|
||||||
res.setMode(this);
|
res.setMode(this);
|
||||||
|
|||||||
@@ -106,8 +106,8 @@ public class ControlTabber extends MyObservable {
|
|||||||
|
|
||||||
madAddAnyCard = new MouseAdapter() { @Override
|
madAddAnyCard = new MouseAdapter() { @Override
|
||||||
public void mousePressed(final MouseEvent e) {
|
public void mousePressed(final MouseEvent e) {
|
||||||
GuiDisplayUtil.devModeAddAnyCard(); } };
|
GuiDisplayUtil.devModeAddAnyCard(); } };
|
||||||
|
|
||||||
madCounter = new MouseAdapter() { @Override
|
madCounter = new MouseAdapter() { @Override
|
||||||
public void mousePressed(final MouseEvent e) {
|
public void mousePressed(final MouseEvent e) {
|
||||||
GuiDisplayUtil.devModeAddCounter(); } };
|
GuiDisplayUtil.devModeAddCounter(); } };
|
||||||
@@ -155,10 +155,9 @@ public class ControlTabber extends MyObservable {
|
|||||||
// DevMode: Tutor for card
|
// DevMode: Tutor for card
|
||||||
this.view.getLblTutor().removeMouseListener(madTutor);
|
this.view.getLblTutor().removeMouseListener(madTutor);
|
||||||
this.view.getLblTutor().addMouseListener(madTutor);
|
this.view.getLblTutor().addMouseListener(madTutor);
|
||||||
|
|
||||||
this.view.getAnyCard().removeMouseListener(madAddAnyCard);
|
this.view.getAnyCard().removeMouseListener(madAddAnyCard);
|
||||||
this.view.getAnyCard().addMouseListener(madAddAnyCard);
|
this.view.getAnyCard().addMouseListener(madAddAnyCard);
|
||||||
|
|
||||||
|
|
||||||
// DevMode: Add counter to permanent
|
// DevMode: Add counter to permanent
|
||||||
this.view.getLblCounterPermanent().removeMouseListener(madCounter);
|
this.view.getLblCounterPermanent().removeMouseListener(madCounter);
|
||||||
|
|||||||
@@ -134,10 +134,10 @@ public class Generate2ColorDeck {
|
|||||||
|
|
||||||
// start with all cards
|
// start with all cards
|
||||||
// remove cards that generated decks don't like
|
// remove cards that generated decks don't like
|
||||||
|
|
||||||
Predicate<Card> toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
Predicate<Card> toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
||||||
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
||||||
|
|
||||||
// reduce to cards that match the colors
|
// reduce to cards that match the colors
|
||||||
CardList cl1 = allCards.getColor(this.color1);
|
CardList cl1 = allCards.getColor(this.color1);
|
||||||
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ public class Generate3ColorDeck {
|
|||||||
// remove cards that generated decks don't like
|
// remove cards that generated decks don't like
|
||||||
Predicate<Card> toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
Predicate<Card> toUse = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
||||||
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
||||||
|
|
||||||
// reduce to cards that match the colors
|
// reduce to cards that match the colors
|
||||||
CardList cl1 = allCards.getColor(this.color1);
|
CardList cl1 = allCards.getColor(this.color1);
|
||||||
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ public class Generate5ColorDeck {
|
|||||||
// remove cards that generated decks don't like
|
// remove cards that generated decks don't like
|
||||||
Predicate<Card> toUse = playerType == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
Predicate<Card> toUse = playerType == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
|
||||||
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
CardList allCards = new CardList(toUse.select(AllZone.getCardFactory()));
|
||||||
|
|
||||||
// reduce to cards that match the colors
|
// reduce to cards that match the colors
|
||||||
CardList cardList1 = allCards.getColor(this.color1);
|
CardList cardList1 = allCards.getColor(this.color1);
|
||||||
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
|
||||||
|
|||||||
@@ -32,19 +32,19 @@ import forge.util.Predicate;
|
|||||||
*/
|
*/
|
||||||
public class GenerateDeckUtil {
|
public class GenerateDeckUtil {
|
||||||
|
|
||||||
public static final Predicate<Card> aiCanPlay = new Predicate<Card>(){
|
public static final Predicate<Card> aiCanPlay = new Predicate<Card>() {
|
||||||
@Override
|
@Override
|
||||||
public boolean isTrue(Card c) {
|
public boolean isTrue(Card c) {
|
||||||
return !c.getSVar("RemRandomDeck").equals("True") && !c.getSVar("RemAIDeck").equals("True");
|
return !c.getSVar("RemRandomDeck").equals("True") && !c.getSVar("RemAIDeck").equals("True");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final Predicate<Card> humanCanPlay = new Predicate<Card>(){
|
public static final Predicate<Card> humanCanPlay = new Predicate<Card>() {
|
||||||
@Override
|
@Override
|
||||||
public boolean isTrue(Card c) {
|
public boolean isTrue(Card c) {
|
||||||
return !c.getSVar("RemRandomDeck").equals("True");
|
return !c.getSVar("RemRandomDeck").equals("True");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Arrays of dual and tri-land cards.
|
* Arrays of dual and tri-land cards.
|
||||||
|
|||||||
@@ -93,11 +93,11 @@ public final class BoosterDraft implements IBoosterDraft {
|
|||||||
case Block: // Draft from cards by block or set
|
case Block: // Draft from cards by block or set
|
||||||
|
|
||||||
List<CardBlock> blocks = new ArrayList<CardBlock>();
|
List<CardBlock> blocks = new ArrayList<CardBlock>();
|
||||||
for(CardBlock b : Singletons.getModel().getBlocks()) {
|
for (CardBlock b : Singletons.getModel().getBlocks()) {
|
||||||
blocks.add(b);
|
blocks.add(b);
|
||||||
}
|
}
|
||||||
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);
|
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);
|
||||||
|
|
||||||
final CardEdition[] cardSets = block.getSets();
|
final CardEdition[] cardSets = block.getSets();
|
||||||
final String[] sets = new String[cardSets.length];
|
final String[] sets = new String[cardSets.length];
|
||||||
for (int k = cardSets.length - 1; k >= 0; --k) {
|
for (int k = cardSets.length - 1; k >= 0; --k) {
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ public class SealedDeck {
|
|||||||
} else if (sealedType.equals("Block")) {
|
} else if (sealedType.equals("Block")) {
|
||||||
|
|
||||||
List<CardBlock> blocks = new ArrayList<CardBlock>();
|
List<CardBlock> blocks = new ArrayList<CardBlock>();
|
||||||
for(CardBlock b : Singletons.getModel().getBlocks()) {
|
for (CardBlock b : Singletons.getModel().getBlocks()) {
|
||||||
blocks.add(b);
|
blocks.add(b);
|
||||||
}
|
}
|
||||||
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);
|
final CardBlock block = GuiUtils.chooseOne("Choose Block", blocks);
|
||||||
|
|||||||
@@ -14,57 +14,57 @@ import javax.swing.border.EmptyBorder;
|
|||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public final class DragTab extends JLabel implements ILocalRepaint {
|
public final class DragTab extends JLabel implements ILocalRepaint {
|
||||||
private boolean selected = false;
|
private boolean selected = false;
|
||||||
private int priority = 10;
|
private int priority = 10;
|
||||||
|
|
||||||
public DragTab(final String title0) {
|
|
||||||
super(title0);
|
|
||||||
setToolTipText(title0);
|
|
||||||
setOpaque(false);
|
|
||||||
setSelected(false);
|
|
||||||
setBorder(new EmptyBorder(2, 5, 2, 5));
|
|
||||||
|
|
||||||
this.addMouseListener(SRearrangingUtil.getRearrangeClickEvent());
|
|
||||||
this.addMouseMotionListener(SRearrangingUtil.getRearrangeDragEvent());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSelected(final boolean isSelected0) {
|
public DragTab(final String title0) {
|
||||||
selected = isSelected0;
|
super(title0);
|
||||||
repaintThis();
|
setToolTipText(title0);
|
||||||
}
|
setOpaque(false);
|
||||||
|
setSelected(false);
|
||||||
|
setBorder(new EmptyBorder(2, 5, 2, 5));
|
||||||
|
|
||||||
public void priorityDecrease() {
|
this.addMouseListener(SRearrangingUtil.getRearrangeClickEvent());
|
||||||
priority++;
|
this.addMouseMotionListener(SRearrangingUtil.getRearrangeDragEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void priorityOne() {
|
public void setSelected(final boolean isSelected0) {
|
||||||
priority = 1;
|
selected = isSelected0;
|
||||||
}
|
repaintThis();
|
||||||
|
}
|
||||||
public int getPriority() {
|
|
||||||
return priority;
|
public void priorityDecrease() {
|
||||||
}
|
priority++;
|
||||||
|
}
|
||||||
public void repaintThis() {
|
|
||||||
|
public void priorityOne() {
|
||||||
|
priority = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPriority() {
|
||||||
|
return priority;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void repaintThis() {
|
||||||
final Dimension d = DragTab.this.getSize();
|
final Dimension d = DragTab.this.getSize();
|
||||||
repaint(0, 0, d.width, d.height);
|
repaint(0, 0, d.width, d.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void paintComponent(final Graphics g) {
|
public void paintComponent(final Graphics g) {
|
||||||
if(!selected) {
|
if (!selected) {
|
||||||
g.setColor(Color.white);
|
g.setColor(Color.white);
|
||||||
g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
||||||
g.setColor(Color.LIGHT_GRAY);
|
g.setColor(Color.LIGHT_GRAY);
|
||||||
g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
g.setColor(Color.orange);
|
g.setColor(Color.orange);
|
||||||
g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
g.fillRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
||||||
g.setColor(Color.red);
|
g.setColor(Color.red);
|
||||||
g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
g.drawRoundRect(0, 0, getWidth() - 1, getHeight() * 2, 6, 6);
|
||||||
}
|
}
|
||||||
|
|
||||||
super.paintComponent(g);
|
super.paintComponent(g);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user