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

rename files to conform with Java standards

Browse Source
This commit is contained in:
jendave
2011-11-02 14:45:19 +00:00
parent 8e1be3d95a
commit b594ba087c
148 changed files with 1765 additions and 1765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
.gitattributes vendored
View File

@@ -10385,15 +10385,15 @@ src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java svneol=native#t
src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.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/CardFactoryAuras.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryCreatures.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryEquipment.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryInstants.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
src/main/java/forge/card/cardFactory/CardFactoryLands.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactorySorceries.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactoryUtil.java svneol=native#text/plain src/main/java/forge/card/cardFactory/CardFactoryUtil.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Auras.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Creatures.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Equipment.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Instants.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Lands.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/LazyCardFactory.java svneol=native#text/plain src/main/java/forge/card/cardFactory/LazyCardFactory.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/PreloadingCardFactory.java svneol=native#text/plain src/main/java/forge/card/cardFactory/PreloadingCardFactory.java svneol=native#text/plain
src/main/java/forge/card/cardFactory/package-info.java svneol=native#text/plain src/main/java/forge/card/cardFactory/package-info.java svneol=native#text/plain
@@ -10406,6 +10406,7 @@ src/main/java/forge/card/cost/CostMill.java -text
src/main/java/forge/card/cost/CostPart.java -text src/main/java/forge/card/cost/CostPart.java -text
src/main/java/forge/card/cost/CostPartWithList.java -text src/main/java/forge/card/cost/CostPartWithList.java -text
src/main/java/forge/card/cost/CostPayLife.java -text src/main/java/forge/card/cost/CostPayLife.java -text
src/main/java/forge/card/cost/CostPayment.java svneol=native#text/plain
src/main/java/forge/card/cost/CostPutCounter.java -text src/main/java/forge/card/cost/CostPutCounter.java -text
src/main/java/forge/card/cost/CostRemoveCounter.java -text src/main/java/forge/card/cost/CostRemoveCounter.java -text
src/main/java/forge/card/cost/CostReturn.java -text src/main/java/forge/card/cost/CostReturn.java -text
@@ -10415,72 +10416,71 @@ src/main/java/forge/card/cost/CostTap.java -text
src/main/java/forge/card/cost/CostTapType.java -text src/main/java/forge/card/cost/CostTapType.java -text
src/main/java/forge/card/cost/CostUntap.java -text src/main/java/forge/card/cost/CostUntap.java -text
src/main/java/forge/card/cost/CostUtil.java -text src/main/java/forge/card/cost/CostUtil.java -text
src/main/java/forge/card/cost/Cost_Payment.java svneol=native#text/plain
src/main/java/forge/card/cost/package-info.java svneol=native#text/plain src/main/java/forge/card/cost/package-info.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana.java svneol=native#text/plain src/main/java/forge/card/mana/Mana.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaCost.java svneol=native#text/plain src/main/java/forge/card/mana/ManaCost.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPart.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPartColor.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPartColorless.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPartPhyrexian.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPartSnow.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPartSplit.java svneol=native#text/plain
src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_Part.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_PartColor.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_PartColorless.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_PartPhyrexian.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_PartSnow.java svneol=native#text/plain
src/main/java/forge/card/mana/Mana_PartSplit.java svneol=native#text/plain
src/main/java/forge/card/mana/package-info.java svneol=native#text/plain src/main/java/forge/card/mana/package-info.java svneol=native#text/plain
src/main/java/forge/card/package-info.java svneol=native#text/plain src/main/java/forge/card/package-info.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability.java svneol=native#text/plain src/main/java/forge/card/spellability/Ability.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability_Activated.java svneol=native#text/plain src/main/java/forge/card/spellability/AbilityActivated.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability_Mana.java svneol=native#text/plain src/main/java/forge/card/spellability/AbilityMana.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability_Static.java svneol=native#text/plain src/main/java/forge/card/spellability/AbilityStatic.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability_Sub.java svneol=native#text/plain src/main/java/forge/card/spellability/AbilitySub.java svneol=native#text/plain
src/main/java/forge/card/spellability/Ability_Triggered.java svneol=native#text/plain src/main/java/forge/card/spellability/AbilityTriggered.java svneol=native#text/plain
src/main/java/forge/card/spellability/Spell.java svneol=native#text/plain src/main/java/forge/card/spellability/Spell.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbility.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbilityCondition.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbilityList.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbilityList.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility_Condition.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbilityRequirements.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility_Requirements.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbilityRestriction.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility_Restriction.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbilityStackInstance.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility_StackInstance.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellAbilityVariables.java svneol=native#text/plain
src/main/java/forge/card/spellability/SpellAbility_Variables.java svneol=native#text/plain src/main/java/forge/card/spellability/SpellPermanent.java svneol=native#text/plain
src/main/java/forge/card/spellability/Spell_Permanent.java svneol=native#text/plain
src/main/java/forge/card/spellability/Target.java svneol=native#text/plain src/main/java/forge/card/spellability/Target.java svneol=native#text/plain
src/main/java/forge/card/spellability/Target_Choices.java svneol=native#text/plain src/main/java/forge/card/spellability/TargetChoices.java svneol=native#text/plain
src/main/java/forge/card/spellability/Target_Selection.java svneol=native#text/plain src/main/java/forge/card/spellability/TargetSelection.java svneol=native#text/plain
src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain
src/main/java/forge/card/staticAbility/StaticAbility.java svneol=native#text/plain src/main/java/forge/card/staticAbility/StaticAbility.java svneol=native#text/plain
src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java -text src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java -text svneol=native#text/plain
src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java svneol=native#text/plain src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java svneol=native#text/plain
src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java -text src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java -text svneol=native#text/plain
src/main/java/forge/card/staticAbility/package-info.java svneol=native#text/plain src/main/java/forge/card/staticAbility/package-info.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger.java svneol=native#text/plain src/main/java/forge/card/trigger/Trigger.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerAlways.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerAttackerBlocked.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerAttackersDeclared.java -text svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerAttacks.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerBecomesTarget.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerBlocks.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerChampioned.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerChangesZone.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerClashed.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerCounterAdded.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerCycled.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerDamageDone.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerDiscarded.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerDrawn.java svneol=native#text/plain
src/main/java/forge/card/trigger/TriggerHandler.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerHandler.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Always.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerLandPlayed.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerLifeGained.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerLifeLost.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_AttackersDeclared.java -text src/main/java/forge/card/trigger/TriggerPhase.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Attacks.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerSacrificed.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_BecomesTarget.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerShuffled.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Blocks.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Championed.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerTaps.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_ChangesZone.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerTapsForMana.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Clashed.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerTurnFaceUp.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_CounterAdded.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerUnequip.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Cycled.java svneol=native#text/plain src/main/java/forge/card/trigger/TriggerUntaps.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_DamageDone.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Discarded.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Drawn.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_LandPlayed.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_LifeGained.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_LifeLost.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Phase.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Sacrificed.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Shuffled.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_SpellAbilityCast.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Taps.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_TapsForMana.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_TurnFaceUp.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Unequip.java svneol=native#text/plain
src/main/java/forge/card/trigger/Trigger_Untaps.java svneol=native#text/plain
src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain
src/main/java/forge/deck/Deck.java svneol=native#text/plain src/main/java/forge/deck/Deck.java svneol=native#text/plain
src/main/java/forge/deck/DeckGeneration.java -text src/main/java/forge/deck/DeckGeneration.java -text
@@ -10507,11 +10507,11 @@ src/main/java/forge/game/GameSummary.java svneol=native#text/plain
src/main/java/forge/game/GameType.java -text src/main/java/forge/game/GameType.java -text
src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain
src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain
src/main/java/forge/game/limited/BoosterDraft_1.java svneol=native#text/plain
src/main/java/forge/game/limited/CCnt.java svneol=native#text/plain src/main/java/forge/game/limited/CCnt.java svneol=native#text/plain
src/main/java/forge/game/limited/CardPoolLimitation.java -text src/main/java/forge/game/limited/CardPoolLimitation.java -text
src/main/java/forge/game/limited/CustomLimited.java svneol=native#text/plain src/main/java/forge/game/limited/CustomLimited.java svneol=native#text/plain
src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain
src/main/java/forge/game/limited/IBoosterDraft.java svneol=native#text/plain
src/main/java/forge/game/limited/SealedDeck.java svneol=native#text/plain src/main/java/forge/game/limited/SealedDeck.java svneol=native#text/plain
src/main/java/forge/game/limited/package-info.java svneol=native#text/plain src/main/java/forge/game/limited/package-info.java svneol=native#text/plain
src/main/java/forge/game/package-info.java -text src/main/java/forge/game/package-info.java -text
@@ -10551,15 +10551,15 @@ src/main/java/forge/gui/game/CardPanel.java svneol=native#text/plain
src/main/java/forge/gui/game/CardPicturePanel.java svneol=native#text/plain src/main/java/forge/gui/game/CardPicturePanel.java svneol=native#text/plain
src/main/java/forge/gui/game/package-info.java svneol=native#text/plain src/main/java/forge/gui/game/package-info.java svneol=native#text/plain
src/main/java/forge/gui/input/Input.java svneol=native#text/plain src/main/java/forge/gui/input/Input.java svneol=native#text/plain
src/main/java/forge/gui/input/InputAttack.java svneol=native#text/plain
src/main/java/forge/gui/input/InputBlock.java svneol=native#text/plain
src/main/java/forge/gui/input/InputCleanup.java svneol=native#text/plain
src/main/java/forge/gui/input/InputControl.java svneol=native#text/plain src/main/java/forge/gui/input/InputControl.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_Attack.java svneol=native#text/plain src/main/java/forge/gui/input/InputMulligan.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_Block.java svneol=native#text/plain src/main/java/forge/gui/input/InputPassPriority.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_Cleanup.java svneol=native#text/plain src/main/java/forge/gui/input/InputPayManaCost.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_Mulligan.java svneol=native#text/plain src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_PassPriority.java svneol=native#text/plain src/main/java/forge/gui/input/InputPayManaCostUtil.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_PayManaCost.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_PayManaCostUtil.java svneol=native#text/plain
src/main/java/forge/gui/input/Input_PayManaCost_Ability.java svneol=native#text/plain
src/main/java/forge/gui/input/package-info.java svneol=native#text/plain src/main/java/forge/gui/input/package-info.java svneol=native#text/plain
src/main/java/forge/gui/package-info.java svneol=native#text/plain src/main/java/forge/gui/package-info.java svneol=native#text/plain
src/main/java/forge/gui/skin/FButton.java -text src/main/java/forge/gui/skin/FButton.java -text

56
src/main/java/forge/Card.java
View File

@@ -17,10 +17,10 @@ import forge.card.CardCharacteristics;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Triggered; import forge.card.spellability.AbilityTriggered;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.item.CardDb; import forge.item.CardDb;
@@ -310,7 +310,7 @@ public class Card extends GameEntity implements Comparable<Card> {
private ArrayList<Card> gainControlTargets = new ArrayList<Card>(); private ArrayList<Card> gainControlTargets = new ArrayList<Card>();
private ArrayList<Command> gainControlReleaseCommands = new ArrayList<Command>(); private ArrayList<Command> gainControlReleaseCommands = new ArrayList<Command>();
private ArrayList<Ability_Triggered> zcTriggers = new ArrayList<Ability_Triggered>(); private ArrayList<AbilityTriggered> zcTriggers = new ArrayList<AbilityTriggered>();
private ArrayList<Command> equipCommandList = new ArrayList<Command>(); private ArrayList<Command> equipCommandList = new ArrayList<Command>();
private ArrayList<Command> unEquipCommandList = new ArrayList<Command>(); private ArrayList<Command> unEquipCommandList = new ArrayList<Command>();
private ArrayList<Command> enchantCommandList = new ArrayList<Command>(); private ArrayList<Command> enchantCommandList = new ArrayList<Command>();
@@ -2359,7 +2359,7 @@ public class Card extends GameEntity implements Comparable<Card> {
continue; continue;
} }
if (sa instanceof Spell_Permanent && primaryCost && !isAura()) { if (sa instanceof SpellPermanent && primaryCost && !isAura()) {
// For Alt costs, make sure to display the cost! // For Alt costs, make sure to display the cost!
primaryCost = false; primaryCost = false;
continue; continue;
@@ -2367,14 +2367,14 @@ public class Card extends GameEntity implements Comparable<Card> {
String sAbility = sa.toString(); String sAbility = sa.toString();
if (sa instanceof Ability_Mana) { if (sa instanceof AbilityMana) {
if (addedManaStrings.contains(sAbility)) { if (addedManaStrings.contains(sAbility)) {
continue; continue;
} }
addedManaStrings.add(sAbility); addedManaStrings.add(sAbility);
} }
if (sa instanceof Spell_Permanent && !isAura()) { if (sa instanceof SpellPermanent && !isAura()) {
sb.insert(0, "\r\n"); sb.insert(0, "\r\n");
sb.insert(0, sAbility); sb.insert(0, sAbility);
} else if (!sAbility.endsWith(getName())) { } else if (!sAbility.endsWith(getName())) {
@@ -2455,8 +2455,8 @@ public class Card extends GameEntity implements Comparable<Card> {
* *
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
public final ArrayList<Ability_Mana> getManaAbility() { public final ArrayList<AbilityMana> getManaAbility() {
return new ArrayList<Ability_Mana>(getCharacteristics().getManaAbility()); return new ArrayList<AbilityMana>(getCharacteristics().getManaAbility());
} }
// Returns basic mana abilities plus "reflected mana" abilities // Returns basic mana abilities plus "reflected mana" abilities
@@ -2467,9 +2467,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* *
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
public final ArrayList<Ability_Mana> getAIPlayableMana() { public final ArrayList<AbilityMana> getAIPlayableMana() {
ArrayList<Ability_Mana> res = new ArrayList<Ability_Mana>(); ArrayList<AbilityMana> res = new ArrayList<AbilityMana>();
for (Ability_Mana am : getManaAbility()) { for (AbilityMana am : getManaAbility()) {
// if a mana ability has a mana cost the AI will miscalculate // if a mana ability has a mana cost the AI will miscalculate
Cost cost = am.getPayCosts(); Cost cost = am.getPayCosts();
@@ -2495,9 +2495,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* *
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
public final ArrayList<Ability_Mana> getBasicMana() { public final ArrayList<AbilityMana> getBasicMana() {
ArrayList<Ability_Mana> res = new ArrayList<Ability_Mana>(); ArrayList<AbilityMana> res = new ArrayList<AbilityMana>();
for (Ability_Mana am : getManaAbility()) { for (AbilityMana am : getManaAbility()) {
if (am.isBasic() && !res.contains(am)) { if (am.isBasic() && !res.contains(am)) {
res.add(am); res.add(am);
} }
@@ -2567,12 +2567,12 @@ public class Card extends GameEntity implements Comparable<Card> {
* getSpellPermanent. * getSpellPermanent.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.Spell_Permanent} object. * @return a {@link forge.card.spellability.SpellPermanent} object.
*/ */
public final Spell_Permanent getSpellPermanent() { public final SpellPermanent getSpellPermanent() {
for (SpellAbility sa : getCharacteristics().getSpellAbility()) { for (SpellAbility sa : getCharacteristics().getSpellAbility()) {
if (sa instanceof Spell_Permanent) { if (sa instanceof SpellPermanent) {
return (Spell_Permanent) sa; return (SpellPermanent) sa;
} }
} }
return null; return null;
@@ -2606,8 +2606,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final void addFirstSpellAbility(final SpellAbility a) { public final void addFirstSpellAbility(final SpellAbility a) {
a.setSourceCard(this); a.setSourceCard(this);
if (a instanceof Ability_Mana) { if (a instanceof AbilityMana) {
getCharacteristics().getManaAbility().add(0, (Ability_Mana) a); getCharacteristics().getManaAbility().add(0, (AbilityMana) a);
} else { } else {
getCharacteristics().getSpellAbility().add(0, a); getCharacteristics().getSpellAbility().add(0, a);
} }
@@ -2623,8 +2623,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final void addSpellAbility(final SpellAbility a) { public final void addSpellAbility(final SpellAbility a) {
a.setSourceCard(this); a.setSourceCard(this);
if (a instanceof Ability_Mana) { if (a instanceof AbilityMana) {
getCharacteristics().getManaAbility().add((Ability_Mana) a); getCharacteristics().getManaAbility().add((AbilityMana) a);
} else { } else {
getCharacteristics().getSpellAbility().add(a); getCharacteristics().getSpellAbility().add(a);
} }
@@ -2639,7 +2639,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final void removeSpellAbility(final SpellAbility a) { public final void removeSpellAbility(final SpellAbility a) {
if (a instanceof Ability_Mana) { if (a instanceof AbilityMana) {
// if (a.isExtrinsic()) //never remove intrinsic mana abilities, is // if (a.isExtrinsic()) //never remove intrinsic mana abilities, is
// this the way to go?? // this the way to go??
getCharacteristics().getManaAbility().remove(a); getCharacteristics().getManaAbility().remove(a);
@@ -3093,7 +3093,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.ZCTrigger} object. * a {@link forge.ZCTrigger} object.
*/ */
public final void addTrigger(final Command c, final ZCTrigger typeIn) { public final void addTrigger(final Command c, final ZCTrigger typeIn) {
zcTriggers.add(new Ability_Triggered(this, c, typeIn)); zcTriggers.add(new AbilityTriggered(this, c, typeIn));
} }
/** /**
@@ -3107,7 +3107,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.ZCTrigger} object. * a {@link forge.ZCTrigger} object.
*/ */
public final void removeTrigger(final Command c, final ZCTrigger typeIn) { public final void removeTrigger(final Command c, final ZCTrigger typeIn) {
zcTriggers.remove(new Ability_Triggered(this, c, typeIn)); zcTriggers.remove(new AbilityTriggered(this, c, typeIn));
} }
/** /**
@@ -3119,7 +3119,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.ZCTrigger} object. * a {@link forge.ZCTrigger} object.
*/ */
public final void executeTrigger(final ZCTrigger type) { public final void executeTrigger(final ZCTrigger type) {
for (Ability_Triggered t : zcTriggers) { for (AbilityTriggered t : zcTriggers) {
if (t.getTrigger().equals(type) && t.isBasic()) { if (t.getTrigger().equals(type) && t.isBasic()) {
t.execute(); t.execute();
} }
@@ -6038,7 +6038,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a boolean. * @return a boolean.
*/ */
public final boolean isReflectedLand() { public final boolean isReflectedLand() {
for (Ability_Mana am : getCharacteristics().getManaAbility()) { for (AbilityMana am : getCharacteristics().getManaAbility()) {
if (am.isReflectedMana()) { if (am.isReflectedMana()) {
return true; return true;
} }

4
src/main/java/forge/CombatUtil.java
View File

@@ -13,7 +13,7 @@ import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
/** /**
* <p> * <p>
@@ -2058,7 +2058,7 @@ public class CombatUtil {
if (c.getController().isHuman()) { if (c.getController().isHuman()) {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability(c + " - Pay to Attack\r\n", ability.getManaCost(), new InputPayManaCostAbility(c + " - Pay to Attack\r\n", ability.getManaCost(),
paidCommand, unpaidCommand)); paidCommand, unpaidCommand));
} else { // computer } else { // computer
if (ComputerUtil.canPayCost(ability)) { if (ComputerUtil.canPayCost(ability)) {

6
src/main/java/forge/ComputerAIGeneral.java
View File

@@ -9,7 +9,7 @@ import com.esotericsoftware.minlog.Log;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
/** /**
* <p> * <p>
@@ -352,8 +352,8 @@ public class ComputerAIGeneral implements Computer {
for (Card c : l) { for (Card c : l) {
for (SpellAbility sa : c.getSpellAbility()) { for (SpellAbility sa : c.getSpellAbility()) {
// Or if this Permanent has an ETB ability with Counter // Or if this Permanent has an ETB ability with Counter
if (sa instanceof Spell_Permanent) { if (sa instanceof SpellPermanent) {
if (Spell_Permanent.checkETBEffects(c, sa, "Counter")) { if (SpellPermanent.checkETBEffects(c, sa, "Counter")) {
spellAbility.add(sa); spellAbility.add(sa);
} }
} }

42
src/main/java/forge/ComputerUtil.java
View File

@@ -12,10 +12,10 @@ import forge.card.abilityFactory.AbilityFactory;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.cost.Cost_Payment; import forge.card.cost.CostPayment;
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.AbilityMana;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -120,7 +120,7 @@ public class ComputerUtil {
sa.chooseTargetAI(); sa.chooseTargetAI();
} }
Cost_Payment pay = new Cost_Payment(cost, sa); CostPayment pay = new CostPayment(cost, sa);
if (pay.payComputerCosts()) { if (pay.payComputerCosts()) {
AllZone.getStack().addAndUnfreeze(sa); AllZone.getStack().addAndUnfreeze(sa);
} }
@@ -253,7 +253,7 @@ public class ComputerUtil {
bestSA.getBeforePayManaAI().execute(); bestSA.getBeforePayManaAI().execute();
AllZone.getStack().addAndUnfreeze(bestSA); AllZone.getStack().addAndUnfreeze(bestSA);
} else { } else {
Cost_Payment pay = new Cost_Payment(cost, bestSA); CostPayment pay = new CostPayment(cost, bestSA);
if (pay.payComputerCosts()) { if (pay.payComputerCosts()) {
AllZone.getStack().addAndUnfreeze(bestSA); AllZone.getStack().addAndUnfreeze(bestSA);
} }
@@ -328,7 +328,7 @@ public class ComputerUtil {
if (cost == null) { if (cost == null) {
payManaCost(sa); payManaCost(sa);
} else { } else {
Cost_Payment pay = new Cost_Payment(cost, sa); CostPayment pay = new CostPayment(cost, sa);
pay.payComputerCosts(); pay.payComputerCosts();
} }
@@ -495,7 +495,7 @@ public class ComputerUtil {
+ " in ComputerUtil.canPayAdditionalCosts() without an activating player"); + " in ComputerUtil.canPayAdditionalCosts() without an activating player");
sa.setActivatingPlayer(player); sa.setActivatingPlayer(player);
} }
return Cost_Payment.canPayAdditionalCosts(sa.getPayCosts(), sa); return CostPayment.canPayAdditionalCosts(sa.getPayCosts(), sa);
} }
/** /**
@@ -581,13 +581,13 @@ public class ComputerUtil {
for (int i = 0; i < manaSources.size(); i++) { for (int i = 0; i < manaSources.size(); i++) {
Card sourceCard = manaSources.get(i); Card sourceCard = manaSources.get(i);
ArrayList<Ability_Mana> manaAbilities = sourceCard.getAIPlayableMana(); ArrayList<AbilityMana> manaAbilities = sourceCard.getAIPlayableMana();
boolean used = false; // this is for testing paying mana only boolean used = false; // this is for testing paying mana only
manaAbilities = sortForNeeded(cost, manaAbilities, player); manaAbilities = sortForNeeded(cost, manaAbilities, player);
for (Ability_Mana m : manaAbilities) { for (AbilityMana m : manaAbilities) {
if (used) { if (used) {
break; // mana source already used in the test break; // mana source already used in the test
@@ -620,7 +620,7 @@ public class ComputerUtil {
if (!test) { if (!test) {
// Pay additional costs // Pay additional costs
if (m.getPayCosts() != null) { if (m.getPayCosts() != null) {
Cost_Payment pay = new Cost_Payment(m.getPayCosts(), m); CostPayment pay = new CostPayment(m.getPayCosts(), m);
if (!pay.payComputerCosts()) { if (!pay.payComputerCosts()) {
continue; continue;
} }
@@ -697,13 +697,13 @@ public class ComputerUtil {
* </p> * </p>
* *
* @param m * @param m
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param player * @param player
* a {@link forge.Player} object. * a {@link forge.Player} object.
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
* @since 1.0.15 * @since 1.0.15
*/ */
public static ArrayList<String> getProduceableColors(final Ability_Mana m, final Player player) { public static ArrayList<String> getProduceableColors(final AbilityMana m, final Player player) {
ArrayList<String> colors = new ArrayList<String>(); ArrayList<String> colors = new ArrayList<String>();
// if the mana ability is not avaiable move to the next one // if the mana ability is not avaiable move to the next one
@@ -759,7 +759,7 @@ public class ComputerUtil {
CardList list = player.getCardsIn(Zone.Battlefield); CardList list = player.getCardsIn(Zone.Battlefield);
CardList manaSources = list.filter(new CardListFilter() { CardList manaSources = list.filter(new CardListFilter() {
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
for (Ability_Mana am : c.getAIPlayableMana()) { for (AbilityMana am : c.getAIPlayableMana()) {
am.setActivatingPlayer(player); am.setActivatingPlayer(player);
if (am.canPlay()) { if (am.canPlay()) {
return true; return true;
@@ -783,9 +783,9 @@ public class ComputerUtil {
int usableManaAbilities = 0; int usableManaAbilities = 0;
boolean needsLimitedResources = false; boolean needsLimitedResources = false;
ArrayList<Ability_Mana> manaAbilities = card.getAIPlayableMana(); ArrayList<AbilityMana> manaAbilities = card.getAIPlayableMana();
for (Ability_Mana m : manaAbilities) { for (AbilityMana m : manaAbilities) {
Cost cost = m.getPayCosts(); Cost cost = m.getPayCosts();
needsLimitedResources |= !cost.isReusuableResource(); needsLimitedResources |= !cost.isReusuableResource();
@@ -828,9 +828,9 @@ public class ComputerUtil {
int usableManaAbilities = 0; int usableManaAbilities = 0;
boolean needsLimitedResources = false; boolean needsLimitedResources = false;
ArrayList<Ability_Mana> manaAbilities = card.getAIPlayableMana(); ArrayList<AbilityMana> manaAbilities = card.getAIPlayableMana();
for (Ability_Mana m : manaAbilities) { for (AbilityMana m : manaAbilities) {
Cost cost = m.getPayCosts(); Cost cost = m.getPayCosts();
needsLimitedResources |= !cost.isReusuableResource(); needsLimitedResources |= !cost.isReusuableResource();
@@ -884,20 +884,20 @@ public class ComputerUtil {
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
* @since 1.0.15 * @since 1.0.15
*/ */
public static ArrayList<Ability_Mana> sortForNeeded(final ManaCost cost, public static ArrayList<AbilityMana> sortForNeeded(final ManaCost cost,
final ArrayList<Ability_Mana> manaAbilities, final Player player) { final ArrayList<AbilityMana> manaAbilities, final Player player) {
ArrayList<String> colors; ArrayList<String> colors;
ArrayList<String> colorsNeededToAvoidNegativeEffect = cost.getManaNeededToAvoidNegativeEffect(); ArrayList<String> colorsNeededToAvoidNegativeEffect = cost.getManaNeededToAvoidNegativeEffect();
ArrayList<Ability_Mana> res = new ArrayList<Ability_Mana>(); ArrayList<AbilityMana> res = new ArrayList<AbilityMana>();
ManaCost onlyColored = new ManaCost(cost.toString()); ManaCost onlyColored = new ManaCost(cost.toString());
onlyColored.removeColorlessMana(); onlyColored.removeColorlessMana();
for (Ability_Mana am : manaAbilities) { for (AbilityMana am : manaAbilities) {
colors = getProduceableColors(am, player); colors = getProduceableColors(am, player);
for (int j = 0; j < colors.size(); j++) { for (int j = 0; j < colors.size(); j++) {
if (onlyColored.isNeeded(colors.get(j))) { if (onlyColored.isNeeded(colors.get(j))) {
@@ -913,7 +913,7 @@ public class ComputerUtil {
} }
} }
for (Ability_Mana am : manaAbilities) { for (AbilityMana am : manaAbilities) {
if (res.contains(am)) { if (res.contains(am)) {
break; break;

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

@@ -17,15 +17,15 @@ 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;
import forge.card.cost.Cost_Payment; import forge.card.cost.CostPayment;
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; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Requirements; import forge.card.spellability.SpellAbilityRequirements;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.spellability.Target_Selection; import forge.card.spellability.TargetSelection;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.deck.Deck; import forge.deck.Deck;
@@ -33,9 +33,9 @@ import forge.game.GameEndReason;
import forge.game.GameSummary; import forge.game.GameSummary;
import forge.game.GameType; import forge.game.GameType;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input_Mulligan; import forge.gui.input.InputMulligan;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants.Lang.GameAction.GameActionText; import forge.properties.NewConstants.Lang.GameAction.GameActionText;
@@ -671,7 +671,7 @@ public class GameAction {
if (cast.getManaCost().equals("0")) { if (cast.getManaCost().equals("0")) {
AllZone.getStack().add(cast); AllZone.getStack().add(cast);
} else { } else {
AllZone.getInputControl().setInput(new Input_PayManaCost(cast)); AllZone.getInputControl().setInput(new InputPayManaCost(cast));
} }
} }
} else { } else {
@@ -1072,7 +1072,7 @@ public class GameAction {
} }
final Card card = c; final Card card = c;
final Ability_Static ability = new Ability_Static(crd, "0") { final AbilityStatic ability = new AbilityStatic(crd, "0") {
@Override @Override
public void resolve() { public void resolve() {
GameAction.this.destroy(crd); GameAction.this.destroy(crd);
@@ -1441,7 +1441,7 @@ public class GameAction {
mp.setImageFilename("mana_pool"); mp.setImageFilename("mana_pool");
AllZone.getHumanPlayer().getZone(Zone.Battlefield).add(mp); AllZone.getHumanPlayer().getZone(Zone.Battlefield).add(mp);
AllZone.getInputControl().setInput(new Input_Mulligan()); AllZone.getInputControl().setInput(new InputMulligan());
Phase.setGameBegins(1); Phase.setGameBegins(1);
} // newGame() } // newGame()
@@ -1854,10 +1854,10 @@ public class GameAction {
*/ */
public final void playSpellAbilityForFree(final SpellAbility sa) { public final void playSpellAbilityForFree(final SpellAbility sa) {
if (sa.getPayCosts() != null) { if (sa.getPayCosts() != null) {
final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); final TargetSelection ts = new TargetSelection(sa.getTarget(), sa);
final Cost_Payment payment = new Cost_Payment(sa.getPayCosts(), sa); final CostPayment payment = new CostPayment(sa.getPayCosts(), sa);
final SpellAbility_Requirements req = new SpellAbility_Requirements(sa, ts, payment); final SpellAbilityRequirements req = new SpellAbilityRequirements(sa, ts, payment);
req.setFree(true); req.setFree(true);
req.fillRequirements(); req.fillRequirements();
} else if (sa.getBeforePayMana() == null) { } else if (sa.getBeforePayMana() == null) {
@@ -1881,7 +1881,7 @@ public class GameAction {
AllZone.getStack().add(sa); AllZone.getStack().add(sa);
} }
}; };
AllZone.getInputControl().setInput(new Input_PayManaCost_Ability(sa.getAdditionalManaCost(), paid1)); AllZone.getInputControl().setInput(new InputPayManaCostAbility(sa.getAdditionalManaCost(), paid1));
} else { } else {
AllZone.getStack().add(sa, x); AllZone.getStack().add(sa, x);
} }
@@ -2492,19 +2492,19 @@ public class GameAction {
} }
if (newAbility) { if (newAbility) {
final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); final TargetSelection ts = new TargetSelection(sa.getTarget(), sa);
Cost_Payment payment = null; CostPayment payment = null;
if (sa.getPayCosts() == null) { if (sa.getPayCosts() == null) {
payment = new Cost_Payment(new Cost("0", sa.getSourceCard().getName(), sa.isAbility()), sa); payment = new CostPayment(new Cost("0", sa.getSourceCard().getName(), sa.isAbility()), sa);
} else { } else {
payment = new Cost_Payment(sa.getPayCosts(), sa); payment = new CostPayment(sa.getPayCosts(), sa);
} }
if (!sa.isTrigger()) { if (!sa.isTrigger()) {
payment.changeCost(); payment.changeCost();
} }
final SpellAbility_Requirements req = new SpellAbility_Requirements(sa, ts, payment); final SpellAbilityRequirements req = new SpellAbilityRequirements(sa, ts, payment);
req.fillRequirements(); req.fillRequirements();
} else { } else {
ManaCost manaCost = new ManaCost(sa.getManaCost()); ManaCost manaCost = new ManaCost(sa.getManaCost());
@@ -2533,7 +2533,7 @@ public class GameAction {
AllZone.getInputControl().setInput(sa.getAfterPayMana()); AllZone.getInputControl().setInput(sa.getAfterPayMana());
} }
} else if (sa.getBeforePayMana() == null) { } else if (sa.getBeforePayMana() == null) {
AllZone.getInputControl().setInput(new Input_PayManaCost(sa)); AllZone.getInputControl().setInput(new InputPayManaCost(sa));
} else { } else {
AllZone.getInputControl().setInput(sa.getBeforePayMana()); AllZone.getInputControl().setInput(sa.getBeforePayMana());
} }
@@ -2554,14 +2554,14 @@ public class GameAction {
sa.setActivatingPlayer(AllZone.getHumanPlayer()); sa.setActivatingPlayer(AllZone.getHumanPlayer());
if (sa.getPayCosts() != null) { if (sa.getPayCosts() != null) {
final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); final TargetSelection ts = new TargetSelection(sa.getTarget(), sa);
final Cost_Payment payment = new Cost_Payment(sa.getPayCosts(), sa); final CostPayment payment = new CostPayment(sa.getPayCosts(), sa);
if (!sa.isTrigger()) { if (!sa.isTrigger()) {
payment.changeCost(); payment.changeCost();
} }
final SpellAbility_Requirements req = new SpellAbility_Requirements(sa, ts, payment); final SpellAbilityRequirements req = new SpellAbilityRequirements(sa, ts, payment);
req.setSkipStack(true); req.setSkipStack(true);
req.fillRequirements(skipTargeting); req.fillRequirements(skipTargeting);
} else { } else {
@@ -2586,7 +2586,7 @@ public class GameAction {
AllZone.getInputControl().setInput(sa.getAfterPayMana()); AllZone.getInputControl().setInput(sa.getAfterPayMana());
} }
} else if (sa.getBeforePayMana() == null) { } else if (sa.getBeforePayMana() == null) {
AllZone.getInputControl().setInput(new Input_PayManaCost(sa, true)); AllZone.getInputControl().setInput(new InputPayManaCost(sa, true));
} else { } else {
AllZone.getInputControl().setInput(sa.getBeforePayMana()); AllZone.getInputControl().setInput(sa.getBeforePayMana());
} }

14
src/main/java/forge/GameActionUtil.java
View File

@@ -9,12 +9,12 @@ import forge.Constant.Zone;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.game.GameLossReason; import forge.game.GameLossReason;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
/** /**
* <p> * <p>
@@ -312,7 +312,7 @@ public final class GameActionUtil {
// resolving Ability // resolving Ability
boolean bResolving = AllZone.getStack().getResolving(); boolean bResolving = AllZone.getStack().getResolving();
AllZone.getStack().setResolving(false); AllZone.getStack().setResolving(false);
AllZone.getInputControl().setInput(new Input_PayManaCost_Ability(message, manaCost, paid, unpaid)); AllZone.getInputControl().setInput(new InputPayManaCostAbility(message, manaCost, paid, unpaid));
AllZone.getStack().setResolving(bResolving); AllZone.getStack().setResolving(bResolving);
} }
@@ -577,9 +577,9 @@ public final class GameActionUtil {
String color = ""; String color = "";
Object o = GuiUtils.getChoice("Choose mana color", Constant.Color.ONLY_COLORS); Object o = GuiUtils.getChoice("Choose mana color", Constant.Color.ONLY_COLORS);
color = Input_PayManaCostUtil.getShortColorString((String) o); color = InputPayManaCostUtil.getShortColorString((String) o);
Ability_Mana abMana = new Ability_Mana(c, "0", color) { AbilityMana abMana = new AbilityMana(c, "0", color) {
private static final long serialVersionUID = -2182129023960978132L; private static final long serialVersionUID = -2182129023960978132L;
}; };
abMana.produceMana(); abMana.produceMana();
@@ -1478,7 +1478,7 @@ public final class GameActionUtil {
// remove all abilities granted by this Command // remove all abilities granted by this Command
for (Card land : lands) { for (Card land : lands) {
ArrayList<Ability_Mana> sas = land.getManaAbility(); ArrayList<AbilityMana> sas = land.getManaAbility();
for (SpellAbility sa : sas) { for (SpellAbility sa : sas) {
if (sa.getType().equals("BasicLandTypeMana")) { if (sa.getType().equals("BasicLandTypeMana")) {
land.removeSpellAbility(sa); land.removeSpellAbility(sa);

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

@@ -85,10 +85,10 @@ import forge.gui.ForgeAction;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.game.CardDetailPanel; import forge.gui.game.CardDetailPanel;
import forge.gui.game.CardPanel; import forge.gui.game.CardPanel;
import forge.gui.input.Input_Attack; import forge.gui.input.InputAttack;
import forge.gui.input.Input_Block; import forge.gui.input.InputBlock;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
@@ -541,8 +541,8 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon
if (c != null) { if (c != null) {
if (c.isTapped() if (c.isTapped()
&& (inputControl.getInput() instanceof Input_PayManaCost && (inputControl.getInput() instanceof InputPayManaCost
|| inputControl.getInput() instanceof Input_PayManaCost_Ability)) { || inputControl.getInput() instanceof InputPayManaCostAbility)) {
arcane.ui.CardPanel cardPanel = playerPlayPanel.getCardPanel(c.getUniqueNumber()); arcane.ui.CardPanel cardPanel = playerPlayPanel.getCardPanel(c.getUniqueNumber());
for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) { for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) {
if (cp.getCard().isUntapped()) { if (cp.getCard().isUntapped()) {
@@ -553,7 +553,7 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon
CardList att = new CardList(AllZone.getCombat().getAttackers()); CardList att = new CardList(AllZone.getCombat().getAttackers());
if ((c.isTapped() || c.hasSickness() || ((c.hasKeyword("Vigilance")) && att.contains(c))) if ((c.isTapped() || c.hasSickness() || ((c.hasKeyword("Vigilance")) && att.contains(c)))
&& (inputControl.getInput() instanceof Input_Attack)) { && (inputControl.getInput() instanceof InputAttack)) {
arcane.ui.CardPanel cardPanel = playerPlayPanel.getCardPanel(c.getUniqueNumber()); arcane.ui.CardPanel cardPanel = playerPlayPanel.getCardPanel(c.getUniqueNumber());
for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) { for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) {
if (cp.getCard().isUntapped() && !cp.getCard().hasSickness()) { if (cp.getCard().isUntapped() && !cp.getCard().hasSickness()) {
@@ -563,15 +563,15 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon
} }
if (e.isMetaDown()) { if (e.isMetaDown()) {
if (att.contains(c) && (inputControl.getInput() instanceof Input_Attack) if (att.contains(c) && (inputControl.getInput() instanceof InputAttack)
&& !c.hasKeyword("CARDNAME attacks each turn if able.")) { && !c.hasKeyword("CARDNAME attacks each turn if able.")) {
c.untap(); c.untap();
AllZone.getCombat().removeFromCombat(c); AllZone.getCombat().removeFromCombat(c);
} else if (inputControl.getInput() instanceof Input_Block) { } else if (inputControl.getInput() instanceof InputBlock) {
if (c.getController().isHuman()) { if (c.getController().isHuman()) {
AllZone.getCombat().removeFromCombat(c); AllZone.getCombat().removeFromCombat(c);
} }
((Input_Block) inputControl.getInput()).removeFromAllBlocking(c); ((InputBlock) inputControl.getInput()).removeFromAllBlocking(c);
} }
} else { } else {
inputControl.selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Battlefield)); inputControl.selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Battlefield));

4
src/main/java/forge/GuiDisplayUtil.java
View File

@@ -28,7 +28,7 @@ import arcane.ui.util.Animation;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.mana.ManaPool; import forge.card.mana.ManaPool;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.game.CardPanel; import forge.gui.game.CardPanel;
import forge.properties.NewConstants; import forge.properties.NewConstants;
@@ -142,7 +142,7 @@ public final class GuiDisplayUtil implements NewConstants {
final Card dummy = new Card(); final Card dummy = new Card();
dummy.setOwner(AllZone.getHumanPlayer()); dummy.setOwner(AllZone.getHumanPlayer());
dummy.addController(AllZone.getHumanPlayer()); dummy.addController(AllZone.getHumanPlayer());
final Ability_Mana abMana = new Ability_Mana(dummy, "0", "W U B G R 1", 10) { final AbilityMana abMana = new AbilityMana(dummy, "0", "W U B G R 1", 10) {
private static final long serialVersionUID = -2164401486331182356L; private static final long serialVersionUID = -2164401486331182356L;
}; };

84
src/main/java/forge/MagicStack.java
View File

@@ -12,18 +12,18 @@ import forge.card.abilityFactory.AbilityFactory;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.Ability_Triggered; import forge.card.spellability.AbilityTriggered;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_StackInstance; import forge.card.spellability.SpellAbilityStackInstance;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.spellability.Target_Choices; import forge.card.spellability.TargetChoices;
import forge.card.spellability.Target_Selection; import forge.card.spellability.TargetSelection;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
/** /**
* <p> * <p>
@@ -36,8 +36,8 @@ import forge.gui.input.Input_PayManaCost_Ability;
public class MagicStack extends MyObservable { public class MagicStack extends MyObservable {
private final List<SpellAbility> simultaneousStackEntryList = new ArrayList<SpellAbility>(); private final List<SpellAbility> simultaneousStackEntryList = new ArrayList<SpellAbility>();
private final Stack<SpellAbility_StackInstance> stack = new Stack<SpellAbility_StackInstance>(); private final Stack<SpellAbilityStackInstance> stack = new Stack<SpellAbilityStackInstance>();
private final Stack<SpellAbility_StackInstance> frozenStack = new Stack<SpellAbility_StackInstance>(); private final Stack<SpellAbilityStackInstance> frozenStack = new Stack<SpellAbilityStackInstance>();
private boolean frozen = false; private boolean frozen = false;
private boolean bResolving = false; private boolean bResolving = false;
@@ -241,7 +241,7 @@ public class MagicStack extends MyObservable {
} else { } else {
// TODO: make working triggered abilities! // TODO: make working triggered abilities!
if ((sp instanceof Ability_Mana) || (sp instanceof Ability_Triggered)) { if ((sp instanceof AbilityMana) || (sp instanceof AbilityTriggered)) {
sp.resolve(); sp.resolve();
} else { } else {
this.push(sp); this.push(sp);
@@ -352,16 +352,16 @@ public class MagicStack extends MyObservable {
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final void add(final SpellAbility sp) { public final void add(final SpellAbility sp) {
final ArrayList<Target_Choices> chosenTargets = sp.getAllTargetChoices(); final ArrayList<TargetChoices> chosenTargets = sp.getAllTargetChoices();
if (sp instanceof Ability_Mana) { // Mana Abilities go straight through if (sp instanceof AbilityMana) { // Mana Abilities go straight through
sp.resolve(); sp.resolve();
sp.resetOnceResolved(); sp.resetOnceResolved();
return; return;
} }
if (this.frozen) { if (this.frozen) {
final SpellAbility_StackInstance si = new SpellAbility_StackInstance(sp); final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp);
this.getFrozenStack().push(si); this.getFrozenStack().push(si);
return; return;
} }
@@ -381,12 +381,12 @@ public class MagicStack extends MyObservable {
} }
// TODO: triggered abilities need to be fixed // TODO: triggered abilities need to be fixed
if (!((sp instanceof Ability_Triggered) || (sp instanceof Ability_Static))) { if (!((sp instanceof AbilityTriggered) || (sp instanceof AbilityStatic))) {
// when something is added we need to setPriority // when something is added we need to setPriority
AllZone.getPhase().setPriority(sp.getActivatingPlayer()); AllZone.getPhase().setPriority(sp.getActivatingPlayer());
} }
if ((sp instanceof Ability_Triggered) || (sp instanceof Ability_Static)) { if ((sp instanceof AbilityTriggered) || (sp instanceof AbilityStatic)) {
// TODO: make working triggered ability // TODO: make working triggered ability
sp.resolve(); sp.resolve();
} else { } else {
@@ -437,7 +437,7 @@ public class MagicStack extends MyObservable {
ability.resolve(); ability.resolve();
final Card crd = sa.getSourceCard(); final Card crd = sa.getSourceCard();
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Pay X cost for " + crd.getName() + " (X=" new InputPayManaCostAbility("Pay X cost for " + crd.getName() + " (X="
+ crd.getXManaCostPaid() + ")\r\n", ability.getManaCost(), this, unpaidCommand, + crd.getXManaCostPaid() + ")\r\n", ability.getManaCost(), this, unpaidCommand,
true)); true));
} }
@@ -446,7 +446,7 @@ public class MagicStack extends MyObservable {
final Card crd = sa.getSourceCard(); final Card crd = sa.getSourceCard();
if (sp.getSourceCard().getController().isHuman()) { if (sp.getSourceCard().getController().isHuman()) {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Pay X cost for " + sp.getSourceCard().getName() + " (X=" new InputPayManaCostAbility("Pay X cost for " + sp.getSourceCard().getName() + " (X="
+ crd.getXManaCostPaid() + ")\r\n", ability.getManaCost(), paidCommand, + crd.getXManaCostPaid() + ")\r\n", ability.getManaCost(), paidCommand,
unpaidCommand, true)); unpaidCommand, true));
} else { } else {
@@ -496,13 +496,13 @@ public class MagicStack extends MyObservable {
.equals("")) { .equals("")) {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Multikicker for " + sa.getSourceCard() + "\r\n" new InputPayManaCostAbility("Multikicker for " + sa.getSourceCard() + "\r\n"
+ "Times Kicked: " + sa.getSourceCard().getMultiKickerMagnitude() + "Times Kicked: " + sa.getSourceCard().getMultiKickerMagnitude()
+ "\r\n", manaCost.toString(), this, unpaidCommand)); + "\r\n", manaCost.toString(), this, unpaidCommand));
} else { } else {
AllZone.getInputControl() AllZone.getInputControl()
.setInput( .setInput(
new Input_PayManaCost_Ability( new InputPayManaCostAbility(
"Multikicker for " "Multikicker for "
+ sa.getSourceCard() + sa.getSourceCard()
+ "\r\n" + "\r\n"
@@ -532,13 +532,13 @@ public class MagicStack extends MyObservable {
if ((AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid() == 0) if ((AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid() == 0)
&& AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored().equals("")) { && AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored().equals("")) {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Multikicker for " + sa.getSourceCard() + "\r\n" new InputPayManaCostAbility("Multikicker for " + sa.getSourceCard() + "\r\n"
+ "Times Kicked: " + sa.getSourceCard().getMultiKickerMagnitude() + "\r\n", + "Times Kicked: " + sa.getSourceCard().getMultiKickerMagnitude() + "\r\n",
manaCost.toString(), paidCommand, unpaidCommand)); manaCost.toString(), paidCommand, unpaidCommand));
} else { } else {
AllZone.getInputControl() AllZone.getInputControl()
.setInput( .setInput(
new Input_PayManaCost_Ability( new InputPayManaCostAbility(
"Multikicker for " "Multikicker for "
+ sa.getSourceCard() + sa.getSourceCard()
+ "\r\n" + "\r\n"
@@ -602,7 +602,7 @@ public class MagicStack extends MyObservable {
} else { } else {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Replicate for " + sa.getSourceCard() + "\r\n" new InputPayManaCostAbility("Replicate for " + sa.getSourceCard() + "\r\n"
+ "Times Replicated: " + sa.getSourceCard().getReplicateMagnitude() + "Times Replicated: " + sa.getSourceCard().getReplicateMagnitude()
+ "\r\n", manaCost.toString(), this, unpaidCommand)); + "\r\n", manaCost.toString(), this, unpaidCommand));
} }
@@ -616,7 +616,7 @@ public class MagicStack extends MyObservable {
paidCommand.execute(); paidCommand.execute();
} else { } else {
AllZone.getInputControl().setInput( AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Replicate for " + sa.getSourceCard() + "\r\n" new InputPayManaCostAbility("Replicate for " + sa.getSourceCard() + "\r\n"
+ "Times Replicated: " + sa.getSourceCard().getReplicateMagnitude() + "\r\n", + "Times Replicated: " + sa.getSourceCard().getReplicateMagnitude() + "\r\n",
manaCost.toString(), paidCommand, unpaidCommand)); manaCost.toString(), paidCommand, unpaidCommand));
} }
@@ -665,7 +665,7 @@ public class MagicStack extends MyObservable {
runParams.clear(); runParams.clear();
runParams.put("SourceSA", sp); runParams.put("SourceSA", sp);
if (chosenTargets.size() > 0) { if (chosenTargets.size() > 0) {
for (final Target_Choices tc : chosenTargets) { for (final TargetChoices tc : chosenTargets) {
if ((tc != null) && (tc.getTargetCards() != null)) { if ((tc != null) && (tc.getTargetCards() != null)) {
for (final Object tgt : tc.getTargets()) { for (final Object tgt : tc.getTargets()) {
runParams.put("Target", tgt); runParams.put("Target", tgt);
@@ -695,7 +695,7 @@ public class MagicStack extends MyObservable {
} }
} }
if ((sp instanceof Spell_Permanent) && sp.getSourceCard().getName().equals("Mana Vortex")) { if ((sp instanceof SpellPermanent) && sp.getSourceCard().getName().equals("Mana Vortex")) {
final SpellAbility counter = new Ability(sp.getSourceCard(), "0") { final SpellAbility counter = new Ability(sp.getSourceCard(), "0") {
@Override @Override
public void resolve() { public void resolve() {
@@ -723,7 +723,7 @@ public class MagicStack extends MyObservable {
} }
} }
}; };
final SpellAbility_StackInstance prev = MagicStack.this.peekInstance(); final SpellAbilityStackInstance prev = MagicStack.this.peekInstance();
if (prev.isSpell() && prev.getSourceCard().getName().equals("Mana Vortex")) { if (prev.isSpell() && prev.getSourceCard().getName().equals("Mana Vortex")) {
if (sp.getSourceCard().getController().isHuman()) { if (sp.getSourceCard().getController().isHuman()) {
AllZone.getInputControl().setInput(in); AllZone.getInputControl().setInput(in);
@@ -823,7 +823,7 @@ public class MagicStack extends MyObservable {
this.incrementSplitSecond(sp); this.incrementSplitSecond(sp);
final SpellAbility_StackInstance si = new SpellAbility_StackInstance(sp); final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp);
this.getStack().push(si); this.getStack().push(si);
this.updateObservers(); this.updateObservers();
@@ -1054,7 +1054,7 @@ public class MagicStack extends MyObservable {
} }
if (o instanceof SpellAbility) { if (o instanceof SpellAbility) {
final SpellAbility tgtSA = (SpellAbility) o; final SpellAbility tgtSA = (SpellAbility) o;
fizzle &= !(Target_Selection.matchSpellAbility(fizzSA, tgtSA, tgt)); fizzle &= !(TargetSelection.matchSpellAbility(fizzSA, tgtSA, tgt));
} }
} }
} else if (fizzSA.getTargetCard() != null) { } else if (fizzSA.getTargetCard() != null) {
@@ -1099,10 +1099,10 @@ public class MagicStack extends MyObservable {
* *
* @param index * @param index
* a int. * a int.
* @return a {@link forge.card.spellability.SpellAbility_StackInstance} * @return a {@link forge.card.spellability.SpellAbilityStackInstance}
* object. * object.
*/ */
public final SpellAbility_StackInstance peekInstance(final int index) { public final SpellAbilityStackInstance peekInstance(final int index) {
return this.getStack().get(index); return this.getStack().get(index);
} }
@@ -1124,10 +1124,10 @@ public class MagicStack extends MyObservable {
* peekInstance. * peekInstance.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.SpellAbility_StackInstance} * @return a {@link forge.card.spellability.SpellAbilityStackInstance}
* object. * object.
*/ */
public final SpellAbility_StackInstance peekInstance() { public final SpellAbilityStackInstance peekInstance() {
return this.getStack().peek(); return this.getStack().peek();
} }
@@ -1151,7 +1151,7 @@ public class MagicStack extends MyObservable {
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final void remove(final SpellAbility sa) { public final void remove(final SpellAbility sa) {
final SpellAbility_StackInstance si = this.getInstanceFromSpellAbility(sa); final SpellAbilityStackInstance si = this.getInstanceFromSpellAbility(sa);
if (si == null) { if (si == null) {
return; return;
@@ -1166,10 +1166,10 @@ public class MagicStack extends MyObservable {
* </p> * </p>
* *
* @param si * @param si
* a {@link forge.card.spellability.SpellAbility_StackInstance} * a {@link forge.card.spellability.SpellAbilityStackInstance}
* object. * object.
*/ */
public final void remove(final SpellAbility_StackInstance si) { public final void remove(final SpellAbilityStackInstance si) {
if (this.getStack().remove(si)) { if (this.getStack().remove(si)) {
this.decrementSplitSecond(si.getSpellAbility()); this.decrementSplitSecond(si.getSpellAbility());
} }
@@ -1184,12 +1184,12 @@ public class MagicStack extends MyObservable {
* *
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @return a {@link forge.card.spellability.SpellAbility_StackInstance} * @return a {@link forge.card.spellability.SpellAbilityStackInstance}
* object. * object.
*/ */
public final SpellAbility_StackInstance getInstanceFromSpellAbility(final SpellAbility sa) { public final SpellAbilityStackInstance getInstanceFromSpellAbility(final SpellAbility sa) {
// TODO: Confirm this works! // TODO: Confirm this works!
for (final SpellAbility_StackInstance si : this.getStack()) { for (final SpellAbilityStackInstance si : this.getStack()) {
if (si.getSpellAbility().equals(sa)) { if (si.getSpellAbility().equals(sa)) {
return si; return si;
} }
@@ -1307,7 +1307,7 @@ public class MagicStack extends MyObservable {
* @return true, if successful * @return true, if successful
*/ */
public final boolean hasStateTrigger(final int triggerID) { public final boolean hasStateTrigger(final int triggerID) {
for (final SpellAbility_StackInstance sasi : this.getStack()) { for (final SpellAbilityStackInstance sasi : this.getStack()) {
if (sasi.isStateTrigger(triggerID)) { if (sasi.isStateTrigger(triggerID)) {
return true; return true;
} }
@@ -1336,7 +1336,7 @@ public class MagicStack extends MyObservable {
* *
* @return the stack * @return the stack
*/ */
public final Stack<SpellAbility_StackInstance> getStack() { public final Stack<SpellAbilityStackInstance> getStack() {
return this.stack; return this.stack;
} }
@@ -1345,7 +1345,7 @@ public class MagicStack extends MyObservable {
* *
* @return the frozenStack * @return the frozenStack
*/ */
public final Stack<SpellAbility_StackInstance> getFrozenStack() { public final Stack<SpellAbilityStackInstance> getFrozenStack() {
return this.frozenStack; return this.frozenStack;
} }

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

@@ -6,8 +6,8 @@ import java.util.HashMap;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
@@ -164,7 +164,7 @@ public class Upkeep implements java.io.Serializable {
public void resolve() { public void resolve() {
c.addCounter(Counters.AGE, 1); c.addCounter(Counters.AGE, 1);
final int ageCounters = c.getCounters(Counters.AGE); final int ageCounters = c.getCounters(Counters.AGE);
final Ability_Mana abMana = new Ability_Mana(c, "0", "R", ageCounters) { final AbilityMana abMana = new AbilityMana(c, "0", "R", ageCounters) {
private static final long serialVersionUID = -2182129023960978132L; private static final long serialVersionUID = -2182129023960978132L;
}; };
if (player.isComputer()) { if (player.isComputer()) {
@@ -473,7 +473,7 @@ public class Upkeep implements java.io.Serializable {
* @return a {@link forge.card.spellability.Ability} object. * @return a {@link forge.card.spellability.Ability} object.
*/ */
private static Ability upkeepAIPayment(final Card c, final String cost) { private static Ability upkeepAIPayment(final Card c, final String cost) {
return new Ability_Static(c, cost) { return new AbilityStatic(c, cost) {
@Override @Override
public void resolve() { public void resolve() {

8
src/main/java/forge/card/CardCharacteristics.java
View File

@@ -7,7 +7,7 @@ import java.util.TreeMap;
import forge.CardColor; import forge.CardColor;
import forge.SetInfo; import forge.SetInfo;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
@@ -27,7 +27,7 @@ public class CardCharacteristics {
private ArrayList<String> intrinsicKeyword = new ArrayList<String>(); private ArrayList<String> intrinsicKeyword = new ArrayList<String>();
private ArrayList<SpellAbility> spellAbility = new ArrayList<SpellAbility>(); private ArrayList<SpellAbility> spellAbility = new ArrayList<SpellAbility>();
private ArrayList<String> intrinsicAbility = new ArrayList<String>(); private ArrayList<String> intrinsicAbility = new ArrayList<String>();
private ArrayList<Ability_Mana> manaAbility = new ArrayList<Ability_Mana>(); private ArrayList<AbilityMana> manaAbility = new ArrayList<AbilityMana>();
private ArrayList<Trigger> triggers = new ArrayList<Trigger>(); private ArrayList<Trigger> triggers = new ArrayList<Trigger>();
private ArrayList<StaticAbility> staticAbilities = new ArrayList<StaticAbility>(); private ArrayList<StaticAbility> staticAbilities = new ArrayList<StaticAbility>();
private ArrayList<String> staticAbilityStrings = new ArrayList<String>(); private ArrayList<String> staticAbilityStrings = new ArrayList<String>();
@@ -237,7 +237,7 @@ public class CardCharacteristics {
* *
* @return the manaAbility * @return the manaAbility
*/ */
public final ArrayList<Ability_Mana> getManaAbility() { public final ArrayList<AbilityMana> getManaAbility() {
return manaAbility; return manaAbility;
} }
@@ -247,7 +247,7 @@ public class CardCharacteristics {
* @param manaAbility0 * @param manaAbility0
* the manaAbility to set * the manaAbility to set
*/ */
public final void setManaAbility(final ArrayList<Ability_Mana> manaAbility0) { public final void setManaAbility(final ArrayList<AbilityMana> manaAbility0) {
this.manaAbility = manaAbility0; // TODO: Add 0 to parameter's name. this.manaAbility = manaAbility0; // TODO: Add 0 to parameter's name.
} }

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

@@ -17,11 +17,11 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
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_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Condition; import forge.card.spellability.SpellAbilityCondition;
import forge.card.spellability.SpellAbility_Restriction; import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
/** /**
@@ -1162,7 +1162,7 @@ public class AbilityFactory {
spellAbility.setSubAbility(this.getSubAbility()); spellAbility.setSubAbility(this.getSubAbility());
} }
if (spellAbility instanceof Spell_Permanent) { if (spellAbility instanceof SpellPermanent) {
spellAbility.setDescription(spellAbility.getSourceCard().getName()); spellAbility.setDescription(spellAbility.getSourceCard().getName());
} else if (this.hasSpDesc) { } else if (this.hasSpDesc) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
@@ -1207,7 +1207,7 @@ public class AbilityFactory {
*/ */
private void makeRestrictions(final SpellAbility sa) { private void makeRestrictions(final SpellAbility sa) {
// SpellAbility_Restrictions should be added in here // SpellAbility_Restrictions should be added in here
final SpellAbility_Restriction restrict = sa.getRestrictions(); final SpellAbilityRestriction restrict = sa.getRestrictions();
if (this.mapParams.containsKey("Flashback")) { if (this.mapParams.containsKey("Flashback")) {
sa.setFlashBackAbility(true); sa.setFlashBackAbility(true);
} }
@@ -1224,7 +1224,7 @@ public class AbilityFactory {
*/ */
private void makeConditions(final SpellAbility sa) { private void makeConditions(final SpellAbility sa) {
// SpellAbility_Restrictions should be added in here // SpellAbility_Restrictions should be added in here
final SpellAbility_Condition condition = sa.getConditions(); final SpellAbilityCondition condition = sa.getConditions();
if (this.mapParams.containsKey("Flashback")) { if (this.mapParams.containsKey("Flashback")) {
sa.setFlashBackAbility(true); sa.setFlashBackAbility(true);
} }
@@ -1250,10 +1250,10 @@ public class AbilityFactory {
* getSubAbility. * getSubAbility.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public final Ability_Sub getSubAbility() { public final AbilitySub getSubAbility() {
Ability_Sub abSub = null; AbilitySub abSub = null;
String sSub = this.getMapParams().get("SubAbility"); String sSub = this.getMapParams().get("SubAbility");
@@ -1266,7 +1266,7 @@ public class AbilityFactory {
if (!sSub.equals("")) { if (!sSub.equals("")) {
// Older style Drawback no longer supported // Older style Drawback no longer supported
final AbilityFactory afDB = new AbilityFactory(); final AbilityFactory afDB = new AbilityFactory();
abSub = (Ability_Sub) afDB.getAbility(sSub, this.getHostCard()); abSub = (AbilitySub) afDB.getAbility(sSub, this.getHostCard());
} else { } else {
System.out.println("SubAbility not found for: " + this.getHostCard()); System.out.println("SubAbility not found for: " + this.getHostCard());
} }
@@ -1657,10 +1657,10 @@ public class AbilityFactory {
do { do {
// did not find any targets // did not find any targets
if (!(parent instanceof Ability_Sub)) { if (!(parent instanceof AbilitySub)) {
return players; return players;
} }
parent = ((Ability_Sub) parent).getParent(); parent = ((AbilitySub) parent).getParent();
tgt = parent.getTarget(); tgt = parent.getTarget();
} while ((tgt == null) || (tgt.getTargetPlayers().size() == 0)); } while ((tgt == null) || (tgt.getTargetPlayers().size() == 0));
@@ -1854,8 +1854,8 @@ public class AbilityFactory {
*/ */
public static SpellAbility findRootAbility(final SpellAbility sa) { public static SpellAbility findRootAbility(final SpellAbility sa) {
SpellAbility parent = sa; SpellAbility parent = sa;
while (parent instanceof Ability_Sub) { while (parent instanceof AbilitySub) {
parent = ((Ability_Sub) parent).getParent(); parent = ((AbilitySub) parent).getParent();
} }
return parent; return parent;
@@ -1874,10 +1874,10 @@ public class AbilityFactory {
SpellAbility parent = sa; SpellAbility parent = sa;
do { do {
if (!(parent instanceof Ability_Sub)) { if (!(parent instanceof AbilitySub)) {
return parent; return parent;
} }
parent = ((Ability_Sub) parent).getParent(); parent = ((AbilitySub) parent).getParent();
} while ((parent.getTarget() == null) || (parent.getTarget().getTargetCards().size() == 0)); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetCards().size() == 0));
return parent; return parent;
@@ -1896,10 +1896,10 @@ public class AbilityFactory {
SpellAbility parent = sa; SpellAbility parent = sa;
do { do {
if (!(parent instanceof Ability_Sub)) { if (!(parent instanceof AbilitySub)) {
return parent; return parent;
} }
parent = ((Ability_Sub) parent).getParent(); parent = ((AbilitySub) parent).getParent();
} while ((parent.getTarget() == null) || (parent.getTarget().getTargetSAs().size() == 0)); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetSAs().size() == 0));
return parent; return parent;
@@ -1918,10 +1918,10 @@ public class AbilityFactory {
SpellAbility parent = sa; SpellAbility parent = sa;
do { do {
if (!(parent instanceof Ability_Sub)) { if (!(parent instanceof AbilitySub)) {
return parent; return parent;
} }
parent = ((Ability_Sub) parent).getParent(); parent = ((AbilitySub) parent).getParent();
} while ((parent.getTarget() == null) || (parent.getTarget().getTargetPlayers().size() == 0)); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetPlayers().size() == 0));
return parent; return parent;
@@ -2316,7 +2316,7 @@ public class AbilityFactory {
* @since 1.0.15 * @since 1.0.15
*/ */
public static void resolveSubAbilities(final SpellAbility sa) { public static void resolveSubAbilities(final SpellAbility sa) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if ((abSub == null) || sa.isWrapper()) { if ((abSub == null) || sa.isWrapper()) {
return; return;
} }

52
src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java
View File

@@ -15,8 +15,8 @@ import forge.MyRandom;
import forge.Player; import forge.Player;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -47,7 +47,7 @@ public class AbilityFactoryAlterLife {
*/ */
public static SpellAbility createAbilityGainLife(final AbilityFactory abilityFactory) { public static SpellAbility createAbilityGainLife(final AbilityFactory abilityFactory) {
final SpellAbility abGainLife = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), final SpellAbility abGainLife = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt()) { abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 8869422603616247307L; private static final long serialVersionUID = 8869422603616247307L;
@@ -131,7 +131,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackGainLife(final AbilityFactory abilityFactory) { public static SpellAbility createDrawbackGainLife(final AbilityFactory abilityFactory) {
final SpellAbility dbGainLife = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final SpellAbility dbGainLife = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 6631124959690157874L; private static final long serialVersionUID = 6631124959690157874L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -188,7 +188,7 @@ public class AbilityFactoryAlterLife {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa); final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -214,7 +214,7 @@ public class AbilityFactoryAlterLife {
sb.append("gains ").append(amount).append(" life."); sb.append("gains ").append(amount).append(" life.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -356,7 +356,7 @@ public class AbilityFactoryAlterLife {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -408,7 +408,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityLoseLife(final AbilityFactory abilityFactory) { public static SpellAbility createAbilityLoseLife(final AbilityFactory abilityFactory) {
final SpellAbility abLoseLife = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), final SpellAbility abLoseLife = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt()) { abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 1129762905315395160L; private static final long serialVersionUID = 1129762905315395160L;
@@ -495,7 +495,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackLoseLife(final AbilityFactory abilityFactory) { public static SpellAbility createDrawbackLoseLife(final AbilityFactory abilityFactory) {
final SpellAbility dbLoseLife = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final SpellAbility dbLoseLife = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -2966932725306192437L; private static final long serialVersionUID = -2966932725306192437L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -551,7 +551,7 @@ public class AbilityFactoryAlterLife {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa); final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -576,7 +576,7 @@ public class AbilityFactoryAlterLife {
sb.append("loses ").append(amount).append(" life."); sb.append("loses ").append(amount).append(" life.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -723,7 +723,7 @@ public class AbilityFactoryAlterLife {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -780,7 +780,7 @@ public class AbilityFactoryAlterLife {
*/ */
public static SpellAbility createAbilityPoison(final AbilityFactory af) { public static SpellAbility createAbilityPoison(final AbilityFactory af) {
final SpellAbility abPoison = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abPoison = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 6598936088284756268L; private static final long serialVersionUID = 6598936088284756268L;
@Override @Override
@@ -856,7 +856,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackPoison(final AbilityFactory af) { public static SpellAbility createDrawbackPoison(final AbilityFactory af) {
final SpellAbility dbPoison = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbPoison = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -1173479041548558016L; private static final long serialVersionUID = -1173479041548558016L;
@Override @Override
@@ -929,7 +929,7 @@ public class AbilityFactoryAlterLife {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -983,7 +983,7 @@ public class AbilityFactoryAlterLife {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Num"), sa); final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Num"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1027,7 +1027,7 @@ public class AbilityFactoryAlterLife {
sb.append("."); sb.append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1104,7 +1104,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilitySetLife(final AbilityFactory af) { public static SpellAbility createAbilitySetLife(final AbilityFactory af) {
final SpellAbility abSetLife = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abSetLife = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -7375434097541097668L; private static final long serialVersionUID = -7375434097541097668L;
@Override @Override
@@ -1178,7 +1178,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackSetLife(final AbilityFactory af) { public static SpellAbility createDrawbackSetLife(final AbilityFactory af) {
final SpellAbility dbSetLife = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbSetLife = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -7634729949893534023L; private static final long serialVersionUID = -7634729949893534023L;
@Override @Override
@@ -1231,7 +1231,7 @@ public class AbilityFactoryAlterLife {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa); final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" -"); sb.append(sa.getSourceCard()).append(" -");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1257,7 +1257,7 @@ public class AbilityFactoryAlterLife {
sb.append("life total becomes ").append(amount).append("."); sb.append("life total becomes ").append(amount).append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1419,7 +1419,7 @@ public class AbilityFactoryAlterLife {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -1471,7 +1471,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityExchangeLife(final AbilityFactory af) { public static SpellAbility createAbilityExchangeLife(final AbilityFactory af) {
final SpellAbility abExLife = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abExLife = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 212548821691286311L; private static final long serialVersionUID = 212548821691286311L;
@Override @Override
@@ -1540,7 +1540,7 @@ public class AbilityFactoryAlterLife {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackExchangeLife(final AbilityFactory af) { public static SpellAbility createDrawbackExchangeLife(final AbilityFactory af) {
final SpellAbility dbExLife = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbExLife = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 6951913863491173483L; private static final long serialVersionUID = 6951913863491173483L;
@Override @Override
@@ -1588,7 +1588,7 @@ public class AbilityFactoryAlterLife {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Player activatingPlayer = sa.getActivatingPlayer(); final Player activatingPlayer = sa.getActivatingPlayer();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" -"); sb.append(sa.getSourceCard()).append(" -");
@@ -1612,7 +1612,7 @@ public class AbilityFactoryAlterLife {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

32
src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java
View File

@@ -15,8 +15,8 @@ import forge.ComputerUtil;
import forge.Constant; import forge.Constant;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -52,7 +52,7 @@ public final class AbilityFactoryAnimate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityAnimate(final AbilityFactory af) { public static SpellAbility createAbilityAnimate(final AbilityFactory af) {
final SpellAbility abAnimate = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abAnimate = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 1938171749867735155L; private static final long serialVersionUID = 1938171749867735155L;
@Override @Override
@@ -119,7 +119,7 @@ public final class AbilityFactoryAnimate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackAnimate(final AbilityFactory af) { public static SpellAbility createDrawbackAnimate(final AbilityFactory af) {
final SpellAbility dbAnimate = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbAnimate = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -8659938411460952874L; private static final long serialVersionUID = -8659938411460952874L;
@Override @Override
@@ -194,7 +194,7 @@ public final class AbilityFactoryAnimate {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -267,7 +267,7 @@ public final class AbilityFactoryAnimate {
sb.append("."); sb.append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -352,7 +352,7 @@ public final class AbilityFactoryAnimate {
useAbility &= AbilityFactoryAnimate.animateTgtAI(af, sa); useAbility &= AbilityFactoryAnimate.animateTgtAI(af, sa);
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
useAbility &= subAb.chkAIDrawback(); useAbility &= subAb.chkAIDrawback();
} }
@@ -377,7 +377,7 @@ public final class AbilityFactoryAnimate {
// TODO - restrict the subAbility a bit // TODO - restrict the subAbility a bit
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -412,7 +412,7 @@ public final class AbilityFactoryAnimate {
// Eventually, we can call the trigger of ETB abilities with // Eventually, we can call the trigger of ETB abilities with
// not mandatory as part of the checks to cast something // not mandatory as part of the checks to cast something
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -812,7 +812,7 @@ public final class AbilityFactoryAnimate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityAnimateAll(final AbilityFactory af) { public static SpellAbility createAbilityAnimateAll(final AbilityFactory af) {
final SpellAbility abAnimateAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abAnimateAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -4969632476557290609L; private static final long serialVersionUID = -4969632476557290609L;
@Override @Override
@@ -879,7 +879,7 @@ public final class AbilityFactoryAnimate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackAnimateAll(final AbilityFactory af) { public static SpellAbility createDrawbackAnimateAll(final AbilityFactory af) {
final SpellAbility dbAnimateAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbAnimateAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 2056843302051205632L; private static final long serialVersionUID = 2056843302051205632L;
@Override @Override
@@ -921,7 +921,7 @@ public final class AbilityFactoryAnimate {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -936,7 +936,7 @@ public final class AbilityFactoryAnimate {
sb.append(desc); sb.append(desc);
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -958,7 +958,7 @@ public final class AbilityFactoryAnimate {
private static boolean animateAllCanPlayAI(final AbilityFactory af, final SpellAbility sa) { private static boolean animateAllCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
boolean useAbility = false; boolean useAbility = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
useAbility &= subAb.chkAIDrawback(); useAbility &= subAb.chkAIDrawback();
} }
@@ -980,7 +980,7 @@ public final class AbilityFactoryAnimate {
private static boolean animateAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean animateAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
boolean chance = false; boolean chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -1008,7 +1008,7 @@ public final class AbilityFactoryAnimate {
boolean chance = false; boolean chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }

12
src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java
View File

@@ -22,10 +22,10 @@ import forge.MyRandom;
import forge.Player; import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
@@ -51,7 +51,7 @@ public class AbilityFactoryAttach {
if (abilityFactory.getHostCard().isAura()) { if (abilityFactory.getHostCard().isAura()) {
// The 4th parameter is to resolve an issue with SetDescription in // The 4th parameter is to resolve an issue with SetDescription in
// default Spell_Permanent constructor // default Spell_Permanent constructor
spAttach = new Spell_Permanent(abilityFactory.getHostCard(), abilityFactory.getAbCost(), spAttach = new SpellPermanent(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt(), false) { abilityFactory.getAbTgt(), false) {
private static final long serialVersionUID = 6631124959690157874L; private static final long serialVersionUID = 6631124959690157874L;
@@ -147,7 +147,7 @@ public class AbilityFactoryAttach {
public static String attachStackDescription(final AbilityFactory af, final SpellAbility sa) { public static String attachStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -174,7 +174,7 @@ public class AbilityFactoryAttach {
sb.append(o).append(" "); sb.append(o).append(" ");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -884,7 +884,7 @@ public class AbilityFactoryAttach {
// Now are Valid Targets better than my targets? // Now are Valid Targets better than my targets?
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }

20
src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java
View File

@@ -11,8 +11,8 @@ import forge.CardList;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -31,7 +31,7 @@ public class AbilityFactoryChangeState {
* @return the change state ability * @return the change state ability
*/ */
public static SpellAbility getChangeStateAbility(final AbilityFactory abilityFactory) { public static SpellAbility getChangeStateAbility(final AbilityFactory abilityFactory) {
final SpellAbility ret = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), final SpellAbility ret = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt()) { abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -1083427558368639457L; private static final long serialVersionUID = -1083427558368639457L;
@@ -82,7 +82,7 @@ public class AbilityFactoryChangeState {
* @return the change state drawback * @return the change state drawback
*/ */
public static SpellAbility getChangeStateDrawback(final AbilityFactory abilityFactory) { public static SpellAbility getChangeStateDrawback(final AbilityFactory abilityFactory) {
final Ability_Sub ret = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final AbilitySub ret = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -3793247725721587468L; private static final long serialVersionUID = -3793247725721587468L;
@@ -142,7 +142,7 @@ public class AbilityFactoryChangeState {
tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa); tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa);
} }
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -169,7 +169,7 @@ public class AbilityFactoryChangeState {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -211,7 +211,7 @@ public class AbilityFactoryChangeState {
* @return the change state all ability * @return the change state all ability
*/ */
public static SpellAbility getChangeStateAllAbility(final AbilityFactory abilityFactory) { public static SpellAbility getChangeStateAllAbility(final AbilityFactory abilityFactory) {
final SpellAbility ret = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), final SpellAbility ret = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt()) { abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 7841029107610111992L; private static final long serialVersionUID = 7841029107610111992L;
@@ -265,7 +265,7 @@ public class AbilityFactoryChangeState {
* @return the change state all drawback * @return the change state all drawback
*/ */
public static SpellAbility getChangeStateAllDrawback(final AbilityFactory abilityFactory) { public static SpellAbility getChangeStateAllDrawback(final AbilityFactory abilityFactory) {
final Ability_Sub ret = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final AbilitySub ret = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 4047514893482113436L; private static final long serialVersionUID = 4047514893482113436L;
@@ -351,7 +351,7 @@ public class AbilityFactoryChangeState {
final Map<String, String> params = abilityFactory.getMapParams(); final Map<String, String> params = abilityFactory.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -365,7 +365,7 @@ public class AbilityFactoryChangeState {
sb.append(" permanents."); sb.append(" permanents.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

44
src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java
View File

@@ -23,11 +23,11 @@ import forge.PlayerZone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
@@ -59,7 +59,7 @@ public final class AbilityFactoryChangeZone {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityChangeZone(final AbilityFactory af) { public static SpellAbility createAbilityChangeZone(final AbilityFactory af) {
final SpellAbility abChangeZone = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChangeZone = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 3728332812890211671L; private static final long serialVersionUID = 3728332812890211671L;
@Override @Override
@@ -129,7 +129,7 @@ public final class AbilityFactoryChangeZone {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackChangeZone(final AbilityFactory af) { public static SpellAbility createDrawbackChangeZone(final AbilityFactory af) {
final SpellAbility dbChangeZone = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChangeZone = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 3270484211099902059L; private static final long serialVersionUID = 3270484211099902059L;
@Override @Override
@@ -206,7 +206,7 @@ public final class AbilityFactoryChangeZone {
af.getAbTgt().setZone(origin); af.getAbTgt().setZone(origin);
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
if (origin.contains(Zone.Battlefield) || params.get("Destination").equals("Battlefield")) { if (origin.contains(Zone.Battlefield) || params.get("Destination").equals("Battlefield")) {
af.getHostCard().setSVar("PlayMain1", "TRUE"); af.getHostCard().setSVar("PlayMain1", "TRUE");
} }
@@ -430,7 +430,7 @@ public final class AbilityFactoryChangeZone {
chance &= (r.nextFloat() < .8); chance &= (r.nextFloat() < .8);
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -541,7 +541,7 @@ public final class AbilityFactoryChangeZone {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
return subAb.doTrigger(mandatory); return subAb.doTrigger(mandatory);
} }
@@ -568,7 +568,7 @@ public final class AbilityFactoryChangeZone {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -"); sb.append(host.getName()).append(" -");
} }
@@ -646,7 +646,7 @@ public final class AbilityFactoryChangeZone {
} }
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1204,7 +1204,7 @@ public final class AbilityFactoryChangeZone {
return false; return false;
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
String subAPI = ""; String subAPI = "";
if (abSub != null) { if (abSub != null) {
subAPI = abSub.getAbilityFactory().getAPI(); subAPI = abSub.getAbilityFactory().getAPI();
@@ -1229,7 +1229,7 @@ public final class AbilityFactoryChangeZone {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -1277,7 +1277,7 @@ public final class AbilityFactoryChangeZone {
final Zone destination = Zone.smartValueOf(params.get("Destination")); final Zone destination = Zone.smartValueOf(params.get("Destination"));
final Target tgt = af.getAbTgt(); final Target tgt = af.getAbTgt();
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
String subAPI = ""; String subAPI = "";
String subAffected = ""; String subAffected = "";
HashMap<String, String> subParams = null; HashMap<String, String> subParams = null;
@@ -1352,7 +1352,7 @@ public final class AbilityFactoryChangeZone {
} }
// counters TODO check good and // counters TODO check good and
// bad counters // bad counters
return Spell_Permanent.checkETBEffects(c, null, null); // checks return SpellPermanent.checkETBEffects(c, null, null); // checks
// only // only
// if // if
// there // there
@@ -1568,7 +1568,7 @@ public final class AbilityFactoryChangeZone {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
return subAb.doTrigger(mandatory); return subAb.doTrigger(mandatory);
} }
@@ -1593,7 +1593,7 @@ public final class AbilityFactoryChangeZone {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -"); sb.append(host.getName()).append(" -");
} }
@@ -1691,7 +1691,7 @@ public final class AbilityFactoryChangeZone {
sb.append(" into").append(pronoun).append("owner's graveyard."); sb.append(" into").append(pronoun).append("owner's graveyard.");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1847,7 +1847,7 @@ public final class AbilityFactoryChangeZone {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityChangeZoneAll(final AbilityFactory af) { public static SpellAbility createAbilityChangeZoneAll(final AbilityFactory af) {
final SpellAbility abChangeZone = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChangeZone = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 3728332812890211671L; private static final long serialVersionUID = 3728332812890211671L;
@Override @Override
@@ -1917,7 +1917,7 @@ public final class AbilityFactoryChangeZone {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackChangeZoneAll(final AbilityFactory af) { public static SpellAbility createDrawbackChangeZoneAll(final AbilityFactory af) {
final SpellAbility dbChangeZone = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChangeZone = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 3270484211099902059L; private static final long serialVersionUID = 3270484211099902059L;
@Override @Override
@@ -2069,7 +2069,7 @@ public final class AbilityFactoryChangeZone {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -2112,7 +2112,7 @@ public final class AbilityFactoryChangeZone {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -"); sb.append(host.getName()).append(" -");
} }
@@ -2126,7 +2126,7 @@ public final class AbilityFactoryChangeZone {
sb.append(desc[0]); sb.append(desc[0]);
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

12
src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java
View File

@@ -2,8 +2,8 @@ package forge.card.abilityFactory;
import java.util.ArrayList; import java.util.ArrayList;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
@@ -34,7 +34,7 @@ public final class AbilityFactoryCharm {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityCharm(final AbilityFactory af) { public static SpellAbility createAbilityCharm(final AbilityFactory af) {
final SpellAbility abCharm = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abCharm = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -4038591081733095021L; private static final long serialVersionUID = -4038591081733095021L;
@Override @Override
@@ -96,7 +96,7 @@ public final class AbilityFactoryCharm {
private static String charmStackDescription(final AbilityFactory af, final SpellAbility sa) { private static String charmStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -106,7 +106,7 @@ public final class AbilityFactoryCharm {
// nothing stack specific for Charm // nothing stack specific for Charm
// begin standard post // begin standard post
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -151,7 +151,7 @@ public final class AbilityFactoryCharm {
if (null == o) { if (null == o) {
break; break;
} }
final Ability_Sub chosen = (Ability_Sub) o; final AbilitySub chosen = (AbilitySub) o;
sa.addCharmChoice(chosen); sa.addCharmChoice(chosen);
choices.remove(chosen); choices.remove(chosen);

46
src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java
View File

@@ -19,8 +19,8 @@ import forge.Constant;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -55,7 +55,7 @@ public final class AbilityFactoryChoose {
*/ */
public static SpellAbility createAbilityChooseType(final AbilityFactory af) { public static SpellAbility createAbilityChooseType(final AbilityFactory af) {
final SpellAbility abChooseType = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChooseType = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -7734286034988741837L; private static final long serialVersionUID = -7734286034988741837L;
@Override @Override
@@ -124,7 +124,7 @@ public final class AbilityFactoryChoose {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackChooseType(final AbilityFactory af) { public static SpellAbility createDrawbackChooseType(final AbilityFactory af) {
final SpellAbility dbChooseType = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChooseType = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 5555184803257696143L; private static final long serialVersionUID = 5555184803257696143L;
@Override @Override
@@ -166,7 +166,7 @@ public final class AbilityFactoryChoose {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -186,7 +186,7 @@ public final class AbilityFactoryChoose {
} }
sb.append("chooses a type."); sb.append("chooses a type.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -410,7 +410,7 @@ public final class AbilityFactoryChoose {
*/ */
public static SpellAbility createAbilityChooseColor(final AbilityFactory af) { public static SpellAbility createAbilityChooseColor(final AbilityFactory af) {
final SpellAbility abChooseColor = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChooseColor = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 7069068165774633355L; private static final long serialVersionUID = 7069068165774633355L;
@Override @Override
@@ -481,7 +481,7 @@ public final class AbilityFactoryChoose {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createDrawbackChooseColor(final AbilityFactory af) { public static SpellAbility createDrawbackChooseColor(final AbilityFactory af) {
final SpellAbility dbChooseColor = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChooseColor = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 6969618586164278998L; private static final long serialVersionUID = 6969618586164278998L;
@Override @Override
@@ -523,7 +523,7 @@ public final class AbilityFactoryChoose {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -547,7 +547,7 @@ public final class AbilityFactoryChoose {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -570,7 +570,7 @@ public final class AbilityFactoryChoose {
// Note: if (AILogic == MostProminentAttackers) return isDuringCombat(); // Note: if (AILogic == MostProminentAttackers) return isDuringCombat();
boolean chance = true; boolean chance = true;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -690,7 +690,7 @@ public final class AbilityFactoryChoose {
*/ */
public static SpellAbility createAbilityChooseNumber(final AbilityFactory af) { public static SpellAbility createAbilityChooseNumber(final AbilityFactory af) {
final SpellAbility abChooseNumber = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChooseNumber = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -8268155210011368749L; private static final long serialVersionUID = -8268155210011368749L;
@Override @Override
@@ -761,7 +761,7 @@ public final class AbilityFactoryChoose {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createDrawbackChooseNumber(final AbilityFactory af) { public static SpellAbility createDrawbackChooseNumber(final AbilityFactory af) {
final SpellAbility dbChooseNumber = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChooseNumber = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -1339609900364066904L; private static final long serialVersionUID = -1339609900364066904L;
@Override @Override
@@ -802,7 +802,7 @@ public final class AbilityFactoryChoose {
private static String chooseNumberStackDescription(final AbilityFactory af, final SpellAbility sa) { private static String chooseNumberStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -822,7 +822,7 @@ public final class AbilityFactoryChoose {
} }
sb.append("chooses a number."); sb.append("chooses a number.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -936,7 +936,7 @@ public final class AbilityFactoryChoose {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createAbilityChoosePlayer(final AbilityFactory af) { public static SpellAbility createAbilityChoosePlayer(final AbilityFactory af) {
final SpellAbility abChoosePlayer = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abChoosePlayer = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 7502903475594562552L; private static final long serialVersionUID = 7502903475594562552L;
@@ -1009,7 +1009,7 @@ public final class AbilityFactoryChoose {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createDrawbackChoosePlayer(final AbilityFactory af) { public static SpellAbility createDrawbackChoosePlayer(final AbilityFactory af) {
final SpellAbility dbChoosePlayer = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbChoosePlayer = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -766158106632103029L; private static final long serialVersionUID = -766158106632103029L;
@@ -1051,7 +1051,7 @@ public final class AbilityFactoryChoose {
private static String choosePlayerStackDescription(final AbilityFactory af, final SpellAbility sa) { private static String choosePlayerStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -1071,7 +1071,7 @@ public final class AbilityFactoryChoose {
} }
sb.append("chooses a player."); sb.append("chooses a player.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1169,7 +1169,7 @@ public final class AbilityFactoryChoose {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createAbilityNameCard(final AbilityFactory af) { public static SpellAbility createAbilityNameCard(final AbilityFactory af) {
final SpellAbility abNameCard = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abNameCard = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 1748714246609515354L; private static final long serialVersionUID = 1748714246609515354L;
@Override @Override
@@ -1240,7 +1240,7 @@ public final class AbilityFactoryChoose {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createDrawbackNameCard(final AbilityFactory af) { public static SpellAbility createDrawbackNameCard(final AbilityFactory af) {
final SpellAbility dbNameCard = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbNameCard = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -7647726271751061495L; private static final long serialVersionUID = -7647726271751061495L;
@Override @Override
@@ -1281,7 +1281,7 @@ public final class AbilityFactoryChoose {
private static String nameCardStackDescription(final AbilityFactory af, final SpellAbility sa) { private static String nameCardStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -1301,7 +1301,7 @@ public final class AbilityFactoryChoose {
} }
sb.append("names a card."); sb.append("names a card.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java
View File

@@ -7,8 +7,8 @@ import forge.AllZone;
import forge.Card; import forge.Card;
import forge.GameActionUtil; import forge.GameActionUtil;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
@@ -37,7 +37,7 @@ public final class AbilityFactoryClash {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility getAbilityClash(final AbilityFactory af) { public static SpellAbility getAbilityClash(final AbilityFactory af) {
final SpellAbility abClash = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abClash = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -8019637116128196248L; private static final long serialVersionUID = -8019637116128196248L;
@Override @Override
@@ -123,7 +123,7 @@ public final class AbilityFactoryClash {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility getDrawbackClash(final AbilityFactory af) { public static SpellAbility getDrawbackClash(final AbilityFactory af) {
final SpellAbility dbClash = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbClash = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -3850086157052881360L; private static final long serialVersionUID = -3850086157052881360L;
@Override @Override
@@ -183,7 +183,7 @@ public final class AbilityFactoryClash {
final SpellAbility win = afOutcomes.getAbility( final SpellAbility win = afOutcomes.getAbility(
af.getHostCard().getSVar(af.getMapParams().get("WinSubAbility")), af.getHostCard()); af.getHostCard().getSVar(af.getMapParams().get("WinSubAbility")), af.getHostCard());
win.setActivatingPlayer(af.getHostCard().getController()); win.setActivatingPlayer(af.getHostCard().getController());
((Ability_Sub) win).setParent(sa); ((AbilitySub) win).setParent(sa);
AbilityFactory.resolve(win, false); AbilityFactory.resolve(win, false);
} }
@@ -193,7 +193,7 @@ public final class AbilityFactoryClash {
final SpellAbility otherwise = afOutcomes.getAbility( final SpellAbility otherwise = afOutcomes.getAbility(
af.getHostCard().getSVar(af.getMapParams().get("OtherwiseSubAbility")), af.getHostCard()); af.getHostCard().getSVar(af.getMapParams().get("OtherwiseSubAbility")), af.getHostCard());
otherwise.setActivatingPlayer(af.getHostCard().getController()); otherwise.setActivatingPlayer(af.getHostCard().getController());
((Ability_Sub) otherwise).setParent(sa); ((AbilitySub) otherwise).setParent(sa);
AbilityFactory.resolve(otherwise, false); AbilityFactory.resolve(otherwise, false);
} }
@@ -218,7 +218,7 @@ public final class AbilityFactoryClash {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createAbilityFlip(final AbilityFactory af) { public static SpellAbility createAbilityFlip(final AbilityFactory af) {
final SpellAbility abFlip = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abFlip = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -8293336773930687488L; private static final long serialVersionUID = -8293336773930687488L;
@Override @Override
@@ -299,7 +299,7 @@ public final class AbilityFactoryClash {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createDrawbackFlip(final AbilityFactory af) { public static SpellAbility createDrawbackFlip(final AbilityFactory af) {
final SpellAbility dbFlip = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbFlip = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 8581978154811461324L; private static final long serialVersionUID = 8581978154811461324L;
@Override @Override
@@ -355,7 +355,7 @@ public final class AbilityFactoryClash {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -363,7 +363,7 @@ public final class AbilityFactoryClash {
sb.append(player).append(" flips a coin."); sb.append(player).append(" flips a coin.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -408,7 +408,7 @@ public final class AbilityFactoryClash {
if (params.containsKey("WinSubAbility")) { if (params.containsKey("WinSubAbility")) {
final SpellAbility win = afOutcomes.getAbility(host.getSVar(params.get("WinSubAbility")), host); final SpellAbility win = afOutcomes.getAbility(host.getSVar(params.get("WinSubAbility")), host);
win.setActivatingPlayer(player); win.setActivatingPlayer(player);
((Ability_Sub) win).setParent(sa); ((AbilitySub) win).setParent(sa);
AbilityFactory.resolve(win, false); AbilityFactory.resolve(win, false);
} }
@@ -420,7 +420,7 @@ public final class AbilityFactoryClash {
if (params.containsKey("LoseSubAbility")) { if (params.containsKey("LoseSubAbility")) {
final SpellAbility lose = afOutcomes.getAbility(host.getSVar(params.get("LoseSubAbility")), host); final SpellAbility lose = afOutcomes.getAbility(host.getSVar(params.get("LoseSubAbility")), host);
lose.setActivatingPlayer(player); lose.setActivatingPlayer(player);
((Ability_Sub) lose).setParent(sa); ((AbilitySub) lose).setParent(sa);
AbilityFactory.resolve(lose, false); AbilityFactory.resolve(lose, false);
} }

8
src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java
View File

@@ -2,7 +2,7 @@ package forge.card.abilityFactory;
import java.util.HashMap; import java.util.HashMap;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
// Cleanup is not the same as other AFs, it is only used as a Drawback, and only used to Cleanup particular card states // Cleanup is not the same as other AFs, it is only used as a Drawback, and only used to Cleanup particular card states
@@ -30,10 +30,10 @@ public final class AbilityFactoryCleanup {
* *
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public static Ability_Sub getDrawback(final AbilityFactory af) { public static AbilitySub getDrawback(final AbilityFactory af) {
final Ability_Sub drawback = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final AbilitySub drawback = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 6192972525033429820L; private static final long serialVersionUID = 6192972525033429820L;
@Override @Override

54
src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java
View File

@@ -13,8 +13,8 @@ import forge.Constant;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -47,7 +47,7 @@ public final class AbilityFactoryCombat {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityFog(final AbilityFactory af) { public static SpellAbility createAbilityFog(final AbilityFactory af) {
final SpellAbility abFog = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abFog = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1933592438783630254L; private static final long serialVersionUID = -1933592438783630254L;
@Override @Override
@@ -120,7 +120,7 @@ public final class AbilityFactoryCombat {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackFog(final AbilityFactory af) { public static SpellAbility createDrawbackFog(final AbilityFactory af) {
final SpellAbility dbFog = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbFog = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -5141246507533353605L; private static final long serialVersionUID = -5141246507533353605L;
@Override @Override
@@ -156,7 +156,7 @@ public final class AbilityFactoryCombat {
public static String fogStackDescription(final AbilityFactory af, final SpellAbility sa) { public static String fogStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -165,7 +165,7 @@ public final class AbilityFactoryCombat {
sb.append(sa.getSourceCard().getController()); sb.append(sa.getSourceCard().getController());
sb.append(" prevents all combat damage this turn."); sb.append(" prevents all combat damage this turn.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -203,7 +203,7 @@ public final class AbilityFactoryCombat {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
if (!subAb.chkAIDrawback()) { if (!subAb.chkAIDrawback()) {
return false; return false;
@@ -234,7 +234,7 @@ public final class AbilityFactoryCombat {
chance = AllZone.getPhase().isAfter(Constant.Phase.COMBAT_DAMAGE); chance = AllZone.getPhase().isAfter(Constant.Phase.COMBAT_DAMAGE);
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -269,7 +269,7 @@ public final class AbilityFactoryCombat {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return chance && abSub.doTrigger(mandatory); return chance && abSub.doTrigger(mandatory);
} }
@@ -312,7 +312,7 @@ public final class AbilityFactoryCombat {
* @since 1.1.01 * @since 1.1.01
*/ */
public static SpellAbility createAbilityMustAttack(final AbilityFactory af) { public static SpellAbility createAbilityMustAttack(final AbilityFactory af) {
final SpellAbility abMustAttack = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abMustAttack = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4559154732470225755L; private static final long serialVersionUID = 4559154732470225755L;
@Override @Override
@@ -381,7 +381,7 @@ public final class AbilityFactoryCombat {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackMustAttack(final AbilityFactory af) { public static SpellAbility createDrawbackMustAttack(final AbilityFactory af) {
final SpellAbility dbMustAttack = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbMustAttack = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 1294949210616598158L; private static final long serialVersionUID = 1294949210616598158L;
@Override @Override
@@ -408,7 +408,7 @@ public final class AbilityFactoryCombat {
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -438,7 +438,7 @@ public final class AbilityFactoryCombat {
} }
// begin standard post- // begin standard post-
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -458,7 +458,7 @@ public final class AbilityFactoryCombat {
// TODO - implement AI // TODO - implement AI
chance = false; chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -478,7 +478,7 @@ public final class AbilityFactoryCombat {
chance = false; chance = false;
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return chance && abSub.doTrigger(mandatory); return chance && abSub.doTrigger(mandatory);
} }
@@ -529,7 +529,7 @@ public final class AbilityFactoryCombat {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createAbilityRemoveFromCombat(final AbilityFactory af) { public static SpellAbility createAbilityRemoveFromCombat(final AbilityFactory af) {
final SpellAbility abRemCombat = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRemCombat = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -2472319390656924874L; private static final long serialVersionUID = -2472319390656924874L;
@Override @Override
@@ -598,7 +598,7 @@ public final class AbilityFactoryCombat {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRemoveFromCombat(final AbilityFactory af) { public static SpellAbility createDrawbackRemoveFromCombat(final AbilityFactory af) {
final SpellAbility dbRemCombat = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRemCombat = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 5080737903616292224L; private static final long serialVersionUID = 5080737903616292224L;
@Override @Override
@@ -624,7 +624,7 @@ public final class AbilityFactoryCombat {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -650,7 +650,7 @@ public final class AbilityFactoryCombat {
sb.append(" from combat."); sb.append(" from combat.");
// begin standard post- // begin standard post-
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -670,7 +670,7 @@ public final class AbilityFactoryCombat {
// TODO - implement AI // TODO - implement AI
chance = false; chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -691,7 +691,7 @@ public final class AbilityFactoryCombat {
chance = false; chance = false;
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return chance && abSub.doTrigger(mandatory); return chance && abSub.doTrigger(mandatory);
} }
@@ -739,7 +739,7 @@ public final class AbilityFactoryCombat {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createAbilityMustBlock(final AbilityFactory af) { public static SpellAbility createAbilityMustBlock(final AbilityFactory af) {
final SpellAbility abMustBlock = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abMustBlock = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4237190949098526123L; private static final long serialVersionUID = 4237190949098526123L;
@Override @Override
@@ -812,7 +812,7 @@ public final class AbilityFactoryCombat {
* @since 1.1.6 * @since 1.1.6
*/ */
public static SpellAbility createDrawbackMustBlock(final AbilityFactory af) { public static SpellAbility createDrawbackMustBlock(final AbilityFactory af) {
final SpellAbility dbMustBlock = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbMustBlock = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -815813765448972775L; private static final long serialVersionUID = -815813765448972775L;
@Override @Override
@@ -839,7 +839,7 @@ public final class AbilityFactoryCombat {
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -870,7 +870,7 @@ public final class AbilityFactoryCombat {
} }
// begin standard post- // begin standard post-
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -891,7 +891,7 @@ public final class AbilityFactoryCombat {
// TODO - implement AI // TODO - implement AI
chance = false; chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -967,7 +967,7 @@ public final class AbilityFactoryCombat {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return chance && abSub.doTrigger(mandatory); return chance && abSub.doTrigger(mandatory);
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java
View File

@@ -18,8 +18,8 @@ import forge.Constant.Zone;
import forge.MyRandom; import forge.MyRandom;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -54,7 +54,7 @@ public final class AbilityFactoryCopy {
*/ */
public static SpellAbility createAbilityCopyPermanent(final AbilityFactory af) { public static SpellAbility createAbilityCopyPermanent(final AbilityFactory af) {
final SpellAbility abCopyPermanent = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abCopyPermanent = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4557071554433108024L; private static final long serialVersionUID = 4557071554433108024L;
@Override @Override
@@ -123,7 +123,7 @@ public final class AbilityFactoryCopy {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackCopyPermanent(final AbilityFactory af) { public static SpellAbility createDrawbackCopyPermanent(final AbilityFactory af) {
final SpellAbility dbCopyPermanent = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbCopyPermanent = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -7725564505830285184L; private static final long serialVersionUID = -7725564505830285184L;
@Override @Override
@@ -165,7 +165,7 @@ public final class AbilityFactoryCopy {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -190,7 +190,7 @@ public final class AbilityFactoryCopy {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -302,7 +302,7 @@ public final class AbilityFactoryCopy {
// end Targeting // end Targeting
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.chkAIDrawback(); return abSub.chkAIDrawback();
} }
@@ -491,7 +491,7 @@ public final class AbilityFactoryCopy {
*/ */
public static SpellAbility createAbilityCopySpell(final AbilityFactory af) { public static SpellAbility createAbilityCopySpell(final AbilityFactory af) {
final SpellAbility abCopySpell = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abCopySpell = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5232548517225345052L; private static final long serialVersionUID = 5232548517225345052L;
@Override @Override
@@ -560,7 +560,7 @@ public final class AbilityFactoryCopy {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackCopySpell(final AbilityFactory af) { public static SpellAbility createDrawbackCopySpell(final AbilityFactory af) {
final SpellAbility dbCopySpell = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbCopySpell = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 1927508119173644632L; private static final long serialVersionUID = 1927508119173644632L;
@Override @Override
@@ -602,7 +602,7 @@ public final class AbilityFactoryCopy {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -636,7 +636,7 @@ public final class AbilityFactoryCopy {
sb.append("."); sb.append(".");
// TODO probably add an optional "You may choose new targets..." // TODO probably add an optional "You may choose new targets..."
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -676,7 +676,7 @@ public final class AbilityFactoryCopy {
final boolean randomReturn = false; final boolean randomReturn = false;
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return randomReturn && abSub.chkAIDrawback(); return randomReturn && abSub.chkAIDrawback();
} }

30
src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java
View File

@@ -10,13 +10,13 @@ import forge.MyRandom;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_StackInstance; import forge.card.spellability.SpellAbilityStackInstance;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.spellability.Target_Selection; import forge.card.spellability.TargetSelection;
//Destination - send countered spell to: (only applies to Spells; ignored for Abilities) //Destination - send countered spell to: (only applies to Spells; ignored for Abilities)
// -Graveyard (Default) // -Graveyard (Default)
@@ -77,7 +77,7 @@ public class AbilityFactoryCounterMagic {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getAbilityCounter(final AbilityFactory abilityFactory) { public final SpellAbility getAbilityCounter(final AbilityFactory abilityFactory) {
final SpellAbility abCounter = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), final SpellAbility abCounter = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
abilityFactory.getAbTgt()) { abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -3895990436431818899L; private static final long serialVersionUID = -3895990436431818899L;
@@ -153,7 +153,7 @@ public class AbilityFactoryCounterMagic {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawbackCounter(final AbilityFactory abilityFactory) { public final SpellAbility getDrawbackCounter(final AbilityFactory abilityFactory) {
final SpellAbility dbCounter = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final SpellAbility dbCounter = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -4272851734871573693L; private static final long serialVersionUID = -4272851734871573693L;
@Override @Override
@@ -226,7 +226,7 @@ public class AbilityFactoryCounterMagic {
} }
tgt.resetTargets(); tgt.resetTargets();
if (Target_Selection.matchSpellAbility(sa, topSA, tgt)) { if (TargetSelection.matchSpellAbility(sa, topSA, tgt)) {
tgt.addTarget(topSA); tgt.addTarget(topSA);
} else { } else {
return false; return false;
@@ -269,7 +269,7 @@ public class AbilityFactoryCounterMagic {
// But really it should be more picky about how it counters things // But really it should be more picky about how it counters things
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
toReturn &= subAb.chkAIDrawback(); toReturn &= subAb.chkAIDrawback();
} }
@@ -304,7 +304,7 @@ public class AbilityFactoryCounterMagic {
} }
tgt.resetTargets(); tgt.resetTargets();
if (Target_Selection.matchSpellAbility(sa, topSA, tgt)) { if (TargetSelection.matchSpellAbility(sa, topSA, tgt)) {
tgt.addTarget(topSA); tgt.addTarget(topSA);
} else { } else {
return false; return false;
@@ -348,7 +348,7 @@ public class AbilityFactoryCounterMagic {
// But really it should be more picky about how it counters things // But really it should be more picky about how it counters things
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
toReturn &= subAb.chkAIDrawback(); toReturn &= subAb.chkAIDrawback();
} }
@@ -392,7 +392,7 @@ public class AbilityFactoryCounterMagic {
continue; continue;
} }
final SpellAbility_StackInstance si = AllZone.getStack().getInstanceFromSpellAbility(tgtSA); final SpellAbilityStackInstance si = AllZone.getStack().getInstanceFromSpellAbility(tgtSA);
if (si == null) { if (si == null) {
continue; continue;
} }
@@ -427,7 +427,7 @@ public class AbilityFactoryCounterMagic {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -460,7 +460,7 @@ public class AbilityFactoryCounterMagic {
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -478,10 +478,10 @@ public class AbilityFactoryCounterMagic {
* @param srcSA * @param srcSA
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param si * @param si
* a {@link forge.card.spellability.SpellAbility_StackInstance} * a {@link forge.card.spellability.SpellAbilityStackInstance}
* object. * object.
*/ */
private void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbility_StackInstance si) { private void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbilityStackInstance si) {
AllZone.getStack().remove(si); AllZone.getStack().remove(si);
if (tgtSA.isAbility()) { if (tgtSA.isAbility()) {

76
src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java
View File

@@ -21,8 +21,8 @@ import forge.PlayerZone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -55,7 +55,7 @@ public class AbilityFactoryCounters {
*/ */
public static SpellAbility createAbilityPutCounters(final AbilityFactory af) { public static SpellAbility createAbilityPutCounters(final AbilityFactory af) {
final SpellAbility abPutCounter = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abPutCounter = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1259638699008542484L; private static final long serialVersionUID = -1259638699008542484L;
@Override @Override
@@ -129,7 +129,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackPutCounters(final AbilityFactory af) { public static SpellAbility createDrawbackPutCounters(final AbilityFactory af) {
final SpellAbility dbPutCounter = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbPutCounter = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -323471693082498224L; private static final long serialVersionUID = -323471693082498224L;
@Override @Override
@@ -171,7 +171,7 @@ public class AbilityFactoryCounters {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -216,7 +216,7 @@ public class AbilityFactoryCounters {
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -368,7 +368,7 @@ public class AbilityFactoryCounters {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -453,7 +453,7 @@ public class AbilityFactoryCounters {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -557,7 +557,7 @@ public class AbilityFactoryCounters {
abTgt.addTarget(choice); abTgt.addTarget(choice);
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
// chance &= subAb.doTrigger(mandatory); // chance &= subAb.doTrigger(mandatory);
} }
@@ -704,7 +704,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityRemoveCounters(final AbilityFactory af) { public static SpellAbility createAbilityRemoveCounters(final AbilityFactory af) {
final SpellAbility abRemCounter = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRemCounter = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 8581011868395954121L; private static final long serialVersionUID = 8581011868395954121L;
@Override @Override
@@ -778,7 +778,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRemoveCounters(final AbilityFactory af) { public static SpellAbility createDrawbackRemoveCounters(final AbilityFactory af) {
final SpellAbility spRemoveCounter = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility spRemoveCounter = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -5065591869141835456L; private static final long serialVersionUID = -5065591869141835456L;
@Override @Override
@@ -821,7 +821,7 @@ public class AbilityFactoryCounters {
final Card card = af.getHostCard(); final Card card = af.getHostCard();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(card).append(" - "); sb.append(card).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -854,7 +854,7 @@ public class AbilityFactoryCounters {
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -928,7 +928,7 @@ public class AbilityFactoryCounters {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -973,7 +973,7 @@ public class AbilityFactoryCounters {
// currently, not targeted // currently, not targeted
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -1010,7 +1010,7 @@ public class AbilityFactoryCounters {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }
@@ -1078,7 +1078,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityProliferate(final AbilityFactory af) { public static SpellAbility createAbilityProliferate(final AbilityFactory af) {
final SpellAbility abProliferate = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abProliferate = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -6617234927365102930L; private static final long serialVersionUID = -6617234927365102930L;
@Override @Override
@@ -1153,7 +1153,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackProliferate(final AbilityFactory af) { public static SpellAbility createDrawbackProliferate(final AbilityFactory af) {
final SpellAbility dbProliferate = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbProliferate = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 1265466498444897146L; private static final long serialVersionUID = 1265466498444897146L;
@Override @Override
@@ -1196,7 +1196,7 @@ public class AbilityFactoryCounters {
*/ */
private static String proliferateStackDescription(final SpellAbility sa) { private static String proliferateStackDescription(final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1205,7 +1205,7 @@ public class AbilityFactoryCounters {
sb.append(" (You choose any number of permanents and/or players with "); sb.append(" (You choose any number of permanents and/or players with ");
sb.append("counters on them, then give each another counter of a kind already there.)"); sb.append("counters on them, then give each another counter of a kind already there.)");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1224,7 +1224,7 @@ public class AbilityFactoryCounters {
*/ */
private static boolean proliferateShouldPlayAI(final SpellAbility sa) { private static boolean proliferateShouldPlayAI(final SpellAbility sa) {
boolean chance = true; boolean chance = true;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -1247,7 +1247,7 @@ public class AbilityFactoryCounters {
*/ */
private static boolean proliferateDoTriggerAI(final SpellAbility sa, final boolean mandatory) { private static boolean proliferateDoTriggerAI(final SpellAbility sa, final boolean mandatory) {
boolean chance = true; boolean chance = true;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }
@@ -1457,7 +1457,7 @@ public class AbilityFactoryCounters {
*/ */
public static SpellAbility createAbilityPutCounterAll(final AbilityFactory af) { public static SpellAbility createAbilityPutCounterAll(final AbilityFactory af) {
final SpellAbility abPutCounterAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abPutCounterAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -712473347429870385L; private static final long serialVersionUID = -712473347429870385L;
@Override @Override
@@ -1526,7 +1526,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackPutCounterAll(final AbilityFactory af) { public static SpellAbility createDrawbackPutCounterAll(final AbilityFactory af) {
final SpellAbility dbPutCounterAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbPutCounterAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -3101160929130043022L; private static final long serialVersionUID = -3101160929130043022L;
@Override @Override
@@ -1568,7 +1568,7 @@ public class AbilityFactoryCounters {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1583,7 +1583,7 @@ public class AbilityFactoryCounters {
} }
sb.append(" on each valid permanent."); sb.append(" on each valid permanent.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1692,7 +1692,7 @@ public class AbilityFactoryCounters {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -1766,7 +1766,7 @@ public class AbilityFactoryCounters {
*/ */
public static SpellAbility createAbilityRemoveCounterAll(final AbilityFactory af) { public static SpellAbility createAbilityRemoveCounterAll(final AbilityFactory af) {
final SpellAbility abRemoveCounterAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRemoveCounterAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 1189198508841846311L; private static final long serialVersionUID = 1189198508841846311L;
@Override @Override
@@ -1835,7 +1835,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRemoveCounterAll(final AbilityFactory af) { public static SpellAbility createDrawbackRemoveCounterAll(final AbilityFactory af) {
final SpellAbility dbRemoveCounterAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRemoveCounterAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 9210702927696563686L; private static final long serialVersionUID = 9210702927696563686L;
@Override @Override
@@ -1877,7 +1877,7 @@ public class AbilityFactoryCounters {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1897,7 +1897,7 @@ public class AbilityFactoryCounters {
} }
sb.append(" from each valid permanent."); sb.append(" from each valid permanent.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1987,7 +1987,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityMoveCounters(final AbilityFactory af) { public static SpellAbility createAbilityMoveCounters(final AbilityFactory af) {
final SpellAbility abMoveCounter = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abMoveCounter = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4602375375570571305L; private static final long serialVersionUID = 4602375375570571305L;
@Override @Override
@@ -2056,7 +2056,7 @@ public class AbilityFactoryCounters {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackMoveCounters(final AbilityFactory af) { public static SpellAbility createDrawbackMoveCounters(final AbilityFactory af) {
final SpellAbility dbMoveCounter = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbMoveCounter = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -9185934729634278014L; private static final long serialVersionUID = -9185934729634278014L;
@Override @Override
@@ -2099,7 +2099,7 @@ public class AbilityFactoryCounters {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -2131,7 +2131,7 @@ public class AbilityFactoryCounters {
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -2169,7 +2169,7 @@ public class AbilityFactoryCounters {
// prevent run-away activations - first time will always return true // prevent run-away activations - first time will always return true
boolean chance = false; boolean chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -2195,7 +2195,7 @@ public class AbilityFactoryCounters {
private static boolean moveCounterPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { private static boolean moveCounterPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) {
boolean chance = false; boolean chance = false;
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -2239,7 +2239,7 @@ public class AbilityFactoryCounters {
chance = true; chance = true;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }

20
src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java
View File

@@ -18,8 +18,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -67,7 +67,7 @@ public class AbilityFactoryDealDamage {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getAbility() { public final SpellAbility getAbility() {
final SpellAbility abDamage = new Ability_Activated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), final SpellAbility abDamage = new AbilityActivated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(),
this.abilityFactory.getAbTgt()) { this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -7560349014757367722L; private static final long serialVersionUID = -7560349014757367722L;
@@ -136,7 +136,7 @@ public class AbilityFactoryDealDamage {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawback() { public final SpellAbility getDrawback() {
final SpellAbility dbDealDamage = new Ability_Sub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) { final SpellAbility dbDealDamage = new AbilitySub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 7239608350643325111L; private static final long serialVersionUID = 7239608350643325111L;
@Override @Override
@@ -191,7 +191,7 @@ public class AbilityFactoryDealDamage {
tgts = sa.getTarget().getTargets(); tgts = sa.getTarget().getTargets();
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(name).append(" -"); sb.append(name).append(" -");
} }
sb.append(" "); sb.append(" ");
@@ -359,7 +359,7 @@ public class AbilityFactoryDealDamage {
} }
} }
final Ability_Sub subAb = saMe.getSubAbility(); final AbilitySub subAb = saMe.getSubAbility();
if (subAb != null) { if (subAb != null) {
rr &= subAb.chkAIDrawback(); rr &= subAb.chkAIDrawback();
} }
@@ -811,7 +811,7 @@ public class AbilityFactoryDealDamage {
*/ */
public final SpellAbility getAbilityDamageAll() { public final SpellAbility getAbilityDamageAll() {
final SpellAbility abDamageAll = new Ability_Activated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), final SpellAbility abDamageAll = new AbilityActivated(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 = AbilityFactoryDealDamage.this.abilityFactory; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory;
@@ -886,7 +886,7 @@ public class AbilityFactoryDealDamage {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawbackDamageAll() { public final SpellAbility getDrawbackDamageAll() {
final SpellAbility dbDamageAll = new Ability_Sub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) { final SpellAbility dbDamageAll = new AbilitySub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -6169562107675964474L; private static final long serialVersionUID = -6169562107675964474L;
private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory;
@@ -939,7 +939,7 @@ public class AbilityFactoryDealDamage {
sb.append(name).append(" - Deals " + dmg + " damage to " + desc); sb.append(name).append(" - Deals " + dmg + " damage to " + desc);
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1028,7 +1028,7 @@ public class AbilityFactoryDealDamage {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java
View File

@@ -20,11 +20,11 @@ import forge.MyRandom;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Restriction; import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Target; import forge.card.spellability.Target;
/** /**
@@ -55,7 +55,7 @@ public final class AbilityFactoryDebuff {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityDebuff(final AbilityFactory af) { public static SpellAbility createAbilityDebuff(final AbilityFactory af) {
final SpellAbility abDebuff = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDebuff = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 3536198601841771383L; private static final long serialVersionUID = 3536198601841771383L;
@Override @Override
@@ -124,7 +124,7 @@ public final class AbilityFactoryDebuff {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDebuff(final AbilityFactory af) { public static SpellAbility createDrawbackDebuff(final AbilityFactory af) {
final SpellAbility dbDebuff = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDebuff = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4728590185604233229L; private static final long serialVersionUID = -4728590185604233229L;
@Override @Override
@@ -194,7 +194,7 @@ public final class AbilityFactoryDebuff {
} }
if (tgtCards.size() > 0) { if (tgtCards.size() > 0) {
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -226,7 +226,7 @@ public final class AbilityFactoryDebuff {
sb.append("."); sb.append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -268,7 +268,7 @@ public final class AbilityFactoryDebuff {
} }
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final SpellAbility_Restriction restrict = sa.getRestrictions(); final SpellAbilityRestriction restrict = sa.getRestrictions();
// Phase Restrictions // Phase Restrictions
if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) { if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) {
@@ -594,7 +594,7 @@ public final class AbilityFactoryDebuff {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createAbilityDebuffAll(final AbilityFactory af) { public static SpellAbility createAbilityDebuffAll(final AbilityFactory af) {
final SpellAbility abDebuffAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDebuffAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1977027530713097149L; private static final long serialVersionUID = -1977027530713097149L;
@Override @Override
@@ -666,7 +666,7 @@ public final class AbilityFactoryDebuff {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createDrawbackDebuffAll(final AbilityFactory af) { public static SpellAbility createDrawbackDebuffAll(final AbilityFactory af) {
final SpellAbility dbDebuffAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDebuffAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 3262199296469706708L; private static final long serialVersionUID = 3262199296469706708L;
@Override @Override
@@ -856,7 +856,7 @@ public final class AbilityFactoryDebuff {
desc = params.get("DebuffAllDescription"); desc = params.get("DebuffAllDescription");
} }
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -864,7 +864,7 @@ public final class AbilityFactoryDebuff {
sb.append(desc); sb.append(desc);
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

20
src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java
View File

@@ -3,8 +3,8 @@ package forge.card.abilityFactory;
import java.util.HashMap; import java.util.HashMap;
import forge.AllZone; import forge.AllZone;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
@@ -32,7 +32,7 @@ public class AbilityFactoryDelayedTrigger {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility getAbility(final AbilityFactory af) { public static SpellAbility getAbility(final AbilityFactory af) {
final SpellAbility ability = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility ability = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -7502962478028160305L; private static final long serialVersionUID = -7502962478028160305L;
@Override @Override
@@ -97,10 +97,10 @@ public class AbilityFactoryDelayedTrigger {
* *
* @param abilityFactory * @param abilityFactory
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public static Ability_Sub getDrawback(final AbilityFactory abilityFactory) { public static AbilitySub getDrawback(final AbilityFactory abilityFactory) {
final Ability_Sub drawback = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final AbilitySub drawback = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 6192972525033429820L; private static final long serialVersionUID = 6192972525033429820L;
@Override @Override
@@ -139,8 +139,8 @@ public class AbilityFactoryDelayedTrigger {
final SpellAbility trigsa = AbilityFactoryDelayedTrigger.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 AbilitySub) {
return ((Ability_Sub) trigsa).chkAIDrawback(); return ((AbilitySub) trigsa).chkAIDrawback();
} else { } else {
return trigsa.canPlayAI(); return trigsa.canPlayAI();
} }
@@ -205,7 +205,7 @@ public class AbilityFactoryDelayedTrigger {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -217,7 +217,7 @@ public class AbilityFactoryDelayedTrigger {
sb.append(mapParams.get("TriggerDescription")); sb.append(mapParams.get("TriggerDescription"));
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

28
src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java
View File

@@ -18,8 +18,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -48,7 +48,7 @@ public class AbilityFactoryDestroy {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityDestroy(final AbilityFactory af) { public static SpellAbility createAbilityDestroy(final AbilityFactory af) {
final SpellAbility abDestroy = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDestroy = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -4153613567150919283L; private static final long serialVersionUID = -4153613567150919283L;
@Override @Override
@@ -114,10 +114,10 @@ public class AbilityFactoryDestroy {
* *
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public static Ability_Sub createDrawbackDestroy(final AbilityFactory af) { public static AbilitySub createDrawbackDestroy(final AbilityFactory af) {
final Ability_Sub dbDestroy = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final AbilitySub dbDestroy = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4153613567150919283L; private static final long serialVersionUID = -4153613567150919283L;
@Override @Override
@@ -256,7 +256,7 @@ public class AbilityFactoryDestroy {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -370,7 +370,7 @@ public class AbilityFactoryDestroy {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
return subAb.doTrigger(mandatory); return subAb.doTrigger(mandatory);
} }
@@ -409,7 +409,7 @@ public class AbilityFactoryDestroy {
tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa); tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa);
} }
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -452,7 +452,7 @@ public class AbilityFactoryDestroy {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -529,7 +529,7 @@ public class AbilityFactoryDestroy {
*/ */
public static SpellAbility createAbilityDestroyAll(final AbilityFactory af) { public static SpellAbility createAbilityDestroyAll(final AbilityFactory af) {
final SpellAbility abDestroyAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDestroyAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1376444173137861437L; private static final long serialVersionUID = -1376444173137861437L;
private final HashMap<String, String> params = af.getMapParams(); private final HashMap<String, String> params = af.getMapParams();
@@ -608,7 +608,7 @@ public class AbilityFactoryDestroy {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDestroyAll(final AbilityFactory af) { public static SpellAbility createDrawbackDestroyAll(final AbilityFactory af) {
final SpellAbility dbDestroyAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDestroyAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -242160421677518351L; private static final long serialVersionUID = -242160421677518351L;
private final HashMap<String, String> params = af.getMapParams(); private final HashMap<String, String> params = af.getMapParams();
@@ -684,7 +684,7 @@ public class AbilityFactoryDestroy {
sb.append(" They can't be regenerated"); sb.append(" They can't be regenerated");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -773,7 +773,7 @@ public class AbilityFactoryDestroy {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }

14
src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java
View File

@@ -12,8 +12,8 @@ import forge.ComputerUtil;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.MyRandom; import forge.MyRandom;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -40,7 +40,7 @@ public class AbilityFactoryEffect {
*/ */
public static SpellAbility createAbilityEffect(final AbilityFactory abilityFactory) { public static SpellAbility createAbilityEffect(final AbilityFactory abilityFactory) {
final SpellAbility abEffect = new Ability_Activated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), abilityFactory.getAbTgt()) { final SpellAbility abEffect = new AbilityActivated(abilityFactory.getHostCard(), abilityFactory.getAbCost(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 8869422603616247307L; private static final long serialVersionUID = 8869422603616247307L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -117,7 +117,7 @@ public class AbilityFactoryEffect {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackEffect(final AbilityFactory abilityFactory) { public static SpellAbility createDrawbackEffect(final AbilityFactory abilityFactory) {
final SpellAbility dbEffect = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final SpellAbility dbEffect = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 6631124959690157874L; private static final long serialVersionUID = 6631124959690157874L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -167,7 +167,7 @@ public class AbilityFactoryEffect {
public static String effectStackDescription(final AbilityFactory af, final SpellAbility sa) { public static String effectStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -175,7 +175,7 @@ public class AbilityFactoryEffect {
sb.append(sa.getDescription()); sb.append(sa.getDescription());
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -247,7 +247,7 @@ public class AbilityFactoryEffect {
// TODO: Add targeting effects // TODO: Add targeting effects
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java
View File

@@ -6,8 +6,8 @@ import forge.AllZone;
import forge.Card; import forge.Card;
import forge.ComputerUtil; import forge.ComputerUtil;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -42,7 +42,7 @@ public final class AbilityFactoryEndGameCondition {
*/ */
public static SpellAbility createAbilityWinsGame(final AbilityFactory af) { public static SpellAbility createAbilityWinsGame(final AbilityFactory af) {
final SpellAbility abWinsGame = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abWinsGame = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 8869422603616247307L; private static final long serialVersionUID = 8869422603616247307L;
@Override @Override
@@ -120,7 +120,7 @@ public final class AbilityFactoryEndGameCondition {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackWinsGame(final AbilityFactory af) { public static SpellAbility createDrawbackWinsGame(final AbilityFactory af) {
final SpellAbility dbWinsGame = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbWinsGame = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 6631124959690157874L; private static final long serialVersionUID = 6631124959690157874L;
@Override @Override
@@ -173,7 +173,7 @@ public final class AbilityFactoryEndGameCondition {
public static String winsGameStackDescription(final AbilityFactory af, final SpellAbility sa) { public static String winsGameStackDescription(final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -182,7 +182,7 @@ public final class AbilityFactoryEndGameCondition {
// Let the spell description also be the stack description // Let the spell description also be the stack description
sb.append(sa.getDescription()); sb.append(sa.getDescription());
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -236,7 +236,7 @@ public final class AbilityFactoryEndGameCondition {
// WinGame abilities usually don't have subAbilities but for // WinGame abilities usually don't have subAbilities but for
// consistency... // consistency...
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -281,7 +281,7 @@ public final class AbilityFactoryEndGameCondition {
*/ */
public static SpellAbility createAbilityLosesGame(final AbilityFactory af) { public static SpellAbility createAbilityLosesGame(final AbilityFactory af) {
final SpellAbility abLosesGame = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abLosesGame = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 8869422603616247307L; private static final long serialVersionUID = 8869422603616247307L;
@Override @Override
@@ -359,7 +359,7 @@ public final class AbilityFactoryEndGameCondition {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackLosesGame(final AbilityFactory af) { public static SpellAbility createDrawbackLosesGame(final AbilityFactory af) {
final SpellAbility dbLosesGame = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbLosesGame = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 6631124959690157874L; private static final long serialVersionUID = 6631124959690157874L;
@Override @Override
@@ -413,7 +413,7 @@ public final class AbilityFactoryEndGameCondition {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(source.getName()).append(" - "); sb.append(source.getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -433,7 +433,7 @@ public final class AbilityFactoryEndGameCondition {
sb.append("loses the game."); sb.append("loses the game.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -506,7 +506,7 @@ public final class AbilityFactoryEndGameCondition {
// WinGame abilities usually don't have subAbilities but for // WinGame abilities usually don't have subAbilities but for
// consistency... // consistency...
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }

12
src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java
View File

@@ -17,8 +17,8 @@ import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -133,7 +133,7 @@ public class AbilityFactoryGainControl {
*/ */
public final SpellAbility getAbilityGainControl() { public final SpellAbility getAbilityGainControl() {
final SpellAbility abControl = new Ability_Activated(this.hostCard, this.af.getAbCost(), this.af.getAbTgt()) { final SpellAbility abControl = new AbilityActivated(this.hostCard, this.af.getAbCost(), this.af.getAbTgt()) {
private static final long serialVersionUID = -4384705198674678831L; private static final long serialVersionUID = -4384705198674678831L;
@Override @Override
@@ -169,7 +169,7 @@ public class AbilityFactoryGainControl {
* @since 1.0.15 * @since 1.0.15
*/ */
public final SpellAbility getDrawbackGainControl() { public final SpellAbility getDrawbackGainControl() {
final SpellAbility dbControl = new Ability_Sub(this.hostCard, this.af.getAbTgt()) { final SpellAbility dbControl = new AbilitySub(this.hostCard, this.af.getAbTgt()) {
private static final long serialVersionUID = -5577742598032345880L; private static final long serialVersionUID = -5577742598032345880L;
@Override @Override
@@ -213,7 +213,7 @@ public class AbilityFactoryGainControl {
private String gainControlStackDescription(final SpellAbility sa) { private String gainControlStackDescription(final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -246,7 +246,7 @@ public class AbilityFactoryGainControl {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

92
src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java
View File

@@ -16,14 +16,14 @@ import forge.Counters;
import forge.MyRandom; import forge.MyRandom;
import forge.Player; import forge.Player;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -47,7 +47,7 @@ public class AbilityFactoryMana {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityMana(final AbilityFactory abilityFactory, final String produced) { public static SpellAbility createAbilityMana(final AbilityFactory abilityFactory, final String produced) {
final Ability_Mana abMana = new Ability_Mana(abilityFactory.getHostCard(), abilityFactory.getAbCost(), produced) { final AbilityMana abMana = new AbilityMana(abilityFactory.getHostCard(), abilityFactory.getAbCost(), produced) {
private static final long serialVersionUID = -1933592438783630254L; private static final long serialVersionUID = -1933592438783630254L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -91,7 +91,7 @@ public class AbilityFactoryMana {
// To get the mana to resolve properly, we need the spell to contain // To get the mana to resolve properly, we need the spell to contain
// an Ability_Mana // an Ability_Mana
private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false); private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false);
private Ability_Mana tmpMana = new Ability_Mana(abilityFactory.getHostCard(), this.tmp, produced) { private AbilityMana tmpMana = new AbilityMana(abilityFactory.getHostCard(), this.tmp, produced) {
private static final long serialVersionUID = 1454043766057140491L; private static final long serialVersionUID = 1454043766057140491L;
@Override @Override
@@ -133,17 +133,17 @@ public class AbilityFactoryMana {
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param produced * @param produced
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public static Ability_Sub createDrawbackMana(final AbilityFactory abilityFactory, final String produced) { public static AbilitySub createDrawbackMana(final AbilityFactory abilityFactory, final String produced) {
final Ability_Sub dbMana = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { final AbilitySub dbMana = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -5141246507533353605L; private static final long serialVersionUID = -5141246507533353605L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
// To get the mana to resolve properly, we need the spell to contain // To get the mana to resolve properly, we need the spell to contain
// an Ability_Mana // an Ability_Mana
private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false); private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false);
private Ability_Mana tmpMana = new Ability_Mana(abilityFactory.getHostCard(), this.tmp, produced) { private AbilityMana tmpMana = new AbilityMana(abilityFactory.getHostCard(), this.tmp, produced) {
private static final long serialVersionUID = 1454043766057140491L; private static final long serialVersionUID = 1454043766057140491L;
@Override @Override
@@ -201,17 +201,17 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
public static String manaStackDescription(final Ability_Mana abMana, final AbilityFactory af, final SpellAbility sa) { public static String manaStackDescription(final AbilityMana abMana, final AbilityFactory af, final SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(af.getHostCard()).append(" - "); sb.append(af.getHostCard()).append(" - ");
@@ -232,13 +232,13 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static void manaResolve(final Ability_Mana abMana, final AbilityFactory af, final SpellAbility sa) { public static void manaResolve(final AbilityMana abMana, final AbilityFactory af, final SpellAbility sa) {
// Spells are not undoable // Spells are not undoable
abMana.setUndoable(af.isAbility() && abMana.isUndoable()); abMana.setUndoable(af.isAbility() && abMana.isUndoable());
@@ -282,14 +282,14 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
private static String generatedMana(final Ability_Mana abMana, final AbilityFactory af, final SpellAbility sa) { private static String generatedMana(final AbilityMana abMana, final AbilityFactory af, final SpellAbility sa) {
// Calculate generated mana here for stack description and resolving // Calculate generated mana here for stack description and resolving
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card card = sa.getSourceCard(); final Card card = sa.getSourceCard();
@@ -299,7 +299,7 @@ public class AbilityFactoryMana {
String baseMana = abMana.mana(); String baseMana = abMana.mana();
if (baseMana.equals("Chosen")) { if (baseMana.equals("Chosen")) {
// this will only support 1 chosen color for now. // this will only support 1 chosen color for now.
baseMana = Input_PayManaCostUtil.getShortColorString(card.getChosenColor().get(0)); baseMana = InputPayManaCostUtil.getShortColorString(card.getChosenColor().get(0));
} }
if (params.containsKey("Bonus")) { if (params.containsKey("Bonus")) {
@@ -358,7 +358,7 @@ public class AbilityFactoryMana {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityManaReflected(final AbilityFactory abilityFactory, final String produced) { public static SpellAbility createAbilityManaReflected(final AbilityFactory abilityFactory, final String produced) {
final Ability_Mana abMana = new Ability_Mana(abilityFactory.getHostCard(), abilityFactory.getAbCost(), produced) { final AbilityMana abMana = new AbilityMana(abilityFactory.getHostCard(), abilityFactory.getAbCost(), produced) {
private static final long serialVersionUID = -1933592438783630254L; private static final long serialVersionUID = -1933592438783630254L;
private final AbilityFactory af = abilityFactory; private final AbilityFactory af = abilityFactory;
@@ -405,7 +405,7 @@ public class AbilityFactoryMana {
// To get the mana to resolve properly, we need the spell to contain // To get the mana to resolve properly, we need the spell to contain
// an Ability_Mana // an Ability_Mana
private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false); private Cost tmp = new Cost("0", abilityFactory.getHostCard().getName(), false);
private Ability_Mana tmpMana = new Ability_Mana(abilityFactory.getHostCard(), this.tmp, produced) { private AbilityMana tmpMana = new AbilityMana(abilityFactory.getHostCard(), this.tmp, produced) {
private static final long serialVersionUID = 1454043766057140491L; private static final long serialVersionUID = 1454043766057140491L;
@Override @Override
@@ -454,11 +454,11 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
*/ */
public static void manaReflectedResolve(final Ability_Mana abMana, final AbilityFactory af) { public static void manaReflectedResolve(final AbilityMana abMana, final AbilityFactory af) {
// Spells are not undoable // Spells are not undoable
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
abMana.setUndoable(af.isAbility() && abMana.isUndoable()); abMana.setUndoable(af.isAbility() && abMana.isUndoable());
@@ -498,7 +498,7 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param colors * @param colors
@@ -507,7 +507,7 @@ public class AbilityFactoryMana {
* a {@link java.util.ArrayList} object. * a {@link java.util.ArrayList} object.
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
public static ArrayList<String> reflectableMana(final Ability_Mana abMana, final AbilityFactory af, public static ArrayList<String> reflectableMana(final AbilityMana abMana, final AbilityFactory af,
ArrayList<String> colors, final ArrayList<Card> parents) { ArrayList<String> colors, final ArrayList<Card> parents) {
// Here's the problem with reflectable Mana. If more than one is out, // Here's the problem with reflectable Mana. If more than one is out,
// they need to Reflect each other, // they need to Reflect each other,
@@ -565,7 +565,7 @@ public class AbilityFactoryMana {
} 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) {
final String s = Input_PayManaCostUtil.getShortColorString(col); final String s = InputPayManaCostUtil.getShortColorString(col);
if (producedColors.contains(s) && !colors.contains(col)) { if (producedColors.contains(s) && !colors.contains(col)) {
colors.add(col); colors.add(col);
} }
@@ -574,16 +574,16 @@ public class AbilityFactoryMana {
colors.add(Constant.Color.COLORLESS); colors.add(Constant.Color.COLORLESS);
} }
} else if (reflectProperty.equals("Produce")) { } else if (reflectProperty.equals("Produce")) {
final ArrayList<Ability_Mana> abilities = new ArrayList<Ability_Mana>(); final ArrayList<AbilityMana> abilities = new ArrayList<AbilityMana>();
for (final Card c : cards) { for (final Card c : cards) {
abilities.addAll(c.getManaAbility()); abilities.addAll(c.getManaAbility());
} }
// currently reflected mana will ignore other reflected mana // currently reflected mana will ignore other reflected mana
// abilities // abilities
final ArrayList<Ability_Mana> reflectAbilities = new ArrayList<Ability_Mana>(); final ArrayList<AbilityMana> reflectAbilities = new ArrayList<AbilityMana>();
for (final Ability_Mana ab : abilities) { for (final AbilityMana ab : abilities) {
if (maxChoices == colors.size()) { if (maxChoices == colors.size()) {
break; break;
} }
@@ -602,7 +602,7 @@ public class AbilityFactoryMana {
} }
} }
for (final Ability_Mana ab : reflectAbilities) { for (final AbilityMana ab : reflectAbilities) {
if (maxChoices == colors.size()) { if (maxChoices == colors.size()) {
break; break;
} }
@@ -652,15 +652,15 @@ public class AbilityFactoryMana {
* @param maxChoices * @param maxChoices
* a int. * a int.
* @param ab * @param ab
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param colors * @param colors
* a {@link java.util.ArrayList} object. * a {@link java.util.ArrayList} object.
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
private static ArrayList<String> canProduce(final int maxChoices, final Ability_Mana ab, private static ArrayList<String> canProduce(final int maxChoices, final AbilityMana ab,
final ArrayList<String> colors) { final ArrayList<String> colors) {
for (final String col : Constant.Color.ONLY_COLORS) { for (final String col : Constant.Color.ONLY_COLORS) {
final String s = Input_PayManaCostUtil.getShortColorString(col); final String s = InputPayManaCostUtil.getShortColorString(col);
if (ab.canProduce(s) && !colors.contains(col)) { if (ab.canProduce(s) && !colors.contains(col)) {
colors.add(col); colors.add(col);
} }
@@ -679,7 +679,7 @@ public class AbilityFactoryMana {
* </p> * </p>
* *
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param colors * @param colors
@@ -688,7 +688,7 @@ public class AbilityFactoryMana {
* a {@link forge.Player} object. * a {@link forge.Player} object.
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
private static String generatedReflectedMana(final Ability_Mana abMana, final AbilityFactory af, private static String generatedReflectedMana(final AbilityMana abMana, final AbilityFactory af,
final ArrayList<String> colors, final Player player) { final ArrayList<String> colors, final Player player) {
// Calculate generated mana here for stack description and resolving // Calculate generated mana here for stack description and resolving
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
@@ -700,7 +700,7 @@ public class AbilityFactoryMana {
if (colors.size() == 0) { if (colors.size() == 0) {
return "0"; return "0";
} else if (colors.size() == 1) { } else if (colors.size() == 1) {
baseMana = Input_PayManaCostUtil.getShortColorString(colors.get(0)); baseMana = InputPayManaCostUtil.getShortColorString(colors.get(0));
} else { } else {
if (player.isHuman()) { if (player.isHuman()) {
final Object o = GuiUtils.getChoiceOptional("Select Mana to Produce", colors.toArray()); final Object o = GuiUtils.getChoiceOptional("Select Mana to Produce", colors.toArray());
@@ -709,11 +709,11 @@ public class AbilityFactoryMana {
abMana.setCanceled(true); abMana.setCanceled(true);
return ""; return "";
} else { } else {
baseMana = Input_PayManaCostUtil.getShortColorString((String) o); baseMana = InputPayManaCostUtil.getShortColorString((String) o);
} }
} else { } else {
// AI doesn't really have anything here yet // AI doesn't really have anything here yet
baseMana = Input_PayManaCostUtil.getShortColorString(colors.get(0)); baseMana = InputPayManaCostUtil.getShortColorString(colors.get(0));
} }
} }
@@ -748,16 +748,16 @@ public class AbilityFactoryMana {
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param abMana * @param abMana
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @param card * @param card
* a {@link forge.Card} object. * a {@link forge.Card} object.
*/ */
public static void doDrawback(final AbilityFactory af, final Ability_Mana abMana, final Card card) { public static void doDrawback(final AbilityFactory af, final AbilityMana abMana, final Card card) {
// if mana production has any type of SubAbility, undoable=false // if mana production has any type of SubAbility, undoable=false
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
abMana.setUndoable(false); abMana.setUndoable(false);
final Ability_Sub abSub = abMana.getSubAbility(); final AbilitySub abSub = abMana.getSubAbility();
AbilityFactory.resolve(abSub, false); AbilityFactory.resolve(abSub, false);
} }
} }
@@ -793,7 +793,7 @@ public class AbilityFactoryMana {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createAbilityDrainMana(final AbilityFactory af) { public static SpellAbility createAbilityDrainMana(final AbilityFactory af) {
final SpellAbility abDrainMana = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDrainMana = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5669367387381350104L; private static final long serialVersionUID = 5669367387381350104L;
@Override @Override
@@ -864,7 +864,7 @@ public class AbilityFactoryMana {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createDrawbackDrainMana(final AbilityFactory af) { public static SpellAbility createDrawbackDrainMana(final AbilityFactory af) {
final SpellAbility dbDrainMana = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDrainMana = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 1458568386420831420L; private static final long serialVersionUID = 1458568386420831420L;
@Override @Override
@@ -907,7 +907,7 @@ public class AbilityFactoryMana {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -931,7 +931,7 @@ public class AbilityFactoryMana {
sb.append(" empties his or her mana pool."); sb.append(" empties his or her mana pool.");
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -974,7 +974,7 @@ public class AbilityFactoryMana {
tgt.addTarget(AllZone.getHumanPlayer()); tgt.addTarget(AllZone.getHumanPlayer());
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -1054,7 +1054,7 @@ public class AbilityFactoryMana {
tgt.addTarget(AllZone.getHumanPlayer()); tgt.addTarget(AllZone.getHumanPlayer());
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }

68
src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java
View File

@@ -19,8 +19,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -50,7 +50,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityUntap(final AbilityFactory af) { public static SpellAbility createAbilityUntap(final AbilityFactory af) {
final SpellAbility abUntap = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abUntap = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5445572699000471299L; private static final long serialVersionUID = 5445572699000471299L;
@Override @Override
@@ -119,7 +119,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackUntap(final AbilityFactory af) { public static SpellAbility createDrawbackUntap(final AbilityFactory af) {
final SpellAbility dbUntap = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbUntap = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -163,7 +163,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card hostCard = sa.getSourceCard(); final Card hostCard = sa.getSourceCard();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -193,7 +193,7 @@ public class AbilityFactoryPermanentState {
} }
sb.append("."); sb.append(".");
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -235,7 +235,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -314,7 +314,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -613,7 +613,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityTap(final AbilityFactory af) { public static SpellAbility createAbilityTap(final AbilityFactory af) {
final SpellAbility abTap = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abTap = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5445572699000471299L; private static final long serialVersionUID = 5445572699000471299L;
@Override @Override
@@ -682,7 +682,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackTap(final AbilityFactory af) { public static SpellAbility createDrawbackTap(final AbilityFactory af) {
final SpellAbility dbTap = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbTap = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -725,7 +725,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card hostCard = sa.getSourceCard(); final Card hostCard = sa.getSourceCard();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -751,7 +751,7 @@ public class AbilityFactoryPermanentState {
sb.append("."); sb.append(".");
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -811,7 +811,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -888,7 +888,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -1134,7 +1134,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityUntapAll(final AbilityFactory af) { public static SpellAbility createAbilityUntapAll(final AbilityFactory af) {
final SpellAbility abUntap = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abUntap = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 8914852730903389831L; private static final long serialVersionUID = 8914852730903389831L;
@Override @Override
@@ -1203,7 +1203,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackUntapAll(final AbilityFactory af) { public static SpellAbility createDrawbackUntapAll(final AbilityFactory af) {
final SpellAbility dbUntapAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbUntapAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -5187900994680626766L; private static final long serialVersionUID = -5187900994680626766L;
@Override @Override
@@ -1346,7 +1346,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
sb.append("Untap all valid cards."); sb.append("Untap all valid cards.");
} else { } else {
@@ -1354,7 +1354,7 @@ public class AbilityFactoryPermanentState {
sb.append(params.get("SpellDescription")); sb.append(params.get("SpellDescription"));
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -1375,7 +1375,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityTapAll(final AbilityFactory af) { public static SpellAbility createAbilityTapAll(final AbilityFactory af) {
final SpellAbility abUntap = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abUntap = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -2095140656782946737L; private static final long serialVersionUID = -2095140656782946737L;
@Override @Override
@@ -1444,7 +1444,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackTapAll(final AbilityFactory af) { public static SpellAbility createDrawbackTapAll(final AbilityFactory af) {
final SpellAbility dbTap = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbTap = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -1609,7 +1609,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
sb.append("Tap all valid cards."); sb.append("Tap all valid cards.");
} else { } else {
@@ -1617,7 +1617,7 @@ public class AbilityFactoryPermanentState {
sb.append(params.get("SpellDescription")); sb.append(params.get("SpellDescription"));
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -1713,7 +1713,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityTapOrUntap(final AbilityFactory af) { public static SpellAbility createAbilityTapOrUntap(final AbilityFactory af) {
final SpellAbility abTapOrUntap = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abTapOrUntap = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -4713183763302932079L; private static final long serialVersionUID = -4713183763302932079L;
@Override @Override
@@ -1782,7 +1782,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackTapOrUntap(final AbilityFactory af) { public static SpellAbility createDrawbackTapOrUntap(final AbilityFactory af) {
final SpellAbility dbTapOrUntap = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbTapOrUntap = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -8282868583712773337L; private static final long serialVersionUID = -8282868583712773337L;
@Override @Override
@@ -1826,7 +1826,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -1852,7 +1852,7 @@ public class AbilityFactoryPermanentState {
sb.append("."); sb.append(".");
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -1902,7 +1902,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -1979,7 +1979,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -2048,7 +2048,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityPhases(final AbilityFactory af) { public static SpellAbility createAbilityPhases(final AbilityFactory af) {
final SpellAbility abPhases = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abPhases = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5445572699000471299L; private static final long serialVersionUID = 5445572699000471299L;
@Override @Override
@@ -2117,7 +2117,7 @@ public class AbilityFactoryPermanentState {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackPhases(final AbilityFactory af) { public static SpellAbility createDrawbackPhases(final AbilityFactory af) {
final SpellAbility dbPhases = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbPhases = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -2161,7 +2161,7 @@ public class AbilityFactoryPermanentState {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -2184,7 +2184,7 @@ public class AbilityFactoryPermanentState {
} }
sb.append(" Phases Out."); sb.append(" Phases Out.");
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
sb.append(subAb.getStackDescription()); sb.append(subAb.getStackDescription());
} }
@@ -2230,7 +2230,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -2297,7 +2297,7 @@ public class AbilityFactoryPermanentState {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }

16
src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java
View File

@@ -17,8 +17,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -48,7 +48,7 @@ public class AbilityFactoryPreventDamage {
*/ */
public static SpellAbility getAbilityPreventDamage(final AbilityFactory af) { public static SpellAbility getAbilityPreventDamage(final AbilityFactory af) {
final SpellAbility abRegenerate = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRegenerate = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -6581723619801399347L; private static final long serialVersionUID = -6581723619801399347L;
@Override @Override
@@ -120,7 +120,7 @@ public class AbilityFactoryPreventDamage {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackPreventDamage(final AbilityFactory af) { public static SpellAbility createDrawbackPreventDamage(final AbilityFactory af) {
final SpellAbility dbRegen = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRegen = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -2295483806708528744L; private static final long serialVersionUID = -2295483806708528744L;
@Override @Override
@@ -170,7 +170,7 @@ public class AbilityFactoryPreventDamage {
tgts = sa.getTarget().getTargets(); tgts = sa.getTarget().getTargets();
} }
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -208,7 +208,7 @@ public class AbilityFactoryPreventDamage {
} }
sb.append(" this turn."); sb.append(" this turn.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -344,7 +344,7 @@ public class AbilityFactoryPreventDamage {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -381,7 +381,7 @@ public class AbilityFactoryPreventDamage {
chance = AbilityFactoryPreventDamage.preventDamageMandatoryTarget(af, sa, mandatory); chance = AbilityFactoryPreventDamage.preventDamageMandatoryTarget(af, sa, mandatory);
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }

20
src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java
View File

@@ -21,8 +21,8 @@ import forge.Constant.Zone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -84,7 +84,7 @@ public final class AbilityFactoryProtection {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityProtection(final AbilityFactory af) { public static SpellAbility createAbilityProtection(final AbilityFactory af) {
final SpellAbility abProtect = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abProtect = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -5295298887428747473L; private static final long serialVersionUID = -5295298887428747473L;
@Override @Override
@@ -122,7 +122,7 @@ public final class AbilityFactoryProtection {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackProtection(final AbilityFactory af) { public static SpellAbility createDrawbackProtection(final AbilityFactory af) {
final SpellAbility dbProtect = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbProtect = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 8342800124705819366L; private static final long serialVersionUID = 8342800124705819366L;
@Override @Override
@@ -590,7 +590,7 @@ public final class AbilityFactoryProtection {
if (tgtCards.size() > 0) { if (tgtCards.size() > 0) {
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -649,7 +649,7 @@ public final class AbilityFactoryProtection {
sb.append("."); sb.append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -849,7 +849,7 @@ public final class AbilityFactoryProtection {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityProtectionAll(final AbilityFactory af) { public static SpellAbility createAbilityProtectionAll(final AbilityFactory af) {
final SpellAbility abProtectAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abProtectAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -8491026929105907288L; private static final long serialVersionUID = -8491026929105907288L;
@Override @Override
@@ -887,7 +887,7 @@ public final class AbilityFactoryProtection {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackProtectionAll(final AbilityFactory af) { public static SpellAbility createDrawbackProtectionAll(final AbilityFactory af) {
final SpellAbility dbProtectAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbProtectAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 5096939345199247701L; private static final long serialVersionUID = 5096939345199247701L;
@Override @Override
@@ -1022,7 +1022,7 @@ public final class AbilityFactoryProtection {
if (tgtCards.size() > 0) { if (tgtCards.size() > 0) {
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -1039,7 +1039,7 @@ public final class AbilityFactoryProtection {
} }
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

24
src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java
View File

@@ -20,11 +20,11 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Restriction; import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Target; import forge.card.spellability.Target;
/** /**
@@ -123,7 +123,7 @@ public class AbilityFactoryPump {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getAbilityPump() { public final SpellAbility getAbilityPump() {
final SpellAbility abPump = new Ability_Activated(this.hostCard, this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) { final SpellAbility abPump = new AbilityActivated(this.hostCard, this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -1118592153328758083L; private static final long serialVersionUID = -1118592153328758083L;
@Override @Override
@@ -159,7 +159,7 @@ public class AbilityFactoryPump {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawbackPump() { public final SpellAbility getDrawbackPump() {
final SpellAbility dbPump = new Ability_Sub(this.hostCard, this.abilityFactory.getAbTgt()) { final SpellAbility dbPump = new AbilitySub(this.hostCard, this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 42244224L; private static final long serialVersionUID = 42244224L;
@Override @Override
@@ -420,7 +420,7 @@ public class AbilityFactoryPump {
return false; return false;
} }
final SpellAbility_Restriction restrict = sa.getRestrictions(); final SpellAbilityRestriction restrict = sa.getRestrictions();
// Phase Restrictions // Phase Restrictions
if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) { if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) {
@@ -796,7 +796,7 @@ public class AbilityFactoryPump {
if (tgtCards.size() > 0) { if (tgtCards.size() > 0) {
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(name).append(" - "); sb.append(name).append(" - ");
@@ -844,7 +844,7 @@ public class AbilityFactoryPump {
} }
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -967,7 +967,7 @@ public class AbilityFactoryPump {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getAbilityPumpAll() { public final SpellAbility getAbilityPumpAll() {
final SpellAbility abPumpAll = new Ability_Activated(this.hostCard, this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) { final SpellAbility abPumpAll = new AbilityActivated(this.hostCard, this.abilityFactory.getAbCost(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = -8299417521903307630L; private static final long serialVersionUID = -8299417521903307630L;
@Override @Override
@@ -1033,7 +1033,7 @@ public class AbilityFactoryPump {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawbackPumpAll() { public final SpellAbility getDrawbackPumpAll() {
final SpellAbility dbPumpAll = new Ability_Sub(this.hostCard, this.abilityFactory.getAbTgt()) { final SpellAbility dbPumpAll = new AbilitySub(this.hostCard, this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 6411531984691660342L; private static final long serialVersionUID = 6411531984691660342L;
@Override @Override
@@ -1280,14 +1280,14 @@ public class AbilityFactoryPump {
desc = this.params.get("PumpAllDescription"); desc = this.params.get("PumpAllDescription");
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
} }
sb.append(desc); sb.append(desc);
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

28
src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java
View File

@@ -17,8 +17,8 @@ import forge.Constant.Zone;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -52,7 +52,7 @@ public class AbilityFactoryRegenerate {
*/ */
public static SpellAbility getAbilityRegenerate(final AbilityFactory af) { public static SpellAbility getAbilityRegenerate(final AbilityFactory af) {
final SpellAbility abRegenerate = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRegenerate = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -6386981911243700037L; private static final long serialVersionUID = -6386981911243700037L;
@Override @Override
@@ -124,7 +124,7 @@ public class AbilityFactoryRegenerate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRegenerate(final AbilityFactory af) { public static SpellAbility createDrawbackRegenerate(final AbilityFactory af) {
final SpellAbility dbRegen = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRegen = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -2295483806708528744L; private static final long serialVersionUID = -2295483806708528744L;
@Override @Override
@@ -176,7 +176,7 @@ public class AbilityFactoryRegenerate {
} }
if (tgtCards.size() > 0) { if (tgtCards.size() > 0) {
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -199,7 +199,7 @@ public class AbilityFactoryRegenerate {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -312,7 +312,7 @@ public class AbilityFactoryRegenerate {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -348,7 +348,7 @@ public class AbilityFactoryRegenerate {
chance = AbilityFactoryRegenerate.regenMandatoryTarget(af, sa, mandatory); chance = AbilityFactoryRegenerate.regenMandatoryTarget(af, sa, mandatory);
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }
@@ -482,7 +482,7 @@ public class AbilityFactoryRegenerate {
*/ */
public static SpellAbility getAbilityRegenerateAll(final AbilityFactory af) { public static SpellAbility getAbilityRegenerateAll(final AbilityFactory af) {
final SpellAbility abRegenerateAll = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRegenerateAll = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -3001272997209059394L; private static final long serialVersionUID = -3001272997209059394L;
@Override @Override
@@ -554,7 +554,7 @@ public class AbilityFactoryRegenerate {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRegenerateAll(final AbilityFactory af) { public static SpellAbility createDrawbackRegenerateAll(final AbilityFactory af) {
final SpellAbility dbRegenAll = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRegenAll = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 4777861790603705572L; private static final long serialVersionUID = 4777861790603705572L;
@Override @Override
@@ -597,7 +597,7 @@ public class AbilityFactoryRegenerate {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard(); final Card host = af.getHostCard();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -612,7 +612,7 @@ public class AbilityFactoryRegenerate {
sb.append(desc); sb.append(desc);
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -686,7 +686,7 @@ public class AbilityFactoryRegenerate {
chance = true; chance = true;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -715,7 +715,7 @@ public class AbilityFactoryRegenerate {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.doTrigger(mandatory); chance &= subAb.doTrigger(mandatory);
} }

66
src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java
View File

@@ -22,8 +22,8 @@ import forge.Player;
import forge.PlayerZone; import forge.PlayerZone;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -58,7 +58,7 @@ public final class AbilityFactoryReveal {
*/ */
public static SpellAbility createAbilityDig(final AbilityFactory af) { public static SpellAbility createAbilityDig(final AbilityFactory af) {
final SpellAbility abDig = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDig = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4239474096624403497L; private static final long serialVersionUID = 4239474096624403497L;
@Override @Override
@@ -127,7 +127,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDig(final AbilityFactory af) { public static SpellAbility createDrawbackDig(final AbilityFactory af) {
final SpellAbility dbDig = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDig = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -3372788479421357024L; private static final long serialVersionUID = -3372788479421357024L;
@Override @Override
@@ -171,7 +171,7 @@ public final class AbilityFactoryReveal {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int numToDig = AbilityFactory.calculateAmount(af.getHostCard(), params.get("DigNum"), sa); final int numToDig = AbilityFactory.calculateAmount(af.getHostCard(), params.get("DigNum"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -201,7 +201,7 @@ public final class AbilityFactoryReveal {
} }
sb.append("library."); sb.append("library.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -259,7 +259,7 @@ public final class AbilityFactoryReveal {
} }
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return randomReturn && abSub.chkAIDrawback(); return randomReturn && abSub.chkAIDrawback();
} }
@@ -592,7 +592,7 @@ public final class AbilityFactoryReveal {
*/ */
public static SpellAbility createAbilityDigUntil(final AbilityFactory af) { public static SpellAbility createAbilityDigUntil(final AbilityFactory af) {
final SpellAbility abDig = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDig = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4239474096624403497L; private static final long serialVersionUID = 4239474096624403497L;
@Override @Override
@@ -661,7 +661,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDigUntil(final AbilityFactory af) { public static SpellAbility createDrawbackDigUntil(final AbilityFactory af) {
final SpellAbility dbDig = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDig = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -3372788479421357024L; private static final long serialVersionUID = -3372788479421357024L;
@Override @Override
@@ -714,7 +714,7 @@ public final class AbilityFactoryReveal {
untilAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Amount"), sa); untilAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Amount"), sa);
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(host).append(" - "); sb.append(host).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -763,7 +763,7 @@ public final class AbilityFactoryReveal {
} }
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -811,7 +811,7 @@ public final class AbilityFactoryReveal {
} }
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return randomReturn && abSub.chkAIDrawback(); return randomReturn && abSub.chkAIDrawback();
} }
@@ -951,7 +951,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityRevealHand(final AbilityFactory af) { public static SpellAbility createAbilityRevealHand(final AbilityFactory af) {
final SpellAbility abRevealHand = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abRevealHand = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 2785654059206102004L; private static final long serialVersionUID = 2785654059206102004L;
@Override @Override
@@ -1020,7 +1020,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackRevealHand(final AbilityFactory af) { public static SpellAbility createDrawbackRevealHand(final AbilityFactory af) {
final SpellAbility dbRevealHand = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbRevealHand = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -6079668770576878801L; private static final long serialVersionUID = -6079668770576878801L;
@Override @Override
@@ -1064,7 +1064,7 @@ public final class AbilityFactoryReveal {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1090,7 +1090,7 @@ public final class AbilityFactoryReveal {
} }
sb.append("hand."); sb.append("hand.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1147,7 +1147,7 @@ public final class AbilityFactoryReveal {
randomReturn = true; randomReturn = true;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -1216,7 +1216,7 @@ public final class AbilityFactoryReveal {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -1286,7 +1286,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityScry(final AbilityFactory af) { public static SpellAbility createAbilityScry(final AbilityFactory af) {
final SpellAbility abScry = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abScry = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 2631175859655699419L; private static final long serialVersionUID = 2631175859655699419L;
@Override @Override
@@ -1355,7 +1355,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackScry(final AbilityFactory af) { public static SpellAbility createDrawbackScry(final AbilityFactory af) {
final SpellAbility dbScry = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbScry = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 7763043327497404630L; private static final long serialVersionUID = 7763043327497404630L;
@Override @Override
@@ -1476,7 +1476,7 @@ public final class AbilityFactoryReveal {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1502,7 +1502,7 @@ public final class AbilityFactoryReveal {
sb.append("scrys (").append(num).append(")."); sb.append("scrys (").append(num).append(").");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1538,7 +1538,7 @@ public final class AbilityFactoryReveal {
} }
if (af.hasSubAbility()) { if (af.hasSubAbility()) {
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return randomReturn && abSub.chkAIDrawback(); return randomReturn && abSub.chkAIDrawback();
} }
@@ -1560,7 +1560,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createRearrangeTopOfLibraryAbility(final AbilityFactory af) { public static SpellAbility createRearrangeTopOfLibraryAbility(final AbilityFactory af) {
final SpellAbility rtolAbility = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility rtolAbility = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -548494891203983219L; private static final long serialVersionUID = -548494891203983219L;
@Override @Override
@@ -1636,7 +1636,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createRearrangeTopOfLibraryDrawback(final AbilityFactory af) { public static SpellAbility createRearrangeTopOfLibraryDrawback(final AbilityFactory af) {
final SpellAbility dbDraw = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDraw = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -777856059960750319L; private static final long serialVersionUID = -777856059960750319L;
@Override @Override
@@ -1693,7 +1693,7 @@ public final class AbilityFactoryReveal {
shuffle = params.containsKey("MayShuffle"); shuffle = params.containsKey("MayShuffle");
final StringBuilder ret = new StringBuilder(); final StringBuilder ret = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
ret.append(af.getHostCard().getName()); ret.append(af.getHostCard().getName());
ret.append(" - "); ret.append(" - ");
} }
@@ -1756,7 +1756,7 @@ public final class AbilityFactoryReveal {
// if it's just defined, no big deal // if it's just defined, no big deal
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -1870,7 +1870,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityReveal(final AbilityFactory af) { public static SpellAbility createAbilityReveal(final AbilityFactory af) {
final SpellAbility abReveal = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abReveal = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -4417404703197532765L; private static final long serialVersionUID = -4417404703197532765L;
@Override @Override
@@ -1939,7 +1939,7 @@ public final class AbilityFactoryReveal {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackReveal(final AbilityFactory af) { public static SpellAbility createDrawbackReveal(final AbilityFactory af) {
final SpellAbility dbReveal = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbReveal = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -8059731932417441449L; private static final long serialVersionUID = -8059731932417441449L;
@Override @Override
@@ -1984,7 +1984,7 @@ public final class AbilityFactoryReveal {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
@@ -2014,7 +2014,7 @@ public final class AbilityFactoryReveal {
sb.append("Error - no target players for RevealHand. "); sb.append("Error - no target players for RevealHand. ");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -2072,7 +2072,7 @@ public final class AbilityFactoryReveal {
randomReturn = true; randomReturn = true;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -2102,7 +2102,7 @@ public final class AbilityFactoryReveal {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }

28
src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java
View File

@@ -17,8 +17,8 @@ import forge.PlayerUtil;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -46,7 +46,7 @@ public class AbilityFactorySacrifice {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilitySacrifice(final AbilityFactory af) { public static SpellAbility createAbilitySacrifice(final AbilityFactory af) {
final SpellAbility abSacrifice = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abSacrifice = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1933592438783630254L; private static final long serialVersionUID = -1933592438783630254L;
@Override @Override
@@ -113,7 +113,7 @@ public class AbilityFactorySacrifice {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackSacrifice(final AbilityFactory af) { public static SpellAbility createDrawbackSacrifice(final AbilityFactory af) {
final SpellAbility dbSacrifice = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbSacrifice = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -5141246507533353605L; private static final long serialVersionUID = -5141246507533353605L;
@Override @Override
@@ -154,7 +154,7 @@ public class AbilityFactorySacrifice {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -200,7 +200,7 @@ public class AbilityFactorySacrifice {
sb.append("Sacrifices ").append(amount).append(" ").append(msg).append("."); sb.append("Sacrifices ").append(amount).append(" ").append(msg).append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -257,7 +257,7 @@ public class AbilityFactorySacrifice {
} }
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -282,7 +282,7 @@ public class AbilityFactorySacrifice {
// TODO: restrict the subAbility a bit // TODO: restrict the subAbility a bit
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -318,7 +318,7 @@ public class AbilityFactorySacrifice {
// Eventually, we can call the trigger of ETB abilities with not // Eventually, we can call the trigger of ETB abilities with not
// mandatory as part of the checks to cast something // mandatory as part of the checks to cast something
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }
@@ -552,7 +552,7 @@ public class AbilityFactorySacrifice {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createAbilitySacrificeAll(final AbilityFactory af) { public static SpellAbility createAbilitySacrificeAll(final AbilityFactory af) {
final SpellAbility abSacrifice = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abSacrifice = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1933592438783630254L; private static final long serialVersionUID = -1933592438783630254L;
@Override @Override
@@ -621,7 +621,7 @@ public class AbilityFactorySacrifice {
* @since 1.0.15 * @since 1.0.15
*/ */
public static SpellAbility createDrawbackSacrificeAll(final AbilityFactory af) { public static SpellAbility createDrawbackSacrificeAll(final AbilityFactory af) {
final SpellAbility dbSacrifice = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbSacrifice = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -5141246507533353605L; private static final long serialVersionUID = -5141246507533353605L;
@Override @Override
@@ -666,7 +666,7 @@ public class AbilityFactorySacrifice {
final Card host = af.getHostCard(); final Card host = af.getHostCard();
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host).append(" - "); sb.append(host).append(" - ");
@@ -688,7 +688,7 @@ public class AbilityFactorySacrifice {
sb.append("Sacrifice permanents."); sb.append("Sacrifice permanents.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -764,7 +764,7 @@ public class AbilityFactorySacrifice {
return false; return false;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
chance &= subAb.chkAIDrawback(); chance &= subAb.chkAIDrawback();
} }

10
src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java
View File

@@ -15,8 +15,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -134,7 +134,7 @@ public class AbilityFactoryToken extends AbilityFactory {
*/ */
public final SpellAbility getAbility() { public final SpellAbility getAbility() {
final SpellAbility abToken = new Ability_Activated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(), final SpellAbility abToken = new AbilityActivated(this.abilityFactory.getHostCard(), this.abilityFactory.getAbCost(),
this.abilityFactory.getAbTgt()) { this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 8460074843405764620L; private static final long serialVersionUID = 8460074843405764620L;
@@ -200,7 +200,7 @@ public class AbilityFactoryToken extends AbilityFactory {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public final SpellAbility getDrawback() { public final SpellAbility getDrawback() {
final SpellAbility dbDealDamage = new Ability_Sub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) { final SpellAbility dbDealDamage = new AbilitySub(this.abilityFactory.getHostCard(), this.abilityFactory.getAbTgt()) {
private static final long serialVersionUID = 7239608350643325111L; private static final long serialVersionUID = 7239608350643325111L;
@Override @Override
@@ -374,7 +374,7 @@ public class AbilityFactoryToken extends AbilityFactory {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
sb.append(" "); sb.append(" ");
} else { } else {
sb.append(host.getName()).append(" - "); sb.append(host.getName()).append(" - ");

12
src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java
View File

@@ -5,8 +5,8 @@ import java.util.HashMap;
import forge.AllZone; import forge.AllZone;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -36,7 +36,7 @@ public class AbilityFactoryTurns {
*/ */
public static SpellAbility createAbilityAddTurn(final AbilityFactory af) { public static SpellAbility createAbilityAddTurn(final AbilityFactory af) {
final SpellAbility abAddTurn = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abAddTurn = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -3526200766738015688L; private static final long serialVersionUID = -3526200766738015688L;
@Override @Override
@@ -105,7 +105,7 @@ public class AbilityFactoryTurns {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackAddTurn(final AbilityFactory af) { public static SpellAbility createDrawbackAddTurn(final AbilityFactory af) {
final SpellAbility dbAddTurn = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbAddTurn = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -562517287448810951L; private static final long serialVersionUID = -562517287448810951L;
@Override @Override
@@ -148,7 +148,7 @@ public class AbilityFactoryTurns {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final int numTurns = AbilityFactory.calculateAmount(af.getHostCard(), params.get("NumTurns"), sa); final int numTurns = AbilityFactory.calculateAmount(af.getHostCard(), params.get("NumTurns"), sa);
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - "); sb.append(sa.getSourceCard()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -179,7 +179,7 @@ public class AbilityFactoryTurns {
} }
sb.append(" after this one."); sb.append(" after this one.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }

58
src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java
View File

@@ -19,8 +19,8 @@ import forge.Player;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.CostUtil; import forge.card.cost.CostUtil;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
@@ -49,7 +49,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityDraw(final AbilityFactory af) { public static SpellAbility createAbilityDraw(final AbilityFactory af) {
final SpellAbility abDraw = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDraw = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5445572699000471299L; private static final long serialVersionUID = 5445572699000471299L;
@Override @Override
@@ -118,7 +118,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDraw(final AbilityFactory af) { public static SpellAbility createDrawbackDraw(final AbilityFactory af) {
final SpellAbility dbDraw = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDraw = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -160,7 +160,7 @@ public class AbilityFactoryZoneAffecting {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -210,7 +210,7 @@ public class AbilityFactoryZoneAffecting {
sb.append("."); sb.append(".");
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -295,7 +295,7 @@ public class AbilityFactoryZoneAffecting {
randomReturn = true; randomReturn = true;
} }
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -337,7 +337,7 @@ public class AbilityFactoryZoneAffecting {
final String num = params.get("NumCards"); final String num = params.get("NumCards");
if ((num != null) && num.equals("X") && source.getSVar(num).equals("Count$xPaid")) { if ((num != null) && num.equals("X") && source.getSVar(num).equals("Count$xPaid")) {
// Set PayX here to maximum value. // Set PayX here to maximum value.
if (sa instanceof Ability_Sub) { if (sa instanceof AbilitySub) {
numCards = Integer.parseInt(source.getSVar("PayX")); numCards = Integer.parseInt(source.getSVar("PayX"));
} else { } else {
numCards = ComputerUtil.determineLeftoverMana(sa); numCards = ComputerUtil.determineLeftoverMana(sa);
@@ -389,7 +389,7 @@ public class AbilityFactoryZoneAffecting {
} else { } else {
// Don't draw too many cards and then risk discarding cards // Don't draw too many cards and then risk discarding cards
// at EOT // at EOT
if (!(params.containsKey("NextUpkeep") || (sa instanceof Ability_Sub)) && !mandatory) { if (!(params.containsKey("NextUpkeep") || (sa instanceof AbilitySub)) && !mandatory) {
return false; return false;
} }
} }
@@ -419,7 +419,7 @@ public class AbilityFactoryZoneAffecting {
&& AllZone.getPhase().getPlayerTurn().isComputer()) { && AllZone.getPhase().getPlayerTurn().isComputer()) {
// Don't draw too many cards and then risk discarding cards at // Don't draw too many cards and then risk discarding cards at
// EOT // EOT
if (!(params.containsKey("NextUpkeep") || (sa instanceof Ability_Sub)) && !mandatory) { if (!(params.containsKey("NextUpkeep") || (sa instanceof AbilitySub)) && !mandatory) {
return false; return false;
} }
} }
@@ -450,7 +450,7 @@ public class AbilityFactoryZoneAffecting {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -545,7 +545,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityMill(final AbilityFactory af) { public static SpellAbility createAbilityMill(final AbilityFactory af) {
final SpellAbility abMill = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abMill = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 5445572699000471299L; private static final long serialVersionUID = 5445572699000471299L;
@Override @Override
@@ -614,7 +614,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackMill(final AbilityFactory af) { public static SpellAbility createDrawbackMill(final AbilityFactory af) {
final SpellAbility dbMill = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbMill = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = -4990932993654533449L; private static final long serialVersionUID = -4990932993654533449L;
@Override @Override
@@ -666,7 +666,7 @@ public class AbilityFactoryZoneAffecting {
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa); tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -694,7 +694,7 @@ public class AbilityFactoryZoneAffecting {
} }
sb.append(" from the top of his or her library."); sb.append(" from the top of his or her library.");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -858,7 +858,7 @@ public class AbilityFactoryZoneAffecting {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.chkAIDrawback(); return abSub.chkAIDrawback();
} }
@@ -886,7 +886,7 @@ public class AbilityFactoryZoneAffecting {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }
@@ -969,7 +969,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityDiscard(final AbilityFactory af) { public static SpellAbility createAbilityDiscard(final AbilityFactory af) {
final SpellAbility abDiscard = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abDiscard = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = 4348585353456736817L; private static final long serialVersionUID = 4348585353456736817L;
@Override @Override
@@ -1038,7 +1038,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackDiscard(final AbilityFactory af) { public static SpellAbility createDrawbackDiscard(final AbilityFactory af) {
final SpellAbility dbDiscard = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbDiscard = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 4348585353456736817L; private static final long serialVersionUID = 4348585353456736817L;
@Override @Override
@@ -1250,7 +1250,7 @@ public class AbilityFactoryZoneAffecting {
tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa); tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);
} }
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1307,7 +1307,7 @@ public class AbilityFactoryZoneAffecting {
} }
} }
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1419,7 +1419,7 @@ public class AbilityFactoryZoneAffecting {
// some other variables here, like handsize vs. maxHandSize // some other variables here, like handsize vs. maxHandSize
final Ability_Sub subAb = sa.getSubAbility(); final AbilitySub subAb = sa.getSubAbility();
if (subAb != null) { if (subAb != null) {
randomReturn &= subAb.chkAIDrawback(); randomReturn &= subAb.chkAIDrawback();
} }
@@ -1491,10 +1491,10 @@ public class AbilityFactoryZoneAffecting {
* @param af * @param af
* a {@link forge.card.abilityFactory.AbilityFactory} object. * a {@link forge.card.abilityFactory.AbilityFactory} object.
* @param subAb * @param subAb
* a {@link forge.card.spellability.Ability_Sub} object. * a {@link forge.card.spellability.AbilitySub} object.
* @return a boolean. * @return a boolean.
*/ */
private static boolean discardCheckDrawbackAI(final AbilityFactory af, final Ability_Sub subAb) { private static boolean discardCheckDrawbackAI(final AbilityFactory af, final AbilitySub subAb) {
// Drawback AI improvements // Drawback AI improvements
// 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();
@@ -1519,7 +1519,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createAbilityShuffle(final AbilityFactory af) { public static SpellAbility createAbilityShuffle(final AbilityFactory af) {
final SpellAbility abShuffle = new Ability_Activated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) { final SpellAbility abShuffle = new AbilityActivated(af.getHostCard(), af.getAbCost(), af.getAbTgt()) {
private static final long serialVersionUID = -1245185178904838198L; private static final long serialVersionUID = -1245185178904838198L;
@Override @Override
@@ -1588,7 +1588,7 @@ public class AbilityFactoryZoneAffecting {
* @return a {@link forge.card.spellability.SpellAbility} object. * @return a {@link forge.card.spellability.SpellAbility} object.
*/ */
public static SpellAbility createDrawbackShuffle(final AbilityFactory af) { public static SpellAbility createDrawbackShuffle(final AbilityFactory af) {
final SpellAbility dbShuffle = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { final SpellAbility dbShuffle = new AbilitySub(af.getHostCard(), af.getAbTgt()) {
private static final long serialVersionUID = 5974307947494280639L; private static final long serialVersionUID = 5974307947494280639L;
@Override @Override
@@ -1630,7 +1630,7 @@ public class AbilityFactoryZoneAffecting {
final HashMap<String, String> params = af.getMapParams(); final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (!(sa instanceof Ability_Sub)) { if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - "); sb.append(sa.getSourceCard().getName()).append(" - ");
} else { } else {
sb.append(" "); sb.append(" ");
@@ -1669,7 +1669,7 @@ public class AbilityFactoryZoneAffecting {
} }
sb.append("."); sb.append(".");
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
sb.append(abSub.getStackDescription()); sb.append(abSub.getStackDescription());
} }
@@ -1751,7 +1751,7 @@ public class AbilityFactoryZoneAffecting {
} }
// check SubAbilities DoTrigger? // check SubAbilities DoTrigger?
final Ability_Sub abSub = sa.getSubAbility(); final AbilitySub abSub = sa.getSubAbility();
if (abSub != null) { if (abSub != null) {
return abSub.doTrigger(mandatory); return abSub.doTrigger(mandatory);
} }

60
src/main/java/forge/card/cardFactory/AbstractCardFactory.java
View File

@@ -32,19 +32,19 @@ import forge.PlayerZone;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
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_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.game.GameLossReason; import forge.game.GameLossReason;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.ListChooser; import forge.gui.ListChooser;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
import forge.item.CardDb; import forge.item.CardDb;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
@@ -484,7 +484,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// this is so permanents like creatures and artifacts have a "default" // this is so permanents like creatures and artifacts have a "default"
// spell // spell
if (card.isPermanent() && !card.isLand() && !card.isAura()) { if (card.isPermanent() && !card.isLand() && !card.isAura()) {
card.addSpellAbility(new Spell_Permanent(card)); card.addSpellAbility(new SpellPermanent(card));
} }
CardFactoryUtil.parseKeywords(card, cardName); CardFactoryUtil.parseKeywords(card, cardName);
@@ -515,25 +515,25 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// ************** Link to different CardFactories ******************* // ************** Link to different CardFactories *******************
Card card2 = null; Card card2 = null;
if (card.isCreature()) { if (card.isCreature()) {
card2 = CardFactory_Creatures.getCard(card, cardName, this); card2 = CardFactoryCreatures.getCard(card, cardName, this);
} else if (card.isAura()) { } else if (card.isAura()) {
card2 = CardFactory_Auras.getCard(card, cardName); card2 = CardFactoryAuras.getCard(card, cardName);
} else if (card.isEquipment()) { } else if (card.isEquipment()) {
card2 = CardFactory_Equipment.getCard(card, cardName); card2 = CardFactoryEquipment.getCard(card, cardName);
} else if (card.isPlaneswalker()) { } else if (card.isPlaneswalker()) {
card2 = CardFactory_Planeswalkers.getCard(card, cardName); card2 = CardFactoryPlaneswalkers.getCard(card, cardName);
} else if (card.isLand()) { } else if (card.isLand()) {
card2 = CardFactory_Lands.getCard(card, cardName, this); card2 = CardFactoryLands.getCard(card, cardName, this);
} else if (card.isInstant()) { } else if (card.isInstant()) {
card2 = CardFactory_Instants.getCard(card, cardName); card2 = CardFactoryInstants.getCard(card, cardName);
} else if (card.isSorcery()) { } else if (card.isSorcery()) {
card2 = CardFactory_Sorceries.getCard(card, cardName); card2 = CardFactorySorceries.getCard(card, cardName);
} }
if (card2 != null) { if (card2 != null) {
return CardFactoryUtil.postFactoryKeywords(card2); return CardFactoryUtil.postFactoryKeywords(card2);
} else if (cardName.equals("Bridge from Below")) { } else if (cardName.equals("Bridge from Below")) {
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = 7254358703158629514L; private static final long serialVersionUID = 7254358703158629514L;
@Override @Override
@@ -601,7 +601,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// card.setChosenType(input[0]); // card.setChosenType(input[0]);
final Cost a1Cost = new Cost("3 T", cardName, true); final Cost a1Cost = new Cost("3 T", cardName, true);
final Ability_Activated a1 = new Ability_Activated(card, a1Cost, null) { final AbilityActivated a1 = new AbilityActivated(card, a1Cost, null) {
private static final long serialVersionUID = -2114111483117171609L; private static final long serialVersionUID = -2114111483117171609L;
@@ -785,7 +785,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
final Cost dungeonCost = new Cost("Discard<1/Card>", cardName, true); final Cost dungeonCost = new Cost("Discard<1/Card>", cardName, true);
final Target dungeonTgt = new Target(card, card + " - Select target player", "Player".split(",")); final Target dungeonTgt = new Target(card, card + " - Select target player", "Player".split(","));
final SpellAbility dungeon = new Ability_Activated(card, dungeonCost, dungeonTgt) { final SpellAbility dungeon = new AbilityActivated(card, dungeonCost, dungeonTgt) {
private static final long serialVersionUID = 334033015590321821L; private static final long serialVersionUID = 334033015590321821L;
@Override @Override
@@ -822,7 +822,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
}; // SpellAbility dungeon }; // SpellAbility dungeon
final Cost bailCost = new Cost("PayLife<5>", cardName, true); final Cost bailCost = new Cost("PayLife<5>", cardName, true);
final SpellAbility bail = new Ability_Activated(card, bailCost, null) { final SpellAbility bail = new AbilityActivated(card, bailCost, null) {
private static final long serialVersionUID = -8990402917139817175L; private static final long serialVersionUID = -8990402917139817175L;
@Override @Override
@@ -915,7 +915,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
} }
}; };
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = -1818766848857998431L; private static final long serialVersionUID = -1818766848857998431L;
// could never get the AI to work correctly // could never get the AI to work correctly
@@ -950,7 +950,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// Keywords. // Keywords.
card.clearFirstSpell(); card.clearFirstSpell();
card.addSpellAbility(new Spell_Permanent(card) { card.addSpellAbility(new SpellPermanent(card) {
private static final long serialVersionUID = 6912683989507840172L; private static final long serialVersionUID = 6912683989507840172L;
@Override @Override
@@ -970,7 +970,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Goblin Charbelcher")) { else if (cardName.equals("Goblin Charbelcher")) {
final Cost abCost = new Cost("3 T", cardName, true); final Cost abCost = new Cost("3 T", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, new Target(card, "TgtCP")) { final AbilityActivated ability = new AbilityActivated(card, abCost, new Target(card, "TgtCP")) {
private static final long serialVersionUID = -840041589720758423L; private static final long serialVersionUID = -840041589720758423L;
@Override @Override
@@ -1039,7 +1039,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
final Cost abCost = new Cost("1 T Sac<1/CARDNAME>", cardName, true); final Cost abCost = new Cost("1 T Sac<1/CARDNAME>", cardName, true);
final Target target = new Target(card, "Select target player", new String[] { "Player" }); final Target target = new Target(card, "Select target player", new String[] { "Player" });
final Ability_Activated ability = new Ability_Activated(card, abCost, target) { final AbilityActivated ability = new AbilityActivated(card, abCost, target) {
private static final long serialVersionUID = -6711849408085138636L; private static final long serialVersionUID = -6711849408085138636L;
@Override @Override
@@ -1118,7 +1118,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
else if (cardName.equals("Grindstone")) { else if (cardName.equals("Grindstone")) {
final Target target = new Target(card, "Select target player", new String[] { "Player" }); final Target target = new Target(card, "Select target player", new String[] { "Player" });
final Cost abCost = new Cost("3 T", cardName, true); final Cost abCost = new Cost("3 T", cardName, true);
final Ability_Activated ab1 = new Ability_Activated(card, abCost, target) { final AbilityActivated ab1 = new AbilityActivated(card, abCost, target) {
private static final long serialVersionUID = -6281219446216L; private static final long serialVersionUID = -6281219446216L;
@Override @Override
@@ -1187,7 +1187,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
final Cost cost = new Cost("3", card.getName(), true); final Cost cost = new Cost("3", card.getName(), true);
final SpellAbility ability = new Ability_Activated(card, cost, target) { final SpellAbility ability = new AbilityActivated(card, cost, target) {
private static final long serialVersionUID = 8941566961041310961L; private static final long serialVersionUID = 8941566961041310961L;
@Override @Override
@@ -1227,7 +1227,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Pithing Needle")) { else if (cardName.equals("Pithing Needle")) {
final SpellAbility ability = new Ability_Static(card, "0") { final SpellAbility ability = new AbilityStatic(card, "0") {
@Override @Override
public void resolve() { public void resolve() {
String cardName = ""; String cardName = "";
@@ -1312,7 +1312,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Scroll Rack")) { else if (cardName.equals("Scroll Rack")) {
final Cost abCost = new Cost("1 T", cardName, true); final Cost abCost = new Cost("1 T", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, null) { final AbilityActivated ability = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = -5588587187720068547L; private static final long serialVersionUID = -5588587187720068547L;
@Override @Override
@@ -1399,7 +1399,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
* creature or player. * creature or player.
*/ */
final Cost abCost = new Cost("3 T", cardName, true); final Cost abCost = new Cost("3 T", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, new Target(card, "TgtCP")) { final AbilityActivated ability = new AbilityActivated(card, abCost, new Target(card, "TgtCP")) {
private static final long serialVersionUID = 7550743617522146304L; private static final long serialVersionUID = 7550743617522146304L;
@Override @Override
@@ -1506,7 +1506,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
freeCast.setStackDescription(cardName + " - play card without paying its mana cost."); freeCast.setStackDescription(cardName + " - play card without paying its mana cost.");
final Cost abCost = new Cost("5 T", cardName, true); final Cost abCost = new Cost("5 T", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, null) { final AbilityActivated ability = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = -7328518969488588777L; private static final long serialVersionUID = -7328518969488588777L;
@Override @Override
@@ -1615,7 +1615,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
final Target t2 = new Target(card, "Select target creature an opponent controls", final Target t2 = new Target(card, "Select target creature an opponent controls",
"Creature.YouDontCtrl".split(",")); "Creature.YouDontCtrl".split(","));
final Ability_Sub sub = new Ability_Sub(card, t2) { final AbilitySub sub = new AbilitySub(card, t2) {
private static final long serialVersionUID = -572849470457911366L; private static final long serialVersionUID = -572849470457911366L;
@Override @Override
@@ -1645,7 +1645,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
final Cost abCost = new Cost("2 Sac<1/CARDNAME>", cardName, true); final Cost abCost = new Cost("2 Sac<1/CARDNAME>", cardName, true);
final Target t1 = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(",")); final Target t1 = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(","));
final Ability_Activated ability = new Ability_Activated(card, abCost, t1) { final AbilityActivated ability = new AbilityActivated(card, abCost, t1) {
private static final long serialVersionUID = 2312243293988795896L; private static final long serialVersionUID = 2312243293988795896L;
@Override @Override
@@ -1744,7 +1744,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
public void selectCard(final Card c, final PlayerZone z) { public void selectCard(final Card c, final PlayerZone z) {
if (z.is(Constant.Zone.Battlefield) && c.isArtifact()) { if (z.is(Constant.Zone.Battlefield) && c.isArtifact()) {
copyTarget[0] = c; copyTarget[0] = c;
this.stopSetNext(new Input_PayManaCost(copy)); this.stopSetNext(new InputPayManaCost(copy));
} }
} }
}; };

10
src/main/java/forge/card/cardFactory/CardFactory_Auras.java → src/main/java/forge/card/cardFactory/CardFactoryAuras.java
View File

@@ -20,7 +20,7 @@ import forge.card.cost.Cost;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
@@ -33,7 +33,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
class CardFactory_Auras { class CardFactoryAuras {
/** /**
* <p> * <p>
@@ -265,7 +265,7 @@ class CardFactory_Auras {
else if (cardName.equals("Earthbind")) { else if (cardName.equals("Earthbind")) {
final Cost cost = new Cost(card.getManaCost(), cardName, false); final Cost cost = new Cost(card.getManaCost(), cardName, false);
final Target tgt = new Target(card, "C"); final Target tgt = new Target(card, "C");
final SpellAbility spell = new Spell_Permanent(card, cost, tgt) { final SpellAbility spell = new SpellPermanent(card, cost, tgt) {
private static final long serialVersionUID = 142389375702113977L; private static final long serialVersionUID = 142389375702113977L;
@@ -368,7 +368,7 @@ class CardFactory_Auras {
else if (cardName.equals("Guilty Conscience")) { else if (cardName.equals("Guilty Conscience")) {
final Cost cost = new Cost(card.getManaCost(), cardName, false); final Cost cost = new Cost(card.getManaCost(), cardName, false);
final Target tgt = new Target(card, "C"); final Target tgt = new Target(card, "C");
final SpellAbility spell = new Spell_Permanent(card, cost, tgt) { final SpellAbility spell = new SpellPermanent(card, cost, tgt) {
private static final long serialVersionUID = 1169151960692309514L; private static final long serialVersionUID = 1169151960692309514L;
@@ -423,7 +423,7 @@ class CardFactory_Auras {
else if (cardName.equals("Animate Dead") || cardName.equals("Dance of the Dead")) { else if (cardName.equals("Animate Dead") || cardName.equals("Dance of the Dead")) {
final Card[] targetC = new Card[1]; final Card[] targetC = new Card[1];
// need to override what happens when this is cast. // need to override what happens when this is cast.
final Spell_Permanent animate = new Spell_Permanent(card) { final SpellPermanent animate = new SpellPermanent(card) {
private static final long serialVersionUID = 7126615291288065344L; private static final long serialVersionUID = 7126615291288065344L;
public CardList getCreturesInGrave() { public CardList getCreturesInGrave() {

74
src/main/java/forge/card/cardFactory/CardFactory_Creatures.java → src/main/java/forge/card/cardFactory/CardFactoryCreatures.java
View File

@@ -28,19 +28,19 @@ import forge.PlayerZone;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
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_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.Ability_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler; import forge.card.trigger.TriggerHandler;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
/** /**
* <p> * <p>
@@ -50,7 +50,7 @@ import forge.gui.input.Input_PayManaCost;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class CardFactory_Creatures { public class CardFactoryCreatures {
/** /**
* <p> * <p>
@@ -171,7 +171,7 @@ public class CardFactory_Creatures {
// *************** START *********** START ************************** // *************** START *********** START **************************
if (cardName.equals("Force of Savagery")) { if (cardName.equals("Force of Savagery")) {
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = 1603238129819160467L; private static final long serialVersionUID = 1603238129819160467L;
@Override @Override
@@ -192,7 +192,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Gilder Bairn")) { else if (cardName.equals("Gilder Bairn")) {
final Cost abCost = new Cost("2 GU Untap", cardName, true); final Cost abCost = new Cost("2 GU Untap", cardName, true);
final Target tgt = new Target(card, "Select target permanent.", new String[] { "Permanent" }); final Target tgt = new Target(card, "Select target permanent.", new String[] { "Permanent" });
final Ability_Activated a1 = new Ability_Activated(card, abCost, tgt) { final AbilityActivated a1 = new AbilityActivated(card, abCost, tgt) {
private static final long serialVersionUID = -1847685865277129366L; private static final long serialVersionUID = -1847685865277129366L;
@Override @Override
@@ -351,7 +351,7 @@ public class CardFactory_Creatures {
} }
}; };
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = -2940969025405788931L; private static final long serialVersionUID = -2940969025405788931L;
// could never get the AI to work correctly // could never get the AI to work correctly
@@ -385,7 +385,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Minotaur Explorer") || cardName.equals("Balduvian Horde") else if (cardName.equals("Minotaur Explorer") || cardName.equals("Balduvian Horde")
|| cardName.equals("Pillaging Horde")) { || cardName.equals("Pillaging Horde")) {
final SpellAbility creature = new Spell_Permanent(card) { final SpellAbility creature = new SpellPermanent(card) {
private static final long serialVersionUID = -7326018877172328480L; private static final long serialVersionUID = -7326018877172328480L;
@Override @Override
@@ -551,7 +551,7 @@ public class CardFactory_Creatures {
// Do not remove SpellAbilities created by AbilityFactory or // Do not remove SpellAbilities created by AbilityFactory or
// Keywords. // Keywords.
card.clearFirstSpell(); card.clearFirstSpell();
card.addSpellAbility(new Spell_Permanent(card) { card.addSpellAbility(new SpellPermanent(card) {
private static final long serialVersionUID = -1506199222879057809L; private static final long serialVersionUID = -1506199222879057809L;
@@ -785,7 +785,7 @@ public class CardFactory_Creatures {
final Cost abCost = new Cost("T", cardName, true); final Cost abCost = new Cost("T", cardName, true);
final Target tgt = new Target(card, "Target creature other than " + cardName, "Creature.Other".split(",")); final Target tgt = new Target(card, "Target creature other than " + cardName, "Creature.Other".split(","));
final Ability_Activated ability = new Ability_Activated(card, abCost, tgt) { final AbilityActivated ability = new AbilityActivated(card, abCost, tgt) {
private static final long serialVersionUID = -8454685126878522607L; private static final long serialVersionUID = -8454685126878522607L;
@Override @Override
@@ -973,14 +973,14 @@ public class CardFactory_Creatures {
+ "your graveyard without paying its mana cost."); + "your graveyard without paying its mana cost.");
ability.setStackDescription("Horde of Notions - play Elemental card from " ability.setStackDescription("Horde of Notions - play Elemental card from "
+ "graveyard without paying its mana cost."); + "graveyard without paying its mana cost.");
ability.setBeforePayMana(new Input_PayManaCost(ability)); ability.setBeforePayMana(new InputPayManaCost(ability));
} // *************** END ************ END ************************** } // *************** END ************ END **************************
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Rhys the Redeemed")) { else if (cardName.equals("Rhys the Redeemed")) {
final Cost abCost = new Cost("4 GW GW T", card.getName(), true); final Cost abCost = new Cost("4 GW GW T", card.getName(), true);
final Ability_Activated copyTokens1 = new Ability_Activated(card, abCost, null) { final AbilityActivated copyTokens1 = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = 6297992502069547478L; private static final long serialVersionUID = 6297992502069547478L;
@Override @Override
@@ -1085,7 +1085,7 @@ public class CardFactory_Creatures {
final Cost abCost = new Cost("T", cardName, true); final Cost abCost = new Cost("T", cardName, true);
final Target abTgt = new Target(card, "Target a creature to Hunt", "Creature".split(",")); final Target abTgt = new Target(card, "Target a creature to Hunt", "Creature".split(","));
final Ability_Activated ability = new Ability_Activated(card, abCost, abTgt) { final AbilityActivated ability = new AbilityActivated(card, abCost, abTgt) {
private static final long serialVersionUID = 35050145102566898L; private static final long serialVersionUID = 35050145102566898L;
@Override @Override
@@ -1248,7 +1248,7 @@ public class CardFactory_Creatures {
|| cardName.equals("Feral Hydra") || cardName.equals("Krakilin") || cardName.equals("Ivy Elemental") || cardName.equals("Feral Hydra") || cardName.equals("Krakilin") || cardName.equals("Ivy Elemental")
|| cardName.equals("Lightning Serpent")) { || cardName.equals("Lightning Serpent")) {
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = 7708945715867177172L; private static final long serialVersionUID = 7708945715867177172L;
@Override @Override
@@ -1264,7 +1264,7 @@ public class CardFactory_Creatures {
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Apocalypse Hydra")) { else if (cardName.equals("Apocalypse Hydra")) {
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = -11489323313L; private static final long serialVersionUID = -11489323313L;
@Override @Override
@@ -1293,7 +1293,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Molten Hydra")) { else if (cardName.equals("Molten Hydra")) {
final Target target = new Target(card, "TgtCP"); final Target target = new Target(card, "TgtCP");
final Cost abCost = new Cost("T", cardName, true); final Cost abCost = new Cost("T", cardName, true);
final Ability_Activated ability2 = new Ability_Activated(card, abCost, target) { final AbilityActivated ability2 = new AbilityActivated(card, abCost, target) {
private static final long serialVersionUID = 2626619319289064289L; private static final long serialVersionUID = 2626619319289064289L;
@Override @Override
@@ -1683,7 +1683,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Gnarlid Pack") || cardName.equals("Apex Hawks") || cardName.equals("Enclave Elite") else if (cardName.equals("Gnarlid Pack") || cardName.equals("Apex Hawks") || cardName.equals("Enclave Elite")
|| cardName.equals("Quag Vampires") || cardName.equals("Skitter of Lizards") || cardName.equals("Quag Vampires") || cardName.equals("Skitter of Lizards")
|| cardName.equals("Joraga Warcaller")) { || cardName.equals("Joraga Warcaller")) {
final Ability_Static ability = new Ability_Static(card, "0") { final AbilityStatic ability = new AbilityStatic(card, "0") {
@Override @Override
public void resolve() { public void resolve() {
card.addCounter(Counters.P1P1, card.getMultiKickerMagnitude()); card.addCounter(Counters.P1P1, card.getMultiKickerMagnitude());
@@ -1716,7 +1716,7 @@ public class CardFactory_Creatures {
final Cost cost = new Cost("Sac<1/CARDNAME>", cardName, true); final Cost cost = new Cost("Sac<1/CARDNAME>", cardName, true);
final Target tgt = new Target(card, "Select a permanent", "Permanent".split(",")); final Target tgt = new Target(card, "Select a permanent", "Permanent".split(","));
final SpellAbility ability = new Ability_Activated(card, cost, tgt) { final SpellAbility ability = new AbilityActivated(card, cost, tgt) {
private static final long serialVersionUID = -5084369399105353155L; private static final long serialVersionUID = -5084369399105353155L;
@Override @Override
@@ -1827,7 +1827,7 @@ public class CardFactory_Creatures {
// Keywords. // Keywords.
card.clearFirstSpell(); card.clearFirstSpell();
card.addComesIntoPlayCommand(intoPlay); card.addComesIntoPlayCommand(intoPlay);
card.addSpellAbility(new Spell_Permanent(card) { card.addSpellAbility(new SpellPermanent(card) {
private static final long serialVersionUID = 304885517082977723L; private static final long serialVersionUID = 304885517082977723L;
@Override @Override
@@ -1907,7 +1907,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Metalworker")) { else if (cardName.equals("Metalworker")) {
final Cost abCost = new Cost("T", card.getName(), true); final Cost abCost = new Cost("T", card.getName(), true);
final SpellAbility ability = new Ability_Activated(card, abCost, null) { final SpellAbility ability = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = 6661308920885136284L; private static final long serialVersionUID = 6661308920885136284L;
@Override @Override
@@ -1963,7 +1963,7 @@ public class CardFactory_Creatures {
JOptionPane.PLAIN_MESSAGE); JOptionPane.PLAIN_MESSAGE);
// adding mana // adding mana
final Ability_Mana abMana = new Ability_Mana(card, "0", "1", 2 * this.revealed.size()) { final AbilityMana abMana = new AbilityMana(card, "0", "1", 2 * this.revealed.size()) {
private static final long serialVersionUID = -2182129023960978132L; private static final long serialVersionUID = -2182129023960978132L;
}; };
abMana.setUndoable(false); abMana.setUndoable(false);
@@ -2368,7 +2368,7 @@ public class CardFactory_Creatures {
return; return;
} }
copyTarget[0] = c; copyTarget[0] = c;
this.stopSetNext(new Input_PayManaCost(copy)); this.stopSetNext(new InputPayManaCost(copy));
} }
} }
}; };
@@ -2386,7 +2386,7 @@ public class CardFactory_Creatures {
} else { } else {
final Card c = (Card) o; final Card c = (Card) o;
copyTarget[0] = c; copyTarget[0] = c;
this.stopSetNext(new Input_PayManaCost(copy)); this.stopSetNext(new InputPayManaCost(copy));
} }
} }
}; };
@@ -2413,7 +2413,7 @@ public class CardFactory_Creatures {
*/ */
final Cost abCost = new Cost("X T", cardName, true); final Cost abCost = new Cost("X T", cardName, true);
final Target target = new Target(card, "Select target opponent", "Opponent".split(",")); final Target target = new Target(card, "Select target opponent", "Opponent".split(","));
final Ability_Activated discard = new Ability_Activated(card, abCost, target) { final AbilityActivated discard = new AbilityActivated(card, abCost, target) {
private static final long serialVersionUID = 4839778470534392198L; private static final long serialVersionUID = 4839778470534392198L;
@Override @Override
@@ -2470,7 +2470,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Brass Squire")) { else if (cardName.equals("Brass Squire")) {
final Target t2 = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(",")); final Target t2 = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(","));
final Ability_Sub sub = new Ability_Sub(card, t2) { final AbilitySub sub = new AbilitySub(card, t2) {
private static final long serialVersionUID = -8926850792424930054L; private static final long serialVersionUID = -8926850792424930054L;
@Override @Override
@@ -2505,7 +2505,7 @@ public class CardFactory_Creatures {
final Cost abCost = new Cost("T", cardName, true); final Cost abCost = new Cost("T", cardName, true);
final Target t1 = new Target(card, "Select target equipment you control", "Equipment.YouCtrl".split(",")); final Target t1 = new Target(card, "Select target equipment you control", "Equipment.YouCtrl".split(","));
final Ability_Activated ability = new Ability_Activated(card, abCost, t1) { final AbilityActivated ability = new AbilityActivated(card, abCost, t1) {
private static final long serialVersionUID = 3818559481920103914L; private static final long serialVersionUID = 3818559481920103914L;
@Override @Override
@@ -2527,7 +2527,7 @@ public class CardFactory_Creatures {
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Gore Vassal")) { else if (cardName.equals("Gore Vassal")) {
final Cost abCost = new Cost("Sac<1/CARDNAME>", cardName, true); final Cost abCost = new Cost("Sac<1/CARDNAME>", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, new Target(card, "TgtC")) { final AbilityActivated ability = new AbilityActivated(card, abCost, new Target(card, "TgtC")) {
private static final long serialVersionUID = 3689290210743241201L; private static final long serialVersionUID = 3689290210743241201L;
@Override @Override
@@ -2621,7 +2621,7 @@ public class CardFactory_Creatures {
theCost = "R"; theCost = "R";
} }
final SpellAbility finalAb = new Ability_Activated(card, new Cost(theCost, cardName, true), new Target( final SpellAbility finalAb = new AbilityActivated(card, new Cost(theCost, cardName, true), new Target(
card, "Select target creature.", "Creature")) { card, "Select target creature.", "Creature")) {
private static final long serialVersionUID = 2391351140880148283L; private static final long serialVersionUID = 2391351140880148283L;
@@ -2655,7 +2655,7 @@ public class CardFactory_Creatures {
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Krovikan Sorcerer")) { else if (cardName.equals("Krovikan Sorcerer")) {
final Cost abCost = new Cost("T Discard<1/Card.Black>", cardName, true); final Cost abCost = new Cost("T Discard<1/Card.Black>", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, null) { final AbilityActivated ability = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = 3689290210743241201L; private static final long serialVersionUID = 3689290210743241201L;
@Override @Override
@@ -2705,10 +2705,10 @@ public class CardFactory_Creatures {
// end of card specific code // end of card specific code
// *************************************************** // ***************************************************
if ((CardFactory_Creatures.hasKeyword(card, "Level up") != -1) if ((CardFactoryCreatures.hasKeyword(card, "Level up") != -1)
&& (CardFactory_Creatures.hasKeyword(card, "maxLevel") != -1)) { && (CardFactoryCreatures.hasKeyword(card, "maxLevel") != -1)) {
final int n = CardFactory_Creatures.hasKeyword(card, "Level up"); final int n = CardFactoryCreatures.hasKeyword(card, "Level up");
final int m = CardFactory_Creatures.hasKeyword(card, "maxLevel"); final int m = CardFactoryCreatures.hasKeyword(card, "maxLevel");
if (n != -1) { if (n != -1) {
final String parse = card.getKeyword().get(n).toString(); final String parse = card.getKeyword().get(n).toString();
final String parseMax = card.getKeyword().get(m).toString(); final String parseMax = card.getKeyword().get(m).toString();
@@ -2722,7 +2722,7 @@ public class CardFactory_Creatures {
final String[] l = parseMax.split(":"); final String[] l = parseMax.split(":");
final int maxLevel = Integer.parseInt(l[1]); final int maxLevel = Integer.parseInt(l[1]);
final SpellAbility levelUp = new Ability_Activated(card, manacost) { final SpellAbility levelUp = new AbilityActivated(card, manacost) {
private static final long serialVersionUID = 3998280279949548652L; private static final long serialVersionUID = 3998280279949548652L;
@Override @Override

10
src/main/java/forge/card/cardFactory/CardFactory_Equipment.java → src/main/java/forge/card/cardFactory/CardFactoryEquipment.java
View File

@@ -16,7 +16,7 @@ import forge.Phase;
import forge.PlayerZone; import forge.PlayerZone;
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_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
@@ -31,7 +31,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
class CardFactory_Equipment { class CardFactoryEquipment {
/** /**
* <p> * <p>
@@ -71,7 +71,7 @@ class CardFactory_Equipment {
if (cardName.equals("Umbral Mantle")) { if (cardName.equals("Umbral Mantle")) {
final Cost abCost = new Cost("0", cardName, true); final Cost abCost = new Cost("0", cardName, true);
final Target target = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(",")); final Target target = new Target(card, "Select target creature you control", "Creature.YouCtrl".split(","));
final Ability_Activated equip = new Ability_Activated(card, abCost, target) { final AbilityActivated equip = new AbilityActivated(card, abCost, target) {
private static final long serialVersionUID = -6122939616068165612L; private static final long serialVersionUID = -6122939616068165612L;
@Override @Override
@@ -363,8 +363,8 @@ class CardFactory_Equipment {
card.addComesIntoPlayCommand(intoPlay); card.addComesIntoPlayCommand(intoPlay);
} // *************** END ************ END ************************** } // *************** END ************ END **************************
if (CardFactory_Equipment.shouldEquip(card) != -1) { if (CardFactoryEquipment.shouldEquip(card) != -1) {
final int n = CardFactory_Equipment.shouldEquip(card); final int n = CardFactoryEquipment.shouldEquip(card);
if (n != -1) { if (n != -1) {
final String parse = card.getKeyword().get(n).toString(); final String parse = card.getKeyword().get(n).toString();
card.removeIntrinsicKeyword(parse); card.removeIntrinsicKeyword(parse);

10
src/main/java/forge/card/cardFactory/CardFactory_Instants.java → src/main/java/forge/card/cardFactory/CardFactoryInstants.java
View File

@@ -20,13 +20,13 @@ import forge.Player;
import forge.PlayerZone; import forge.PlayerZone;
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_Sub; import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
/** /**
* <p> * <p>
@@ -36,7 +36,7 @@ import forge.gui.input.Input_PayManaCost;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class CardFactory_Instants { public class CardFactoryInstants {
/** /**
* <p> * <p>
@@ -448,7 +448,7 @@ public class CardFactory_Instants {
AllZone.getStack().add(spell); AllZone.getStack().add(spell);
this.stop(); this.stop();
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
} }
@@ -1059,7 +1059,7 @@ public class CardFactory_Instants {
else if (cardName.equals("Wing Puncture")) { else if (cardName.equals("Wing Puncture")) {
final Target t2 = new Target(card, "Select target creature with flying", "Creature.withFlying".split(",")); final Target t2 = new Target(card, "Select target creature with flying", "Creature.withFlying".split(","));
final Ability_Sub sub = new Ability_Sub(card, t2) { final AbilitySub sub = new AbilitySub(card, t2) {
private static final long serialVersionUID = 4618047889975691050L; private static final long serialVersionUID = 4618047889975691050L;
@Override @Override

10
src/main/java/forge/card/cardFactory/CardFactory_Lands.java → src/main/java/forge/card/cardFactory/CardFactoryLands.java
View File

@@ -18,8 +18,8 @@ import forge.Player;
import forge.PlayerZone; import forge.PlayerZone;
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_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
@@ -32,7 +32,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
class CardFactory_Lands { class CardFactoryLands {
/** /**
* <p> * <p>
@@ -206,7 +206,7 @@ class CardFactory_Lands {
}; };
final Cost abCost = new Cost("G U T", cardName, true); final Cost abCost = new Cost("G U T", cardName, true);
final Ability_Activated ability = new Ability_Activated(card, abCost, null) { final AbilityActivated ability = new AbilityActivated(card, abCost, null) {
private static final long serialVersionUID = 1416258136308898492L; private static final long serialVersionUID = 1416258136308898492L;
private final CardList inPlay = new CardList(); private final CardList inPlay = new CardList();
@@ -602,7 +602,7 @@ class CardFactory_Lands {
// This dummy AbMana is for Reflecting and for having an abMana // This dummy AbMana is for Reflecting and for having an abMana
// produce mana // produce mana
final Ability_Mana abMana = new Ability_Mana(card, "0", primary + " " + secondary) { final AbilityMana abMana = new AbilityMana(card, "0", primary + " " + secondary) {
private static final long serialVersionUID = -4506828762302357781L; private static final long serialVersionUID = -4506828762302357781L;
@Override @Override

16
src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java → src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java
View File

@@ -21,7 +21,7 @@ import forge.Player;
import forge.PlayerZone; import forge.PlayerZone;
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_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
@@ -35,7 +35,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class CardFactory_Planeswalkers { public class CardFactoryPlaneswalkers {
/** /**
* <p> * <p>
@@ -677,7 +677,7 @@ public class CardFactory_Planeswalkers {
final HashMap<Integer, Card> tempCardMap = new HashMap<Integer, Card>(); final HashMap<Integer, Card> tempCardMap = new HashMap<Integer, Card>();
for (final Card creatureCard : creatures) { for (final Card creatureCard : creatures) {
final Card crd = CardFactory_Planeswalkers.copyStats(creatureCard); final Card crd = CardFactoryPlaneswalkers.copyStats(creatureCard);
tempCardMap.put(creatureCard.getUniqueNumber(), crd); tempCardMap.put(creatureCard.getUniqueNumber(), crd);
// System.out.println("Just added:" + crd); // System.out.println("Just added:" + crd);
} }
@@ -773,7 +773,7 @@ public class CardFactory_Planeswalkers {
final Target t1 = new Target(card, "Select target player", "Player"); final Target t1 = new Target(card, "Select target player", "Player");
final Cost cost1 = new Cost("AddCounter<2/LOYALTY>", cardName, true); final Cost cost1 = new Cost("AddCounter<2/LOYALTY>", cardName, true);
final SpellAbility ability1 = new Ability_Activated(card, cost1, t1) { final SpellAbility ability1 = new AbilityActivated(card, cost1, t1) {
private static final long serialVersionUID = -986543400626807336L; private static final long serialVersionUID = -986543400626807336L;
@Override @Override
@@ -893,7 +893,7 @@ public class CardFactory_Planeswalkers {
final Cost cost = new Cost("SubCounter<1/LOYALTY>", cardName, true); final Cost cost = new Cost("SubCounter<1/LOYALTY>", cardName, true);
final Target target = new Target(card, "TgtC"); final Target target = new Target(card, "TgtC");
final SpellAbility ability3 = new Ability_Activated(card, cost, target) { final SpellAbility ability3 = new AbilityActivated(card, cost, target) {
private static final long serialVersionUID = -1113077473448818423L; private static final long serialVersionUID = -1113077473448818423L;
@Override @Override
@@ -927,7 +927,7 @@ public class CardFactory_Planeswalkers {
final Target target4 = new Target(card, "Select target player", "Player"); final Target target4 = new Target(card, "Select target player", "Player");
final Cost cost4 = new Cost("SubCounter<12/LOYALTY>", cardName, true); final Cost cost4 = new Cost("SubCounter<12/LOYALTY>", cardName, true);
final SpellAbility ability4 = new Ability_Activated(card, cost4, target4) { final SpellAbility ability4 = new AbilityActivated(card, cost4, target4) {
private static final long serialVersionUID = 5512803971603404142L; private static final long serialVersionUID = 5512803971603404142L;
@Override @Override
@@ -1046,7 +1046,7 @@ public class CardFactory_Planeswalkers {
*/ */
final Target target2 = new Target(card, "TgtC"); final Target target2 = new Target(card, "TgtC");
final Cost cost2 = new Cost("SubCounter<2/LOYALTY>", cardName, true); final Cost cost2 = new Cost("SubCounter<2/LOYALTY>", cardName, true);
final SpellAbility ability2 = new Ability_Activated(card, cost2, target2) { final SpellAbility ability2 = new AbilityActivated(card, cost2, target2) {
private static final long serialVersionUID = 4322453486268967722L; private static final long serialVersionUID = 4322453486268967722L;
@Override @Override
@@ -1109,7 +1109,7 @@ public class CardFactory_Planeswalkers {
*/ */
final Target target3 = new Target(card, "Select target player", "Player"); final Target target3 = new Target(card, "Select target player", "Player");
final Cost cost3 = new Cost("SubCounter<4/LOYALTY>", cardName, true); final Cost cost3 = new Cost("SubCounter<4/LOYALTY>", cardName, true);
final SpellAbility ability3 = new Ability_Activated(card, cost3, target3) { final SpellAbility ability3 = new AbilityActivated(card, cost3, target3) {
private static final long serialVersionUID = -5488579738767048060L; private static final long serialVersionUID = -5488579738767048060L;
@Override @Override

30
src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java → src/main/java/forge/card/cardFactory/CardFactorySorceries.java
View File

@@ -29,12 +29,12 @@ import forge.card.cost.Cost;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
import forge.gui.input.Input_PayManaCost_Ability; import forge.gui.input.InputPayManaCostAbility;
/** /**
* <p> * <p>
@@ -44,7 +44,7 @@ import forge.gui.input.Input_PayManaCost_Ability;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class CardFactory_Sorceries { public class CardFactorySorceries {
/** /**
* <p> * <p>
@@ -136,7 +136,7 @@ public class CardFactory_Sorceries {
AllZone.getStack().add(spell); AllZone.getStack().add(spell);
this.stop(); this.stop();
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
} }
@@ -431,7 +431,7 @@ public class CardFactory_Sorceries {
} }
}; };
final SpellAbility spell = new Spell_Permanent(card) { final SpellAbility spell = new SpellPermanent(card) {
private static final long serialVersionUID = -2940969025405788931L; private static final long serialVersionUID = -2940969025405788931L;
@Override @Override
@@ -794,7 +794,7 @@ public class CardFactory_Sorceries {
AllZone.getStack().add(spell); AllZone.getStack().add(spell);
this.stop(); this.stop();
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
} }
@@ -1099,7 +1099,7 @@ public class CardFactory_Sorceries {
this.showMessage(); this.showMessage();
if (index[0] >= humanBasic.size()) { if (index[0] >= humanBasic.size()) {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
// need to sacrifice the other non-basic land types // need to sacrifice the other non-basic land types
@@ -1834,7 +1834,7 @@ public class CardFactory_Sorceries {
@Override @Override
public void selectButtonOK() { public void selectButtonOK() {
spell.setStackDescription(cardName + " deals X damage to " + this.getNumTargets() + " target(s)."); spell.setStackDescription(cardName + " deals X damage to " + this.getNumTargets() + " target(s).");
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
@Override @Override
@@ -2031,7 +2031,7 @@ public class CardFactory_Sorceries {
final Object check = GuiUtils.getChoiceOptional("Select creature", creature); final Object check = GuiUtils.getChoiceOptional("Select creature", creature);
if (check != null) { if (check != null) {
spell.setTargetCard((Card) check); spell.setTargetCard((Card) check);
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} else { } else {
this.stop(); this.stop();
} }
@@ -2505,7 +2505,7 @@ public class CardFactory_Sorceries {
private void done() { private void done() {
setStackDescription.execute(); setStackDescription.execute();
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
}; };
@@ -2539,7 +2539,7 @@ public class CardFactory_Sorceries {
this.stopSetNext(targetXCreatures); this.stopSetNext(targetXCreatures);
} else { } else {
System.out.println("Input_PayManaCost for spell is getting: " + spell.getManaCost()); System.out.println("Input_PayManaCost for spell is getting: " + spell.getManaCost());
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} // if } // if
} // selectCard() } // selectCard()
@@ -2580,7 +2580,7 @@ public class CardFactory_Sorceries {
} else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) { } else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) {
this.stopSetNext(targetXCreatures); this.stopSetNext(targetXCreatures);
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
}; // Input }; // Input
@@ -2618,7 +2618,7 @@ public class CardFactory_Sorceries {
} else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) { } else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) {
this.stopSetNext(targetXCreatures); this.stopSetNext(targetXCreatures);
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
} // selectPlayer() } // selectPlayer()
@@ -2849,7 +2849,7 @@ public class CardFactory_Sorceries {
AllZone.getGameAction().moveToPlay(newArtifact[0]); AllZone.getGameAction().moveToPlay(newArtifact[0]);
} else { } else {
final String diffCost = String.valueOf(newCMC - baseCMC); final String diffCost = String.valueOf(newCMC - baseCMC);
AllZone.getInputControl().setInput(new Input_PayManaCost_Ability(diffCost, new Command() { AllZone.getInputControl().setInput(new InputPayManaCostAbility(diffCost, new Command() {
private static final long serialVersionUID = -8729850321341068049L; private static final long serialVersionUID = -8729850321341068049L;
@Override @Override

56
src/main/java/forge/card/cardFactory/CardFactoryUtil.java
View File

@@ -37,20 +37,20 @@ import forge.card.abilityFactory.AbilityFactory;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
import forge.card.spellability.Ability_Activated; import forge.card.spellability.AbilityActivated;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.Ability_Static; import forge.card.spellability.AbilityStatic;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Restriction; import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Spell_Permanent; import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler; import forge.card.trigger.TriggerHandler;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCost; import forge.gui.input.InputPayManaCost;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -842,7 +842,7 @@ public class CardFactoryUtil {
} }
this.stop(); this.stop();
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
} }
}; };
@@ -949,12 +949,12 @@ public class CardFactoryUtil {
* a {@link forge.Card} object. * a {@link forge.Card} object.
* @param manaCost * @param manaCost
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @return a {@link forge.card.spellability.Ability_Activated} object. * @return a {@link forge.card.spellability.AbilityActivated} object.
*/ */
public static Ability_Activated abilityUnearth(final Card sourceCard, final String manaCost) { public static AbilityActivated abilityUnearth(final Card sourceCard, final String manaCost) {
final Cost cost = new Cost(manaCost, sourceCard.getName(), true); final Cost cost = new Cost(manaCost, sourceCard.getName(), true);
final Ability_Activated unearth = new Ability_Activated(sourceCard, cost, null) { final AbilityActivated unearth = new AbilityActivated(sourceCard, cost, null) {
private static final long serialVersionUID = -5633945565395478009L; private static final long serialVersionUID = -5633945565395478009L;
@Override @Override
@@ -975,7 +975,7 @@ public class CardFactoryUtil {
return ComputerUtil.canPayCost(this); return ComputerUtil.canPayCost(this);
} }
}; };
final SpellAbility_Restriction restrict = new SpellAbility_Restriction(); final SpellAbilityRestriction restrict = new SpellAbilityRestriction();
restrict.setZone(Zone.Graveyard); restrict.setZone(Zone.Graveyard);
restrict.setSorcerySpeed(true); restrict.setSorcerySpeed(true);
unearth.setRestrictions(restrict); unearth.setRestrictions(restrict);
@@ -1049,16 +1049,16 @@ public class CardFactoryUtil {
* a int. * a int.
* @param d * @param d
* a int. * a int.
* @return a {@link forge.card.spellability.Ability_Activated} object. * @return a {@link forge.card.spellability.AbilityActivated} object.
*/ */
public static Ability_Activated abilityMorphUp(final Card sourceCard, final Cost cost, final String orgManaCost, public static AbilityActivated abilityMorphUp(final Card sourceCard, final Cost cost, final String orgManaCost,
final int a, final int d) { final int a, final int d) {
// final String player = sourceCard.getController(); // final String player = sourceCard.getController();
// final String manaCost = cost; // final String manaCost = cost;
final int attack = a; final int attack = a;
final int defense = d; final int defense = d;
final String origManaCost = orgManaCost; final String origManaCost = orgManaCost;
final Ability_Activated morphUp = new Ability_Activated(sourceCard, cost, null) { final AbilityActivated morphUp = new AbilityActivated(sourceCard, cost, null) {
private static final long serialVersionUID = -3663857013937085953L; private static final long serialVersionUID = -3663857013937085953L;
@Override @Override
@@ -1122,7 +1122,7 @@ public class CardFactoryUtil {
cycleCost += " Discard<1/CARDNAME>"; cycleCost += " Discard<1/CARDNAME>";
final Cost abCost = new Cost(cycleCost, sourceCard.getName(), true); final Cost abCost = new Cost(cycleCost, sourceCard.getName(), true);
final SpellAbility cycle = new Ability_Activated(sourceCard, abCost, null) { final SpellAbility cycle = new AbilityActivated(sourceCard, abCost, null) {
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1192,7 +1192,7 @@ public class CardFactoryUtil {
cycleCost += " Discard<1/CARDNAME>"; cycleCost += " Discard<1/CARDNAME>";
final Cost abCost = new Cost(cycleCost, sourceCard.getName(), true); final Cost abCost = new Cost(cycleCost, sourceCard.getName(), true);
final SpellAbility cycle = new Ability_Activated(sourceCard, abCost, null) { final SpellAbility cycle = new AbilityActivated(sourceCard, abCost, null) {
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1276,7 +1276,7 @@ public class CardFactoryUtil {
transmuteCost += " Discard<1/CARDNAME>"; transmuteCost += " Discard<1/CARDNAME>";
final Cost abCost = new Cost(transmuteCost, sourceCard.getName(), true); final Cost abCost = new Cost(transmuteCost, sourceCard.getName(), true);
final SpellAbility transmute = new Ability_Activated(sourceCard, abCost, null) { final SpellAbility transmute = new AbilityActivated(sourceCard, abCost, null) {
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1349,7 +1349,7 @@ public class CardFactoryUtil {
*/ */
public static SpellAbility abilitySuspend(final Card sourceCard, final String suspendCost, final int suspendCounters) { public static SpellAbility abilitySuspend(final Card sourceCard, final String suspendCost, final int suspendCounters) {
// be careful with Suspend ability, it will not hit the stack // be careful with Suspend ability, it will not hit the stack
final SpellAbility suspend = new Ability_Static(sourceCard, suspendCost) { final SpellAbility suspend = new AbilityStatic(sourceCard, suspendCost) {
@Override @Override
public boolean canPlay() { public boolean canPlay() {
if (!(this.getRestrictions().canPlay(sourceCard, this))) { if (!(this.getRestrictions().canPlay(sourceCard, this))) {
@@ -1409,7 +1409,7 @@ public class CardFactoryUtil {
final String[] extrinsicKeywords, final Cost abCost) { final String[] extrinsicKeywords, final Cost abCost) {
final Target target = new Target(sourceCard, "Select target creature you control", final Target target = new Target(sourceCard, "Select target creature you control",
"Creature.YouCtrl".split(",")); "Creature.YouCtrl".split(","));
final SpellAbility equip = new Ability_Activated(sourceCard, abCost, target) { final SpellAbility equip = new AbilityActivated(sourceCard, abCost, target) {
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1602,11 +1602,11 @@ public class CardFactoryUtil {
* *
* @param c * @param c
* a {@link forge.Card} object. * a {@link forge.Card} object.
* @return a {@link forge.card.spellability.Ability_Mana} object. * @return a {@link forge.card.spellability.AbilityMana} object.
*/ */
public static Ability_Mana getEldraziSpawnAbility(final Card c) { public static AbilityMana getEldraziSpawnAbility(final Card c) {
final Cost cost = new Cost("Sac<1/CARDNAME>", c.getName(), true); final Cost cost = new Cost("Sac<1/CARDNAME>", c.getName(), true);
final Ability_Mana mana = new Ability_Mana(c, cost, "1") { final AbilityMana mana = new AbilityMana(c, cost, "1") {
private static final long serialVersionUID = -2478676548112738019L; private static final long serialVersionUID = -2478676548112738019L;
}; };
mana.setDescription("Sacrifice CARDNAME: Add 1 to your mana pool."); mana.setDescription("Sacrifice CARDNAME: Add 1 to your mana pool.");
@@ -1861,7 +1861,7 @@ public class CardFactoryUtil {
AllZone.getStack().add(spell); AllZone.getStack().add(spell);
this.stop(); this.stop();
} else { } else {
this.stopSetNext(new Input_PayManaCost(spell)); this.stopSetNext(new InputPayManaCost(spell));
} }
paid.execute(); paid.execute();
@@ -3744,7 +3744,7 @@ public class CardFactoryUtil {
list = list.filter(new CardListFilter() { list = list.filter(new CardListFilter() {
@Override @Override
public boolean addCard(final Card c) { public boolean addCard(final Card c) {
for (final Ability_Mana am : c.getAIPlayableMana()) { for (final AbilityMana am : c.getAIPlayableMana()) {
if (am.canPlay()) { if (am.canPlay()) {
return true; return true;
} }
@@ -4419,7 +4419,7 @@ public class CardFactoryUtil {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
if (!Spell_Permanent.checkETBEffects(card, this, null)) { if (!SpellPermanent.checkETBEffects(card, this, null)) {
return false; return false;
} }
return super.canPlayAI(); return super.canPlayAI();
@@ -4649,7 +4649,7 @@ public class CardFactoryUtil {
final String parse = card.getKeyword().get(cardnameSpot).toString(); final String parse = card.getKeyword().get(cardnameSpot).toString();
card.removeIntrinsicKeyword(parse); card.removeIntrinsicKeyword(parse);
color += " " color += " "
+ Input_PayManaCostUtil.getShortColorString(parse.replace("CARDNAME is ", "").replace(".", + InputPayManaCostUtil.getShortColorString(parse.replace("CARDNAME is ", "").replace(".",
"")); ""));
cardnameSpot = CardFactoryUtil.hasKeyword(card, "CARDNAME is "); cardnameSpot = CardFactoryUtil.hasKeyword(card, "CARDNAME is ");
} }
@@ -4742,7 +4742,7 @@ public class CardFactoryUtil {
sb.append(" rather than pay ").append(card.getName()).append("'s mana cost."); sb.append(" rather than pay ").append(card.getName()).append("'s mana cost.");
} }
final SpellAbility_Restriction restriction = new SpellAbility_Restriction(); final SpellAbilityRestriction restriction = new SpellAbilityRestriction();
restriction.setRestrictions(mapParams); restriction.setRestrictions(mapParams);
if (!mapParams.containsKey("ActivationZone")) { if (!mapParams.containsKey("ActivationZone")) {
restriction.setZone(Constant.Zone.Hand); restriction.setZone(Constant.Zone.Hand);

10
src/main/java/forge/card/cost/CostDiscard.java
View File

@@ -124,7 +124,7 @@ public class CostDiscard extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
activator.discard(c, ability); activator.discard(c, ability);
@@ -139,7 +139,7 @@ public class CostDiscard extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
CardList handList = activator.getCardsIn(Zone.Hand); CardList handList = activator.getCardsIn(Zone.Hand);
final String discType = this.getType(); final String discType = this.getType();
@@ -211,7 +211,7 @@ public class CostDiscard extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final String type = this.getType(); final String type = this.getType();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
final CardList hand = activator.getCardsIn(Zone.Hand); final CardList hand = activator.getCardsIn(Zone.Hand);
@@ -268,7 +268,7 @@ public class CostDiscard extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @param nNeeded * @param nNeeded
@@ -277,7 +277,7 @@ public class CostDiscard extends CostPartWithList {
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input inputDiscardCost(final String discType, final CardList handList, final SpellAbility sa, public static Input inputDiscardCost(final String discType, final CardList handList, final SpellAbility sa,
final Cost_Payment payment, final CostDiscard part, final int nNeeded) { final CostPayment payment, final CostDiscard part, final int nNeeded) {
final SpellAbility sp = sa; final SpellAbility sp = sa;
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = -329993322080934435L; private static final long serialVersionUID = -329993322080934435L;

18
src/main/java/forge/card/cost/CostExile.java
View File

@@ -146,7 +146,7 @@ public class CostExile extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
AllZone.getGameAction().exile(c); AllZone.getGameAction().exile(c);
} }
@@ -160,7 +160,7 @@ public class CostExile extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
@@ -195,7 +195,7 @@ public class CostExile extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
this.resetList(); this.resetList();
if (this.getThis()) { if (this.getThis()) {
this.getList().add(source); this.getList().add(source);
@@ -238,7 +238,7 @@ public class CostExile extends CostPartWithList {
* @param nNeeded * @param nNeeded
* the n needed * the n needed
*/ */
public static void exileFromTop(final SpellAbility sa, final CostExile part, final Cost_Payment payment, public static void exileFromTop(final SpellAbility sa, final CostExile part, final CostPayment payment,
final int nNeeded) { final int nNeeded) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append("Exile ").append(nNeeded).append(" cards from the top of your library?"); sb.append("Exile ").append(nNeeded).append(" cards from the top of your library?");
@@ -281,7 +281,7 @@ public class CostExile extends CostPartWithList {
* @return the input * @return the input
*/ */
public static Input exileFrom(final SpellAbility sa, final CostExile part, final String type, public static Input exileFrom(final SpellAbility sa, final CostExile part, final String type,
final Cost_Payment payment, final int nNeeded) { final CostPayment payment, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 734256837615635021L; private static final long serialVersionUID = 734256837615635021L;
private CardList typeList; private CardList typeList;
@@ -350,13 +350,13 @@ public class CostExile extends CostPartWithList {
* @param type * @param type
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param nNeeded * @param nNeeded
* the n needed * the n needed
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input exileType(final SpellAbility sa, final CostExile part, final String type, public static Input exileType(final SpellAbility sa, final CostExile part, final String type,
final Cost_Payment payment, final int nNeeded) { final CostPayment payment, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 1403915758082824694L; private static final long serialVersionUID = 1403915758082824694L;
@@ -434,12 +434,12 @@ public class CostExile extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* the part * the part
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input exileThis(final SpellAbility sa, final Cost_Payment payment, final CostExile part) { public static Input exileThis(final SpellAbility sa, final CostPayment payment, final CostExile part) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 678668673002725001L; private static final long serialVersionUID = 678668673002725001L;

6
src/main/java/forge/card/cost/CostGainLife.java
View File

@@ -88,7 +88,7 @@ public class CostGainLife extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
AllZone.getHumanPlayer().gainLife(this.getLastPaidAmount(), null); AllZone.getHumanPlayer().gainLife(this.getLastPaidAmount(), null);
} }
@@ -100,7 +100,7 @@ public class CostGainLife extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
final int life = activator.getLife(); final int life = activator.getLife();
@@ -139,7 +139,7 @@ public class CostGainLife extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
Integer c = this.convertAmount(); Integer c = this.convertAmount();

20
src/main/java/forge/card/cost/CostMana.java
View File

@@ -14,7 +14,7 @@ import forge.card.abilityFactory.AbilityFactory;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.gui.input.Input; import forge.gui.input.Input;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* The Class CostMana. * The Class CostMana.
@@ -170,7 +170,7 @@ public class CostMana extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
ComputerUtil.payManaCost(ability); ComputerUtil.payManaCost(ability);
} }
@@ -182,7 +182,7 @@ public class CostMana extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
int manaToAdd = 0; int manaToAdd = 0;
if (!this.hasNoXManaCost()) { if (!this.hasNoXManaCost()) {
// if X cost is a defined value, other than xPaid // if X cost is a defined value, other than xPaid
@@ -212,7 +212,7 @@ public class CostMana extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
return true; return true;
} }
@@ -226,7 +226,7 @@ public class CostMana extends CostPart {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param costMana * @param costMana
* TODO * TODO
* @param numX * @param numX
@@ -234,7 +234,7 @@ public class CostMana extends CostPart {
* *
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input inputPayXMana(final SpellAbility sa, final Cost_Payment payment, final CostMana costMana, public static Input inputPayXMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana,
final int numX) { final int numX) {
final Input payX = new Input() { final Input payX = new Input() {
private static final long serialVersionUID = -6900234444347364050L; private static final long serialVersionUID = -6900234444347364050L;
@@ -268,7 +268,7 @@ public class CostMana extends CostPart {
return; return;
} }
this.manaCost = Input_PayManaCostUtil.activateManaAbility(sa, card, this.manaCost); this.manaCost = InputPayManaCostUtil.activateManaAbility(sa, card, this.manaCost);
if (this.manaCost.isPaid()) { if (this.manaCost.isPaid()) {
this.manaCost = new ManaCost(Integer.toString(numX)); this.manaCost = new ManaCost(Integer.toString(numX));
this.xPaid++; this.xPaid++;
@@ -306,14 +306,14 @@ public class CostMana extends CostPart {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param costMana * @param costMana
* the cost mana * the cost mana
* @param manaToAdd * @param manaToAdd
* a int. * a int.
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input inputPayMana(final SpellAbility sa, final Cost_Payment payment, final CostMana costMana, public static Input inputPayMana(final SpellAbility sa, final CostPayment payment, final CostMana costMana,
final int manaToAdd) { final int manaToAdd) {
final ManaCost manaCost; final ManaCost manaCost;
@@ -351,7 +351,7 @@ public class CostMana extends CostPart {
return; return;
} }
this.mana = Input_PayManaCostUtil.activateManaAbility(sa, card, this.mana); this.mana = InputPayManaCostUtil.activateManaAbility(sa, card, this.mana);
if (this.mana.isPaid()) { if (this.mana.isPaid()) {
this.done(); this.done();

6
src/main/java/forge/card/cost/CostMill.java
View File

@@ -63,7 +63,7 @@ public class CostMill extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
this.resetList(); this.resetList();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
@@ -93,7 +93,7 @@ public class CostMill extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
AllZone.getGameAction().moveToGraveyard(c); AllZone.getGameAction().moveToGraveyard(c);
} }
@@ -107,7 +107,7 @@ public class CostMill extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();

6
src/main/java/forge/card/cost/CostPart.java
View File

@@ -174,7 +174,7 @@ public abstract class CostPart {
* the payment * the payment
* @return true, if successful * @return true, if successful
*/ */
public abstract boolean decideAIPayment(SpellAbility ability, Card source, Cost_Payment payment); public abstract boolean decideAIPayment(SpellAbility ability, Card source, CostPayment payment);
/** /**
* Pay ai. * Pay ai.
@@ -186,7 +186,7 @@ public abstract class CostPart {
* @param payment * @param payment
* the payment * the payment
*/ */
public abstract void payAI(SpellAbility ability, Card source, Cost_Payment payment); public abstract void payAI(SpellAbility ability, Card source, CostPayment payment);
/** /**
* Pay human. * Pay human.
@@ -199,7 +199,7 @@ public abstract class CostPart {
* the payment * the payment
* @return true, if successful * @return true, if successful
*/ */
public abstract boolean payHuman(SpellAbility ability, Card source, Cost_Payment payment); public abstract boolean payHuman(SpellAbility ability, Card source, CostPayment payment);
/* /*
* (non-Javadoc) * (non-Javadoc)

6
src/main/java/forge/card/cost/CostPayLife.java
View File

@@ -89,7 +89,7 @@ public class CostPayLife extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
AllZone.getComputerPlayer().payLife(this.getLastPaidAmount(), null); AllZone.getComputerPlayer().payLife(this.getLastPaidAmount(), null);
} }
@@ -101,7 +101,7 @@ public class CostPayLife extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
final int life = activator.getLife(); final int life = activator.getLife();
@@ -140,7 +140,7 @@ public class CostPayLife extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
Integer c = this.convertAmount(); Integer c = this.convertAmount();

14
src/main/java/forge/card/cost/Cost_Payment.java → src/main/java/forge/card/cost/CostPayment.java
View File

@@ -8,7 +8,7 @@ import forge.AllZone;
import forge.Card; import forge.Card;
import forge.Player; import forge.Player;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbility_Requirements; import forge.card.spellability.SpellAbilityRequirements;
/** /**
* <p> * <p>
@@ -18,11 +18,11 @@ import forge.card.spellability.SpellAbility_Requirements;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Cost_Payment { public class CostPayment {
private Cost cost = null; private Cost cost = null;
private SpellAbility ability = null; private SpellAbility ability = null;
private Card card = null; private Card card = null;
private SpellAbility_Requirements req = null; private SpellAbilityRequirements req = null;
private boolean bCancel = false; private boolean bCancel = false;
private final Map<CostPart, Boolean> paidCostParts = new HashMap<CostPart, Boolean>(); private final Map<CostPart, Boolean> paidCostParts = new HashMap<CostPart, Boolean>();
@@ -65,10 +65,10 @@ public class Cost_Payment {
* </p> * </p>
* *
* @param reqs * @param reqs
* a {@link forge.card.spellability.SpellAbility_Requirements} * a {@link forge.card.spellability.SpellAbilityRequirements}
* object. * object.
*/ */
public final void setRequirements(final SpellAbility_Requirements reqs) { public final void setRequirements(final SpellAbilityRequirements reqs) {
this.req = reqs; this.req = reqs;
} }
@@ -77,7 +77,7 @@ public class Cost_Payment {
* *
* @return the requirements * @return the requirements
*/ */
public final SpellAbility_Requirements getRequirements() { public final SpellAbilityRequirements getRequirements() {
return this.req; return this.req;
} }
@@ -114,7 +114,7 @@ public class Cost_Payment {
* @param abil * @param abil
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public Cost_Payment(final Cost cost, final SpellAbility abil) { public CostPayment(final Cost cost, final SpellAbility abil) {
this.cost = cost; this.cost = cost;
this.ability = abil; this.ability = abil;
this.card = abil.getSourceCard(); this.card = abil.getSourceCard();

10
src/main/java/forge/card/cost/CostPutCounter.java
View File

@@ -136,7 +136,7 @@ public class CostPutCounter extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
Integer c = this.convertAmount(); Integer c = this.convertAmount();
if (c == null) { if (c == null) {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); c = AbilityFactory.calculateAmount(source, this.getAmount(), ability);
@@ -160,7 +160,7 @@ public class CostPutCounter extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
Integer c = this.convertAmount(); Integer c = this.convertAmount();
if (c == null) { if (c == null) {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); c = AbilityFactory.calculateAmount(source, this.getAmount(), ability);
@@ -185,7 +185,7 @@ public class CostPutCounter extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
this.resetList(); this.resetList();
if (this.getThis()) { if (this.getThis()) {
this.addToList(source); this.addToList(source);
@@ -221,14 +221,14 @@ public class CostPutCounter extends CostPartWithList {
* @param type * @param type
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param costPutCounter * @param costPutCounter
* TODO * TODO
* @param nNeeded * @param nNeeded
* the n needed * the n needed
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input putCounterType(final SpellAbility sa, final String type, final Cost_Payment payment, public static Input putCounterType(final SpellAbility sa, final String type, final CostPayment payment,
final CostPutCounter costPutCounter, final int nNeeded) { final CostPutCounter costPutCounter, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 2685832214519141903L; private static final long serialVersionUID = 2685832214519141903L;

6
src/main/java/forge/card/cost/CostRemoveCounter.java
View File

@@ -118,7 +118,7 @@ public class CostRemoveCounter extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
Integer c = this.convertAmount(); Integer c = this.convertAmount();
if (c == null) { if (c == null) {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); c = AbilityFactory.calculateAmount(source, this.getAmount(), ability);
@@ -134,7 +134,7 @@ public class CostRemoveCounter extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
final Counters type = this.getCounter(); final Counters type = this.getCounter();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
@@ -175,7 +175,7 @@ public class CostRemoveCounter extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
Integer c = this.convertAmount(); Integer c = this.convertAmount();
if (c == null) { if (c == null) {
final String sVar = source.getSVar(this.getAmount()); final String sVar = source.getSVar(this.getAmount());

14
src/main/java/forge/card/cost/CostReturn.java
View File

@@ -109,7 +109,7 @@ public class CostReturn extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
AllZone.getGameAction().moveToHand(c); AllZone.getGameAction().moveToHand(c);
} }
@@ -123,7 +123,7 @@ public class CostReturn extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
@@ -153,7 +153,7 @@ public class CostReturn extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
this.resetList(); this.resetList();
if (this.getThis()) { if (this.getThis()) {
this.getList().add(source); this.getList().add(source);
@@ -183,14 +183,14 @@ public class CostReturn extends CostPartWithList {
* @param type * @param type
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @param nNeeded * @param nNeeded
* the n needed * the n needed
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input returnType(final SpellAbility sa, final String type, final Cost_Payment payment, public static Input returnType(final SpellAbility sa, final String type, final CostPayment payment,
final CostReturn part, final int nNeeded) { final CostReturn part, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 2685832214519141903L; private static final long serialVersionUID = 2685832214519141903L;
@@ -265,12 +265,12 @@ public class CostReturn extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input returnThis(final SpellAbility sa, final Cost_Payment payment, final CostReturn part) { public static Input returnThis(final SpellAbility sa, final CostPayment payment, final CostReturn part) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 2685832214519141903L; private static final long serialVersionUID = 2685832214519141903L;

10
src/main/java/forge/card/cost/CostReveal.java
View File

@@ -70,7 +70,7 @@ public class CostReveal extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final String type = this.getType(); final String type = this.getType();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
CardList hand = activator.getCardsIn(Zone.Hand); CardList hand = activator.getCardsIn(Zone.Hand);
@@ -106,7 +106,7 @@ public class CostReveal extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
GuiUtils.getChoiceOptional("Revealed cards:", this.getList().toArray()); GuiUtils.getChoiceOptional("Revealed cards:", this.getList().toArray());
} }
@@ -118,7 +118,7 @@ public class CostReveal extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
final String amount = this.getAmount(); final String amount = this.getAmount();
this.resetList(); this.resetList();
@@ -200,7 +200,7 @@ public class CostReveal extends CostPartWithList {
* @param handList * @param handList
* a {@link forge.CardList} object. * a {@link forge.CardList} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @param sa * @param sa
@@ -209,7 +209,7 @@ public class CostReveal extends CostPartWithList {
* a int. * a int.
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input inputRevealCost(final String discType, final CardList handList, final Cost_Payment payment, public static Input inputRevealCost(final String discType, final CardList handList, final CostPayment payment,
final CostReveal part, final SpellAbility sa, final int nNeeded) { final CostReveal part, final SpellAbility sa, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = -329993322080934435L; private static final long serialVersionUID = -329993322080934435L;

18
src/main/java/forge/card/cost/CostSacrifice.java
View File

@@ -107,7 +107,7 @@ public class CostSacrifice extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
AllZone.getGameAction().sacrifice(c); AllZone.getGameAction().sacrifice(c);
} }
@@ -121,7 +121,7 @@ public class CostSacrifice extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount(); final String amount = this.getAmount();
final String type = this.getType(); final String type = this.getType();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
@@ -161,7 +161,7 @@ public class CostSacrifice extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
this.resetList(); this.resetList();
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
if (this.getThis()) { if (this.getThis()) {
@@ -198,13 +198,13 @@ public class CostSacrifice extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @param typeList * @param typeList
* TODO * TODO
*/ */
public static void sacrificeAll(final SpellAbility sa, final Cost_Payment payment, final CostPart part, public static void sacrificeAll(final SpellAbility sa, final CostPayment payment, final CostPart part,
final CardList typeList) { final CardList typeList) {
// TODO Ask First // TODO Ask First
for (final Card card : typeList) { for (final Card card : typeList) {
@@ -223,7 +223,7 @@ public class CostSacrifice extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @param typeList * @param typeList
@@ -232,7 +232,7 @@ public class CostSacrifice extends CostPartWithList {
* the n needed * the n needed
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input sacrificeFromList(final SpellAbility sa, final Cost_Payment payment, final CostSacrifice part, public static Input sacrificeFromList(final SpellAbility sa, final CostPayment payment, final CostSacrifice part,
final CardList typeList, final int nNeeded) { final CardList typeList, final int nNeeded) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 2685832214519141903L; private static final long serialVersionUID = 2685832214519141903L;
@@ -304,12 +304,12 @@ public class CostSacrifice extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param part * @param part
* TODO * TODO
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input sacrificeThis(final SpellAbility sa, final Cost_Payment payment, final CostSacrifice part) { public static Input sacrificeThis(final SpellAbility sa, final CostPayment payment, final CostSacrifice part) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 2685832214519141903L; private static final long serialVersionUID = 2685832214519141903L;

6
src/main/java/forge/card/cost/CostTap.java
View File

@@ -56,7 +56,7 @@ public class CostTap extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
source.tap(); source.tap();
} }
@@ -68,7 +68,7 @@ public class CostTap extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
// if (!canPay(ability, source, ability.getActivatingPlayer(), // if (!canPay(ability, source, ability.getActivatingPlayer(),
// payment.getCost())) // payment.getCost()))
// return false; // return false;
@@ -86,7 +86,7 @@ public class CostTap extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
return true; return true;
} }
} }

10
src/main/java/forge/card/cost/CostTapType.java
View File

@@ -120,7 +120,7 @@ public class CostTapType extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
for (final Card c : this.getList()) { for (final Card c : this.getList()) {
c.tap(); c.tap();
} }
@@ -134,7 +134,7 @@ public class CostTapType extends CostPartWithList {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
CardList typeList = ability.getActivatingPlayer().getCardsIn(Zone.Battlefield); CardList typeList = ability.getActivatingPlayer().getCardsIn(Zone.Battlefield);
typeList = typeList.getValidCards(this.getType().split(";"), ability.getActivatingPlayer(), typeList = typeList.getValidCards(this.getType().split(";"), ability.getActivatingPlayer(),
ability.getSourceCard()); ability.getSourceCard());
@@ -163,7 +163,7 @@ public class CostTapType extends CostPartWithList {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final boolean tap = payment.getCost().getTap(); final boolean tap = payment.getCost().getTap();
final Integer c = this.convertAmount(); final Integer c = this.convertAmount();
if (c == null) { if (c == null) {
@@ -194,13 +194,13 @@ public class CostTapType extends CostPartWithList {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param payment * @param payment
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
* @param nCards * @param nCards
* a int. * a int.
* @return a {@link forge.gui.input.Input} object. * @return a {@link forge.gui.input.Input} object.
*/ */
public static Input inputTapXCost(final CostTapType tapType, final CardList cardList, final SpellAbility sa, public static Input inputTapXCost(final CostTapType tapType, final CardList cardList, final SpellAbility sa,
final Cost_Payment payment, final int nCards) { final CostPayment payment, final int nCards) {
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = 6438988130447851042L; private static final long serialVersionUID = 6438988130447851042L;

6
src/main/java/forge/card/cost/CostUntap.java
View File

@@ -56,7 +56,7 @@ public class CostUntap extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
source.untap(); source.untap();
} }
@@ -68,7 +68,7 @@ public class CostUntap extends CostPart {
* forge.Card, forge.card.cost.Cost_Payment) * forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean payHuman(final SpellAbility ability, final Card source, final CostPayment payment) {
// if (!canPay(ability, source, ability.getActivatingPlayer(), // if (!canPay(ability, source, ability.getActivatingPlayer(),
// payment.getCost())) // payment.getCost()))
// return false; // return false;
@@ -86,7 +86,7 @@ public class CostUntap extends CostPart {
* , forge.Card, forge.card.cost.Cost_Payment) * , forge.Card, forge.card.cost.Cost_Payment)
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final Cost_Payment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
return true; return true;
} }
} }

6
src/main/java/forge/card/mana/Mana.java
View File

@@ -2,7 +2,7 @@ package forge.card.mana;
import forge.Card; import forge.Card;
import forge.Constant; import forge.Constant;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -55,7 +55,7 @@ public class Mana {
String manaString = ""; String manaString = "";
final StringBuilder sbMana = new StringBuilder(); final StringBuilder sbMana = new StringBuilder();
manaString = Input_PayManaCostUtil.getShortColorString(this.color); manaString = InputPayManaCostUtil.getShortColorString(this.color);
for (int i = 0; i < this.amount; i++) { for (int i = 0; i < this.amount; i++) {
sbMana.append(manaString); sbMana.append(manaString);
@@ -79,7 +79,7 @@ public class Mana {
String manaString = ""; String manaString = "";
final StringBuilder sbMana = new StringBuilder(); final StringBuilder sbMana = new StringBuilder();
manaString = Input_PayManaCostUtil.getShortColorString(this.color); manaString = InputPayManaCostUtil.getShortColorString(this.color);
for (int i = 0; i < this.amount; i++) { for (int i = 0; i < this.amount; i++) {
sbMana.append(manaString); sbMana.append(manaString);

110
src/main/java/forge/card/mana/ManaCost.java
View File

@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import forge.Constant; import forge.Constant;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -102,11 +102,11 @@ public class ManaCost {
* *
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
private ArrayList<Mana_PartPhyrexian> getUnpaidPhyrexianMana() { private ArrayList<ManaPartPhyrexian> getUnpaidPhyrexianMana() {
final ArrayList<Mana_PartPhyrexian> res = new ArrayList<Mana_PartPhyrexian>(); final ArrayList<ManaPartPhyrexian> res = new ArrayList<ManaPartPhyrexian>();
for (final Object o : this.manaPart) { for (final Object o : this.manaPart) {
if (o instanceof Mana_PartPhyrexian) { if (o instanceof ManaPartPhyrexian) {
final Mana_PartPhyrexian phy = (Mana_PartPhyrexian) o; final ManaPartPhyrexian phy = (ManaPartPhyrexian) o;
if (!phy.isPaid()) { if (!phy.isPaid()) {
res.add(phy); res.add(phy);
@@ -126,7 +126,7 @@ public class ManaCost {
*/ */
public final boolean containsPhyrexianMana() { public final boolean containsPhyrexianMana() {
for (final Object o : this.manaPart) { for (final Object o : this.manaPart) {
if (o instanceof Mana_PartPhyrexian) { if (o instanceof ManaPartPhyrexian) {
return true; return true;
} }
} }
@@ -142,7 +142,7 @@ public class ManaCost {
* @return a boolean. * @return a boolean.
*/ */
public final boolean payPhyrexian() { public final boolean payPhyrexian() {
final ArrayList<Mana_PartPhyrexian> phy = this.getUnpaidPhyrexianMana(); final ArrayList<ManaPartPhyrexian> phy = this.getUnpaidPhyrexianMana();
if (phy.size() > 0) { if (phy.size() > 0) {
phy.get(0).payLife(); phy.get(0).payLife();
@@ -194,11 +194,11 @@ public class ManaCost {
} }
} }
if (mana.length() > 1) { if (mana.length() > 1) {
mana = Input_PayManaCostUtil.getShortColorString(mana); mana = InputPayManaCostUtil.getShortColorString(mana);
} }
Mana_Part m; ManaPart m;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
m = (Mana_Part) this.manaPart.get(i); m = (ManaPart) this.manaPart.get(i);
if (m.isNeeded(mana)) { if (m.isNeeded(mana)) {
return true; return true;
} }
@@ -216,13 +216,13 @@ public class ManaCost {
* @return a boolean. * @return a boolean.
*/ */
public final boolean isNeeded(final Mana mana) { public final boolean isNeeded(final Mana mana) {
Mana_Part m; ManaPart m;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
m = (Mana_Part) this.manaPart.get(i); m = (ManaPart) this.manaPart.get(i);
if (m.isNeeded(mana)) { if (m.isNeeded(mana)) {
return true; return true;
} }
if ((m instanceof Mana_PartSnow) && mana.isSnow()) { if ((m instanceof ManaPartSnow) && mana.isSnow()) {
return true; return true;
} }
} }
@@ -237,9 +237,9 @@ public class ManaCost {
* @return a boolean. * @return a boolean.
*/ */
public final boolean isPaid() { public final boolean isPaid() {
Mana_Part m; ManaPart m;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
m = (Mana_Part) this.manaPart.get(i); m = (ManaPart) this.manaPart.get(i);
if (!m.isPaid()) { if (!m.isPaid()) {
return false; return false;
} }
@@ -273,7 +273,7 @@ public class ManaCost {
if (this.manaNeededToAvoidNegativeEffect.contains(color) && !this.manaPaidToAvoidNegativeEffect.contains(color)) { if (this.manaNeededToAvoidNegativeEffect.contains(color) && !this.manaPaidToAvoidNegativeEffect.contains(color)) {
this.manaPaidToAvoidNegativeEffect.add(color); this.manaPaidToAvoidNegativeEffect.add(color);
} }
color = Input_PayManaCostUtil.getShortColorString(color); color = InputPayManaCostUtil.getShortColorString(color);
return this.addMana(color); return this.addMana(color);
} }
@@ -290,15 +290,15 @@ public class ManaCost {
return; return;
} }
Mana_Part m; ManaPart m;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
m = (Mana_Part) this.manaPart.get(i); m = (ManaPart) this.manaPart.get(i);
if (m instanceof Mana_PartColorless) { if (m instanceof ManaPartColorless) {
((Mana_PartColorless) m).addToManaNeeded(manaToAdd); ((ManaPartColorless) m).addToManaNeeded(manaToAdd);
return; return;
} }
} }
this.manaPart.add(new Mana_PartColorless(manaToAdd)); this.manaPart.add(new ManaPartColorless(manaToAdd));
} }
/** /**
@@ -316,17 +316,17 @@ public class ManaCost {
return; return;
} }
Mana_Part m; ManaPart m;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
m = (Mana_Part) this.manaPart.get(i); m = (ManaPart) this.manaPart.get(i);
if (m instanceof Mana_PartColorless) { if (m instanceof ManaPartColorless) {
final int remainingColorless = ((Mana_PartColorless) m).getManaNeeded() - manaToSubtract; final int remainingColorless = ((ManaPartColorless) m).getManaNeeded() - manaToSubtract;
if (remainingColorless <= 0) { if (remainingColorless <= 0) {
this.manaPart.remove(m); this.manaPart.remove(m);
break; break;
} else { } else {
this.manaPart.remove(m); this.manaPart.remove(m);
this.manaPart.add(new Mana_PartColorless(remainingColorless)); this.manaPart.add(new ManaPartColorless(remainingColorless));
} }
} }
} }
@@ -343,8 +343,8 @@ public class ManaCost {
*/ */
public final int getColorlessManaAmount() { public final int getColorlessManaAmount() {
for (final Object m : this.manaPart) { for (final Object m : this.manaPart) {
if (m instanceof Mana_PartColorless) { if (m instanceof ManaPartColorless) {
return ((Mana_PartColorless) m).getManaNeeded(); return ((ManaPartColorless) m).getManaNeeded();
} }
} }
return 0; return 0;
@@ -364,10 +364,10 @@ public class ManaCost {
throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana); throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana);
} }
Mana_Part choice = null; ManaPart choice = null;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
final Mana_Part m = (Mana_Part) this.manaPart.get(i); final ManaPart m = (ManaPart) this.manaPart.get(i);
if (m.isNeeded(mana)) { if (m.isNeeded(mana)) {
// if m is a better to pay than choice // if m is a better to pay than choice
if (choice == null) { if (choice == null) {
@@ -408,10 +408,10 @@ public class ManaCost {
throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana); throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana);
} }
Mana_Part choice = null; ManaPart choice = null;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
final Mana_Part m = (Mana_Part) this.manaPart.get(i); final ManaPart m = (ManaPart) this.manaPart.get(i);
if (m.isNeeded(mana)) { if (m.isNeeded(mana)) {
// if m is a better to pay than choice // if m is a better to pay than choice
if (choice == null) { if (choice == null) {
@@ -449,11 +449,11 @@ public class ManaCost {
public final void combineManaCost(final String extra) { public final void combineManaCost(final String extra) {
final ArrayList<Object> extraParts = this.split(extra); final ArrayList<Object> extraParts = this.split(extra);
Mana_PartColorless part = null; ManaPartColorless part = null;
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
final Object o = this.manaPart.get(i); final Object o = this.manaPart.get(i);
if (o instanceof Mana_PartColorless) { if (o instanceof ManaPartColorless) {
part = (Mana_PartColorless) o; part = (ManaPartColorless) o;
} }
} }
if (part != null) { if (part != null) {
@@ -462,11 +462,11 @@ public class ManaCost {
while (extraParts.size() > 0) { while (extraParts.size() > 0) {
final Object o = extraParts.get(0); final Object o = extraParts.get(0);
if (o instanceof Mana_PartColorless) { if (o instanceof ManaPartColorless) {
if (part == null) { if (part == null) {
part = (Mana_PartColorless) o; part = (ManaPartColorless) o;
} else { } else {
part.addToManaNeeded(((Mana_PartColorless) o).getManaNeeded()); part.addToManaNeeded(((ManaPartColorless) o).getManaNeeded());
} }
} else { } else {
this.manaPart.add(o); this.manaPart.add(o);
@@ -526,7 +526,7 @@ public class ManaCost {
public final int getConvertedManaCost() { public final int getConvertedManaCost() {
int cmc = 0; int cmc = 0;
for (final Object s : this.manaPart) { for (final Object s : this.manaPart) {
cmc += ((Mana_Part) s).getConvertedManaCost(); cmc += ((ManaPart) s).getConvertedManaCost();
} }
return cmc; return cmc;
} }
@@ -542,8 +542,8 @@ public class ManaCost {
public final double getWeightedManaCost() { public final double getWeightedManaCost() {
double cmc = 0; double cmc = 0;
for (final Object s : this.manaPart) { for (final Object s : this.manaPart) {
cmc += ((Mana_Part) s).getConvertedManaCost(); cmc += ((ManaPart) s).getConvertedManaCost();
if (s instanceof Mana_PartColor) { if (s instanceof ManaPartColor) {
cmc += 0.0001; cmc += 0.0001;
} }
} }
@@ -567,13 +567,13 @@ public class ManaCost {
// handles costs like "3", "G", "GW", "10", "S" // handles costs like "3", "G", "GW", "10", "S"
if ((cost.length() == 1) || (cost.length() == 2)) { if ((cost.length() == 1) || (cost.length() == 2)) {
if (Character.isDigit(cost.charAt(0))) { if (Character.isDigit(cost.charAt(0))) {
list.add(new Mana_PartColorless(cost)); list.add(new ManaPartColorless(cost));
} else if (cost.charAt(0) == 'S') { } else if (cost.charAt(0) == 'S') {
list.add(new Mana_PartSnow()); list.add(new ManaPartSnow());
} else if (cost.charAt(0) == 'P') { } else if (cost.charAt(0) == 'P') {
list.add(new Mana_PartPhyrexian(cost)); list.add(new ManaPartPhyrexian(cost));
} else { } else {
list.add(new Mana_PartColor(cost)); list.add(new ManaPartColor(cost));
} }
} else { } else {
// handles "3 GW", "10 GW", "1 G G", "G G", "S 1" // handles "3 GW", "10 GW", "1 G G", "G G", "S 1"
@@ -587,14 +587,14 @@ public class ManaCost {
// ManaPartColorless needs to be added AFTER the colored mana // ManaPartColorless needs to be added AFTER the colored mana
// in order for isNeeded() and addMana() to work correctly // in order for isNeeded() and addMana() to work correctly
Object o = list.get(0); Object o = list.get(0);
if (o instanceof Mana_PartSnow) { if (o instanceof ManaPartSnow) {
// move snow cost to the end of the list // move snow cost to the end of the list
list.remove(0); list.remove(0);
list.add(o); list.add(o);
} }
o = list.get(0); o = list.get(0);
if (o instanceof Mana_PartColorless) { if (o instanceof ManaPartColorless) {
// move colorless cost to the end of the list // move colorless cost to the end of the list
list.remove(0); list.remove(0);
list.add(o); list.add(o);
@@ -611,19 +611,19 @@ public class ManaCost {
* *
* @param partCost * @param partCost
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* @return a {@link forge.card.mana.Mana_Part} object. * @return a {@link forge.card.mana.ManaPart} object.
*/ */
private Mana_Part getManaPart(final String partCost) { private ManaPart getManaPart(final String partCost) {
if (partCost.length() == 3) { if (partCost.length() == 3) {
return new Mana_PartSplit(partCost); return new ManaPartSplit(partCost);
} else if (Character.isDigit(partCost.charAt(0))) { } else if (Character.isDigit(partCost.charAt(0))) {
return new Mana_PartColorless(partCost); return new ManaPartColorless(partCost);
} else if (partCost.equals("S")) { } else if (partCost.equals("S")) {
return new Mana_PartSnow(); return new ManaPartSnow();
} else if (partCost.startsWith("P")) { } else if (partCost.startsWith("P")) {
return new Mana_PartPhyrexian(partCost); return new ManaPartPhyrexian(partCost);
} else { } else {
return new Mana_PartColor(partCost); return new ManaPartColor(partCost);
} }
} }
@@ -660,7 +660,7 @@ public class ManaCost {
public final void removeColorlessMana() { public final void removeColorlessMana() {
for (int i = 0; i < this.manaPart.size(); i++) { for (int i = 0; i < this.manaPart.size(); i++) {
if (this.manaPart.get(i) instanceof Mana_PartColorless) { if (this.manaPart.get(i) instanceof ManaPartColorless) {
this.manaPart.remove(this.manaPart.get(i)); this.manaPart.remove(this.manaPart.get(i));
} }
} }

6
src/main/java/forge/card/mana/Mana_Part.java → src/main/java/forge/card/mana/ManaPart.java
View File

@@ -8,7 +8,7 @@ package forge.card.mana;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public abstract class Mana_Part { public abstract class ManaPart {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public abstract String toString(); public abstract String toString();
@@ -92,10 +92,10 @@ public abstract class Mana_Part {
* </p> * </p>
* *
* @param mp * @param mp
* a {@link forge.card.mana.Mana_Part} object. * a {@link forge.card.mana.ManaPart} object.
* @return a boolean. * @return a boolean.
*/ */
public abstract boolean isEasierToPay(Mana_Part mp); public abstract boolean isEasierToPay(ManaPart mp);
/** /**
* <p> * <p>

18
src/main/java/forge/card/mana/Mana_PartColor.java → src/main/java/forge/card/mana/ManaPartColor.java
View File

@@ -1,6 +1,6 @@
package forge.card.mana; package forge.card.mana;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -10,7 +10,7 @@ import forge.gui.input.Input_PayManaCostUtil;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Mana_PartColor extends Mana_Part { public class ManaPartColor extends ManaPart {
private String manaCost; private String manaCost;
// String manaCostToPay is either "G" or "GW" NOT "3 G" // String manaCostToPay is either "G" or "GW" NOT "3 G"
@@ -24,11 +24,11 @@ public class Mana_PartColor extends Mana_Part {
* @param manaCostToPay * @param manaCostToPay
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Mana_PartColor(final String manaCostToPay) { public ManaPartColor(final String manaCostToPay) {
final char[] c = manaCostToPay.toCharArray(); final char[] c = manaCostToPay.toCharArray();
for (int i = 0; i < c.length; i++) { for (int i = 0; i < c.length; i++) {
if ((i != 0) || (c[i] != ' ')) { if ((i != 0) || (c[i] != ' ')) {
Mana_Part.checkSingleMana("" + c[i]); ManaPart.checkSingleMana("" + c[i]);
} }
} }
@@ -45,7 +45,7 @@ public class Mana_PartColor extends Mana_Part {
@Override @Override
public final boolean isNeeded(final String mana) { public final boolean isNeeded(final String mana) {
// ManaPart method // ManaPart method
Mana_Part.checkSingleMana(mana); ManaPart.checkSingleMana(mana);
return !this.isPaid() && this.isColor(mana); return !this.isPaid() && this.isColor(mana);
} }
@@ -60,7 +60,7 @@ public class Mana_PartColor extends Mana_Part {
@Override @Override
public final boolean isColor(final String mana) { public final boolean isColor(final String mana) {
// ManaPart method // ManaPart method
Mana_Part.checkSingleMana(mana); ManaPart.checkSingleMana(mana);
return this.manaCost.indexOf(mana) != -1; return this.manaCost.indexOf(mana) != -1;
} }
@@ -68,15 +68,15 @@ public class Mana_PartColor extends Mana_Part {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isColor(final Mana mana) { public final boolean isColor(final Mana mana) {
final String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); final String color = InputPayManaCostUtil.getShortColorString(mana.getColor());
return this.manaCost.indexOf(color) != -1; return this.manaCost.indexOf(color) != -1;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isEasierToPay(final Mana_Part mp) { public final boolean isEasierToPay(final ManaPart mp) {
if (mp instanceof Mana_PartColorless) { if (mp instanceof ManaPartColorless) {
return false; return false;
} }
return this.toString().length() >= mp.toString().length(); return this.toString().length() >= mp.toString().length();

10
src/main/java/forge/card/mana/Mana_PartColorless.java → src/main/java/forge/card/mana/ManaPartColorless.java
View File

@@ -10,7 +10,7 @@ import forge.error.ErrorViewer;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Mana_PartColorless extends Mana_Part { public class ManaPartColorless extends ManaPart {
private int manaNeeded; private int manaNeeded;
/** /**
@@ -45,7 +45,7 @@ public class Mana_PartColorless extends Mana_Part {
* @param manaCostToPay * @param manaCostToPay
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Mana_PartColorless(final String manaCostToPay) { public ManaPartColorless(final String manaCostToPay) {
try { try {
this.manaNeeded = Integer.parseInt(manaCostToPay); this.manaNeeded = Integer.parseInt(manaCostToPay);
} catch (final NumberFormatException ex) { } catch (final NumberFormatException ex) {
@@ -62,7 +62,7 @@ public class Mana_PartColorless extends Mana_Part {
* @param manaCostToPay * @param manaCostToPay
* a int. * a int.
*/ */
public Mana_PartColorless(final int manaCostToPay) { public ManaPartColorless(final int manaCostToPay) {
this.manaNeeded = manaCostToPay; this.manaNeeded = manaCostToPay;
} }
@@ -80,7 +80,7 @@ public class Mana_PartColorless extends Mana_Part {
@Override @Override
public final boolean isNeeded(final String mana) { public final boolean isNeeded(final String mana) {
// ManaPart method // ManaPart method
Mana_Part.checkSingleMana(mana); ManaPart.checkSingleMana(mana);
return 0 < this.manaNeeded; return 0 < this.manaNeeded;
} }
@@ -110,7 +110,7 @@ public class Mana_PartColorless extends Mana_Part {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isEasierToPay(final Mana_Part mp) { public final boolean isEasierToPay(final ManaPart mp) {
// Colorless is always easier to Pay for // Colorless is always easier to Pay for
return true; return true;
} }

10
src/main/java/forge/card/mana/Mana_PartPhyrexian.java → src/main/java/forge/card/mana/ManaPartPhyrexian.java
View File

@@ -8,8 +8,8 @@ package forge.card.mana;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Mana_PartPhyrexian extends Mana_Part { public class ManaPartPhyrexian extends ManaPart {
private final Mana_PartColor wrappedColor; private final ManaPartColor wrappedColor;
private final String color; private final String color;
/** /**
@@ -20,14 +20,14 @@ public class Mana_PartPhyrexian extends Mana_Part {
* @param manaCostToPay * @param manaCostToPay
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Mana_PartPhyrexian(final String manaCostToPay) { public ManaPartPhyrexian(final String manaCostToPay) {
this.wrappedColor = new Mana_PartColor(manaCostToPay.substring(1)); this.wrappedColor = new ManaPartColor(manaCostToPay.substring(1));
this.color = manaCostToPay.substring(1); this.color = manaCostToPay.substring(1);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isEasierToPay(final Mana_Part part) { public final boolean isEasierToPay(final ManaPart part) {
return true; return true;
} }

6
src/main/java/forge/card/mana/Mana_PartSnow.java → src/main/java/forge/card/mana/ManaPartSnow.java
View File

@@ -8,7 +8,7 @@ package forge.card.mana;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Mana_PartSnow extends Mana_Part { public class ManaPartSnow extends ManaPart {
private boolean isPaid = false; private boolean isPaid = false;
@@ -45,8 +45,8 @@ public class Mana_PartSnow extends Mana_Part {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isEasierToPay(final Mana_Part mp) { public final boolean isEasierToPay(final ManaPart mp) {
if (mp instanceof Mana_PartColorless) { if (mp instanceof ManaPartColorless) {
return false; return false;
} }
return this.toString().length() >= mp.toString().length(); return this.toString().length() >= mp.toString().length();

20
src/main/java/forge/card/mana/Mana_PartSplit.java → src/main/java/forge/card/mana/ManaPartSplit.java
View File

@@ -1,6 +1,6 @@
package forge.card.mana; package forge.card.mana;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
//handles mana costs like 2/R or 2/B //handles mana costs like 2/R or 2/B
//for cards like Flame Javelin (Shadowmoor) //for cards like Flame Javelin (Shadowmoor)
@@ -12,8 +12,8 @@ import forge.gui.input.Input_PayManaCostUtil;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Mana_PartSplit extends Mana_Part { public class ManaPartSplit extends ManaPart {
private Mana_Part manaPart = null; private ManaPart manaPart = null;
private String originalCost = ""; private String originalCost = "";
/** /**
@@ -24,7 +24,7 @@ public class Mana_PartSplit extends Mana_Part {
* @param manaCost * @param manaCost
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Mana_PartSplit(final String manaCost) { public ManaPartSplit(final String manaCost) {
// is mana cost like "2/R" // is mana cost like "2/R"
if (manaCost.length() != 3) { if (manaCost.length() != 3) {
throw new RuntimeException("Mana_PartSplit : constructor() error, bad mana cost parameter - " + manaCost); throw new RuntimeException("Mana_PartSplit : constructor() error, bad mana cost parameter - " + manaCost);
@@ -62,10 +62,10 @@ public class Mana_PartSplit extends Mana_Part {
// or R? if W use Mana_PartColorless, if R use Mana_PartColor // or R? if W use Mana_PartColorless, if R use Mana_PartColor
// does manaToPay contain color? // does manaToPay contain color?
if (0 <= manaToPay.indexOf(color)) { if (0 <= manaToPay.indexOf(color)) {
this.manaPart = new Mana_PartColor(color); this.manaPart = new ManaPartColor(color);
} else { } else {
// get 2 out of "2/R" // get 2 out of "2/R"
this.manaPart = new Mana_PartColorless(this.originalCost.substring(0, 1)); this.manaPart = new ManaPartColorless(this.originalCost.substring(0, 1));
} }
} // setup() } // setup()
@@ -83,7 +83,7 @@ public class Mana_PartSplit extends Mana_Part {
@Override @Override
public final void reduce(final Mana mana) { public final void reduce(final Mana mana) {
if (this.isFirstTime()) { if (this.isFirstTime()) {
this.setup(Input_PayManaCostUtil.getShortColorString(mana.getColor())); this.setup(InputPayManaCostUtil.getShortColorString(mana.getColor()));
} }
this.manaPart.reduce(mana); this.manaPart.reduce(mana);
@@ -122,15 +122,15 @@ public class Mana_PartSplit extends Mana_Part {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isColor(final Mana mana) { public final boolean isColor(final Mana mana) {
final String color = Input_PayManaCostUtil.getShortColorString(mana.getColor()); final String color = InputPayManaCostUtil.getShortColorString(mana.getColor());
final String mp = this.toString(); final String mp = this.toString();
return mp.indexOf(color) != -1; return mp.indexOf(color) != -1;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean isEasierToPay(final Mana_Part mp) { public final boolean isEasierToPay(final ManaPart mp) {
if (mp instanceof Mana_PartColorless) { if (mp instanceof ManaPartColorless) {
return false; return false;
} }
if (!this.isFirstTime()) { if (!this.isFirstTime()) {

30
src/main/java/forge/card/mana/ManaPool.java
View File

@@ -10,10 +10,10 @@ import forge.Card;
import forge.CardUtil; import forge.CardUtil;
import forge.Constant; import forge.Constant;
import forge.Player; import forge.Player;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.AbilityMana;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.gui.GuiUtils; import forge.gui.GuiUtils;
import forge.gui.input.Input_PayManaCostUtil; import forge.gui.input.InputPayManaCostUtil;
/** /**
* <p> * <p>
@@ -299,7 +299,7 @@ public class ManaPool extends Card {
int genericTotal = 0; int genericTotal = 0;
for (final String c : manaArr) { for (final String c : manaArr) {
final String longStr = Input_PayManaCostUtil.getLongColorString(c); final String longStr = InputPayManaCostUtil.getLongColorString(c);
if (longStr.equals(Constant.Color.COLORLESS)) { if (longStr.equals(Constant.Color.COLORLESS)) {
genericTotal += Integer.parseInt(c); genericTotal += Integer.parseInt(c);
} else if (color.equals("")) { } else if (color.equals("")) {
@@ -365,7 +365,7 @@ public class ManaPool extends Card {
final String[] colors = manaStr.split("/"); final String[] colors = manaStr.split("/");
boolean wantSnow = false; boolean wantSnow = false;
for (int i = 0; i < colors.length; i++) { for (int i = 0; i < colors.length; i++) {
colors[i] = Input_PayManaCostUtil.getLongColorString(colors[i]); colors[i] = InputPayManaCostUtil.getLongColorString(colors[i]);
if (colors[i].equals(Constant.Color.SNOW)) { if (colors[i].equals(Constant.Color.SNOW)) {
wantSnow = true; wantSnow = true;
} }
@@ -589,10 +589,10 @@ public class ManaPool extends Card {
* </p> * </p>
* *
* @param manaAbility * @param manaAbility
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @return an array of {@link java.lang.String} objects. * @return an array of {@link java.lang.String} objects.
*/ */
public static String[] formatMana(final Ability_Mana manaAbility) { public static String[] formatMana(final AbilityMana manaAbility) {
return ManaPool.formatMana(manaAbility.mana(), true); return ManaPool.formatMana(manaAbility.mana(), true);
} // wrapper } // wrapper
@@ -733,11 +733,11 @@ public class ManaPool extends Card {
* @param m * @param m
* a {@link forge.card.mana.ManaCost} object. * a {@link forge.card.mana.ManaCost} object.
* @param mAbilities * @param mAbilities
* a {@link forge.card.spellability.Ability_Mana} object. * a {@link forge.card.spellability.AbilityMana} object.
* @return a {@link forge.card.mana.ManaCost} object. * @return a {@link forge.card.mana.ManaCost} object.
*/ */
public final ManaCost subtractMana(final SpellAbility sa, ManaCost m, final Ability_Mana... mAbilities) { public final ManaCost subtractMana(final SpellAbility sa, ManaCost m, final AbilityMana... mAbilities) {
final ArrayList<Ability_Mana> paidAbs = sa.getPayingManaAbilities(); final ArrayList<AbilityMana> paidAbs = sa.getPayingManaAbilities();
if (mAbilities.length == 0) { if (mAbilities.length == 0) {
// paying from Mana Pool // paying from Mana Pool
@@ -750,7 +750,7 @@ public class ManaPool extends Card {
} }
// paying via Mana Abilities // paying via Mana Abilities
for (final Ability_Mana mability : mAbilities) { for (final AbilityMana mability : mAbilities) {
paidAbs.add(mability); paidAbs.add(mability);
final String[] cost = ManaPool.formatMana(mability); final String[] cost = ManaPool.formatMana(mability);
m = this.subtractMultiple(sa, cost, m); m = this.subtractMultiple(sa, cost, m);
@@ -858,7 +858,7 @@ public class ManaPool extends Card {
* a boolean. * a boolean.
*/ */
public final void clearPay(final SpellAbility ability, final boolean refund) { public final void clearPay(final SpellAbility ability, final boolean refund) {
final ArrayList<Ability_Mana> payAbs = ability.getPayingManaAbilities(); final ArrayList<AbilityMana> payAbs = ability.getPayingManaAbilities();
final ArrayList<Mana> payMana = ability.getPayingMana(); final ArrayList<Mana> payMana = ability.getPayingMana();
payAbs.clear(); payAbs.clear();
@@ -897,7 +897,7 @@ public class ManaPool extends Card {
final boolean flag = false; final boolean flag = false;
String manaStr = mana[i]; String manaStr = mana[i];
String color = Input_PayManaCostUtil.getLongColorString(manaStr); String color = InputPayManaCostUtil.getLongColorString(manaStr);
if (!usePay && (this.floatingMana.size() == 0)) { if (!usePay && (this.floatingMana.size() == 0)) {
return false; return false;
@@ -925,7 +925,7 @@ public class ManaPool extends Card {
manaStr = mana[i]; manaStr = mana[i];
} }
} }
color = Input_PayManaCostUtil.getLongColorString(manaStr); color = InputPayManaCostUtil.getLongColorString(manaStr);
if (usePay) { if (usePay) {
removePaying.add(m); removePaying.add(m);
} else { } else {
@@ -974,10 +974,10 @@ public class ManaPool extends Card {
public final void unpaid(final SpellAbility sa, final boolean untap) { public final void unpaid(final SpellAbility sa, final boolean untap) {
// TODO having some crash in here related to undo and not tracking // TODO having some crash in here related to undo and not tracking
// abilities properly // abilities properly
final ArrayList<Ability_Mana> payAbs = sa.getPayingManaAbilities(); final ArrayList<AbilityMana> payAbs = sa.getPayingManaAbilities();
// go through paidAbilities if they are undoable // go through paidAbilities if they are undoable
for (final Ability_Mana am : payAbs) { for (final AbilityMana am : payAbs) {
if (am.isUndoable()) { if (am.isUndoable()) {
final String[] formattedMana = ManaPool.formatMana(am); final String[] formattedMana = ManaPool.formatMana(am);
if (this.accountFor(sa, formattedMana, am.getSourceCard())) { if (this.accountFor(sa, formattedMana, am.getSourceCard())) {

12
src/main/java/forge/card/spellability/Ability_Activated.java → src/main/java/forge/card/spellability/AbilityActivated.java
View File

@@ -10,7 +10,7 @@ import forge.CardListFilter;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.Player; import forge.Player;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.Cost_Payment; import forge.card.cost.CostPayment;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
/** /**
@@ -21,7 +21,7 @@ import forge.card.staticAbility.StaticAbility;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public abstract class Ability_Activated extends SpellAbility implements java.io.Serializable { public abstract class AbilityActivated extends SpellAbility implements java.io.Serializable {
/** Constant <code>serialVersionUID=1L</code>. */ /** Constant <code>serialVersionUID=1L</code>. */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public abstract class Ability_Activated extends SpellAbility implements java.io.
* @param manacost * @param manacost
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Ability_Activated(final Card card, final String manacost) { public AbilityActivated(final Card card, final String manacost) {
this(card, new Cost(manacost, card.getName(), true), null); this(card, new Cost(manacost, card.getName(), true), null);
} }
@@ -51,7 +51,7 @@ public abstract class Ability_Activated extends SpellAbility implements java.io.
* @param tgt * @param tgt
* a {@link forge.card.spellability.Target} object. * a {@link forge.card.spellability.Target} object.
*/ */
public Ability_Activated(final Card sourceCard, final Cost abCost, final Target tgt) { public AbilityActivated(final Card sourceCard, final Cost abCost, final Target tgt) {
super(SpellAbility.getAbility(), sourceCard); super(SpellAbility.getAbility(), sourceCard);
this.setManaCost(abCost.getTotalMana()); this.setManaCost(abCost.getTotalMana());
this.setPayCosts(abCost); this.setPayCosts(abCost);
@@ -101,7 +101,7 @@ public abstract class Ability_Activated extends SpellAbility implements java.io.
} }
}); });
if ((pithing.size() != 0) && !(this instanceof Ability_Mana)) { if ((pithing.size() != 0) && !(this instanceof AbilityMana)) {
return false; return false;
} }
@@ -109,6 +109,6 @@ public abstract class Ability_Activated extends SpellAbility implements java.io.
return false; return false;
} }
return Cost_Payment.canPayAdditionalCosts(this.getPayCosts(), this); return CostPayment.canPayAdditionalCosts(this.getPayCosts(), this);
} }
} }

14
src/main/java/forge/card/spellability/Ability_Mana.java → src/main/java/forge/card/spellability/AbilityMana.java
View File

@@ -17,7 +17,7 @@ import forge.card.mana.ManaPool;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public abstract class Ability_Mana extends Ability_Activated implements java.io.Serializable { public abstract class AbilityMana extends AbilityActivated implements java.io.Serializable {
/** Constant <code>serialVersionUID=-6816356991224950520L</code>. */ /** Constant <code>serialVersionUID=-6816356991224950520L</code>. */
private static final long serialVersionUID = -6816356991224950520L; private static final long serialVersionUID = -6816356991224950520L;
@@ -45,7 +45,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io.
* @param produced * @param produced
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Ability_Mana(final Card sourceCard, final String parse, final String produced) { public AbilityMana(final Card sourceCard, final String parse, final String produced) {
this(sourceCard, parse, produced, 1); this(sourceCard, parse, produced, 1);
} }
@@ -63,7 +63,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io.
* @param num * @param num
* a int. * a int.
*/ */
public Ability_Mana(final Card sourceCard, final String parse, final String produced, final int num) { public AbilityMana(final Card sourceCard, final String parse, final String produced, final int num) {
this(sourceCard, new Cost(parse, sourceCard.getName(), true), produced, num); this(sourceCard, new Cost(parse, sourceCard.getName(), true), produced, num);
} }
@@ -79,7 +79,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io.
* @param produced * @param produced
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Ability_Mana(final Card sourceCard, final Cost cost, final String produced) { public AbilityMana(final Card sourceCard, final Cost cost, final String produced) {
this(sourceCard, cost, produced, 1); this(sourceCard, cost, produced, 1);
} }
@@ -97,7 +97,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io.
* @param num * @param num
* a int. * a int.
*/ */
public Ability_Mana(final Card sourceCard, final Cost cost, final String produced, final int num) { public AbilityMana(final Card sourceCard, final Cost cost, final String produced, final int num) {
super(sourceCard, cost, null); super(sourceCard, cost, null);
this.origProduced = produced; this.origProduced = produced;
@@ -346,11 +346,11 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io.
@Override @Override
public final boolean equals(final Object o) { public final boolean equals(final Object o) {
// Mana abilities with same Descriptions are "equal" // Mana abilities with same Descriptions are "equal"
if ((o == null) || !(o instanceof Ability_Mana)) { if ((o == null) || !(o instanceof AbilityMana)) {
return false; return false;
} }
final Ability_Mana abm = (Ability_Mana) o; final AbilityMana abm = (AbilityMana) o;
if (abm.getType() != this.getType()) { if (abm.getType() != this.getType()) {
return false; return false;

4
src/main/java/forge/card/spellability/Ability_Static.java → src/main/java/forge/card/spellability/AbilityStatic.java
View File

@@ -10,7 +10,7 @@ import forge.Card;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public abstract class Ability_Static extends Ability { public abstract class AbilityStatic extends Ability {
/** /**
* <p> * <p>
* Constructor for Ability_Static. * Constructor for Ability_Static.
@@ -21,7 +21,7 @@ public abstract class Ability_Static extends Ability {
* @param manaCost * @param manaCost
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
*/ */
public Ability_Static(final Card sourceCard, final String manaCost) { public AbilityStatic(final Card sourceCard, final String manaCost) {
super(sourceCard, manaCost); super(sourceCard, manaCost);
} }
} }

4
src/main/java/forge/card/spellability/Ability_Sub.java → src/main/java/forge/card/spellability/AbilitySub.java
View File

@@ -10,7 +10,7 @@ import forge.Card;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public abstract class Ability_Sub extends SpellAbility implements java.io.Serializable { public abstract class AbilitySub extends SpellAbility implements java.io.Serializable {
/** Constant <code>serialVersionUID=4650634415821733134L</code>. */ /** Constant <code>serialVersionUID=4650634415821733134L</code>. */
private static final long serialVersionUID = 4650634415821733134L; private static final long serialVersionUID = 4650634415821733134L;
@@ -26,7 +26,7 @@ public abstract class Ability_Sub extends SpellAbility implements java.io.Serial
* @param tgt * @param tgt
* a {@link forge.card.spellability.Target} object. * a {@link forge.card.spellability.Target} object.
*/ */
public Ability_Sub(final Card sourceCard, final Target tgt) { public AbilitySub(final Card sourceCard, final Target tgt) {
super(SpellAbility.getAbility(), sourceCard); super(SpellAbility.getAbility(), sourceCard);
this.setTarget(tgt); this.setTarget(tgt);
} }

12
src/main/java/forge/card/spellability/Ability_Triggered.java → src/main/java/forge/card/spellability/AbilityTriggered.java
View File

@@ -15,7 +15,7 @@ import forge.ZCTrigger;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Ability_Triggered extends Ability implements Command { public class AbilityTriggered extends Ability implements Command {
/** /**
* *
@@ -62,14 +62,14 @@ public class Ability_Triggered extends Ability implements Command {
* @param situation * @param situation
* a {@link forge.ZCTrigger} object. * a {@link forge.ZCTrigger} object.
*/ */
public Ability_Triggered(final Card sourceCard, final Command sourceCommand, final ZCTrigger situation) { public AbilityTriggered(final Card sourceCard, final Command sourceCommand, final ZCTrigger situation) {
super(sourceCard, "0"); super(sourceCard, "0");
this.setTrigger(true); this.setTrigger(true);
this.todo = sourceCommand; this.todo = sourceCommand;
this.trigger = situation; this.trigger = situation;
if (this.todo instanceof Ability_Triggered) { if (this.todo instanceof AbilityTriggered) {
this.setStackDescription(((SpellAbility) this.todo).getStackDescription()); this.setStackDescription(((SpellAbility) this.todo).getStackDescription());
this.restrictions = ((Ability_Triggered) this.todo).restrictions; this.restrictions = ((AbilityTriggered) this.todo).restrictions;
} else { } else {
this.setStackDescription("Triggered ability: " + sourceCard + " " + situation); this.setStackDescription("Triggered ability: " + sourceCard + " " + situation);
this.restrictions = new String[] { "named " + sourceCard.getName() }; this.restrictions = new String[] { "named " + sourceCard.getName() };
@@ -137,10 +137,10 @@ public class Ability_Triggered extends Ability implements Command {
public final boolean equals(final Object o) { public final boolean equals(final Object o) {
// TODO triggers affecting other // TODO triggers affecting other
// cards // cards
if (!(o instanceof Ability_Triggered)) { if (!(o instanceof AbilityTriggered)) {
return false; return false;
} }
final Ability_Triggered tmp = (Ability_Triggered) o; final AbilityTriggered tmp = (AbilityTriggered) o;
return tmp.getSourceCard().equals(this.getSourceCard()) && tmp.trigger.equals(this.trigger) return tmp.getSourceCard().equals(this.getSourceCard()) && tmp.trigger.equals(this.trigger)
&& tmp.todo.equals(this.todo) && Arrays.equals(tmp.restrictions, this.restrictions); && tmp.todo.equals(this.todo) && Arrays.equals(tmp.restrictions, this.restrictions);
} }

4
src/main/java/forge/card/spellability/Spell.java
View File

@@ -11,7 +11,7 @@ import forge.Constant.Zone;
import forge.Phase; import forge.Phase;
import forge.Player; import forge.Player;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.cost.Cost_Payment; import forge.card.cost.CostPayment;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
@@ -95,7 +95,7 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
} }
if (this.getPayCosts() != null) { if (this.getPayCosts() != null) {
if (!Cost_Payment.canPayAdditionalCosts(this.getPayCosts(), this)) { if (!CostPayment.canPayAdditionalCosts(this.getPayCosts(), this)) {
return false; return false;
} }
} }

42
src/main/java/forge/card/spellability/SpellAbility.java
View File

@@ -88,14 +88,14 @@ public abstract class SpellAbility {
/** The chosen target. */ /** The chosen target. */
private Target chosenTarget = null; private Target chosenTarget = null;
private SpellAbility_Restriction restrictions = new SpellAbility_Restriction(); private SpellAbilityRestriction restrictions = new SpellAbilityRestriction();
private SpellAbility_Condition conditions = new SpellAbility_Condition(); private SpellAbilityCondition conditions = new SpellAbilityCondition();
private Ability_Sub subAbility = null; private AbilitySub subAbility = null;
private AbilityFactory abilityFactory = null; private AbilityFactory abilityFactory = null;
private final ArrayList<Mana> payingMana = new ArrayList<Mana>(); private final ArrayList<Mana> payingMana = new ArrayList<Mana>();
private final ArrayList<Ability_Mana> paidAbilities = new ArrayList<Ability_Mana>(); private final ArrayList<AbilityMana> paidAbilities = new ArrayList<AbilityMana>();
private HashMap<String, CardList> paidLists = new HashMap<String, CardList>(); private HashMap<String, CardList> paidLists = new HashMap<String, CardList>();
@@ -690,10 +690,10 @@ public abstract class SpellAbility {
* </p> * </p>
* *
* @param restrict * @param restrict
* a {@link forge.card.spellability.SpellAbility_Restriction} * a {@link forge.card.spellability.SpellAbilityRestriction}
* object. * object.
*/ */
public void setRestrictions(final SpellAbility_Restriction restrict) { public void setRestrictions(final SpellAbilityRestriction restrict) {
this.restrictions = restrict; this.restrictions = restrict;
} }
@@ -702,10 +702,10 @@ public abstract class SpellAbility {
* Getter for the field <code>restrictions</code>. * Getter for the field <code>restrictions</code>.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.SpellAbility_Restriction} * @return a {@link forge.card.spellability.SpellAbilityRestriction}
* object. * object.
*/ */
public SpellAbility_Restriction getRestrictions() { public SpellAbilityRestriction getRestrictions() {
return this.restrictions; return this.restrictions;
} }
@@ -726,11 +726,11 @@ public abstract class SpellAbility {
* </p> * </p>
* *
* @param condition * @param condition
* a {@link forge.card.spellability.SpellAbility_Condition} * a {@link forge.card.spellability.SpellAbilityCondition}
* object. * object.
* @since 1.0.15 * @since 1.0.15
*/ */
public void setConditions(final SpellAbility_Condition condition) { public void setConditions(final SpellAbilityCondition condition) {
this.conditions = condition; this.conditions = condition;
} }
@@ -739,10 +739,10 @@ public abstract class SpellAbility {
* Getter for the field <code>conditions</code>. * Getter for the field <code>conditions</code>.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.SpellAbility_Condition} object. * @return a {@link forge.card.spellability.SpellAbilityCondition} object.
* @since 1.0.15 * @since 1.0.15
*/ */
public SpellAbility_Condition getConditions() { public SpellAbilityCondition getConditions() {
return this.conditions; return this.conditions;
} }
@@ -787,7 +787,7 @@ public abstract class SpellAbility {
* *
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
*/ */
public ArrayList<Ability_Mana> getPayingManaAbilities() { public ArrayList<AbilityMana> getPayingManaAbilities() {
return this.paidAbilities; return this.paidAbilities;
} }
@@ -1136,9 +1136,9 @@ public abstract class SpellAbility {
* </p> * </p>
* *
* @param subAbility * @param subAbility
* a {@link forge.card.spellability.Ability_Sub} object. * a {@link forge.card.spellability.AbilitySub} object.
*/ */
public void setSubAbility(final Ability_Sub subAbility) { public void setSubAbility(final AbilitySub subAbility) {
this.subAbility = subAbility; this.subAbility = subAbility;
if (subAbility != null) { if (subAbility != null) {
subAbility.setParent(this); subAbility.setParent(this);
@@ -1150,9 +1150,9 @@ public abstract class SpellAbility {
* Getter for the field <code>subAbility</code>. * Getter for the field <code>subAbility</code>.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.Ability_Sub} object. * @return a {@link forge.card.spellability.AbilitySub} object.
*/ */
public Ability_Sub getSubAbility() { public AbilitySub getSubAbility() {
return this.subAbility; return this.subAbility;
} }
@@ -1500,8 +1500,8 @@ public abstract class SpellAbility {
* @since 1.0.15 * @since 1.0.15
*/ */
public final SpellAbility getRootSpellAbility() { public final SpellAbility getRootSpellAbility() {
if (this instanceof Ability_Sub) { if (this instanceof AbilitySub) {
final SpellAbility parent = ((Ability_Sub) this).getParent(); final SpellAbility parent = ((AbilitySub) this).getParent();
if (parent != null) { if (parent != null) {
return parent.getRootSpellAbility(); return parent.getRootSpellAbility();
} }
@@ -1518,8 +1518,8 @@ public abstract class SpellAbility {
* @return a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object.
* @since 1.0.15 * @since 1.0.15
*/ */
public final ArrayList<Target_Choices> getAllTargetChoices() { public final ArrayList<TargetChoices> getAllTargetChoices() {
final ArrayList<Target_Choices> res = new ArrayList<Target_Choices>(); final ArrayList<TargetChoices> res = new ArrayList<TargetChoices>();
SpellAbility sa = this.getRootSpellAbility(); SpellAbility sa = this.getRootSpellAbility();
if (sa.getTarget() != null) { if (sa.getTarget() != null) {

4
src/main/java/forge/card/spellability/SpellAbility_Condition.java → src/main/java/forge/card/spellability/SpellAbilityCondition.java
View File

@@ -20,7 +20,7 @@ import forge.card.cardFactory.CardFactoryUtil;
* @version $Id$ * @version $Id$
* @since 1.0.15 * @since 1.0.15
*/ */
public class SpellAbility_Condition extends SpellAbility_Variables { public class SpellAbilityCondition extends SpellAbilityVariables {
// A class for handling SpellAbility Conditions. These restrictions include: // A class for handling SpellAbility Conditions. These restrictions include:
// Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player,
// Threshold, Metalcraft, LevelRange, etc // Threshold, Metalcraft, LevelRange, etc
@@ -34,7 +34,7 @@ public class SpellAbility_Condition extends SpellAbility_Variables {
* Constructor for SpellAbility_Condition. * Constructor for SpellAbility_Condition.
* </p> * </p>
*/ */
public SpellAbility_Condition() { public SpellAbilityCondition() {
} }
/** /**

14
src/main/java/forge/card/spellability/SpellAbility_Requirements.java → src/main/java/forge/card/spellability/SpellAbilityRequirements.java
View File

@@ -6,7 +6,7 @@ import forge.AllZone;
import forge.Card; import forge.Card;
import forge.PlayerZone; import forge.PlayerZone;
import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactory;
import forge.card.cost.Cost_Payment; import forge.card.cost.CostPayment;
/** /**
* <p> * <p>
@@ -16,10 +16,10 @@ import forge.card.cost.Cost_Payment;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class SpellAbility_Requirements { public class SpellAbilityRequirements {
private SpellAbility ability = null; private SpellAbility ability = null;
private Target_Selection select = null; private TargetSelection select = null;
private Cost_Payment payment = null; private CostPayment payment = null;
private boolean isFree = false; private boolean isFree = false;
private boolean skipStack = false; private boolean skipStack = false;
@@ -58,11 +58,11 @@ public class SpellAbility_Requirements {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
* @param ts * @param ts
* a {@link forge.card.spellability.Target_Selection} object. * a {@link forge.card.spellability.TargetSelection} object.
* @param cp * @param cp
* a {@link forge.card.cost.Cost_Payment} object. * a {@link forge.card.cost.CostPayment} object.
*/ */
public SpellAbility_Requirements(final SpellAbility sa, final Target_Selection ts, final Cost_Payment cp) { public SpellAbilityRequirements(final SpellAbility sa, final TargetSelection ts, final CostPayment cp) {
this.ability = sa; this.ability = sa;
this.select = ts; this.select = ts;
this.payment = cp; this.payment = cp;

6
src/main/java/forge/card/spellability/SpellAbility_Restriction.java → src/main/java/forge/card/spellability/SpellAbilityRestriction.java
View File

@@ -22,7 +22,7 @@ import forge.card.cardFactory.CardFactoryUtil;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class SpellAbility_Restriction extends SpellAbility_Variables { public class SpellAbilityRestriction extends SpellAbilityVariables {
// A class for handling SpellAbility Restrictions. These restrictions // A class for handling SpellAbility Restrictions. These restrictions
// include: // include:
// Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player,
@@ -37,7 +37,7 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
* Constructor for SpellAbility_Restriction. * Constructor for SpellAbility_Restriction.
* </p> * </p>
*/ */
public SpellAbility_Restriction() { public SpellAbilityRestriction() {
} }
/** /**
@@ -311,7 +311,7 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
for (final SpellAbility pwAbs : c.getAllSpellAbilities()) { for (final SpellAbility pwAbs : c.getAllSpellAbilities()) {
// check all abilities on card that have their planeswalker // check all abilities on card that have their planeswalker
// restriction set to confirm they haven't been activated // restriction set to confirm they haven't been activated
final SpellAbility_Restriction restrict = pwAbs.getRestrictions(); final SpellAbilityRestriction restrict = pwAbs.getRestrictions();
if (restrict.getPlaneswalker() && (restrict.getNumberTurnActivations() > 0)) { if (restrict.getPlaneswalker() && (restrict.getNumberTurnActivations() > 0)) {
return false; return false;
} }

14
src/main/java/forge/card/spellability/SpellAbility_StackInstance.java → src/main/java/forge/card/spellability/SpellAbilityStackInstance.java
View File

@@ -14,7 +14,7 @@ import forge.Player;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class SpellAbility_StackInstance { public class SpellAbilityStackInstance {
// At some point I want this functioning more like Target/Target Choices // At some point I want this functioning more like Target/Target Choices
// where the SA has an "active" // where the SA has an "active"
// Stack Instance, and instead of having duplicate parameters, it adds // Stack Instance, and instead of having duplicate parameters, it adds
@@ -27,11 +27,11 @@ public class SpellAbility_StackInstance {
private SpellAbility ability = null; private SpellAbility ability = null;
/** The sub instace. */ /** The sub instace. */
private SpellAbility_StackInstance subInstace = null; private SpellAbilityStackInstance subInstace = null;
// When going to a SubAbility that SA has a Instance Choice object // When going to a SubAbility that SA has a Instance Choice object
/** The tc. */ /** The tc. */
private Target_Choices tc = null; private TargetChoices tc = null;
/** The activating player. */ /** The activating player. */
private Player activatingPlayer = null; private Player activatingPlayer = null;
@@ -67,7 +67,7 @@ public class SpellAbility_StackInstance {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public SpellAbility_StackInstance(final SpellAbility sa) { public SpellAbilityStackInstance(final SpellAbility sa) {
// Base SA info // Base SA info
this.ability = sa; this.ability = sa;
this.stackDescription = this.ability.getStackDescription(); this.stackDescription = this.ability.getStackDescription();
@@ -83,9 +83,9 @@ public class SpellAbility_StackInstance {
// Triggering info // Triggering info
this.triggeringObjects = sa.getTriggeringObjects(); this.triggeringObjects = sa.getTriggeringObjects();
final Ability_Sub subAb = this.ability.getSubAbility(); final AbilitySub subAb = this.ability.getSubAbility();
if (subAb != null) { if (subAb != null) {
this.subInstace = new SpellAbility_StackInstance(subAb); this.subInstace = new SpellAbilityStackInstance(subAb);
} }
// Targeting info -- 29/06/11 Moved to after taking care of SubAbilities // Targeting info -- 29/06/11 Moved to after taking care of SubAbilities
@@ -125,7 +125,7 @@ public class SpellAbility_StackInstance {
// Saved sub-SA needs to be reset on the way out // Saved sub-SA needs to be reset on the way out
if (this.subInstace != null) { if (this.subInstace != null) {
this.ability.setSubAbility((Ability_Sub) this.subInstace.getSpellAbility()); this.ability.setSubAbility((AbilitySub) this.subInstace.getSpellAbility());
} }
// Set Cost specific things here // Set Cost specific things here

4
src/main/java/forge/card/spellability/SpellAbility_Variables.java → src/main/java/forge/card/spellability/SpellAbilityVariables.java
View File

@@ -13,7 +13,7 @@ import forge.Constant;
* @version $Id$ * @version $Id$
* @since 1.0.15 * @since 1.0.15
*/ */
public class SpellAbility_Variables { public class SpellAbilityVariables {
// A class for handling SpellAbility Variables. These restrictions include: // A class for handling SpellAbility Variables. These restrictions include:
// Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player,
// Threshold, Metalcraft, Hellbent, LevelRange, etc // Threshold, Metalcraft, Hellbent, LevelRange, etc
@@ -25,7 +25,7 @@ public class SpellAbility_Variables {
* Constructor for SpellAbility_Variables. * Constructor for SpellAbility_Variables.
* </p> * </p>
*/ */
public SpellAbility_Variables() { public SpellAbilityVariables() {
} }
// default values for Sorcery speed abilities // default values for Sorcery speed abilities

42
src/main/java/forge/card/spellability/Spell_Permanent.java → src/main/java/forge/card/spellability/SpellPermanent.java
View File

@@ -27,7 +27,7 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Spell_Permanent extends Spell { public class SpellPermanent extends Spell {
/** Constant <code>serialVersionUID=2413495058630644447L</code>. */ /** Constant <code>serialVersionUID=2413495058630644447L</code>. */
private static final long serialVersionUID = 2413495058630644447L; private static final long serialVersionUID = 2413495058630644447L;
@@ -41,11 +41,11 @@ public class Spell_Permanent extends Spell {
@Override @Override
public void showMessage() { public void showMessage() {
final CardList choice = (CardList) Spell_Permanent.this.championGetCreature.execute(); final CardList choice = (CardList) SpellPermanent.this.championGetCreature.execute();
this.stopSetNext(CardFactoryUtil.inputTargetChampionSac(Spell_Permanent.this.getSourceCard(), this.stopSetNext(CardFactoryUtil.inputTargetChampionSac(SpellPermanent.this.getSourceCard(),
Spell_Permanent.this.championAbilityComes, choice, "Select another " SpellPermanent.this.championAbilityComes, choice, "Select another "
+ Spell_Permanent.this.championValidDesc + " you control to exile", false, false)); + SpellPermanent.this.championValidDesc + " you control to exile", false, false));
ButtonUtil.disableAll(); // target this card means: sacrifice this ButtonUtil.disableAll(); // target this card means: sacrifice this
// card // card
} }
@@ -54,9 +54,9 @@ public class Spell_Permanent extends Spell {
private final CommandReturn championGetCreature = new CommandReturn() { private final CommandReturn championGetCreature = new CommandReturn() {
@Override @Override
public Object execute() { public Object execute() {
final CardList cards = Spell_Permanent.this.getSourceCard().getController().getCardsIn(Zone.Battlefield); final CardList cards = SpellPermanent.this.getSourceCard().getController().getCardsIn(Zone.Battlefield);
return cards.getValidCards(Spell_Permanent.this.championValid, Spell_Permanent.this.getSourceCard() return cards.getValidCards(SpellPermanent.this.championValid, SpellPermanent.this.getSourceCard()
.getController(), Spell_Permanent.this.getSourceCard()); .getController(), SpellPermanent.this.getSourceCard());
} }
}; // CommandReturn }; // CommandReturn
@@ -68,15 +68,15 @@ public class Spell_Permanent extends Spell {
final Card source = this.getSourceCard(); final Card source = this.getSourceCard();
final Player controller = source.getController(); final Player controller = source.getController();
final CardList creature = (CardList) Spell_Permanent.this.championGetCreature.execute(); final CardList creature = (CardList) SpellPermanent.this.championGetCreature.execute();
if (creature.size() == 0) { if (creature.size() == 0) {
AllZone.getGameAction().sacrifice(source); AllZone.getGameAction().sacrifice(source);
return; return;
} else if (controller.isHuman()) { } else if (controller.isHuman()) {
AllZone.getInputControl().setInput(Spell_Permanent.this.championInputComes); AllZone.getInputControl().setInput(SpellPermanent.this.championInputComes);
} else { // Computer } else { // Computer
CardList computer = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield); CardList computer = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield);
computer = computer.getValidCards(Spell_Permanent.this.championValid, controller, source); computer = computer.getValidCards(SpellPermanent.this.championValid, controller, source);
computer.remove(source); computer.remove(source);
computer.shuffle(); computer.shuffle();
@@ -107,10 +107,10 @@ public class Spell_Permanent extends Spell {
@Override @Override
public void execute() { public void execute() {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(Spell_Permanent.this.getSourceCard()).append( sb.append(SpellPermanent.this.getSourceCard()).append(
" - When CARDNAME enters the battlefield, sacrifice it unless you exile a creature you control."); " - When CARDNAME enters the battlefield, sacrifice it unless you exile a creature you control.");
Spell_Permanent.this.championAbilityComes.setStackDescription(sb.toString()); SpellPermanent.this.championAbilityComes.setStackDescription(sb.toString());
AllZone.getStack().addSimultaneousStackEntry(Spell_Permanent.this.championAbilityComes); AllZone.getStack().addSimultaneousStackEntry(SpellPermanent.this.championAbilityComes);
} // execute() } // execute()
}; // championCommandComes }; // championCommandComes
@@ -122,7 +122,7 @@ public class Spell_Permanent extends Spell {
@Override @Override
public void execute() { public void execute() {
final SpellAbility ability = new Ability(Spell_Permanent.this.getSourceCard(), "0") { final SpellAbility ability = new Ability(SpellPermanent.this.getSourceCard(), "0") {
@Override @Override
public void resolve() { public void resolve() {
final Card c = this.getSourceCard().getChampionedCard(); final Card c = this.getSourceCard().getChampionedCard();
@@ -133,7 +133,7 @@ public class Spell_Permanent extends Spell {
}; // SpellAbility }; // SpellAbility
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(Spell_Permanent.this.getSourceCard()).append( sb.append(SpellPermanent.this.getSourceCard()).append(
" - When CARDNAME leaves the battlefield, exiled card returns to the battlefield."); " - When CARDNAME leaves the battlefield, exiled card returns to the battlefield.");
ability.setStackDescription(sb.toString()); ability.setStackDescription(sb.toString());
@@ -152,7 +152,7 @@ public class Spell_Permanent extends Spell {
* @param sourceCard * @param sourceCard
* a {@link forge.Card} object. * a {@link forge.Card} object.
*/ */
public Spell_Permanent(final Card sourceCard) { public SpellPermanent(final Card sourceCard) {
// Add Costs for all SpellPermanents // Add Costs for all SpellPermanents
this(sourceCard, new Cost(sourceCard.getManaCost(), sourceCard.getName(), false), null); this(sourceCard, new Cost(sourceCard.getManaCost(), sourceCard.getName(), false), null);
} // Spell_Permanent() } // Spell_Permanent()
@@ -169,7 +169,7 @@ public class Spell_Permanent extends Spell {
* @param tgt * @param tgt
* a {@link forge.card.spellability.Target} object. * a {@link forge.card.spellability.Target} object.
*/ */
public Spell_Permanent(final Card sourceCard, final Cost cost, final Target tgt) { public SpellPermanent(final Card sourceCard, final Cost cost, final Target tgt) {
this(sourceCard, cost, tgt, true); this(sourceCard, cost, tgt, true);
} // Spell_Permanent() } // Spell_Permanent()
@@ -185,7 +185,7 @@ public class Spell_Permanent extends Spell {
* @param setDesc * @param setDesc
* the set desc * the set desc
*/ */
public Spell_Permanent(final Card sourceCard, final Cost cost, final Target tgt, final boolean setDesc) { public SpellPermanent(final Card sourceCard, final Cost cost, final Target tgt, final boolean setDesc) {
super(sourceCard, cost, tgt); super(sourceCard, cost, tgt);
if (CardFactoryUtil.hasKeyword(sourceCard, "Champion") != -1) { if (CardFactoryUtil.hasKeyword(sourceCard, "Champion") != -1) {
@@ -291,7 +291,7 @@ public class Spell_Permanent extends Spell {
} }
} }
if (!Spell_Permanent.checkETBEffects(card, this, null)) { if (!SpellPermanent.checkETBEffects(card, this, null)) {
return false; return false;
} }
@@ -360,7 +360,7 @@ public class Spell_Permanent extends Spell {
// Run non-mandatory trigger. // Run non-mandatory trigger.
// These checks only work if the Executing SpellAbility is an // These checks only work if the Executing SpellAbility is an
// Ability_Sub. // Ability_Sub.
if ((exSA instanceof Ability_Sub) && !exSA.doTrigger(false)) { if ((exSA instanceof AbilitySub) && !exSA.doTrigger(false)) {
// AI would not run this trigger if given the chance // AI would not run this trigger if given the chance
// if trigger is mandatory, return false // if trigger is mandatory, return false

12
src/main/java/forge/card/spellability/Target.java
View File

@@ -26,16 +26,16 @@ public class Target {
// Target Choices (which is specific for the StackInstance) // Target Choices (which is specific for the StackInstance)
private Card srcCard; private Card srcCard;
private boolean uniqueTargets = false; private boolean uniqueTargets = false;
private Target_Choices choice = null; private TargetChoices choice = null;
/** /**
* <p> * <p>
* getTargetChoices. * getTargetChoices.
* </p> * </p>
* *
* @return a {@link forge.card.spellability.Target_Choices} object. * @return a {@link forge.card.spellability.TargetChoices} object.
*/ */
public final Target_Choices getTargetChoices() { public final TargetChoices getTargetChoices() {
return this.choice; return this.choice;
} }
@@ -45,9 +45,9 @@ public class Target {
* </p> * </p>
* *
* @param tc * @param tc
* a {@link forge.card.spellability.Target_Choices} object. * a {@link forge.card.spellability.TargetChoices} object.
*/ */
public final void setTargetChoices(final Target_Choices tc) { public final void setTargetChoices(final TargetChoices tc) {
this.choice = tc; this.choice = tc;
} }
@@ -279,7 +279,7 @@ public class Target {
*/ */
public final boolean addTarget(final Object o) { public final boolean addTarget(final Object o) {
if (this.choice == null) { if (this.choice == null) {
this.choice = new Target_Choices(); this.choice = new TargetChoices();
} }
if (o instanceof Card) { if (o instanceof Card) {

2
src/main/java/forge/card/spellability/Target_Choices.java → src/main/java/forge/card/spellability/TargetChoices.java
View File

@@ -13,7 +13,7 @@ import forge.Player;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Target_Choices { public class TargetChoices {
private int numTargeted = 0; private int numTargeted = 0;
/** /**

34
src/main/java/forge/card/spellability/Target_Selection.java → src/main/java/forge/card/spellability/TargetSelection.java
View File

@@ -25,11 +25,11 @@ import forge.gui.input.Input;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Target_Selection { public class TargetSelection {
private Target target = null; private Target target = null;
private SpellAbility ability = null; private SpellAbility ability = null;
private Card card = null; private Card card = null;
private Target_Selection subSelection = null; private TargetSelection subSelection = null;
/** /**
* <p> * <p>
@@ -64,7 +64,7 @@ public class Target_Selection {
return this.card; return this.card;
} }
private SpellAbility_Requirements req = null; private SpellAbilityRequirements req = null;
/** /**
* <p> * <p>
@@ -72,10 +72,10 @@ public class Target_Selection {
* </p> * </p>
* *
* @param reqs * @param reqs
* a {@link forge.card.spellability.SpellAbility_Requirements} * a {@link forge.card.spellability.SpellAbilityRequirements}
* object. * object.
*/ */
public final void setRequirements(final SpellAbility_Requirements reqs) { public final void setRequirements(final SpellAbilityRequirements reqs) {
this.req = reqs; this.req = reqs;
} }
@@ -136,7 +136,7 @@ public class Target_Selection {
* @param sa * @param sa
* a {@link forge.card.spellability.SpellAbility} object. * a {@link forge.card.spellability.SpellAbility} object.
*/ */
public Target_Selection(final Target tgt, final SpellAbility sa) { public TargetSelection(final Target tgt, final SpellAbility sa) {
this.target = tgt; this.target = tgt;
this.ability = sa; this.ability = sa;
this.card = sa.getSourceCard(); this.card = sa.getSourceCard();
@@ -182,7 +182,7 @@ public class Target_Selection {
return false; return false;
} else if (!this.doesTarget() || (this.bDoneTarget && this.target.isMinTargetsChosen(this.card, this.ability)) } else if (!this.doesTarget() || (this.bDoneTarget && this.target.isMinTargetsChosen(this.card, this.ability))
|| this.target.isMaxTargetsChosen(this.card, this.ability)) { || this.target.isMaxTargetsChosen(this.card, this.ability)) {
final Ability_Sub abSub = this.ability.getSubAbility(); final AbilitySub abSub = this.ability.getSubAbility();
if (abSub == null) { if (abSub == null) {
// if no more SubAbilities finish targeting // if no more SubAbilities finish targeting
@@ -190,7 +190,7 @@ public class Target_Selection {
return true; return true;
} else { } else {
// Has Sub Ability // Has Sub Ability
this.subSelection = new Target_Selection(abSub.getTarget(), abSub); this.subSelection = new TargetSelection(abSub.getTarget(), abSub);
this.subSelection.setRequirements(this.req); this.subSelection.setRequirements(this.req);
this.subSelection.resetTargets(); this.subSelection.resetTargets();
return this.subSelection.chooseTargets(); return this.subSelection.chooseTargets();
@@ -212,8 +212,8 @@ public class Target_Selection {
public final ArrayList<Object> getUniqueTargets(final SpellAbility ability) { public final ArrayList<Object> getUniqueTargets(final SpellAbility ability) {
final ArrayList<Object> targets = new ArrayList<Object>(); final ArrayList<Object> targets = new ArrayList<Object>();
SpellAbility child = ability; SpellAbility child = ability;
while (child instanceof Ability_Sub) { while (child instanceof AbilitySub) {
child = ((Ability_Sub) child).getParent(); child = ((AbilitySub) child).getParent();
targets.addAll(child.getTarget().getTargets()); targets.addAll(child.getTarget().getTargets());
} }
@@ -288,9 +288,9 @@ public class Target_Selection {
public final Input inputTargetSpecific(final CardList choices, final boolean targeted, final boolean mandatory, public final Input inputTargetSpecific(final CardList choices, final boolean targeted, final boolean mandatory,
final ArrayList<Object> alreadyTargeted) { final ArrayList<Object> alreadyTargeted) {
final SpellAbility sa = this.ability; final SpellAbility sa = this.ability;
final Target_Selection select = this; final TargetSelection select = this;
final Target tgt = this.target; final Target tgt = this.target;
final SpellAbility_Requirements req = this.req; final SpellAbilityRequirements req = this.req;
final Input target = new Input() { final Input target = new Input() {
private static final long serialVersionUID = -1091595663541356356L; private static final long serialVersionUID = -1091595663541356356L;
@@ -421,10 +421,10 @@ public class Target_Selection {
public final void chooseCardFromStack(final boolean mandatory) { public final void chooseCardFromStack(final boolean mandatory) {
final Target tgt = this.target; final Target tgt = this.target;
final String message = tgt.getVTSelection(); final String message = tgt.getVTSelection();
final Target_Selection select = this; final TargetSelection select = this;
// Find what's targetable, then allow human to choose // Find what's targetable, then allow human to choose
final ArrayList<SpellAbility> choosables = Target_Selection.getTargetableOnStack(this.ability, select.getTgt()); final ArrayList<SpellAbility> choosables = TargetSelection.getTargetableOnStack(this.ability, select.getTgt());
final HashMap<String, SpellAbility> map = new HashMap<String, SpellAbility>(); final HashMap<String, SpellAbility> map = new HashMap<String, SpellAbility>();
@@ -472,7 +472,7 @@ public class Target_Selection {
} }
for (int i = 0; i < choosables.size(); i++) { for (int i = 0; i < choosables.size(); i++) {
if (!Target_Selection.matchSpellAbility(sa, choosables.get(i), tgt)) { if (!TargetSelection.matchSpellAbility(sa, choosables.get(i), tgt)) {
choosables.remove(i); choosables.remove(i);
} }
} }
@@ -524,7 +524,7 @@ public class Target_Selection {
boolean result = false; boolean result = false;
for (final Object o : matchTgt.getTargets()) { for (final Object o : matchTgt.getTargets()) {
if (Target_Selection.matchesValid(o, splitTargetRestrictions.split(","), sa)) { if (TargetSelection.matchesValid(o, splitTargetRestrictions.split(","), sa)) {
result = true; result = true;
break; break;
} }
@@ -535,7 +535,7 @@ public class Target_Selection {
} }
} }
if (!Target_Selection.matchesValid(topSA, tgt.getValidTgts(), sa)) { if (!TargetSelection.matchesValid(topSA, tgt.getValidTgts(), sa)) {
return false; return false;
} }

8
src/main/java/forge/card/staticAbility/StaticAbility.java
View File

@@ -216,7 +216,7 @@ public class StaticAbility {
} }
if (mode.equals("Continuous")) { if (mode.equals("Continuous")) {
StaticAbility_Continuous.applyContinuousAbility(this); StaticAbilityContinuous.applyContinuousAbility(this);
} }
} }
@@ -249,7 +249,7 @@ public class StaticAbility {
} }
if (mode.equals("PreventDamage")) { if (mode.equals("PreventDamage")) {
return StaticAbility_PreventDamage.applyPreventDamageAbility(this, source, target, in, b); return StaticAbilityPreventDamage.applyPreventDamageAbility(this, source, target, in, b);
} }
return in; return in;
@@ -279,11 +279,11 @@ public class StaticAbility {
} }
if (mode.equals("CantBeCast")) { if (mode.equals("CantBeCast")) {
return StaticAbility_CantBeCast.applyCantBeCastAbility(this, card, activator); return StaticAbilityCantBeCast.applyCantBeCastAbility(this, card, activator);
} }
if (mode.equals("CantBeActivated")) { if (mode.equals("CantBeActivated")) {
return StaticAbility_CantBeCast.applyCantBeActivatedAbility(this, card, activator); return StaticAbilityCantBeCast.applyCantBeActivatedAbility(this, card, activator);
} }
return false; return false;

2
src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java → src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java
View File

@@ -9,7 +9,7 @@ import forge.Player;
/** /**
* The Class StaticAbility_CantBeCast. * The Class StaticAbility_CantBeCast.
*/ */
public class StaticAbility_CantBeCast { public class StaticAbilityCantBeCast {
/** /**
* TODO Write javadoc for this method. * TODO Write javadoc for this method.

6
src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java → src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java
View File

@@ -21,7 +21,7 @@ import forge.card.trigger.TriggerHandler;
/** /**
* The Class StaticAbility_Continuous. * The Class StaticAbility_Continuous.
*/ */
public class StaticAbility_Continuous { public class StaticAbilityContinuous {
/** /**
* *
@@ -35,8 +35,8 @@ public class StaticAbility_Continuous {
final Card hostCard = stAb.getHostCard(); final Card hostCard = stAb.getHostCard();
final StaticEffect se = new StaticEffect(); final StaticEffect se = new StaticEffect();
final CardList affectedCards = StaticAbility_Continuous.getAffectedCards(stAb); final CardList affectedCards = StaticAbilityContinuous.getAffectedCards(stAb);
final ArrayList<Player> affectedPlayers = StaticAbility_Continuous.getAffectedPlayers(stAb); final ArrayList<Player> affectedPlayers = StaticAbilityContinuous.getAffectedPlayers(stAb);
se.setAffectedCards(affectedCards); se.setAffectedCards(affectedCards);
se.setAffectedPlayers(affectedPlayers); se.setAffectedPlayers(affectedPlayers);

2
src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java → src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java
View File

@@ -9,7 +9,7 @@ import forge.card.cardFactory.CardFactoryUtil;
/** /**
* The Class StaticAbility_PreventDamage. * The Class StaticAbility_PreventDamage.
*/ */
public class StaticAbility_PreventDamage { public class StaticAbilityPreventDamage {
/** /**
* TODO Write javadoc for this method. * TODO Write javadoc for this method.

6
src/main/java/forge/card/trigger/Trigger_Always.java → src/main/java/forge/card/trigger/TriggerAlways.java
View File

@@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Trigger_Always extends Trigger { public class TriggerAlways extends Trigger {
/** /**
* <p> * <p>
@@ -28,7 +28,7 @@ public class Trigger_Always extends Trigger {
* @param intrinsic * @param intrinsic
* the intrinsic * the intrinsic
*/ */
public Trigger_Always(final HashMap<String, String> params, final Card host, final boolean intrinsic) { public TriggerAlways(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic); super(params, host, intrinsic);
} }
@@ -41,7 +41,7 @@ public class Trigger_Always extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final Trigger getCopy() { public final Trigger getCopy() {
final Trigger copy = new Trigger_Always(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); final Trigger copy = new TriggerAlways(this.getMapParams(), this.getHostCard(), this.isIntrinsic());
if (this.getOverridingAbility() != null) { if (this.getOverridingAbility() != null) {
copy.setOverridingAbility(this.getOverridingAbility()); copy.setOverridingAbility(this.getOverridingAbility());
} }

6
src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java → src/main/java/forge/card/trigger/TriggerAttackerBlocked.java
View File

@@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class Trigger_AttackerBlocked extends Trigger { public class TriggerAttackerBlocked extends Trigger {
/** /**
* <p> * <p>
@@ -28,7 +28,7 @@ public class Trigger_AttackerBlocked extends Trigger {
* @param intrinsic * @param intrinsic
* the intrinsic * the intrinsic
*/ */
public Trigger_AttackerBlocked(final HashMap<String, String> params, final Card host, final boolean intrinsic) { public TriggerAttackerBlocked(final HashMap<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic); super(params, host, intrinsic);
} }
@@ -54,7 +54,7 @@ public class Trigger_AttackerBlocked extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final Trigger getCopy() { public final Trigger getCopy() {
final Trigger copy = new Trigger_AttackerBlocked(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); final Trigger copy = new TriggerAttackerBlocked(this.getMapParams(), this.getHostCard(), this.isIntrinsic());
if (this.getOverridingAbility() != null) { if (this.getOverridingAbility() != null) {
copy.setOverridingAbility(this.getOverridingAbility()); copy.setOverridingAbility(this.getOverridingAbility());
} }

Some files were not shown because too many files have changed in this diff Show More