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

rename files to confirm with Java standards

Browse Source
This commit is contained in:
jendave
2011-11-02 14:19:26 +00:00
parent d740c598a3
commit 8e1be3d95a
40 changed files with 1251 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
.gitattributes vendored
View File

@@ -10302,7 +10302,6 @@ src/main/java/forge/GuiImportPicture.java svneol=native#text/plain
src/main/java/forge/GuiInput.java svneol=native#text/plain src/main/java/forge/GuiInput.java svneol=native#text/plain
src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plain src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plain
src/main/java/forge/GuiMultipleBlockers.java svneol=native#text/plain src/main/java/forge/GuiMultipleBlockers.java svneol=native#text/plain
src/main/java/forge/GuiNewGame.java svneol=native#text/plain
src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain
src/main/java/forge/HandSizeOp.java svneol=native#text/plain src/main/java/forge/HandSizeOp.java svneol=native#text/plain
src/main/java/forge/HttpUtil.java svneol=native#text/plain src/main/java/forge/HttpUtil.java svneol=native#text/plain
@@ -10311,7 +10310,7 @@ src/main/java/forge/IPlayerZone.java svneol=native#text/plain
src/main/java/forge/ImageCache.java svneol=native#text/plain src/main/java/forge/ImageCache.java svneol=native#text/plain
src/main/java/forge/ImagePreviewPanel.java svneol=native#text/plain src/main/java/forge/ImagePreviewPanel.java svneol=native#text/plain
src/main/java/forge/MagicStack.java svneol=native#text/plain src/main/java/forge/MagicStack.java svneol=native#text/plain
src/main/java/forge/MenuItem_HowToPlay.java svneol=native#text/plain src/main/java/forge/MenuItemHowToPlay.java svneol=native#text/plain
src/main/java/forge/Move.java svneol=native#text/plain src/main/java/forge/Move.java svneol=native#text/plain
src/main/java/forge/MyButton.java svneol=native#text/plain src/main/java/forge/MyButton.java svneol=native#text/plain
src/main/java/forge/MyObservable.java svneol=native#text/plain src/main/java/forge/MyObservable.java svneol=native#text/plain
@@ -10353,37 +10352,37 @@ src/main/java/forge/card/CardSuperType.java -text
src/main/java/forge/card/CardType.java -text src/main/java/forge/card/CardType.java -text
src/main/java/forge/card/MtgDataParser.java -text src/main/java/forge/card/MtgDataParser.java -text
src/main/java/forge/card/abilityFactory/AbilityFactory.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactory.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeState.java -text src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java -text svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Charm.java -text src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java -text svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Clash.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_DelayedTrigger.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Destroy.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Effect.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_EndGameCondition.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_GainControl.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Mana.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_PreventDamage.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Protection.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Regenerate.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Sacrifice.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java svneol=native#text/plain
src/main/java/forge/card/abilityFactory/package-info.java svneol=native#text/plain src/main/java/forge/card/abilityFactory/package-info.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/AbstractCardFactory.java svneol=native#text/plain src/main/java/forge/card/cardFactory/AbstractCardFactory.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryInterface.java svneol=native#text/plain src/main/java/forge/card/cardFactory/CardFactoryInterface.java svneol=native#text/plain

6
pom.xml
View File

@@ -231,7 +231,7 @@
</descriptorRefs> </descriptorRefs>
<archive> <archive>
<manifest> <manifest>
<mainClass>forge.GuiNewGame</mainClass> <mainClass>forge.view.swing.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest> </manifest>
<manifestEntries> <manifestEntries>
@@ -704,7 +704,7 @@
<errTitle>forge</errTitle> <errTitle>forge</errTitle>
<icon>${configSourceDirectory}/forge.ico</icon> <icon>${configSourceDirectory}/forge.ico</icon>
<classPath> <classPath>
<mainClass>forge.GuiNewGame</mainClass> <mainClass>forge.view.swing.Main</mainClass>
<addDependencies>false</addDependencies> <addDependencies>false</addDependencies>
<preCp>anything</preCp> <preCp>anything</preCp>
</classPath> </classPath>
@@ -870,7 +870,7 @@
<mkdir dir="${project.build.directory}/res/cardsfolder" /> <mkdir dir="${project.build.directory}/res/cardsfolder" />
<zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" /> <zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
<taskdef name="jarbundler" classpathref="maven.runtime.classpath" classname="net.sourceforge.jarbundler.JarBundler" /> <taskdef name="jarbundler" classpathref="maven.runtime.classpath" classname="net.sourceforge.jarbundler.JarBundler" />
<jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.GuiNewGame" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar"> <jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.view.swing.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar">
<javafileset dir="${basedir}"> <javafileset dir="${basedir}">
<include name="*.properties" /> <include name="*.properties" />
<include name="res/**" /> <include name="res/**" />

8
src/main/java/forge/GameAction.java
View File

@@ -12,8 +12,8 @@ import javax.swing.JOptionPane;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
import forge.card.abilityFactory.AbilityFactory_Attach; import forge.card.abilityFactory.AbilityFactoryAttach;
import forge.card.abilityFactory.AbilityFactory_Charm; import forge.card.abilityFactory.AbilityFactoryCharm;
import forge.card.cardFactory.CardFactoryInterface; import forge.card.cardFactory.CardFactoryInterface;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
@@ -224,7 +224,7 @@ public class GameAction {
if (c.isAura() && zone.is(Constant.Zone.Battlefield) && ((prev == null) || !prev.is(Constant.Zone.Stack))) { if (c.isAura() && zone.is(Constant.Zone.Battlefield) && ((prev == null) || !prev.is(Constant.Zone.Stack))) {
// TODO Need a way to override this for Abilities that put Auras // TODO Need a way to override this for Abilities that put Auras
// into play attached to things // into play attached to things
AbilityFactory_Attach.attachAuraOnIndirectEnterBattlefield(c); AbilityFactoryAttach.attachAuraOnIndirectEnterBattlefield(c);
} }
return c; return c;
@@ -2479,7 +2479,7 @@ public class GameAction {
public final void playSpellAbility(final SpellAbility sa) { public final void playSpellAbility(final SpellAbility sa) {
sa.setActivatingPlayer(AllZone.getHumanPlayer()); sa.setActivatingPlayer(AllZone.getHumanPlayer());
AbilityFactory_Charm.setupCharmSAs(sa); AbilityFactoryCharm.setupCharmSAs(sa);
// Need to check PayCosts, and Ability + All SubAbilities for Target // Need to check PayCosts, and Ability + All SubAbilities for Target
boolean newAbility = sa.getPayCosts() != null; boolean newAbility = sa.getPayCosts() != null;

2
src/main/java/forge/GuiDisplay.java
View File

@@ -351,7 +351,7 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon
menuBar.add(gameMenu); menuBar.add(gameMenu);
menuBar.add(gamePhases); menuBar.add(gamePhases);
menuBar.add(devMenu); menuBar.add(devMenu);
menuBar.add(new MenuItem_HowToPlay()); menuBar.add(new MenuItemHowToPlay());
this.setJMenuBar(menuBar); this.setJMenuBar(menuBar);
} // addMenu() } // addMenu()

31
src/main/java/forge/GuiNewGame.java
View File

@@ -1,31 +0,0 @@
package forge;
/**
* Contains a main delegate; this class used to be Forge's entry point.
*
* The class that used to be here is presently at
* {@link forge.view.swing.OldGuiNewGame}, which is slowly being refactored out
* of existence.
*/
public final class GuiNewGame {
/**
* Do not instantiate.
*/
private GuiNewGame() {
// blank
}
/**
* This is a delegate.
*
* @param args
* from the OS or command line
*
* @deprecated use {@link forge.view.swing.Main}
*/
public static void main(final String[] args) {
forge.view.swing.Main.main(args);
}
}

4
src/main/java/forge/MenuItem_HowToPlay.java → src/main/java/forge/MenuItemHowToPlay.java
View File

@@ -19,7 +19,7 @@ import forge.properties.NewConstants;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.Lang.HowTo { public class MenuItemHowToPlay extends JMenuItem implements NewConstants.Lang.HowTo {
/** Constant <code>serialVersionUID=5552000208438248428L</code>. */ /** Constant <code>serialVersionUID=5552000208438248428L</code>. */
private static final long serialVersionUID = 5552000208438248428L; private static final long serialVersionUID = 5552000208438248428L;
@@ -28,7 +28,7 @@ public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.Lang.H
* Constructor for MenuItem_HowToPlay. * Constructor for MenuItem_HowToPlay.
* </p> * </p>
*/ */
public MenuItem_HowToPlay() { public MenuItemHowToPlay() {
super(ForgeProps.getLocalized(TITLE)); super(ForgeProps.getLocalized(TITLE));
this.addActionListener(new ActionListener() { this.addActionListener(new ActionListener() {

414
src/main/java/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -349,7 +349,7 @@ public class AbilityFactory {
// Match API keywords // Match API keywords
if (this.api.equals("DealDamage")) { if (this.api.equals("DealDamage")) {
final AbilityFactory_DealDamage dd = new AbilityFactory_DealDamage(this); final AbilityFactoryDealDamage dd = new AbilityFactoryDealDamage(this);
if (this.isAb) { if (this.isAb) {
spellAbility = dd.getAbility(); spellAbility = dd.getAbility();
@@ -361,7 +361,7 @@ public class AbilityFactory {
} }
else if (this.api.equals("DamageAll")) { else if (this.api.equals("DamageAll")) {
final AbilityFactory_DealDamage dd = new AbilityFactory_DealDamage(this); final AbilityFactoryDealDamage dd = new AbilityFactoryDealDamage(this);
if (this.isAb) { if (this.isAb) {
spellAbility = dd.getAbilityDamageAll(); spellAbility = dd.getAbilityDamageAll();
} else if (this.isSp) { } else if (this.isSp) {
@@ -373,86 +373,86 @@ public class AbilityFactory {
else if (this.api.equals("PutCounter")) { else if (this.api.equals("PutCounter")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityPutCounters(this); spellAbility = AbilityFactoryCounters.createAbilityPutCounters(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellPutCounters(this); spellAbility = AbilityFactoryCounters.createSpellPutCounters(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackPutCounters(this); spellAbility = AbilityFactoryCounters.createDrawbackPutCounters(this);
} }
} }
else if (this.api.equals("PutCounterAll")) { else if (this.api.equals("PutCounterAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityPutCounterAll(this); spellAbility = AbilityFactoryCounters.createAbilityPutCounterAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellPutCounterAll(this); spellAbility = AbilityFactoryCounters.createSpellPutCounterAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackPutCounterAll(this); spellAbility = AbilityFactoryCounters.createDrawbackPutCounterAll(this);
} }
} }
else if (this.api.equals("RemoveCounter")) { else if (this.api.equals("RemoveCounter")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityRemoveCounters(this); spellAbility = AbilityFactoryCounters.createAbilityRemoveCounters(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellRemoveCounters(this); spellAbility = AbilityFactoryCounters.createSpellRemoveCounters(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackRemoveCounters(this); spellAbility = AbilityFactoryCounters.createDrawbackRemoveCounters(this);
} }
} }
else if (this.api.equals("RemoveCounterAll")) { else if (this.api.equals("RemoveCounterAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityRemoveCounterAll(this); spellAbility = AbilityFactoryCounters.createAbilityRemoveCounterAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellRemoveCounterAll(this); spellAbility = AbilityFactoryCounters.createSpellRemoveCounterAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackRemoveCounterAll(this); spellAbility = AbilityFactoryCounters.createDrawbackRemoveCounterAll(this);
} }
} }
else if (this.api.equals("Proliferate")) { else if (this.api.equals("Proliferate")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityProliferate(this); spellAbility = AbilityFactoryCounters.createAbilityProliferate(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellProliferate(this); spellAbility = AbilityFactoryCounters.createSpellProliferate(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackProliferate(this); spellAbility = AbilityFactoryCounters.createDrawbackProliferate(this);
} }
} }
else if (this.api.equals("MoveCounter")) { else if (this.api.equals("MoveCounter")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Counters.createAbilityMoveCounters(this); spellAbility = AbilityFactoryCounters.createAbilityMoveCounters(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Counters.createSpellMoveCounters(this); spellAbility = AbilityFactoryCounters.createSpellMoveCounters(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Counters.createDrawbackMoveCounters(this); spellAbility = AbilityFactoryCounters.createDrawbackMoveCounters(this);
} }
} }
else if (this.api.equals("ChangeZone")) { else if (this.api.equals("ChangeZone")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ChangeZone.createAbilityChangeZone(this); spellAbility = AbilityFactoryChangeZone.createAbilityChangeZone(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ChangeZone.createSpellChangeZone(this); spellAbility = AbilityFactoryChangeZone.createSpellChangeZone(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ChangeZone.createDrawbackChangeZone(this); spellAbility = AbilityFactoryChangeZone.createDrawbackChangeZone(this);
} }
} }
else if (this.api.equals("ChangeZoneAll")) { else if (this.api.equals("ChangeZoneAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ChangeZone.createAbilityChangeZoneAll(this); spellAbility = AbilityFactoryChangeZone.createAbilityChangeZoneAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ChangeZone.createSpellChangeZoneAll(this); spellAbility = AbilityFactoryChangeZone.createSpellChangeZoneAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ChangeZone.createDrawbackChangeZoneAll(this); spellAbility = AbilityFactoryChangeZone.createDrawbackChangeZoneAll(this);
} }
} }
else if (this.api.equals("Pump")) { else if (this.api.equals("Pump")) {
final AbilityFactory_Pump afPump = new AbilityFactory_Pump(this); final AbilityFactoryPump afPump = new AbilityFactoryPump(this);
if (this.isAb) { if (this.isAb) {
spellAbility = afPump.getAbilityPump(); spellAbility = afPump.getAbilityPump();
@@ -468,7 +468,7 @@ public class AbilityFactory {
} }
else if (this.api.equals("PumpAll")) { else if (this.api.equals("PumpAll")) {
final AbilityFactory_Pump afPump = new AbilityFactory_Pump(this); final AbilityFactoryPump afPump = new AbilityFactoryPump(this);
if (this.isAb) { if (this.isAb) {
spellAbility = afPump.getAbilityPumpAll(); spellAbility = afPump.getAbilityPumpAll();
@@ -485,259 +485,259 @@ public class AbilityFactory {
else if (this.api.equals("GainLife")) { else if (this.api.equals("GainLife")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_AlterLife.createAbilityGainLife(this); spellAbility = AbilityFactoryAlterLife.createAbilityGainLife(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_AlterLife.createSpellGainLife(this); spellAbility = AbilityFactoryAlterLife.createSpellGainLife(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_AlterLife.createDrawbackGainLife(this); spellAbility = AbilityFactoryAlterLife.createDrawbackGainLife(this);
} }
} }
else if (this.api.equals("LoseLife")) { else if (this.api.equals("LoseLife")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_AlterLife.createAbilityLoseLife(this); spellAbility = AbilityFactoryAlterLife.createAbilityLoseLife(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_AlterLife.createSpellLoseLife(this); spellAbility = AbilityFactoryAlterLife.createSpellLoseLife(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_AlterLife.createDrawbackLoseLife(this); spellAbility = AbilityFactoryAlterLife.createDrawbackLoseLife(this);
} }
} }
else if (this.api.equals("SetLife")) { else if (this.api.equals("SetLife")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_AlterLife.createAbilitySetLife(this); spellAbility = AbilityFactoryAlterLife.createAbilitySetLife(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_AlterLife.createSpellSetLife(this); spellAbility = AbilityFactoryAlterLife.createSpellSetLife(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_AlterLife.createDrawbackSetLife(this); spellAbility = AbilityFactoryAlterLife.createDrawbackSetLife(this);
} }
} }
else if (this.api.equals("ExchangeLife")) { else if (this.api.equals("ExchangeLife")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_AlterLife.createAbilityExchangeLife(this); spellAbility = AbilityFactoryAlterLife.createAbilityExchangeLife(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_AlterLife.createSpellExchangeLife(this); spellAbility = AbilityFactoryAlterLife.createSpellExchangeLife(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_AlterLife.createDrawbackExchangeLife(this); spellAbility = AbilityFactoryAlterLife.createDrawbackExchangeLife(this);
} }
} }
else if (this.api.equals("Poison")) { else if (this.api.equals("Poison")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_AlterLife.createAbilityPoison(this); spellAbility = AbilityFactoryAlterLife.createAbilityPoison(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_AlterLife.createSpellPoison(this); spellAbility = AbilityFactoryAlterLife.createSpellPoison(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_AlterLife.createDrawbackPoison(this); spellAbility = AbilityFactoryAlterLife.createDrawbackPoison(this);
} }
} }
else if (this.api.equals("Fog")) { else if (this.api.equals("Fog")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Combat.createAbilityFog(this); spellAbility = AbilityFactoryCombat.createAbilityFog(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Combat.createSpellFog(this); spellAbility = AbilityFactoryCombat.createSpellFog(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Combat.createDrawbackFog(this); spellAbility = AbilityFactoryCombat.createDrawbackFog(this);
} }
} }
else if (this.api.equals("RemoveFromCombat")) { else if (this.api.equals("RemoveFromCombat")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Combat.createAbilityRemoveFromCombat(this); spellAbility = AbilityFactoryCombat.createAbilityRemoveFromCombat(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Combat.createSpellRemoveFromCombat(this); spellAbility = AbilityFactoryCombat.createSpellRemoveFromCombat(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Combat.createDrawbackRemoveFromCombat(this); spellAbility = AbilityFactoryCombat.createDrawbackRemoveFromCombat(this);
} }
} }
else if (this.api.equals("Untap")) { else if (this.api.equals("Untap")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityUntap(this); spellAbility = AbilityFactoryPermanentState.createAbilityUntap(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellUntap(this); spellAbility = AbilityFactoryPermanentState.createSpellUntap(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackUntap(this); spellAbility = AbilityFactoryPermanentState.createDrawbackUntap(this);
} }
} }
else if (this.api.equals("UntapAll")) { else if (this.api.equals("UntapAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityUntapAll(this); spellAbility = AbilityFactoryPermanentState.createAbilityUntapAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellUntapAll(this); spellAbility = AbilityFactoryPermanentState.createSpellUntapAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackUntapAll(this); spellAbility = AbilityFactoryPermanentState.createDrawbackUntapAll(this);
} }
} }
else if (this.api.equals("Tap")) { else if (this.api.equals("Tap")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityTap(this); spellAbility = AbilityFactoryPermanentState.createAbilityTap(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellTap(this); spellAbility = AbilityFactoryPermanentState.createSpellTap(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackTap(this); spellAbility = AbilityFactoryPermanentState.createDrawbackTap(this);
} }
} }
else if (this.api.equals("TapAll")) { else if (this.api.equals("TapAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityTapAll(this); spellAbility = AbilityFactoryPermanentState.createAbilityTapAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellTapAll(this); spellAbility = AbilityFactoryPermanentState.createSpellTapAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackTapAll(this); spellAbility = AbilityFactoryPermanentState.createDrawbackTapAll(this);
} }
} }
else if (this.api.equals("TapOrUntap")) { else if (this.api.equals("TapOrUntap")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityTapOrUntap(this); spellAbility = AbilityFactoryPermanentState.createAbilityTapOrUntap(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellTapOrUntap(this); spellAbility = AbilityFactoryPermanentState.createSpellTapOrUntap(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackTapOrUntap(this); spellAbility = AbilityFactoryPermanentState.createDrawbackTapOrUntap(this);
} }
} }
else if (this.api.equals("Phases")) { else if (this.api.equals("Phases")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PermanentState.createAbilityPhases(this); spellAbility = AbilityFactoryPermanentState.createAbilityPhases(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PermanentState.createSpellPhases(this); spellAbility = AbilityFactoryPermanentState.createSpellPhases(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PermanentState.createDrawbackPhases(this); spellAbility = AbilityFactoryPermanentState.createDrawbackPhases(this);
} }
} }
else if (this.api.equals("PreventDamage")) { else if (this.api.equals("PreventDamage")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_PreventDamage.getAbilityPreventDamage(this); spellAbility = AbilityFactoryPreventDamage.getAbilityPreventDamage(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_PreventDamage.getSpellPreventDamage(this); spellAbility = AbilityFactoryPreventDamage.getSpellPreventDamage(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_PreventDamage.createDrawbackPreventDamage(this); spellAbility = AbilityFactoryPreventDamage.createDrawbackPreventDamage(this);
} }
} }
else if (this.api.equals("Regenerate")) { else if (this.api.equals("Regenerate")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Regenerate.getAbilityRegenerate(this); spellAbility = AbilityFactoryRegenerate.getAbilityRegenerate(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Regenerate.getSpellRegenerate(this); spellAbility = AbilityFactoryRegenerate.getSpellRegenerate(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Regenerate.createDrawbackRegenerate(this); spellAbility = AbilityFactoryRegenerate.createDrawbackRegenerate(this);
} }
} }
else if (this.api.equals("Draw")) { else if (this.api.equals("Draw")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ZoneAffecting.createAbilityDraw(this); spellAbility = AbilityFactoryZoneAffecting.createAbilityDraw(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ZoneAffecting.createSpellDraw(this); spellAbility = AbilityFactoryZoneAffecting.createSpellDraw(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ZoneAffecting.createDrawbackDraw(this); spellAbility = AbilityFactoryZoneAffecting.createDrawbackDraw(this);
} }
} }
else if (this.api.equals("Mill")) { else if (this.api.equals("Mill")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ZoneAffecting.createAbilityMill(this); spellAbility = AbilityFactoryZoneAffecting.createAbilityMill(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ZoneAffecting.createSpellMill(this); spellAbility = AbilityFactoryZoneAffecting.createSpellMill(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ZoneAffecting.createDrawbackMill(this); spellAbility = AbilityFactoryZoneAffecting.createDrawbackMill(this);
} }
} }
else if (this.api.equals("Scry")) { else if (this.api.equals("Scry")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createAbilityScry(this); spellAbility = AbilityFactoryReveal.createAbilityScry(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createSpellScry(this); spellAbility = AbilityFactoryReveal.createSpellScry(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createDrawbackScry(this); spellAbility = AbilityFactoryReveal.createDrawbackScry(this);
} }
} }
else if (this.api.equals("RearrangeTopOfLibrary")) { else if (this.api.equals("RearrangeTopOfLibrary")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createRearrangeTopOfLibraryAbility(this); spellAbility = AbilityFactoryReveal.createRearrangeTopOfLibraryAbility(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createRearrangeTopOfLibrarySpell(this); spellAbility = AbilityFactoryReveal.createRearrangeTopOfLibrarySpell(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createRearrangeTopOfLibraryDrawback(this); spellAbility = AbilityFactoryReveal.createRearrangeTopOfLibraryDrawback(this);
} }
} }
else if (this.api.equals("Sacrifice")) { else if (this.api.equals("Sacrifice")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Sacrifice.createAbilitySacrifice(this); spellAbility = AbilityFactorySacrifice.createAbilitySacrifice(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Sacrifice.createSpellSacrifice(this); spellAbility = AbilityFactorySacrifice.createSpellSacrifice(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Sacrifice.createDrawbackSacrifice(this); spellAbility = AbilityFactorySacrifice.createDrawbackSacrifice(this);
} }
} }
else if (this.api.equals("SacrificeAll")) { else if (this.api.equals("SacrificeAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Sacrifice.createAbilitySacrificeAll(this); spellAbility = AbilityFactorySacrifice.createAbilitySacrificeAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Sacrifice.createSpellSacrificeAll(this); spellAbility = AbilityFactorySacrifice.createSpellSacrificeAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Sacrifice.createDrawbackSacrificeAll(this); spellAbility = AbilityFactorySacrifice.createDrawbackSacrificeAll(this);
} }
} }
else if (this.api.equals("Destroy")) { else if (this.api.equals("Destroy")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Destroy.createAbilityDestroy(this); spellAbility = AbilityFactoryDestroy.createAbilityDestroy(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Destroy.createSpellDestroy(this); spellAbility = AbilityFactoryDestroy.createSpellDestroy(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Destroy.createDrawbackDestroy(this); spellAbility = AbilityFactoryDestroy.createDrawbackDestroy(this);
} }
} }
else if (this.api.equals("DestroyAll")) { else if (this.api.equals("DestroyAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Destroy.createAbilityDestroyAll(this); spellAbility = AbilityFactoryDestroy.createAbilityDestroyAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Destroy.createSpellDestroyAll(this); spellAbility = AbilityFactoryDestroy.createSpellDestroyAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Destroy.createDrawbackDestroyAll(this); spellAbility = AbilityFactoryDestroy.createDrawbackDestroyAll(this);
} }
} }
else if (this.api.equals("Mana")) { else if (this.api.equals("Mana")) {
final String produced = this.mapParams.get("Produced"); final String produced = this.mapParams.get("Produced");
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Mana.createAbilityMana(this, produced); spellAbility = AbilityFactoryMana.createAbilityMana(this, produced);
} }
if (this.isSp) { if (this.isSp) {
spellAbility = AbilityFactory_Mana.createSpellMana(this, produced); spellAbility = AbilityFactoryMana.createSpellMana(this, produced);
} }
if (this.isDb) { if (this.isDb) {
spellAbility = AbilityFactory_Mana.createDrawbackMana(this, produced); spellAbility = AbilityFactoryMana.createDrawbackMana(this, produced);
} }
} }
else if (this.api.equals("ManaReflected")) { else if (this.api.equals("ManaReflected")) {
// Reflected mana will have a filler for produced of "1" // Reflected mana will have a filler for produced of "1"
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Mana.createAbilityManaReflected(this, "1"); spellAbility = AbilityFactoryMana.createAbilityManaReflected(this, "1");
} }
if (this.isSp) { // shouldn't really happen i think? if (this.isSp) { // shouldn't really happen i think?
spellAbility = AbilityFactory_Mana.createSpellManaReflected(this, "1"); spellAbility = AbilityFactoryMana.createSpellManaReflected(this, "1");
} }
} }
else if (this.api.equals("Token")) { else if (this.api.equals("Token")) {
final AbilityFactory_Token aft = new AbilityFactory_Token(this); final AbilityFactoryToken aft = new AbilityFactoryToken(this);
if (this.isAb) { if (this.isAb) {
spellAbility = aft.getAbility(); spellAbility = aft.getAbility();
@@ -749,7 +749,7 @@ public class AbilityFactory {
} }
else if (this.api.equals("GainControl")) { else if (this.api.equals("GainControl")) {
final AbilityFactory_GainControl afControl = new AbilityFactory_GainControl(this); final AbilityFactoryGainControl afControl = new AbilityFactoryGainControl(this);
if (this.isAb) { if (this.isAb) {
spellAbility = afControl.getAbilityGainControl(); spellAbility = afControl.getAbilityGainControl();
@@ -762,16 +762,16 @@ public class AbilityFactory {
else if (this.api.equals("Discard")) { else if (this.api.equals("Discard")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ZoneAffecting.createAbilityDiscard(this); spellAbility = AbilityFactoryZoneAffecting.createAbilityDiscard(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ZoneAffecting.createSpellDiscard(this); spellAbility = AbilityFactoryZoneAffecting.createSpellDiscard(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ZoneAffecting.createDrawbackDiscard(this); spellAbility = AbilityFactoryZoneAffecting.createDrawbackDiscard(this);
} }
} }
else if (this.api.equals("Counter")) { else if (this.api.equals("Counter")) {
final AbilityFactory_CounterMagic c = new AbilityFactory_CounterMagic(this); final AbilityFactoryCounterMagic c = new AbilityFactoryCounterMagic(this);
if (this.isTargeted) { // Since all "Counter" ABs Counter things on if (this.isTargeted) { // Since all "Counter" ABs Counter things on
// the // the
@@ -790,171 +790,171 @@ public class AbilityFactory {
else if (this.api.equals("AddTurn")) { else if (this.api.equals("AddTurn")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Turns.createAbilityAddTurn(this); spellAbility = AbilityFactoryTurns.createAbilityAddTurn(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Turns.createSpellAddTurn(this); spellAbility = AbilityFactoryTurns.createSpellAddTurn(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Turns.createDrawbackAddTurn(this); spellAbility = AbilityFactoryTurns.createDrawbackAddTurn(this);
} }
} }
else if (this.api.equals("Clash")) { else if (this.api.equals("Clash")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Clash.getAbilityClash(this); spellAbility = AbilityFactoryClash.getAbilityClash(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Clash.getSpellClash(this); spellAbility = AbilityFactoryClash.getSpellClash(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Clash.getDrawbackClash(this); spellAbility = AbilityFactoryClash.getDrawbackClash(this);
} }
} }
else if (this.api.equals("Animate")) { else if (this.api.equals("Animate")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Animate.createAbilityAnimate(this); spellAbility = AbilityFactoryAnimate.createAbilityAnimate(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Animate.createSpellAnimate(this); spellAbility = AbilityFactoryAnimate.createSpellAnimate(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Animate.createDrawbackAnimate(this); spellAbility = AbilityFactoryAnimate.createDrawbackAnimate(this);
} }
} }
else if (this.api.equals("Effect")) { else if (this.api.equals("Effect")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Effect.createAbilityEffect(this); spellAbility = AbilityFactoryEffect.createAbilityEffect(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Effect.createSpellEffect(this); spellAbility = AbilityFactoryEffect.createSpellEffect(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Effect.createDrawbackEffect(this); spellAbility = AbilityFactoryEffect.createDrawbackEffect(this);
} }
} }
else if (this.api.equals("WinsGame")) { else if (this.api.equals("WinsGame")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_EndGameCondition.createAbilityWinsGame(this); spellAbility = AbilityFactoryEndGameCondition.createAbilityWinsGame(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_EndGameCondition.createSpellWinsGame(this); spellAbility = AbilityFactoryEndGameCondition.createSpellWinsGame(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_EndGameCondition.createDrawbackWinsGame(this); spellAbility = AbilityFactoryEndGameCondition.createDrawbackWinsGame(this);
} }
} }
else if (this.api.equals("LosesGame")) { else if (this.api.equals("LosesGame")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_EndGameCondition.createAbilityLosesGame(this); spellAbility = AbilityFactoryEndGameCondition.createAbilityLosesGame(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_EndGameCondition.createSpellLosesGame(this); spellAbility = AbilityFactoryEndGameCondition.createSpellLosesGame(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_EndGameCondition.createDrawbackLosesGame(this); spellAbility = AbilityFactoryEndGameCondition.createDrawbackLosesGame(this);
} }
} }
else if (this.api.equals("RevealHand")) { else if (this.api.equals("RevealHand")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createAbilityRevealHand(this); spellAbility = AbilityFactoryReveal.createAbilityRevealHand(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createSpellRevealHand(this); spellAbility = AbilityFactoryReveal.createSpellRevealHand(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createDrawbackRevealHand(this); spellAbility = AbilityFactoryReveal.createDrawbackRevealHand(this);
} }
} }
else if (this.api.equals("Reveal")) { else if (this.api.equals("Reveal")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createAbilityReveal(this); spellAbility = AbilityFactoryReveal.createAbilityReveal(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createSpellReveal(this); spellAbility = AbilityFactoryReveal.createSpellReveal(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createDrawbackReveal(this); spellAbility = AbilityFactoryReveal.createDrawbackReveal(this);
} }
} }
else if (this.api.equals("Dig")) { else if (this.api.equals("Dig")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createAbilityDig(this); spellAbility = AbilityFactoryReveal.createAbilityDig(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createSpellDig(this); spellAbility = AbilityFactoryReveal.createSpellDig(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createDrawbackDig(this); spellAbility = AbilityFactoryReveal.createDrawbackDig(this);
} }
} }
else if (this.api.equals("DigUntil")) { else if (this.api.equals("DigUntil")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Reveal.createAbilityDigUntil(this); spellAbility = AbilityFactoryReveal.createAbilityDigUntil(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Reveal.createSpellDigUntil(this); spellAbility = AbilityFactoryReveal.createSpellDigUntil(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Reveal.createDrawbackDigUntil(this); spellAbility = AbilityFactoryReveal.createDrawbackDigUntil(this);
} }
} }
else if (this.api.equals("Shuffle")) { else if (this.api.equals("Shuffle")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ZoneAffecting.createAbilityShuffle(this); spellAbility = AbilityFactoryZoneAffecting.createAbilityShuffle(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ZoneAffecting.createSpellShuffle(this); spellAbility = AbilityFactoryZoneAffecting.createSpellShuffle(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ZoneAffecting.createDrawbackShuffle(this); spellAbility = AbilityFactoryZoneAffecting.createDrawbackShuffle(this);
} }
} }
else if (this.api.equals("ChooseType")) { else if (this.api.equals("ChooseType")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Choose.createAbilityChooseType(this); spellAbility = AbilityFactoryChoose.createAbilityChooseType(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Choose.createSpellChooseType(this); spellAbility = AbilityFactoryChoose.createSpellChooseType(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Choose.createDrawbackChooseType(this); spellAbility = AbilityFactoryChoose.createDrawbackChooseType(this);
} }
} }
else if (this.api.equals("ChooseColor")) { else if (this.api.equals("ChooseColor")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Choose.createAbilityChooseColor(this); spellAbility = AbilityFactoryChoose.createAbilityChooseColor(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Choose.createSpellChooseColor(this); spellAbility = AbilityFactoryChoose.createSpellChooseColor(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Choose.createDrawbackChooseColor(this); spellAbility = AbilityFactoryChoose.createDrawbackChooseColor(this);
} }
} }
else if (this.api.equals("ChooseNumber")) { else if (this.api.equals("ChooseNumber")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Choose.createAbilityChooseNumber(this); spellAbility = AbilityFactoryChoose.createAbilityChooseNumber(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Choose.createSpellChooseNumber(this); spellAbility = AbilityFactoryChoose.createSpellChooseNumber(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Choose.createDrawbackChooseNumber(this); spellAbility = AbilityFactoryChoose.createDrawbackChooseNumber(this);
} }
} }
else if (this.api.equals("ChoosePlayer")) { else if (this.api.equals("ChoosePlayer")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Choose.createAbilityChoosePlayer(this); spellAbility = AbilityFactoryChoose.createAbilityChoosePlayer(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Choose.createSpellChoosePlayer(this); spellAbility = AbilityFactoryChoose.createSpellChoosePlayer(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Choose.createDrawbackChoosePlayer(this); spellAbility = AbilityFactoryChoose.createDrawbackChoosePlayer(this);
} }
} }
else if (this.api.equals("NameCard")) { else if (this.api.equals("NameCard")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Choose.createAbilityNameCard(this); spellAbility = AbilityFactoryChoose.createAbilityNameCard(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Choose.createSpellNameCard(this); spellAbility = AbilityFactoryChoose.createSpellNameCard(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Choose.createDrawbackNameCard(this); spellAbility = AbilityFactoryChoose.createDrawbackNameCard(this);
} }
} }
else if (this.api.equals("CopyPermanent")) { else if (this.api.equals("CopyPermanent")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Copy.createAbilityCopyPermanent(this); spellAbility = AbilityFactoryCopy.createAbilityCopyPermanent(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Copy.createSpellCopyPermanent(this); spellAbility = AbilityFactoryCopy.createSpellCopyPermanent(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Copy.createDrawbackCopyPermanent(this); spellAbility = AbilityFactoryCopy.createDrawbackCopyPermanent(this);
} }
} }
@@ -966,11 +966,11 @@ public class AbilityFactory {
} }
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Copy.createAbilityCopySpell(this); spellAbility = AbilityFactoryCopy.createAbilityCopySpell(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Copy.createSpellCopySpell(this); spellAbility = AbilityFactoryCopy.createSpellCopySpell(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Copy.createDrawbackCopySpell(this); spellAbility = AbilityFactoryCopy.createDrawbackCopySpell(this);
} }
hostCard.setCopiesSpells(true); hostCard.setCopiesSpells(true);
@@ -978,136 +978,136 @@ public class AbilityFactory {
else if (this.api.equals("FlipACoin")) { else if (this.api.equals("FlipACoin")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Clash.createAbilityFlip(this); spellAbility = AbilityFactoryClash.createAbilityFlip(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Clash.createSpellFlip(this); spellAbility = AbilityFactoryClash.createSpellFlip(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Clash.createDrawbackFlip(this); spellAbility = AbilityFactoryClash.createDrawbackFlip(this);
} }
} }
else if (this.api.equals("DelayedTrigger")) { else if (this.api.equals("DelayedTrigger")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_DelayedTrigger.getAbility(this); spellAbility = AbilityFactoryDelayedTrigger.getAbility(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_DelayedTrigger.getSpell(this); spellAbility = AbilityFactoryDelayedTrigger.getSpell(this);
} }
if (this.isDb) { if (this.isDb) {
spellAbility = AbilityFactory_DelayedTrigger.getDrawback(this); spellAbility = AbilityFactoryDelayedTrigger.getDrawback(this);
} }
} }
else if (this.api.equals("Cleanup")) { else if (this.api.equals("Cleanup")) {
if (this.isDb) { if (this.isDb) {
spellAbility = AbilityFactory_Cleanup.getDrawback(this); spellAbility = AbilityFactoryCleanup.getDrawback(this);
} }
} }
else if (this.api.equals("RegenerateAll")) { else if (this.api.equals("RegenerateAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Regenerate.getAbilityRegenerateAll(this); spellAbility = AbilityFactoryRegenerate.getAbilityRegenerateAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Regenerate.getSpellRegenerateAll(this); spellAbility = AbilityFactoryRegenerate.getSpellRegenerateAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Regenerate.createDrawbackRegenerateAll(this); spellAbility = AbilityFactoryRegenerate.createDrawbackRegenerateAll(this);
} }
} }
else if (this.api.equals("AnimateAll")) { else if (this.api.equals("AnimateAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Animate.createAbilityAnimateAll(this); spellAbility = AbilityFactoryAnimate.createAbilityAnimateAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Animate.createSpellAnimateAll(this); spellAbility = AbilityFactoryAnimate.createSpellAnimateAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Animate.createDrawbackAnimateAll(this); spellAbility = AbilityFactoryAnimate.createDrawbackAnimateAll(this);
} }
} }
else if (this.api.equals("Debuff")) { else if (this.api.equals("Debuff")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Debuff.createAbilityDebuff(this); spellAbility = AbilityFactoryDebuff.createAbilityDebuff(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Debuff.createSpellDebuff(this); spellAbility = AbilityFactoryDebuff.createSpellDebuff(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Debuff.createDrawbackDebuff(this); spellAbility = AbilityFactoryDebuff.createDrawbackDebuff(this);
} }
} }
else if (this.api.equals("DebuffAll")) { else if (this.api.equals("DebuffAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Debuff.createAbilityDebuffAll(this); spellAbility = AbilityFactoryDebuff.createAbilityDebuffAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Debuff.createSpellDebuffAll(this); spellAbility = AbilityFactoryDebuff.createSpellDebuffAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Debuff.createDrawbackDebuffAll(this); spellAbility = AbilityFactoryDebuff.createDrawbackDebuffAll(this);
} }
} }
else if (this.api.equals("DrainMana")) { else if (this.api.equals("DrainMana")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Mana.createAbilityDrainMana(this); spellAbility = AbilityFactoryMana.createAbilityDrainMana(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Mana.createSpellDrainMana(this); spellAbility = AbilityFactoryMana.createSpellDrainMana(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Mana.createDrawbackDrainMana(this); spellAbility = AbilityFactoryMana.createDrawbackDrainMana(this);
} }
} }
else if (this.api.equals("Protection")) { else if (this.api.equals("Protection")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Protection.createAbilityProtection(this); spellAbility = AbilityFactoryProtection.createAbilityProtection(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Protection.createSpellProtection(this); spellAbility = AbilityFactoryProtection.createSpellProtection(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Protection.createDrawbackProtection(this); spellAbility = AbilityFactoryProtection.createDrawbackProtection(this);
} }
} }
else if (this.api.equals("Attach")) { else if (this.api.equals("Attach")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Attach.createAbilityAttach(this); spellAbility = AbilityFactoryAttach.createAbilityAttach(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Attach.createSpellAttach(this); spellAbility = AbilityFactoryAttach.createSpellAttach(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Attach.createDrawbackAttach(this); spellAbility = AbilityFactoryAttach.createDrawbackAttach(this);
} }
} }
else if (this.api.equals("ProtectionAll")) { else if (this.api.equals("ProtectionAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Protection.createAbilityProtectionAll(this); spellAbility = AbilityFactoryProtection.createAbilityProtectionAll(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Protection.createSpellProtectionAll(this); spellAbility = AbilityFactoryProtection.createSpellProtectionAll(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Protection.createDrawbackProtectionAll(this); spellAbility = AbilityFactoryProtection.createDrawbackProtectionAll(this);
} }
} }
else if (this.api.equals("MustAttack")) { else if (this.api.equals("MustAttack")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Combat.createAbilityMustAttack(this); spellAbility = AbilityFactoryCombat.createAbilityMustAttack(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Combat.createSpellMustAttack(this); spellAbility = AbilityFactoryCombat.createSpellMustAttack(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Combat.createDrawbackMustAttack(this); spellAbility = AbilityFactoryCombat.createDrawbackMustAttack(this);
} }
} }
else if (this.api.equals("MustBlock")) { else if (this.api.equals("MustBlock")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Combat.createAbilityMustBlock(this); spellAbility = AbilityFactoryCombat.createAbilityMustBlock(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Combat.createSpellMustBlock(this); spellAbility = AbilityFactoryCombat.createSpellMustBlock(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_Combat.createDrawbackMustBlock(this); spellAbility = AbilityFactoryCombat.createDrawbackMustBlock(this);
} }
} }
else if (this.api.equals("Charm")) { else if (this.api.equals("Charm")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_Charm.createAbilityCharm(this); spellAbility = AbilityFactoryCharm.createAbilityCharm(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_Charm.createSpellCharm(this); spellAbility = AbilityFactoryCharm.createSpellCharm(this);
} }
spellAbility.setIsCharm(true); spellAbility.setIsCharm(true);
final int num = Integer.parseInt(this.mapParams.containsKey("CharmNum") ? this.mapParams.get("CharmNum") final int num = Integer.parseInt(this.mapParams.containsKey("CharmNum") ? this.mapParams.get("CharmNum")
@@ -1127,21 +1127,21 @@ public class AbilityFactory {
else if (this.api.equals("ChangeState")) { else if (this.api.equals("ChangeState")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ChangeState.getChangeStateAbility(this); spellAbility = AbilityFactoryChangeState.getChangeStateAbility(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ChangeState.getChangeStateSpell(this); spellAbility = AbilityFactoryChangeState.getChangeStateSpell(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ChangeState.getChangeStateDrawback(this); spellAbility = AbilityFactoryChangeState.getChangeStateDrawback(this);
} }
} }
else if (this.api.equals("ChangeStateAll")) { else if (this.api.equals("ChangeStateAll")) {
if (this.isAb) { if (this.isAb) {
spellAbility = AbilityFactory_ChangeState.getChangeStateAllAbility(this); spellAbility = AbilityFactoryChangeState.getChangeStateAllAbility(this);
} else if (this.isSp) { } else if (this.isSp) {
spellAbility = AbilityFactory_ChangeState.getChangeStateAllSpell(this); spellAbility = AbilityFactoryChangeState.getChangeStateAllSpell(this);
} else if (this.isDb) { } else if (this.isDb) {
spellAbility = AbilityFactory_ChangeState.getChangeStateAllDrawback(this); spellAbility = AbilityFactoryChangeState.getChangeStateAllDrawback(this);
} }
} }

112
src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java → src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java
View File

@@ -29,7 +29,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_AlterLife { public class AbilityFactoryAlterLife {
// An AbilityFactory subclass for Gaining, Losing, or Setting Life totals. // An AbilityFactory subclass for Gaining, Losing, or Setting Life totals.
// ************************************************************************* // *************************************************************************
@@ -57,22 +57,22 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.gainLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.gainLifeStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.gainLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.gainLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.gainLifeResolve(this.af, this); AbilityFactoryAlterLife.gainLifeResolve(this.af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.gainLifeDoTriggerAI(this.af, this, mandatory); return AbilityFactoryAlterLife.gainLifeDoTriggerAI(this.af, this, mandatory);
} }
}; };
@@ -99,7 +99,7 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.gainLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.gainLifeStackDescription(this.af, this);
} }
@Override @Override
@@ -109,12 +109,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.gainLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.gainLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.gainLifeResolve(this.af, this); AbilityFactoryAlterLife.gainLifeResolve(this.af, this);
} }
}; };
@@ -140,7 +140,7 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.gainLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.gainLifeStackDescription(this.af, this);
} }
@Override @Override
@@ -150,12 +150,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.gainLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.gainLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.gainLifeResolve(this.af, this); AbilityFactoryAlterLife.gainLifeResolve(this.af, this);
} }
@Override @Override
@@ -165,7 +165,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.gainLifeDoTriggerAI(this.af, this, mandatory); return AbilityFactoryAlterLife.gainLifeDoTriggerAI(this.af, this, mandatory);
} }
}; };
@@ -418,7 +418,7 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.loseLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.loseLifeStackDescription(this.af, this);
} }
@Override @Override
@@ -428,17 +428,17 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.loseLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.loseLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.loseLifeResolve(this.af, this); AbilityFactoryAlterLife.loseLifeResolve(this.af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.loseLifeDoTriggerAI(this.af, this, mandatory); return AbilityFactoryAlterLife.loseLifeDoTriggerAI(this.af, this, mandatory);
} }
}; };
return abLoseLife; return abLoseLife;
@@ -464,7 +464,7 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.loseLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.loseLifeStackDescription(this.af, this);
} }
@Override @Override
@@ -474,12 +474,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.loseLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.loseLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.loseLifeResolve(this.af, this); AbilityFactoryAlterLife.loseLifeResolve(this.af, this);
} }
}; };
return spLoseLife; return spLoseLife;
@@ -504,7 +504,7 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.loseLifeStackDescription(this.af, this); return AbilityFactoryAlterLife.loseLifeStackDescription(this.af, this);
} }
@Override @Override
@@ -514,12 +514,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.loseLifeCanPlayAI(this.af, this); return AbilityFactoryAlterLife.loseLifeCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.loseLifeResolve(this.af, this); AbilityFactoryAlterLife.loseLifeResolve(this.af, this);
} }
@Override @Override
@@ -529,7 +529,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.loseLifeDoTriggerAI(this.af, this, mandatory); return AbilityFactoryAlterLife.loseLifeDoTriggerAI(this.af, this, mandatory);
} }
}; };
return dbLoseLife; return dbLoseLife;
@@ -787,22 +787,22 @@ public class AbilityFactory_AlterLife {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_AlterLife.poisonStackDescription(af, this); return AbilityFactoryAlterLife.poisonStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.poisonCanPlayAI(af, this); return AbilityFactoryAlterLife.poisonCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.poisonResolve(af, this); AbilityFactoryAlterLife.poisonResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.poisonDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.poisonDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -824,7 +824,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.poisonStackDescription(af, this); return AbilityFactoryAlterLife.poisonStackDescription(af, this);
} }
@Override @Override
@@ -834,12 +834,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.poisonCanPlayAI(af, this); return AbilityFactoryAlterLife.poisonCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.poisonResolve(af, this); AbilityFactoryAlterLife.poisonResolve(af, this);
} }
}; };
@@ -861,7 +861,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.poisonStackDescription(af, this); return AbilityFactoryAlterLife.poisonStackDescription(af, this);
} }
@Override @Override
@@ -871,12 +871,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.poisonCanPlayAI(af, this); return AbilityFactoryAlterLife.poisonCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.poisonResolve(af, this); AbilityFactoryAlterLife.poisonResolve(af, this);
} }
@Override @Override
@@ -886,7 +886,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.poisonDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.poisonDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -1109,22 +1109,22 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.setLifeStackDescription(af, this); return AbilityFactoryAlterLife.setLifeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.setLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.setLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.setLifeResolve(af, this); AbilityFactoryAlterLife.setLifeResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.setLifeDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.setLifeDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -1146,7 +1146,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.setLifeStackDescription(af, this); return AbilityFactoryAlterLife.setLifeStackDescription(af, this);
} }
@Override @Override
@@ -1156,12 +1156,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.setLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.setLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.setLifeResolve(af, this); AbilityFactoryAlterLife.setLifeResolve(af, this);
} }
}; };
@@ -1183,7 +1183,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.setLifeStackDescription(af, this); return AbilityFactoryAlterLife.setLifeStackDescription(af, this);
} }
@Override @Override
@@ -1193,12 +1193,12 @@ public class AbilityFactory_AlterLife {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_AlterLife.setLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.setLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.setLifeResolve(af, this); AbilityFactoryAlterLife.setLifeResolve(af, this);
} }
@Override @Override
@@ -1208,7 +1208,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.setLifeDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.setLifeDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -1476,22 +1476,22 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.exchangeLifeStackDescription(af, this); return AbilityFactoryAlterLife.exchangeLifeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.exchangeLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.exchangeLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.exchangeLifeResolve(af, this); AbilityFactoryAlterLife.exchangeLifeResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.exchangeLifeDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.exchangeLifeDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -1513,17 +1513,17 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.exchangeLifeStackDescription(af, this); return AbilityFactoryAlterLife.exchangeLifeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.exchangeLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.exchangeLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.exchangeLifeResolve(af, this); AbilityFactoryAlterLife.exchangeLifeResolve(af, this);
} }
}; };
@@ -1545,17 +1545,17 @@ public class AbilityFactory_AlterLife {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_AlterLife.exchangeLifeStackDescription(af, this); return AbilityFactoryAlterLife.exchangeLifeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_AlterLife.exchangeLifeCanPlayAI(af, this); return AbilityFactoryAlterLife.exchangeLifeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_AlterLife.exchangeLifeResolve(af, this); AbilityFactoryAlterLife.exchangeLifeResolve(af, this);
} }
@Override @Override
@@ -1565,7 +1565,7 @@ public class AbilityFactory_AlterLife {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_AlterLife.exchangeLifeDoTriggerAI(af, this, mandatory); return AbilityFactoryAlterLife.exchangeLifeDoTriggerAI(af, this, mandatory);
} }
}; };

62
src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java → src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java
View File

@@ -32,9 +32,9 @@ import forge.card.trigger.TriggerHandler;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Animate { public final class AbilityFactoryAnimate {
private AbilityFactory_Animate() { private AbilityFactoryAnimate() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -57,22 +57,22 @@ public final class AbilityFactory_Animate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Animate.animateCanPlayAI(af, this); return AbilityFactoryAnimate.animateCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateResolve(af, this); AbilityFactoryAnimate.animateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateStackDescription(af, this); return AbilityFactoryAnimate.animateStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Animate.animateTriggerAI(af, this, mandatory); return AbilityFactoryAnimate.animateTriggerAI(af, this, mandatory);
} }
}; };
return abAnimate; return abAnimate;
@@ -93,17 +93,17 @@ public final class AbilityFactory_Animate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Animate.animateCanPlayAI(af, this); return AbilityFactoryAnimate.animateCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateResolve(af, this); AbilityFactoryAnimate.animateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateStackDescription(af, this); return AbilityFactoryAnimate.animateStackDescription(af, this);
} }
}; };
return spAnimate; return spAnimate;
@@ -124,22 +124,22 @@ public final class AbilityFactory_Animate {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateResolve(af, this); AbilityFactoryAnimate.animateResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Animate.animatePlayDrawbackAI(af, this); return AbilityFactoryAnimate.animatePlayDrawbackAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateStackDescription(af, this); return AbilityFactoryAnimate.animateStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Animate.animateTriggerAI(af, this, mandatory); return AbilityFactoryAnimate.animateTriggerAI(af, this, mandatory);
} }
}; };
return dbAnimate; return dbAnimate;
@@ -349,7 +349,7 @@ public final class AbilityFactory_Animate {
} }
} else { } else {
tgt.resetTargets(); tgt.resetTargets();
useAbility &= AbilityFactory_Animate.animateTgtAI(af, sa); useAbility &= AbilityFactoryAnimate.animateTgtAI(af, sa);
} }
final Ability_Sub subAb = sa.getSubAbility(); final Ability_Sub subAb = sa.getSubAbility();
@@ -373,7 +373,7 @@ public final class AbilityFactory_Animate {
*/ */
private static boolean animatePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean animatePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
// AI should only activate this during Human's turn // AI should only activate this during Human's turn
boolean chance = AbilityFactory_Animate.animateTgtAI(af, sa); boolean chance = AbilityFactoryAnimate.animateTgtAI(af, sa);
// TODO - restrict the subAbility a bit // TODO - restrict the subAbility a bit
@@ -403,7 +403,7 @@ public final class AbilityFactory_Animate {
return false; return false;
} }
boolean chance = AbilityFactory_Animate.animateTgtAI(af, sa); boolean chance = AbilityFactoryAnimate.animateTgtAI(af, sa);
// Improve AI for triggers. If source is a creature with: // Improve AI for triggers. If source is a creature with:
// When ETB, sacrifice a creature. Check to see if the AI has something // When ETB, sacrifice a creature. Check to see if the AI has something
@@ -555,7 +555,7 @@ public final class AbilityFactory_Animate {
for (final Card c : tgts) { for (final Card c : tgts) {
final long colorTimestamp = AbilityFactory_Animate.doAnimate(c, af, power, toughness, types, removeTypes, final long colorTimestamp = AbilityFactoryAnimate.doAnimate(c, af, power, toughness, types, removeTypes,
finalDesc, keywords, hiddenKeywords, timestamp); finalDesc, keywords, hiddenKeywords, timestamp);
// give abilities // give abilities
@@ -625,7 +625,7 @@ public final class AbilityFactory_Animate {
@Override @Override
public void execute() { public void execute() {
AbilityFactory_Animate.doUnanimate(c, af, finalDesc, hiddenKeywords, addedAbilities, addedTriggers, AbilityFactoryAnimate.doUnanimate(c, af, finalDesc, hiddenKeywords, addedAbilities, addedTriggers,
colorTimestamp, givesStAbs, removedAbilities, timestamp); colorTimestamp, givesStAbs, removedAbilities, timestamp);
// give back suppressed triggers // give back suppressed triggers
@@ -817,22 +817,22 @@ public final class AbilityFactory_Animate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Animate.animateAllCanPlayAI(af, this); return AbilityFactoryAnimate.animateAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateAllResolve(af, this); AbilityFactoryAnimate.animateAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateAllStackDescription(af, this); return AbilityFactoryAnimate.animateAllStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Animate.animateAllTriggerAI(af, this, mandatory); return AbilityFactoryAnimate.animateAllTriggerAI(af, this, mandatory);
} }
}; };
return abAnimateAll; return abAnimateAll;
@@ -853,17 +853,17 @@ public final class AbilityFactory_Animate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Animate.animateAllCanPlayAI(af, this); return AbilityFactoryAnimate.animateAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateAllResolve(af, this); AbilityFactoryAnimate.animateAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateAllStackDescription(af, this); return AbilityFactoryAnimate.animateAllStackDescription(af, this);
} }
}; };
return spAnimateAll; return spAnimateAll;
@@ -884,22 +884,22 @@ public final class AbilityFactory_Animate {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Animate.animateAllResolve(af, this); AbilityFactoryAnimate.animateAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Animate.animateAllPlayDrawbackAI(af, this); return AbilityFactoryAnimate.animateAllPlayDrawbackAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Animate.animateAllStackDescription(af, this); return AbilityFactoryAnimate.animateAllStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Animate.animateAllTriggerAI(af, this, mandatory); return AbilityFactoryAnimate.animateAllTriggerAI(af, this, mandatory);
} }
}; };
return dbAnimateAll; return dbAnimateAll;
@@ -1140,7 +1140,7 @@ public final class AbilityFactory_Animate {
for (final Card c : list) { for (final Card c : list) {
final long colorTimestamp = AbilityFactory_Animate.doAnimate(c, af, power, toughness, types, removeTypes, final long colorTimestamp = AbilityFactoryAnimate.doAnimate(c, af, power, toughness, types, removeTypes,
finalDesc, keywords, hiddenKeywords, timestamp); finalDesc, keywords, hiddenKeywords, timestamp);
// give abilities // give abilities
@@ -1189,7 +1189,7 @@ public final class AbilityFactory_Animate {
@Override @Override
public void execute() { public void execute() {
AbilityFactory_Animate.doUnanimate(c, af, finalDesc, hiddenKeywords, addedAbilities, addedTriggers, AbilityFactoryAnimate.doUnanimate(c, af, finalDesc, hiddenKeywords, addedAbilities, addedTriggers,
colorTimestamp, false, removedAbilities, timestamp); colorTimestamp, false, removedAbilities, timestamp);
} }
}; };

64
src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java → src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java
View File

@@ -33,7 +33,7 @@ import forge.gui.GuiUtils;
/** /**
* The Class AbilityFactory_Attach. * The Class AbilityFactory_Attach.
*/ */
public class AbilityFactory_Attach { public class AbilityFactoryAttach {
/** /**
* Creates the spell attach. * Creates the spell attach.
@@ -61,12 +61,12 @@ public class AbilityFactory_Attach {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Attach.attachStackDescription(this.af, this); return AbilityFactoryAttach.attachStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Attach.attachCanPlayAI(this.af, this); return AbilityFactoryAttach.attachCanPlayAI(this.af, this);
} }
@Override @Override
@@ -75,7 +75,7 @@ public class AbilityFactory_Attach {
// move the card into play before Attaching // move the card into play before Attaching
final Card c = AllZone.getGameAction().moveToPlay(this.getSourceCard()); final Card c = AllZone.getGameAction().moveToPlay(this.getSourceCard());
this.setSourceCard(c); this.setSourceCard(c);
AbilityFactory_Attach.attachResolve(this.af, this); AbilityFactoryAttach.attachResolve(this.af, this);
} }
}; };
} else { } else {
@@ -92,17 +92,17 @@ public class AbilityFactory_Attach {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Attach.attachStackDescription(this.af, this); return AbilityFactoryAttach.attachStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Attach.attachCanPlayAI(this.af, this); return AbilityFactoryAttach.attachCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Attach.attachResolve(this.af, this); AbilityFactoryAttach.attachResolve(this.af, this);
} }
}; };
} }
@@ -201,9 +201,9 @@ public class AbilityFactory_Attach {
final Map<String, String> params, final Target tgt, final boolean mandatory) { final Map<String, String> params, final Target tgt, final boolean mandatory) {
Object o; Object o;
if (tgt.canTgtPlayer()) { if (tgt.canTgtPlayer()) {
o = AbilityFactory_Attach.attachToPlayerAIPreferences(af, sa, mandatory); o = AbilityFactoryAttach.attachToPlayerAIPreferences(af, sa, mandatory);
} else { } else {
o = AbilityFactory_Attach.attachToCardAIPreferences(af, sa, params, mandatory); o = AbilityFactoryAttach.attachToCardAIPreferences(af, sa, params, mandatory);
} }
if (o == null) { if (o == null) {
@@ -251,7 +251,7 @@ public class AbilityFactory_Attach {
return null; return null;
} }
Card c = AbilityFactory_Attach.attachGeneralAI(sa, list, mandatory, attachSource, params.get("AILogic")); Card c = AbilityFactoryAttach.attachGeneralAI(sa, list, mandatory, attachSource, params.get("AILogic"));
if ((c == null) && mandatory) { if ((c == null) && mandatory) {
list.shuffle(); list.shuffle();
@@ -285,22 +285,22 @@ public class AbilityFactory_Attach {
// If there are no preferred cards, and not mandatory bail out // If there are no preferred cards, and not mandatory bail out
if (prefList.size() == 0) { if (prefList.size() == 0) {
return AbilityFactory_Attach.chooseUnpreferred(mandatory, list); return AbilityFactoryAttach.chooseUnpreferred(mandatory, list);
} }
// Preferred list has at least one card in it to make to the actual // Preferred list has at least one card in it to make to the actual
// Logic // Logic
Card c = null; Card c = null;
if ("GainControl".equals(logic)) { if ("GainControl".equals(logic)) {
c = AbilityFactory_Attach.attachAIControlPreference(sa, prefList, mandatory, attachSource); c = AbilityFactoryAttach.attachAIControlPreference(sa, prefList, mandatory, attachSource);
} else if ("Curse".equals(logic)) { } else if ("Curse".equals(logic)) {
c = AbilityFactory_Attach.attachAICursePreference(sa, prefList, mandatory, attachSource); c = AbilityFactoryAttach.attachAICursePreference(sa, prefList, mandatory, attachSource);
} else if ("Pump".equals(logic)) { } else if ("Pump".equals(logic)) {
c = AbilityFactory_Attach.attachAIPumpPreference(sa, prefList, mandatory, attachSource); c = AbilityFactoryAttach.attachAIPumpPreference(sa, prefList, mandatory, attachSource);
} else if ("ChangeType".equals(logic)) { } else if ("ChangeType".equals(logic)) {
c = AbilityFactory_Attach.attachAIChangeTypePreference(sa, prefList, mandatory, attachSource); c = AbilityFactoryAttach.attachAIChangeTypePreference(sa, prefList, mandatory, attachSource);
} else if ("KeepTapped".equals(logic)) { } else if ("KeepTapped".equals(logic)) {
c = AbilityFactory_Attach.attachAIKeepTappedPreference(sa, prefList, mandatory, attachSource); c = AbilityFactoryAttach.attachAIKeepTappedPreference(sa, prefList, mandatory, attachSource);
} }
return c; return c;
@@ -396,10 +396,10 @@ public class AbilityFactory_Attach {
// If Mandatory (brought directly into play without casting) gotta // If Mandatory (brought directly into play without casting) gotta
// choose something // choose something
if (c == null) { if (c == null) {
return AbilityFactory_Attach.chooseLessPreferred(mandatory, list); return AbilityFactoryAttach.chooseLessPreferred(mandatory, list);
} }
return AbilityFactory_Attach.acceptableChoice(c, mandatory); return AbilityFactoryAttach.acceptableChoice(c, mandatory);
} }
/** /**
@@ -544,10 +544,10 @@ public class AbilityFactory_Attach {
} }
if (c == null) { if (c == null) {
return AbilityFactory_Attach.chooseLessPreferred(mandatory, list); return AbilityFactoryAttach.chooseLessPreferred(mandatory, list);
} }
return AbilityFactory_Attach.acceptableChoice(c, mandatory); return AbilityFactoryAttach.acceptableChoice(c, mandatory);
} }
/** /**
@@ -651,10 +651,10 @@ public class AbilityFactory_Attach {
c = CardFactoryUtil.getBestAI(prefList); c = CardFactoryUtil.getBestAI(prefList);
if (c == null) { if (c == null) {
return AbilityFactory_Attach.chooseLessPreferred(mandatory, list); return AbilityFactoryAttach.chooseLessPreferred(mandatory, list);
} }
return AbilityFactory_Attach.acceptableChoice(c, mandatory); return AbilityFactoryAttach.acceptableChoice(c, mandatory);
} }
/** /**
@@ -695,10 +695,10 @@ public class AbilityFactory_Attach {
// cast on // cast on
if (c == null) { if (c == null) {
return AbilityFactory_Attach.chooseLessPreferred(mandatory, list); return AbilityFactoryAttach.chooseLessPreferred(mandatory, list);
} }
return AbilityFactory_Attach.acceptableChoice(c, mandatory); return AbilityFactoryAttach.acceptableChoice(c, mandatory);
} }
/** /**
@@ -751,10 +751,10 @@ public class AbilityFactory_Attach {
final Card c = CardFactoryUtil.getBestAI(prefList); final Card c = CardFactoryUtil.getBestAI(prefList);
if (c == null) { if (c == null) {
return AbilityFactory_Attach.chooseLessPreferred(mandatory, list); return AbilityFactoryAttach.chooseLessPreferred(mandatory, list);
} }
return AbilityFactory_Attach.acceptableChoice(c, mandatory); return AbilityFactoryAttach.acceptableChoice(c, mandatory);
} }
/** /**
@@ -831,7 +831,7 @@ public class AbilityFactory_Attach {
final Target tgt = sa.getTarget(); final Target tgt = sa.getTarget();
if (tgt != null) { if (tgt != null) {
tgt.resetTargets(); tgt.resetTargets();
if (!AbilityFactory_Attach.attachPreference(af, sa, params, tgt, false)) { if (!AbilityFactoryAttach.attachPreference(af, sa, params, tgt, false)) {
return false; return false;
} }
} }
@@ -917,7 +917,7 @@ public class AbilityFactory_Attach {
// If Cast Targets will be checked on the Stack // If Cast Targets will be checked on the Stack
for (final Object o : targets) { for (final Object o : targets) {
AbilityFactory_Attach.handleAttachment(card, o, af); AbilityFactoryAttach.handleAttachment(card, o, af);
} }
} }
@@ -942,7 +942,7 @@ public class AbilityFactory_Attach {
// Although honestly, I'm not sure if the three of those could // Although honestly, I'm not sure if the three of those could
// handle being scripted // handle being scripted
final boolean gainControl = "GainControl".equals(af.getMapParams().get("AILogic")); final boolean gainControl = "GainControl".equals(af.getMapParams().get("AILogic"));
AbilityFactory_Attach.handleAura(card, c, gainControl); AbilityFactoryAttach.handleAura(card, c, gainControl);
} else if (card.isEquipment()) { } else if (card.isEquipment()) {
card.equipCard(c); card.equipCard(c);
// else if (card.isFortification()) // else if (card.isFortification())
@@ -954,7 +954,7 @@ public class AbilityFactory_Attach {
// Curse cards // Curse cards
final Player p = (Player) o; final Player p = (Player) o;
if (card.isAura()) { if (card.isAura()) {
AbilityFactory_Attach.handleAura(card, p, false); AbilityFactoryAttach.handleAura(card, p, false);
} }
} }
} }
@@ -1094,7 +1094,7 @@ public class AbilityFactory_Attach {
public static boolean attachAuraOnIndirectEnterBattlefield(final Card source) { public static boolean attachAuraOnIndirectEnterBattlefield(final Card source) {
// When an Aura ETB without being cast you can choose a valid card to // When an Aura ETB without being cast you can choose a valid card to
// attach it to // attach it to
final SpellAbility aura = AbilityFactory_Attach.getAttachSpellAbility(source); final SpellAbility aura = AbilityFactoryAttach.getAttachSpellAbility(source);
if (aura == null) { if (aura == null) {
return false; return false;
@@ -1132,7 +1132,7 @@ public class AbilityFactory_Attach {
} }
} }
else if (AbilityFactory_Attach.attachPreference(af, aura, af.getMapParams(), tgt, true)) { else if (AbilityFactoryAttach.attachPreference(af, aura, af.getMapParams(), tgt, true)) {
final Object o = aura.getTarget().getTargets().get(0); final Object o = aura.getTarget().getTargets().get(0);
if (o instanceof Card) { if (o instanceof Card) {
source.enchantEntity((Card) o); source.enchantEntity((Card) o);

26
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeState.java → src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java
View File

@@ -21,7 +21,7 @@ import forge.card.spellability.Target;
* AbilityFactory for abilities that cause cards to change states. * AbilityFactory for abilities that cause cards to change states.
* *
*/ */
public class AbilityFactory_ChangeState { public class AbilityFactoryChangeState {
/** /**
* Gets the change state ability. * Gets the change state ability.
@@ -37,12 +37,12 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateStackDescription(abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateResolve(abilityFactory, this);
} }
}; };
@@ -62,12 +62,12 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateStackDescription(abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateResolve(abilityFactory, this);
} }
}; };
@@ -88,7 +88,7 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateStackDescription(abilityFactory, this);
} }
@Override @Override
@@ -114,7 +114,7 @@ public class AbilityFactory_ChangeState {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateResolve(abilityFactory, this);
} }
}; };
@@ -218,12 +218,12 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateAllStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateAllStackDescription(abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateAllResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateAllResolve(abilityFactory, this);
} }
}; };
@@ -245,12 +245,12 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateAllStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateAllStackDescription(abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateAllResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateAllResolve(abilityFactory, this);
} }
}; };
@@ -271,7 +271,7 @@ public class AbilityFactory_ChangeState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeState.changeStateAllStackDescription(abilityFactory, this); return AbilityFactoryChangeState.changeStateAllStackDescription(abilityFactory, this);
} }
@Override @Override
@@ -293,7 +293,7 @@ public class AbilityFactory_ChangeState {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeState.changeStateAllResolve(abilityFactory, this); AbilityFactoryChangeState.changeStateAllResolve(abilityFactory, this);
} }
}; };

132
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java → src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java
View File

@@ -39,9 +39,9 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_ChangeZone { public final class AbilityFactoryChangeZone {
private AbilityFactory_ChangeZone() { private AbilityFactoryChangeZone() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -64,26 +64,26 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ChangeZone.changeZoneCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneResolve(af, this); AbilityFactoryChangeZone.changeZoneResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneDescription(af, this); return AbilityFactoryChangeZone.changeZoneDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ChangeZone.changeZoneTriggerAI(af, this, mandatory); return AbilityFactoryChangeZone.changeZoneTriggerAI(af, this, mandatory);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, abChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, abChangeZone);
return abChangeZone; return abChangeZone;
} }
@@ -102,20 +102,20 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ChangeZone.changeZoneCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneResolve(af, this); AbilityFactoryChangeZone.changeZoneResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneDescription(af, this); return AbilityFactoryChangeZone.changeZoneDescription(af, this);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, spChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, spChangeZone);
return spChangeZone; return spChangeZone;
} }
@@ -134,25 +134,25 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneResolve(af, this); AbilityFactoryChangeZone.changeZoneResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ChangeZone.changeZonePlayDrawbackAI(af, this); return AbilityFactoryChangeZone.changeZonePlayDrawbackAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneDescription(af, this); return AbilityFactoryChangeZone.changeZoneDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ChangeZone.changeZoneTriggerAI(af, this, mandatory); return AbilityFactoryChangeZone.changeZoneTriggerAI(af, this, mandatory);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, dbChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, dbChangeZone);
return dbChangeZone; return dbChangeZone;
} }
@@ -228,10 +228,10 @@ public final class AbilityFactory_ChangeZone {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin"); final String origin = params.get("Origin");
if (AbilityFactory_ChangeZone.isHidden(origin, params.containsKey("Hidden"))) { if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactory_ChangeZone.changeHiddenOriginCanPlayAI(af, sa); return AbilityFactoryChangeZone.changeHiddenOriginCanPlayAI(af, sa);
} else if (AbilityFactory_ChangeZone.isKnown(origin)) { } else if (AbilityFactoryChangeZone.isKnown(origin)) {
return AbilityFactory_ChangeZone.changeKnownOriginCanPlayAI(af, sa); return AbilityFactoryChangeZone.changeKnownOriginCanPlayAI(af, sa);
} }
return false; return false;
@@ -252,10 +252,10 @@ public final class AbilityFactory_ChangeZone {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin"); final String origin = params.get("Origin");
if (AbilityFactory_ChangeZone.isHidden(origin, params.containsKey("Hidden"))) { if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactory_ChangeZone.changeHiddenOriginPlayDrawbackAI(af, sa); return AbilityFactoryChangeZone.changeHiddenOriginPlayDrawbackAI(af, sa);
} else if (AbilityFactory_ChangeZone.isKnown(origin)) { } else if (AbilityFactoryChangeZone.isKnown(origin)) {
return AbilityFactory_ChangeZone.changeKnownOriginPlayDrawbackAI(af, sa); return AbilityFactoryChangeZone.changeKnownOriginPlayDrawbackAI(af, sa);
} }
return false; return false;
@@ -278,10 +278,10 @@ public final class AbilityFactory_ChangeZone {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin"); final String origin = params.get("Origin");
if (AbilityFactory_ChangeZone.isHidden(origin, params.containsKey("Hidden"))) { if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactory_ChangeZone.changeHiddenTriggerAI(af, sa, mandatory); return AbilityFactoryChangeZone.changeHiddenTriggerAI(af, sa, mandatory);
} else if (AbilityFactory_ChangeZone.isKnown(origin)) { } else if (AbilityFactoryChangeZone.isKnown(origin)) {
return AbilityFactory_ChangeZone.changeKnownOriginTriggerAI(af, sa, mandatory); return AbilityFactoryChangeZone.changeKnownOriginTriggerAI(af, sa, mandatory);
} }
return false; return false;
@@ -302,10 +302,10 @@ public final class AbilityFactory_ChangeZone {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin"); final String origin = params.get("Origin");
if (AbilityFactory_ChangeZone.isHidden(origin, params.containsKey("Hidden"))) { if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden"))) {
return AbilityFactory_ChangeZone.changeHiddenOriginStackDescription(af, sa); return AbilityFactoryChangeZone.changeHiddenOriginStackDescription(af, sa);
} else if (AbilityFactory_ChangeZone.isKnown(origin)) { } else if (AbilityFactoryChangeZone.isKnown(origin)) {
return AbilityFactory_ChangeZone.changeKnownOriginStackDescription(af, sa); return AbilityFactoryChangeZone.changeKnownOriginStackDescription(af, sa);
} }
return ""; return "";
@@ -325,10 +325,10 @@ public final class AbilityFactory_ChangeZone {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String origin = params.get("Origin"); final String origin = params.get("Origin");
if (AbilityFactory_ChangeZone.isHidden(origin, params.containsKey("Hidden")) && !params.containsKey("Ninjutsu")) { if (AbilityFactoryChangeZone.isHidden(origin, params.containsKey("Hidden")) && !params.containsKey("Ninjutsu")) {
AbilityFactory_ChangeZone.changeHiddenOriginResolve(af, sa); AbilityFactoryChangeZone.changeHiddenOriginResolve(af, sa);
} else if (AbilityFactory_ChangeZone.isKnown(origin) || params.containsKey("Ninjutsu")) { } else if (AbilityFactoryChangeZone.isKnown(origin) || params.containsKey("Ninjutsu")) {
AbilityFactory_ChangeZone.changeKnownOriginResolve(af, sa); AbilityFactoryChangeZone.changeKnownOriginResolve(af, sa);
} }
} }
@@ -696,9 +696,9 @@ public final class AbilityFactory_ChangeZone {
decider = player; decider = player;
} }
if (decider.isComputer()) { if (decider.isComputer()) {
AbilityFactory_ChangeZone.changeHiddenOriginResolveAI(af, sa, player); AbilityFactoryChangeZone.changeHiddenOriginResolveAI(af, sa, player);
} else { } else {
AbilityFactory_ChangeZone.changeHiddenOriginResolveHuman(af, sa, player); AbilityFactoryChangeZone.changeHiddenOriginResolveHuman(af, sa, player);
} }
} }
} }
@@ -942,9 +942,9 @@ public final class AbilityFactory_ChangeZone {
} else if (defined) { } else if (defined) {
c = fetchList.get(i); c = fetchList.get(i);
} else if (type.contains("Basic")) { } else if (type.contains("Basic")) {
c = AbilityFactory_ChangeZone.basicManaFixing(fetchList); c = AbilityFactoryChangeZone.basicManaFixing(fetchList);
} else if (AbilityFactory_ChangeZone.areAllBasics(type)) { } else if (AbilityFactoryChangeZone.areAllBasics(type)) {
c = AbilityFactory_ChangeZone.basicManaFixing(fetchList, type); c = AbilityFactoryChangeZone.basicManaFixing(fetchList, type);
} else if (fetchList.getNotType("Creature").size() == 0) { } else if (fetchList.getNotType("Creature").size() == 0) {
c = CardFactoryUtil.getBestCreatureAI(fetchList); // if only c = CardFactoryUtil.getBestCreatureAI(fetchList); // if only
// creatures // creatures
@@ -997,7 +997,7 @@ public final class AbilityFactory_ChangeZone {
} }
// Auras without Candidates stay in their current location // Auras without Candidates stay in their current location
if (c.isAura()) { if (c.isAura()) {
final SpellAbility saAura = AbilityFactory_Attach.getAttachSpellAbility(c); final SpellAbility saAura = AbilityFactoryAttach.getAttachSpellAbility(c);
if (!saAura.getTarget().hasCandidates(false)) { if (!saAura.getTarget().hasCandidates(false)) {
continue; continue;
} }
@@ -1042,7 +1042,7 @@ public final class AbilityFactory_ChangeZone {
*/ */
private static Card basicManaFixing(final CardList list) { // Search for a private static Card basicManaFixing(final CardList list) { // Search for a
// Basic Land // Basic Land
return AbilityFactory_ChangeZone.basicManaFixing(list, "Plains, Island, Swamp, Mountain, Forest"); return AbilityFactoryChangeZone.basicManaFixing(list, "Plains, Island, Swamp, Mountain, Forest");
} }
/** /**
@@ -1179,12 +1179,12 @@ public final class AbilityFactory_ChangeZone {
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
if (tgt != null) { if (tgt != null) {
if (!AbilityFactory_ChangeZone.changeKnownPreferredTarget(af, sa, false)) { if (!AbilityFactoryChangeZone.changeKnownPreferredTarget(af, sa, false)) {
return false; return false;
} }
} else { } else {
// non-targeted retrieval // non-targeted retrieval
final CardList retrieval = AbilityFactory_ChangeZone.knownDetermineDefined(sa, params.get("Defined"), final CardList retrieval = AbilityFactoryChangeZone.knownDetermineDefined(sa, params.get("Defined"),
origin); origin);
if ((retrieval == null) || retrieval.isEmpty()) { if ((retrieval == null) || retrieval.isEmpty()) {
@@ -1253,7 +1253,7 @@ public final class AbilityFactory_ChangeZone {
return true; return true;
} }
return AbilityFactory_ChangeZone.changeKnownPreferredTarget(af, sa, false); return AbilityFactoryChangeZone.changeKnownPreferredTarget(af, sa, false);
} }
/** /**
@@ -1562,9 +1562,9 @@ public final class AbilityFactory_ChangeZone {
if (sa.getTarget() == null) { if (sa.getTarget() == null) {
// Just in case of Defined cases // Just in case of Defined cases
// do nothing // do nothing
} else if (AbilityFactory_ChangeZone.changeKnownPreferredTarget(af, sa, mandatory)) { } else if (AbilityFactoryChangeZone.changeKnownPreferredTarget(af, sa, mandatory)) {
// do nothing // do nothing
} else if (!AbilityFactory_ChangeZone.changeKnownUnpreferredTarget(af, sa, mandatory)) { } else if (!AbilityFactoryChangeZone.changeKnownUnpreferredTarget(af, sa, mandatory)) {
return false; return false;
} }
@@ -1610,7 +1610,7 @@ public final class AbilityFactory_ChangeZone {
} else { } else {
// otherwise add self to list and go from there // otherwise add self to list and go from there
tgts = new ArrayList<Card>(); tgts = new ArrayList<Card>();
for (final Card c : AbilityFactory_ChangeZone.knownDetermineDefined(sa, params.get("Defined"), origin)) { for (final Card c : AbilityFactoryChangeZone.knownDetermineDefined(sa, params.get("Defined"), origin)) {
tgts.add(c); tgts.add(c);
} }
} }
@@ -1723,7 +1723,7 @@ public final class AbilityFactory_ChangeZone {
tgtCards = tgt.getTargetCards(); tgtCards = tgt.getTargetCards();
} else { } else {
tgtCards = new ArrayList<Card>(); tgtCards = new ArrayList<Card>();
for (final Card c : AbilityFactory_ChangeZone.knownDetermineDefined(sa, params.get("Defined"), origin)) { for (final Card c : AbilityFactoryChangeZone.knownDetermineDefined(sa, params.get("Defined"), origin)) {
tgtCards.add(c); tgtCards.add(c);
} }
} }
@@ -1778,7 +1778,7 @@ public final class AbilityFactory_ChangeZone {
// Auras without Candidates stay in their current // Auras without Candidates stay in their current
// location // location
if (tgtC.isAura()) { if (tgtC.isAura()) {
final SpellAbility saAura = AbilityFactory_Attach.getAttachSpellAbility(tgtC); final SpellAbility saAura = AbilityFactoryAttach.getAttachSpellAbility(tgtC);
if (!saAura.getTarget().hasCandidates(false)) { if (!saAura.getTarget().hasCandidates(false)) {
continue; continue;
} }
@@ -1852,26 +1852,26 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ChangeZone.changeZoneAllCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneAllResolve(af, this); AbilityFactoryChangeZone.changeZoneAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneAllDescription(af, this); return AbilityFactoryChangeZone.changeZoneAllDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ChangeZone.changeZoneAllCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneAllCanPlayAI(af, this);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, abChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, abChangeZone);
return abChangeZone; return abChangeZone;
} }
@@ -1890,20 +1890,20 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ChangeZone.changeZoneAllCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneAllResolve(af, this); AbilityFactoryChangeZone.changeZoneAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneAllDescription(af, this); return AbilityFactoryChangeZone.changeZoneAllDescription(af, this);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, spChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, spChangeZone);
return spChangeZone; return spChangeZone;
} }
@@ -1922,25 +1922,25 @@ public final class AbilityFactory_ChangeZone {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ChangeZone.changeZoneAllResolve(af, this); AbilityFactoryChangeZone.changeZoneAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ChangeZone.changeZoneAllPlayDrawbackAI(af, this); return AbilityFactoryChangeZone.changeZoneAllPlayDrawbackAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ChangeZone.changeZoneAllDescription(af, this); return AbilityFactoryChangeZone.changeZoneAllDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ChangeZone.changeZoneAllCanPlayAI(af, this); return AbilityFactoryChangeZone.changeZoneAllCanPlayAI(af, this);
} }
}; };
AbilityFactory_ChangeZone.setMiscellaneous(af, dbChangeZone); AbilityFactoryChangeZone.setMiscellaneous(af, dbChangeZone);
return dbChangeZone; return dbChangeZone;
} }
@@ -2182,7 +2182,7 @@ public final class AbilityFactory_ChangeZone {
if (destination.equals(Zone.Battlefield)) { if (destination.equals(Zone.Battlefield)) {
// Auras without Candidates stay in their current location // Auras without Candidates stay in their current location
if (c.isAura()) { if (c.isAura()) {
final SpellAbility saAura = AbilityFactory_Attach.getAttachSpellAbility(c); final SpellAbility saAura = AbilityFactoryAttach.getAttachSpellAbility(c);
if (!saAura.getTarget().hasCandidates(false)) { if (!saAura.getTarget().hasCandidates(false)) {
continue; continue;
} }

18
src/main/java/forge/card/abilityFactory/AbilityFactory_Charm.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java
View File

@@ -18,9 +18,9 @@ import forge.gui.GuiUtils;
* *
* @author Forge * @author Forge
*/ */
public final class AbilityFactory_Charm { public final class AbilityFactoryCharm {
private AbilityFactory_Charm() { private AbilityFactoryCharm() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -39,22 +39,22 @@ public final class AbilityFactory_Charm {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Charm.charmCanPlayAI(af, this); return AbilityFactoryCharm.charmCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Charm.charmResolve(af, this); AbilityFactoryCharm.charmResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Charm.charmStackDescription(af, this); return AbilityFactoryCharm.charmStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Charm.charmCanPlayAI(af, this); return AbilityFactoryCharm.charmCanPlayAI(af, this);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -76,17 +76,17 @@ public final class AbilityFactory_Charm {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Charm.charmCanPlayAI(af, this); return AbilityFactoryCharm.charmCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Charm.charmResolve(af, this); AbilityFactoryCharm.charmResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Charm.charmStackDescription(af, this); return AbilityFactoryCharm.charmStackDescription(af, this);
} }
}; };

112
src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java → src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java
View File

@@ -34,9 +34,9 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Choose { public final class AbilityFactoryChoose {
private AbilityFactory_Choose() { private AbilityFactoryChoose() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -60,22 +60,22 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseTypeStackDescription(af, this); return AbilityFactoryChoose.chooseTypeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseTypeCanPlayAI(af, this); return AbilityFactoryChoose.chooseTypeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseTypeResolve(af, this); AbilityFactoryChoose.chooseTypeResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseTypeTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseTypeTriggerAI(af, this, mandatory);
} }
}; };
@@ -97,17 +97,17 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseTypeStackDescription(af, this); return AbilityFactoryChoose.chooseTypeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseTypeCanPlayAI(af, this); return AbilityFactoryChoose.chooseTypeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseTypeResolve(af, this); AbilityFactoryChoose.chooseTypeResolve(af, this);
} }
}; };
@@ -129,12 +129,12 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseTypeStackDescription(af, this); return AbilityFactoryChoose.chooseTypeStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseTypeResolve(af, this); AbilityFactoryChoose.chooseTypeResolve(af, this);
} }
@Override @Override
@@ -144,7 +144,7 @@ public final class AbilityFactory_Choose {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseTypeTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseTypeTriggerAI(af, this, mandatory);
} }
}; };
@@ -206,7 +206,7 @@ public final class AbilityFactory_Choose {
* @return a boolean. * @return a boolean.
*/ */
private static boolean chooseTypeCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean chooseTypeCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Choose.chooseTypeTriggerAI(af, sa, false); return AbilityFactoryChoose.chooseTypeTriggerAI(af, sa, false);
} }
/** /**
@@ -415,22 +415,22 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseColorStackDescription(af, this); return AbilityFactoryChoose.chooseColorStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseColorCanPlayAI(af, this); return AbilityFactoryChoose.chooseColorCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseColorResolve(af, this); AbilityFactoryChoose.chooseColorResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseColorTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseColorTriggerAI(af, this, mandatory);
} }
}; };
@@ -453,17 +453,17 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseColorStackDescription(af, this); return AbilityFactoryChoose.chooseColorStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseColorCanPlayAI(af, this); return AbilityFactoryChoose.chooseColorCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseColorResolve(af, this); AbilityFactoryChoose.chooseColorResolve(af, this);
} }
}; };
@@ -486,12 +486,12 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseColorStackDescription(af, this); return AbilityFactoryChoose.chooseColorStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseColorResolve(af, this); AbilityFactoryChoose.chooseColorResolve(af, this);
} }
@Override @Override
@@ -501,7 +501,7 @@ public final class AbilityFactory_Choose {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseColorTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseColorTriggerAI(af, this, mandatory);
} }
}; };
@@ -695,22 +695,22 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseNumberStackDescription(af, this); return AbilityFactoryChoose.chooseNumberStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseNumberCanPlayAI(af, this); return AbilityFactoryChoose.chooseNumberCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseNumberResolve(af, this); AbilityFactoryChoose.chooseNumberResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseNumberTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseNumberTriggerAI(af, this, mandatory);
} }
}; };
@@ -733,17 +733,17 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseNumberStackDescription(af, this); return AbilityFactoryChoose.chooseNumberStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.chooseNumberCanPlayAI(af, this); return AbilityFactoryChoose.chooseNumberCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseNumberResolve(af, this); AbilityFactoryChoose.chooseNumberResolve(af, this);
} }
}; };
@@ -766,12 +766,12 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.chooseNumberStackDescription(af, this); return AbilityFactoryChoose.chooseNumberStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.chooseNumberResolve(af, this); AbilityFactoryChoose.chooseNumberResolve(af, this);
} }
@Override @Override
@@ -781,7 +781,7 @@ public final class AbilityFactory_Choose {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.chooseNumberTriggerAI(af, this, mandatory); return AbilityFactoryChoose.chooseNumberTriggerAI(af, this, mandatory);
} }
}; };
@@ -842,7 +842,7 @@ public final class AbilityFactory_Choose {
* @return a boolean. * @return a boolean.
*/ */
private static boolean chooseNumberCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean chooseNumberCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Choose.chooseNumberTriggerAI(af, sa, false); return AbilityFactoryChoose.chooseNumberTriggerAI(af, sa, false);
} }
/** /**
@@ -942,22 +942,22 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.choosePlayerStackDescription(af, this); return AbilityFactoryChoose.choosePlayerStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.choosePlayerCanPlayAI(af, this); return AbilityFactoryChoose.choosePlayerCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.choosePlayerResolve(af, this); AbilityFactoryChoose.choosePlayerResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.choosePlayerTriggerAI(af, this, mandatory); return AbilityFactoryChoose.choosePlayerTriggerAI(af, this, mandatory);
} }
}; };
@@ -981,17 +981,17 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.choosePlayerStackDescription(af, this); return AbilityFactoryChoose.choosePlayerStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.choosePlayerCanPlayAI(af, this); return AbilityFactoryChoose.choosePlayerCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.choosePlayerResolve(af, this); AbilityFactoryChoose.choosePlayerResolve(af, this);
} }
}; };
@@ -1015,12 +1015,12 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.choosePlayerStackDescription(af, this); return AbilityFactoryChoose.choosePlayerStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.choosePlayerResolve(af, this); AbilityFactoryChoose.choosePlayerResolve(af, this);
} }
@Override @Override
@@ -1030,7 +1030,7 @@ public final class AbilityFactory_Choose {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.choosePlayerTriggerAI(af, this, mandatory); return AbilityFactoryChoose.choosePlayerTriggerAI(af, this, mandatory);
} }
}; };
@@ -1091,7 +1091,7 @@ public final class AbilityFactory_Choose {
* @return a boolean. * @return a boolean.
*/ */
private static boolean choosePlayerCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean choosePlayerCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Choose.choosePlayerTriggerAI(af, sa, false); return AbilityFactoryChoose.choosePlayerTriggerAI(af, sa, false);
} }
/** /**
@@ -1174,22 +1174,22 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.nameCardStackDescription(af, this); return AbilityFactoryChoose.nameCardStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.nameCardCanPlayAI(af, this); return AbilityFactoryChoose.nameCardCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.nameCardResolve(af, this); AbilityFactoryChoose.nameCardResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.nameCardTriggerAI(af, this, mandatory); return AbilityFactoryChoose.nameCardTriggerAI(af, this, mandatory);
} }
}; };
@@ -1212,17 +1212,17 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.nameCardStackDescription(af, this); return AbilityFactoryChoose.nameCardStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Choose.nameCardCanPlayAI(af, this); return AbilityFactoryChoose.nameCardCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.nameCardResolve(af, this); AbilityFactoryChoose.nameCardResolve(af, this);
} }
}; };
@@ -1245,12 +1245,12 @@ public final class AbilityFactory_Choose {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Choose.nameCardStackDescription(af, this); return AbilityFactoryChoose.nameCardStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Choose.nameCardResolve(af, this); AbilityFactoryChoose.nameCardResolve(af, this);
} }
@Override @Override
@@ -1260,7 +1260,7 @@ public final class AbilityFactory_Choose {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Choose.nameCardTriggerAI(af, this, mandatory); return AbilityFactoryChoose.nameCardTriggerAI(af, this, mandatory);
} }
}; };
@@ -1321,7 +1321,7 @@ public final class AbilityFactory_Choose {
* @return a boolean. * @return a boolean.
*/ */
private static boolean nameCardCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean nameCardCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Choose.choosePlayerTriggerAI(af, sa, false); return AbilityFactoryChoose.choosePlayerTriggerAI(af, sa, false);
} }
/** /**

22
src/main/java/forge/card/abilityFactory/AbilityFactory_Clash.java → src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java
View File

@@ -20,9 +20,9 @@ import forge.card.spellability.SpellAbility;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Clash { public final class AbilityFactoryClash {
private AbilityFactory_Clash() { private AbilityFactoryClash() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -62,7 +62,7 @@ public final class AbilityFactory_Clash {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.clashResolve(af, this); AbilityFactoryClash.clashResolve(af, this);
} }
}; };
@@ -105,7 +105,7 @@ public final class AbilityFactory_Clash {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.clashResolve(af, this); AbilityFactoryClash.clashResolve(af, this);
} }
}; };
@@ -153,7 +153,7 @@ public final class AbilityFactory_Clash {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.clashResolve(af, this); AbilityFactoryClash.clashResolve(af, this);
} }
}; };
@@ -233,12 +233,12 @@ public final class AbilityFactory_Clash {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Clash.flipGetStackDescription(af, this); return AbilityFactoryClash.flipGetStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.flipResolve(af, this); AbilityFactoryClash.flipResolve(af, this);
} }
}; };
@@ -276,12 +276,12 @@ public final class AbilityFactory_Clash {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Clash.flipGetStackDescription(af, this); return AbilityFactoryClash.flipGetStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.flipResolve(af, this); AbilityFactoryClash.flipResolve(af, this);
} }
}; };
@@ -324,12 +324,12 @@ public final class AbilityFactory_Clash {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Clash.flipGetStackDescription(af, this); return AbilityFactoryClash.flipGetStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Clash.flipResolve(af, this); AbilityFactoryClash.flipResolve(af, this);
} }
}; };

6
src/main/java/forge/card/abilityFactory/AbilityFactory_Cleanup.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java
View File

@@ -17,9 +17,9 @@ import forge.card.spellability.SpellAbility;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Cleanup { public final class AbilityFactoryCleanup {
private AbilityFactory_Cleanup() { private AbilityFactoryCleanup() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -48,7 +48,7 @@ public final class AbilityFactory_Cleanup {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Cleanup.doResolve(af, this); AbilityFactoryCleanup.doResolve(af, this);
} }
}; };

84
src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java
View File

@@ -27,9 +27,9 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Combat { public final class AbilityFactoryCombat {
private AbilityFactory_Combat() { private AbilityFactoryCombat() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -54,22 +54,22 @@ public final class AbilityFactory_Combat {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Combat.fogStackDescription(af, this); return AbilityFactoryCombat.fogStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.fogCanPlayAI(af, this); return AbilityFactoryCombat.fogCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.fogResolve(af, this); AbilityFactoryCombat.fogResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.fogDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.fogDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -93,17 +93,17 @@ public final class AbilityFactory_Combat {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Combat.fogStackDescription(af, this); return AbilityFactoryCombat.fogStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.fogCanPlayAI(af, this); return AbilityFactoryCombat.fogCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.fogResolve(af, this); AbilityFactoryCombat.fogResolve(af, this);
} }
}; };
@@ -125,17 +125,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.fogResolve(af, this); AbilityFactoryCombat.fogResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Combat.fogPlayDrawbackAI(af, this); return AbilityFactoryCombat.fogPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.fogDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.fogDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -317,22 +317,22 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.mustAttackStackDescription(af, this); return AbilityFactoryCombat.mustAttackStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.mustAttackCanPlayAI(af, this); return AbilityFactoryCombat.mustAttackCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustAttackResolve(af, this); AbilityFactoryCombat.mustAttackResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.mustAttackDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.mustAttackDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -354,17 +354,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.mustAttackStackDescription(af, this); return AbilityFactoryCombat.mustAttackStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.mustAttackCanPlayAI(af, this); return AbilityFactoryCombat.mustAttackCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustAttackResolve(af, this); AbilityFactoryCombat.mustAttackResolve(af, this);
} }
}; };
@@ -386,17 +386,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustAttackResolve(af, this); AbilityFactoryCombat.mustAttackResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Combat.mustAttackPlayDrawbackAI(af, this); return AbilityFactoryCombat.mustAttackPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.mustAttackDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.mustAttackDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -534,22 +534,22 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.removeFromCombatStackDescription(af, this); return AbilityFactoryCombat.removeFromCombatStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.removeFromCombatCanPlayAI(af, this); return AbilityFactoryCombat.removeFromCombatCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.removeFromCombatResolve(af, this); AbilityFactoryCombat.removeFromCombatResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.removeFromCombatDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.removeFromCombatDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -571,17 +571,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.removeFromCombatStackDescription(af, this); return AbilityFactoryCombat.removeFromCombatStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.removeFromCombatCanPlayAI(af, this); return AbilityFactoryCombat.removeFromCombatCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.removeFromCombatResolve(af, this); AbilityFactoryCombat.removeFromCombatResolve(af, this);
} }
}; };
@@ -603,17 +603,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.removeFromCombatResolve(af, this); AbilityFactoryCombat.removeFromCombatResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Combat.removeFromCombatPlayDrawbackAI(af, this); return AbilityFactoryCombat.removeFromCombatPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.removeFromCombatDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.removeFromCombatDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -744,22 +744,22 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.mustBlockStackDescription(af, this); return AbilityFactoryCombat.mustBlockStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.mustBlockCanPlayAI(af, this); return AbilityFactoryCombat.mustBlockCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustBlockResolve(af, this); AbilityFactoryCombat.mustBlockResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.mustBlockDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.mustBlockDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -783,17 +783,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Combat.mustBlockStackDescription(af, this); return AbilityFactoryCombat.mustBlockStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Combat.mustBlockCanPlayAI(af, this); return AbilityFactoryCombat.mustBlockCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustBlockResolve(af, this); AbilityFactoryCombat.mustBlockResolve(af, this);
} }
}; };
@@ -817,17 +817,17 @@ public final class AbilityFactory_Combat {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Combat.mustBlockResolve(af, this); AbilityFactoryCombat.mustBlockResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Combat.mustBlockPlayDrawbackAI(af, this); return AbilityFactoryCombat.mustBlockPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Combat.mustBlockDoTriggerAI(af, this, mandatory); return AbilityFactoryCombat.mustBlockDoTriggerAI(af, this, mandatory);
} }
}; };

46
src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java
View File

@@ -33,9 +33,9 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Copy { public final class AbilityFactoryCopy {
private AbilityFactory_Copy() { private AbilityFactoryCopy() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -59,22 +59,22 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copyPermanentStackDescription(af, this); return AbilityFactoryCopy.copyPermanentStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Copy.copyPermanentCanPlayAI(af, this); return AbilityFactoryCopy.copyPermanentCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copyPermanentResolve(af, this); AbilityFactoryCopy.copyPermanentResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Copy.copyPermanentTriggerAI(af, this, mandatory); return AbilityFactoryCopy.copyPermanentTriggerAI(af, this, mandatory);
} }
}; };
@@ -96,17 +96,17 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copyPermanentStackDescription(af, this); return AbilityFactoryCopy.copyPermanentStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Copy.copyPermanentCanPlayAI(af, this); return AbilityFactoryCopy.copyPermanentCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copyPermanentResolve(af, this); AbilityFactoryCopy.copyPermanentResolve(af, this);
} }
}; };
@@ -128,12 +128,12 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copyPermanentStackDescription(af, this); return AbilityFactoryCopy.copyPermanentStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copyPermanentResolve(af, this); AbilityFactoryCopy.copyPermanentResolve(af, this);
} }
@Override @Override
@@ -143,7 +143,7 @@ public final class AbilityFactory_Copy {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Copy.copyPermanentTriggerAI(af, this, mandatory); return AbilityFactoryCopy.copyPermanentTriggerAI(af, this, mandatory);
} }
}; };
@@ -224,7 +224,7 @@ public final class AbilityFactory_Copy {
} }
final Random r = MyRandom.getRandom(); final Random r = MyRandom.getRandom();
if (r.nextFloat() <= Math.pow(chance, sa.getActivationsThisTurn() + 1)) { if (r.nextFloat() <= Math.pow(chance, sa.getActivationsThisTurn() + 1)) {
return AbilityFactory_Copy.copyPermanentTriggerAI(af, sa, false); return AbilityFactoryCopy.copyPermanentTriggerAI(af, sa, false);
} else { } else {
return false; return false;
} }
@@ -496,22 +496,22 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copySpellStackDescription(af, this); return AbilityFactoryCopy.copySpellStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Copy.copySpellCanPlayAI(af, this); return AbilityFactoryCopy.copySpellCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copySpellResolve(af, this); AbilityFactoryCopy.copySpellResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Copy.copySpellTriggerAI(af, this, mandatory); return AbilityFactoryCopy.copySpellTriggerAI(af, this, mandatory);
} }
}; };
@@ -533,17 +533,17 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copySpellStackDescription(af, this); return AbilityFactoryCopy.copySpellStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Copy.copySpellCanPlayAI(af, this); return AbilityFactoryCopy.copySpellCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copySpellResolve(af, this); AbilityFactoryCopy.copySpellResolve(af, this);
} }
}; };
@@ -565,12 +565,12 @@ public final class AbilityFactory_Copy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Copy.copySpellStackDescription(af, this); return AbilityFactoryCopy.copySpellStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Copy.copySpellResolve(af, this); AbilityFactoryCopy.copySpellResolve(af, this);
} }
@Override @Override
@@ -580,7 +580,7 @@ public final class AbilityFactory_Copy {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Copy.copySpellTriggerAI(af, this, mandatory); return AbilityFactoryCopy.copySpellTriggerAI(af, this, mandatory);
} }
}; };

28
src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java
View File

@@ -40,7 +40,7 @@ import forge.card.spellability.Target_Selection;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_CounterMagic { public class AbilityFactoryCounterMagic {
private AbilityFactory af = null; private AbilityFactory af = null;
private HashMap<String, String> params = null; private HashMap<String, String> params = null;
@@ -55,7 +55,7 @@ public class AbilityFactory_CounterMagic {
* @param newAF * @param newAF
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public AbilityFactory_CounterMagic(final AbilityFactory newAF) { public AbilityFactoryCounterMagic(final AbilityFactory newAF) {
this.af = newAF; this.af = newAF;
this.params = this.af.getMapParams(); this.params = this.af.getMapParams();
@@ -85,23 +85,23 @@ public class AbilityFactory_CounterMagic {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_CounterMagic.this.counterStackDescription(AbilityFactory_CounterMagic.this.af, return AbilityFactoryCounterMagic.this.counterStackDescription(AbilityFactoryCounterMagic.this.af,
this); this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_CounterMagic.this.counterCanPlayAI(AbilityFactory_CounterMagic.this.af, this); return AbilityFactoryCounterMagic.this.counterCanPlayAI(AbilityFactoryCounterMagic.this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_CounterMagic.this.counterResolve(AbilityFactory_CounterMagic.this.af, this); AbilityFactoryCounterMagic.this.counterResolve(AbilityFactoryCounterMagic.this.af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_CounterMagic.this.counterCanPlayAI(AbilityFactory_CounterMagic.this.af, this); return AbilityFactoryCounterMagic.this.counterCanPlayAI(AbilityFactoryCounterMagic.this.af, this);
} }
}; };
@@ -124,18 +124,18 @@ public class AbilityFactory_CounterMagic {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_CounterMagic.this.counterStackDescription(AbilityFactory_CounterMagic.this.af, return AbilityFactoryCounterMagic.this.counterStackDescription(AbilityFactoryCounterMagic.this.af,
this); this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_CounterMagic.this.counterCanPlayAI(AbilityFactory_CounterMagic.this.af, this); return AbilityFactoryCounterMagic.this.counterCanPlayAI(AbilityFactoryCounterMagic.this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_CounterMagic.this.counterResolve(AbilityFactory_CounterMagic.this.af, this); AbilityFactoryCounterMagic.this.counterResolve(AbilityFactoryCounterMagic.this.af, this);
} }
}; };
@@ -158,29 +158,29 @@ public class AbilityFactory_CounterMagic {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_CounterMagic.this.counterStackDescription(AbilityFactory_CounterMagic.this.af, return AbilityFactoryCounterMagic.this.counterStackDescription(AbilityFactoryCounterMagic.this.af,
this); this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_CounterMagic.this.counterCanPlayAI(AbilityFactory_CounterMagic.this.af, this); return AbilityFactoryCounterMagic.this.counterCanPlayAI(AbilityFactoryCounterMagic.this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_CounterMagic.this.counterResolve(AbilityFactory_CounterMagic.this.af, this); AbilityFactoryCounterMagic.this.counterResolve(AbilityFactoryCounterMagic.this.af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_CounterMagic.this.counterDoTriggerAI(AbilityFactory_CounterMagic.this.af, this, return AbilityFactoryCounterMagic.this.counterDoTriggerAI(AbilityFactoryCounterMagic.this.af, this,
true); true);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_CounterMagic.this.counterDoTriggerAI(AbilityFactory_CounterMagic.this.af, this, return AbilityFactoryCounterMagic.this.counterDoTriggerAI(AbilityFactoryCounterMagic.this.af, this,
mandatory); mandatory);
} }

148
src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java → src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java
View File

@@ -37,7 +37,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Counters { public class AbilityFactoryCounters {
// An AbilityFactory subclass for Putting or Removing Counters on Cards. // An AbilityFactory subclass for Putting or Removing Counters on Cards.
// ******************************************* // *******************************************
@@ -60,22 +60,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putStackDescription(af, this); return AbilityFactoryCounters.putStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.putCanPlayAI(af, this); return AbilityFactoryCounters.putCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putResolve(af, this); AbilityFactoryCounters.putResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.putDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.putDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -97,7 +97,7 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putStackDescription(af, this); return AbilityFactoryCounters.putStackDescription(af, this);
} }
@Override @Override
@@ -107,12 +107,12 @@ public class AbilityFactory_Counters {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_Counters.putCanPlayAI(af, this); return AbilityFactoryCounters.putCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putResolve(af, this); AbilityFactoryCounters.putResolve(af, this);
} }
}; };
@@ -134,22 +134,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putStackDescription(af, this); return AbilityFactoryCounters.putStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putResolve(af, this); AbilityFactoryCounters.putResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.putPlayDrawbackAI(af, this); return AbilityFactoryCounters.putPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.putDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.putDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -333,9 +333,9 @@ public class AbilityFactory_Counters {
} }
if (af.isCurse()) { if (af.isCurse()) {
choice = AbilityFactory_Counters.chooseCursedTarget(list, type, amount); choice = AbilityFactoryCounters.chooseCursedTarget(list, type, amount);
} else { } else {
choice = AbilityFactory_Counters.chooseBoonTarget(list, type); choice = AbilityFactoryCounters.chooseBoonTarget(list, type);
} }
if (choice == null) { // can't find anything left if (choice == null) { // can't find anything left
@@ -433,7 +433,7 @@ public class AbilityFactory_Counters {
} }
if (af.isCurse()) { if (af.isCurse()) {
choice = AbilityFactory_Counters.chooseCursedTarget(list, type, amount); choice = AbilityFactoryCounters.chooseCursedTarget(list, type, amount);
} else { } else {
} }
@@ -528,7 +528,7 @@ public class AbilityFactory_Counters {
// Choose targets here: // Choose targets here:
if (af.isCurse()) { if (af.isCurse()) {
if (preferred) { if (preferred) {
choice = AbilityFactory_Counters.chooseCursedTarget(list, type, amount); choice = AbilityFactoryCounters.chooseCursedTarget(list, type, amount);
} }
else { else {
@@ -540,7 +540,7 @@ public class AbilityFactory_Counters {
} }
} else { } else {
if (preferred) { if (preferred) {
choice = AbilityFactory_Counters.chooseBoonTarget(list, type); choice = AbilityFactoryCounters.chooseBoonTarget(list, type);
} }
else { else {
@@ -709,22 +709,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeStackDescription(af, this); return AbilityFactoryCounters.removeStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.removeCanPlayAI(af, this); return AbilityFactoryCounters.removeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeResolve(af, this); AbilityFactoryCounters.removeResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.removeDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.removeDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -746,7 +746,7 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeStackDescription(af, this); return AbilityFactoryCounters.removeStackDescription(af, this);
} }
@Override @Override
@@ -756,12 +756,12 @@ public class AbilityFactory_Counters {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_Counters.removeCanPlayAI(af, this); return AbilityFactoryCounters.removeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeResolve(af, this); AbilityFactoryCounters.removeResolve(af, this);
} }
}; };
@@ -783,22 +783,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeStackDescription(af, this); return AbilityFactoryCounters.removeStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeResolve(af, this); AbilityFactoryCounters.removeResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.removePlayDrawbackAI(af, this); return AbilityFactoryCounters.removePlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.removeDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.removeDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -1083,22 +1083,22 @@ public class AbilityFactory_Counters {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.proliferateShouldPlayAI(this); return AbilityFactoryCounters.proliferateShouldPlayAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.proliferateResolve(af, this); AbilityFactoryCounters.proliferateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.proliferateStackDescription(this); return AbilityFactoryCounters.proliferateStackDescription(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.proliferateDoTriggerAI(this, mandatory); return AbilityFactoryCounters.proliferateDoTriggerAI(this, mandatory);
} }
}; };
@@ -1120,12 +1120,12 @@ public class AbilityFactory_Counters {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.proliferateShouldPlayAI(this); return AbilityFactoryCounters.proliferateShouldPlayAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.proliferateResolve(af, this); AbilityFactoryCounters.proliferateResolve(af, this);
} }
@Override @Override
@@ -1136,7 +1136,7 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.proliferateStackDescription(this); return AbilityFactoryCounters.proliferateStackDescription(this);
} }
}; };
@@ -1158,27 +1158,27 @@ public class AbilityFactory_Counters {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.proliferateShouldPlayAI(this); return AbilityFactoryCounters.proliferateShouldPlayAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.proliferateResolve(af, this); AbilityFactoryCounters.proliferateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.proliferateStackDescription(this); return AbilityFactoryCounters.proliferateStackDescription(this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.proliferateShouldPlayAI(this); return AbilityFactoryCounters.proliferateShouldPlayAI(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.proliferateDoTriggerAI(this, mandatory); return AbilityFactoryCounters.proliferateDoTriggerAI(this, mandatory);
} }
}; };
@@ -1462,22 +1462,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putAllStackDescription(af, this); return AbilityFactoryCounters.putAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.putAllCanPlayAI(af, this); return AbilityFactoryCounters.putAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putAllResolve(af, this); AbilityFactoryCounters.putAllResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.putAllCanPlayAI(af, this); return AbilityFactoryCounters.putAllCanPlayAI(af, this);
} }
}; };
@@ -1499,17 +1499,17 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putAllStackDescription(af, this); return AbilityFactoryCounters.putAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.putAllCanPlayAI(af, this); return AbilityFactoryCounters.putAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putAllResolve(af, this); AbilityFactoryCounters.putAllResolve(af, this);
} }
}; };
@@ -1531,22 +1531,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.putAllStackDescription(af, this); return AbilityFactoryCounters.putAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.putAllResolve(af, this); AbilityFactoryCounters.putAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.putAllPlayDrawbackAI(af, this); return AbilityFactoryCounters.putAllPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.putAllPlayDrawbackAI(af, this); return AbilityFactoryCounters.putAllPlayDrawbackAI(af, this);
} }
}; };
@@ -1712,7 +1712,7 @@ public class AbilityFactory_Counters {
* @return a boolean. * @return a boolean.
*/ */
private static boolean putAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean putAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Counters.putAllCanPlayAI(af, sa); return AbilityFactoryCounters.putAllCanPlayAI(af, sa);
} }
/** /**
@@ -1771,17 +1771,17 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeCounterAllStackDescription(af, this); return AbilityFactoryCounters.removeCounterAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.removeCounterAllCanPlayAI(af, this); return AbilityFactoryCounters.removeCounterAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeCounterAllResolve(af, this); AbilityFactoryCounters.removeCounterAllResolve(af, this);
} }
@Override @Override
@@ -1808,17 +1808,17 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeCounterAllStackDescription(af, this); return AbilityFactoryCounters.removeCounterAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.removeCounterAllCanPlayAI(af, this); return AbilityFactoryCounters.removeCounterAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeCounterAllResolve(af, this); AbilityFactoryCounters.removeCounterAllResolve(af, this);
} }
}; };
@@ -1840,22 +1840,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.removeCounterAllStackDescription(af, this); return AbilityFactoryCounters.removeCounterAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.removeCounterAllResolve(af, this); AbilityFactoryCounters.removeCounterAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.removeCounterAllPlayDrawbackAI(af, this); return AbilityFactoryCounters.removeCounterAllPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.removeCounterAllPlayDrawbackAI(af, this); return AbilityFactoryCounters.removeCounterAllPlayDrawbackAI(af, this);
} }
}; };
@@ -1935,7 +1935,7 @@ public class AbilityFactory_Counters {
* @return a boolean. * @return a boolean.
*/ */
private static boolean removeCounterAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean removeCounterAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Counters.removeCounterAllCanPlayAI(af, sa); return AbilityFactoryCounters.removeCounterAllCanPlayAI(af, sa);
} }
/** /**
@@ -1992,22 +1992,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.moveCounterStackDescription(af, this); return AbilityFactoryCounters.moveCounterStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.moveCounterCanPlayAI(af, this); return AbilityFactoryCounters.moveCounterCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.moveCounterResolve(af, this); AbilityFactoryCounters.moveCounterResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.moveCounterDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.moveCounterDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -2029,17 +2029,17 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.moveCounterStackDescription(af, this); return AbilityFactoryCounters.moveCounterStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Counters.moveCounterCanPlayAI(af, this); return AbilityFactoryCounters.moveCounterCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.moveCounterResolve(af, this); AbilityFactoryCounters.moveCounterResolve(af, this);
} }
}; };
@@ -2061,22 +2061,22 @@ public class AbilityFactory_Counters {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Counters.moveCounterStackDescription(af, this); return AbilityFactoryCounters.moveCounterStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Counters.moveCounterResolve(af, this); AbilityFactoryCounters.moveCounterResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Counters.moveCounterPlayDrawbackAI(af, this); return AbilityFactoryCounters.moveCounterPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Counters.moveCounterDoTriggerAI(af, this, mandatory); return AbilityFactoryCounters.moveCounterDoTriggerAI(af, this, mandatory);
} }
}; };

54
src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java → src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java
View File

@@ -32,7 +32,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_DealDamage { public class AbilityFactoryDealDamage {
private AbilityFactory abilityFactory = null; private AbilityFactory abilityFactory = null;
private final String damage; private final String damage;
@@ -45,7 +45,7 @@ public class AbilityFactory_DealDamage {
* @param newAF * @param newAF
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public AbilityFactory_DealDamage(final AbilityFactory newAF) { public AbilityFactoryDealDamage(final AbilityFactory newAF) {
this.abilityFactory = newAF; this.abilityFactory = newAF;
this.damage = this.abilityFactory.getMapParams().get("NumDmg"); this.damage = this.abilityFactory.getMapParams().get("NumDmg");
@@ -73,22 +73,22 @@ public class AbilityFactory_DealDamage {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DealDamage.this.doCanPlayAI(this); return AbilityFactoryDealDamage.this.doCanPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DealDamage.this.damageStackDescription(AbilityFactory_DealDamage.this.abilityFactory, this); return AbilityFactoryDealDamage.this.damageStackDescription(AbilityFactoryDealDamage.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.doResolve(this); AbilityFactoryDealDamage.this.doResolve(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DealDamage.this.damageDoTriggerAI(AbilityFactory_DealDamage.this.abilityFactory, this, return AbilityFactoryDealDamage.this.damageDoTriggerAI(AbilityFactoryDealDamage.this.abilityFactory, this,
mandatory); mandatory);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -109,18 +109,18 @@ public class AbilityFactory_DealDamage {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DealDamage.this.doCanPlayAI(this); return AbilityFactoryDealDamage.this.doCanPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DealDamage.this.damageStackDescription(AbilityFactory_DealDamage.this.abilityFactory, this); return AbilityFactoryDealDamage.this.damageStackDescription(AbilityFactoryDealDamage.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.doResolve(this); AbilityFactoryDealDamage.this.doResolve(this);
} }
}; // Spell }; // Spell
@@ -142,22 +142,22 @@ public class AbilityFactory_DealDamage {
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
// Make sure there is a valid target // Make sure there is a valid target
return AbilityFactory_DealDamage.this.damageDrawback(this); return AbilityFactoryDealDamage.this.damageDrawback(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DealDamage.this.damageStackDescription(AbilityFactory_DealDamage.this.abilityFactory, this); return AbilityFactoryDealDamage.this.damageStackDescription(AbilityFactoryDealDamage.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.doResolve(this); AbilityFactoryDealDamage.this.doResolve(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DealDamage.this.damageDoTriggerAI(AbilityFactory_DealDamage.this.abilityFactory, this, return AbilityFactoryDealDamage.this.damageDoTriggerAI(AbilityFactoryDealDamage.this.abilityFactory, this,
mandatory); mandatory);
} }
@@ -814,26 +814,26 @@ public class AbilityFactory_DealDamage {
final SpellAbility abDamageAll = new Ability_Activated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), final SpellAbility abDamageAll = new Ability_Activated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(),
this.abilityFactory.getAbTgt()) { this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -1831356710492849854L; private static final long serialVersionUID = -1831356710492849854L;
private final AbilityFactory af = AbilityFactory_DealDamage.this.abilityFactory; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory;
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DealDamage.this.damageAllStackDescription(this.af, this); return AbilityFactoryDealDamage.this.damageAllStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DealDamage.this.damageAllCanPlayAI(this.af, this); return AbilityFactoryDealDamage.this.damageAllCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.damageAllResolve(this.af, this); AbilityFactoryDealDamage.this.damageAllResolve(this.af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DealDamage.this.damageAllDoTriggerAI(AbilityFactory_DealDamage.this.abilityFactory, this, return AbilityFactoryDealDamage.this.damageAllDoTriggerAI(AbilityFactoryDealDamage.this.abilityFactory, this,
mandatory); mandatory);
} }
@@ -851,27 +851,27 @@ public class AbilityFactory_DealDamage {
public final SpellAbility getSpellDamageAll() { public final SpellAbility getSpellDamageAll() {
final SpellAbility spDamageAll = new Spell(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) { final SpellAbility spDamageAll = new Spell(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 8004957182752984818L; private static final long serialVersionUID = 8004957182752984818L;
private final AbilityFactory af = AbilityFactory_DealDamage.this.abilityFactory; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory;
private final HashMap<String, String> params = this.af.getMapParams(); private final HashMap<String, String> params = this.af.getMapParams();
@Override @Override
public String getStackDescription() { public String getStackDescription() {
if (this.params.containsKey("SpellDescription")) { if (this.params.containsKey("SpellDescription")) {
return AbilityFactory_DealDamage.this.abilityFactory.getHostCard().getName() + " - " return AbilityFactoryDealDamage.this.abilityFactory.getHostCard().getName() + " - "
+ this.params.get("SpellDescription"); + this.params.get("SpellDescription");
} else { } else {
return AbilityFactory_DealDamage.this.damageAllStackDescription(this.af, this); return AbilityFactoryDealDamage.this.damageAllStackDescription(this.af, this);
} }
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DealDamage.this.damageAllCanPlayAI(this.af, this); return AbilityFactoryDealDamage.this.damageAllCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.damageAllResolve(this.af, this); AbilityFactoryDealDamage.this.damageAllResolve(this.af, this);
} }
}; };
@@ -888,16 +888,16 @@ public class AbilityFactory_DealDamage {
public final SpellAbility getDrawbackDamageAll() { public final SpellAbility getDrawbackDamageAll() {
final SpellAbility dbDamageAll = new Ability_Sub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) { final SpellAbility dbDamageAll = new Ability_Sub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -6169562107675964474L; private static final long serialVersionUID = -6169562107675964474L;
private final AbilityFactory af = AbilityFactory_DealDamage.this.abilityFactory; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory;
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DealDamage.this.damageAllStackDescription(this.af, this); return AbilityFactoryDealDamage.this.damageAllStackDescription(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DealDamage.this.damageAllResolve(this.af, this); AbilityFactoryDealDamage.this.damageAllResolve(this.af, this);
} }
@Override @Override
@@ -908,7 +908,7 @@ public class AbilityFactory_DealDamage {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DealDamage.this.damageAllDoTriggerAI(AbilityFactory_DealDamage.this.abilityFactory, this, return AbilityFactoryDealDamage.this.damageAllDoTriggerAI(AbilityFactoryDealDamage.this.abilityFactory, this,
mandatory); mandatory);
} }

68
src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java → src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java
View File

@@ -35,9 +35,9 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Debuff { public final class AbilityFactoryDebuff {
private AbilityFactory_Debuff() { private AbilityFactoryDebuff() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -60,22 +60,22 @@ public final class AbilityFactory_Debuff {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffStackDescription(af, this); return AbilityFactoryDebuff.debuffStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Debuff.debuffCanPlayAI(af, this); return AbilityFactoryDebuff.debuffCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffResolve(af, this); AbilityFactoryDebuff.debuffResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Debuff.debuffTriggerAI(af, this, mandatory); return AbilityFactoryDebuff.debuffTriggerAI(af, this, mandatory);
} }
}; };
@@ -97,17 +97,17 @@ public final class AbilityFactory_Debuff {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffStackDescription(af, this); return AbilityFactoryDebuff.debuffStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Debuff.debuffCanPlayAI(af, this); return AbilityFactoryDebuff.debuffCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffResolve(af, this); AbilityFactoryDebuff.debuffResolve(af, this);
} }
}; };
@@ -129,22 +129,22 @@ public final class AbilityFactory_Debuff {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffStackDescription(af, this); return AbilityFactoryDebuff.debuffStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffResolve(af, this); AbilityFactoryDebuff.debuffResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Debuff.debuffDrawbackAI(af, this); return AbilityFactoryDebuff.debuffDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Debuff.debuffTriggerAI(af, this, mandatory); return AbilityFactoryDebuff.debuffTriggerAI(af, this, mandatory);
} }
}; };
@@ -182,7 +182,7 @@ public final class AbilityFactory_Debuff {
private static String debuffStackDescription(final AbilityFactory af, final SpellAbility sa) { private static String debuffStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final ArrayList<String> kws = AbilityFactory_Debuff.getKeywords(params); final ArrayList<String> kws = AbilityFactoryDebuff.getKeywords(params);
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
ArrayList<Card> tgtCards; ArrayList<Card> tgtCards;
@@ -292,7 +292,7 @@ public final class AbilityFactory_Debuff {
return false; return false;
} }
} else { } else {
return AbilityFactory_Debuff.debuffTgtAI(af, sa, AbilityFactory_Debuff.getKeywords(params), false); return AbilityFactoryDebuff.debuffTgtAI(af, sa, AbilityFactoryDebuff.getKeywords(params), false);
} }
return false; return false;
@@ -315,7 +315,7 @@ public final class AbilityFactory_Debuff {
// TODO - copied from AF_Pump.pumpDrawbackAI() - what should be // TODO - copied from AF_Pump.pumpDrawbackAI() - what should be
// here? // here?
} else { } else {
return AbilityFactory_Debuff.debuffTgtAI(af, sa, AbilityFactory_Debuff.getKeywords(params), false); return AbilityFactoryDebuff.debuffTgtAI(af, sa, AbilityFactoryDebuff.getKeywords(params), false);
} }
return true; return true;
@@ -345,7 +345,7 @@ public final class AbilityFactory_Debuff {
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
tgt.resetTargets(); tgt.resetTargets();
CardList list = AbilityFactory_Debuff.getCurseCreatures(af, sa, kws); CardList list = AbilityFactoryDebuff.getCurseCreatures(af, sa, kws);
list = list.getValidCards(tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getSourceCard()); list = list.getValidCards(tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getSourceCard());
// several uses here: // several uses here:
@@ -356,7 +356,7 @@ public final class AbilityFactory_Debuff {
// 3a. remove Persist? // 3a. remove Persist?
if (list.isEmpty()) { if (list.isEmpty()) {
return mandatory && AbilityFactory_Debuff.debuffMandatoryTarget(af, sa, mandatory); return mandatory && AbilityFactoryDebuff.debuffMandatoryTarget(af, sa, mandatory);
} }
while (tgt.getNumTargeted() < tgt.getMaxTargets(sa.getSourceCard(), sa)) { while (tgt.getNumTargeted() < tgt.getMaxTargets(sa.getSourceCard(), sa)) {
@@ -366,7 +366,7 @@ public final class AbilityFactory_Debuff {
if (list.isEmpty()) { if (list.isEmpty()) {
if ((tgt.getNumTargeted() < tgt.getMinTargets(sa.getSourceCard(), sa)) || (tgt.getNumTargeted() == 0)) { if ((tgt.getNumTargeted() < tgt.getMinTargets(sa.getSourceCard(), sa)) || (tgt.getNumTargeted() == 0)) {
if (mandatory) { if (mandatory) {
return AbilityFactory_Debuff.debuffMandatoryTarget(af, sa, mandatory); return AbilityFactoryDebuff.debuffMandatoryTarget(af, sa, mandatory);
} }
tgt.resetTargets(); tgt.resetTargets();
@@ -513,14 +513,14 @@ public final class AbilityFactory_Debuff {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final ArrayList<String> kws = AbilityFactory_Debuff.getKeywords(params); final ArrayList<String> kws = AbilityFactoryDebuff.getKeywords(params);
if (sa.getTarget() == null) { if (sa.getTarget() == null) {
if (mandatory) { if (mandatory) {
return true; return true;
} }
} else { } else {
return AbilityFactory_Debuff.debuffTgtAI(af, sa, kws, mandatory); return AbilityFactoryDebuff.debuffTgtAI(af, sa, kws, mandatory);
} }
return true; return true;
@@ -540,7 +540,7 @@ public final class AbilityFactory_Debuff {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final ArrayList<String> kws = AbilityFactory_Debuff.getKeywords(params); final ArrayList<String> kws = AbilityFactoryDebuff.getKeywords(params);
ArrayList<Card> tgtCards; ArrayList<Card> tgtCards;
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
@@ -599,22 +599,22 @@ public final class AbilityFactory_Debuff {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Debuff.debuffAllCanPlayAI(af, this); return AbilityFactoryDebuff.debuffAllCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffAllStackDescription(af, this); return AbilityFactoryDebuff.debuffAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffAllResolve(af, this); AbilityFactoryDebuff.debuffAllResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Debuff.debuffAllTriggerAI(af, this, mandatory); return AbilityFactoryDebuff.debuffAllTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -638,17 +638,17 @@ public final class AbilityFactory_Debuff {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Debuff.debuffAllCanPlayAI(af, this); return AbilityFactoryDebuff.debuffAllCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffAllStackDescription(af, this); return AbilityFactoryDebuff.debuffAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffAllResolve(af, this); AbilityFactoryDebuff.debuffAllResolve(af, this);
} }
}; // SpellAbility }; // SpellAbility
@@ -671,22 +671,22 @@ public final class AbilityFactory_Debuff {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Debuff.debuffAllStackDescription(af, this); return AbilityFactoryDebuff.debuffAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Debuff.debuffAllResolve(af, this); AbilityFactoryDebuff.debuffAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Debuff.debuffAllChkDrawbackAI(af, this); return AbilityFactoryDebuff.debuffAllChkDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Debuff.debuffAllTriggerAI(af, this, mandatory); return AbilityFactoryDebuff.debuffAllTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -760,7 +760,7 @@ public final class AbilityFactory_Debuff {
private static void debuffAllResolve(final AbilityFactory af, final SpellAbility sa) { private static void debuffAllResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card hostCard = af.getHostCard(); final Card hostCard = af.getHostCard();
final ArrayList<String> kws = AbilityFactory_Debuff.getKeywords(params); final ArrayList<String> kws = AbilityFactoryDebuff.getKeywords(params);
String valid = ""; String valid = "";
if (params.containsKey("ValidCards")) { if (params.containsKey("ValidCards")) {

28
src/main/java/forge/card/abilityFactory/AbilityFactory_DelayedTrigger.java → src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java
View File

@@ -17,7 +17,7 @@ import forge.card.trigger.TriggerHandler;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_DelayedTrigger { public class AbilityFactoryDelayedTrigger {
/** Constant <code>tempCreator</code>. */ /** Constant <code>tempCreator</code>. */
private static AbilityFactory tempCreator = new AbilityFactory(); private static AbilityFactory tempCreator = new AbilityFactory();
@@ -37,22 +37,22 @@ public class AbilityFactory_DelayedTrigger {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DelayedTrigger.delTrigCanPlayAI(af, this); return AbilityFactoryDelayedTrigger.delTrigCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DelayedTrigger.doResolve(af, this); AbilityFactoryDelayedTrigger.doResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DelayedTrigger.delTrigStackDescription(af, this); return AbilityFactoryDelayedTrigger.delTrigStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DelayedTrigger.doTriggerAI(af, this, mandatory); return AbilityFactoryDelayedTrigger.doTriggerAI(af, this, mandatory);
} }
}; };
return ability; return ability;
@@ -74,17 +74,17 @@ public class AbilityFactory_DelayedTrigger {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_DelayedTrigger.delTrigCanPlayAI(af, this); return AbilityFactoryDelayedTrigger.delTrigCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DelayedTrigger.doResolve(af, this); AbilityFactoryDelayedTrigger.doResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_DelayedTrigger.delTrigStackDescription(af, this); return AbilityFactoryDelayedTrigger.delTrigStackDescription(af, this);
} }
}; };
return spell; return spell;
@@ -105,17 +105,17 @@ public class AbilityFactory_DelayedTrigger {
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_DelayedTrigger.doChkDrawbackAI(abilityFactory, this); return AbilityFactoryDelayedTrigger.doChkDrawbackAI(abilityFactory, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_DelayedTrigger.doTriggerAI(abilityFactory, this, mandatory); return AbilityFactoryDelayedTrigger.doTriggerAI(abilityFactory, this, mandatory);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_DelayedTrigger.doResolve(abilityFactory, this); AbilityFactoryDelayedTrigger.doResolve(abilityFactory, this);
} }
}; };
@@ -136,7 +136,7 @@ public class AbilityFactory_DelayedTrigger {
private static boolean doChkDrawbackAI(final AbilityFactory abilityFactory, final SpellAbility spellAbility) { private static boolean doChkDrawbackAI(final AbilityFactory abilityFactory, final SpellAbility spellAbility) {
final HashMap<String, String> params = abilityFactory.getMapParams(); final HashMap<String, String> params = abilityFactory.getMapParams();
final String svarName = params.get("Execute"); final String svarName = params.get("Execute");
final SpellAbility trigsa = AbilityFactory_DelayedTrigger.tempCreator.getAbility( final SpellAbility trigsa = AbilityFactoryDelayedTrigger.tempCreator.getAbility(
abilityFactory.getHostCard().getSVar(svarName), abilityFactory.getHostCard()); abilityFactory.getHostCard().getSVar(svarName), abilityFactory.getHostCard());
if (trigsa instanceof Ability_Sub) { if (trigsa instanceof Ability_Sub) {
@@ -160,7 +160,7 @@ public class AbilityFactory_DelayedTrigger {
private static boolean doTriggerAI(final AbilityFactory abilityFactory, final SpellAbility spellAbility, final boolean mandatory) { private static boolean doTriggerAI(final AbilityFactory abilityFactory, final SpellAbility spellAbility, final boolean mandatory) {
final HashMap<String, String> params = abilityFactory.getMapParams(); final HashMap<String, String> params = abilityFactory.getMapParams();
final String svarName = params.get("Execute"); final String svarName = params.get("Execute");
final SpellAbility trigsa = AbilityFactory_DelayedTrigger.tempCreator.getAbility( final SpellAbility trigsa = AbilityFactoryDelayedTrigger.tempCreator.getAbility(
abilityFactory.getHostCard().getSVar(svarName), abilityFactory.getHostCard()); abilityFactory.getHostCard().getSVar(svarName), abilityFactory.getHostCard());
if (!params.containsKey("OptionalDecider")) { if (!params.containsKey("OptionalDecider")) {
@@ -184,7 +184,7 @@ public class AbilityFactory_DelayedTrigger {
private static boolean delTrigCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean delTrigCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final String svarName = params.get("Execute"); final String svarName = params.get("Execute");
final SpellAbility trigsa = AbilityFactory_DelayedTrigger.tempCreator.getAbility( final SpellAbility trigsa = AbilityFactoryDelayedTrigger.tempCreator.getAbility(
af.getHostCard().getSVar(svarName), af.getHostCard()); af.getHostCard().getSVar(svarName), af.getHostCard());
return trigsa.canPlayAI(); return trigsa.canPlayAI();

40
src/main/java/forge/card/abilityFactory/AbilityFactory_Destroy.java → src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java
View File

@@ -32,7 +32,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Destroy { public class AbilityFactoryDestroy {
// An AbilityFactory subclass for destroying permanents // An AbilityFactory subclass for destroying permanents
// ********************************************************************************* // *********************************************************************************
// ************************** DESTROY // ************************** DESTROY
@@ -53,22 +53,22 @@ public class AbilityFactory_Destroy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Destroy.destroyStackDescription(af, this); return AbilityFactoryDestroy.destroyStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Destroy.destroyCanPlayAI(af, this); return AbilityFactoryDestroy.destroyCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyResolve(af, this); AbilityFactoryDestroy.destroyResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Destroy.destroyDoTriggerAI(af, this, mandatory); return AbilityFactoryDestroy.destroyDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -90,17 +90,17 @@ public class AbilityFactory_Destroy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Destroy.destroyStackDescription(af, this); return AbilityFactoryDestroy.destroyStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Destroy.destroyCanPlayAI(af, this); return AbilityFactoryDestroy.destroyCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyResolve(af, this); AbilityFactoryDestroy.destroyResolve(af, this);
} }
}; };
@@ -122,7 +122,7 @@ public class AbilityFactory_Destroy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Destroy.destroyStackDescription(af, this); return AbilityFactoryDestroy.destroyStackDescription(af, this);
} }
@Override @Override
@@ -132,12 +132,12 @@ public class AbilityFactory_Destroy {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyResolve(af, this); AbilityFactoryDestroy.destroyResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Destroy.destroyDoTriggerAI(af, this, mandatory); return AbilityFactoryDestroy.destroyDoTriggerAI(af, this, mandatory);
} }
}; };
return dbDestroy; return dbDestroy;
@@ -537,22 +537,22 @@ public class AbilityFactory_Destroy {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Destroy.destroyAllStackDescription(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllStackDescription(af, this, this.noRegen);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Destroy.destroyAllCanPlayAI(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllCanPlayAI(af, this, this.noRegen);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyAllResolve(af, this, this.noRegen); AbilityFactoryDestroy.destroyAllResolve(af, this, this.noRegen);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Destroy.destroyAllCanPlayAI(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllCanPlayAI(af, this, this.noRegen);
} }
}; };
@@ -580,18 +580,18 @@ public class AbilityFactory_Destroy {
if (this.params.containsKey("SpellDescription")) { if (this.params.containsKey("SpellDescription")) {
return af.getHostCard().getName() + " - " + this.params.get("SpellDescription"); return af.getHostCard().getName() + " - " + this.params.get("SpellDescription");
} else { } else {
return AbilityFactory_Destroy.destroyAllStackDescription(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllStackDescription(af, this, this.noRegen);
} }
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Destroy.destroyAllCanPlayAI(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllCanPlayAI(af, this, this.noRegen);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyAllResolve(af, this, this.noRegen); AbilityFactoryDestroy.destroyAllResolve(af, this, this.noRegen);
} }
}; };
@@ -619,13 +619,13 @@ public class AbilityFactory_Destroy {
if (this.params.containsKey("SpellDescription")) { if (this.params.containsKey("SpellDescription")) {
return af.getHostCard().getName() + " - " + this.params.get("SpellDescription"); return af.getHostCard().getName() + " - " + this.params.get("SpellDescription");
} else { } else {
return AbilityFactory_Destroy.destroyAllStackDescription(af, this, this.noRegen); return AbilityFactoryDestroy.destroyAllStackDescription(af, this, this.noRegen);
} }
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Destroy.destroyAllResolve(af, this, this.noRegen); AbilityFactoryDestroy.destroyAllResolve(af, this, this.noRegen);
} }
@Override @Override

24
src/main/java/forge/card/abilityFactory/AbilityFactory_Effect.java → src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java
View File

@@ -28,7 +28,7 @@ import forge.card.trigger.TriggerHandler;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Effect { public class AbilityFactoryEffect {
/** /**
* <p> * <p>
* createAbilityEffect. * createAbilityEffect.
@@ -49,22 +49,22 @@ public class AbilityFactory_Effect {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Effect.effectStackDescription(this.af, this); return AbilityFactoryEffect.effectStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Effect.effectCanPlayAI(this.af, this); return AbilityFactoryEffect.effectCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Effect.effectResolve(this.af, this); AbilityFactoryEffect.effectResolve(this.af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Effect.effectDoTriggerAI(this.af, this, mandatory); return AbilityFactoryEffect.effectDoTriggerAI(this.af, this, mandatory);
} }
}; };
@@ -90,17 +90,17 @@ public class AbilityFactory_Effect {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Effect.effectStackDescription(this.af, this); return AbilityFactoryEffect.effectStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Effect.effectCanPlayAI(this.af, this); return AbilityFactoryEffect.effectCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Effect.effectResolve(this.af, this); AbilityFactoryEffect.effectResolve(this.af, this);
} }
}; };
@@ -126,17 +126,17 @@ public class AbilityFactory_Effect {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Effect.effectStackDescription(this.af, this); return AbilityFactoryEffect.effectStackDescription(this.af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Effect.effectCanPlayAI(this.af, this); return AbilityFactoryEffect.effectCanPlayAI(this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Effect.effectResolve(this.af, this); AbilityFactoryEffect.effectResolve(this.af, this);
} }
@Override @Override
@@ -146,7 +146,7 @@ public class AbilityFactory_Effect {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Effect.effectDoTriggerAI(this.af, this, mandatory); return AbilityFactoryEffect.effectDoTriggerAI(this.af, this, mandatory);
} }
}; };

48
src/main/java/forge/card/abilityFactory/AbilityFactory_EndGameCondition.java → src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java
View File

@@ -21,9 +21,9 @@ import forge.game.GameLossReason;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_EndGameCondition { public final class AbilityFactoryEndGameCondition {
private AbilityFactory_EndGameCondition() { private AbilityFactoryEndGameCondition() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -49,22 +49,22 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.winsGameStackDescription(af, this); return AbilityFactoryEndGameCondition.winsGameStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_EndGameCondition.winsGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.winsGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.winsGameResolve(af, this); AbilityFactoryEndGameCondition.winsGameResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_EndGameCondition.winsGameDoTriggerAI(af, this, mandatory); return AbilityFactoryEndGameCondition.winsGameDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -88,7 +88,7 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.winsGameStackDescription(af, this); return AbilityFactoryEndGameCondition.winsGameStackDescription(af, this);
} }
@Override @Override
@@ -98,12 +98,12 @@ public final class AbilityFactory_EndGameCondition {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_EndGameCondition.winsGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.winsGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.winsGameResolve(af, this); AbilityFactoryEndGameCondition.winsGameResolve(af, this);
} }
}; };
@@ -127,7 +127,7 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.winsGameStackDescription(af, this); return AbilityFactoryEndGameCondition.winsGameStackDescription(af, this);
} }
@Override @Override
@@ -137,12 +137,12 @@ public final class AbilityFactory_EndGameCondition {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_EndGameCondition.winsGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.winsGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.winsGameResolve(af, this); AbilityFactoryEndGameCondition.winsGameResolve(af, this);
} }
@Override @Override
@@ -152,7 +152,7 @@ public final class AbilityFactory_EndGameCondition {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_EndGameCondition.winsGameDoTriggerAI(af, this, mandatory); return AbilityFactoryEndGameCondition.winsGameDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -288,22 +288,22 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.losesGameStackDescription(af, this); return AbilityFactoryEndGameCondition.losesGameStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_EndGameCondition.losesGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.losesGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.losesGameResolve(af, this); AbilityFactoryEndGameCondition.losesGameResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_EndGameCondition.losesGameDoTriggerAI(af, this, mandatory); return AbilityFactoryEndGameCondition.losesGameDoTriggerAI(af, this, mandatory);
} }
}; };
@@ -327,7 +327,7 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.losesGameStackDescription(af, this); return AbilityFactoryEndGameCondition.losesGameStackDescription(af, this);
} }
@Override @Override
@@ -337,12 +337,12 @@ public final class AbilityFactory_EndGameCondition {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_EndGameCondition.losesGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.losesGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.losesGameResolve(af, this); AbilityFactoryEndGameCondition.losesGameResolve(af, this);
} }
}; };
@@ -366,7 +366,7 @@ public final class AbilityFactory_EndGameCondition {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_EndGameCondition.losesGameStackDescription(af, this); return AbilityFactoryEndGameCondition.losesGameStackDescription(af, this);
} }
@Override @Override
@@ -376,12 +376,12 @@ public final class AbilityFactory_EndGameCondition {
// then call xCount with that card to properly calculate the // then call xCount with that card to properly calculate the
// amount // amount
// Or choosing how many to sacrifice // Or choosing how many to sacrifice
return AbilityFactory_EndGameCondition.losesGameCanPlayAI(af, this); return AbilityFactoryEndGameCondition.losesGameCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_EndGameCondition.losesGameResolve(af, this); AbilityFactoryEndGameCondition.losesGameResolve(af, this);
} }
@Override @Override
@@ -391,7 +391,7 @@ public final class AbilityFactory_EndGameCondition {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_EndGameCondition.losesGameDoTriggerAI(af, this, mandatory); return AbilityFactoryEndGameCondition.losesGameDoTriggerAI(af, this, mandatory);
} }
}; };

44
src/main/java/forge/card/abilityFactory/AbilityFactory_GainControl.java → src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java
View File

@@ -46,7 +46,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_GainControl { public class AbilityFactoryGainControl {
private final Card[] movedCards = new Card[1]; private final Card[] movedCards = new Card[1];
@@ -68,7 +68,7 @@ public class AbilityFactory_GainControl {
* @param newAF * @param newAF
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public AbilityFactory_GainControl(final AbilityFactory newAF) { public AbilityFactoryGainControl(final AbilityFactory newAF) {
this.af = newAF; this.af = newAF;
this.params = this.af.getMapParams(); this.params = this.af.getMapParams();
this.hostCard = this.af.getHostCard(); this.hostCard = this.af.getHostCard();
@@ -106,17 +106,17 @@ public class AbilityFactory_GainControl {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_GainControl.this.gainControlTgtAI(this); return AbilityFactoryGainControl.this.gainControlTgtAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_GainControl.this.gainControlResolve(this); AbilityFactoryGainControl.this.gainControlResolve(this);
} // resolve } // resolve
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_GainControl.this.gainControlStackDescription(this); return AbilityFactoryGainControl.this.gainControlStackDescription(this);
} }
}; // SpellAbility }; // SpellAbility
@@ -138,22 +138,22 @@ public class AbilityFactory_GainControl {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_GainControl.this.gainControlTgtAI(this); return AbilityFactoryGainControl.this.gainControlTgtAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_GainControl.this.gainControlResolve(this); AbilityFactoryGainControl.this.gainControlResolve(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_GainControl.this.gainControlStackDescription(this); return AbilityFactoryGainControl.this.gainControlStackDescription(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_GainControl.this.gainControlTgtAI(this); return AbilityFactoryGainControl.this.gainControlTgtAI(this);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -174,27 +174,27 @@ public class AbilityFactory_GainControl {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_GainControl.this.gainControlTgtAI(this); return AbilityFactoryGainControl.this.gainControlTgtAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_GainControl.this.gainControlStackDescription(this); return AbilityFactoryGainControl.this.gainControlStackDescription(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_GainControl.this.gainControlResolve(this); AbilityFactoryGainControl.this.gainControlResolve(this);
} // resolve } // resolve
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_GainControl.this.gainControlDrawbackAI(this); return AbilityFactoryGainControl.this.gainControlDrawbackAI(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_GainControl.this.gainControlTriggerAI(this, mandatory); return AbilityFactoryGainControl.this.gainControlTriggerAI(this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -285,7 +285,7 @@ public class AbilityFactory_GainControl {
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
final Map<String, String> vars = c.getSVars(); final Map<String, String> vars = c.getSVars();
return !vars.containsKey("RemAIDeck") return !vars.containsKey("RemAIDeck")
&& CardFactoryUtil.canTarget(AbilityFactory_GainControl.this.hostCard, c); && CardFactoryUtil.canTarget(AbilityFactoryGainControl.this.hostCard, c);
} }
}); });
@@ -507,12 +507,12 @@ public class AbilityFactory_GainControl {
@Override @Override
public void execute() { public void execute() {
final Card c = AbilityFactory_GainControl.this.movedCards[i]; final Card c = AbilityFactoryGainControl.this.movedCards[i];
final Ability ability = new Ability(AbilityFactory_GainControl.this.hostCard, "0") { final Ability ability = new Ability(AbilityFactoryGainControl.this.hostCard, "0") {
@Override @Override
public void resolve() { public void resolve() {
if (AbilityFactory_GainControl.this.bNoRegen) { if (AbilityFactoryGainControl.this.bNoRegen) {
AllZone.getGameAction().destroyNoRegeneration(c); AllZone.getGameAction().destroyNoRegeneration(c);
} else { } else {
AllZone.getGameAction().destroy(c); AllZone.getGameAction().destroy(c);
@@ -520,9 +520,9 @@ public class AbilityFactory_GainControl {
} }
}; };
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(AbilityFactory_GainControl.this.hostCard).append(" - destroy ").append(c.getName()) sb.append(AbilityFactoryGainControl.this.hostCard).append(" - destroy ").append(c.getName())
.append("."); .append(".");
if (AbilityFactory_GainControl.this.bNoRegen) { if (AbilityFactoryGainControl.this.bNoRegen) {
sb.append(" It can't be regenerated."); sb.append(" It can't be regenerated.");
} }
ability.setStackDescription(sb.toString()); ability.setStackDescription(sb.toString());
@@ -552,8 +552,8 @@ public class AbilityFactory_GainControl {
@Override @Override
public void execute() { public void execute() {
AbilityFactory_GainControl.doLoseControl(c, AbilityFactory_GainControl.this.hostCard, AbilityFactoryGainControl.doLoseControl(c, AbilityFactoryGainControl.this.hostCard,
AbilityFactory_GainControl.this.bTapOnLose, AbilityFactory_GainControl.this.kws); AbilityFactoryGainControl.this.bTapOnLose, AbilityFactoryGainControl.this.kws);
} // execute() } // execute()
}; };

66
src/main/java/forge/card/abilityFactory/AbilityFactory_Mana.java → src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java
View File

@@ -33,7 +33,7 @@ import forge.gui.input.Input_PayManaCostUtil;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Mana { public class AbilityFactoryMana {
// ****************************** MANA ************************ // ****************************** MANA ************************
/** /**
* <p> * <p>
@@ -54,12 +54,12 @@ public class AbilityFactory_Mana {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.manaCanPlayAI(this.af); return AbilityFactoryMana.manaCanPlayAI(this.af);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.manaResolve(this, this.af, this); AbilityFactoryMana.manaResolve(this, this.af, this);
} }
@Override @Override
@@ -104,19 +104,19 @@ public class AbilityFactory_Mana {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.manaCanPlayAI(this.af); return AbilityFactoryMana.manaCanPlayAI(this.af);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Mana.manaStackDescription(this.tmpMana, this.af, this); return AbilityFactoryMana.manaStackDescription(this.tmpMana, this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.manaResolve(this.tmpMana, this.af, this); AbilityFactoryMana.manaResolve(this.tmpMana, this.af, this);
} }
}; };
@@ -158,12 +158,12 @@ public class AbilityFactory_Mana {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Mana.manaStackDescription(this.tmpMana, this.af, this); return AbilityFactoryMana.manaStackDescription(this.tmpMana, this.af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.manaResolve(this.tmpMana, this.af, this); AbilityFactoryMana.manaResolve(this.tmpMana, this.af, this);
} }
@Override @Override
@@ -217,7 +217,7 @@ public class AbilityFactory_Mana {
sb.append(af.getHostCard()).append(" - "); sb.append(af.getHostCard()).append(" - ");
} }
sb.append("Add ").append(AbilityFactory_Mana.generatedMana(abMana, af, sa)).append(" to your mana pool."); sb.append("Add ").append(AbilityFactoryMana.generatedMana(abMana, af, sa)).append(" to your mana pool.");
if (abMana.getSubAbility() != null) { if (abMana.getSubAbility() != null) {
sb.append(abMana.getSubAbility().getStackDescription()); sb.append(abMana.getSubAbility().getStackDescription());
@@ -255,7 +255,7 @@ public class AbilityFactory_Mana {
} }
for (final Player player : tgtPlayers) { for (final Player player : tgtPlayers) {
abMana.produceMana(AbilityFactory_Mana.generatedMana(abMana, af, sa), player); abMana.produceMana(AbilityFactoryMana.generatedMana(abMana, af, sa), player);
} }
// convert these to SubAbilities when appropriate // convert these to SubAbilities when appropriate
@@ -273,7 +273,7 @@ public class AbilityFactory_Mana {
} }
} }
AbilityFactory_Mana.doDrawback(af, abMana, card); AbilityFactoryMana.doDrawback(af, abMana, card);
} }
/** /**
@@ -308,7 +308,7 @@ public class AbilityFactory_Mana {
// ALWAYS be Base // ALWAYS be Base
int bonus = 0; int bonus = 0;
if (params.get("Bonus").equals("UrzaLands")) { if (params.get("Bonus").equals("UrzaLands")) {
if (AbilityFactory_Mana.hasUrzaLands(abMana.getActivatingPlayer())) { if (AbilityFactoryMana.hasUrzaLands(abMana.getActivatingPlayer())) {
bonus = Integer.parseInt(params.get("BonusProduced")); bonus = Integer.parseInt(params.get("BonusProduced"));
} }
} }
@@ -365,12 +365,12 @@ public class AbilityFactory_Mana {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.manaReflectedCanPlayAI(this.af); return AbilityFactoryMana.manaReflectedCanPlayAI(this.af);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.manaReflectedResolve(this, this.af); AbilityFactoryMana.manaReflectedResolve(this, this.af);
} }
@Override @Override
@@ -422,12 +422,12 @@ public class AbilityFactory_Mana {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.manaReflectedCanPlayAI(this.af); return AbilityFactoryMana.manaReflectedCanPlayAI(this.af);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.manaReflectedResolve(this.tmpMana, this.af); AbilityFactoryMana.manaReflectedResolve(this.tmpMana, this.af);
} }
}; };
@@ -465,7 +465,7 @@ public class AbilityFactory_Mana {
final Card card = af.getHostCard(); final Card card = af.getHostCard();
final ArrayList<String> colors = AbilityFactory_Mana.reflectableMana(abMana, af, new ArrayList<String>(), final ArrayList<String> colors = AbilityFactoryMana.reflectableMana(abMana, af, new ArrayList<String>(),
new ArrayList<Card>()); new ArrayList<Card>());
ArrayList<Player> tgtPlayers; ArrayList<Player> tgtPlayers;
@@ -478,7 +478,7 @@ public class AbilityFactory_Mana {
} }
for (final Player player : tgtPlayers) { for (final Player player : tgtPlayers) {
final String generated = AbilityFactory_Mana.generatedReflectedMana(abMana, af, colors, player); final String generated = AbilityFactoryMana.generatedReflectedMana(abMana, af, colors, player);
if (abMana.getCanceled()) { if (abMana.getCanceled()) {
abMana.undo(); abMana.undo();
@@ -488,7 +488,7 @@ public class AbilityFactory_Mana {
abMana.produceMana(generated, player); abMana.produceMana(generated, player);
} }
AbilityFactory_Mana.doDrawback(af, abMana, card); AbilityFactoryMana.doDrawback(af, abMana, card);
} }
// add Colors and // add Colors and
@@ -561,7 +561,7 @@ public class AbilityFactory_Mana {
} }
if (reflectProperty.equals("Is")) { // Meteor Crater if (reflectProperty.equals("Is")) { // Meteor Crater
colors = AbilityFactory_Mana.hasProperty(maxChoices, cards, colors); colors = AbilityFactoryMana.hasProperty(maxChoices, cards, colors);
} else if (reflectProperty.equals("Produced")) { } else if (reflectProperty.equals("Produced")) {
final String producedColors = (String) abMana.getTriggeringObject("Produced"); final String producedColors = (String) abMana.getTriggeringObject("Produced");
for (final String col : Constant.Color.ONLY_COLORS) { for (final String col : Constant.Color.ONLY_COLORS) {
@@ -596,7 +596,7 @@ public class AbilityFactory_Mana {
} }
continue; continue;
} }
colors = AbilityFactory_Mana.canProduce(maxChoices, ab, colors); colors = AbilityFactoryMana.canProduce(maxChoices, ab, colors);
if (!parents.contains(ab.getSourceCard())) { if (!parents.contains(ab.getSourceCard())) {
parents.add(ab.getSourceCard()); parents.add(ab.getSourceCard());
} }
@@ -607,7 +607,7 @@ public class AbilityFactory_Mana {
break; break;
} }
colors = AbilityFactory_Mana.reflectableMana(ab, ab.getAbilityFactory(), colors, parents); colors = AbilityFactoryMana.reflectableMana(ab, ab.getAbilityFactory(), colors, parents);
} }
} }
@@ -798,22 +798,22 @@ public class AbilityFactory_Mana {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Mana.drainManaStackDescription(af, this); return AbilityFactoryMana.drainManaStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.drainManaCanPlayAI(af, this); return AbilityFactoryMana.drainManaCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.drainManaResolve(af, this); AbilityFactoryMana.drainManaResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Mana.drainManaTrigger(af, this, mandatory); return AbilityFactoryMana.drainManaTrigger(af, this, mandatory);
} }
}; };
@@ -836,17 +836,17 @@ public class AbilityFactory_Mana {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Mana.drainManaStackDescription(af, this); return AbilityFactoryMana.drainManaStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Mana.drainManaCanPlayAI(af, this); return AbilityFactoryMana.drainManaCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.drainManaResolve(af, this); AbilityFactoryMana.drainManaResolve(af, this);
} }
}; };
@@ -869,22 +869,22 @@ public class AbilityFactory_Mana {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Mana.drainManaStackDescription(af, this); return AbilityFactoryMana.drainManaStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Mana.drainManaResolve(af, this); AbilityFactoryMana.drainManaResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Mana.drainManaPlayDrawbackAI(af, this); return AbilityFactoryMana.drainManaPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Mana.drainManaTrigger(af, this, mandatory); return AbilityFactoryMana.drainManaTrigger(af, this, mandatory);
} }
}; };

182
src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java → src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java
View File

@@ -34,7 +34,7 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_PermanentState { public class AbilityFactoryPermanentState {
// **************************************** // ****************************************
// ************** Untap ******************* // ************** Untap *******************
@@ -55,22 +55,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapStackDescription(af, this); return AbilityFactoryPermanentState.untapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.untapCanPlayAI(af, this); return AbilityFactoryPermanentState.untapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapResolve(af, this); AbilityFactoryPermanentState.untapResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.untapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.untapTrigger(af, this, mandatory);
} }
}; };
@@ -92,17 +92,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapStackDescription(af, this); return AbilityFactoryPermanentState.untapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.untapCanPlayAI(af, this); return AbilityFactoryPermanentState.untapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapResolve(af, this); AbilityFactoryPermanentState.untapResolve(af, this);
} }
}; };
@@ -124,22 +124,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapStackDescription(af, this); return AbilityFactoryPermanentState.untapStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapResolve(af, this); AbilityFactoryPermanentState.untapResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.untapPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.untapPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.untapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.untapTrigger(af, this, mandatory);
} }
}; };
@@ -230,7 +230,7 @@ public class AbilityFactory_PermanentState {
return false; return false;
} }
} else { } else {
if (!AbilityFactory_PermanentState.untapPrefTargeting(tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.untapPrefTargeting(tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -278,11 +278,11 @@ public class AbilityFactory_PermanentState {
return true; return true;
} else { } else {
if (AbilityFactory_PermanentState.untapPrefTargeting(tgt, af, sa, mandatory)) { if (AbilityFactoryPermanentState.untapPrefTargeting(tgt, af, sa, mandatory)) {
return true; return true;
} else if (mandatory) { } else if (mandatory) {
// not enough preferred targets, but mandatory so keep going: // not enough preferred targets, but mandatory so keep going:
return AbilityFactory_PermanentState.untapUnpreferredTargeting(af, sa, mandatory); return AbilityFactoryPermanentState.untapUnpreferredTargeting(af, sa, mandatory);
} }
} }
@@ -309,7 +309,7 @@ public class AbilityFactory_PermanentState {
if (tgt == null) { if (tgt == null) {
// who cares if its already untapped, it's only a subability? // who cares if its already untapped, it's only a subability?
} else { } else {
if (!AbilityFactory_PermanentState.untapPrefTargeting(tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.untapPrefTargeting(tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -429,21 +429,21 @@ public class AbilityFactory_PermanentState {
final String[] tappablePermanents = { "Enchantment", "Planeswalker" }; final String[] tappablePermanents = { "Enchantment", "Planeswalker" };
CardList tapList = list.getValidCards(tappablePermanents, source.getController(), source); CardList tapList = list.getValidCards(tappablePermanents, source.getController(), source);
if (AbilityFactory_PermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) { if (AbilityFactoryPermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) {
return true; return true;
} }
// try to just tap already tapped things // try to just tap already tapped things
tapList = list.filter(CardListFilter.UNTAPPED); tapList = list.filter(CardListFilter.UNTAPPED);
if (AbilityFactory_PermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) { if (AbilityFactoryPermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) {
return true; return true;
} }
// just tap whatever we can // just tap whatever we can
tapList = list; tapList = list;
if (AbilityFactory_PermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) { if (AbilityFactoryPermanentState.untapTargetList(source, tgt, af, sa, mandatory, tapList)) {
return true; return true;
} }
@@ -540,7 +540,7 @@ public class AbilityFactory_PermanentState {
ArrayList<Card> tgtCards = null; ArrayList<Card> tgtCards = null;
if (params.containsKey("UntapUpTo")) { if (params.containsKey("UntapUpTo")) {
AbilityFactory_PermanentState.untapChooseUpTo(af, sa, params); AbilityFactoryPermanentState.untapChooseUpTo(af, sa, params);
} else { } else {
if (tgt != null) { if (tgt != null) {
tgtCards = tgt.getTargetCards(); tgtCards = tgt.getTargetCards();
@@ -618,22 +618,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapStackDescription(af, this); return AbilityFactoryPermanentState.tapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapCanPlayAI(af, this); return AbilityFactoryPermanentState.tapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapResolve(af, this); AbilityFactoryPermanentState.tapResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.tapTrigger(af, this, mandatory);
} }
}; };
@@ -655,17 +655,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapStackDescription(af, this); return AbilityFactoryPermanentState.tapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapCanPlayAI(af, this); return AbilityFactoryPermanentState.tapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapResolve(af, this); AbilityFactoryPermanentState.tapResolve(af, this);
} }
}; };
@@ -687,22 +687,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapStackDescription(af, this); return AbilityFactoryPermanentState.tapStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapResolve(af, this); AbilityFactoryPermanentState.tapResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.tapPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.tapPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.tapTrigger(af, this, mandatory);
} }
}; };
@@ -806,7 +806,7 @@ public class AbilityFactory_PermanentState {
} }
} else { } else {
tgt.resetTargets(); tgt.resetTargets();
if (!AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -849,11 +849,11 @@ public class AbilityFactory_PermanentState {
return true; return true;
} else { } else {
if (AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, mandatory)) { if (AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, mandatory)) {
return true; return true;
} else if (mandatory) { } else if (mandatory) {
// not enough preferred targets, but mandatory so keep going: // not enough preferred targets, but mandatory so keep going:
return AbilityFactory_PermanentState.tapUnpreferredTargeting(af, sa, mandatory); return AbilityFactoryPermanentState.tapUnpreferredTargeting(af, sa, mandatory);
} }
} }
@@ -883,7 +883,7 @@ public class AbilityFactory_PermanentState {
} else { } else {
// target section, maybe pull this out? // target section, maybe pull this out?
tgt.resetTargets(); tgt.resetTargets();
if (!AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -999,21 +999,21 @@ public class AbilityFactory_PermanentState {
final String[] tappablePermanents = { "Enchantment", "Planeswalker" }; final String[] tappablePermanents = { "Enchantment", "Planeswalker" };
CardList tapList = list.getValidCards(tappablePermanents, source.getController(), source); CardList tapList = list.getValidCards(tappablePermanents, source.getController(), source);
if (AbilityFactory_PermanentState.tapTargetList(af, sa, tapList, mandatory)) { if (AbilityFactoryPermanentState.tapTargetList(af, sa, tapList, mandatory)) {
return true; return true;
} }
// try to just tap already tapped things // try to just tap already tapped things
tapList = list.filter(CardListFilter.TAPPED); tapList = list.filter(CardListFilter.TAPPED);
if (AbilityFactory_PermanentState.tapTargetList(af, sa, tapList, mandatory)) { if (AbilityFactoryPermanentState.tapTargetList(af, sa, tapList, mandatory)) {
return true; return true;
} }
// just tap whatever we can // just tap whatever we can
tapList = list; tapList = list;
if (AbilityFactory_PermanentState.tapTargetList(af, sa, tapList, mandatory)) { if (AbilityFactoryPermanentState.tapTargetList(af, sa, tapList, mandatory)) {
return true; return true;
} }
@@ -1139,22 +1139,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapAllStackDescription(af, this); return AbilityFactoryPermanentState.untapAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.untapAllCanPlayAI(af, this); return AbilityFactoryPermanentState.untapAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapAllResolve(af, this); AbilityFactoryPermanentState.untapAllResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.untapAllTrigger(af, this, mandatory); return AbilityFactoryPermanentState.untapAllTrigger(af, this, mandatory);
} }
}; };
@@ -1176,17 +1176,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapAllStackDescription(af, this); return AbilityFactoryPermanentState.untapAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.untapAllCanPlayAI(af, this); return AbilityFactoryPermanentState.untapAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapAllResolve(af, this); AbilityFactoryPermanentState.untapAllResolve(af, this);
} }
}; };
@@ -1208,22 +1208,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.untapAllStackDescription(af, this); return AbilityFactoryPermanentState.untapAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.untapAllResolve(af, this); AbilityFactoryPermanentState.untapAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.untapAllPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.untapAllPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.untapAllPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.untapAllPlayDrawbackAI(af, this);
} }
}; };
@@ -1380,22 +1380,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapAllStackDescription(af, this); return AbilityFactoryPermanentState.tapAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapAllCanPlayAI(af, this); return AbilityFactoryPermanentState.tapAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapAllResolve(af, this); AbilityFactoryPermanentState.tapAllResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapAllTrigger(af, this, mandatory); return AbilityFactoryPermanentState.tapAllTrigger(af, this, mandatory);
} }
}; };
@@ -1417,17 +1417,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapAllStackDescription(af, this); return AbilityFactoryPermanentState.tapAllStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapAllCanPlayAI(af, this); return AbilityFactoryPermanentState.tapAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapAllResolve(af, this); AbilityFactoryPermanentState.tapAllResolve(af, this);
} }
}; };
@@ -1449,22 +1449,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapAllStackDescription(af, this); return AbilityFactoryPermanentState.tapAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapAllResolve(af, this); AbilityFactoryPermanentState.tapAllResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.tapAllPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.tapAllPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapAllPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.tapAllPlayDrawbackAI(af, this);
} }
}; };
@@ -1655,7 +1655,7 @@ public class AbilityFactory_PermanentState {
valid = params.get("ValidCards"); valid = params.get("ValidCards");
} }
final CardList validTappables = AbilityFactory_PermanentState.getTapAllTargets(valid, source); final CardList validTappables = AbilityFactoryPermanentState.getTapAllTargets(valid, source);
final Random r = MyRandom.getRandom(); final Random r = MyRandom.getRandom();
boolean rr = false; boolean rr = false;
@@ -1718,22 +1718,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapOrUntapStackDescription(af, this); return AbilityFactoryPermanentState.tapOrUntapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapOrUntapCanPlayAI(af, this); return AbilityFactoryPermanentState.tapOrUntapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapOrUntapResolve(af, this); AbilityFactoryPermanentState.tapOrUntapResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapOrUntapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.tapOrUntapTrigger(af, this, mandatory);
} }
}; };
@@ -1755,17 +1755,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapOrUntapStackDescription(af, this); return AbilityFactoryPermanentState.tapOrUntapStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.tapOrUntapCanPlayAI(af, this); return AbilityFactoryPermanentState.tapOrUntapCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapOrUntapResolve(af, this); AbilityFactoryPermanentState.tapOrUntapResolve(af, this);
} }
}; };
@@ -1787,22 +1787,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.tapOrUntapStackDescription(af, this); return AbilityFactoryPermanentState.tapOrUntapStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.tapOrUntapResolve(af, this); AbilityFactoryPermanentState.tapOrUntapResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.tapOrUntapPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.tapOrUntapPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.tapOrUntapTrigger(af, this, mandatory); return AbilityFactoryPermanentState.tapOrUntapTrigger(af, this, mandatory);
} }
}; };
@@ -1897,7 +1897,7 @@ public class AbilityFactory_PermanentState {
} }
} else { } else {
tgt.resetTargets(); tgt.resetTargets();
if (!AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -1940,11 +1940,11 @@ public class AbilityFactory_PermanentState {
return true; return true;
} else { } else {
if (AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, mandatory)) { if (AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, mandatory)) {
return true; return true;
} else if (mandatory) { } else if (mandatory) {
// not enough preferred targets, but mandatory so keep going: // not enough preferred targets, but mandatory so keep going:
return AbilityFactory_PermanentState.tapUnpreferredTargeting(af, sa, mandatory); return AbilityFactoryPermanentState.tapUnpreferredTargeting(af, sa, mandatory);
} }
} }
@@ -1974,7 +1974,7 @@ public class AbilityFactory_PermanentState {
} else { } else {
// target section, maybe pull this out? // target section, maybe pull this out?
tgt.resetTargets(); tgt.resetTargets();
if (!AbilityFactory_PermanentState.tapPrefTargeting(source, tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.tapPrefTargeting(source, tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -2053,22 +2053,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.phasesStackDescription(af, this); return AbilityFactoryPermanentState.phasesStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.phasesCanPlayAI(af, this); return AbilityFactoryPermanentState.phasesCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.phasesResolve(af, this); AbilityFactoryPermanentState.phasesResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.phasesTrigger(af, this, mandatory); return AbilityFactoryPermanentState.phasesTrigger(af, this, mandatory);
} }
}; };
@@ -2090,17 +2090,17 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.phasesStackDescription(af, this); return AbilityFactoryPermanentState.phasesStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PermanentState.phasesCanPlayAI(af, this); return AbilityFactoryPermanentState.phasesCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.phasesResolve(af, this); AbilityFactoryPermanentState.phasesResolve(af, this);
} }
}; };
@@ -2122,22 +2122,22 @@ public class AbilityFactory_PermanentState {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PermanentState.phasesStackDescription(af, this); return AbilityFactoryPermanentState.phasesStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PermanentState.phasesResolve(af, this); AbilityFactoryPermanentState.phasesResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_PermanentState.phasesPlayDrawbackAI(af, this); return AbilityFactoryPermanentState.phasesPlayDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PermanentState.phasesTrigger(af, this, mandatory); return AbilityFactoryPermanentState.phasesTrigger(af, this, mandatory);
} }
}; };
@@ -2225,7 +2225,7 @@ public class AbilityFactory_PermanentState {
return false; return false;
} else { } else {
if (!AbilityFactory_PermanentState.phasesPrefTargeting(tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.phasesPrefTargeting(tgt, af, sa, false)) {
return false; return false;
} }
} }
@@ -2261,11 +2261,11 @@ public class AbilityFactory_PermanentState {
return false; return false;
} else { } else {
if (AbilityFactory_PermanentState.phasesPrefTargeting(tgt, af, sa, mandatory)) { if (AbilityFactoryPermanentState.phasesPrefTargeting(tgt, af, sa, mandatory)) {
return true; return true;
} else if (mandatory) { } else if (mandatory) {
// not enough preferred targets, but mandatory so keep going: // not enough preferred targets, but mandatory so keep going:
return AbilityFactory_PermanentState.phasesUnpreferredTargeting(af, sa, mandatory); return AbilityFactoryPermanentState.phasesUnpreferredTargeting(af, sa, mandatory);
} }
} }
@@ -2292,7 +2292,7 @@ public class AbilityFactory_PermanentState {
if (tgt == null) { if (tgt == null) {
} else { } else {
if (!AbilityFactory_PermanentState.phasesPrefTargeting(tgt, af, sa, false)) { if (!AbilityFactoryPermanentState.phasesPrefTargeting(tgt, af, sa, false)) {
return false; return false;
} }
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactory_PreventDamage.java → src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java
View File

@@ -31,7 +31,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_PreventDamage { public class AbilityFactoryPreventDamage {
// Ex: A:SP$ PreventDamage | Cost$ W | Tgt$ TgtC | Amount$ 3 | // Ex: A:SP$ PreventDamage | Cost$ W | Tgt$ TgtC | Amount$ 3 |
// SpellDescription$ Prevent the next 3 damage that would be dealt to ... // SpellDescription$ Prevent the next 3 damage that would be dealt to ...
@@ -53,22 +53,22 @@ public class AbilityFactory_PreventDamage {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PreventDamage.preventDamageCanPlayAI(af, this); return AbilityFactoryPreventDamage.preventDamageCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PreventDamage.preventDamageResolve(af, this); AbilityFactoryPreventDamage.preventDamageResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PreventDamage.preventDamageStackDescription(af, this); return AbilityFactoryPreventDamage.preventDamageStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PreventDamage.doPreventDamageTriggerAI(af, this, mandatory); return AbilityFactoryPreventDamage.doPreventDamageTriggerAI(af, this, mandatory);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -92,17 +92,17 @@ public class AbilityFactory_PreventDamage {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_PreventDamage.preventDamageCanPlayAI(af, this); return AbilityFactoryPreventDamage.preventDamageCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PreventDamage.preventDamageResolve(af, this); AbilityFactoryPreventDamage.preventDamageResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PreventDamage.preventDamageStackDescription(af, this); return AbilityFactoryPreventDamage.preventDamageStackDescription(af, this);
} }
}; // Spell }; // Spell
@@ -125,12 +125,12 @@ public class AbilityFactory_PreventDamage {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_PreventDamage.preventDamageStackDescription(af, this); return AbilityFactoryPreventDamage.preventDamageStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_PreventDamage.preventDamageResolve(af, this); AbilityFactoryPreventDamage.preventDamageResolve(af, this);
} }
@Override @Override
@@ -140,7 +140,7 @@ public class AbilityFactory_PreventDamage {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_PreventDamage.doPreventDamageTriggerAI(af, this, mandatory); return AbilityFactoryPreventDamage.doPreventDamageTriggerAI(af, this, mandatory);
} }
}; };
@@ -378,7 +378,7 @@ public class AbilityFactory_PreventDamage {
// If there's no target on the trigger, just say yes. // If there's no target on the trigger, just say yes.
chance = true; chance = true;
} else { } else {
chance = AbilityFactory_PreventDamage.preventDamageMandatoryTarget(af, sa, mandatory); chance = AbilityFactoryPreventDamage.preventDamageMandatoryTarget(af, sa, mandatory);
} }
final Ability_Sub subAb = sa.getSubAbility(); final Ability_Sub subAb = sa.getSubAbility();

88
src/main/java/forge/card/abilityFactory/AbilityFactory_Protection.java → src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java
View File

@@ -36,9 +36,9 @@ import forge.gui.GuiUtils;
* @author dennis.r.friedrichsen (slapshot5 on slightlymagic.net) * @author dennis.r.friedrichsen (slapshot5 on slightlymagic.net)
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Protection { public final class AbilityFactoryProtection {
private AbilityFactory_Protection() { private AbilityFactoryProtection() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -57,17 +57,17 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectCanPlayAI(af, this); return AbilityFactoryProtection.protectCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectStackDescription(af, this); return AbilityFactoryProtection.protectStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectResolve(af, this); AbilityFactoryProtection.protectResolve(af, this);
} // resolve } // resolve
}; // SpellAbility }; // SpellAbility
@@ -89,22 +89,22 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectCanPlayAI(af, this); return AbilityFactoryProtection.protectCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectStackDescription(af, this); return AbilityFactoryProtection.protectStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectResolve(af, this); AbilityFactoryProtection.protectResolve(af, this);
} // resolve() } // resolve()
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Protection.protectTriggerAI(af, this, mandatory); return AbilityFactoryProtection.protectTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -127,27 +127,27 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectCanPlayAI(af, this); return AbilityFactoryProtection.protectCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectStackDescription(af, this); return AbilityFactoryProtection.protectStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectResolve(af, this); AbilityFactoryProtection.protectResolve(af, this);
} // resolve } // resolve
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Protection.protectDrawbackAI(af, this); return AbilityFactoryProtection.protectDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Protection.protectTriggerAI(af, this, mandatory); return AbilityFactoryProtection.protectTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -170,7 +170,7 @@ public final class AbilityFactory_Protection {
private static boolean hasProtectionFromAny(final Card card, final ArrayList<String> colors) { private static boolean hasProtectionFromAny(final Card card, final ArrayList<String> colors) {
boolean protect = false; boolean protect = false;
for (final String color : colors) { for (final String color : colors) {
protect |= AbilityFactory_Protection.hasProtectionFrom(card, color); protect |= AbilityFactoryProtection.hasProtectionFrom(card, color);
} }
return protect; return protect;
} }
@@ -182,7 +182,7 @@ public final class AbilityFactory_Protection {
} }
for (final String color : colors) { for (final String color : colors) {
protect &= AbilityFactory_Protection.hasProtectionFrom(card, color); protect &= AbilityFactoryProtection.hasProtectionFrom(card, color);
} }
return protect; return protect;
} }
@@ -198,7 +198,7 @@ public final class AbilityFactory_Protection {
*/ */
private static CardList getProtectCreatures(final AbilityFactory af, final SpellAbility sa) { private static CardList getProtectCreatures(final AbilityFactory af, final SpellAbility sa) {
final Card hostCard = af.getHostCard(); final Card hostCard = af.getHostCard();
final ArrayList<String> gains = AbilityFactory_Protection.getProtectionList(hostCard, af.getMapParams()); final ArrayList<String> gains = AbilityFactoryProtection.getProtectionList(hostCard, af.getMapParams());
CardList list = AllZoneUtil.getCreaturesInPlay(AllZone.getComputerPlayer()); CardList list = AllZoneUtil.getCreaturesInPlay(AllZone.getComputerPlayer());
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
@@ -209,7 +209,7 @@ public final class AbilityFactory_Protection {
} }
// Don't add duplicate protections // Don't add duplicate protections
if (AbilityFactory_Protection.hasProtectionFromAll(c, gains)) { if (AbilityFactoryProtection.hasProtectionFromAll(c, gains)) {
return false; return false;
} }
@@ -307,7 +307,7 @@ public final class AbilityFactory_Protection {
* } * }
*/ */
} else { } else {
return AbilityFactory_Protection.protectTgtAI(af, sa, false); return AbilityFactoryProtection.protectTgtAI(af, sa, false);
} }
return false; return false;
@@ -335,7 +335,7 @@ public final class AbilityFactory_Protection {
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
tgt.resetTargets(); tgt.resetTargets();
CardList list = AbilityFactory_Protection.getProtectCreatures(af, sa); CardList list = AbilityFactoryProtection.getProtectCreatures(af, sa);
list = list.getValidCards(tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getSourceCard()); list = list.getValidCards(tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getSourceCard());
@@ -366,7 +366,7 @@ public final class AbilityFactory_Protection {
} }
if (list.isEmpty()) { if (list.isEmpty()) {
return mandatory && AbilityFactory_Protection.protectMandatoryTarget(af, sa, mandatory); return mandatory && AbilityFactoryProtection.protectMandatoryTarget(af, sa, mandatory);
} }
while (tgt.getNumTargeted() < tgt.getMaxTargets(source, sa)) { while (tgt.getNumTargeted() < tgt.getMaxTargets(source, sa)) {
@@ -376,7 +376,7 @@ public final class AbilityFactory_Protection {
if (list.isEmpty()) { if (list.isEmpty()) {
if ((tgt.getNumTargeted() < tgt.getMinTargets(source, sa)) || (tgt.getNumTargeted() == 0)) { if ((tgt.getNumTargeted() < tgt.getMinTargets(source, sa)) || (tgt.getNumTargeted() == 0)) {
if (mandatory) { if (mandatory) {
return AbilityFactory_Protection.protectMandatoryTarget(af, sa, mandatory); return AbilityFactoryProtection.protectMandatoryTarget(af, sa, mandatory);
} }
tgt.resetTargets(); tgt.resetTargets();
@@ -431,16 +431,16 @@ public final class AbilityFactory_Protection {
pref = pref.filter(new CardListFilter() { pref = pref.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
return !AbilityFactory_Protection.hasProtectionFromAll(c, return !AbilityFactoryProtection.hasProtectionFromAll(c,
AbilityFactory_Protection.getProtectionList(host, params)); AbilityFactoryProtection.getProtectionList(host, params));
} }
}); });
final CardList pref2 = list.getController(AllZone.getComputerPlayer()); final CardList pref2 = list.getController(AllZone.getComputerPlayer());
pref = pref.filter(new CardListFilter() { pref = pref.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
return !AbilityFactory_Protection.hasProtectionFromAny(c, return !AbilityFactoryProtection.hasProtectionFromAny(c,
AbilityFactory_Protection.getProtectionList(host, params)); AbilityFactoryProtection.getProtectionList(host, params));
} }
}); });
final CardList forced = list.getController(AllZone.getHumanPlayer()); final CardList forced = list.getController(AllZone.getHumanPlayer());
@@ -528,7 +528,7 @@ public final class AbilityFactory_Protection {
return true; return true;
} }
} else { } else {
return AbilityFactory_Protection.protectTgtAI(af, sa, mandatory); return AbilityFactoryProtection.protectTgtAI(af, sa, mandatory);
} }
return true; return true;
@@ -553,7 +553,7 @@ public final class AbilityFactory_Protection {
// TODO // TODO
} }
} else { } else {
return AbilityFactory_Protection.protectTgtAI(af, sa, false); return AbilityFactoryProtection.protectTgtAI(af, sa, false);
} }
return true; return true;
@@ -574,7 +574,7 @@ public final class AbilityFactory_Protection {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final ArrayList<String> gains = AbilityFactory_Protection.getProtectionList(host, params); final ArrayList<String> gains = AbilityFactoryProtection.getProtectionList(host, params);
final boolean choose = (params.containsKey("Choices")) ? true : false; final boolean choose = (params.containsKey("Choices")) ? true : false;
final String joiner = choose ? "or" : "and"; final String joiner = choose ? "or" : "and";
@@ -672,7 +672,7 @@ public final class AbilityFactory_Protection {
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final boolean isChoice = params.get("Gains").contains("Choice"); final boolean isChoice = params.get("Gains").contains("Choice");
final ArrayList<String> choices = AbilityFactory_Protection.getProtectionList(host, params); final ArrayList<String> choices = AbilityFactoryProtection.getProtectionList(host, params);
final ArrayList<String> gains = new ArrayList<String>(); final ArrayList<String> gains = new ArrayList<String>();
if (isChoice) { if (isChoice) {
if (sa.getActivatingPlayer().isHuman()) { if (sa.getActivatingPlayer().isHuman()) {
@@ -822,17 +822,17 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectAllCanPlayAI(af, this); return AbilityFactoryProtection.protectAllCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectAllStackDescription(af, this); return AbilityFactoryProtection.protectAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectAllResolve(af, this); AbilityFactoryProtection.protectAllResolve(af, this);
} // resolve } // resolve
}; // SpellAbility }; // SpellAbility
@@ -854,22 +854,22 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectAllCanPlayAI(af, this); return AbilityFactoryProtection.protectAllCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectAllStackDescription(af, this); return AbilityFactoryProtection.protectAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectAllResolve(af, this); AbilityFactoryProtection.protectAllResolve(af, this);
} // resolve() } // resolve()
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Protection.protectAllTriggerAI(af, this, mandatory); return AbilityFactoryProtection.protectAllTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -892,27 +892,27 @@ public final class AbilityFactory_Protection {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Protection.protectAllCanPlayAI(af, this); return AbilityFactoryProtection.protectAllCanPlayAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Protection.protectAllStackDescription(af, this); return AbilityFactoryProtection.protectAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Protection.protectAllResolve(af, this); AbilityFactoryProtection.protectAllResolve(af, this);
} // resolve } // resolve
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Protection.protectAllDrawbackAI(af, this); return AbilityFactoryProtection.protectAllDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Protection.protectAllTriggerAI(af, this, mandatory); return AbilityFactoryProtection.protectAllTriggerAI(af, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -992,7 +992,7 @@ public final class AbilityFactory_Protection {
* @return a boolean. * @return a boolean.
*/ */
private static boolean protectAllDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean protectAllDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Protection.protectAllTriggerAI(af, sa, false); return AbilityFactoryProtection.protectAllTriggerAI(af, sa, false);
} // protectAllDrawbackAI() } // protectAllDrawbackAI()
/** /**
@@ -1062,7 +1062,7 @@ public final class AbilityFactory_Protection {
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final boolean isChoice = params.get("Gains").contains("Choice"); final boolean isChoice = params.get("Gains").contains("Choice");
final ArrayList<String> choices = AbilityFactory_Protection.getProtectionList(host, params); final ArrayList<String> choices = AbilityFactoryProtection.getProtectionList(host, params);
final ArrayList<String> gains = new ArrayList<String>(); final ArrayList<String> gains = new ArrayList<String>();
if (isChoice) { if (isChoice) {
if (sa.getActivatingPlayer().isHuman()) { if (sa.getActivatingPlayer().isHuman()) {

70
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java → src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java
View File

@@ -35,7 +35,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Pump { public class AbilityFactoryPump {
private final ArrayList<String> keywords = new ArrayList<String>(); private final ArrayList<String> keywords = new ArrayList<String>();
@@ -54,7 +54,7 @@ public class AbilityFactory_Pump {
* @param newAF * @param newAF
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public AbilityFactory_Pump(final AbilityFactory newAF) { public AbilityFactoryPump(final AbilityFactory newAF) {
this.abilityFactory = newAF; this.abilityFactory = newAF;
this.params = this.abilityFactory.getMapParams(); this.params = this.abilityFactory.getMapParams();
@@ -98,17 +98,17 @@ public class AbilityFactory_Pump {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Pump.this.pumpPlayAI(this); return AbilityFactoryPump.this.pumpPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpResolve(this); AbilityFactoryPump.this.pumpResolve(this);
} // resolve } // resolve
}; // SpellAbility }; // SpellAbility
@@ -128,22 +128,22 @@ public class AbilityFactory_Pump {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Pump.this.pumpPlayAI(this); return AbilityFactoryPump.this.pumpPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpResolve(this); AbilityFactoryPump.this.pumpResolve(this);
} // resolve() } // resolve()
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Pump.this.pumpTriggerAI(AbilityFactory_Pump.this.abilityFactory, this, mandatory); return AbilityFactoryPump.this.pumpTriggerAI(AbilityFactoryPump.this.abilityFactory, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -164,27 +164,27 @@ public class AbilityFactory_Pump {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Pump.this.pumpPlayAI(this); return AbilityFactoryPump.this.pumpPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpResolve(this); AbilityFactoryPump.this.pumpResolve(this);
} // resolve } // resolve
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Pump.this.pumpDrawbackAI(this); return AbilityFactoryPump.this.pumpDrawbackAI(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Pump.this.pumpTriggerAI(AbilityFactory_Pump.this.abilityFactory, this, mandatory); return AbilityFactoryPump.this.pumpTriggerAI(AbilityFactoryPump.this.abilityFactory, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -245,7 +245,7 @@ public class AbilityFactory_Pump {
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
if (!CardFactoryUtil.canTarget(AbilityFactory_Pump.this.hostCard, c)) { if (!CardFactoryUtil.canTarget(AbilityFactoryPump.this.hostCard, c)) {
return false; return false;
} }
@@ -932,10 +932,10 @@ public class AbilityFactory_Pump {
applyTo.addTempAttackBoost(-1 * a); applyTo.addTempAttackBoost(-1 * a);
applyTo.addTempDefenseBoost(-1 * d); applyTo.addTempDefenseBoost(-1 * d);
if (AbilityFactory_Pump.this.keywords.size() > 0) { if (AbilityFactoryPump.this.keywords.size() > 0) {
for (int i = 0; i < AbilityFactory_Pump.this.keywords.size(); i++) { for (int i = 0; i < AbilityFactoryPump.this.keywords.size(); i++) {
if (!AbilityFactory_Pump.this.keywords.get(i).equals("none")) { if (!AbilityFactoryPump.this.keywords.get(i).equals("none")) {
applyTo.removeExtrinsicKeyword(AbilityFactory_Pump.this.keywords.get(i)); applyTo.removeExtrinsicKeyword(AbilityFactoryPump.this.keywords.get(i));
} }
} }
} }
@@ -972,22 +972,22 @@ public class AbilityFactory_Pump {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Pump.this.pumpAllCanPlayAI(this); return AbilityFactoryPump.this.pumpAllCanPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpAllStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpAllStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpAllResolve(this); AbilityFactoryPump.this.pumpAllResolve(this);
} // resolve() } // resolve()
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Pump.this.pumpAllTriggerAI(AbilityFactory_Pump.this.abilityFactory, this, mandatory); return AbilityFactoryPump.this.pumpAllTriggerAI(AbilityFactoryPump.this.abilityFactory, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -1008,17 +1008,17 @@ public class AbilityFactory_Pump {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Pump.this.pumpAllCanPlayAI(this); return AbilityFactoryPump.this.pumpAllCanPlayAI(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpAllStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpAllStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpAllResolve(this); AbilityFactoryPump.this.pumpAllResolve(this);
} // resolve } // resolve
}; // SpellAbility }; // SpellAbility
@@ -1038,22 +1038,22 @@ public class AbilityFactory_Pump {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Pump.this.pumpAllStackDescription(AbilityFactory_Pump.this.abilityFactory, this); return AbilityFactoryPump.this.pumpAllStackDescription(AbilityFactoryPump.this.abilityFactory, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Pump.this.pumpAllResolve(this); AbilityFactoryPump.this.pumpAllResolve(this);
} // resolve } // resolve
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Pump.this.pumpAllChkDrawbackAI(this); return AbilityFactoryPump.this.pumpAllChkDrawbackAI(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Pump.this.pumpAllTriggerAI(AbilityFactory_Pump.this.abilityFactory, this, mandatory); return AbilityFactoryPump.this.pumpAllTriggerAI(AbilityFactoryPump.this.abilityFactory, this, mandatory);
} }
}; // SpellAbility }; // SpellAbility
@@ -1094,7 +1094,7 @@ public class AbilityFactory_Pump {
human = human.filter(new CardListFilter() { human = human.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
return CombatUtil.canAttack(c) && !AbilityFactory_Pump.this.abilityFactory.isCurse(); return CombatUtil.canAttack(c) && !AbilityFactoryPump.this.abilityFactory.isCurse();
} }
}); });
@@ -1206,10 +1206,10 @@ public class AbilityFactory_Pump {
tgtC.addTempAttackBoost(-1 * a); tgtC.addTempAttackBoost(-1 * a);
tgtC.addTempDefenseBoost(-1 * d); tgtC.addTempDefenseBoost(-1 * d);
if (AbilityFactory_Pump.this.keywords.size() > 0) { if (AbilityFactoryPump.this.keywords.size() > 0) {
for (int i = 0; i < AbilityFactory_Pump.this.keywords.size(); i++) { for (int i = 0; i < AbilityFactoryPump.this.keywords.size(); i++) {
if (!AbilityFactory_Pump.this.keywords.get(i).equals("none")) { if (!AbilityFactoryPump.this.keywords.get(i).equals("none")) {
tgtC.removeExtrinsicKeyword(AbilityFactory_Pump.this.keywords.get(i)); tgtC.removeExtrinsicKeyword(AbilityFactoryPump.this.keywords.get(i));
} }
} }
} }

44
src/main/java/forge/card/abilityFactory/AbilityFactory_Regenerate.java → src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java
View File

@@ -31,7 +31,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Regenerate { public class AbilityFactoryRegenerate {
// Ex: A:SP$Regenerate | Cost$W | Tgt$TgtC | SpellDescription$Regenerate // Ex: A:SP$Regenerate | Cost$W | Tgt$TgtC | SpellDescription$Regenerate
// target creature. // target creature.
@@ -57,22 +57,22 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Regenerate.regenerateCanPlayAI(af, this); return AbilityFactoryRegenerate.regenerateCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateResolve(af, this); AbilityFactoryRegenerate.regenerateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateStackDescription(af, this); return AbilityFactoryRegenerate.regenerateStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Regenerate.doTriggerAI(af, this, mandatory); return AbilityFactoryRegenerate.doTriggerAI(af, this, mandatory);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -96,17 +96,17 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Regenerate.regenerateCanPlayAI(af, this); return AbilityFactoryRegenerate.regenerateCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateResolve(af, this); AbilityFactoryRegenerate.regenerateResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateStackDescription(af, this); return AbilityFactoryRegenerate.regenerateStackDescription(af, this);
} }
}; // Spell }; // Spell
@@ -129,12 +129,12 @@ public class AbilityFactory_Regenerate {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateStackDescription(af, this); return AbilityFactoryRegenerate.regenerateStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateResolve(af, this); AbilityFactoryRegenerate.regenerateResolve(af, this);
} }
@Override @Override
@@ -144,7 +144,7 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Regenerate.doTriggerAI(af, this, mandatory); return AbilityFactoryRegenerate.doTriggerAI(af, this, mandatory);
} }
}; };
@@ -345,7 +345,7 @@ public class AbilityFactory_Regenerate {
// If there's no target on the trigger, just say yes. // If there's no target on the trigger, just say yes.
chance = true; chance = true;
} else { } else {
chance = AbilityFactory_Regenerate.regenMandatoryTarget(af, sa, mandatory); chance = AbilityFactoryRegenerate.regenMandatoryTarget(af, sa, mandatory);
} }
final Ability_Sub subAb = sa.getSubAbility(); final Ability_Sub subAb = sa.getSubAbility();
@@ -487,22 +487,22 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Regenerate.regenerateAllCanPlayAI(af, this); return AbilityFactoryRegenerate.regenerateAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateAllResolve(af, this); AbilityFactoryRegenerate.regenerateAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateAllStackDescription(af, this); return AbilityFactoryRegenerate.regenerateAllStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Regenerate.regenerateAllDoTriggerAI(af, this, mandatory); return AbilityFactoryRegenerate.regenerateAllDoTriggerAI(af, this, mandatory);
} }
}; // Ability_Activated }; // Ability_Activated
@@ -526,17 +526,17 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Regenerate.regenerateAllCanPlayAI(af, this); return AbilityFactoryRegenerate.regenerateAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateAllResolve(af, this); AbilityFactoryRegenerate.regenerateAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateAllStackDescription(af, this); return AbilityFactoryRegenerate.regenerateAllStackDescription(af, this);
} }
}; // Spell }; // Spell
@@ -559,12 +559,12 @@ public class AbilityFactory_Regenerate {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Regenerate.regenerateAllStackDescription(af, this); return AbilityFactoryRegenerate.regenerateAllStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Regenerate.regenerateAllResolve(af, this); AbilityFactoryRegenerate.regenerateAllResolve(af, this);
} }
@Override @Override
@@ -574,7 +574,7 @@ public class AbilityFactory_Regenerate {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Regenerate.regenerateAllDoTriggerAI(af, this, mandatory); return AbilityFactoryRegenerate.regenerateAllDoTriggerAI(af, this, mandatory);
} }
}; };

144
src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java → src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java
View File

@@ -37,9 +37,9 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public final class AbilityFactory_Reveal { public final class AbilityFactoryReveal {
private AbilityFactory_Reveal() { private AbilityFactoryReveal() {
throw new AssertionError(); throw new AssertionError();
} }
@@ -63,22 +63,22 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digStackDescription(af, this); return AbilityFactoryReveal.digStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.digCanPlayAI(af, this); return AbilityFactoryReveal.digCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digResolve(af, this); AbilityFactoryReveal.digResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.digTriggerAI(af, this, mandatory); return AbilityFactoryReveal.digTriggerAI(af, this, mandatory);
} }
}; };
@@ -100,17 +100,17 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digStackDescription(af, this); return AbilityFactoryReveal.digStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.digCanPlayAI(af, this); return AbilityFactoryReveal.digCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digResolve(af, this); AbilityFactoryReveal.digResolve(af, this);
} }
}; };
@@ -132,12 +132,12 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digStackDescription(af, this); return AbilityFactoryReveal.digStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digResolve(af, this); AbilityFactoryReveal.digResolve(af, this);
} }
@Override @Override
@@ -147,7 +147,7 @@ public final class AbilityFactory_Reveal {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.digTriggerAI(af, this, mandatory); return AbilityFactoryReveal.digTriggerAI(af, this, mandatory);
} }
}; };
@@ -386,7 +386,7 @@ public final class AbilityFactory_Reveal {
if (!noMove) { if (!noMove) {
if (mitosis) { if (mitosis) {
valid = AbilityFactory_Reveal.sharesNameWithCardOnBattlefield(top); valid = AbilityFactoryReveal.sharesNameWithCardOnBattlefield(top);
for (final Card c : top) { for (final Card c : top) {
if (!valid.contains(c)) { if (!valid.contains(c)) {
rest.add(c); rest.add(c);
@@ -597,22 +597,22 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digUntilStackDescription(af, this); return AbilityFactoryReveal.digUntilStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.digUntilCanPlayAI(af, this); return AbilityFactoryReveal.digUntilCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digUntilResolve(af, this); AbilityFactoryReveal.digUntilResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.digUntilTriggerAI(af, this, mandatory); return AbilityFactoryReveal.digUntilTriggerAI(af, this, mandatory);
} }
}; };
@@ -634,17 +634,17 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digUntilStackDescription(af, this); return AbilityFactoryReveal.digUntilStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.digUntilCanPlayAI(af, this); return AbilityFactoryReveal.digUntilCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digUntilResolve(af, this); AbilityFactoryReveal.digUntilResolve(af, this);
} }
}; };
@@ -666,12 +666,12 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.digUntilStackDescription(af, this); return AbilityFactoryReveal.digUntilStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.digUntilResolve(af, this); AbilityFactoryReveal.digUntilResolve(af, this);
} }
@Override @Override
@@ -681,7 +681,7 @@ public final class AbilityFactory_Reveal {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.digUntilTriggerAI(af, this, mandatory); return AbilityFactoryReveal.digUntilTriggerAI(af, this, mandatory);
} }
}; };
@@ -956,22 +956,22 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.revealHandStackDescription(af, this); return AbilityFactoryReveal.revealHandStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.revealHandCanPlayAI(af, this); return AbilityFactoryReveal.revealHandCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealHandResolve(af, this); AbilityFactoryReveal.revealHandResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.revealHandTrigger(af, this, mandatory); return AbilityFactoryReveal.revealHandTrigger(af, this, mandatory);
} }
}; };
@@ -993,17 +993,17 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.revealHandStackDescription(af, this); return AbilityFactoryReveal.revealHandStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.revealHandCanPlayAI(af, this); return AbilityFactoryReveal.revealHandCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealHandResolve(af, this); AbilityFactoryReveal.revealHandResolve(af, this);
} }
}; };
@@ -1027,22 +1027,22 @@ public final class AbilityFactory_Reveal {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Reveal.revealHandStackDescription(af, this); return AbilityFactoryReveal.revealHandStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealHandResolve(af, this); AbilityFactoryReveal.revealHandResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Reveal.revealHandTargetAI(af, this, false, false); return AbilityFactoryReveal.revealHandTargetAI(af, this, false, false);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.revealHandTrigger(af, this, mandatory); return AbilityFactoryReveal.revealHandTrigger(af, this, mandatory);
} }
}; };
@@ -1134,7 +1134,7 @@ public final class AbilityFactory_Reveal {
} }
final boolean bFlag = AbilityFactory_Reveal.revealHandTargetAI(af, sa, true, false); final boolean bFlag = AbilityFactoryReveal.revealHandTargetAI(af, sa, true, false);
if (!bFlag) { if (!bFlag) {
return false; return false;
@@ -1211,7 +1211,7 @@ public final class AbilityFactory_Reveal {
return false; return false;
} }
if (!AbilityFactory_Reveal.revealHandTargetAI(af, sa, false, mandatory)) { if (!AbilityFactoryReveal.revealHandTargetAI(af, sa, false, mandatory)) {
return false; return false;
} }
@@ -1291,22 +1291,22 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.scryStackDescription(af, this); return AbilityFactoryReveal.scryStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.scryCanPlayAI(af, this); return AbilityFactoryReveal.scryCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.scryResolve(af, this); AbilityFactoryReveal.scryResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.scryTriggerAI(af, this); return AbilityFactoryReveal.scryTriggerAI(af, this);
} }
}; };
@@ -1328,17 +1328,17 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.scryStackDescription(af, this); return AbilityFactoryReveal.scryStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.scryCanPlayAI(af, this); return AbilityFactoryReveal.scryCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.scryResolve(af, this); AbilityFactoryReveal.scryResolve(af, this);
} }
}; };
@@ -1362,22 +1362,22 @@ public final class AbilityFactory_Reveal {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Reveal.scryStackDescription(af, this); return AbilityFactoryReveal.scryStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.scryResolve(af, this); AbilityFactoryReveal.scryResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Reveal.scryTargetAI(af, this); return AbilityFactoryReveal.scryTargetAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.scryTriggerAI(af, this); return AbilityFactoryReveal.scryTriggerAI(af, this);
} }
}; };
@@ -1458,7 +1458,7 @@ public final class AbilityFactory_Reveal {
return false; return false;
} }
return AbilityFactory_Reveal.scryTargetAI(af, sa); return AbilityFactoryReveal.scryTargetAI(af, sa);
} // scryTargetAI() } // scryTargetAI()
/** /**
@@ -1565,7 +1565,7 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.rearrangeTopOfLibraryStackDescription(af, this); return AbilityFactoryReveal.rearrangeTopOfLibraryStackDescription(af, this);
} }
@Override @Override
@@ -1575,12 +1575,12 @@ public final class AbilityFactory_Reveal {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.rearrangeTopOfLibraryTrigger(af, this, mandatory); return AbilityFactoryReveal.rearrangeTopOfLibraryTrigger(af, this, mandatory);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.rearrangeTopOfLibraryResolve(af, this); AbilityFactoryReveal.rearrangeTopOfLibraryResolve(af, this);
} }
}; };
@@ -1603,7 +1603,7 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.rearrangeTopOfLibraryStackDescription(af, this); return AbilityFactoryReveal.rearrangeTopOfLibraryStackDescription(af, this);
} }
@Override @Override
@@ -1613,12 +1613,12 @@ public final class AbilityFactory_Reveal {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.rearrangeTopOfLibraryTrigger(af, this, mandatory); return AbilityFactoryReveal.rearrangeTopOfLibraryTrigger(af, this, mandatory);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.rearrangeTopOfLibraryResolve(af, this); AbilityFactoryReveal.rearrangeTopOfLibraryResolve(af, this);
} }
}; };
@@ -1643,12 +1643,12 @@ public final class AbilityFactory_Reveal {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Reveal.rearrangeTopOfLibraryStackDescription(af, this); return AbilityFactoryReveal.rearrangeTopOfLibraryStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.rearrangeTopOfLibraryResolve(af, this); AbilityFactoryReveal.rearrangeTopOfLibraryResolve(af, this);
} }
@Override @Override
@@ -1658,7 +1658,7 @@ public final class AbilityFactory_Reveal {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.rearrangeTopOfLibraryTrigger(af, this, mandatory); return AbilityFactoryReveal.rearrangeTopOfLibraryTrigger(af, this, mandatory);
} }
}; };
@@ -1793,7 +1793,7 @@ public final class AbilityFactory_Reveal {
for (final Player p : tgtPlayers) { for (final Player p : tgtPlayers) {
if ((tgt == null) || p.canTarget(sa)) { if ((tgt == null) || p.canTarget(sa)) {
AbilityFactory_Reveal.rearrangeTopOfLibrary(af.getHostCard(), p, numCards, shuffle); AbilityFactoryReveal.rearrangeTopOfLibrary(af.getHostCard(), p, numCards, shuffle);
} }
} }
} }
@@ -1875,22 +1875,22 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.revealStackDescription(af, this); return AbilityFactoryReveal.revealStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.revealCanPlayAI(af, this); return AbilityFactoryReveal.revealCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealResolve(af, this); AbilityFactoryReveal.revealResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.revealTrigger(af, this, mandatory); return AbilityFactoryReveal.revealTrigger(af, this, mandatory);
} }
}; };
@@ -1912,17 +1912,17 @@ public final class AbilityFactory_Reveal {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Reveal.revealStackDescription(af, this); return AbilityFactoryReveal.revealStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Reveal.revealCanPlayAI(af, this); return AbilityFactoryReveal.revealCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealResolve(af, this); AbilityFactoryReveal.revealResolve(af, this);
} }
}; };
@@ -1946,23 +1946,23 @@ public final class AbilityFactory_Reveal {
public String getStackDescription() { public String getStackDescription() {
// when getStackDesc is called, just build exactly what is // when getStackDesc is called, just build exactly what is
// happening // happening
return AbilityFactory_Reveal.revealStackDescription(af, this); return AbilityFactoryReveal.revealStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Reveal.revealResolve(af, this); AbilityFactoryReveal.revealResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
// reuse code from RevealHand // reuse code from RevealHand
return AbilityFactory_Reveal.revealHandTargetAI(af, this, false, false); return AbilityFactoryReveal.revealHandTargetAI(af, this, false, false);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Reveal.revealTrigger(af, this, mandatory); return AbilityFactoryReveal.revealTrigger(af, this, mandatory);
} }
}; };
@@ -2059,7 +2059,7 @@ public final class AbilityFactory_Reveal {
} }
// we can reuse this function here... // we can reuse this function here...
final boolean bFlag = AbilityFactory_Reveal.revealHandTargetAI(af, sa, true, false); final boolean bFlag = AbilityFactoryReveal.revealHandTargetAI(af, sa, true, false);
if (!bFlag) { if (!bFlag) {
return false; return false;
@@ -2097,7 +2097,7 @@ public final class AbilityFactory_Reveal {
return false; return false;
} }
if (!AbilityFactory_Reveal.revealHandTargetAI(af, sa, false, mandatory)) { if (!AbilityFactoryReveal.revealHandTargetAI(af, sa, false, mandatory)) {
return false; return false;
} }
@@ -2146,7 +2146,7 @@ public final class AbilityFactory_Reveal {
if (params.containsKey("RevealValid")) { if (params.containsKey("RevealValid")) {
valid = valid.getValidCards(params.get("RevealValid"), p, host); valid = valid.getValidCards(params.get("RevealValid"), p, host);
} }
revealed.addAll(AbilityFactory_Reveal.getRevealedList(host, sa, valid)); revealed.addAll(AbilityFactoryReveal.getRevealedList(host, sa, valid));
} }
if (params.containsKey("RememberRevealed")) { if (params.containsKey("RememberRevealed")) {

54
src/main/java/forge/card/abilityFactory/AbilityFactory_Sacrifice.java → src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java
View File

@@ -31,7 +31,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Sacrifice { public class AbilityFactorySacrifice {
// ************************************************************** // **************************************************************
// *************************** Sacrifice *********************** // *************************** Sacrifice ***********************
// ************************************************************** // **************************************************************
@@ -51,22 +51,22 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Sacrifice.sacrificeCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeResolve(af, this); AbilityFactorySacrifice.sacrificeResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeDescription(af, this); return AbilityFactorySacrifice.sacrificeDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Sacrifice.sacrificeTriggerAI(af, this, mandatory); return AbilityFactorySacrifice.sacrificeTriggerAI(af, this, mandatory);
} }
}; };
return abSacrifice; return abSacrifice;
@@ -87,17 +87,17 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Sacrifice.sacrificeCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeResolve(af, this); AbilityFactorySacrifice.sacrificeResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeDescription(af, this); return AbilityFactorySacrifice.sacrificeDescription(af, this);
} }
}; };
return spSacrifice; return spSacrifice;
@@ -118,22 +118,22 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeResolve(af, this); AbilityFactorySacrifice.sacrificeResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_Sacrifice.sacrificePlayDrawbackAI(af, this); return AbilityFactorySacrifice.sacrificePlayDrawbackAI(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeDescription(af, this); return AbilityFactorySacrifice.sacrificeDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Sacrifice.sacrificeTriggerAI(af, this, mandatory); return AbilityFactorySacrifice.sacrificeTriggerAI(af, this, mandatory);
} }
}; };
return dbSacrifice; return dbSacrifice;
@@ -222,7 +222,7 @@ public class AbilityFactory_Sacrifice {
public static boolean sacrificeCanPlayAI(final AbilityFactory af, final SpellAbility sa) { public static boolean sacrificeCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
boolean chance = AbilityFactory_Sacrifice.sacrificeTgtAI(af, sa); boolean chance = AbilityFactorySacrifice.sacrificeTgtAI(af, sa);
// Some additional checks based on what is being sacrificed, and who is // Some additional checks based on what is being sacrificed, and who is
// sacrificing // sacrificing
@@ -278,7 +278,7 @@ public class AbilityFactory_Sacrifice {
*/ */
public static boolean sacrificePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { public static boolean sacrificePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
// AI should only activate this during Human's turn // AI should only activate this during Human's turn
boolean chance = AbilityFactory_Sacrifice.sacrificeTgtAI(af, sa); boolean chance = AbilityFactorySacrifice.sacrificeTgtAI(af, sa);
// TODO: restrict the subAbility a bit // TODO: restrict the subAbility a bit
@@ -309,7 +309,7 @@ public class AbilityFactory_Sacrifice {
} }
// AI should only activate this during Human's turn // AI should only activate this during Human's turn
boolean chance = AbilityFactory_Sacrifice.sacrificeTgtAI(af, sa); boolean chance = AbilityFactorySacrifice.sacrificeTgtAI(af, sa);
// Improve AI for triggers. If source is a creature with: // Improve AI for triggers. If source is a creature with:
// When ETB, sacrifice a creature. Check to see if the AI has something // When ETB, sacrifice a creature. Check to see if the AI has something
@@ -473,14 +473,14 @@ public class AbilityFactory_Sacrifice {
// then actually sacrifice the cards in this resolve method. // then actually sacrifice the cards in this resolve method.
// (ArsenalNut 09/20/2011) // (ArsenalNut 09/20/2011)
if (p.isComputer()) { if (p.isComputer()) {
sacList = AbilityFactory_Sacrifice.sacrificeAI(p, amount, valid, sa); sacList = AbilityFactorySacrifice.sacrificeAI(p, amount, valid, sa);
if (remSacrificed) { if (remSacrificed) {
for (int i = 0; i < sacList.size(); i++) { for (int i = 0; i < sacList.size(); i++) {
card.addRemembered(sacList.get(i)); card.addRemembered(sacList.get(i));
} }
} }
} else { } else {
AbilityFactory_Sacrifice.sacrificeHuman(p, amount, valid, sa, msg); AbilityFactorySacrifice.sacrificeHuman(p, amount, valid, sa, msg);
} }
} }
@@ -557,22 +557,22 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Sacrifice.sacrificeAllCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeAllResolve(af, this); AbilityFactorySacrifice.sacrificeAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeAllStackDescription(af, this); return AbilityFactorySacrifice.sacrificeAllStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Sacrifice.sacrificeAllCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeAllCanPlayAI(af, this);
} }
}; };
return abSacrifice; return abSacrifice;
@@ -594,17 +594,17 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Sacrifice.sacrificeAllCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeAllCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeAllResolve(af, this); AbilityFactorySacrifice.sacrificeAllResolve(af, this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeAllStackDescription(af, this); return AbilityFactorySacrifice.sacrificeAllStackDescription(af, this);
} }
}; };
return spSacrifice; return spSacrifice;
@@ -626,7 +626,7 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Sacrifice.sacrificeAllResolve(af, this); AbilityFactorySacrifice.sacrificeAllResolve(af, this);
} }
@Override @Override
@@ -636,12 +636,12 @@ public class AbilityFactory_Sacrifice {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Sacrifice.sacrificeAllStackDescription(af, this); return AbilityFactorySacrifice.sacrificeAllStackDescription(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Sacrifice.sacrificeAllCanPlayAI(af, this); return AbilityFactorySacrifice.sacrificeAllCanPlayAI(af, this);
} }
}; };
return dbSacrifice; return dbSacrifice;

24
src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java → src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java
View File

@@ -31,7 +31,7 @@ import forge.card.trigger.TriggerHandler;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Token extends AbilityFactory { public class AbilityFactoryToken extends AbilityFactory {
private AbilityFactory abilityFactory = null; private AbilityFactory abilityFactory = null;
private final String tokenAmount; private final String tokenAmount;
@@ -58,7 +58,7 @@ public class AbilityFactory_Token extends AbilityFactory {
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public AbilityFactory_Token(final AbilityFactory af) { public AbilityFactoryToken(final AbilityFactory af) {
this.abilityFactory = af; this.abilityFactory = af;
final HashMap<String, String> mapParams = af.getMapParams(); final HashMap<String, String> mapParams = af.getMapParams();
@@ -140,22 +140,22 @@ public class AbilityFactory_Token extends AbilityFactory {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Token.this.tokenCanPlayAI(this); return AbilityFactoryToken.this.tokenCanPlayAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Token.this.doResolve(this); AbilityFactoryToken.this.doResolve(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Token.this.doStackDescription(this); return AbilityFactoryToken.this.doStackDescription(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Token.this.tokenDoTriggerAI(this, mandatory); return AbilityFactoryToken.this.tokenDoTriggerAI(this, mandatory);
} }
}; };
@@ -175,17 +175,17 @@ public class AbilityFactory_Token extends AbilityFactory {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Token.this.tokenCanPlayAI(this); return AbilityFactoryToken.this.tokenCanPlayAI(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Token.this.doResolve(this); AbilityFactoryToken.this.doResolve(this);
} }
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Token.this.doStackDescription(this); return AbilityFactoryToken.this.doStackDescription(this);
} }
}; };
@@ -210,17 +210,17 @@ public class AbilityFactory_Token extends AbilityFactory {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Token.this.doStackDescription(this); return AbilityFactoryToken.this.doStackDescription(this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Token.this.doResolve(this); AbilityFactoryToken.this.doResolve(this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Token.this.tokenDoTriggerAI(this, mandatory); return AbilityFactoryToken.this.tokenDoTriggerAI(this, mandatory);
} }
}; // Spell }; // Spell

24
src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java → src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java
View File

@@ -19,7 +19,7 @@ import forge.card.spellability.Target;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_Turns { public class AbilityFactoryTurns {
// ************************************************************************* // *************************************************************************
// ************************* ADD TURN ************************************** // ************************* ADD TURN **************************************
@@ -41,22 +41,22 @@ public class AbilityFactory_Turns {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Turns.addTurnStackDescription(af, this); return AbilityFactoryTurns.addTurnStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Turns.addTurnCanPlayAI(af, this); return AbilityFactoryTurns.addTurnCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Turns.addTurnResolve(af, this); AbilityFactoryTurns.addTurnResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Turns.addTurnTriggerAI(af, this, mandatory); return AbilityFactoryTurns.addTurnTriggerAI(af, this, mandatory);
} }
}; };
@@ -78,17 +78,17 @@ public class AbilityFactory_Turns {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Turns.addTurnStackDescription(af, this); return AbilityFactoryTurns.addTurnStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_Turns.addTurnCanPlayAI(af, this); return AbilityFactoryTurns.addTurnCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Turns.addTurnResolve(af, this); AbilityFactoryTurns.addTurnResolve(af, this);
} }
}; };
@@ -110,12 +110,12 @@ public class AbilityFactory_Turns {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_Turns.addTurnStackDescription(af, this); return AbilityFactoryTurns.addTurnStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_Turns.addTurnResolve(af, this); AbilityFactoryTurns.addTurnResolve(af, this);
} }
@Override @Override
@@ -125,7 +125,7 @@ public class AbilityFactory_Turns {
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_Turns.addTurnTriggerAI(af, this, mandatory); return AbilityFactoryTurns.addTurnTriggerAI(af, this, mandatory);
} }
}; };
@@ -199,7 +199,7 @@ public class AbilityFactory_Turns {
* @return a boolean. * @return a boolean.
*/ */
private static boolean addTurnCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean addTurnCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
return AbilityFactory_Turns.addTurnTriggerAI(af, sa, false); return AbilityFactoryTurns.addTurnTriggerAI(af, sa, false);
} }
/** /**

108
src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java → src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java
View File

@@ -34,7 +34,7 @@ import forge.gui.GuiUtils;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AbilityFactory_ZoneAffecting { public class AbilityFactoryZoneAffecting {
// ********************************************************************** // **********************************************************************
// ******************************* DRAW ********************************* // ******************************* DRAW *********************************
@@ -54,22 +54,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.drawStackDescription(af, this); return AbilityFactoryZoneAffecting.drawStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.drawCanPlayAI(af, this); return AbilityFactoryZoneAffecting.drawCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.drawResolve(af, this); AbilityFactoryZoneAffecting.drawResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.drawTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.drawTrigger(af, this, mandatory);
} }
}; };
@@ -91,17 +91,17 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.drawStackDescription(af, this); return AbilityFactoryZoneAffecting.drawStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.drawCanPlayAI(af, this); return AbilityFactoryZoneAffecting.drawCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.drawResolve(af, this); AbilityFactoryZoneAffecting.drawResolve(af, this);
} }
}; };
@@ -123,22 +123,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.drawStackDescription(af, this); return AbilityFactoryZoneAffecting.drawStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.drawResolve(af, this); AbilityFactoryZoneAffecting.drawResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ZoneAffecting.drawTargetAI(af, this, false, false); return AbilityFactoryZoneAffecting.drawTargetAI(af, this, false, false);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.drawTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.drawTrigger(af, this, mandatory);
} }
}; };
@@ -256,7 +256,7 @@ public class AbilityFactory_ZoneAffecting {
} }
final boolean bFlag = AbilityFactory_ZoneAffecting.drawTargetAI(af, sa, true, false); final boolean bFlag = AbilityFactoryZoneAffecting.drawTargetAI(af, sa, true, false);
if (!bFlag) { if (!bFlag) {
return false; return false;
@@ -445,7 +445,7 @@ public class AbilityFactory_ZoneAffecting {
return false; return false;
} }
if (!AbilityFactory_ZoneAffecting.drawTargetAI(af, sa, false, mandatory)) { if (!AbilityFactoryZoneAffecting.drawTargetAI(af, sa, false, mandatory)) {
return false; return false;
} }
@@ -550,22 +550,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.millStackDescription(this, af); return AbilityFactoryZoneAffecting.millStackDescription(this, af);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.millCanPlayAI(af, this); return AbilityFactoryZoneAffecting.millCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.millResolve(af, this); AbilityFactoryZoneAffecting.millResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.millTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.millTrigger(af, this, mandatory);
} }
}; };
@@ -587,17 +587,17 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.millStackDescription(this, af); return AbilityFactoryZoneAffecting.millStackDescription(this, af);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.millCanPlayAI(af, this); return AbilityFactoryZoneAffecting.millCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.millResolve(af, this); AbilityFactoryZoneAffecting.millResolve(af, this);
} }
}; };
@@ -619,22 +619,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.millStackDescription(this, af); return AbilityFactoryZoneAffecting.millStackDescription(this, af);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.millResolve(af, this); AbilityFactoryZoneAffecting.millResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ZoneAffecting.millDrawback(af, this); return AbilityFactoryZoneAffecting.millDrawback(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.millTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.millTrigger(af, this, mandatory);
} }
}; };
@@ -739,7 +739,7 @@ public class AbilityFactory_ZoneAffecting {
} }
if (!AbilityFactory_ZoneAffecting.millTargetAI(af, sa, false)) { if (!AbilityFactoryZoneAffecting.millTargetAI(af, sa, false)) {
return false; return false;
} }
@@ -853,7 +853,7 @@ public class AbilityFactory_ZoneAffecting {
* @return a boolean. * @return a boolean.
*/ */
private static boolean millDrawback(final AbilityFactory af, final SpellAbility sa) { private static boolean millDrawback(final AbilityFactory af, final SpellAbility sa) {
if (!AbilityFactory_ZoneAffecting.millTargetAI(af, sa, true)) { if (!AbilityFactoryZoneAffecting.millTargetAI(af, sa, true)) {
return false; return false;
} }
@@ -871,7 +871,7 @@ public class AbilityFactory_ZoneAffecting {
return false; return false;
} }
if (!AbilityFactory_ZoneAffecting.millTargetAI(af, sa, mandatory)) { if (!AbilityFactoryZoneAffecting.millTargetAI(af, sa, mandatory)) {
return false; return false;
} }
@@ -974,22 +974,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.discardStackDescription(af, this); return AbilityFactoryZoneAffecting.discardStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.discardCanPlayAI(af, this); return AbilityFactoryZoneAffecting.discardCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.discardResolve(af, this); AbilityFactoryZoneAffecting.discardResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.discardTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.discardTrigger(af, this, mandatory);
} }
}; };
@@ -1011,17 +1011,17 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.discardStackDescription(af, this); return AbilityFactoryZoneAffecting.discardStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.discardCanPlayAI(af, this); return AbilityFactoryZoneAffecting.discardCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.discardResolve(af, this); AbilityFactoryZoneAffecting.discardResolve(af, this);
} }
}; };
@@ -1043,22 +1043,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.discardStackDescription(af, this); return AbilityFactoryZoneAffecting.discardStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.discardResolve(af, this); AbilityFactoryZoneAffecting.discardResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ZoneAffecting.discardCheckDrawbackAI(af, this); return AbilityFactoryZoneAffecting.discardCheckDrawbackAI(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.discardTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.discardTrigger(af, this, mandatory);
} }
}; };
@@ -1356,7 +1356,7 @@ public class AbilityFactory_ZoneAffecting {
final boolean humanHasHand = AllZone.getHumanPlayer().getCardsIn(Constant.Zone.Hand).size() > 0; final boolean humanHasHand = AllZone.getHumanPlayer().getCardsIn(Constant.Zone.Hand).size() > 0;
if (tgt != null) { if (tgt != null) {
AbilityFactory_ZoneAffecting.discardTargetAI(af, sa); AbilityFactoryZoneAffecting.discardTargetAI(af, sa);
} else { } else {
// TODO: Add appropriate restrictions // TODO: Add appropriate restrictions
final ArrayList<Player> players = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), final ArrayList<Player> players = AbilityFactory.getDefinedPlayers(sa.getSourceCard(),
@@ -1471,7 +1471,7 @@ public class AbilityFactory_ZoneAffecting {
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
if (tgt != null) { if (tgt != null) {
if (!AbilityFactory_ZoneAffecting.discardTargetAI(af, sa)) { if (!AbilityFactoryZoneAffecting.discardTargetAI(af, sa)) {
if (mandatory && AllZone.getComputerPlayer().canTarget(sa)) { if (mandatory && AllZone.getComputerPlayer().canTarget(sa)) {
tgt.addTarget(AllZone.getComputerPlayer()); tgt.addTarget(AllZone.getComputerPlayer());
} else { } else {
@@ -1499,7 +1499,7 @@ public class AbilityFactory_ZoneAffecting {
// if parent draws cards, make sure cards in hand + cards drawn > 0 // if parent draws cards, make sure cards in hand + cards drawn > 0
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
if (tgt != null) { if (tgt != null) {
return AbilityFactory_ZoneAffecting.discardTargetAI(af, subAb); return AbilityFactoryZoneAffecting.discardTargetAI(af, subAb);
} }
// TODO: check for some extra things // TODO: check for some extra things
return true; return true;
@@ -1524,22 +1524,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.shuffleStackDescription(af, this); return AbilityFactoryZoneAffecting.shuffleStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.shuffleCanPlayAI(af, this); return AbilityFactoryZoneAffecting.shuffleCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.shuffleResolve(af, this); AbilityFactoryZoneAffecting.shuffleResolve(af, this);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.shuffleTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.shuffleTrigger(af, this, mandatory);
} }
}; };
@@ -1561,17 +1561,17 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.shuffleStackDescription(af, this); return AbilityFactoryZoneAffecting.shuffleStackDescription(af, this);
} }
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
return AbilityFactory_ZoneAffecting.shuffleCanPlayAI(af, this); return AbilityFactoryZoneAffecting.shuffleCanPlayAI(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.shuffleResolve(af, this); AbilityFactoryZoneAffecting.shuffleResolve(af, this);
} }
}; };
@@ -1593,22 +1593,22 @@ public class AbilityFactory_ZoneAffecting {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
return AbilityFactory_ZoneAffecting.shuffleStackDescription(af, this); return AbilityFactoryZoneAffecting.shuffleStackDescription(af, this);
} }
@Override @Override
public void resolve() { public void resolve() {
AbilityFactory_ZoneAffecting.shuffleResolve(af, this); AbilityFactoryZoneAffecting.shuffleResolve(af, this);
} }
@Override @Override
public boolean chkAIDrawback() { public boolean chkAIDrawback() {
return AbilityFactory_ZoneAffecting.shuffleTargetAI(af, this, false, false); return AbilityFactoryZoneAffecting.shuffleTargetAI(af, this, false, false);
} }
@Override @Override
public boolean doTrigger(final boolean mandatory) { public boolean doTrigger(final boolean mandatory) {
return AbilityFactory_ZoneAffecting.shuffleTrigger(af, this, mandatory); return AbilityFactoryZoneAffecting.shuffleTrigger(af, this, mandatory);
} }
}; };
@@ -1746,7 +1746,7 @@ public class AbilityFactory_ZoneAffecting {
return false; return false;
} }
if (!AbilityFactory_ZoneAffecting.shuffleTargetAI(af, sa, false, mandatory)) { if (!AbilityFactoryZoneAffecting.shuffleTargetAI(af, sa, false, mandatory)) {
return false; return false;
} }

4
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -16,7 +16,7 @@ import forge.Constant.Zone;
import forge.GameActionUtil; import forge.GameActionUtil;
import forge.Player; import forge.Player;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
import forge.card.abilityFactory.AbilityFactory_Charm; import forge.card.abilityFactory.AbilityFactoryCharm;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.Ability_Mana;
@@ -437,7 +437,7 @@ public class TriggerHandler {
sa[0].setStackDescription(sa[0].toString()); sa[0].setStackDescription(sa[0].toString());
// TODO - for Charms to supports AI, this needs to be removed // TODO - for Charms to supports AI, this needs to be removed
if (sa[0].getActivatingPlayer().isHuman()) { if (sa[0].getActivatingPlayer().isHuman()) {
AbilityFactory_Charm.setupCharmSAs(sa[0]); AbilityFactoryCharm.setupCharmSAs(sa[0]);
} }
boolean mand = false; boolean mand = false;
if (params.containsKey("OptionalDecider")) { if (params.containsKey("OptionalDecider")) {

6
src/main/java/forge/gui/input/Input_PayManaCostUtil.java
View File

@@ -9,7 +9,7 @@ import forge.AllZone;
import forge.Card; import forge.Card;
import forge.Constant; import forge.Constant;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.card.abilityFactory.AbilityFactory_Mana; import forge.card.abilityFactory.AbilityFactoryMana;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.mana.ManaPool; import forge.card.mana.ManaPool;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.Ability_Mana;
@@ -100,7 +100,7 @@ public class Input_PayManaCostUtil {
for (final Ability_Mana am : abilities) { for (final Ability_Mana am : abilities) {
if (am.isReflectedMana()) { if (am.isReflectedMana()) {
final ArrayList<String> reflectableColors = AbilityFactory_Mana.reflectableMana(am, final ArrayList<String> reflectableColors = AbilityFactoryMana.reflectableMana(am,
am.getAbilityFactory(), new ArrayList<String>(), new ArrayList<Card>()); am.getAbilityFactory(), new ArrayList<String>(), new ArrayList<Card>());
for (final String color : reflectableColors) { for (final String color : reflectableColors) {
if (manaCost.isColor(color)) { if (manaCost.isColor(color)) {
@@ -181,7 +181,7 @@ public class Input_PayManaCostUtil {
} }
if (am.isReflectedMana()) { if (am.isReflectedMana()) {
final ArrayList<String> reflectableColors = AbilityFactory_Mana.reflectableMana(am, am.getAbilityFactory(), final ArrayList<String> reflectableColors = AbilityFactoryMana.reflectableMana(am, am.getAbilityFactory(),
new ArrayList<String>(), new ArrayList<Card>()); new ArrayList<String>(), new ArrayList<Card>());
for (final String color : reflectableColors) { for (final String color : reflectableColors) {
if (mana.contains(Input_PayManaCostUtil.getShortColorString(color))) { if (mana.contains(Input_PayManaCostUtil.getShortColorString(color))) {