diff --git a/.gitattributes b/.gitattributes index 1e8fe02020b..cb59deb784c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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/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/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/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/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/PreloadingCardFactory.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/CostPartWithList.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/CostRemoveCounter.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/CostUntap.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/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/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/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/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_Activated.java svneol=native#text/plain -src/main/java/forge/card/spellability/Ability_Mana.java svneol=native#text/plain -src/main/java/forge/card/spellability/Ability_Static.java svneol=native#text/plain -src/main/java/forge/card/spellability/Ability_Sub.java svneol=native#text/plain -src/main/java/forge/card/spellability/Ability_Triggered.java svneol=native#text/plain +src/main/java/forge/card/spellability/AbilityActivated.java svneol=native#text/plain +src/main/java/forge/card/spellability/AbilityMana.java svneol=native#text/plain +src/main/java/forge/card/spellability/AbilityStatic.java svneol=native#text/plain +src/main/java/forge/card/spellability/AbilitySub.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/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/SpellAbility_Condition.java svneol=native#text/plain -src/main/java/forge/card/spellability/SpellAbility_Requirements.java svneol=native#text/plain -src/main/java/forge/card/spellability/SpellAbility_Restriction.java svneol=native#text/plain -src/main/java/forge/card/spellability/SpellAbility_StackInstance.java svneol=native#text/plain -src/main/java/forge/card/spellability/SpellAbility_Variables.java svneol=native#text/plain -src/main/java/forge/card/spellability/Spell_Permanent.java svneol=native#text/plain +src/main/java/forge/card/spellability/SpellAbilityRequirements.java svneol=native#text/plain +src/main/java/forge/card/spellability/SpellAbilityRestriction.java svneol=native#text/plain +src/main/java/forge/card/spellability/SpellAbilityStackInstance.java svneol=native#text/plain +src/main/java/forge/card/spellability/SpellAbilityVariables.java svneol=native#text/plain +src/main/java/forge/card/spellability/SpellPermanent.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/Target_Selection.java svneol=native#text/plain +src/main/java/forge/card/spellability/TargetChoices.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/staticAbility/StaticAbility.java svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java -text -src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java svneol=native#text/plain -src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java -text +src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java -text svneol=native#text/plain +src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java svneol=native#text/plain +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/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/Trigger_Always.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_AttackersDeclared.java -text -src/main/java/forge/card/trigger/Trigger_Attacks.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_BecomesTarget.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_Blocks.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_Championed.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_ChangesZone.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_Clashed.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_CounterAdded.java svneol=native#text/plain -src/main/java/forge/card/trigger/Trigger_Cycled.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/TriggerLandPlayed.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerLifeGained.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerLifeLost.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerPhase.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerSacrificed.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerShuffled.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerTaps.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerTapsForMana.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerTurnFaceUp.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerUnequip.java svneol=native#text/plain +src/main/java/forge/card/trigger/TriggerUntaps.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/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/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/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/CardPoolLimitation.java -text 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/IBoosterDraft.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/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/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/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/Input_Attack.java svneol=native#text/plain -src/main/java/forge/gui/input/Input_Block.java svneol=native#text/plain -src/main/java/forge/gui/input/Input_Cleanup.java svneol=native#text/plain -src/main/java/forge/gui/input/Input_Mulligan.java svneol=native#text/plain -src/main/java/forge/gui/input/Input_PassPriority.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/InputMulligan.java svneol=native#text/plain +src/main/java/forge/gui/input/InputPassPriority.java svneol=native#text/plain +src/main/java/forge/gui/input/InputPayManaCost.java svneol=native#text/plain +src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/plain +src/main/java/forge/gui/input/InputPayManaCostUtil.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/skin/FButton.java -text diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 8a74e909831..f98baa1be67 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -17,10 +17,10 @@ import forge.card.CardCharacteristics; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.mana.ManaCost; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Triggered; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilityTriggered; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.staticAbility.StaticAbility; import forge.card.trigger.Trigger; import forge.item.CardDb; @@ -310,7 +310,7 @@ public class Card extends GameEntity implements Comparable { private ArrayList gainControlTargets = new ArrayList(); private ArrayList gainControlReleaseCommands = new ArrayList(); - private ArrayList zcTriggers = new ArrayList(); + private ArrayList zcTriggers = new ArrayList(); private ArrayList equipCommandList = new ArrayList(); private ArrayList unEquipCommandList = new ArrayList(); private ArrayList enchantCommandList = new ArrayList(); @@ -2359,7 +2359,7 @@ public class Card extends GameEntity implements Comparable { continue; } - if (sa instanceof Spell_Permanent && primaryCost && !isAura()) { + if (sa instanceof SpellPermanent && primaryCost && !isAura()) { // For Alt costs, make sure to display the cost! primaryCost = false; continue; @@ -2367,14 +2367,14 @@ public class Card extends GameEntity implements Comparable { String sAbility = sa.toString(); - if (sa instanceof Ability_Mana) { + if (sa instanceof AbilityMana) { if (addedManaStrings.contains(sAbility)) { continue; } addedManaStrings.add(sAbility); } - if (sa instanceof Spell_Permanent && !isAura()) { + if (sa instanceof SpellPermanent && !isAura()) { sb.insert(0, "\r\n"); sb.insert(0, sAbility); } else if (!sAbility.endsWith(getName())) { @@ -2455,8 +2455,8 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.util.ArrayList} object. */ - public final ArrayList getManaAbility() { - return new ArrayList(getCharacteristics().getManaAbility()); + public final ArrayList getManaAbility() { + return new ArrayList(getCharacteristics().getManaAbility()); } // Returns basic mana abilities plus "reflected mana" abilities @@ -2467,9 +2467,9 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.util.ArrayList} object. */ - public final ArrayList getAIPlayableMana() { - ArrayList res = new ArrayList(); - for (Ability_Mana am : getManaAbility()) { + public final ArrayList getAIPlayableMana() { + ArrayList res = new ArrayList(); + for (AbilityMana am : getManaAbility()) { // if a mana ability has a mana cost the AI will miscalculate Cost cost = am.getPayCosts(); @@ -2495,9 +2495,9 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.util.ArrayList} object. */ - public final ArrayList getBasicMana() { - ArrayList res = new ArrayList(); - for (Ability_Mana am : getManaAbility()) { + public final ArrayList getBasicMana() { + ArrayList res = new ArrayList(); + for (AbilityMana am : getManaAbility()) { if (am.isBasic() && !res.contains(am)) { res.add(am); } @@ -2567,12 +2567,12 @@ public class Card extends GameEntity implements Comparable { * getSpellPermanent. *

* - * @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()) { - if (sa instanceof Spell_Permanent) { - return (Spell_Permanent) sa; + if (sa instanceof SpellPermanent) { + return (SpellPermanent) sa; } } return null; @@ -2606,8 +2606,8 @@ public class Card extends GameEntity implements Comparable { */ public final void addFirstSpellAbility(final SpellAbility a) { a.setSourceCard(this); - if (a instanceof Ability_Mana) { - getCharacteristics().getManaAbility().add(0, (Ability_Mana) a); + if (a instanceof AbilityMana) { + getCharacteristics().getManaAbility().add(0, (AbilityMana) a); } else { getCharacteristics().getSpellAbility().add(0, a); } @@ -2623,8 +2623,8 @@ public class Card extends GameEntity implements Comparable { */ public final void addSpellAbility(final SpellAbility a) { a.setSourceCard(this); - if (a instanceof Ability_Mana) { - getCharacteristics().getManaAbility().add((Ability_Mana) a); + if (a instanceof AbilityMana) { + getCharacteristics().getManaAbility().add((AbilityMana) a); } else { getCharacteristics().getSpellAbility().add(a); } @@ -2639,7 +2639,7 @@ public class Card extends GameEntity implements Comparable { * a {@link forge.card.spellability.SpellAbility} object. */ 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 // this the way to go?? getCharacteristics().getManaAbility().remove(a); @@ -3093,7 +3093,7 @@ public class Card extends GameEntity implements Comparable { * a {@link forge.ZCTrigger} object. */ 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 { * a {@link forge.ZCTrigger} object. */ 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 { * a {@link forge.ZCTrigger} object. */ public final void executeTrigger(final ZCTrigger type) { - for (Ability_Triggered t : zcTriggers) { + for (AbilityTriggered t : zcTriggers) { if (t.getTrigger().equals(type) && t.isBasic()) { t.execute(); } @@ -6038,7 +6038,7 @@ public class Card extends GameEntity implements Comparable { * @return a boolean. */ public final boolean isReflectedLand() { - for (Ability_Mana am : getCharacteristics().getManaAbility()) { + for (AbilityMana am : getCharacteristics().getManaAbility()) { if (am.isReflectedMana()) { return true; } diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index fb8148d8e34..78550b12df3 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -13,7 +13,7 @@ import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.Ability; import forge.card.trigger.Trigger; import forge.gui.GuiUtils; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputPayManaCostAbility; /** *

@@ -2058,7 +2058,7 @@ public class CombatUtil { if (c.getController().isHuman()) { 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)); } else { // computer if (ComputerUtil.canPayCost(ability)) { diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/ComputerAIGeneral.java index 8399301e5ee..8c5ec29bc6d 100644 --- a/src/main/java/forge/ComputerAIGeneral.java +++ b/src/main/java/forge/ComputerAIGeneral.java @@ -9,7 +9,7 @@ import com.esotericsoftware.minlog.Log; import forge.Constant.Zone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; /** *

@@ -352,8 +352,8 @@ public class ComputerAIGeneral implements Computer { for (Card c : l) { for (SpellAbility sa : c.getSpellAbility()) { // Or if this Permanent has an ETB ability with Counter - if (sa instanceof Spell_Permanent) { - if (Spell_Permanent.checkETBEffects(c, sa, "Counter")) { + if (sa instanceof SpellPermanent) { + if (SpellPermanent.checkETBEffects(c, sa, "Counter")) { spellAbility.add(sa); } } diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java index 794a57125b9..efe48f3833f 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/ComputerUtil.java @@ -12,10 +12,10 @@ import forge.card.abilityFactory.AbilityFactory; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; 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.ManaPool; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -120,7 +120,7 @@ public class ComputerUtil { sa.chooseTargetAI(); } - Cost_Payment pay = new Cost_Payment(cost, sa); + CostPayment pay = new CostPayment(cost, sa); if (pay.payComputerCosts()) { AllZone.getStack().addAndUnfreeze(sa); } @@ -253,7 +253,7 @@ public class ComputerUtil { bestSA.getBeforePayManaAI().execute(); AllZone.getStack().addAndUnfreeze(bestSA); } else { - Cost_Payment pay = new Cost_Payment(cost, bestSA); + CostPayment pay = new CostPayment(cost, bestSA); if (pay.payComputerCosts()) { AllZone.getStack().addAndUnfreeze(bestSA); } @@ -328,7 +328,7 @@ public class ComputerUtil { if (cost == null) { payManaCost(sa); } else { - Cost_Payment pay = new Cost_Payment(cost, sa); + CostPayment pay = new CostPayment(cost, sa); pay.payComputerCosts(); } @@ -495,7 +495,7 @@ public class ComputerUtil { + " in ComputerUtil.canPayAdditionalCosts() without an activating 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++) { Card sourceCard = manaSources.get(i); - ArrayList manaAbilities = sourceCard.getAIPlayableMana(); + ArrayList manaAbilities = sourceCard.getAIPlayableMana(); boolean used = false; // this is for testing paying mana only manaAbilities = sortForNeeded(cost, manaAbilities, player); - for (Ability_Mana m : manaAbilities) { + for (AbilityMana m : manaAbilities) { if (used) { break; // mana source already used in the test @@ -620,7 +620,7 @@ public class ComputerUtil { if (!test) { // Pay additional costs if (m.getPayCosts() != null) { - Cost_Payment pay = new Cost_Payment(m.getPayCosts(), m); + CostPayment pay = new CostPayment(m.getPayCosts(), m); if (!pay.payComputerCosts()) { continue; } @@ -697,13 +697,13 @@ public class ComputerUtil { *

* * @param m - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param player * a {@link forge.Player} object. * @return a {@link java.util.ArrayList} object. * @since 1.0.15 */ - public static ArrayList getProduceableColors(final Ability_Mana m, final Player player) { + public static ArrayList getProduceableColors(final AbilityMana m, final Player player) { ArrayList colors = new ArrayList(); // 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 manaSources = list.filter(new CardListFilter() { public boolean addCard(final Card c) { - for (Ability_Mana am : c.getAIPlayableMana()) { + for (AbilityMana am : c.getAIPlayableMana()) { am.setActivatingPlayer(player); if (am.canPlay()) { return true; @@ -783,9 +783,9 @@ public class ComputerUtil { int usableManaAbilities = 0; boolean needsLimitedResources = false; - ArrayList manaAbilities = card.getAIPlayableMana(); + ArrayList manaAbilities = card.getAIPlayableMana(); - for (Ability_Mana m : manaAbilities) { + for (AbilityMana m : manaAbilities) { Cost cost = m.getPayCosts(); needsLimitedResources |= !cost.isReusuableResource(); @@ -828,9 +828,9 @@ public class ComputerUtil { int usableManaAbilities = 0; boolean needsLimitedResources = false; - ArrayList manaAbilities = card.getAIPlayableMana(); + ArrayList manaAbilities = card.getAIPlayableMana(); - for (Ability_Mana m : manaAbilities) { + for (AbilityMana m : manaAbilities) { Cost cost = m.getPayCosts(); needsLimitedResources |= !cost.isReusuableResource(); @@ -884,20 +884,20 @@ public class ComputerUtil { * @return a {@link java.util.ArrayList} object. * @since 1.0.15 */ - public static ArrayList sortForNeeded(final ManaCost cost, - final ArrayList manaAbilities, final Player player) { + public static ArrayList sortForNeeded(final ManaCost cost, + final ArrayList manaAbilities, final Player player) { ArrayList colors; ArrayList colorsNeededToAvoidNegativeEffect = cost.getManaNeededToAvoidNegativeEffect(); - ArrayList res = new ArrayList(); + ArrayList res = new ArrayList(); ManaCost onlyColored = new ManaCost(cost.toString()); onlyColored.removeColorlessMana(); - for (Ability_Mana am : manaAbilities) { + for (AbilityMana am : manaAbilities) { colors = getProduceableColors(am, player); for (int j = 0; j < colors.size(); 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)) { break; diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index e4393a6a594..7f99ce5a1e0 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -17,15 +17,15 @@ import forge.card.abilityFactory.AbilityFactoryCharm; import forge.card.cardFactory.CardFactoryInterface; import forge.card.cardFactory.CardFactoryUtil; 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.ManaPool; 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_Requirements; +import forge.card.spellability.SpellAbilityRequirements; import forge.card.spellability.Target; -import forge.card.spellability.Target_Selection; +import forge.card.spellability.TargetSelection; import forge.card.staticAbility.StaticAbility; import forge.card.trigger.Trigger; import forge.deck.Deck; @@ -33,9 +33,9 @@ import forge.game.GameEndReason; import forge.game.GameSummary; import forge.game.GameType; import forge.gui.GuiUtils; -import forge.gui.input.Input_Mulligan; -import forge.gui.input.Input_PayManaCost; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputMulligan; +import forge.gui.input.InputPayManaCost; +import forge.gui.input.InputPayManaCostAbility; import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.GameAction.GameActionText; @@ -671,7 +671,7 @@ public class GameAction { if (cast.getManaCost().equals("0")) { AllZone.getStack().add(cast); } else { - AllZone.getInputControl().setInput(new Input_PayManaCost(cast)); + AllZone.getInputControl().setInput(new InputPayManaCost(cast)); } } } else { @@ -1072,7 +1072,7 @@ public class GameAction { } final Card card = c; - final Ability_Static ability = new Ability_Static(crd, "0") { + final AbilityStatic ability = new AbilityStatic(crd, "0") { @Override public void resolve() { GameAction.this.destroy(crd); @@ -1441,7 +1441,7 @@ public class GameAction { mp.setImageFilename("mana_pool"); AllZone.getHumanPlayer().getZone(Zone.Battlefield).add(mp); - AllZone.getInputControl().setInput(new Input_Mulligan()); + AllZone.getInputControl().setInput(new InputMulligan()); Phase.setGameBegins(1); } // newGame() @@ -1854,10 +1854,10 @@ public class GameAction { */ public final void playSpellAbilityForFree(final SpellAbility sa) { if (sa.getPayCosts() != null) { - final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); - final Cost_Payment payment = new Cost_Payment(sa.getPayCosts(), sa); + final TargetSelection ts = new TargetSelection(sa.getTarget(), 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.fillRequirements(); } else if (sa.getBeforePayMana() == null) { @@ -1881,7 +1881,7 @@ public class GameAction { AllZone.getStack().add(sa); } }; - AllZone.getInputControl().setInput(new Input_PayManaCost_Ability(sa.getAdditionalManaCost(), paid1)); + AllZone.getInputControl().setInput(new InputPayManaCostAbility(sa.getAdditionalManaCost(), paid1)); } else { AllZone.getStack().add(sa, x); } @@ -2492,19 +2492,19 @@ public class GameAction { } if (newAbility) { - final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); - Cost_Payment payment = null; + final TargetSelection ts = new TargetSelection(sa.getTarget(), sa); + CostPayment payment = 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 { - payment = new Cost_Payment(sa.getPayCosts(), sa); + payment = new CostPayment(sa.getPayCosts(), sa); } if (!sa.isTrigger()) { payment.changeCost(); } - final SpellAbility_Requirements req = new SpellAbility_Requirements(sa, ts, payment); + final SpellAbilityRequirements req = new SpellAbilityRequirements(sa, ts, payment); req.fillRequirements(); } else { ManaCost manaCost = new ManaCost(sa.getManaCost()); @@ -2533,7 +2533,7 @@ public class GameAction { AllZone.getInputControl().setInput(sa.getAfterPayMana()); } } else if (sa.getBeforePayMana() == null) { - AllZone.getInputControl().setInput(new Input_PayManaCost(sa)); + AllZone.getInputControl().setInput(new InputPayManaCost(sa)); } else { AllZone.getInputControl().setInput(sa.getBeforePayMana()); } @@ -2554,14 +2554,14 @@ public class GameAction { sa.setActivatingPlayer(AllZone.getHumanPlayer()); if (sa.getPayCosts() != null) { - final Target_Selection ts = new Target_Selection(sa.getTarget(), sa); - final Cost_Payment payment = new Cost_Payment(sa.getPayCosts(), sa); + final TargetSelection ts = new TargetSelection(sa.getTarget(), sa); + final CostPayment payment = new CostPayment(sa.getPayCosts(), sa); if (!sa.isTrigger()) { payment.changeCost(); } - final SpellAbility_Requirements req = new SpellAbility_Requirements(sa, ts, payment); + final SpellAbilityRequirements req = new SpellAbilityRequirements(sa, ts, payment); req.setSkipStack(true); req.fillRequirements(skipTargeting); } else { @@ -2586,7 +2586,7 @@ public class GameAction { AllZone.getInputControl().setInput(sa.getAfterPayMana()); } } else if (sa.getBeforePayMana() == null) { - AllZone.getInputControl().setInput(new Input_PayManaCost(sa, true)); + AllZone.getInputControl().setInput(new InputPayManaCost(sa, true)); } else { AllZone.getInputControl().setInput(sa.getBeforePayMana()); } diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 03830efd439..c39107b570a 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -9,12 +9,12 @@ import forge.Constant.Zone; import forge.card.abilityFactory.AbilityFactory; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.game.GameLossReason; import forge.gui.GuiUtils; -import forge.gui.input.Input_PayManaCostUtil; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputPayManaCostUtil; +import forge.gui.input.InputPayManaCostAbility; /** *

@@ -312,7 +312,7 @@ public final class GameActionUtil { // resolving Ability boolean bResolving = AllZone.getStack().getResolving(); 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); } @@ -577,9 +577,9 @@ public final class GameActionUtil { String color = ""; 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; }; abMana.produceMana(); @@ -1478,7 +1478,7 @@ public final class GameActionUtil { // remove all abilities granted by this Command for (Card land : lands) { - ArrayList sas = land.getManaAbility(); + ArrayList sas = land.getManaAbility(); for (SpellAbility sa : sas) { if (sa.getType().equals("BasicLandTypeMana")) { land.removeSpellAbility(sa); diff --git a/src/main/java/forge/GuiDisplay.java b/src/main/java/forge/GuiDisplay.java index c7ecabffd31..6e18b1c58e8 100644 --- a/src/main/java/forge/GuiDisplay.java +++ b/src/main/java/forge/GuiDisplay.java @@ -85,10 +85,10 @@ import forge.gui.ForgeAction; import forge.gui.GuiUtils; import forge.gui.game.CardDetailPanel; import forge.gui.game.CardPanel; -import forge.gui.input.Input_Attack; -import forge.gui.input.Input_Block; -import forge.gui.input.Input_PayManaCost; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputAttack; +import forge.gui.input.InputBlock; +import forge.gui.input.InputPayManaCost; +import forge.gui.input.InputPayManaCostAbility; import forge.item.CardPrinted; import forge.properties.ForgePreferences; import forge.properties.ForgeProps; @@ -541,8 +541,8 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon if (c != null) { if (c.isTapped() - && (inputControl.getInput() instanceof Input_PayManaCost - || inputControl.getInput() instanceof Input_PayManaCost_Ability)) { + && (inputControl.getInput() instanceof InputPayManaCost + || inputControl.getInput() instanceof InputPayManaCostAbility)) { arcane.ui.CardPanel cardPanel = playerPlayPanel.getCardPanel(c.getUniqueNumber()); for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) { if (cp.getCard().isUntapped()) { @@ -553,7 +553,7 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon CardList att = new CardList(AllZone.getCombat().getAttackers()); 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()); for (arcane.ui.CardPanel cp : cardPanel.getAttachedPanels()) { if (cp.getCard().isUntapped() && !cp.getCard().hasSickness()) { @@ -563,15 +563,15 @@ public class GuiDisplay extends JFrame implements CardContainer, Display, NewCon } 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.untap(); AllZone.getCombat().removeFromCombat(c); - } else if (inputControl.getInput() instanceof Input_Block) { + } else if (inputControl.getInput() instanceof InputBlock) { if (c.getController().isHuman()) { AllZone.getCombat().removeFromCombat(c); } - ((Input_Block) inputControl.getInput()).removeFromAllBlocking(c); + ((InputBlock) inputControl.getInput()).removeFromAllBlocking(c); } } else { inputControl.selectCard(c, AllZone.getHumanPlayer().getZone(Zone.Battlefield)); diff --git a/src/main/java/forge/GuiDisplayUtil.java b/src/main/java/forge/GuiDisplayUtil.java index 080a675e039..1ae7f83950b 100644 --- a/src/main/java/forge/GuiDisplayUtil.java +++ b/src/main/java/forge/GuiDisplayUtil.java @@ -28,7 +28,7 @@ import arcane.ui.util.Animation; import forge.Constant.Zone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.mana.ManaPool; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.gui.GuiUtils; import forge.gui.game.CardPanel; import forge.properties.NewConstants; @@ -142,7 +142,7 @@ public final class GuiDisplayUtil implements NewConstants { final Card dummy = new Card(); dummy.setOwner(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; }; diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 7e8b485a75b..839247defee 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -12,18 +12,18 @@ import forge.card.abilityFactory.AbilityFactory; import forge.card.cardFactory.CardFactoryUtil; import forge.card.mana.ManaCost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Static; -import forge.card.spellability.Ability_Triggered; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilityStatic; +import forge.card.spellability.AbilityTriggered; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_StackInstance; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellAbilityStackInstance; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; -import forge.card.spellability.Target_Choices; -import forge.card.spellability.Target_Selection; +import forge.card.spellability.TargetChoices; +import forge.card.spellability.TargetSelection; import forge.gui.GuiUtils; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputPayManaCostAbility; /** *

@@ -36,8 +36,8 @@ import forge.gui.input.Input_PayManaCost_Ability; public class MagicStack extends MyObservable { private final List simultaneousStackEntryList = new ArrayList(); - private final Stack stack = new Stack(); - private final Stack frozenStack = new Stack(); + private final Stack stack = new Stack(); + private final Stack frozenStack = new Stack(); private boolean frozen = false; private boolean bResolving = false; @@ -241,7 +241,7 @@ public class MagicStack extends MyObservable { } else { // TODO: make working triggered abilities! - if ((sp instanceof Ability_Mana) || (sp instanceof Ability_Triggered)) { + if ((sp instanceof AbilityMana) || (sp instanceof AbilityTriggered)) { sp.resolve(); } else { this.push(sp); @@ -352,16 +352,16 @@ public class MagicStack extends MyObservable { * a {@link forge.card.spellability.SpellAbility} object. */ public final void add(final SpellAbility sp) { - final ArrayList chosenTargets = sp.getAllTargetChoices(); + final ArrayList 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.resetOnceResolved(); return; } if (this.frozen) { - final SpellAbility_StackInstance si = new SpellAbility_StackInstance(sp); + final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp); this.getFrozenStack().push(si); return; } @@ -381,12 +381,12 @@ public class MagicStack extends MyObservable { } // 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 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 sp.resolve(); } else { @@ -437,7 +437,7 @@ public class MagicStack extends MyObservable { ability.resolve(); final Card crd = sa.getSourceCard(); 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, true)); } @@ -446,7 +446,7 @@ public class MagicStack extends MyObservable { final Card crd = sa.getSourceCard(); if (sp.getSourceCard().getController().isHuman()) { 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, unpaidCommand, true)); } else { @@ -496,13 +496,13 @@ public class MagicStack extends MyObservable { .equals("")) { 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", manaCost.toString(), this, unpaidCommand)); } else { AllZone.getInputControl() .setInput( - new Input_PayManaCost_Ability( + new InputPayManaCostAbility( "Multikicker for " + sa.getSourceCard() + "\r\n" @@ -532,13 +532,13 @@ public class MagicStack extends MyObservable { if ((AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid() == 0) && AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored().equals("")) { 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", manaCost.toString(), paidCommand, unpaidCommand)); } else { AllZone.getInputControl() .setInput( - new Input_PayManaCost_Ability( + new InputPayManaCostAbility( "Multikicker for " + sa.getSourceCard() + "\r\n" @@ -602,7 +602,7 @@ public class MagicStack extends MyObservable { } else { 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", manaCost.toString(), this, unpaidCommand)); } @@ -616,7 +616,7 @@ public class MagicStack extends MyObservable { paidCommand.execute(); } else { 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", manaCost.toString(), paidCommand, unpaidCommand)); } @@ -665,7 +665,7 @@ public class MagicStack extends MyObservable { runParams.clear(); runParams.put("SourceSA", sp); if (chosenTargets.size() > 0) { - for (final Target_Choices tc : chosenTargets) { + for (final TargetChoices tc : chosenTargets) { if ((tc != null) && (tc.getTargetCards() != null)) { for (final Object tgt : tc.getTargets()) { 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") { @Override 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 (sp.getSourceCard().getController().isHuman()) { AllZone.getInputControl().setInput(in); @@ -823,7 +823,7 @@ public class MagicStack extends MyObservable { this.incrementSplitSecond(sp); - final SpellAbility_StackInstance si = new SpellAbility_StackInstance(sp); + final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp); this.getStack().push(si); this.updateObservers(); @@ -1054,7 +1054,7 @@ public class MagicStack extends MyObservable { } if (o instanceof SpellAbility) { final SpellAbility tgtSA = (SpellAbility) o; - fizzle &= !(Target_Selection.matchSpellAbility(fizzSA, tgtSA, tgt)); + fizzle &= !(TargetSelection.matchSpellAbility(fizzSA, tgtSA, tgt)); } } } else if (fizzSA.getTargetCard() != null) { @@ -1099,10 +1099,10 @@ public class MagicStack extends MyObservable { * * @param index * a int. - * @return a {@link forge.card.spellability.SpellAbility_StackInstance} + * @return a {@link forge.card.spellability.SpellAbilityStackInstance} * object. */ - public final SpellAbility_StackInstance peekInstance(final int index) { + public final SpellAbilityStackInstance peekInstance(final int index) { return this.getStack().get(index); } @@ -1124,10 +1124,10 @@ public class MagicStack extends MyObservable { * peekInstance. *

* - * @return a {@link forge.card.spellability.SpellAbility_StackInstance} + * @return a {@link forge.card.spellability.SpellAbilityStackInstance} * object. */ - public final SpellAbility_StackInstance peekInstance() { + public final SpellAbilityStackInstance peekInstance() { return this.getStack().peek(); } @@ -1151,7 +1151,7 @@ public class MagicStack extends MyObservable { * a {@link forge.card.spellability.SpellAbility} object. */ public final void remove(final SpellAbility sa) { - final SpellAbility_StackInstance si = this.getInstanceFromSpellAbility(sa); + final SpellAbilityStackInstance si = this.getInstanceFromSpellAbility(sa); if (si == null) { return; @@ -1166,10 +1166,10 @@ public class MagicStack extends MyObservable { *

* * @param si - * a {@link forge.card.spellability.SpellAbility_StackInstance} + * a {@link forge.card.spellability.SpellAbilityStackInstance} * object. */ - public final void remove(final SpellAbility_StackInstance si) { + public final void remove(final SpellAbilityStackInstance si) { if (this.getStack().remove(si)) { this.decrementSplitSecond(si.getSpellAbility()); } @@ -1184,12 +1184,12 @@ public class MagicStack extends MyObservable { * * @param sa * a {@link forge.card.spellability.SpellAbility} object. - * @return a {@link forge.card.spellability.SpellAbility_StackInstance} + * @return a {@link forge.card.spellability.SpellAbilityStackInstance} * object. */ - public final SpellAbility_StackInstance getInstanceFromSpellAbility(final SpellAbility sa) { + public final SpellAbilityStackInstance getInstanceFromSpellAbility(final SpellAbility sa) { // TODO: Confirm this works! - for (final SpellAbility_StackInstance si : this.getStack()) { + for (final SpellAbilityStackInstance si : this.getStack()) { if (si.getSpellAbility().equals(sa)) { return si; } @@ -1307,7 +1307,7 @@ public class MagicStack extends MyObservable { * @return true, if successful */ public final boolean hasStateTrigger(final int triggerID) { - for (final SpellAbility_StackInstance sasi : this.getStack()) { + for (final SpellAbilityStackInstance sasi : this.getStack()) { if (sasi.isStateTrigger(triggerID)) { return true; } @@ -1336,7 +1336,7 @@ public class MagicStack extends MyObservable { * * @return the stack */ - public final Stack getStack() { + public final Stack getStack() { return this.stack; } @@ -1345,7 +1345,7 @@ public class MagicStack extends MyObservable { * * @return the frozenStack */ - public final Stack getFrozenStack() { + public final Stack getFrozenStack() { return this.frozenStack; } diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index d04a715ccaa..0ef188a58c4 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -6,8 +6,8 @@ import java.util.HashMap; import forge.Constant.Zone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Static; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilityStatic; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; import forge.gui.input.Input; @@ -164,7 +164,7 @@ public class Upkeep implements java.io.Serializable { public void resolve() { c.addCounter(Counters.AGE, 1); 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; }; if (player.isComputer()) { @@ -473,7 +473,7 @@ public class Upkeep implements java.io.Serializable { * @return a {@link forge.card.spellability.Ability} object. */ private static Ability upkeepAIPayment(final Card c, final String cost) { - return new Ability_Static(c, cost) { + return new AbilityStatic(c, cost) { @Override public void resolve() { diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java index b1324ab2ba3..b279511ff1b 100644 --- a/src/main/java/forge/card/CardCharacteristics.java +++ b/src/main/java/forge/card/CardCharacteristics.java @@ -7,7 +7,7 @@ import java.util.TreeMap; import forge.CardColor; import forge.SetInfo; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.card.staticAbility.StaticAbility; import forge.card.trigger.Trigger; @@ -27,7 +27,7 @@ public class CardCharacteristics { private ArrayList intrinsicKeyword = new ArrayList(); private ArrayList spellAbility = new ArrayList(); private ArrayList intrinsicAbility = new ArrayList(); - private ArrayList manaAbility = new ArrayList(); + private ArrayList manaAbility = new ArrayList(); private ArrayList triggers = new ArrayList(); private ArrayList staticAbilities = new ArrayList(); private ArrayList staticAbilityStrings = new ArrayList(); @@ -237,7 +237,7 @@ public class CardCharacteristics { * * @return the manaAbility */ - public final ArrayList getManaAbility() { + public final ArrayList getManaAbility() { return manaAbility; } @@ -247,7 +247,7 @@ public class CardCharacteristics { * @param manaAbility0 * the manaAbility to set */ - public final void setManaAbility(final ArrayList manaAbility0) { + public final void setManaAbility(final ArrayList manaAbility0) { this.manaAbility = manaAbility0; // TODO: Add 0 to parameter's name. } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java index 300a6a7ae7f..4532cda4ed6 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java @@ -17,11 +17,11 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; 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_Condition; -import forge.card.spellability.SpellAbility_Restriction; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellAbilityCondition; +import forge.card.spellability.SpellAbilityRestriction; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; /** @@ -1162,7 +1162,7 @@ public class AbilityFactory { spellAbility.setSubAbility(this.getSubAbility()); } - if (spellAbility instanceof Spell_Permanent) { + if (spellAbility instanceof SpellPermanent) { spellAbility.setDescription(spellAbility.getSourceCard().getName()); } else if (this.hasSpDesc) { final StringBuilder sb = new StringBuilder(); @@ -1207,7 +1207,7 @@ public class AbilityFactory { */ private void makeRestrictions(final SpellAbility sa) { // SpellAbility_Restrictions should be added in here - final SpellAbility_Restriction restrict = sa.getRestrictions(); + final SpellAbilityRestriction restrict = sa.getRestrictions(); if (this.mapParams.containsKey("Flashback")) { sa.setFlashBackAbility(true); } @@ -1224,7 +1224,7 @@ public class AbilityFactory { */ private void makeConditions(final SpellAbility sa) { // SpellAbility_Restrictions should be added in here - final SpellAbility_Condition condition = sa.getConditions(); + final SpellAbilityCondition condition = sa.getConditions(); if (this.mapParams.containsKey("Flashback")) { sa.setFlashBackAbility(true); } @@ -1250,10 +1250,10 @@ public class AbilityFactory { * getSubAbility. *

* - * @return a {@link forge.card.spellability.Ability_Sub} object. + * @return a {@link forge.card.spellability.AbilitySub} object. */ - public final Ability_Sub getSubAbility() { - Ability_Sub abSub = null; + public final AbilitySub getSubAbility() { + AbilitySub abSub = null; String sSub = this.getMapParams().get("SubAbility"); @@ -1266,7 +1266,7 @@ public class AbilityFactory { if (!sSub.equals("")) { // Older style Drawback no longer supported final AbilityFactory afDB = new AbilityFactory(); - abSub = (Ability_Sub) afDB.getAbility(sSub, this.getHostCard()); + abSub = (AbilitySub) afDB.getAbility(sSub, this.getHostCard()); } else { System.out.println("SubAbility not found for: " + this.getHostCard()); } @@ -1657,10 +1657,10 @@ public class AbilityFactory { do { // did not find any targets - if (!(parent instanceof Ability_Sub)) { + if (!(parent instanceof AbilitySub)) { return players; } - parent = ((Ability_Sub) parent).getParent(); + parent = ((AbilitySub) parent).getParent(); tgt = parent.getTarget(); } while ((tgt == null) || (tgt.getTargetPlayers().size() == 0)); @@ -1854,8 +1854,8 @@ public class AbilityFactory { */ public static SpellAbility findRootAbility(final SpellAbility sa) { SpellAbility parent = sa; - while (parent instanceof Ability_Sub) { - parent = ((Ability_Sub) parent).getParent(); + while (parent instanceof AbilitySub) { + parent = ((AbilitySub) parent).getParent(); } return parent; @@ -1874,10 +1874,10 @@ public class AbilityFactory { SpellAbility parent = sa; do { - if (!(parent instanceof Ability_Sub)) { + if (!(parent instanceof AbilitySub)) { return parent; } - parent = ((Ability_Sub) parent).getParent(); + parent = ((AbilitySub) parent).getParent(); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetCards().size() == 0)); return parent; @@ -1896,10 +1896,10 @@ public class AbilityFactory { SpellAbility parent = sa; do { - if (!(parent instanceof Ability_Sub)) { + if (!(parent instanceof AbilitySub)) { return parent; } - parent = ((Ability_Sub) parent).getParent(); + parent = ((AbilitySub) parent).getParent(); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetSAs().size() == 0)); return parent; @@ -1918,10 +1918,10 @@ public class AbilityFactory { SpellAbility parent = sa; do { - if (!(parent instanceof Ability_Sub)) { + if (!(parent instanceof AbilitySub)) { return parent; } - parent = ((Ability_Sub) parent).getParent(); + parent = ((AbilitySub) parent).getParent(); } while ((parent.getTarget() == null) || (parent.getTarget().getTargetPlayers().size() == 0)); return parent; @@ -2316,7 +2316,7 @@ public class AbilityFactory { * @since 1.0.15 */ public static void resolveSubAbilities(final SpellAbility sa) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if ((abSub == null) || sa.isWrapper()) { return; } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java index 060c18abbe1..166a6a13655 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryAlterLife.java @@ -15,8 +15,8 @@ import forge.MyRandom; import forge.Player; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -47,7 +47,7 @@ public class AbilityFactoryAlterLife { */ 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()) { private static final long serialVersionUID = 8869422603616247307L; @@ -131,7 +131,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = abilityFactory; @@ -188,7 +188,7 @@ public class AbilityFactoryAlterLife { final StringBuilder sb = new StringBuilder(); 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(" - "); } else { sb.append(" "); @@ -214,7 +214,7 @@ public class AbilityFactoryAlterLife { sb.append("gains ").append(amount).append(" life."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -356,7 +356,7 @@ public class AbilityFactoryAlterLife { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -408,7 +408,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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()) { private static final long serialVersionUID = 1129762905315395160L; @@ -495,7 +495,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = abilityFactory; @@ -551,7 +551,7 @@ public class AbilityFactoryAlterLife { final StringBuilder sb = new StringBuilder(); 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(" - "); } else { sb.append(" "); @@ -576,7 +576,7 @@ public class AbilityFactoryAlterLife { sb.append("loses ").append(amount).append(" life."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -723,7 +723,7 @@ public class AbilityFactoryAlterLife { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -780,7 +780,7 @@ public class AbilityFactoryAlterLife { */ 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; @Override @@ -856,7 +856,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -929,7 +929,7 @@ public class AbilityFactoryAlterLife { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -983,7 +983,7 @@ public class AbilityFactoryAlterLife { final StringBuilder sb = new StringBuilder(); 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(" - "); } else { sb.append(" "); @@ -1027,7 +1027,7 @@ public class AbilityFactoryAlterLife { sb.append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1104,7 +1104,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1178,7 +1178,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1231,7 +1231,7 @@ public class AbilityFactoryAlterLife { final StringBuilder sb = new StringBuilder(); 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(" -"); } else { sb.append(" "); @@ -1257,7 +1257,7 @@ public class AbilityFactoryAlterLife { sb.append("life total becomes ").append(amount).append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1419,7 +1419,7 @@ public class AbilityFactoryAlterLife { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -1471,7 +1471,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1540,7 +1540,7 @@ public class AbilityFactoryAlterLife { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1588,7 +1588,7 @@ public class AbilityFactoryAlterLife { final StringBuilder sb = new StringBuilder(); final Player activatingPlayer = sa.getActivatingPlayer(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" -"); @@ -1612,7 +1612,7 @@ public class AbilityFactoryAlterLife { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java index f3a3a99650b..e71c0f4a525 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryAnimate.java @@ -15,8 +15,8 @@ import forge.ComputerUtil; import forge.Constant; import forge.Constant.Zone; import forge.Player; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -52,7 +52,7 @@ public final class AbilityFactoryAnimate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -119,7 +119,7 @@ public final class AbilityFactoryAnimate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -194,7 +194,7 @@ public final class AbilityFactoryAnimate { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard().getName()).append(" - "); @@ -267,7 +267,7 @@ public final class AbilityFactoryAnimate { sb.append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -352,7 +352,7 @@ public final class AbilityFactoryAnimate { useAbility &= AbilityFactoryAnimate.animateTgtAI(af, sa); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { useAbility &= subAb.chkAIDrawback(); } @@ -377,7 +377,7 @@ public final class AbilityFactoryAnimate { // TODO - restrict the subAbility a bit - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -412,7 +412,7 @@ public final class AbilityFactoryAnimate { // Eventually, we can call the trigger of ETB abilities with // not mandatory as part of the checks to cast something - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -812,7 +812,7 @@ public final class AbilityFactoryAnimate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -879,7 +879,7 @@ public final class AbilityFactoryAnimate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -921,7 +921,7 @@ public final class AbilityFactoryAnimate { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -936,7 +936,7 @@ public final class AbilityFactoryAnimate { sb.append(desc); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -958,7 +958,7 @@ public final class AbilityFactoryAnimate { private static boolean animateAllCanPlayAI(final AbilityFactory af, final SpellAbility sa) { boolean useAbility = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { useAbility &= subAb.chkAIDrawback(); } @@ -980,7 +980,7 @@ public final class AbilityFactoryAnimate { private static boolean animateAllPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { boolean chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -1008,7 +1008,7 @@ public final class AbilityFactoryAnimate { boolean chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java index 28f47ab38ae..7620b07ef49 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryAttach.java @@ -22,10 +22,10 @@ import forge.MyRandom; import forge.Player; import forge.card.cardFactory.CardFactoryUtil; 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.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.staticAbility.StaticAbility; import forge.gui.GuiUtils; @@ -51,7 +51,7 @@ public class AbilityFactoryAttach { if (abilityFactory.getHostCard().isAura()) { // The 4th parameter is to resolve an issue with SetDescription in // default Spell_Permanent constructor - spAttach = new Spell_Permanent(abilityFactory.getHostCard(), abilityFactory.getAbCost(), + spAttach = new SpellPermanent(abilityFactory.getHostCard(), abilityFactory.getAbCost(), abilityFactory.getAbTgt(), false) { private static final long serialVersionUID = 6631124959690157874L; @@ -147,7 +147,7 @@ public class AbilityFactoryAttach { public static String attachStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -174,7 +174,7 @@ public class AbilityFactoryAttach { sb.append(o).append(" "); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -884,7 +884,7 @@ public class AbilityFactoryAttach { // Now are Valid Targets better than my targets? // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java index 4270386e38a..cb95e80bd4e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeState.java @@ -11,8 +11,8 @@ import forge.CardList; import forge.Constant.Zone; import forge.Player; import forge.card.cardFactory.CardFactoryUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -31,7 +31,7 @@ public class AbilityFactoryChangeState { * @return the change state ability */ 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()) { private static final long serialVersionUID = -1083427558368639457L; @@ -82,7 +82,7 @@ public class AbilityFactoryChangeState { * @return the change state drawback */ 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; @@ -142,7 +142,7 @@ public class AbilityFactoryChangeState { tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa); } - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -169,7 +169,7 @@ public class AbilityFactoryChangeState { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -211,7 +211,7 @@ public class AbilityFactoryChangeState { * @return the change state all ability */ 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()) { private static final long serialVersionUID = 7841029107610111992L; @@ -265,7 +265,7 @@ public class AbilityFactoryChangeState { * @return the change state all drawback */ 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; @@ -351,7 +351,7 @@ public class AbilityFactoryChangeState { final Map params = abilityFactory.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -365,7 +365,7 @@ public class AbilityFactoryChangeState { sb.append(" permanents."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java index 7febf8eba20..50d7ea2398e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryChangeZone.java @@ -23,11 +23,11 @@ import forge.PlayerZone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.gui.GuiUtils; @@ -59,7 +59,7 @@ public final class AbilityFactoryChangeZone { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -129,7 +129,7 @@ public final class AbilityFactoryChangeZone { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -206,7 +206,7 @@ public final class AbilityFactoryChangeZone { af.getAbTgt().setZone(origin); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { if (origin.contains(Zone.Battlefield) || params.get("Destination").equals("Battlefield")) { af.getHostCard().setSVar("PlayMain1", "TRUE"); } @@ -430,7 +430,7 @@ public final class AbilityFactoryChangeZone { chance &= (r.nextFloat() < .8); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { 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) { return subAb.doTrigger(mandatory); } @@ -568,7 +568,7 @@ public final class AbilityFactoryChangeZone { final StringBuilder sb = new StringBuilder(); final Card host = af.getHostCard(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { 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) { sb.append(abSub.getStackDescription()); } @@ -1204,7 +1204,7 @@ public final class AbilityFactoryChangeZone { return false; } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); String subAPI = ""; if (abSub != null) { 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) { chance &= subAb.chkAIDrawback(); } @@ -1277,7 +1277,7 @@ public final class AbilityFactoryChangeZone { final Zone destination = Zone.smartValueOf(params.get("Destination")); final Target tgt = af.getAbTgt(); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); String subAPI = ""; String subAffected = ""; HashMap subParams = null; @@ -1352,7 +1352,7 @@ public final class AbilityFactoryChangeZone { } // counters TODO check good and // bad counters - return Spell_Permanent.checkETBEffects(c, null, null); // checks + return SpellPermanent.checkETBEffects(c, null, null); // checks // only // if // there @@ -1568,7 +1568,7 @@ public final class AbilityFactoryChangeZone { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { return subAb.doTrigger(mandatory); } @@ -1593,7 +1593,7 @@ public final class AbilityFactoryChangeZone { final StringBuilder sb = new StringBuilder(); final Card host = af.getHostCard(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(host.getName()).append(" -"); } @@ -1691,7 +1691,7 @@ public final class AbilityFactoryChangeZone { sb.append(" into").append(pronoun).append("owner's graveyard."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1847,7 +1847,7 @@ public final class AbilityFactoryChangeZone { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1917,7 +1917,7 @@ public final class AbilityFactoryChangeZone { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -2069,7 +2069,7 @@ public final class AbilityFactoryChangeZone { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -2112,7 +2112,7 @@ public final class AbilityFactoryChangeZone { final StringBuilder sb = new StringBuilder(); final Card host = af.getHostCard(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(host.getName()).append(" -"); } @@ -2126,7 +2126,7 @@ public final class AbilityFactoryChangeZone { sb.append(desc[0]); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java index 05e986150ee..f89bffd1914 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCharm.java @@ -2,8 +2,8 @@ package forge.card.abilityFactory; import java.util.ArrayList; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; @@ -34,7 +34,7 @@ public final class AbilityFactoryCharm { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -96,7 +96,7 @@ public final class AbilityFactoryCharm { private static String charmStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -106,7 +106,7 @@ public final class AbilityFactoryCharm { // nothing stack specific for Charm // begin standard post - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -151,7 +151,7 @@ public final class AbilityFactoryCharm { if (null == o) { break; } - final Ability_Sub chosen = (Ability_Sub) o; + final AbilitySub chosen = (AbilitySub) o; sa.addCharmChoice(chosen); choices.remove(chosen); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java index ea576fceff4..4ec17aa887f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryChoose.java @@ -19,8 +19,8 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.card.cardFactory.CardFactoryUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -55,7 +55,7 @@ public final class AbilityFactoryChoose { */ 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; @Override @@ -124,7 +124,7 @@ public final class AbilityFactoryChoose { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -166,7 +166,7 @@ public final class AbilityFactoryChoose { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -186,7 +186,7 @@ public final class AbilityFactoryChoose { } sb.append("chooses a type."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -410,7 +410,7 @@ public final class AbilityFactoryChoose { */ 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; @Override @@ -481,7 +481,7 @@ public final class AbilityFactoryChoose { * @since 1.0.15 */ 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; @Override @@ -523,7 +523,7 @@ public final class AbilityFactoryChoose { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -547,7 +547,7 @@ public final class AbilityFactoryChoose { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -570,7 +570,7 @@ public final class AbilityFactoryChoose { // Note: if (AILogic == MostProminentAttackers) return isDuringCombat(); boolean chance = true; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -690,7 +690,7 @@ public final class AbilityFactoryChoose { */ 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; @Override @@ -761,7 +761,7 @@ public final class AbilityFactoryChoose { * @since 1.1.6 */ 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; @Override @@ -802,7 +802,7 @@ public final class AbilityFactoryChoose { private static String chooseNumberStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -822,7 +822,7 @@ public final class AbilityFactoryChoose { } sb.append("chooses a number."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -936,7 +936,7 @@ public final class AbilityFactoryChoose { * @since 1.1.6 */ 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; @@ -1009,7 +1009,7 @@ public final class AbilityFactoryChoose { * @since 1.1.6 */ 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; @@ -1051,7 +1051,7 @@ public final class AbilityFactoryChoose { private static String choosePlayerStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -1071,7 +1071,7 @@ public final class AbilityFactoryChoose { } sb.append("chooses a player."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1169,7 +1169,7 @@ public final class AbilityFactoryChoose { * @since 1.1.6 */ 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; @Override @@ -1240,7 +1240,7 @@ public final class AbilityFactoryChoose { * @since 1.1.6 */ 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; @Override @@ -1281,7 +1281,7 @@ public final class AbilityFactoryChoose { private static String nameCardStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -1301,7 +1301,7 @@ public final class AbilityFactoryChoose { } sb.append("names a card."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java index aa03a0be7da..0d6186e06a7 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryClash.java @@ -7,8 +7,8 @@ import forge.AllZone; import forge.Card; import forge.GameActionUtil; import forge.Player; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; @@ -37,7 +37,7 @@ public final class AbilityFactoryClash { * @since 1.0.15 */ 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; @Override @@ -123,7 +123,7 @@ public final class AbilityFactoryClash { * @since 1.0.15 */ 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; @Override @@ -183,7 +183,7 @@ public final class AbilityFactoryClash { final SpellAbility win = afOutcomes.getAbility( af.getHostCard().getSVar(af.getMapParams().get("WinSubAbility")), af.getHostCard()); win.setActivatingPlayer(af.getHostCard().getController()); - ((Ability_Sub) win).setParent(sa); + ((AbilitySub) win).setParent(sa); AbilityFactory.resolve(win, false); } @@ -193,7 +193,7 @@ public final class AbilityFactoryClash { final SpellAbility otherwise = afOutcomes.getAbility( af.getHostCard().getSVar(af.getMapParams().get("OtherwiseSubAbility")), af.getHostCard()); otherwise.setActivatingPlayer(af.getHostCard().getController()); - ((Ability_Sub) otherwise).setParent(sa); + ((AbilitySub) otherwise).setParent(sa); AbilityFactory.resolve(otherwise, false); } @@ -218,7 +218,7 @@ public final class AbilityFactoryClash { * @since 1.0.15 */ 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; @Override @@ -299,7 +299,7 @@ public final class AbilityFactoryClash { * @since 1.0.15 */ 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; @Override @@ -355,7 +355,7 @@ public final class AbilityFactoryClash { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -363,7 +363,7 @@ public final class AbilityFactoryClash { sb.append(player).append(" flips a coin."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -408,7 +408,7 @@ public final class AbilityFactoryClash { if (params.containsKey("WinSubAbility")) { final SpellAbility win = afOutcomes.getAbility(host.getSVar(params.get("WinSubAbility")), host); win.setActivatingPlayer(player); - ((Ability_Sub) win).setParent(sa); + ((AbilitySub) win).setParent(sa); AbilityFactory.resolve(win, false); } @@ -420,7 +420,7 @@ public final class AbilityFactoryClash { if (params.containsKey("LoseSubAbility")) { final SpellAbility lose = afOutcomes.getAbility(host.getSVar(params.get("LoseSubAbility")), host); lose.setActivatingPlayer(player); - ((Ability_Sub) lose).setParent(sa); + ((AbilitySub) lose).setParent(sa); AbilityFactory.resolve(lose, false); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java index d2492fda1ea..6f2d13261ba 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCleanup.java @@ -2,7 +2,7 @@ package forge.card.abilityFactory; import java.util.HashMap; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilitySub; 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 @@ -30,10 +30,10 @@ public final class AbilityFactoryCleanup { * * @param af * 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) { - final Ability_Sub drawback = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { + public static AbilitySub getDrawback(final AbilityFactory af) { + final AbilitySub drawback = new AbilitySub(af.getHostCard(), af.getAbTgt()) { private static final long serialVersionUID = 6192972525033429820L; @Override diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java index 937410d3a02..779b63822e8 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCombat.java @@ -13,8 +13,8 @@ import forge.Constant; import forge.Constant.Zone; import forge.Player; import forge.card.cardFactory.CardFactoryUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -47,7 +47,7 @@ public final class AbilityFactoryCombat { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -120,7 +120,7 @@ public final class AbilityFactoryCombat { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -156,7 +156,7 @@ public final class AbilityFactoryCombat { public static String fogStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -165,7 +165,7 @@ public final class AbilityFactoryCombat { sb.append(sa.getSourceCard().getController()); sb.append(" prevents all combat damage this turn."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -203,7 +203,7 @@ public final class AbilityFactoryCombat { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { if (!subAb.chkAIDrawback()) { return false; @@ -234,7 +234,7 @@ public final class AbilityFactoryCombat { chance = AllZone.getPhase().isAfter(Constant.Phase.COMBAT_DAMAGE); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -269,7 +269,7 @@ public final class AbilityFactoryCombat { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return chance && abSub.doTrigger(mandatory); } @@ -312,7 +312,7 @@ public final class AbilityFactoryCombat { * @since 1.1.01 */ 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; @Override @@ -381,7 +381,7 @@ public final class AbilityFactoryCombat { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -408,7 +408,7 @@ public final class AbilityFactoryCombat { final Card host = af.getHostCard(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -438,7 +438,7 @@ public final class AbilityFactoryCombat { } // begin standard post- - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -458,7 +458,7 @@ public final class AbilityFactoryCombat { // TODO - implement AI chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -478,7 +478,7 @@ public final class AbilityFactoryCombat { chance = false; // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return chance && abSub.doTrigger(mandatory); } @@ -529,7 +529,7 @@ public final class AbilityFactoryCombat { * @since 1.1.6 */ 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; @Override @@ -598,7 +598,7 @@ public final class AbilityFactoryCombat { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -624,7 +624,7 @@ public final class AbilityFactoryCombat { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -650,7 +650,7 @@ public final class AbilityFactoryCombat { sb.append(" from combat."); // begin standard post- - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -670,7 +670,7 @@ public final class AbilityFactoryCombat { // TODO - implement AI chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -691,7 +691,7 @@ public final class AbilityFactoryCombat { chance = false; // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return chance && abSub.doTrigger(mandatory); } @@ -739,7 +739,7 @@ public final class AbilityFactoryCombat { * @since 1.1.6 */ 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; @Override @@ -812,7 +812,7 @@ public final class AbilityFactoryCombat { * @since 1.1.6 */ 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; @Override @@ -839,7 +839,7 @@ public final class AbilityFactoryCombat { final Card host = af.getHostCard(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -870,7 +870,7 @@ public final class AbilityFactoryCombat { } // begin standard post- - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -891,7 +891,7 @@ public final class AbilityFactoryCombat { // TODO - implement AI chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -967,7 +967,7 @@ public final class AbilityFactoryCombat { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return chance && abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java index 0f0c2d98511..1fddbd9714e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCopy.java @@ -18,8 +18,8 @@ import forge.Constant.Zone; import forge.MyRandom; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -54,7 +54,7 @@ public final class AbilityFactoryCopy { */ 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; @Override @@ -123,7 +123,7 @@ public final class AbilityFactoryCopy { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -165,7 +165,7 @@ public final class AbilityFactoryCopy { final StringBuilder sb = new StringBuilder(); final HashMap params = af.getMapParams(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -190,7 +190,7 @@ public final class AbilityFactoryCopy { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -302,7 +302,7 @@ public final class AbilityFactoryCopy { // end Targeting if (af.hasSubAbility()) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.chkAIDrawback(); } @@ -491,7 +491,7 @@ public final class AbilityFactoryCopy { */ 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; @Override @@ -560,7 +560,7 @@ public final class AbilityFactoryCopy { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -602,7 +602,7 @@ public final class AbilityFactoryCopy { final StringBuilder sb = new StringBuilder(); final HashMap params = af.getMapParams(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -636,7 +636,7 @@ public final class AbilityFactoryCopy { sb.append("."); // TODO probably add an optional "You may choose new targets..." - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -676,7 +676,7 @@ public final class AbilityFactoryCopy { final boolean randomReturn = false; if (af.hasSubAbility()) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return randomReturn && abSub.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java index b8a80d900e6..5e01cef0da0 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCounterMagic.java @@ -10,13 +10,13 @@ import forge.MyRandom; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; 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_Selection; +import forge.card.spellability.TargetSelection; //Destination - send countered spell to: (only applies to Spells; ignored for Abilities) // -Graveyard (Default) @@ -77,7 +77,7 @@ public class AbilityFactoryCounterMagic { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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()) { private static final long serialVersionUID = -3895990436431818899L; @@ -153,7 +153,7 @@ public class AbilityFactoryCounterMagic { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -226,7 +226,7 @@ public class AbilityFactoryCounterMagic { } tgt.resetTargets(); - if (Target_Selection.matchSpellAbility(sa, topSA, tgt)) { + if (TargetSelection.matchSpellAbility(sa, topSA, tgt)) { tgt.addTarget(topSA); } else { return false; @@ -269,7 +269,7 @@ public class AbilityFactoryCounterMagic { // 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) { toReturn &= subAb.chkAIDrawback(); } @@ -304,7 +304,7 @@ public class AbilityFactoryCounterMagic { } tgt.resetTargets(); - if (Target_Selection.matchSpellAbility(sa, topSA, tgt)) { + if (TargetSelection.matchSpellAbility(sa, topSA, tgt)) { tgt.addTarget(topSA); } else { return false; @@ -348,7 +348,7 @@ public class AbilityFactoryCounterMagic { // 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) { toReturn &= subAb.chkAIDrawback(); } @@ -392,7 +392,7 @@ public class AbilityFactoryCounterMagic { continue; } - final SpellAbility_StackInstance si = AllZone.getStack().getInstanceFromSpellAbility(tgtSA); + final SpellAbilityStackInstance si = AllZone.getStack().getInstanceFromSpellAbility(tgtSA); if (si == null) { continue; } @@ -427,7 +427,7 @@ public class AbilityFactoryCounterMagic { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -460,7 +460,7 @@ public class AbilityFactoryCounterMagic { sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -478,10 +478,10 @@ public class AbilityFactoryCounterMagic { * @param srcSA * a {@link forge.card.spellability.SpellAbility} object. * @param si - * a {@link forge.card.spellability.SpellAbility_StackInstance} + * a {@link forge.card.spellability.SpellAbilityStackInstance} * 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); if (tgtSA.isAbility()) { diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java index 09c3ec5cfdb..68de4b4d369 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryCounters.java @@ -21,8 +21,8 @@ import forge.PlayerZone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -55,7 +55,7 @@ public class AbilityFactoryCounters { */ 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; @Override @@ -129,7 +129,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -171,7 +171,7 @@ public class AbilityFactoryCounters { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -216,7 +216,7 @@ public class AbilityFactoryCounters { sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -368,7 +368,7 @@ public class AbilityFactoryCounters { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -453,7 +453,7 @@ public class AbilityFactoryCounters { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -557,7 +557,7 @@ public class AbilityFactoryCounters { abTgt.addTarget(choice); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { // chance &= subAb.doTrigger(mandatory); } @@ -704,7 +704,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -778,7 +778,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -821,7 +821,7 @@ public class AbilityFactoryCounters { final Card card = af.getHostCard(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(card).append(" - "); } else { sb.append(" "); @@ -854,7 +854,7 @@ public class AbilityFactoryCounters { sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -928,7 +928,7 @@ public class AbilityFactoryCounters { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -973,7 +973,7 @@ public class AbilityFactoryCounters { // currently, not targeted - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -1010,7 +1010,7 @@ public class AbilityFactoryCounters { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } @@ -1078,7 +1078,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1153,7 +1153,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1196,7 +1196,7 @@ public class AbilityFactoryCounters { */ private static String proliferateStackDescription(final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -1205,7 +1205,7 @@ public class AbilityFactoryCounters { 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.)"); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1224,7 +1224,7 @@ public class AbilityFactoryCounters { */ private static boolean proliferateShouldPlayAI(final SpellAbility sa) { boolean chance = true; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -1247,7 +1247,7 @@ public class AbilityFactoryCounters { */ private static boolean proliferateDoTriggerAI(final SpellAbility sa, final boolean mandatory) { boolean chance = true; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } @@ -1457,7 +1457,7 @@ public class AbilityFactoryCounters { */ 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; @Override @@ -1526,7 +1526,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1568,7 +1568,7 @@ public class AbilityFactoryCounters { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -1583,7 +1583,7 @@ public class AbilityFactoryCounters { } sb.append(" on each valid permanent."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { 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) { chance &= subAb.chkAIDrawback(); } @@ -1766,7 +1766,7 @@ public class AbilityFactoryCounters { */ 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; @Override @@ -1835,7 +1835,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1877,7 +1877,7 @@ public class AbilityFactoryCounters { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -1897,7 +1897,7 @@ public class AbilityFactoryCounters { } sb.append(" from each valid permanent."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1987,7 +1987,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -2056,7 +2056,7 @@ public class AbilityFactoryCounters { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -2099,7 +2099,7 @@ public class AbilityFactoryCounters { final StringBuilder sb = new StringBuilder(); final Card host = af.getHostCard(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard().getName()).append(" - "); @@ -2131,7 +2131,7 @@ public class AbilityFactoryCounters { sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -2169,7 +2169,7 @@ public class AbilityFactoryCounters { // prevent run-away activations - first time will always return true boolean chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -2195,7 +2195,7 @@ public class AbilityFactoryCounters { private static boolean moveCounterPlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { boolean chance = false; - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -2239,7 +2239,7 @@ public class AbilityFactoryCounters { chance = true; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java index fd142104e44..a2fe1a520b1 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryDealDamage.java @@ -18,8 +18,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -67,7 +67,7 @@ public class AbilityFactoryDealDamage { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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()) { private static final long serialVersionUID = -7560349014757367722L; @@ -136,7 +136,7 @@ public class AbilityFactoryDealDamage { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -191,7 +191,7 @@ public class AbilityFactoryDealDamage { tgts = sa.getTarget().getTargets(); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(name).append(" -"); } sb.append(" "); @@ -359,7 +359,7 @@ public class AbilityFactoryDealDamage { } } - final Ability_Sub subAb = saMe.getSubAbility(); + final AbilitySub subAb = saMe.getSubAbility(); if (subAb != null) { rr &= subAb.chkAIDrawback(); } @@ -811,7 +811,7 @@ public class AbilityFactoryDealDamage { */ 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()) { private static final long serialVersionUID = -1831356710492849854L; private final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory; @@ -886,7 +886,7 @@ public class AbilityFactoryDealDamage { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = AbilityFactoryDealDamage.this.abilityFactory; @@ -939,7 +939,7 @@ public class AbilityFactoryDealDamage { sb.append(name).append(" - Deals " + dmg + " damage to " + desc); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1028,7 +1028,7 @@ public class AbilityFactoryDealDamage { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java index 1996fc0b34f..35f2f2febe4 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryDebuff.java @@ -20,11 +20,11 @@ import forge.MyRandom; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_Restriction; +import forge.card.spellability.SpellAbilityRestriction; import forge.card.spellability.Target; /** @@ -55,7 +55,7 @@ public final class AbilityFactoryDebuff { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -124,7 +124,7 @@ public final class AbilityFactoryDebuff { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -194,7 +194,7 @@ public final class AbilityFactoryDebuff { } if (tgtCards.size() > 0) { - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -226,7 +226,7 @@ public final class AbilityFactoryDebuff { sb.append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -268,7 +268,7 @@ public final class AbilityFactoryDebuff { } final HashMap params = af.getMapParams(); - final SpellAbility_Restriction restrict = sa.getRestrictions(); + final SpellAbilityRestriction restrict = sa.getRestrictions(); // Phase Restrictions if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) { @@ -594,7 +594,7 @@ public final class AbilityFactoryDebuff { * @since 1.0.15 */ 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; @Override @@ -666,7 +666,7 @@ public final class AbilityFactoryDebuff { * @since 1.0.15 */ 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; @Override @@ -856,7 +856,7 @@ public final class AbilityFactoryDebuff { desc = params.get("DebuffAllDescription"); } - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -864,7 +864,7 @@ public final class AbilityFactoryDebuff { sb.append(desc); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java index f4a0af6c8b8..3d14119bd88 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryDelayedTrigger.java @@ -3,8 +3,8 @@ package forge.card.abilityFactory; import java.util.HashMap; import forge.AllZone; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.trigger.Trigger; @@ -32,7 +32,7 @@ public class AbilityFactoryDelayedTrigger { * @since 1.0.15 */ 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; @Override @@ -97,10 +97,10 @@ public class AbilityFactoryDelayedTrigger { * * @param abilityFactory * 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) { - final Ability_Sub drawback = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { + public static AbilitySub getDrawback(final AbilityFactory abilityFactory) { + final AbilitySub drawback = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { private static final long serialVersionUID = 6192972525033429820L; @Override @@ -139,8 +139,8 @@ public class AbilityFactoryDelayedTrigger { final SpellAbility trigsa = AbilityFactoryDelayedTrigger.tempCreator.getAbility( abilityFactory.getHostCard().getSVar(svarName), abilityFactory.getHostCard()); - if (trigsa instanceof Ability_Sub) { - return ((Ability_Sub) trigsa).chkAIDrawback(); + if (trigsa instanceof AbilitySub) { + return ((AbilitySub) trigsa).chkAIDrawback(); } else { return trigsa.canPlayAI(); } @@ -205,7 +205,7 @@ public class AbilityFactoryDelayedTrigger { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -217,7 +217,7 @@ public class AbilityFactoryDelayedTrigger { sb.append(mapParams.get("TriggerDescription")); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java index b43145e9abe..af973444e5e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryDestroy.java @@ -18,8 +18,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -48,7 +48,7 @@ public class AbilityFactoryDestroy { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -114,10 +114,10 @@ public class AbilityFactoryDestroy { * * @param af * 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) { - final Ability_Sub dbDestroy = new Ability_Sub(af.getHostCard(), af.getAbTgt()) { + public static AbilitySub createDrawbackDestroy(final AbilityFactory af) { + final AbilitySub dbDestroy = new AbilitySub(af.getHostCard(), af.getAbTgt()) { private static final long serialVersionUID = -4153613567150919283L; @Override @@ -256,7 +256,7 @@ public class AbilityFactoryDestroy { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -370,7 +370,7 @@ public class AbilityFactoryDestroy { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { return subAb.doTrigger(mandatory); } @@ -409,7 +409,7 @@ public class AbilityFactoryDestroy { tgtCards = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("Defined"), sa); } - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -452,7 +452,7 @@ public class AbilityFactoryDestroy { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -529,7 +529,7 @@ public class AbilityFactoryDestroy { */ 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 final HashMap params = af.getMapParams(); @@ -608,7 +608,7 @@ public class AbilityFactoryDestroy { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final HashMap params = af.getMapParams(); @@ -684,7 +684,7 @@ public class AbilityFactoryDestroy { sb.append(" They can't be regenerated"); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -773,7 +773,7 @@ public class AbilityFactoryDestroy { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java index 16ab379e836..51937f20856 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryEffect.java @@ -12,8 +12,8 @@ import forge.ComputerUtil; import forge.Constant.Zone; import forge.MyRandom; import forge.Player; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -40,7 +40,7 @@ public class AbilityFactoryEffect { */ 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 final AbilityFactory af = abilityFactory; @@ -117,7 +117,7 @@ public class AbilityFactoryEffect { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = abilityFactory; @@ -167,7 +167,7 @@ public class AbilityFactoryEffect { public static String effectStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard().getName()).append(" - "); @@ -175,7 +175,7 @@ public class AbilityFactoryEffect { sb.append(sa.getDescription()); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -247,7 +247,7 @@ public class AbilityFactoryEffect { // TODO: Add targeting effects // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java index 127466f1f86..8ad4224468c 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryEndGameCondition.java @@ -6,8 +6,8 @@ import forge.AllZone; import forge.Card; import forge.ComputerUtil; import forge.Player; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -42,7 +42,7 @@ public final class AbilityFactoryEndGameCondition { */ 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; @Override @@ -120,7 +120,7 @@ public final class AbilityFactoryEndGameCondition { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -173,7 +173,7 @@ public final class AbilityFactoryEndGameCondition { public static String winsGameStackDescription(final AbilityFactory af, final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -182,7 +182,7 @@ public final class AbilityFactoryEndGameCondition { // Let the spell description also be the stack description sb.append(sa.getDescription()); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -236,7 +236,7 @@ public final class AbilityFactoryEndGameCondition { // WinGame abilities usually don't have subAbilities but for // consistency... - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -281,7 +281,7 @@ public final class AbilityFactoryEndGameCondition { */ 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; @Override @@ -359,7 +359,7 @@ public final class AbilityFactoryEndGameCondition { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -413,7 +413,7 @@ public final class AbilityFactoryEndGameCondition { final StringBuilder sb = new StringBuilder(); final Card source = sa.getSourceCard(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(source.getName()).append(" - "); } else { sb.append(" "); @@ -433,7 +433,7 @@ public final class AbilityFactoryEndGameCondition { sb.append("loses the game."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -506,7 +506,7 @@ public final class AbilityFactoryEndGameCondition { // WinGame abilities usually don't have subAbilities but for // consistency... - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java index 81d1865629f..a1e9bf84fc7 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryGainControl.java @@ -17,8 +17,8 @@ import forge.Constant.Zone; import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -133,7 +133,7 @@ public class AbilityFactoryGainControl { */ 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; @Override @@ -169,7 +169,7 @@ public class AbilityFactoryGainControl { * @since 1.0.15 */ 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; @Override @@ -213,7 +213,7 @@ public class AbilityFactoryGainControl { private String gainControlStackDescription(final SpellAbility sa) { final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -246,7 +246,7 @@ public class AbilityFactoryGainControl { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java index 5cf5884d420..786b60204c5 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryMana.java @@ -16,14 +16,14 @@ import forge.Counters; import forge.MyRandom; import forge.Player; import forge.card.cost.Cost; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; import forge.gui.GuiUtils; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -47,7 +47,7 @@ public class AbilityFactoryMana { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = abilityFactory; @@ -91,7 +91,7 @@ public class AbilityFactoryMana { // To get the mana to resolve properly, we need the spell to contain // an Ability_Mana 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; @Override @@ -133,17 +133,17 @@ public class AbilityFactoryMana { * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param produced * 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) { - final Ability_Sub dbMana = new Ability_Sub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { + public static AbilitySub createDrawbackMana(final AbilityFactory abilityFactory, final String produced) { + final AbilitySub dbMana = new AbilitySub(abilityFactory.getHostCard(), abilityFactory.getAbTgt()) { private static final long serialVersionUID = -5141246507533353605L; private final AbilityFactory af = abilityFactory; // To get the mana to resolve properly, we need the spell to contain // an Ability_Mana 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; @Override @@ -201,17 +201,17 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} 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(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(af.getHostCard()).append(" - "); @@ -232,13 +232,13 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param sa * 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 abMana.setUndoable(af.isAbility() && abMana.isUndoable()); @@ -282,14 +282,14 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param sa * a {@link forge.card.spellability.SpellAbility} 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 final HashMap params = af.getMapParams(); final Card card = sa.getSourceCard(); @@ -299,7 +299,7 @@ public class AbilityFactoryMana { String baseMana = abMana.mana(); if (baseMana.equals("Chosen")) { // 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")) { @@ -358,7 +358,7 @@ public class AbilityFactoryMana { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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 final AbilityFactory af = abilityFactory; @@ -405,7 +405,7 @@ public class AbilityFactoryMana { // To get the mana to resolve properly, we need the spell to contain // an Ability_Mana 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; @Override @@ -454,11 +454,11 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * 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 final HashMap params = af.getMapParams(); abMana.setUndoable(af.isAbility() && abMana.isUndoable()); @@ -498,7 +498,7 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param colors @@ -507,7 +507,7 @@ public class AbilityFactoryMana { * a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object. */ - public static ArrayList reflectableMana(final Ability_Mana abMana, final AbilityFactory af, + public static ArrayList reflectableMana(final AbilityMana abMana, final AbilityFactory af, ArrayList colors, final ArrayList parents) { // Here's the problem with reflectable Mana. If more than one is out, // they need to Reflect each other, @@ -565,7 +565,7 @@ public class AbilityFactoryMana { } else if (reflectProperty.equals("Produced")) { final String producedColors = (String) abMana.getTriggeringObject("Produced"); 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)) { colors.add(col); } @@ -574,16 +574,16 @@ public class AbilityFactoryMana { colors.add(Constant.Color.COLORLESS); } } else if (reflectProperty.equals("Produce")) { - final ArrayList abilities = new ArrayList(); + final ArrayList abilities = new ArrayList(); for (final Card c : cards) { abilities.addAll(c.getManaAbility()); } // currently reflected mana will ignore other reflected mana // abilities - final ArrayList reflectAbilities = new ArrayList(); + final ArrayList reflectAbilities = new ArrayList(); - for (final Ability_Mana ab : abilities) { + for (final AbilityMana ab : abilities) { if (maxChoices == colors.size()) { break; } @@ -602,7 +602,7 @@ public class AbilityFactoryMana { } } - for (final Ability_Mana ab : reflectAbilities) { + for (final AbilityMana ab : reflectAbilities) { if (maxChoices == colors.size()) { break; } @@ -652,15 +652,15 @@ public class AbilityFactoryMana { * @param maxChoices * a int. * @param ab - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param colors * a {@link java.util.ArrayList} object. * @return a {@link java.util.ArrayList} object. */ - private static ArrayList canProduce(final int maxChoices, final Ability_Mana ab, + private static ArrayList canProduce(final int maxChoices, final AbilityMana ab, final ArrayList 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)) { colors.add(col); } @@ -679,7 +679,7 @@ public class AbilityFactoryMana { *

* * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param colors @@ -688,7 +688,7 @@ public class AbilityFactoryMana { * a {@link forge.Player} 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 colors, final Player player) { // Calculate generated mana here for stack description and resolving final HashMap params = af.getMapParams(); @@ -700,7 +700,7 @@ public class AbilityFactoryMana { if (colors.size() == 0) { return "0"; } else if (colors.size() == 1) { - baseMana = Input_PayManaCostUtil.getShortColorString(colors.get(0)); + baseMana = InputPayManaCostUtil.getShortColorString(colors.get(0)); } else { if (player.isHuman()) { final Object o = GuiUtils.getChoiceOptional("Select Mana to Produce", colors.toArray()); @@ -709,11 +709,11 @@ public class AbilityFactoryMana { abMana.setCanceled(true); return ""; } else { - baseMana = Input_PayManaCostUtil.getShortColorString((String) o); + baseMana = InputPayManaCostUtil.getShortColorString((String) o); } } else { // 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 * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param abMana - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param card * 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 (af.hasSubAbility()) { abMana.setUndoable(false); - final Ability_Sub abSub = abMana.getSubAbility(); + final AbilitySub abSub = abMana.getSubAbility(); AbilityFactory.resolve(abSub, false); } } @@ -793,7 +793,7 @@ public class AbilityFactoryMana { * @since 1.0.15 */ 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; @Override @@ -864,7 +864,7 @@ public class AbilityFactoryMana { * @since 1.0.15 */ 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; @Override @@ -907,7 +907,7 @@ public class AbilityFactoryMana { final HashMap params = af.getMapParams(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -931,7 +931,7 @@ public class AbilityFactoryMana { sb.append(" empties his or her mana pool."); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { sb.append(subAb.getStackDescription()); } @@ -974,7 +974,7 @@ public class AbilityFactoryMana { tgt.addTarget(AllZone.getHumanPlayer()); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -1054,7 +1054,7 @@ public class AbilityFactoryMana { tgt.addTarget(AllZone.getHumanPlayer()); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java index 23bbbe06019..26118877d49 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryPermanentState.java @@ -19,8 +19,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -50,7 +50,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -119,7 +119,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -163,7 +163,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); final Card hostCard = sa.getSourceCard(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -193,7 +193,7 @@ public class AbilityFactoryPermanentState { } sb.append("."); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { 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) { randomReturn &= subAb.chkAIDrawback(); } @@ -314,7 +314,7 @@ public class AbilityFactoryPermanentState { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -613,7 +613,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -682,7 +682,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -725,7 +725,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); final Card hostCard = sa.getSourceCard(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -751,7 +751,7 @@ public class AbilityFactoryPermanentState { sb.append("."); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { 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) { randomReturn &= subAb.chkAIDrawback(); } @@ -888,7 +888,7 @@ public class AbilityFactoryPermanentState { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -1134,7 +1134,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1203,7 +1203,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1346,7 +1346,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); sb.append("Untap all valid cards."); } else { @@ -1354,7 +1354,7 @@ public class AbilityFactoryPermanentState { sb.append(params.get("SpellDescription")); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { sb.append(subAb.getStackDescription()); } @@ -1375,7 +1375,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1444,7 +1444,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1609,7 +1609,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); sb.append("Tap all valid cards."); } else { @@ -1617,7 +1617,7 @@ public class AbilityFactoryPermanentState { sb.append(params.get("SpellDescription")); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { sb.append(subAb.getStackDescription()); } @@ -1713,7 +1713,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1782,7 +1782,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1826,7 +1826,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -1852,7 +1852,7 @@ public class AbilityFactoryPermanentState { sb.append("."); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { 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) { randomReturn &= subAb.chkAIDrawback(); } @@ -1979,7 +1979,7 @@ public class AbilityFactoryPermanentState { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -2048,7 +2048,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -2117,7 +2117,7 @@ public class AbilityFactoryPermanentState { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -2161,7 +2161,7 @@ public class AbilityFactoryPermanentState { final HashMap params = af.getMapParams(); final Card source = sa.getSourceCard(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -2184,7 +2184,7 @@ public class AbilityFactoryPermanentState { } sb.append(" Phases Out."); - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { 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) { randomReturn &= subAb.chkAIDrawback(); } @@ -2297,7 +2297,7 @@ public class AbilityFactoryPermanentState { } } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java index 9bf1bca291d..03d184228e4 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryPreventDamage.java @@ -17,8 +17,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -48,7 +48,7 @@ public class AbilityFactoryPreventDamage { */ 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; @Override @@ -120,7 +120,7 @@ public class AbilityFactoryPreventDamage { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -170,7 +170,7 @@ public class AbilityFactoryPreventDamage { tgts = sa.getTarget().getTargets(); } - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -208,7 +208,7 @@ public class AbilityFactoryPreventDamage { } sb.append(" this turn."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { 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) { chance &= subAb.chkAIDrawback(); } @@ -381,7 +381,7 @@ public class AbilityFactoryPreventDamage { chance = AbilityFactoryPreventDamage.preventDamageMandatoryTarget(af, sa, mandatory); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java index cf967df90c9..54ec32dcb04 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryProtection.java @@ -21,8 +21,8 @@ import forge.Constant.Zone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -84,7 +84,7 @@ public final class AbilityFactoryProtection { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -122,7 +122,7 @@ public final class AbilityFactoryProtection { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -590,7 +590,7 @@ public final class AbilityFactoryProtection { if (tgtCards.size() > 0) { - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -649,7 +649,7 @@ public final class AbilityFactoryProtection { sb.append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -849,7 +849,7 @@ public final class AbilityFactoryProtection { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -887,7 +887,7 @@ public final class AbilityFactoryProtection { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1022,7 +1022,7 @@ public final class AbilityFactoryProtection { if (tgtCards.size() > 0) { - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { 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) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java index a883576639d..9993946b8ee 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryPump.java @@ -20,11 +20,11 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_Restriction; +import forge.card.spellability.SpellAbilityRestriction; import forge.card.spellability.Target; /** @@ -123,7 +123,7 @@ public class AbilityFactoryPump { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -159,7 +159,7 @@ public class AbilityFactoryPump { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -420,7 +420,7 @@ public class AbilityFactoryPump { return false; } - final SpellAbility_Restriction restrict = sa.getRestrictions(); + final SpellAbilityRestriction restrict = sa.getRestrictions(); // Phase Restrictions if ((AllZone.getStack().size() == 0) && AllZone.getPhase().isBefore(Constant.Phase.COMBAT_BEGIN)) { @@ -796,7 +796,7 @@ public class AbilityFactoryPump { if (tgtCards.size() > 0) { - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { 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) { sb.append(abSub.getStackDescription()); } @@ -967,7 +967,7 @@ public class AbilityFactoryPump { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1033,7 +1033,7 @@ public class AbilityFactoryPump { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1280,14 +1280,14 @@ public class AbilityFactoryPump { desc = this.params.get("PumpAllDescription"); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); } sb.append(desc); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java index 81811a604cd..f0fe053f694 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryRegenerate.java @@ -17,8 +17,8 @@ import forge.Constant.Zone; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -52,7 +52,7 @@ public class AbilityFactoryRegenerate { */ 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; @Override @@ -124,7 +124,7 @@ public class AbilityFactoryRegenerate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -176,7 +176,7 @@ public class AbilityFactoryRegenerate { } if (tgtCards.size() > 0) { - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -199,7 +199,7 @@ public class AbilityFactoryRegenerate { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { 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) { chance &= subAb.chkAIDrawback(); } @@ -348,7 +348,7 @@ public class AbilityFactoryRegenerate { chance = AbilityFactoryRegenerate.regenMandatoryTarget(af, sa, mandatory); } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } @@ -482,7 +482,7 @@ public class AbilityFactoryRegenerate { */ 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; @Override @@ -554,7 +554,7 @@ public class AbilityFactoryRegenerate { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -597,7 +597,7 @@ public class AbilityFactoryRegenerate { final StringBuilder sb = new StringBuilder(); final Card host = af.getHostCard(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -612,7 +612,7 @@ public class AbilityFactoryRegenerate { sb.append(desc); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -686,7 +686,7 @@ public class AbilityFactoryRegenerate { chance = true; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -715,7 +715,7 @@ public class AbilityFactoryRegenerate { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java index 4c0ce34e1ac..35ff3b5f66e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryReveal.java @@ -22,8 +22,8 @@ import forge.Player; import forge.PlayerZone; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -58,7 +58,7 @@ public final class AbilityFactoryReveal { */ 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; @Override @@ -127,7 +127,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -171,7 +171,7 @@ public final class AbilityFactoryReveal { final StringBuilder sb = new StringBuilder(); 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(" - "); } else { sb.append(" "); @@ -201,7 +201,7 @@ public final class AbilityFactoryReveal { } sb.append("library."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -259,7 +259,7 @@ public final class AbilityFactoryReveal { } if (af.hasSubAbility()) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return randomReturn && abSub.chkAIDrawback(); } @@ -592,7 +592,7 @@ public final class AbilityFactoryReveal { */ 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; @Override @@ -661,7 +661,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -714,7 +714,7 @@ public final class AbilityFactoryReveal { untilAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Amount"), sa); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(host).append(" - "); } else { sb.append(" "); @@ -763,7 +763,7 @@ public final class AbilityFactoryReveal { } } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -811,7 +811,7 @@ public final class AbilityFactoryReveal { } if (af.hasSubAbility()) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return randomReturn && abSub.chkAIDrawback(); } @@ -951,7 +951,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1020,7 +1020,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1064,7 +1064,7 @@ public final class AbilityFactoryReveal { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard()).append(" - "); } else { sb.append(" "); @@ -1090,7 +1090,7 @@ public final class AbilityFactoryReveal { } sb.append("hand."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1147,7 +1147,7 @@ public final class AbilityFactoryReveal { randomReturn = true; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -1216,7 +1216,7 @@ public final class AbilityFactoryReveal { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -1286,7 +1286,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1355,7 +1355,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1476,7 +1476,7 @@ public final class AbilityFactoryReveal { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -1502,7 +1502,7 @@ public final class AbilityFactoryReveal { sb.append("scrys (").append(num).append(")."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1538,7 +1538,7 @@ public final class AbilityFactoryReveal { } if (af.hasSubAbility()) { - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return randomReturn && abSub.chkAIDrawback(); } @@ -1560,7 +1560,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1636,7 +1636,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1693,7 +1693,7 @@ public final class AbilityFactoryReveal { shuffle = params.containsKey("MayShuffle"); final StringBuilder ret = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { ret.append(af.getHostCard().getName()); ret.append(" - "); } @@ -1756,7 +1756,7 @@ public final class AbilityFactoryReveal { // if it's just defined, no big deal } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -1870,7 +1870,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1939,7 +1939,7 @@ public final class AbilityFactoryReveal { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1984,7 +1984,7 @@ public final class AbilityFactoryReveal { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard()).append(" - "); @@ -2014,7 +2014,7 @@ public final class AbilityFactoryReveal { sb.append("Error - no target players for RevealHand. "); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -2072,7 +2072,7 @@ public final class AbilityFactoryReveal { randomReturn = true; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -2102,7 +2102,7 @@ public final class AbilityFactoryReveal { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java index d4f3ae6899c..2fa4d9ebba2 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactorySacrifice.java @@ -17,8 +17,8 @@ import forge.PlayerUtil; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -46,7 +46,7 @@ public class AbilityFactorySacrifice { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -113,7 +113,7 @@ public class AbilityFactorySacrifice { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -154,7 +154,7 @@ public class AbilityFactorySacrifice { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(sa.getSourceCard().getName()).append(" - "); @@ -200,7 +200,7 @@ public class AbilityFactorySacrifice { sb.append("Sacrifices ").append(amount).append(" ").append(msg).append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { 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) { chance &= subAb.chkAIDrawback(); } @@ -282,7 +282,7 @@ public class AbilityFactorySacrifice { // TODO: restrict the subAbility a bit - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -318,7 +318,7 @@ public class AbilityFactorySacrifice { // Eventually, we can call the trigger of ETB abilities with not // mandatory as part of the checks to cast something - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } @@ -552,7 +552,7 @@ public class AbilityFactorySacrifice { * @since 1.0.15 */ 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; @Override @@ -621,7 +621,7 @@ public class AbilityFactorySacrifice { * @since 1.0.15 */ 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; @Override @@ -666,7 +666,7 @@ public class AbilityFactorySacrifice { final Card host = af.getHostCard(); final HashMap params = af.getMapParams(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host).append(" - "); @@ -688,7 +688,7 @@ public class AbilityFactorySacrifice { sb.append("Sacrifice permanents."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -764,7 +764,7 @@ public class AbilityFactorySacrifice { return false; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { chance &= subAb.chkAIDrawback(); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java index b1bcb48151c..6c9c9165260 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryToken.java @@ -15,8 +15,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -134,7 +134,7 @@ public class AbilityFactoryToken extends AbilityFactory { */ 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()) { private static final long serialVersionUID = 8460074843405764620L; @@ -200,7 +200,7 @@ public class AbilityFactoryToken extends AbilityFactory { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -374,7 +374,7 @@ public class AbilityFactoryToken extends AbilityFactory { final StringBuilder sb = new StringBuilder(); - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { sb.append(" "); } else { sb.append(host.getName()).append(" - "); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java index 7514fe40fe2..e9b53ac4dd1 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryTurns.java @@ -5,8 +5,8 @@ import java.util.HashMap; import forge.AllZone; import forge.Player; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -36,7 +36,7 @@ public class AbilityFactoryTurns { */ 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; @Override @@ -105,7 +105,7 @@ public class AbilityFactoryTurns { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -148,7 +148,7 @@ public class AbilityFactoryTurns { final StringBuilder sb = new StringBuilder(); 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(" - "); } else { sb.append(" "); @@ -179,7 +179,7 @@ public class AbilityFactoryTurns { } sb.append(" after this one."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java index 41044e2722c..ace4681b5ce 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactoryZoneAffecting.java @@ -19,8 +19,8 @@ import forge.Player; import forge.card.cardFactory.CardFactoryUtil; import forge.card.cost.Cost; import forge.card.cost.CostUtil; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; import forge.card.spellability.Target; @@ -49,7 +49,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -118,7 +118,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -160,7 +160,7 @@ public class AbilityFactoryZoneAffecting { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -210,7 +210,7 @@ public class AbilityFactoryZoneAffecting { sb.append("."); } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -295,7 +295,7 @@ public class AbilityFactoryZoneAffecting { randomReturn = true; } - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -337,7 +337,7 @@ public class AbilityFactoryZoneAffecting { final String num = params.get("NumCards"); if ((num != null) && num.equals("X") && source.getSVar(num).equals("Count$xPaid")) { // Set PayX here to maximum value. - if (sa instanceof Ability_Sub) { + if (sa instanceof AbilitySub) { numCards = Integer.parseInt(source.getSVar("PayX")); } else { numCards = ComputerUtil.determineLeftoverMana(sa); @@ -389,7 +389,7 @@ public class AbilityFactoryZoneAffecting { } else { // Don't draw too many cards and then risk discarding cards // at EOT - if (!(params.containsKey("NextUpkeep") || (sa instanceof Ability_Sub)) && !mandatory) { + if (!(params.containsKey("NextUpkeep") || (sa instanceof AbilitySub)) && !mandatory) { return false; } } @@ -419,7 +419,7 @@ public class AbilityFactoryZoneAffecting { && AllZone.getPhase().getPlayerTurn().isComputer()) { // Don't draw too many cards and then risk discarding cards at // EOT - if (!(params.containsKey("NextUpkeep") || (sa instanceof Ability_Sub)) && !mandatory) { + if (!(params.containsKey("NextUpkeep") || (sa instanceof AbilitySub)) && !mandatory) { return false; } } @@ -450,7 +450,7 @@ public class AbilityFactoryZoneAffecting { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -545,7 +545,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -614,7 +614,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -666,7 +666,7 @@ public class AbilityFactoryZoneAffecting { tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -694,7 +694,7 @@ public class AbilityFactoryZoneAffecting { } sb.append(" from the top of his or her library."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -858,7 +858,7 @@ public class AbilityFactoryZoneAffecting { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.chkAIDrawback(); } @@ -886,7 +886,7 @@ public class AbilityFactoryZoneAffecting { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } @@ -969,7 +969,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1038,7 +1038,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1250,7 +1250,7 @@ public class AbilityFactoryZoneAffecting { tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa); } - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -1307,7 +1307,7 @@ public class AbilityFactoryZoneAffecting { } } - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1419,7 +1419,7 @@ public class AbilityFactoryZoneAffecting { // some other variables here, like handsize vs. maxHandSize - final Ability_Sub subAb = sa.getSubAbility(); + final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { randomReturn &= subAb.chkAIDrawback(); } @@ -1491,10 +1491,10 @@ public class AbilityFactoryZoneAffecting { * @param af * a {@link forge.card.abilityFactory.AbilityFactory} object. * @param subAb - * a {@link forge.card.spellability.Ability_Sub} object. + * a {@link forge.card.spellability.AbilitySub} object. * @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 // if parent draws cards, make sure cards in hand + cards drawn > 0 final Target tgt = af.getAbTgt(); @@ -1519,7 +1519,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1588,7 +1588,7 @@ public class AbilityFactoryZoneAffecting { * @return a {@link forge.card.spellability.SpellAbility} object. */ 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; @Override @@ -1630,7 +1630,7 @@ public class AbilityFactoryZoneAffecting { final HashMap params = af.getMapParams(); final StringBuilder sb = new StringBuilder(); - if (!(sa instanceof Ability_Sub)) { + if (!(sa instanceof AbilitySub)) { sb.append(sa.getSourceCard().getName()).append(" - "); } else { sb.append(" "); @@ -1669,7 +1669,7 @@ public class AbilityFactoryZoneAffecting { } sb.append("."); - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { sb.append(abSub.getStackDescription()); } @@ -1751,7 +1751,7 @@ public class AbilityFactoryZoneAffecting { } // check SubAbilities DoTrigger? - final Ability_Sub abSub = sa.getSubAbility(); + final AbilitySub abSub = sa.getSubAbility(); if (abSub != null) { return abSub.doTrigger(mandatory); } diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java index 05ee47bebed..43bb051c7c3 100644 --- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java @@ -32,19 +32,19 @@ import forge.PlayerZone; import forge.card.abilityFactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Static; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilityStatic; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; import forge.game.GameLossReason; import forge.gui.GuiUtils; import forge.gui.ListChooser; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost; +import forge.gui.input.InputPayManaCost; import forge.item.CardDb; import forge.item.CardPrinted; 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" // spell if (card.isPermanent() && !card.isLand() && !card.isAura()) { - card.addSpellAbility(new Spell_Permanent(card)); + card.addSpellAbility(new SpellPermanent(card)); } CardFactoryUtil.parseKeywords(card, cardName); @@ -515,25 +515,25 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // ************** Link to different CardFactories ******************* Card card2 = null; if (card.isCreature()) { - card2 = CardFactory_Creatures.getCard(card, cardName, this); + card2 = CardFactoryCreatures.getCard(card, cardName, this); } else if (card.isAura()) { - card2 = CardFactory_Auras.getCard(card, cardName); + card2 = CardFactoryAuras.getCard(card, cardName); } else if (card.isEquipment()) { - card2 = CardFactory_Equipment.getCard(card, cardName); + card2 = CardFactoryEquipment.getCard(card, cardName); } else if (card.isPlaneswalker()) { - card2 = CardFactory_Planeswalkers.getCard(card, cardName); + card2 = CardFactoryPlaneswalkers.getCard(card, cardName); } else if (card.isLand()) { - card2 = CardFactory_Lands.getCard(card, cardName, this); + card2 = CardFactoryLands.getCard(card, cardName, this); } else if (card.isInstant()) { - card2 = CardFactory_Instants.getCard(card, cardName); + card2 = CardFactoryInstants.getCard(card, cardName); } else if (card.isSorcery()) { - card2 = CardFactory_Sorceries.getCard(card, cardName); + card2 = CardFactorySorceries.getCard(card, cardName); } if (card2 != null) { return CardFactoryUtil.postFactoryKeywords(card2); } 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; @Override @@ -601,7 +601,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // card.setChosenType(input[0]); 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; @@ -785,7 +785,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn final Cost dungeonCost = new Cost("Discard<1/Card>", cardName, true); 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; @Override @@ -822,7 +822,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn }; // SpellAbility dungeon 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; @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; // could never get the AI to work correctly @@ -950,7 +950,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // Keywords. card.clearFirstSpell(); - card.addSpellAbility(new Spell_Permanent(card) { + card.addSpellAbility(new SpellPermanent(card) { private static final long serialVersionUID = 6912683989507840172L; @Override @@ -970,7 +970,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // *************** START *********** START ************************** else if (cardName.equals("Goblin Charbelcher")) { 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; @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 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; @Override @@ -1118,7 +1118,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn else if (cardName.equals("Grindstone")) { final Target target = new Target(card, "Select target player", new String[] { "Player" }); 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; @Override @@ -1187,7 +1187,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn 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; @Override @@ -1227,7 +1227,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // *************** START *********** START ************************** else if (cardName.equals("Pithing Needle")) { - final SpellAbility ability = new Ability_Static(card, "0") { + final SpellAbility ability = new AbilityStatic(card, "0") { @Override public void resolve() { String cardName = ""; @@ -1312,7 +1312,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn // *************** START *********** START ************************** else if (cardName.equals("Scroll Rack")) { 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; @Override @@ -1399,7 +1399,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn * creature or player. */ 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; @Override @@ -1506,7 +1506,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn freeCast.setStackDescription(cardName + " - play card without paying its mana cost."); 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; @Override @@ -1615,7 +1615,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn final Target t2 = new Target(card, "Select target creature an opponent controls", "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; @Override @@ -1645,7 +1645,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn 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 Ability_Activated ability = new Ability_Activated(card, abCost, t1) { + final AbilityActivated ability = new AbilityActivated(card, abCost, t1) { private static final long serialVersionUID = 2312243293988795896L; @Override @@ -1744,7 +1744,7 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn public void selectCard(final Card c, final PlayerZone z) { if (z.is(Constant.Zone.Battlefield) && c.isArtifact()) { copyTarget[0] = c; - this.stopSetNext(new Input_PayManaCost(copy)); + this.stopSetNext(new InputPayManaCost(copy)); } } }; diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java b/src/main/java/forge/card/cardFactory/CardFactoryAuras.java similarity index 98% rename from src/main/java/forge/card/cardFactory/CardFactory_Auras.java rename to src/main/java/forge/card/cardFactory/CardFactoryAuras.java index f773841dd85..7604ec5064d 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryAuras.java @@ -20,7 +20,7 @@ import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.gui.GuiUtils; import forge.gui.input.Input; @@ -33,7 +33,7 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -class CardFactory_Auras { +class CardFactoryAuras { /** *

@@ -265,7 +265,7 @@ class CardFactory_Auras { else if (cardName.equals("Earthbind")) { final Cost cost = new Cost(card.getManaCost(), cardName, false); 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; @@ -368,7 +368,7 @@ class CardFactory_Auras { else if (cardName.equals("Guilty Conscience")) { final Cost cost = new Cost(card.getManaCost(), cardName, false); 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; @@ -423,7 +423,7 @@ class CardFactory_Auras { else if (cardName.equals("Animate Dead") || cardName.equals("Dance of the Dead")) { final Card[] targetC = new Card[1]; // 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; public CardList getCreturesInGrave() { diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactoryCreatures.java similarity index 97% rename from src/main/java/forge/card/cardFactory/CardFactory_Creatures.java rename to src/main/java/forge/card/cardFactory/CardFactoryCreatures.java index 81b31010233..9d366cfaffe 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryCreatures.java @@ -28,19 +28,19 @@ import forge.PlayerZone; import forge.card.abilityFactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Static; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilityStatic; +import forge.card.spellability.AbilitySub; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; import forge.gui.GuiUtils; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost; +import forge.gui.input.InputPayManaCost; /** *

@@ -50,7 +50,7 @@ import forge.gui.input.Input_PayManaCost; * @author Forge * @version $Id$ */ -public class CardFactory_Creatures { +public class CardFactoryCreatures { /** *

@@ -171,7 +171,7 @@ public class CardFactory_Creatures { // *************** START *********** START ************************** 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; @Override @@ -192,7 +192,7 @@ public class CardFactory_Creatures { else if (cardName.equals("Gilder Bairn")) { final Cost abCost = new Cost("2 GU Untap", cardName, true); 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; @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; // 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") || cardName.equals("Pillaging Horde")) { - final SpellAbility creature = new Spell_Permanent(card) { + final SpellAbility creature = new SpellPermanent(card) { private static final long serialVersionUID = -7326018877172328480L; @Override @@ -551,7 +551,7 @@ public class CardFactory_Creatures { // Do not remove SpellAbilities created by AbilityFactory or // Keywords. card.clearFirstSpell(); - card.addSpellAbility(new Spell_Permanent(card) { + card.addSpellAbility(new SpellPermanent(card) { private static final long serialVersionUID = -1506199222879057809L; @@ -785,7 +785,7 @@ public class CardFactory_Creatures { final Cost abCost = new Cost("T", cardName, true); 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; @Override @@ -973,14 +973,14 @@ public class CardFactory_Creatures { + "your graveyard without paying its mana cost."); ability.setStackDescription("Horde of Notions - play Elemental card from " + "graveyard without paying its mana cost."); - ability.setBeforePayMana(new Input_PayManaCost(ability)); + ability.setBeforePayMana(new InputPayManaCost(ability)); } // *************** END ************ END ************************** // *************** START *********** START ************************** else if (cardName.equals("Rhys the Redeemed")) { 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; @Override @@ -1085,7 +1085,7 @@ public class CardFactory_Creatures { final Cost abCost = new Cost("T", cardName, true); 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; @Override @@ -1248,7 +1248,7 @@ public class CardFactory_Creatures { || cardName.equals("Feral Hydra") || cardName.equals("Krakilin") || cardName.equals("Ivy Elemental") || cardName.equals("Lightning Serpent")) { - final SpellAbility spell = new Spell_Permanent(card) { + final SpellAbility spell = new SpellPermanent(card) { private static final long serialVersionUID = 7708945715867177172L; @Override @@ -1264,7 +1264,7 @@ public class CardFactory_Creatures { // *************** START *********** START ************************** 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; @Override @@ -1293,7 +1293,7 @@ public class CardFactory_Creatures { else if (cardName.equals("Molten Hydra")) { final Target target = new Target(card, "TgtCP"); 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; @Override @@ -1683,7 +1683,7 @@ public class CardFactory_Creatures { 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("Joraga Warcaller")) { - final Ability_Static ability = new Ability_Static(card, "0") { + final AbilityStatic ability = new AbilityStatic(card, "0") { @Override public void resolve() { 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 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; @Override @@ -1827,7 +1827,7 @@ public class CardFactory_Creatures { // Keywords. card.clearFirstSpell(); card.addComesIntoPlayCommand(intoPlay); - card.addSpellAbility(new Spell_Permanent(card) { + card.addSpellAbility(new SpellPermanent(card) { private static final long serialVersionUID = 304885517082977723L; @Override @@ -1907,7 +1907,7 @@ public class CardFactory_Creatures { else if (cardName.equals("Metalworker")) { 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; @Override @@ -1963,7 +1963,7 @@ public class CardFactory_Creatures { JOptionPane.PLAIN_MESSAGE); // 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; }; abMana.setUndoable(false); @@ -2368,7 +2368,7 @@ public class CardFactory_Creatures { return; } copyTarget[0] = c; - this.stopSetNext(new Input_PayManaCost(copy)); + this.stopSetNext(new InputPayManaCost(copy)); } } }; @@ -2386,7 +2386,7 @@ public class CardFactory_Creatures { } else { final Card c = (Card) o; 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 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; @Override @@ -2470,7 +2470,7 @@ public class CardFactory_Creatures { else if (cardName.equals("Brass Squire")) { 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; @Override @@ -2505,7 +2505,7 @@ public class CardFactory_Creatures { final Cost abCost = new Cost("T", cardName, true); 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; @Override @@ -2527,7 +2527,7 @@ public class CardFactory_Creatures { // *************** START *********** START ************************** else if (cardName.equals("Gore Vassal")) { 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; @Override @@ -2621,7 +2621,7 @@ public class CardFactory_Creatures { 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")) { private static final long serialVersionUID = 2391351140880148283L; @@ -2655,7 +2655,7 @@ public class CardFactory_Creatures { // *************** START *********** START ************************** else if (cardName.equals("Krovikan Sorcerer")) { 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; @Override @@ -2705,10 +2705,10 @@ public class CardFactory_Creatures { // end of card specific code // *************************************************** - if ((CardFactory_Creatures.hasKeyword(card, "Level up") != -1) - && (CardFactory_Creatures.hasKeyword(card, "maxLevel") != -1)) { - final int n = CardFactory_Creatures.hasKeyword(card, "Level up"); - final int m = CardFactory_Creatures.hasKeyword(card, "maxLevel"); + if ((CardFactoryCreatures.hasKeyword(card, "Level up") != -1) + && (CardFactoryCreatures.hasKeyword(card, "maxLevel") != -1)) { + final int n = CardFactoryCreatures.hasKeyword(card, "Level up"); + final int m = CardFactoryCreatures.hasKeyword(card, "maxLevel"); if (n != -1) { final String parse = card.getKeyword().get(n).toString(); final String parseMax = card.getKeyword().get(m).toString(); @@ -2722,7 +2722,7 @@ public class CardFactory_Creatures { final String[] l = parseMax.split(":"); 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; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java b/src/main/java/forge/card/cardFactory/CardFactoryEquipment.java similarity index 98% rename from src/main/java/forge/card/cardFactory/CardFactory_Equipment.java rename to src/main/java/forge/card/cardFactory/CardFactoryEquipment.java index 7f8c557eb78..1f9f62f3c30 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryEquipment.java @@ -16,7 +16,7 @@ import forge.Phase; import forge.PlayerZone; import forge.card.cost.Cost; 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.Target; import forge.card.trigger.Trigger; @@ -31,7 +31,7 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -class CardFactory_Equipment { +class CardFactoryEquipment { /** *

@@ -71,7 +71,7 @@ class CardFactory_Equipment { if (cardName.equals("Umbral Mantle")) { final Cost abCost = new Cost("0", cardName, true); 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; @Override @@ -363,8 +363,8 @@ class CardFactory_Equipment { card.addComesIntoPlayCommand(intoPlay); } // *************** END ************ END ************************** - if (CardFactory_Equipment.shouldEquip(card) != -1) { - final int n = CardFactory_Equipment.shouldEquip(card); + if (CardFactoryEquipment.shouldEquip(card) != -1) { + final int n = CardFactoryEquipment.shouldEquip(card); if (n != -1) { final String parse = card.getKeyword().get(n).toString(); card.removeIntrinsicKeyword(parse); diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java b/src/main/java/forge/card/cardFactory/CardFactoryInstants.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactory_Instants.java rename to src/main/java/forge/card/cardFactory/CardFactoryInstants.java index 8d04cf4b2d9..d898f3d146b 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryInstants.java @@ -20,13 +20,13 @@ import forge.Player; import forge.PlayerZone; import forge.card.cost.Cost; 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.SpellAbility; import forge.card.spellability.Target; import forge.gui.GuiUtils; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost; +import forge.gui.input.InputPayManaCost; /** *

@@ -36,7 +36,7 @@ import forge.gui.input.Input_PayManaCost; * @author Forge * @version $Id$ */ -public class CardFactory_Instants { +public class CardFactoryInstants { /** *

@@ -448,7 +448,7 @@ public class CardFactory_Instants { AllZone.getStack().add(spell); this.stop(); } 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")) { 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; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java b/src/main/java/forge/card/cardFactory/CardFactoryLands.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactory_Lands.java rename to src/main/java/forge/card/cardFactory/CardFactoryLands.java index 660b9860f74..cc6878a5811 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryLands.java @@ -18,8 +18,8 @@ import forge.Player; import forge.PlayerZone; import forge.card.cost.Cost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; import forge.gui.input.Input; @@ -32,7 +32,7 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -class CardFactory_Lands { +class CardFactoryLands { /** *

@@ -206,7 +206,7 @@ class CardFactory_Lands { }; 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 final CardList inPlay = new CardList(); @@ -602,7 +602,7 @@ class CardFactory_Lands { // This dummy AbMana is for Reflecting and for having an abMana // 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; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java b/src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java rename to src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java index 8ae8b418d96..c1ee03ec3a2 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryPlaneswalkers.java @@ -21,7 +21,7 @@ import forge.Player; import forge.PlayerZone; import forge.card.cost.Cost; 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.Target; import forge.gui.GuiUtils; @@ -35,7 +35,7 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -public class CardFactory_Planeswalkers { +public class CardFactoryPlaneswalkers { /** *

@@ -677,7 +677,7 @@ public class CardFactory_Planeswalkers { final HashMap tempCardMap = new HashMap(); for (final Card creatureCard : creatures) { - final Card crd = CardFactory_Planeswalkers.copyStats(creatureCard); + final Card crd = CardFactoryPlaneswalkers.copyStats(creatureCard); tempCardMap.put(creatureCard.getUniqueNumber(), 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 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; @Override @@ -893,7 +893,7 @@ public class CardFactory_Planeswalkers { final Cost cost = new Cost("SubCounter<1/LOYALTY>", cardName, true); 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; @Override @@ -927,7 +927,7 @@ public class CardFactory_Planeswalkers { final Target target4 = new Target(card, "Select target player", "Player"); 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; @Override @@ -1046,7 +1046,7 @@ public class CardFactory_Planeswalkers { */ final Target target2 = new Target(card, "TgtC"); 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; @Override @@ -1109,7 +1109,7 @@ public class CardFactory_Planeswalkers { */ final Target target3 = new Target(card, "Select target player", "Player"); 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; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java b/src/main/java/forge/card/cardFactory/CardFactorySorceries.java similarity index 99% rename from src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java rename to src/main/java/forge/card/cardFactory/CardFactorySorceries.java index 916bfa265c8..678b8a2e737 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/main/java/forge/card/cardFactory/CardFactorySorceries.java @@ -29,12 +29,12 @@ import forge.card.cost.Cost; import forge.card.spellability.Ability; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.gui.GuiUtils; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost; -import forge.gui.input.Input_PayManaCost_Ability; +import forge.gui.input.InputPayManaCost; +import forge.gui.input.InputPayManaCostAbility; /** *

@@ -44,7 +44,7 @@ import forge.gui.input.Input_PayManaCost_Ability; * @author Forge * @version $Id$ */ -public class CardFactory_Sorceries { +public class CardFactorySorceries { /** *

@@ -136,7 +136,7 @@ public class CardFactory_Sorceries { AllZone.getStack().add(spell); this.stop(); } 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; @Override @@ -794,7 +794,7 @@ public class CardFactory_Sorceries { AllZone.getStack().add(spell); this.stop(); } else { - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } } } @@ -1099,7 +1099,7 @@ public class CardFactory_Sorceries { this.showMessage(); 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 @@ -1834,7 +1834,7 @@ public class CardFactory_Sorceries { @Override public void selectButtonOK() { spell.setStackDescription(cardName + " deals X damage to " + this.getNumTargets() + " target(s)."); - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } @Override @@ -2031,7 +2031,7 @@ public class CardFactory_Sorceries { final Object check = GuiUtils.getChoiceOptional("Select creature", creature); if (check != null) { spell.setTargetCard((Card) check); - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } else { this.stop(); } @@ -2505,7 +2505,7 @@ public class CardFactory_Sorceries { private void done() { setStackDescription.execute(); - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } }; @@ -2539,7 +2539,7 @@ public class CardFactory_Sorceries { this.stopSetNext(targetXCreatures); } else { System.out.println("Input_PayManaCost for spell is getting: " + spell.getManaCost()); - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } } // if } // selectCard() @@ -2580,7 +2580,7 @@ public class CardFactory_Sorceries { } else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) { this.stopSetNext(targetXCreatures); } else { - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } } }; // Input @@ -2618,7 +2618,7 @@ public class CardFactory_Sorceries { } else if (userChoice.contains(cardChoice[3]) || card.getChoices().contains(cardChoice[3])) { this.stopSetNext(targetXCreatures); } else { - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } } } // selectPlayer() @@ -2849,7 +2849,7 @@ public class CardFactory_Sorceries { AllZone.getGameAction().moveToPlay(newArtifact[0]); } else { 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; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 2e5fb14e385..3e0ca9a880a 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -37,20 +37,20 @@ import forge.card.abilityFactory.AbilityFactory; import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Static; +import forge.card.spellability.AbilityActivated; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilityStatic; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_Restriction; -import forge.card.spellability.Spell_Permanent; +import forge.card.spellability.SpellAbilityRestriction; +import forge.card.spellability.SpellPermanent; import forge.card.spellability.Target; import forge.card.trigger.Trigger; import forge.card.trigger.TriggerHandler; import forge.gui.GuiUtils; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCost; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCost; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -842,7 +842,7 @@ public class CardFactoryUtil { } this.stop(); } else { - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } } }; @@ -949,12 +949,12 @@ public class CardFactoryUtil { * a {@link forge.Card} object. * @param manaCost * 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 Ability_Activated unearth = new Ability_Activated(sourceCard, cost, null) { + final AbilityActivated unearth = new AbilityActivated(sourceCard, cost, null) { private static final long serialVersionUID = -5633945565395478009L; @Override @@ -975,7 +975,7 @@ public class CardFactoryUtil { return ComputerUtil.canPayCost(this); } }; - final SpellAbility_Restriction restrict = new SpellAbility_Restriction(); + final SpellAbilityRestriction restrict = new SpellAbilityRestriction(); restrict.setZone(Zone.Graveyard); restrict.setSorcerySpeed(true); unearth.setRestrictions(restrict); @@ -1049,16 +1049,16 @@ public class CardFactoryUtil { * a int. * @param d * 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 String player = sourceCard.getController(); // final String manaCost = cost; final int attack = a; final int defense = d; 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; @Override @@ -1122,7 +1122,7 @@ public class CardFactoryUtil { cycleCost += " Discard<1/CARDNAME>"; 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; @Override @@ -1192,7 +1192,7 @@ public class CardFactoryUtil { cycleCost += " Discard<1/CARDNAME>"; 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; @Override @@ -1276,7 +1276,7 @@ public class CardFactoryUtil { transmuteCost += " Discard<1/CARDNAME>"; 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; @Override @@ -1349,7 +1349,7 @@ public class CardFactoryUtil { */ public static SpellAbility abilitySuspend(final Card sourceCard, final String suspendCost, final int suspendCounters) { // 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 public boolean canPlay() { if (!(this.getRestrictions().canPlay(sourceCard, this))) { @@ -1409,7 +1409,7 @@ public class CardFactoryUtil { final String[] extrinsicKeywords, final Cost abCost) { final Target target = new Target(sourceCard, "Select target creature you control", "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; @Override @@ -1602,11 +1602,11 @@ public class CardFactoryUtil { * * @param c * 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 Ability_Mana mana = new Ability_Mana(c, cost, "1") { + final AbilityMana mana = new AbilityMana(c, cost, "1") { private static final long serialVersionUID = -2478676548112738019L; }; mana.setDescription("Sacrifice CARDNAME: Add 1 to your mana pool."); @@ -1861,7 +1861,7 @@ public class CardFactoryUtil { AllZone.getStack().add(spell); this.stop(); } else { - this.stopSetNext(new Input_PayManaCost(spell)); + this.stopSetNext(new InputPayManaCost(spell)); } paid.execute(); @@ -3744,7 +3744,7 @@ public class CardFactoryUtil { list = list.filter(new CardListFilter() { @Override public boolean addCard(final Card c) { - for (final Ability_Mana am : c.getAIPlayableMana()) { + for (final AbilityMana am : c.getAIPlayableMana()) { if (am.canPlay()) { return true; } @@ -4419,7 +4419,7 @@ public class CardFactoryUtil { @Override public boolean canPlayAI() { - if (!Spell_Permanent.checkETBEffects(card, this, null)) { + if (!SpellPermanent.checkETBEffects(card, this, null)) { return false; } return super.canPlayAI(); @@ -4649,7 +4649,7 @@ public class CardFactoryUtil { final String parse = card.getKeyword().get(cardnameSpot).toString(); card.removeIntrinsicKeyword(parse); color += " " - + Input_PayManaCostUtil.getShortColorString(parse.replace("CARDNAME is ", "").replace(".", + + InputPayManaCostUtil.getShortColorString(parse.replace("CARDNAME is ", "").replace(".", "")); 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."); } - final SpellAbility_Restriction restriction = new SpellAbility_Restriction(); + final SpellAbilityRestriction restriction = new SpellAbilityRestriction(); restriction.setRestrictions(mapParams); if (!mapParams.containsKey("ActivationZone")) { restriction.setZone(Constant.Zone.Hand); diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index a7ed9b0214e..3c1de6392a8 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/src/main/java/forge/card/cost/CostDiscard.java @@ -124,7 +124,7 @@ public class CostDiscard extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); for (final Card c : this.getList()) { activator.discard(c, ability); @@ -139,7 +139,7 @@ public class CostDiscard extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); CardList handList = activator.getCardsIn(Zone.Hand); final String discType = this.getType(); @@ -211,7 +211,7 @@ public class CostDiscard extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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 Player activator = ability.getActivatingPlayer(); final CardList hand = activator.getCardsIn(Zone.Hand); @@ -268,7 +268,7 @@ public class CostDiscard extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @param nNeeded @@ -277,7 +277,7 @@ public class CostDiscard extends CostPartWithList { * @return a {@link forge.gui.input.Input} object. */ 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 Input target = new Input() { private static final long serialVersionUID = -329993322080934435L; diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 61162b21722..e05a109298a 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -146,7 +146,7 @@ public class CostExile extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()) { AllZone.getGameAction().exile(c); } @@ -160,7 +160,7 @@ public class CostExile extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); final Player activator = ability.getActivatingPlayer(); @@ -195,7 +195,7 @@ public class CostExile extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (this.getThis()) { this.getList().add(source); @@ -238,7 +238,7 @@ public class CostExile extends CostPartWithList { * @param nNeeded * 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 StringBuilder sb = new StringBuilder(); 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 */ 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() { private static final long serialVersionUID = 734256837615635021L; private CardList typeList; @@ -350,13 +350,13 @@ public class CostExile extends CostPartWithList { * @param type * a {@link java.lang.String} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param nNeeded * the n needed * @return a {@link forge.gui.input.Input} object. */ 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() { private static final long serialVersionUID = 1403915758082824694L; @@ -434,12 +434,12 @@ public class CostExile extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * the part * @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() { private static final long serialVersionUID = 678668673002725001L; diff --git a/src/main/java/forge/card/cost/CostGainLife.java b/src/main/java/forge/card/cost/CostGainLife.java index e9e3c1bf6bf..9275fb12dca 100644 --- a/src/main/java/forge/card/cost/CostGainLife.java +++ b/src/main/java/forge/card/cost/CostGainLife.java @@ -88,7 +88,7 @@ public class CostGainLife extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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); } @@ -100,7 +100,7 @@ public class CostGainLife extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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 Player activator = ability.getActivatingPlayer(); final int life = activator.getLife(); @@ -139,7 +139,7 @@ public class CostGainLife extends CostPart { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 5c8f3a1ea36..1f3ba3a7f88 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -14,7 +14,7 @@ import forge.card.abilityFactory.AbilityFactory; import forge.card.mana.ManaCost; import forge.card.spellability.SpellAbility; import forge.gui.input.Input; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** * The Class CostMana. @@ -170,7 +170,7 @@ public class CostMana extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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); } @@ -182,7 +182,7 @@ public class CostMana extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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; if (!this.hasNoXManaCost()) { // 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) */ @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; } @@ -226,7 +226,7 @@ public class CostMana extends CostPart { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param costMana * TODO * @param numX @@ -234,7 +234,7 @@ public class CostMana extends CostPart { * * @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 Input payX = new Input() { private static final long serialVersionUID = -6900234444347364050L; @@ -268,7 +268,7 @@ public class CostMana extends CostPart { return; } - this.manaCost = Input_PayManaCostUtil.activateManaAbility(sa, card, this.manaCost); + this.manaCost = InputPayManaCostUtil.activateManaAbility(sa, card, this.manaCost); if (this.manaCost.isPaid()) { this.manaCost = new ManaCost(Integer.toString(numX)); this.xPaid++; @@ -306,14 +306,14 @@ public class CostMana extends CostPart { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param costMana * the cost mana * @param manaToAdd * a int. * @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 ManaCost manaCost; @@ -351,7 +351,7 @@ public class CostMana extends CostPart { return; } - this.mana = Input_PayManaCostUtil.activateManaAbility(sa, card, this.mana); + this.mana = InputPayManaCostUtil.activateManaAbility(sa, card, this.mana); if (this.mana.isPaid()) { this.done(); diff --git a/src/main/java/forge/card/cost/CostMill.java b/src/main/java/forge/card/cost/CostMill.java index ebbdaf07a90..9c0065b6d6c 100644 --- a/src/main/java/forge/card/cost/CostMill.java +++ b/src/main/java/forge/card/cost/CostMill.java @@ -63,7 +63,7 @@ public class CostMill extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); @@ -93,7 +93,7 @@ public class CostMill extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()) { AllZone.getGameAction().moveToGraveyard(c); } @@ -107,7 +107,7 @@ public class CostMill extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); final Player activator = ability.getActivatingPlayer(); diff --git a/src/main/java/forge/card/cost/CostPart.java b/src/main/java/forge/card/cost/CostPart.java index eda4b09e9f7..c9d267c2072 100644 --- a/src/main/java/forge/card/cost/CostPart.java +++ b/src/main/java/forge/card/cost/CostPart.java @@ -174,7 +174,7 @@ public abstract class CostPart { * the payment * @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. @@ -186,7 +186,7 @@ public abstract class CostPart { * @param 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. @@ -199,7 +199,7 @@ public abstract class CostPart { * the payment * @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) diff --git a/src/main/java/forge/card/cost/CostPayLife.java b/src/main/java/forge/card/cost/CostPayLife.java index bb78bad7f96..2956b8c8d84 100644 --- a/src/main/java/forge/card/cost/CostPayLife.java +++ b/src/main/java/forge/card/cost/CostPayLife.java @@ -89,7 +89,7 @@ public class CostPayLife extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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); } @@ -101,7 +101,7 @@ public class CostPayLife extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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 Player activator = ability.getActivatingPlayer(); final int life = activator.getLife(); @@ -140,7 +140,7 @@ public class CostPayLife extends CostPart { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); diff --git a/src/main/java/forge/card/cost/Cost_Payment.java b/src/main/java/forge/card/cost/CostPayment.java similarity index 94% rename from src/main/java/forge/card/cost/Cost_Payment.java rename to src/main/java/forge/card/cost/CostPayment.java index 60dd3def5a0..8f5e69b298f 100644 --- a/src/main/java/forge/card/cost/Cost_Payment.java +++ b/src/main/java/forge/card/cost/CostPayment.java @@ -8,7 +8,7 @@ import forge.AllZone; import forge.Card; import forge.Player; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_Requirements; +import forge.card.spellability.SpellAbilityRequirements; /** *

@@ -18,11 +18,11 @@ import forge.card.spellability.SpellAbility_Requirements; * @author Forge * @version $Id$ */ -public class Cost_Payment { +public class CostPayment { private Cost cost = null; private SpellAbility ability = null; private Card card = null; - private SpellAbility_Requirements req = null; + private SpellAbilityRequirements req = null; private boolean bCancel = false; private final Map paidCostParts = new HashMap(); @@ -65,10 +65,10 @@ public class Cost_Payment { *

* * @param reqs - * a {@link forge.card.spellability.SpellAbility_Requirements} + * a {@link forge.card.spellability.SpellAbilityRequirements} * object. */ - public final void setRequirements(final SpellAbility_Requirements reqs) { + public final void setRequirements(final SpellAbilityRequirements reqs) { this.req = reqs; } @@ -77,7 +77,7 @@ public class Cost_Payment { * * @return the requirements */ - public final SpellAbility_Requirements getRequirements() { + public final SpellAbilityRequirements getRequirements() { return this.req; } @@ -114,7 +114,7 @@ public class Cost_Payment { * @param abil * 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.ability = abil; this.card = abil.getSourceCard(); diff --git a/src/main/java/forge/card/cost/CostPutCounter.java b/src/main/java/forge/card/cost/CostPutCounter.java index 9a462215edb..d6693ffed27 100644 --- a/src/main/java/forge/card/cost/CostPutCounter.java +++ b/src/main/java/forge/card/cost/CostPutCounter.java @@ -136,7 +136,7 @@ public class CostPutCounter extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (c == null) { c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); @@ -160,7 +160,7 @@ public class CostPutCounter extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (c == null) { c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); @@ -185,7 +185,7 @@ public class CostPutCounter extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (this.getThis()) { this.addToList(source); @@ -221,14 +221,14 @@ public class CostPutCounter extends CostPartWithList { * @param type * a {@link java.lang.String} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param costPutCounter * TODO * @param nNeeded * the n needed * @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 Input target = new Input() { private static final long serialVersionUID = 2685832214519141903L; diff --git a/src/main/java/forge/card/cost/CostRemoveCounter.java b/src/main/java/forge/card/cost/CostRemoveCounter.java index fd016e2a017..1aad8280ee7 100644 --- a/src/main/java/forge/card/cost/CostRemoveCounter.java +++ b/src/main/java/forge/card/cost/CostRemoveCounter.java @@ -118,7 +118,7 @@ public class CostRemoveCounter extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (c == null) { c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); @@ -134,7 +134,7 @@ public class CostRemoveCounter extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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 Counters type = this.getCounter(); Integer c = this.convertAmount(); @@ -175,7 +175,7 @@ public class CostRemoveCounter extends CostPart { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (c == null) { final String sVar = source.getSVar(this.getAmount()); diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index 78d5fddaf50..42c6875d4ff 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/src/main/java/forge/card/cost/CostReturn.java @@ -109,7 +109,7 @@ public class CostReturn extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()) { AllZone.getGameAction().moveToHand(c); } @@ -123,7 +123,7 @@ public class CostReturn extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); Integer c = this.convertAmount(); final Player activator = ability.getActivatingPlayer(); @@ -153,7 +153,7 @@ public class CostReturn extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); if (this.getThis()) { this.getList().add(source); @@ -183,14 +183,14 @@ public class CostReturn extends CostPartWithList { * @param type * a {@link java.lang.String} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @param nNeeded * the n needed * @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 Input target = new Input() { private static final long serialVersionUID = 2685832214519141903L; @@ -265,12 +265,12 @@ public class CostReturn extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @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() { private static final long serialVersionUID = 2685832214519141903L; diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index f6c776f49d4..33e0f6582af 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -70,7 +70,7 @@ public class CostReveal extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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 Player activator = ability.getActivatingPlayer(); CardList hand = activator.getCardsIn(Zone.Hand); @@ -106,7 +106,7 @@ public class CostReveal extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()); } @@ -118,7 +118,7 @@ public class CostReveal extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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 String amount = this.getAmount(); this.resetList(); @@ -200,7 +200,7 @@ public class CostReveal extends CostPartWithList { * @param handList * a {@link forge.CardList} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @param sa @@ -209,7 +209,7 @@ public class CostReveal extends CostPartWithList { * a int. * @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 Input target = new Input() { private static final long serialVersionUID = -329993322080934435L; diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index c40b64569c1..3456786a8a0 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -107,7 +107,7 @@ public class CostSacrifice extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()) { AllZone.getGameAction().sacrifice(c); } @@ -121,7 +121,7 @@ public class CostSacrifice extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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 type = this.getType(); final Player activator = ability.getActivatingPlayer(); @@ -161,7 +161,7 @@ public class CostSacrifice extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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(); final Player activator = ability.getActivatingPlayer(); if (this.getThis()) { @@ -198,13 +198,13 @@ public class CostSacrifice extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @param typeList * 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) { // TODO Ask First for (final Card card : typeList) { @@ -223,7 +223,7 @@ public class CostSacrifice extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @param typeList @@ -232,7 +232,7 @@ public class CostSacrifice extends CostPartWithList { * the n needed * @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 Input target = new Input() { private static final long serialVersionUID = 2685832214519141903L; @@ -304,12 +304,12 @@ public class CostSacrifice extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param part * TODO * @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() { private static final long serialVersionUID = 2685832214519141903L; diff --git a/src/main/java/forge/card/cost/CostTap.java b/src/main/java/forge/card/cost/CostTap.java index 2671fb12eb2..75f6a6f5d0b 100644 --- a/src/main/java/forge/card/cost/CostTap.java +++ b/src/main/java/forge/card/cost/CostTap.java @@ -56,7 +56,7 @@ public class CostTap extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); } @@ -68,7 +68,7 @@ public class CostTap extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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(), // payment.getCost())) // return false; @@ -86,7 +86,7 @@ public class CostTap extends CostPart { * , forge.Card, forge.card.cost.Cost_Payment) */ @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; } } diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 6cb7a8890d0..9ac9dcb9909 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -120,7 +120,7 @@ public class CostTapType extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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()) { c.tap(); } @@ -134,7 +134,7 @@ public class CostTapType extends CostPartWithList { * forge.Card, forge.card.cost.Cost_Payment) */ @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); typeList = typeList.getValidCards(this.getType().split(";"), ability.getActivatingPlayer(), ability.getSourceCard()); @@ -163,7 +163,7 @@ public class CostTapType extends CostPartWithList { * , forge.Card, forge.card.cost.Cost_Payment) */ @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 Integer c = this.convertAmount(); if (c == null) { @@ -194,13 +194,13 @@ public class CostTapType extends CostPartWithList { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param payment - * a {@link forge.card.cost.Cost_Payment} object. + * a {@link forge.card.cost.CostPayment} object. * @param nCards * a int. * @return a {@link forge.gui.input.Input} object. */ 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() { private static final long serialVersionUID = 6438988130447851042L; diff --git a/src/main/java/forge/card/cost/CostUntap.java b/src/main/java/forge/card/cost/CostUntap.java index f1b69c18374..f362e8171dd 100644 --- a/src/main/java/forge/card/cost/CostUntap.java +++ b/src/main/java/forge/card/cost/CostUntap.java @@ -56,7 +56,7 @@ public class CostUntap extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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(); } @@ -68,7 +68,7 @@ public class CostUntap extends CostPart { * forge.Card, forge.card.cost.Cost_Payment) */ @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(), // payment.getCost())) // return false; @@ -86,7 +86,7 @@ public class CostUntap extends CostPart { * , forge.Card, forge.card.cost.Cost_Payment) */ @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; } } diff --git a/src/main/java/forge/card/mana/Mana.java b/src/main/java/forge/card/mana/Mana.java index f46f07f4ea2..ac442a0347a 100644 --- a/src/main/java/forge/card/mana/Mana.java +++ b/src/main/java/forge/card/mana/Mana.java @@ -2,7 +2,7 @@ package forge.card.mana; import forge.Card; import forge.Constant; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -55,7 +55,7 @@ public class Mana { String manaString = ""; final StringBuilder sbMana = new StringBuilder(); - manaString = Input_PayManaCostUtil.getShortColorString(this.color); + manaString = InputPayManaCostUtil.getShortColorString(this.color); for (int i = 0; i < this.amount; i++) { sbMana.append(manaString); @@ -79,7 +79,7 @@ public class Mana { String manaString = ""; final StringBuilder sbMana = new StringBuilder(); - manaString = Input_PayManaCostUtil.getShortColorString(this.color); + manaString = InputPayManaCostUtil.getShortColorString(this.color); for (int i = 0; i < this.amount; i++) { sbMana.append(manaString); diff --git a/src/main/java/forge/card/mana/ManaCost.java b/src/main/java/forge/card/mana/ManaCost.java index afbf9c6ff18..ec630760d20 100644 --- a/src/main/java/forge/card/mana/ManaCost.java +++ b/src/main/java/forge/card/mana/ManaCost.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.StringTokenizer; import forge.Constant; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -102,11 +102,11 @@ public class ManaCost { * * @return a {@link java.util.ArrayList} object. */ - private ArrayList getUnpaidPhyrexianMana() { - final ArrayList res = new ArrayList(); + private ArrayList getUnpaidPhyrexianMana() { + final ArrayList res = new ArrayList(); for (final Object o : this.manaPart) { - if (o instanceof Mana_PartPhyrexian) { - final Mana_PartPhyrexian phy = (Mana_PartPhyrexian) o; + if (o instanceof ManaPartPhyrexian) { + final ManaPartPhyrexian phy = (ManaPartPhyrexian) o; if (!phy.isPaid()) { res.add(phy); @@ -126,7 +126,7 @@ public class ManaCost { */ public final boolean containsPhyrexianMana() { for (final Object o : this.manaPart) { - if (o instanceof Mana_PartPhyrexian) { + if (o instanceof ManaPartPhyrexian) { return true; } } @@ -142,7 +142,7 @@ public class ManaCost { * @return a boolean. */ public final boolean payPhyrexian() { - final ArrayList phy = this.getUnpaidPhyrexianMana(); + final ArrayList phy = this.getUnpaidPhyrexianMana(); if (phy.size() > 0) { phy.get(0).payLife(); @@ -194,11 +194,11 @@ public class ManaCost { } } 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++) { - m = (Mana_Part) this.manaPart.get(i); + m = (ManaPart) this.manaPart.get(i); if (m.isNeeded(mana)) { return true; } @@ -216,13 +216,13 @@ public class ManaCost { * @return a boolean. */ public final boolean isNeeded(final Mana mana) { - Mana_Part m; + ManaPart m; 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)) { return true; } - if ((m instanceof Mana_PartSnow) && mana.isSnow()) { + if ((m instanceof ManaPartSnow) && mana.isSnow()) { return true; } } @@ -237,9 +237,9 @@ public class ManaCost { * @return a boolean. */ public final boolean isPaid() { - Mana_Part m; + ManaPart m; 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()) { return false; } @@ -273,7 +273,7 @@ public class ManaCost { if (this.manaNeededToAvoidNegativeEffect.contains(color) && !this.manaPaidToAvoidNegativeEffect.contains(color)) { this.manaPaidToAvoidNegativeEffect.add(color); } - color = Input_PayManaCostUtil.getShortColorString(color); + color = InputPayManaCostUtil.getShortColorString(color); return this.addMana(color); } @@ -290,15 +290,15 @@ public class ManaCost { return; } - Mana_Part m; + ManaPart m; for (int i = 0; i < this.manaPart.size(); i++) { - m = (Mana_Part) this.manaPart.get(i); - if (m instanceof Mana_PartColorless) { - ((Mana_PartColorless) m).addToManaNeeded(manaToAdd); + m = (ManaPart) this.manaPart.get(i); + if (m instanceof ManaPartColorless) { + ((ManaPartColorless) m).addToManaNeeded(manaToAdd); return; } } - this.manaPart.add(new Mana_PartColorless(manaToAdd)); + this.manaPart.add(new ManaPartColorless(manaToAdd)); } /** @@ -316,17 +316,17 @@ public class ManaCost { return; } - Mana_Part m; + ManaPart m; for (int i = 0; i < this.manaPart.size(); i++) { - m = (Mana_Part) this.manaPart.get(i); - if (m instanceof Mana_PartColorless) { - final int remainingColorless = ((Mana_PartColorless) m).getManaNeeded() - manaToSubtract; + m = (ManaPart) this.manaPart.get(i); + if (m instanceof ManaPartColorless) { + final int remainingColorless = ((ManaPartColorless) m).getManaNeeded() - manaToSubtract; if (remainingColorless <= 0) { this.manaPart.remove(m); break; } else { 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() { for (final Object m : this.manaPart) { - if (m instanceof Mana_PartColorless) { - return ((Mana_PartColorless) m).getManaNeeded(); + if (m instanceof ManaPartColorless) { + return ((ManaPartColorless) m).getManaNeeded(); } } return 0; @@ -364,10 +364,10 @@ public class ManaCost { 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++) { - final Mana_Part m = (Mana_Part) this.manaPart.get(i); + final ManaPart m = (ManaPart) this.manaPart.get(i); if (m.isNeeded(mana)) { // if m is a better to pay than choice if (choice == null) { @@ -408,10 +408,10 @@ public class ManaCost { 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++) { - final Mana_Part m = (Mana_Part) this.manaPart.get(i); + final ManaPart m = (ManaPart) this.manaPart.get(i); if (m.isNeeded(mana)) { // if m is a better to pay than choice if (choice == null) { @@ -449,11 +449,11 @@ public class ManaCost { public final void combineManaCost(final String extra) { final ArrayList extraParts = this.split(extra); - Mana_PartColorless part = null; + ManaPartColorless part = null; for (int i = 0; i < this.manaPart.size(); i++) { final Object o = this.manaPart.get(i); - if (o instanceof Mana_PartColorless) { - part = (Mana_PartColorless) o; + if (o instanceof ManaPartColorless) { + part = (ManaPartColorless) o; } } if (part != null) { @@ -462,11 +462,11 @@ public class ManaCost { while (extraParts.size() > 0) { final Object o = extraParts.get(0); - if (o instanceof Mana_PartColorless) { + if (o instanceof ManaPartColorless) { if (part == null) { - part = (Mana_PartColorless) o; + part = (ManaPartColorless) o; } else { - part.addToManaNeeded(((Mana_PartColorless) o).getManaNeeded()); + part.addToManaNeeded(((ManaPartColorless) o).getManaNeeded()); } } else { this.manaPart.add(o); @@ -526,7 +526,7 @@ public class ManaCost { public final int getConvertedManaCost() { int cmc = 0; for (final Object s : this.manaPart) { - cmc += ((Mana_Part) s).getConvertedManaCost(); + cmc += ((ManaPart) s).getConvertedManaCost(); } return cmc; } @@ -542,8 +542,8 @@ public class ManaCost { public final double getWeightedManaCost() { double cmc = 0; for (final Object s : this.manaPart) { - cmc += ((Mana_Part) s).getConvertedManaCost(); - if (s instanceof Mana_PartColor) { + cmc += ((ManaPart) s).getConvertedManaCost(); + if (s instanceof ManaPartColor) { cmc += 0.0001; } } @@ -567,13 +567,13 @@ public class ManaCost { // handles costs like "3", "G", "GW", "10", "S" if ((cost.length() == 1) || (cost.length() == 2)) { if (Character.isDigit(cost.charAt(0))) { - list.add(new Mana_PartColorless(cost)); + list.add(new ManaPartColorless(cost)); } else if (cost.charAt(0) == 'S') { - list.add(new Mana_PartSnow()); + list.add(new ManaPartSnow()); } else if (cost.charAt(0) == 'P') { - list.add(new Mana_PartPhyrexian(cost)); + list.add(new ManaPartPhyrexian(cost)); } else { - list.add(new Mana_PartColor(cost)); + list.add(new ManaPartColor(cost)); } } else { // 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 // in order for isNeeded() and addMana() to work correctly Object o = list.get(0); - if (o instanceof Mana_PartSnow) { + if (o instanceof ManaPartSnow) { // move snow cost to the end of the list list.remove(0); list.add(o); } o = list.get(0); - if (o instanceof Mana_PartColorless) { + if (o instanceof ManaPartColorless) { // move colorless cost to the end of the list list.remove(0); list.add(o); @@ -611,19 +611,19 @@ public class ManaCost { * * @param partCost * 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) { - return new Mana_PartSplit(partCost); + return new ManaPartSplit(partCost); } else if (Character.isDigit(partCost.charAt(0))) { - return new Mana_PartColorless(partCost); + return new ManaPartColorless(partCost); } else if (partCost.equals("S")) { - return new Mana_PartSnow(); + return new ManaPartSnow(); } else if (partCost.startsWith("P")) { - return new Mana_PartPhyrexian(partCost); + return new ManaPartPhyrexian(partCost); } else { - return new Mana_PartColor(partCost); + return new ManaPartColor(partCost); } } @@ -660,7 +660,7 @@ public class ManaCost { public final void removeColorlessMana() { 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)); } } diff --git a/src/main/java/forge/card/mana/Mana_Part.java b/src/main/java/forge/card/mana/ManaPart.java similarity index 94% rename from src/main/java/forge/card/mana/Mana_Part.java rename to src/main/java/forge/card/mana/ManaPart.java index f7c6d8942f0..020000ad34a 100644 --- a/src/main/java/forge/card/mana/Mana_Part.java +++ b/src/main/java/forge/card/mana/ManaPart.java @@ -8,7 +8,7 @@ package forge.card.mana; * @author Forge * @version $Id$ */ -public abstract class Mana_Part { +public abstract class ManaPart { /** {@inheritDoc} */ @Override public abstract String toString(); @@ -92,10 +92,10 @@ public abstract class Mana_Part { *

* * @param mp - * a {@link forge.card.mana.Mana_Part} object. + * a {@link forge.card.mana.ManaPart} object. * @return a boolean. */ - public abstract boolean isEasierToPay(Mana_Part mp); + public abstract boolean isEasierToPay(ManaPart mp); /** *

diff --git a/src/main/java/forge/card/mana/Mana_PartColor.java b/src/main/java/forge/card/mana/ManaPartColor.java similarity index 84% rename from src/main/java/forge/card/mana/Mana_PartColor.java rename to src/main/java/forge/card/mana/ManaPartColor.java index 5f90562db5b..4e22f0fb0fb 100644 --- a/src/main/java/forge/card/mana/Mana_PartColor.java +++ b/src/main/java/forge/card/mana/ManaPartColor.java @@ -1,6 +1,6 @@ package forge.card.mana; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -10,7 +10,7 @@ import forge.gui.input.Input_PayManaCostUtil; * @author Forge * @version $Id$ */ -public class Mana_PartColor extends Mana_Part { +public class ManaPartColor extends ManaPart { private String manaCost; // String manaCostToPay is either "G" or "GW" NOT "3 G" @@ -24,11 +24,11 @@ public class Mana_PartColor extends Mana_Part { * @param manaCostToPay * a {@link java.lang.String} object. */ - public Mana_PartColor(final String manaCostToPay) { + public ManaPartColor(final String manaCostToPay) { final char[] c = manaCostToPay.toCharArray(); for (int i = 0; i < c.length; 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 public final boolean isNeeded(final String mana) { // ManaPart method - Mana_Part.checkSingleMana(mana); + ManaPart.checkSingleMana(mana); return !this.isPaid() && this.isColor(mana); } @@ -60,7 +60,7 @@ public class Mana_PartColor extends Mana_Part { @Override public final boolean isColor(final String mana) { // ManaPart method - Mana_Part.checkSingleMana(mana); + ManaPart.checkSingleMana(mana); return this.manaCost.indexOf(mana) != -1; } @@ -68,15 +68,15 @@ public class Mana_PartColor extends Mana_Part { /** {@inheritDoc} */ @Override 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; } /** {@inheritDoc} */ @Override - public final boolean isEasierToPay(final Mana_Part mp) { - if (mp instanceof Mana_PartColorless) { + public final boolean isEasierToPay(final ManaPart mp) { + if (mp instanceof ManaPartColorless) { return false; } return this.toString().length() >= mp.toString().length(); diff --git a/src/main/java/forge/card/mana/Mana_PartColorless.java b/src/main/java/forge/card/mana/ManaPartColorless.java similarity index 92% rename from src/main/java/forge/card/mana/Mana_PartColorless.java rename to src/main/java/forge/card/mana/ManaPartColorless.java index baa03457288..60c97d99b29 100644 --- a/src/main/java/forge/card/mana/Mana_PartColorless.java +++ b/src/main/java/forge/card/mana/ManaPartColorless.java @@ -10,7 +10,7 @@ import forge.error.ErrorViewer; * @author Forge * @version $Id$ */ -public class Mana_PartColorless extends Mana_Part { +public class ManaPartColorless extends ManaPart { private int manaNeeded; /** @@ -45,7 +45,7 @@ public class Mana_PartColorless extends Mana_Part { * @param manaCostToPay * a {@link java.lang.String} object. */ - public Mana_PartColorless(final String manaCostToPay) { + public ManaPartColorless(final String manaCostToPay) { try { this.manaNeeded = Integer.parseInt(manaCostToPay); } catch (final NumberFormatException ex) { @@ -62,7 +62,7 @@ public class Mana_PartColorless extends Mana_Part { * @param manaCostToPay * a int. */ - public Mana_PartColorless(final int manaCostToPay) { + public ManaPartColorless(final int manaCostToPay) { this.manaNeeded = manaCostToPay; } @@ -80,7 +80,7 @@ public class Mana_PartColorless extends Mana_Part { @Override public final boolean isNeeded(final String mana) { // ManaPart method - Mana_Part.checkSingleMana(mana); + ManaPart.checkSingleMana(mana); return 0 < this.manaNeeded; } @@ -110,7 +110,7 @@ public class Mana_PartColorless extends Mana_Part { /** {@inheritDoc} */ @Override - public final boolean isEasierToPay(final Mana_Part mp) { + public final boolean isEasierToPay(final ManaPart mp) { // Colorless is always easier to Pay for return true; } diff --git a/src/main/java/forge/card/mana/Mana_PartPhyrexian.java b/src/main/java/forge/card/mana/ManaPartPhyrexian.java similarity index 89% rename from src/main/java/forge/card/mana/Mana_PartPhyrexian.java rename to src/main/java/forge/card/mana/ManaPartPhyrexian.java index 4895c11b71f..d5ae0373a37 100644 --- a/src/main/java/forge/card/mana/Mana_PartPhyrexian.java +++ b/src/main/java/forge/card/mana/ManaPartPhyrexian.java @@ -8,8 +8,8 @@ package forge.card.mana; * @author Forge * @version $Id$ */ -public class Mana_PartPhyrexian extends Mana_Part { - private final Mana_PartColor wrappedColor; +public class ManaPartPhyrexian extends ManaPart { + private final ManaPartColor wrappedColor; private final String color; /** @@ -20,14 +20,14 @@ public class Mana_PartPhyrexian extends Mana_Part { * @param manaCostToPay * a {@link java.lang.String} object. */ - public Mana_PartPhyrexian(final String manaCostToPay) { - this.wrappedColor = new Mana_PartColor(manaCostToPay.substring(1)); + public ManaPartPhyrexian(final String manaCostToPay) { + this.wrappedColor = new ManaPartColor(manaCostToPay.substring(1)); this.color = manaCostToPay.substring(1); } /** {@inheritDoc} */ @Override - public final boolean isEasierToPay(final Mana_Part part) { + public final boolean isEasierToPay(final ManaPart part) { return true; } diff --git a/src/main/java/forge/card/mana/Mana_PartSnow.java b/src/main/java/forge/card/mana/ManaPartSnow.java similarity index 91% rename from src/main/java/forge/card/mana/Mana_PartSnow.java rename to src/main/java/forge/card/mana/ManaPartSnow.java index 3c69c2a8e6b..d15c3c2a4bc 100644 --- a/src/main/java/forge/card/mana/Mana_PartSnow.java +++ b/src/main/java/forge/card/mana/ManaPartSnow.java @@ -8,7 +8,7 @@ package forge.card.mana; * @author Forge * @version $Id$ */ -public class Mana_PartSnow extends Mana_Part { +public class ManaPartSnow extends ManaPart { private boolean isPaid = false; @@ -45,8 +45,8 @@ public class Mana_PartSnow extends Mana_Part { /** {@inheritDoc} */ @Override - public final boolean isEasierToPay(final Mana_Part mp) { - if (mp instanceof Mana_PartColorless) { + public final boolean isEasierToPay(final ManaPart mp) { + if (mp instanceof ManaPartColorless) { return false; } return this.toString().length() >= mp.toString().length(); diff --git a/src/main/java/forge/card/mana/Mana_PartSplit.java b/src/main/java/forge/card/mana/ManaPartSplit.java similarity index 86% rename from src/main/java/forge/card/mana/Mana_PartSplit.java rename to src/main/java/forge/card/mana/ManaPartSplit.java index 35b6c5ce2b9..b780a768a1a 100644 --- a/src/main/java/forge/card/mana/Mana_PartSplit.java +++ b/src/main/java/forge/card/mana/ManaPartSplit.java @@ -1,6 +1,6 @@ package forge.card.mana; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; //handles mana costs like 2/R or 2/B //for cards like Flame Javelin (Shadowmoor) @@ -12,8 +12,8 @@ import forge.gui.input.Input_PayManaCostUtil; * @author Forge * @version $Id$ */ -public class Mana_PartSplit extends Mana_Part { - private Mana_Part manaPart = null; +public class ManaPartSplit extends ManaPart { + private ManaPart manaPart = null; private String originalCost = ""; /** @@ -24,7 +24,7 @@ public class Mana_PartSplit extends Mana_Part { * @param manaCost * a {@link java.lang.String} object. */ - public Mana_PartSplit(final String manaCost) { + public ManaPartSplit(final String manaCost) { // is mana cost like "2/R" if (manaCost.length() != 3) { 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 // does manaToPay contain color? if (0 <= manaToPay.indexOf(color)) { - this.manaPart = new Mana_PartColor(color); + this.manaPart = new ManaPartColor(color); } else { // 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() @@ -83,7 +83,7 @@ public class Mana_PartSplit extends Mana_Part { @Override public final void reduce(final Mana mana) { if (this.isFirstTime()) { - this.setup(Input_PayManaCostUtil.getShortColorString(mana.getColor())); + this.setup(InputPayManaCostUtil.getShortColorString(mana.getColor())); } this.manaPart.reduce(mana); @@ -122,15 +122,15 @@ public class Mana_PartSplit extends Mana_Part { /** {@inheritDoc} */ @Override 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(); return mp.indexOf(color) != -1; } /** {@inheritDoc} */ @Override - public final boolean isEasierToPay(final Mana_Part mp) { - if (mp instanceof Mana_PartColorless) { + public final boolean isEasierToPay(final ManaPart mp) { + if (mp instanceof ManaPartColorless) { return false; } if (!this.isFirstTime()) { diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java index 129904051ed..6dddfbe4244 100644 --- a/src/main/java/forge/card/mana/ManaPool.java +++ b/src/main/java/forge/card/mana/ManaPool.java @@ -10,10 +10,10 @@ import forge.Card; import forge.CardUtil; import forge.Constant; import forge.Player; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; /** *

@@ -299,7 +299,7 @@ public class ManaPool extends Card { int genericTotal = 0; for (final String c : manaArr) { - final String longStr = Input_PayManaCostUtil.getLongColorString(c); + final String longStr = InputPayManaCostUtil.getLongColorString(c); if (longStr.equals(Constant.Color.COLORLESS)) { genericTotal += Integer.parseInt(c); } else if (color.equals("")) { @@ -365,7 +365,7 @@ public class ManaPool extends Card { final String[] colors = manaStr.split("/"); boolean wantSnow = false; 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)) { wantSnow = true; } @@ -589,10 +589,10 @@ public class ManaPool extends Card { *

* * @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. */ - public static String[] formatMana(final Ability_Mana manaAbility) { + public static String[] formatMana(final AbilityMana manaAbility) { return ManaPool.formatMana(manaAbility.mana(), true); } // wrapper @@ -733,11 +733,11 @@ public class ManaPool extends Card { * @param m * a {@link forge.card.mana.ManaCost} object. * @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. */ - public final ManaCost subtractMana(final SpellAbility sa, ManaCost m, final Ability_Mana... mAbilities) { - final ArrayList paidAbs = sa.getPayingManaAbilities(); + public final ManaCost subtractMana(final SpellAbility sa, ManaCost m, final AbilityMana... mAbilities) { + final ArrayList paidAbs = sa.getPayingManaAbilities(); if (mAbilities.length == 0) { // paying from Mana Pool @@ -750,7 +750,7 @@ public class ManaPool extends Card { } // paying via Mana Abilities - for (final Ability_Mana mability : mAbilities) { + for (final AbilityMana mability : mAbilities) { paidAbs.add(mability); final String[] cost = ManaPool.formatMana(mability); m = this.subtractMultiple(sa, cost, m); @@ -858,7 +858,7 @@ public class ManaPool extends Card { * a boolean. */ public final void clearPay(final SpellAbility ability, final boolean refund) { - final ArrayList payAbs = ability.getPayingManaAbilities(); + final ArrayList payAbs = ability.getPayingManaAbilities(); final ArrayList payMana = ability.getPayingMana(); payAbs.clear(); @@ -897,7 +897,7 @@ public class ManaPool extends Card { final boolean flag = false; String manaStr = mana[i]; - String color = Input_PayManaCostUtil.getLongColorString(manaStr); + String color = InputPayManaCostUtil.getLongColorString(manaStr); if (!usePay && (this.floatingMana.size() == 0)) { return false; @@ -925,7 +925,7 @@ public class ManaPool extends Card { manaStr = mana[i]; } } - color = Input_PayManaCostUtil.getLongColorString(manaStr); + color = InputPayManaCostUtil.getLongColorString(manaStr); if (usePay) { removePaying.add(m); } else { @@ -974,10 +974,10 @@ public class ManaPool extends Card { public final void unpaid(final SpellAbility sa, final boolean untap) { // TODO having some crash in here related to undo and not tracking // abilities properly - final ArrayList payAbs = sa.getPayingManaAbilities(); + final ArrayList payAbs = sa.getPayingManaAbilities(); // go through paidAbilities if they are undoable - for (final Ability_Mana am : payAbs) { + for (final AbilityMana am : payAbs) { if (am.isUndoable()) { final String[] formattedMana = ManaPool.formatMana(am); if (this.accountFor(sa, formattedMana, am.getSourceCard())) { diff --git a/src/main/java/forge/card/spellability/Ability_Activated.java b/src/main/java/forge/card/spellability/AbilityActivated.java similarity index 87% rename from src/main/java/forge/card/spellability/Ability_Activated.java rename to src/main/java/forge/card/spellability/AbilityActivated.java index ca86b7f2648..970d56285f5 100644 --- a/src/main/java/forge/card/spellability/Ability_Activated.java +++ b/src/main/java/forge/card/spellability/AbilityActivated.java @@ -10,7 +10,7 @@ import forge.CardListFilter; import forge.Constant.Zone; import forge.Player; import forge.card.cost.Cost; -import forge.card.cost.Cost_Payment; +import forge.card.cost.CostPayment; import forge.card.staticAbility.StaticAbility; /** @@ -21,7 +21,7 @@ import forge.card.staticAbility.StaticAbility; * @author Forge * @version $Id$ */ -public abstract class Ability_Activated extends SpellAbility implements java.io.Serializable { +public abstract class AbilityActivated extends SpellAbility implements java.io.Serializable { /** Constant serialVersionUID=1L. */ private static final long serialVersionUID = 1L; @@ -35,7 +35,7 @@ public abstract class Ability_Activated extends SpellAbility implements java.io. * @param manacost * 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); } @@ -51,7 +51,7 @@ public abstract class Ability_Activated extends SpellAbility implements java.io. * @param tgt * 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); this.setManaCost(abCost.getTotalMana()); 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; } @@ -109,6 +109,6 @@ public abstract class Ability_Activated extends SpellAbility implements java.io. return false; } - return Cost_Payment.canPayAdditionalCosts(this.getPayCosts(), this); + return CostPayment.canPayAdditionalCosts(this.getPayCosts(), this); } } diff --git a/src/main/java/forge/card/spellability/Ability_Mana.java b/src/main/java/forge/card/spellability/AbilityMana.java similarity index 93% rename from src/main/java/forge/card/spellability/Ability_Mana.java rename to src/main/java/forge/card/spellability/AbilityMana.java index 5bb18d3beab..f808f9510af 100644 --- a/src/main/java/forge/card/spellability/Ability_Mana.java +++ b/src/main/java/forge/card/spellability/AbilityMana.java @@ -17,7 +17,7 @@ import forge.card.mana.ManaPool; * @author Forge * @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 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 * 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); } @@ -63,7 +63,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io. * @param num * 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); } @@ -79,7 +79,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io. * @param produced * 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); } @@ -97,7 +97,7 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io. * @param num * 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); this.origProduced = produced; @@ -346,11 +346,11 @@ public abstract class Ability_Mana extends Ability_Activated implements java.io. @Override public final boolean equals(final Object o) { // Mana abilities with same Descriptions are "equal" - if ((o == null) || !(o instanceof Ability_Mana)) { + if ((o == null) || !(o instanceof AbilityMana)) { return false; } - final Ability_Mana abm = (Ability_Mana) o; + final AbilityMana abm = (AbilityMana) o; if (abm.getType() != this.getType()) { return false; diff --git a/src/main/java/forge/card/spellability/Ability_Static.java b/src/main/java/forge/card/spellability/AbilityStatic.java similarity index 76% rename from src/main/java/forge/card/spellability/Ability_Static.java rename to src/main/java/forge/card/spellability/AbilityStatic.java index d083af935ea..475bc3f8c73 100644 --- a/src/main/java/forge/card/spellability/Ability_Static.java +++ b/src/main/java/forge/card/spellability/AbilityStatic.java @@ -10,7 +10,7 @@ import forge.Card; * @author Forge * @version $Id$ */ -public abstract class Ability_Static extends Ability { +public abstract class AbilityStatic extends Ability { /** *

* Constructor for Ability_Static. @@ -21,7 +21,7 @@ public abstract class Ability_Static extends Ability { * @param manaCost * 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); } } diff --git a/src/main/java/forge/card/spellability/Ability_Sub.java b/src/main/java/forge/card/spellability/AbilitySub.java similarity index 91% rename from src/main/java/forge/card/spellability/Ability_Sub.java rename to src/main/java/forge/card/spellability/AbilitySub.java index 5b2584159d3..34bfdb546fe 100644 --- a/src/main/java/forge/card/spellability/Ability_Sub.java +++ b/src/main/java/forge/card/spellability/AbilitySub.java @@ -10,7 +10,7 @@ import forge.Card; * @author Forge * @version $Id$ */ -public abstract class Ability_Sub extends SpellAbility implements java.io.Serializable { +public abstract class AbilitySub extends SpellAbility implements java.io.Serializable { /** Constant 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 * 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); this.setTarget(tgt); } diff --git a/src/main/java/forge/card/spellability/Ability_Triggered.java b/src/main/java/forge/card/spellability/AbilityTriggered.java similarity index 89% rename from src/main/java/forge/card/spellability/Ability_Triggered.java rename to src/main/java/forge/card/spellability/AbilityTriggered.java index 57483de6eda..d160387f1ed 100644 --- a/src/main/java/forge/card/spellability/Ability_Triggered.java +++ b/src/main/java/forge/card/spellability/AbilityTriggered.java @@ -15,7 +15,7 @@ import forge.ZCTrigger; * @author Forge * @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 * 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"); this.setTrigger(true); this.todo = sourceCommand; this.trigger = situation; - if (this.todo instanceof Ability_Triggered) { + if (this.todo instanceof AbilityTriggered) { this.setStackDescription(((SpellAbility) this.todo).getStackDescription()); - this.restrictions = ((Ability_Triggered) this.todo).restrictions; + this.restrictions = ((AbilityTriggered) this.todo).restrictions; } else { this.setStackDescription("Triggered ability: " + sourceCard + " " + situation); 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) { // TODO triggers affecting other // cards - if (!(o instanceof Ability_Triggered)) { + if (!(o instanceof AbilityTriggered)) { 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) && tmp.todo.equals(this.todo) && Arrays.equals(tmp.restrictions, this.restrictions); } diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java index aa1db02e3a0..b13462b842b 100644 --- a/src/main/java/forge/card/spellability/Spell.java +++ b/src/main/java/forge/card/spellability/Spell.java @@ -11,7 +11,7 @@ import forge.Constant.Zone; import forge.Phase; import forge.Player; import forge.card.cost.Cost; -import forge.card.cost.Cost_Payment; +import forge.card.cost.CostPayment; import forge.card.staticAbility.StaticAbility; import forge.error.ErrorViewer; @@ -95,7 +95,7 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable } if (this.getPayCosts() != null) { - if (!Cost_Payment.canPayAdditionalCosts(this.getPayCosts(), this)) { + if (!CostPayment.canPayAdditionalCosts(this.getPayCosts(), this)) { return false; } } diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index 72308eb800b..293bed71c95 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -88,14 +88,14 @@ public abstract class SpellAbility { /** The chosen target. */ private Target chosenTarget = null; - private SpellAbility_Restriction restrictions = new SpellAbility_Restriction(); - private SpellAbility_Condition conditions = new SpellAbility_Condition(); - private Ability_Sub subAbility = null; + private SpellAbilityRestriction restrictions = new SpellAbilityRestriction(); + private SpellAbilityCondition conditions = new SpellAbilityCondition(); + private AbilitySub subAbility = null; private AbilityFactory abilityFactory = null; private final ArrayList payingMana = new ArrayList(); - private final ArrayList paidAbilities = new ArrayList(); + private final ArrayList paidAbilities = new ArrayList(); private HashMap paidLists = new HashMap(); @@ -690,10 +690,10 @@ public abstract class SpellAbility { *

* * @param restrict - * a {@link forge.card.spellability.SpellAbility_Restriction} + * a {@link forge.card.spellability.SpellAbilityRestriction} * object. */ - public void setRestrictions(final SpellAbility_Restriction restrict) { + public void setRestrictions(final SpellAbilityRestriction restrict) { this.restrictions = restrict; } @@ -702,10 +702,10 @@ public abstract class SpellAbility { * Getter for the field restrictions. *

* - * @return a {@link forge.card.spellability.SpellAbility_Restriction} + * @return a {@link forge.card.spellability.SpellAbilityRestriction} * object. */ - public SpellAbility_Restriction getRestrictions() { + public SpellAbilityRestriction getRestrictions() { return this.restrictions; } @@ -726,11 +726,11 @@ public abstract class SpellAbility { *

* * @param condition - * a {@link forge.card.spellability.SpellAbility_Condition} + * a {@link forge.card.spellability.SpellAbilityCondition} * object. * @since 1.0.15 */ - public void setConditions(final SpellAbility_Condition condition) { + public void setConditions(final SpellAbilityCondition condition) { this.conditions = condition; } @@ -739,10 +739,10 @@ public abstract class SpellAbility { * Getter for the field conditions. *

* - * @return a {@link forge.card.spellability.SpellAbility_Condition} object. + * @return a {@link forge.card.spellability.SpellAbilityCondition} object. * @since 1.0.15 */ - public SpellAbility_Condition getConditions() { + public SpellAbilityCondition getConditions() { return this.conditions; } @@ -787,7 +787,7 @@ public abstract class SpellAbility { * * @return a {@link java.util.ArrayList} object. */ - public ArrayList getPayingManaAbilities() { + public ArrayList getPayingManaAbilities() { return this.paidAbilities; } @@ -1136,9 +1136,9 @@ public abstract class SpellAbility { *

* * @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; if (subAbility != null) { subAbility.setParent(this); @@ -1150,9 +1150,9 @@ public abstract class SpellAbility { * Getter for the field subAbility. *

* - * @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; } @@ -1500,8 +1500,8 @@ public abstract class SpellAbility { * @since 1.0.15 */ public final SpellAbility getRootSpellAbility() { - if (this instanceof Ability_Sub) { - final SpellAbility parent = ((Ability_Sub) this).getParent(); + if (this instanceof AbilitySub) { + final SpellAbility parent = ((AbilitySub) this).getParent(); if (parent != null) { return parent.getRootSpellAbility(); } @@ -1518,8 +1518,8 @@ public abstract class SpellAbility { * @return a {@link java.util.ArrayList} object. * @since 1.0.15 */ - public final ArrayList getAllTargetChoices() { - final ArrayList res = new ArrayList(); + public final ArrayList getAllTargetChoices() { + final ArrayList res = new ArrayList(); SpellAbility sa = this.getRootSpellAbility(); if (sa.getTarget() != null) { diff --git a/src/main/java/forge/card/spellability/SpellAbility_Condition.java b/src/main/java/forge/card/spellability/SpellAbilityCondition.java similarity index 98% rename from src/main/java/forge/card/spellability/SpellAbility_Condition.java rename to src/main/java/forge/card/spellability/SpellAbilityCondition.java index 9473e848d7f..d420dcfce43 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_Condition.java +++ b/src/main/java/forge/card/spellability/SpellAbilityCondition.java @@ -20,7 +20,7 @@ import forge.card.cardFactory.CardFactoryUtil; * @version $Id$ * @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: // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Threshold, Metalcraft, LevelRange, etc @@ -34,7 +34,7 @@ public class SpellAbility_Condition extends SpellAbility_Variables { * Constructor for SpellAbility_Condition. *

*/ - public SpellAbility_Condition() { + public SpellAbilityCondition() { } /** diff --git a/src/main/java/forge/card/spellability/SpellAbility_Requirements.java b/src/main/java/forge/card/spellability/SpellAbilityRequirements.java similarity index 93% rename from src/main/java/forge/card/spellability/SpellAbility_Requirements.java rename to src/main/java/forge/card/spellability/SpellAbilityRequirements.java index ff20e2f5d11..ce75fc3f5f7 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_Requirements.java +++ b/src/main/java/forge/card/spellability/SpellAbilityRequirements.java @@ -6,7 +6,7 @@ import forge.AllZone; import forge.Card; import forge.PlayerZone; import forge.card.abilityFactory.AbilityFactory; -import forge.card.cost.Cost_Payment; +import forge.card.cost.CostPayment; /** *

@@ -16,10 +16,10 @@ import forge.card.cost.Cost_Payment; * @author Forge * @version $Id$ */ -public class SpellAbility_Requirements { +public class SpellAbilityRequirements { private SpellAbility ability = null; - private Target_Selection select = null; - private Cost_Payment payment = null; + private TargetSelection select = null; + private CostPayment payment = null; private boolean isFree = false; private boolean skipStack = false; @@ -58,11 +58,11 @@ public class SpellAbility_Requirements { * @param sa * a {@link forge.card.spellability.SpellAbility} object. * @param ts - * a {@link forge.card.spellability.Target_Selection} object. + * a {@link forge.card.spellability.TargetSelection} object. * @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.select = ts; this.payment = cp; diff --git a/src/main/java/forge/card/spellability/SpellAbility_Restriction.java b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java similarity index 98% rename from src/main/java/forge/card/spellability/SpellAbility_Restriction.java rename to src/main/java/forge/card/spellability/SpellAbilityRestriction.java index 89dfb7a9564..6cf1a992521 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_Restriction.java +++ b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java @@ -22,7 +22,7 @@ import forge.card.cardFactory.CardFactoryUtil; * @author Forge * @version $Id$ */ -public class SpellAbility_Restriction extends SpellAbility_Variables { +public class SpellAbilityRestriction extends SpellAbilityVariables { // A class for handling SpellAbility Restrictions. These restrictions // include: // 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. *

*/ - public SpellAbility_Restriction() { + public SpellAbilityRestriction() { } /** @@ -311,7 +311,7 @@ public class SpellAbility_Restriction extends SpellAbility_Variables { for (final SpellAbility pwAbs : c.getAllSpellAbilities()) { // check all abilities on card that have their planeswalker // 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)) { return false; } diff --git a/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java b/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java similarity index 93% rename from src/main/java/forge/card/spellability/SpellAbility_StackInstance.java rename to src/main/java/forge/card/spellability/SpellAbilityStackInstance.java index eeba2d741cb..a13ba90af69 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_StackInstance.java +++ b/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java @@ -14,7 +14,7 @@ import forge.Player; * @author Forge * @version $Id$ */ -public class SpellAbility_StackInstance { +public class SpellAbilityStackInstance { // At some point I want this functioning more like Target/Target Choices // where the SA has an "active" // Stack Instance, and instead of having duplicate parameters, it adds @@ -27,11 +27,11 @@ public class SpellAbility_StackInstance { private SpellAbility ability = null; /** The sub instace. */ - private SpellAbility_StackInstance subInstace = null; + private SpellAbilityStackInstance subInstace = null; // When going to a SubAbility that SA has a Instance Choice object /** The tc. */ - private Target_Choices tc = null; + private TargetChoices tc = null; /** The activating player. */ private Player activatingPlayer = null; @@ -67,7 +67,7 @@ public class SpellAbility_StackInstance { * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ - public SpellAbility_StackInstance(final SpellAbility sa) { + public SpellAbilityStackInstance(final SpellAbility sa) { // Base SA info this.ability = sa; this.stackDescription = this.ability.getStackDescription(); @@ -83,9 +83,9 @@ public class SpellAbility_StackInstance { // Triggering info this.triggeringObjects = sa.getTriggeringObjects(); - final Ability_Sub subAb = this.ability.getSubAbility(); + final AbilitySub subAb = this.ability.getSubAbility(); 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 @@ -125,7 +125,7 @@ public class SpellAbility_StackInstance { // Saved sub-SA needs to be reset on the way out if (this.subInstace != null) { - this.ability.setSubAbility((Ability_Sub) this.subInstace.getSpellAbility()); + this.ability.setSubAbility((AbilitySub) this.subInstace.getSpellAbility()); } // Set Cost specific things here diff --git a/src/main/java/forge/card/spellability/SpellAbility_Variables.java b/src/main/java/forge/card/spellability/SpellAbilityVariables.java similarity index 99% rename from src/main/java/forge/card/spellability/SpellAbility_Variables.java rename to src/main/java/forge/card/spellability/SpellAbilityVariables.java index 0e8a7f56959..5e9bd6f7e3a 100644 --- a/src/main/java/forge/card/spellability/SpellAbility_Variables.java +++ b/src/main/java/forge/card/spellability/SpellAbilityVariables.java @@ -13,7 +13,7 @@ import forge.Constant; * @version $Id$ * @since 1.0.15 */ -public class SpellAbility_Variables { +public class SpellAbilityVariables { // A class for handling SpellAbility Variables. These restrictions include: // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Threshold, Metalcraft, Hellbent, LevelRange, etc @@ -25,7 +25,7 @@ public class SpellAbility_Variables { * Constructor for SpellAbility_Variables. *

*/ - public SpellAbility_Variables() { + public SpellAbilityVariables() { } // default values for Sorcery speed abilities diff --git a/src/main/java/forge/card/spellability/Spell_Permanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java similarity index 86% rename from src/main/java/forge/card/spellability/Spell_Permanent.java rename to src/main/java/forge/card/spellability/SpellPermanent.java index 9f9598586f1..3aa7856f239 100644 --- a/src/main/java/forge/card/spellability/Spell_Permanent.java +++ b/src/main/java/forge/card/spellability/SpellPermanent.java @@ -27,7 +27,7 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -public class Spell_Permanent extends Spell { +public class SpellPermanent extends Spell { /** Constant serialVersionUID=2413495058630644447L. */ private static final long serialVersionUID = 2413495058630644447L; @@ -41,11 +41,11 @@ public class Spell_Permanent extends Spell { @Override 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(), - Spell_Permanent.this.championAbilityComes, choice, "Select another " - + Spell_Permanent.this.championValidDesc + " you control to exile", false, false)); + this.stopSetNext(CardFactoryUtil.inputTargetChampionSac(SpellPermanent.this.getSourceCard(), + SpellPermanent.this.championAbilityComes, choice, "Select another " + + SpellPermanent.this.championValidDesc + " you control to exile", false, false)); ButtonUtil.disableAll(); // target this card means: sacrifice this // card } @@ -54,9 +54,9 @@ public class Spell_Permanent extends Spell { private final CommandReturn championGetCreature = new CommandReturn() { @Override public Object execute() { - final CardList cards = Spell_Permanent.this.getSourceCard().getController().getCardsIn(Zone.Battlefield); - return cards.getValidCards(Spell_Permanent.this.championValid, Spell_Permanent.this.getSourceCard() - .getController(), Spell_Permanent.this.getSourceCard()); + final CardList cards = SpellPermanent.this.getSourceCard().getController().getCardsIn(Zone.Battlefield); + return cards.getValidCards(SpellPermanent.this.championValid, SpellPermanent.this.getSourceCard() + .getController(), SpellPermanent.this.getSourceCard()); } }; // CommandReturn @@ -68,15 +68,15 @@ public class Spell_Permanent extends Spell { final Card source = this.getSourceCard(); 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) { AllZone.getGameAction().sacrifice(source); return; } else if (controller.isHuman()) { - AllZone.getInputControl().setInput(Spell_Permanent.this.championInputComes); + AllZone.getInputControl().setInput(SpellPermanent.this.championInputComes); } else { // Computer 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.shuffle(); @@ -107,10 +107,10 @@ public class Spell_Permanent extends Spell { @Override public void execute() { 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."); - Spell_Permanent.this.championAbilityComes.setStackDescription(sb.toString()); - AllZone.getStack().addSimultaneousStackEntry(Spell_Permanent.this.championAbilityComes); + SpellPermanent.this.championAbilityComes.setStackDescription(sb.toString()); + AllZone.getStack().addSimultaneousStackEntry(SpellPermanent.this.championAbilityComes); } // execute() }; // championCommandComes @@ -122,7 +122,7 @@ public class Spell_Permanent extends Spell { @Override public void execute() { - final SpellAbility ability = new Ability(Spell_Permanent.this.getSourceCard(), "0") { + final SpellAbility ability = new Ability(SpellPermanent.this.getSourceCard(), "0") { @Override public void resolve() { final Card c = this.getSourceCard().getChampionedCard(); @@ -133,7 +133,7 @@ public class Spell_Permanent extends Spell { }; // SpellAbility 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."); ability.setStackDescription(sb.toString()); @@ -152,7 +152,7 @@ public class Spell_Permanent extends Spell { * @param sourceCard * a {@link forge.Card} object. */ - public Spell_Permanent(final Card sourceCard) { + public SpellPermanent(final Card sourceCard) { // Add Costs for all SpellPermanents this(sourceCard, new Cost(sourceCard.getManaCost(), sourceCard.getName(), false), null); } // Spell_Permanent() @@ -169,7 +169,7 @@ public class Spell_Permanent extends Spell { * @param tgt * 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); } // Spell_Permanent() @@ -185,7 +185,7 @@ public class Spell_Permanent extends Spell { * @param setDesc * 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); 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; } @@ -360,7 +360,7 @@ public class Spell_Permanent extends Spell { // Run non-mandatory trigger. // These checks only work if the Executing SpellAbility is an // 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 // if trigger is mandatory, return false diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java index bc176675aa0..94aeb954a80 100644 --- a/src/main/java/forge/card/spellability/Target.java +++ b/src/main/java/forge/card/spellability/Target.java @@ -26,16 +26,16 @@ public class Target { // Target Choices (which is specific for the StackInstance) private Card srcCard; private boolean uniqueTargets = false; - private Target_Choices choice = null; + private TargetChoices choice = null; /** *

* getTargetChoices. *

* - * @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; } @@ -45,9 +45,9 @@ public class Target { *

* * @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; } @@ -279,7 +279,7 @@ public class Target { */ public final boolean addTarget(final Object o) { if (this.choice == null) { - this.choice = new Target_Choices(); + this.choice = new TargetChoices(); } if (o instanceof Card) { diff --git a/src/main/java/forge/card/spellability/Target_Choices.java b/src/main/java/forge/card/spellability/TargetChoices.java similarity index 99% rename from src/main/java/forge/card/spellability/Target_Choices.java rename to src/main/java/forge/card/spellability/TargetChoices.java index 19af10746a8..a2638c4be38 100644 --- a/src/main/java/forge/card/spellability/Target_Choices.java +++ b/src/main/java/forge/card/spellability/TargetChoices.java @@ -13,7 +13,7 @@ import forge.Player; * @author Forge * @version $Id$ */ -public class Target_Choices { +public class TargetChoices { private int numTargeted = 0; /** diff --git a/src/main/java/forge/card/spellability/Target_Selection.java b/src/main/java/forge/card/spellability/TargetSelection.java similarity index 93% rename from src/main/java/forge/card/spellability/Target_Selection.java rename to src/main/java/forge/card/spellability/TargetSelection.java index 724a9a3d880..f871a7ada95 100644 --- a/src/main/java/forge/card/spellability/Target_Selection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -25,11 +25,11 @@ import forge.gui.input.Input; * @author Forge * @version $Id$ */ -public class Target_Selection { +public class TargetSelection { private Target target = null; private SpellAbility ability = null; private Card card = null; - private Target_Selection subSelection = null; + private TargetSelection subSelection = null; /** *

@@ -64,7 +64,7 @@ public class Target_Selection { return this.card; } - private SpellAbility_Requirements req = null; + private SpellAbilityRequirements req = null; /** *

@@ -72,10 +72,10 @@ public class Target_Selection { *

* * @param reqs - * a {@link forge.card.spellability.SpellAbility_Requirements} + * a {@link forge.card.spellability.SpellAbilityRequirements} * object. */ - public final void setRequirements(final SpellAbility_Requirements reqs) { + public final void setRequirements(final SpellAbilityRequirements reqs) { this.req = reqs; } @@ -136,7 +136,7 @@ public class Target_Selection { * @param sa * 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.ability = sa; this.card = sa.getSourceCard(); @@ -182,7 +182,7 @@ public class Target_Selection { return false; } else if (!this.doesTarget() || (this.bDoneTarget && this.target.isMinTargetsChosen(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 no more SubAbilities finish targeting @@ -190,7 +190,7 @@ public class Target_Selection { return true; } else { // 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.resetTargets(); return this.subSelection.chooseTargets(); @@ -212,8 +212,8 @@ public class Target_Selection { public final ArrayList getUniqueTargets(final SpellAbility ability) { final ArrayList targets = new ArrayList(); SpellAbility child = ability; - while (child instanceof Ability_Sub) { - child = ((Ability_Sub) child).getParent(); + while (child instanceof AbilitySub) { + child = ((AbilitySub) child).getParent(); 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, final ArrayList alreadyTargeted) { final SpellAbility sa = this.ability; - final Target_Selection select = this; + final TargetSelection select = this; final Target tgt = this.target; - final SpellAbility_Requirements req = this.req; + final SpellAbilityRequirements req = this.req; final Input target = new Input() { private static final long serialVersionUID = -1091595663541356356L; @@ -421,10 +421,10 @@ public class Target_Selection { public final void chooseCardFromStack(final boolean mandatory) { final Target tgt = this.target; final String message = tgt.getVTSelection(); - final Target_Selection select = this; + final TargetSelection select = this; // Find what's targetable, then allow human to choose - final ArrayList choosables = Target_Selection.getTargetableOnStack(this.ability, select.getTgt()); + final ArrayList choosables = TargetSelection.getTargetableOnStack(this.ability, select.getTgt()); final HashMap map = new HashMap(); @@ -472,7 +472,7 @@ public class Target_Selection { } 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); } } @@ -524,7 +524,7 @@ public class Target_Selection { boolean result = false; for (final Object o : matchTgt.getTargets()) { - if (Target_Selection.matchesValid(o, splitTargetRestrictions.split(","), sa)) { + if (TargetSelection.matchesValid(o, splitTargetRestrictions.split(","), sa)) { result = true; 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; } diff --git a/src/main/java/forge/card/staticAbility/StaticAbility.java b/src/main/java/forge/card/staticAbility/StaticAbility.java index 07d0767477f..c6683b43c11 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility.java +++ b/src/main/java/forge/card/staticAbility/StaticAbility.java @@ -216,7 +216,7 @@ public class StaticAbility { } if (mode.equals("Continuous")) { - StaticAbility_Continuous.applyContinuousAbility(this); + StaticAbilityContinuous.applyContinuousAbility(this); } } @@ -249,7 +249,7 @@ public class StaticAbility { } if (mode.equals("PreventDamage")) { - return StaticAbility_PreventDamage.applyPreventDamageAbility(this, source, target, in, b); + return StaticAbilityPreventDamage.applyPreventDamageAbility(this, source, target, in, b); } return in; @@ -279,11 +279,11 @@ public class StaticAbility { } if (mode.equals("CantBeCast")) { - return StaticAbility_CantBeCast.applyCantBeCastAbility(this, card, activator); + return StaticAbilityCantBeCast.applyCantBeCastAbility(this, card, activator); } if (mode.equals("CantBeActivated")) { - return StaticAbility_CantBeCast.applyCantBeActivatedAbility(this, card, activator); + return StaticAbilityCantBeCast.applyCantBeActivatedAbility(this, card, activator); } return false; diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java b/src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java similarity index 94% rename from src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java rename to src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java index 673f604f38f..8732bff31fe 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility_CantBeCast.java +++ b/src/main/java/forge/card/staticAbility/StaticAbilityCantBeCast.java @@ -9,7 +9,7 @@ import forge.Player; /** * The Class StaticAbility_CantBeCast. */ -public class StaticAbility_CantBeCast { +public class StaticAbilityCantBeCast { /** * TODO Write javadoc for this method. diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java b/src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java similarity index 98% rename from src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java rename to src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java index 1d2d1e6352d..40a768467db 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility_Continuous.java +++ b/src/main/java/forge/card/staticAbility/StaticAbilityContinuous.java @@ -21,7 +21,7 @@ import forge.card.trigger.TriggerHandler; /** * 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 StaticEffect se = new StaticEffect(); - final CardList affectedCards = StaticAbility_Continuous.getAffectedCards(stAb); - final ArrayList affectedPlayers = StaticAbility_Continuous.getAffectedPlayers(stAb); + final CardList affectedCards = StaticAbilityContinuous.getAffectedCards(stAb); + final ArrayList affectedPlayers = StaticAbilityContinuous.getAffectedPlayers(stAb); se.setAffectedCards(affectedCards); se.setAffectedPlayers(affectedPlayers); diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java b/src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java similarity index 94% rename from src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java rename to src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java index 66efac2dfcc..4ee96f7901c 100644 --- a/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java +++ b/src/main/java/forge/card/staticAbility/StaticAbilityPreventDamage.java @@ -9,7 +9,7 @@ import forge.card.cardFactory.CardFactoryUtil; /** * The Class StaticAbility_PreventDamage. */ -public class StaticAbility_PreventDamage { +public class StaticAbilityPreventDamage { /** * TODO Write javadoc for this method. diff --git a/src/main/java/forge/card/trigger/Trigger_Always.java b/src/main/java/forge/card/trigger/TriggerAlways.java similarity index 80% rename from src/main/java/forge/card/trigger/Trigger_Always.java rename to src/main/java/forge/card/trigger/TriggerAlways.java index 61ccf8cf341..3f6b87bc5a7 100644 --- a/src/main/java/forge/card/trigger/Trigger_Always.java +++ b/src/main/java/forge/card/trigger/TriggerAlways.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Always extends Trigger { +public class TriggerAlways extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_Always extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Always(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerAlways(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -41,7 +41,7 @@ public class Trigger_Always extends Trigger { /** {@inheritDoc} */ @Override 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) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java b/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java similarity index 86% rename from src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java rename to src/main/java/forge/card/trigger/TriggerAttackerBlocked.java index 418281d1967..5003b7ee2ff 100644 --- a/src/main/java/forge/card/trigger/Trigger_AttackerBlocked.java +++ b/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_AttackerBlocked extends Trigger { +public class TriggerAttackerBlocked extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_AttackerBlocked extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_AttackerBlocked(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerAttackerBlocked(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -54,7 +54,7 @@ public class Trigger_AttackerBlocked extends Trigger { /** {@inheritDoc} */ @Override 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) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java b/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java similarity index 83% rename from src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java rename to src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java index 2dca35710aa..9b76d01ce0d 100644 --- a/src/main/java/forge/card/trigger/Trigger_AttackerUnblocked.java +++ b/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_AttackerUnblocked extends Trigger { +public class TriggerAttackerUnblocked extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_AttackerUnblocked extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_AttackerUnblocked(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerAttackerUnblocked(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -48,7 +48,7 @@ public class Trigger_AttackerUnblocked extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_AttackerUnblocked(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerAttackerUnblocked(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_AttackersDeclared.java b/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java similarity index 82% rename from src/main/java/forge/card/trigger/Trigger_AttackersDeclared.java rename to src/main/java/forge/card/trigger/TriggerAttackersDeclared.java index 1333e37a4c9..ef70771862e 100644 --- a/src/main/java/forge/card/trigger/Trigger_AttackersDeclared.java +++ b/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java @@ -11,7 +11,7 @@ import forge.card.spellability.SpellAbility; * TODO Write javadoc for this type. * */ -public class Trigger_AttackersDeclared extends Trigger { +public class TriggerAttackersDeclared extends Trigger { /** * Instantiates a new trigger_ attackers declared. @@ -23,7 +23,7 @@ public class Trigger_AttackersDeclared extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_AttackersDeclared(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerAttackersDeclared(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -48,7 +48,7 @@ public class Trigger_AttackersDeclared extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_AttackersDeclared(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerAttackersDeclared(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); diff --git a/src/main/java/forge/card/trigger/Trigger_Attacks.java b/src/main/java/forge/card/trigger/TriggerAttacks.java similarity index 90% rename from src/main/java/forge/card/trigger/Trigger_Attacks.java rename to src/main/java/forge/card/trigger/TriggerAttacks.java index 98893ad664f..3d1ae93d4ce 100644 --- a/src/main/java/forge/card/trigger/Trigger_Attacks.java +++ b/src/main/java/forge/card/trigger/TriggerAttacks.java @@ -17,7 +17,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Attacks extends Trigger { +public class TriggerAttacks extends Trigger { /** *

@@ -31,7 +31,7 @@ public class Trigger_Attacks extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Attacks(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerAttacks(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -75,7 +75,7 @@ public class Trigger_Attacks extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Attacks(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerAttacks(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_BecomesTarget.java b/src/main/java/forge/card/trigger/TriggerBecomesTarget.java similarity index 89% rename from src/main/java/forge/card/trigger/Trigger_BecomesTarget.java rename to src/main/java/forge/card/trigger/TriggerBecomesTarget.java index 942876f09ff..c52722bd81b 100644 --- a/src/main/java/forge/card/trigger/Trigger_BecomesTarget.java +++ b/src/main/java/forge/card/trigger/TriggerBecomesTarget.java @@ -15,7 +15,7 @@ import forge.card.spellability.SpellAbility; * @version $Id$ * @since 1.0.15 */ -public class Trigger_BecomesTarget extends Trigger { +public class TriggerBecomesTarget extends Trigger { /** *

@@ -29,7 +29,7 @@ public class Trigger_BecomesTarget extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_BecomesTarget(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerBecomesTarget(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -67,7 +67,7 @@ public class Trigger_BecomesTarget extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_BecomesTarget(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerBecomesTarget(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Blocks.java b/src/main/java/forge/card/trigger/TriggerBlocks.java similarity index 87% rename from src/main/java/forge/card/trigger/Trigger_Blocks.java rename to src/main/java/forge/card/trigger/TriggerBlocks.java index 68ef65425bc..f31ff124a5c 100644 --- a/src/main/java/forge/card/trigger/Trigger_Blocks.java +++ b/src/main/java/forge/card/trigger/TriggerBlocks.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Blocks extends Trigger { +public class TriggerBlocks extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_Blocks extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Blocks(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerBlocks(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -54,7 +54,7 @@ public class Trigger_Blocks extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Blocks(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerBlocks(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Championed.java b/src/main/java/forge/card/trigger/TriggerChampioned.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_Championed.java rename to src/main/java/forge/card/trigger/TriggerChampioned.java index 70bb6e72c16..776d6acb8e2 100644 --- a/src/main/java/forge/card/trigger/Trigger_Championed.java +++ b/src/main/java/forge/card/trigger/TriggerChampioned.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @version $Id$ * @since 1.0.15 */ -public class Trigger_Championed extends Trigger { +public class TriggerChampioned extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_Championed extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Championed(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerChampioned(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -50,7 +50,7 @@ public class Trigger_Championed extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Championed(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerChampioned(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_ChangesZone.java b/src/main/java/forge/card/trigger/TriggerChangesZone.java similarity index 88% rename from src/main/java/forge/card/trigger/Trigger_ChangesZone.java rename to src/main/java/forge/card/trigger/TriggerChangesZone.java index 724ca9b53a5..222705a0bea 100644 --- a/src/main/java/forge/card/trigger/Trigger_ChangesZone.java +++ b/src/main/java/forge/card/trigger/TriggerChangesZone.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_ChangesZone extends Trigger { +public class TriggerChangesZone extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_ChangesZone extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_ChangesZone(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerChangesZone(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -67,7 +67,7 @@ public class Trigger_ChangesZone extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_ChangesZone(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerChangesZone(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Clashed.java b/src/main/java/forge/card/trigger/TriggerClashed.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_Clashed.java rename to src/main/java/forge/card/trigger/TriggerClashed.java index 7eec7cfdade..89347aff12a 100644 --- a/src/main/java/forge/card/trigger/Trigger_Clashed.java +++ b/src/main/java/forge/card/trigger/TriggerClashed.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Clashed extends Trigger { +public class TriggerClashed extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Clashed extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Clashed(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerClashed(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -53,7 +53,7 @@ public class Trigger_Clashed extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Clashed(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerClashed(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_CounterAdded.java b/src/main/java/forge/card/trigger/TriggerCounterAdded.java similarity index 86% rename from src/main/java/forge/card/trigger/Trigger_CounterAdded.java rename to src/main/java/forge/card/trigger/TriggerCounterAdded.java index fb6290d8536..52db8bb222d 100644 --- a/src/main/java/forge/card/trigger/Trigger_CounterAdded.java +++ b/src/main/java/forge/card/trigger/TriggerCounterAdded.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_CounterAdded extends Trigger { +public class TriggerCounterAdded extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_CounterAdded extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_CounterAdded(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerCounterAdded(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -58,7 +58,7 @@ public class Trigger_CounterAdded extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_CounterAdded(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerCounterAdded(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Cycled.java b/src/main/java/forge/card/trigger/TriggerCycled.java similarity index 84% rename from src/main/java/forge/card/trigger/Trigger_Cycled.java rename to src/main/java/forge/card/trigger/TriggerCycled.java index 65c5ae2118e..70bb3862080 100644 --- a/src/main/java/forge/card/trigger/Trigger_Cycled.java +++ b/src/main/java/forge/card/trigger/TriggerCycled.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Cycled extends Trigger { +public class TriggerCycled extends Trigger { /** *

@@ -27,14 +27,14 @@ public class Trigger_Cycled extends Trigger { * @param intrinsic * a boolean */ - public Trigger_Cycled(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerCycled(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Cycled(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerCycled(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_DamageDone.java b/src/main/java/forge/card/trigger/TriggerDamageDone.java similarity index 92% rename from src/main/java/forge/card/trigger/Trigger_DamageDone.java rename to src/main/java/forge/card/trigger/TriggerDamageDone.java index b58049cc9b7..1bc24bdc4bd 100644 --- a/src/main/java/forge/card/trigger/Trigger_DamageDone.java +++ b/src/main/java/forge/card/trigger/TriggerDamageDone.java @@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_DamageDone extends Trigger { +public class TriggerDamageDone extends Trigger { /** *

@@ -28,7 +28,7 @@ public class Trigger_DamageDone extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_DamageDone(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerDamageDone(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -86,7 +86,7 @@ public class Trigger_DamageDone extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_DamageDone(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerDamageDone(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Discarded.java b/src/main/java/forge/card/trigger/TriggerDiscarded.java similarity index 88% rename from src/main/java/forge/card/trigger/Trigger_Discarded.java rename to src/main/java/forge/card/trigger/TriggerDiscarded.java index 3e69cca1d34..ed32caaae58 100644 --- a/src/main/java/forge/card/trigger/Trigger_Discarded.java +++ b/src/main/java/forge/card/trigger/TriggerDiscarded.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Discarded extends Trigger { +public class TriggerDiscarded extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Discarded extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Discarded(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerDiscarded(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -63,7 +63,7 @@ public class Trigger_Discarded extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Discarded(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerDiscarded(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Drawn.java b/src/main/java/forge/card/trigger/TriggerDrawn.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_Drawn.java rename to src/main/java/forge/card/trigger/TriggerDrawn.java index 3572921281d..b674956eaef 100644 --- a/src/main/java/forge/card/trigger/Trigger_Drawn.java +++ b/src/main/java/forge/card/trigger/TriggerDrawn.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Drawn extends Trigger { +public class TriggerDrawn extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Drawn extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Drawn(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerDrawn(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -48,7 +48,7 @@ public class Trigger_Drawn extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Drawn(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerDrawn(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 03d60d75b4c..4782a73a672 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -19,10 +19,10 @@ import forge.card.abilityFactory.AbilityFactory; import forge.card.abilityFactory.AbilityFactoryCharm; import forge.card.cost.Cost; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Mana; -import forge.card.spellability.Ability_Sub; +import forge.card.spellability.AbilityMana; +import forge.card.spellability.AbilitySub; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_Restriction; +import forge.card.spellability.SpellAbilityRestriction; import forge.card.spellability.Target; import forge.gui.input.Input; @@ -158,63 +158,63 @@ public class TriggerHandler { final String mode = mapParams.get("Mode"); if (mode.equals("AbilityCast")) { - ret = new Trigger_SpellAbilityCast(mapParams, host, intrinsic); + ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic); } else if (mode.equals("Always")) { - ret = new Trigger_Always(mapParams, host, intrinsic); + ret = new TriggerAlways(mapParams, host, intrinsic); } else if (mode.equals("AttackerBlocked")) { - ret = new Trigger_AttackerBlocked(mapParams, host, intrinsic); + ret = new TriggerAttackerBlocked(mapParams, host, intrinsic); } else if (mode.equals("AttackersDeclared")) { - ret = new Trigger_AttackersDeclared(mapParams, host, intrinsic); + ret = new TriggerAttackersDeclared(mapParams, host, intrinsic); } else if (mode.equals("AttackerUnblocked")) { - ret = new Trigger_AttackerUnblocked(mapParams, host, intrinsic); + ret = new TriggerAttackerUnblocked(mapParams, host, intrinsic); } else if (mode.equals("Attacks")) { - ret = new Trigger_Attacks(mapParams, host, intrinsic); + ret = new TriggerAttacks(mapParams, host, intrinsic); } else if (mode.equals("BecomesTarget")) { - ret = new Trigger_BecomesTarget(mapParams, host, intrinsic); + ret = new TriggerBecomesTarget(mapParams, host, intrinsic); } else if (mode.equals("Blocks")) { - ret = new Trigger_Blocks(mapParams, host, intrinsic); + ret = new TriggerBlocks(mapParams, host, intrinsic); } else if (mode.equals("Championed")) { - ret = new Trigger_Championed(mapParams, host, intrinsic); + ret = new TriggerChampioned(mapParams, host, intrinsic); } else if (mode.equals("ChangesZone")) { - ret = new Trigger_ChangesZone(mapParams, host, intrinsic); + ret = new TriggerChangesZone(mapParams, host, intrinsic); } else if (mode.equals("Clashed")) { - ret = new Trigger_Clashed(mapParams, host, intrinsic); + ret = new TriggerClashed(mapParams, host, intrinsic); } else if (mode.equals("CounterAdded")) { - ret = new Trigger_CounterAdded(mapParams, host, intrinsic); + ret = new TriggerCounterAdded(mapParams, host, intrinsic); } else if (mode.equals("Cycled")) { - ret = new Trigger_Cycled(mapParams, host, intrinsic); + ret = new TriggerCycled(mapParams, host, intrinsic); } else if (mode.equals("DamageDone")) { - ret = new Trigger_DamageDone(mapParams, host, intrinsic); + ret = new TriggerDamageDone(mapParams, host, intrinsic); } else if (mode.equals("Discarded")) { - ret = new Trigger_Discarded(mapParams, host, intrinsic); + ret = new TriggerDiscarded(mapParams, host, intrinsic); } else if (mode.equals("Drawn")) { - ret = new Trigger_Drawn(mapParams, host, intrinsic); + ret = new TriggerDrawn(mapParams, host, intrinsic); } else if (mode.equals("LandPlayed")) { - ret = new Trigger_LandPlayed(mapParams, host, intrinsic); + ret = new TriggerLandPlayed(mapParams, host, intrinsic); } else if (mode.equals("LifeGained")) { - ret = new Trigger_LifeGained(mapParams, host, intrinsic); + ret = new TriggerLifeGained(mapParams, host, intrinsic); } else if (mode.equals("LifeLost")) { - ret = new Trigger_LifeLost(mapParams, host, intrinsic); + ret = new TriggerLifeLost(mapParams, host, intrinsic); } else if (mode.equals("Phase")) { - ret = new Trigger_Phase(mapParams, host, intrinsic); + ret = new TriggerPhase(mapParams, host, intrinsic); } else if (mode.equals("Sacrificed")) { - ret = new Trigger_Sacrificed(mapParams, host, intrinsic); + ret = new TriggerSacrificed(mapParams, host, intrinsic); } else if (mode.equals("Shuffled")) { - ret = new Trigger_Shuffled(mapParams, host, intrinsic); + ret = new TriggerShuffled(mapParams, host, intrinsic); } else if (mode.equals("SpellAbilityCast")) { - ret = new Trigger_SpellAbilityCast(mapParams, host, intrinsic); + ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic); } else if (mode.equals("SpellCast")) { - ret = new Trigger_SpellAbilityCast(mapParams, host, intrinsic); + ret = new TriggerSpellAbilityCast(mapParams, host, intrinsic); } else if (mode.equals("Taps")) { - ret = new Trigger_Taps(mapParams, host, intrinsic); + ret = new TriggerTaps(mapParams, host, intrinsic); } else if (mode.equals("TapsForMana")) { - ret = new Trigger_TapsForMana(mapParams, host, intrinsic); + ret = new TriggerTapsForMana(mapParams, host, intrinsic); } else if (mode.equals("TurnFaceUp")) { - ret = new Trigger_TurnFaceUp(mapParams, host, intrinsic); + ret = new TriggerTurnFaceUp(mapParams, host, intrinsic); } else if (mode.equals("Unequip")) { - ret = new Trigger_Unequip(mapParams, host, intrinsic); + ret = new TriggerUnequip(mapParams, host, intrinsic); } else if (mode.equals("Untaps")) { - ret = new Trigger_Untaps(mapParams, host, intrinsic); + ret = new TriggerUntaps(mapParams, host, intrinsic); } return ret; @@ -356,7 +356,7 @@ public class TriggerHandler { if (regtrig.getHostCard().isFaceDown() && regtrig.getIsIntrinsic()) { return false; // Morphed cards only have pumped triggers go off. } - if (regtrig instanceof Trigger_Always) { + if (regtrig instanceof TriggerAlways) { if (AllZone.getStack().hasStateTrigger(regtrig.getId())) { return false; // State triggers that are already on the stack // don't trigger again. @@ -398,8 +398,8 @@ public class TriggerHandler { regtrig.setRunParams(runParams); // All tests passed, execute ability. - if (regtrig instanceof Trigger_TapsForMana) { - final Ability_Mana abMana = (Ability_Mana) runParams.get("Ability_Mana"); + if (regtrig instanceof TriggerTapsForMana) { + final AbilityMana abMana = (AbilityMana) runParams.get("Ability_Mana"); if (null != abMana) { abMana.setUndoable(false); } @@ -613,7 +613,7 @@ public class TriggerHandler { } @Override - public SpellAbility_Restriction getRestrictions() { + public SpellAbilityRestriction getRestrictions() { return sa[0].getRestrictions(); } @@ -643,7 +643,7 @@ public class TriggerHandler { } @Override - public Ability_Sub getSubAbility() { + public AbilitySub getSubAbility() { return sa[0].getSubAbility(); } @@ -849,7 +849,7 @@ public class TriggerHandler { } @Override - public void setRestrictions(final SpellAbility_Restriction restrict) { + public void setRestrictions(final SpellAbilityRestriction restrict) { sa[0].setRestrictions(restrict); } @@ -864,7 +864,7 @@ public class TriggerHandler { } @Override - public void setSubAbility(final Ability_Sub subAbility) { + public void setSubAbility(final AbilitySub subAbility) { sa[0].setSubAbility(subAbility); } @@ -928,7 +928,7 @@ public class TriggerHandler { // ////////////////////////////////////// @Override public void resolve() { - if (!(regtrig instanceof Trigger_Always)) { + if (!(regtrig instanceof TriggerAlways)) { // State triggers // don't do the whole // "Intervening If" diff --git a/src/main/java/forge/card/trigger/Trigger_LandPlayed.java b/src/main/java/forge/card/trigger/TriggerLandPlayed.java similarity index 83% rename from src/main/java/forge/card/trigger/Trigger_LandPlayed.java rename to src/main/java/forge/card/trigger/TriggerLandPlayed.java index ba46d216ba7..c41ff753c33 100644 --- a/src/main/java/forge/card/trigger/Trigger_LandPlayed.java +++ b/src/main/java/forge/card/trigger/TriggerLandPlayed.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_LandPlayed extends Trigger { +public class TriggerLandPlayed extends Trigger { /** *

@@ -29,7 +29,7 @@ public class Trigger_LandPlayed extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_LandPlayed(final String n, final HashMap params, final Card host, + public TriggerLandPlayed(final String n, final HashMap params, final Card host, final boolean intrinsic) { super(n, params, host, intrinsic); } @@ -46,14 +46,14 @@ public class Trigger_LandPlayed extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_LandPlayed(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerLandPlayed(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_LandPlayed(this.getName(), this.getMapParams(), this.getHostCard(), + final Trigger copy = new TriggerLandPlayed(this.getName(), this.getMapParams(), this.getHostCard(), this.isIntrinsic()); copy.setID(this.getId()); diff --git a/src/main/java/forge/card/trigger/Trigger_LifeGained.java b/src/main/java/forge/card/trigger/TriggerLifeGained.java similarity index 84% rename from src/main/java/forge/card/trigger/Trigger_LifeGained.java rename to src/main/java/forge/card/trigger/TriggerLifeGained.java index 4c0e2aa29ee..9e0313fdf0e 100644 --- a/src/main/java/forge/card/trigger/Trigger_LifeGained.java +++ b/src/main/java/forge/card/trigger/TriggerLifeGained.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_LifeGained extends Trigger { +public class TriggerLifeGained extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_LifeGained extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_LifeGained(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerLifeGained(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -47,7 +47,7 @@ public class Trigger_LifeGained extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_LifeGained(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerLifeGained(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_LifeLost.java b/src/main/java/forge/card/trigger/TriggerLifeLost.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_LifeLost.java rename to src/main/java/forge/card/trigger/TriggerLifeLost.java index 009377a5133..107c9b466d6 100644 --- a/src/main/java/forge/card/trigger/Trigger_LifeLost.java +++ b/src/main/java/forge/card/trigger/TriggerLifeLost.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_LifeLost extends Trigger { +public class TriggerLifeLost extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_LifeLost extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_LifeLost(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerLifeLost(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -47,7 +47,7 @@ public class Trigger_LifeLost extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_LifeLost(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerLifeLost(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Phase.java b/src/main/java/forge/card/trigger/TriggerPhase.java similarity index 89% rename from src/main/java/forge/card/trigger/Trigger_Phase.java rename to src/main/java/forge/card/trigger/TriggerPhase.java index 9d67b941341..beca89f11bb 100644 --- a/src/main/java/forge/card/trigger/Trigger_Phase.java +++ b/src/main/java/forge/card/trigger/TriggerPhase.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Phase extends Trigger { +public class TriggerPhase extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Phase extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Phase(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerPhase(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -65,7 +65,7 @@ public class Trigger_Phase extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Phase(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerPhase(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Sacrificed.java b/src/main/java/forge/card/trigger/TriggerSacrificed.java similarity index 86% rename from src/main/java/forge/card/trigger/Trigger_Sacrificed.java rename to src/main/java/forge/card/trigger/TriggerSacrificed.java index 1a4f48a7418..a71a9433b11 100644 --- a/src/main/java/forge/card/trigger/Trigger_Sacrificed.java +++ b/src/main/java/forge/card/trigger/TriggerSacrificed.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Sacrificed extends Trigger { +public class TriggerSacrificed extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Sacrificed extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Sacrificed(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerSacrificed(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -53,7 +53,7 @@ public class Trigger_Sacrificed extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Sacrificed(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerSacrificed(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Shuffled.java b/src/main/java/forge/card/trigger/TriggerShuffled.java similarity index 84% rename from src/main/java/forge/card/trigger/Trigger_Shuffled.java rename to src/main/java/forge/card/trigger/TriggerShuffled.java index 13fe9e4dcea..62fa71ee31a 100644 --- a/src/main/java/forge/card/trigger/Trigger_Shuffled.java +++ b/src/main/java/forge/card/trigger/TriggerShuffled.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Shuffled extends Trigger { +public class TriggerShuffled extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Shuffled extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Shuffled(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerShuffled(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -47,7 +47,7 @@ public class Trigger_Shuffled extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Shuffled(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerShuffled(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_SpellAbilityCast.java b/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java similarity index 92% rename from src/main/java/forge/card/trigger/Trigger_SpellAbilityCast.java rename to src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java index df37776f7c9..5ad9e8a3bbc 100644 --- a/src/main/java/forge/card/trigger/Trigger_SpellAbilityCast.java +++ b/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java @@ -7,7 +7,7 @@ import forge.Card; import forge.Player; import forge.card.cost.Cost; import forge.card.spellability.SpellAbility; -import forge.card.spellability.SpellAbility_StackInstance; +import forge.card.spellability.SpellAbilityStackInstance; /** *

@@ -17,7 +17,7 @@ import forge.card.spellability.SpellAbility_StackInstance; * @author Forge * @version $Id$ */ -public class Trigger_SpellAbilityCast extends Trigger { +public class TriggerSpellAbilityCast extends Trigger { /** *

@@ -31,7 +31,7 @@ public class Trigger_SpellAbilityCast extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_SpellAbilityCast(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerSpellAbilityCast(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -40,7 +40,7 @@ public class Trigger_SpellAbilityCast extends Trigger { public final boolean performTest(final java.util.Map runParams2) { final SpellAbility spellAbility = (SpellAbility) runParams2.get("CastSA"); final Card cast = spellAbility.getSourceCard(); - final SpellAbility_StackInstance si = AllZone.getStack().getInstanceFromSpellAbility(spellAbility); + final SpellAbilityStackInstance si = AllZone.getStack().getInstanceFromSpellAbility(spellAbility); if (this.getMapParams().get("Mode").equals("SpellCast")) { if (!spellAbility.isSpell()) { @@ -152,7 +152,7 @@ public class Trigger_SpellAbilityCast extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_SpellAbilityCast(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerSpellAbilityCast(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Taps.java b/src/main/java/forge/card/trigger/TriggerTaps.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_Taps.java rename to src/main/java/forge/card/trigger/TriggerTaps.java index cb4646ce6ee..c20952811a2 100644 --- a/src/main/java/forge/card/trigger/Trigger_Taps.java +++ b/src/main/java/forge/card/trigger/TriggerTaps.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Taps extends Trigger { +public class TriggerTaps extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Taps extends Trigger { * @param intrinsic * a boolean */ - public Trigger_Taps(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerTaps(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -49,7 +49,7 @@ public class Trigger_Taps extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Taps(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerTaps(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_TapsForMana.java b/src/main/java/forge/card/trigger/TriggerTapsForMana.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_TapsForMana.java rename to src/main/java/forge/card/trigger/TriggerTapsForMana.java index a65f9473857..213658336a3 100644 --- a/src/main/java/forge/card/trigger/Trigger_TapsForMana.java +++ b/src/main/java/forge/card/trigger/TriggerTapsForMana.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_TapsForMana extends Trigger { +public class TriggerTapsForMana extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_TapsForMana extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_TapsForMana(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerTapsForMana(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -49,7 +49,7 @@ public class Trigger_TapsForMana extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_TapsForMana(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerTapsForMana(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_TurnFaceUp.java b/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java similarity index 84% rename from src/main/java/forge/card/trigger/Trigger_TurnFaceUp.java rename to src/main/java/forge/card/trigger/TriggerTurnFaceUp.java index 3e80f39c77f..3d10fec719a 100644 --- a/src/main/java/forge/card/trigger/Trigger_TurnFaceUp.java +++ b/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_TurnFaceUp extends Trigger { +public class TriggerTurnFaceUp extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_TurnFaceUp extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_TurnFaceUp(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerTurnFaceUp(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -47,7 +47,7 @@ public class Trigger_TurnFaceUp extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_TurnFaceUp(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerTurnFaceUp(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Unequip.java b/src/main/java/forge/card/trigger/TriggerUnequip.java similarity index 88% rename from src/main/java/forge/card/trigger/Trigger_Unequip.java rename to src/main/java/forge/card/trigger/TriggerUnequip.java index 4f4c4520bd2..79ab4c0343c 100644 --- a/src/main/java/forge/card/trigger/Trigger_Unequip.java +++ b/src/main/java/forge/card/trigger/TriggerUnequip.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Unequip extends Trigger { +public class TriggerUnequip extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Unequip extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Unequip(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerUnequip(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -57,7 +57,7 @@ public class Trigger_Unequip extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Unequip(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerUnequip(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/card/trigger/Trigger_Untaps.java b/src/main/java/forge/card/trigger/TriggerUntaps.java similarity index 85% rename from src/main/java/forge/card/trigger/Trigger_Untaps.java rename to src/main/java/forge/card/trigger/TriggerUntaps.java index fdbfe2dd0e9..b2e2122522d 100644 --- a/src/main/java/forge/card/trigger/Trigger_Untaps.java +++ b/src/main/java/forge/card/trigger/TriggerUntaps.java @@ -13,7 +13,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Trigger_Untaps extends Trigger { +public class TriggerUntaps extends Trigger { /** *

@@ -27,7 +27,7 @@ public class Trigger_Untaps extends Trigger { * @param intrinsic * the intrinsic */ - public Trigger_Untaps(final HashMap params, final Card host, final boolean intrinsic) { + public TriggerUntaps(final HashMap params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -49,7 +49,7 @@ public class Trigger_Untaps extends Trigger { /** {@inheritDoc} */ @Override public final Trigger getCopy() { - final Trigger copy = new Trigger_Untaps(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); + final Trigger copy = new TriggerUntaps(this.getMapParams(), this.getHostCard(), this.isIntrinsic()); if (this.getOverridingAbility() != null) { copy.setOverridingAbility(this.getOverridingAbility()); } diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java index bfe581dfea0..8af33da30c7 100644 --- a/src/main/java/forge/game/limited/BoosterDraft.java +++ b/src/main/java/forge/game/limited/BoosterDraft.java @@ -1,18 +1,204 @@ package forge.game.limited; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.TreeMap; + +import javax.swing.JOptionPane; + +import net.slightlymagic.braids.util.lambda.Lambda1; +import net.slightlymagic.maxmtg.Closure1; + +import org.apache.commons.lang3.ArrayUtils; + +import forge.AllZone; +import forge.Card; +import forge.CardList; +import forge.Constant; +import forge.FileUtil; +import forge.HttpUtil; +import forge.SetUtils; +import forge.card.BoosterGenerator; +import forge.card.CardBlock; +import forge.card.CardSet; import forge.deck.Deck; +import forge.deck.DeckManager; +import forge.gui.GuiUtils; +import forge.item.CardDb; import forge.item.CardPrinted; +import forge.item.ItemPool; import forge.item.ItemPoolView; /** - *

- * BoosterDraft interface. - *

* - * @author Forge - * @version $Id$ + * TODO Write javadoc for this type. + * */ -public interface BoosterDraft { +public final class BoosterDraft implements IBoosterDraft { + private final BoosterDraftAI draftAI = new BoosterDraftAI(); + private static final int N_PLAYERS = 8; + + private int nextBoosterGroup = 0; + private int currentBoosterSize = 0; + private int currentBoosterPick = 0; + private List> pack; // size 8 + + /** The draft picks. */ + private final Map draftPicks = new TreeMap(); + private final CardPoolLimitation draftFormat; + + private final ArrayList, BoosterGenerator>> packs = new ArrayList, BoosterGenerator>>(); + + /** + *

+ * Constructor for BoosterDraft_1. + *

+ * + * @param draftType + * a {@link java.lang.String} object. + */ + public BoosterDraft(final CardPoolLimitation draftType) { + this.draftAI.setBd(this); + this.draftFormat = draftType; + + switch (draftType) { + case Full: // Draft from all cards in Forge + final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards()); + final Closure1, BoosterGenerator> picker = BoosterGenerator.getSimplePicker(bpFull); + for (int i = 0; i < 3; i++) { + this.packs.add(picker); + } + + IBoosterDraft.LAND_SET_CODE[0] = CardDb.instance().getCard("Plains").getSet(); + break; + + case Block: // Draft from cards by block or set + final List blocks = SetUtils.getBlocks(); + + final Object o = GuiUtils.getChoice("Choose Block", blocks.toArray()); + final CardBlock block = (CardBlock) o; + + final CardSet[] cardSets = block.getSets(); + final String[] sets = new String[cardSets.length]; + for (int k = cardSets.length - 1; k >= 0; --k) { + sets[k] = cardSets[k].getCode(); + } + + final int nPacks = block.getCntBoostersDraft(); + + final ArrayList setCombos = new ArrayList(); + if (sets.length >= 2) { + setCombos.add(String.format("%s/%s/%s", sets[0], sets[0], sets[0])); + setCombos.add(String.format("%s/%s/%s", sets[1], sets[0], sets[0])); + setCombos.add(String.format("%s/%s/%s", sets[1], sets[1], sets[0])); + setCombos.add(String.format("%s/%s/%s", sets[1], sets[1], sets[1])); + } + if (sets.length >= 3) { + setCombos.add(String.format("%s/%s/%s", sets[2], sets[1], sets[0])); + setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[0])); + setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[1])); + setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[2])); + } + + if (sets.length > 1) { + final Object p = GuiUtils.getChoice("Choose Set Combination", setCombos.toArray()); + final String[] pp = p.toString().split("/"); + for (int i = 0; i < nPacks; i++) { + final BoosterGenerator bpMulti = new BoosterGenerator(SetUtils.getSetByCode(pp[i])); + this.packs.add(BoosterGenerator.getSimplePicker(bpMulti)); + } + + } else { + final BoosterGenerator bpOne = new BoosterGenerator(SetUtils.getSetByCode(sets[0])); + final Closure1, BoosterGenerator> pick1 = BoosterGenerator.getSimplePicker(bpOne); + for (int i = 0; i < nPacks; i++) { + this.packs.add(pick1); + } + } + + IBoosterDraft.LAND_SET_CODE[0] = block.getLandSet().getCode(); + break; + + case Custom: + final List myDrafts = this.loadCustomDrafts("res/draft/", ".draft"); + + if (myDrafts.size() < 1) { + JOptionPane + .showMessageDialog(null, "No custom draft files found.", "", JOptionPane.INFORMATION_MESSAGE); + } else { + final CustomLimited draft = (CustomLimited) GuiUtils.getChoice("Choose Custom Draft", + myDrafts.toArray()); + this.setupCustomDraft(draft); + } + break; + default: + throw new NoSuchElementException("Draft for mode " + draftType + " has not been set up!"); + } + + this.pack = this.get8BoosterPack(); + } + + private void setupCustomDraft(final CustomLimited draft) { + final DeckManager dio = AllZone.getDeckManager(); + final Deck dPool = dio.getDeck(draft.getDeckFile()); + if (dPool == null) { + throw new RuntimeException("BoosterGenerator : deck not found - " + draft.getDeckFile()); + } + + final BoosterGenerator bpCustom = new BoosterGenerator(dPool); + final Lambda1, BoosterGenerator> fnPick = new Lambda1, BoosterGenerator>() { + @Override + public List apply(final BoosterGenerator pack) { + if (draft.getIgnoreRarity()) { + if (!draft.getSingleton()) { + return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.getNumCards(), 0); + } else { + return pack.getSingletonBoosterPack(draft.getNumCards()); + } + } + return pack.getBoosterPack(draft.getNumCommons(), draft.getNumUncommons(), 0, draft.getNumRares(), draft.getNumMythics(), + draft.getNumSpecials(), 0, 0, 0); + } + }; + + final Closure1, BoosterGenerator> picker = new Closure1, BoosterGenerator>( + fnPick, bpCustom); + for (int i = 0; i < draft.getNumPacks(); i++) { + this.packs.add(picker); + } + + IBoosterDraft.LAND_SET_CODE[0] = draft.getLandSetCode(); + } + + /** Looks for res/draft/*.draft files, reads them, returns a list. */ + private List loadCustomDrafts(final String lookupFolder, final String fileExtension) { + String[] dList; + final ArrayList customs = new ArrayList(); + + // get list of custom draft files + final File dFolder = new File(lookupFolder); + if (!dFolder.exists()) { + throw new RuntimeException("BoosterDraft : folder not found -- folder is " + dFolder.getAbsolutePath()); + } + + if (!dFolder.isDirectory()) { + throw new RuntimeException("BoosterDraft : not a folder -- " + dFolder.getAbsolutePath()); + } + + dList = dFolder.list(); + + for (final String element : dList) { + if (element.endsWith(fileExtension)) { + final List dfData = FileUtil.readFile(lookupFolder + element); + customs.add(CustomLimited.parse(dfData)); + } + } + return customs; + } + /** *

* nextChoice. @@ -20,26 +206,40 @@ public interface BoosterDraft { * * @return a {@link forge.CardList} object. */ - ItemPoolView nextChoice(); + @Override + public ItemPoolView nextChoice() { + if (this.pack.get(this.getCurrentBoosterIndex()).size() == 0) { + this.pack = this.get8BoosterPack(); + } + + this.computerChoose(); + return ItemPool.createFrom(this.pack.get(this.getCurrentBoosterIndex()), CardPrinted.class); + } /** *

- * setChoice. + * get8BoosterPack. *

* - * @param c - * a {@link forge.Card} object. + * @return an array of {@link forge.CardList} objects. */ - void setChoice(CardPrinted c); + public List> get8BoosterPack() { + if (this.nextBoosterGroup >= this.packs.size()) { + return null; + } - /** - *

- * hasNextChoice. - *

- * - * @return a boolean. - */ - boolean hasNextChoice(); + final List> list = new ArrayList>(); + for (int i = 0; i < 8; i++) { + list.add(this.packs.get(this.nextBoosterGroup).apply()); + } + + this.nextBoosterGroup++; + this.currentBoosterSize = list.get(0).size(); + this.currentBoosterPick = 0; + return list; + } + + // size 7, all the computers decks /** *

@@ -48,14 +248,115 @@ public interface BoosterDraft { * * @return an array of {@link forge.deck.Deck} objects. */ - Deck[] getDecks(); // size 7, all the computers decks + @Override + public Deck[] getDecks() { + return this.draftAI.getDecks(); + } - /** Constant LandSetCode="{}". */ - String[] LAND_SET_CODE = { "" }; + private void computerChoose() { + + final int iHumansBooster = this.getCurrentBoosterIndex(); + int iPlayer = 0; + for (int i = 0; i < this.pack.size(); i++) { + if (iHumansBooster == i) { + continue; + } // don't touch player's booster + + final CardList forAi = new CardList(); + final List booster = this.pack.get(i); + for (final CardPrinted cr : booster) { + forAi.add(cr.toForgeCard()); + } + // TODO: Please write this drafting code to work without heavy card + // objects + final Card aiPick = this.draftAI.choose(forAi, iPlayer++); + final String pickedName = aiPick.getName(); + + for (int pick = booster.size() - 1; pick >= 0; pick--) { + final CardPrinted cp = booster.get(pick); + if (cp.getName().equalsIgnoreCase(pickedName)) { + booster.remove(pick); + break; + } + } + } + } // computerChoose() + + private int getCurrentBoosterIndex() { + return this.currentBoosterPick % BoosterDraft.N_PLAYERS; + } /** - * Called when drafting is over - to upload picks. + *

+ * hasNextChoice. + *

+ * + * @return a boolean. */ - void finishedDrafting(); + @Override + public boolean hasNextChoice() { + final boolean isLastGroup = this.nextBoosterGroup >= this.packs.size(); + final boolean isBoosterDepleted = this.currentBoosterPick >= this.currentBoosterSize; + final boolean noMoreCards = isLastGroup && isBoosterDepleted; + return !noMoreCards; + } + /** {@inheritDoc} */ + @Override + public void setChoice(final CardPrinted c) { + final List thisBooster = this.pack.get(this.getCurrentBoosterIndex()); + + if (!thisBooster.contains(c)) { + throw new RuntimeException("BoosterDraft : setChoice() error - card not found - " + c + + " - booster pack = " + thisBooster); + } + + if (Constant.Runtime.UPLOAD_DRAFT[0]) { + for (int i = 0; i < thisBooster.size(); i++) { + final CardPrinted cc = thisBooster.get(i); + final String cnBk = cc.getName() + "|" + cc.getSet(); + + float pickValue = 0; + if (cc.equals(c)) { + pickValue = thisBooster.size() + * (1f - (((float) this.currentBoosterPick / this.currentBoosterSize) * 2f)); + } else { + pickValue = 0; + } + + if (!this.draftPicks.containsKey(cnBk)) { + this.draftPicks.put(cnBk, pickValue); + } else { + final float curValue = this.draftPicks.get(cnBk); + final float newValue = (curValue + pickValue) / 2; + this.draftPicks.put(cnBk, newValue); + } + } + } + + thisBooster.remove(c); + this.currentBoosterPick++; + } // setChoice() + + /** This will upload drafting picks to cardforge HQ. */ + @Override + public void finishedDrafting() { + if (Constant.Runtime.UPLOAD_DRAFT[0]) { + if (this.draftPicks.size() > 1) { + final ArrayList outDraftData = new ArrayList(); + + final String[] keys = this.draftPicks.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY); + + for (final String key : keys) { + outDraftData.add(key + "|" + this.draftPicks.get(key)); + } + + FileUtil.writeFile("res/draft/tmpDraftData.txt", outDraftData); + + final HttpUtil poster = new HttpUtil(); + poster.upload("http://cardforge.org/draftAI/submitDraftData.php?fmt=" + this.draftFormat, + "res/draft/tmpDraftData.txt"); + } + } + } } diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java index 078e2078ad7..a55a5bd8e88 100644 --- a/src/main/java/forge/game/limited/BoosterDraftAI.java +++ b/src/main/java/forge/game/limited/BoosterDraftAI.java @@ -15,7 +15,7 @@ import forge.CardListFilter; import forge.CardListUtil; import forge.Constant; import forge.MyRandom; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.deck.Deck; import forge.game.GameType; @@ -30,7 +30,7 @@ import forge.game.GameType; public class BoosterDraftAI { /** The bd. */ - private BoosterDraft bd = null; + private IBoosterDraft bd = null; // once a deck has this number of creatures the computer randomly // picks a card, so the final computer deck has 12-20 creatures // minimum of creatures per deck @@ -211,7 +211,7 @@ public class BoosterDraftAI { typeList = aiPlayables.getType("Land"); if (typeList.size() > 0) { for (int i = 0; i < typeList.size(); i++) { - final ArrayList maList = typeList.get(i).getManaAbility(); + final ArrayList maList = typeList.get(i).getManaAbility(); for (int j = 0; j < maList.size(); j++) { if (maList.get(j).canProduce(this.playerColors.get(player).getMana1()) || maList.get(j).canProduce(this.playerColors.get(player).getMana2())) { @@ -510,7 +510,7 @@ public class BoosterDraftAI { for (int j = 0; j <= nLand; j++) { final Card c = AllZone.getCardFactory().getCard(clrCnts[i].getColor(), AllZone.getComputerPlayer()); - c.setCurSetCode(BoosterDraft.LAND_SET_CODE[0]); + c.setCurSetCode(IBoosterDraft.LAND_SET_CODE[0]); outList.add(c); landsNeeded--; } @@ -520,7 +520,7 @@ public class BoosterDraftAI { while (landsNeeded > 0) { if (clrCnts[n].getCount() > 0) { final Card c = AllZone.getCardFactory().getCard(clrCnts[n].getColor(), AllZone.getComputerPlayer()); - c.setCurSetCode(BoosterDraft.LAND_SET_CODE[0]); + c.setCurSetCode(IBoosterDraft.LAND_SET_CODE[0]); outList.add(c); landsNeeded--; @@ -652,7 +652,7 @@ public class BoosterDraftAI { /** * @return the bd */ - public BoosterDraft getBd() { + public IBoosterDraft getBd() { return this.bd; } @@ -660,7 +660,7 @@ public class BoosterDraftAI { * @param bd * the bd to set */ - public void setBd(final BoosterDraft bd) { + public void setBd(final IBoosterDraft bd) { this.bd = bd; // TODO: Add 0 to parameter's name. } diff --git a/src/main/java/forge/game/limited/BoosterDraft_1.java b/src/main/java/forge/game/limited/BoosterDraft_1.java deleted file mode 100644 index 56535cac4b9..00000000000 --- a/src/main/java/forge/game/limited/BoosterDraft_1.java +++ /dev/null @@ -1,362 +0,0 @@ -package forge.game.limited; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.TreeMap; - -import javax.swing.JOptionPane; - -import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Closure1; - -import org.apache.commons.lang3.ArrayUtils; - -import forge.AllZone; -import forge.Card; -import forge.CardList; -import forge.Constant; -import forge.FileUtil; -import forge.HttpUtil; -import forge.SetUtils; -import forge.card.BoosterGenerator; -import forge.card.CardBlock; -import forge.card.CardSet; -import forge.deck.Deck; -import forge.deck.DeckManager; -import forge.gui.GuiUtils; -import forge.item.CardDb; -import forge.item.CardPrinted; -import forge.item.ItemPool; -import forge.item.ItemPoolView; - -/** - * - * TODO Write javadoc for this type. - * - */ -public final class BoosterDraft_1 implements BoosterDraft { - private final BoosterDraftAI draftAI = new BoosterDraftAI(); - private static final int N_PLAYERS = 8; - - private int nextBoosterGroup = 0; - private int currentBoosterSize = 0; - private int currentBoosterPick = 0; - private List> pack; // size 8 - - /** The draft picks. */ - private final Map draftPicks = new TreeMap(); - private final CardPoolLimitation draftFormat; - - private final ArrayList, BoosterGenerator>> packs = new ArrayList, BoosterGenerator>>(); - - /** - *

- * Constructor for BoosterDraft_1. - *

- * - * @param draftType - * a {@link java.lang.String} object. - */ - public BoosterDraft_1(final CardPoolLimitation draftType) { - this.draftAI.setBd(this); - this.draftFormat = draftType; - - switch (draftType) { - case Full: // Draft from all cards in Forge - final BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards()); - final Closure1, BoosterGenerator> picker = BoosterGenerator.getSimplePicker(bpFull); - for (int i = 0; i < 3; i++) { - this.packs.add(picker); - } - - BoosterDraft.LAND_SET_CODE[0] = CardDb.instance().getCard("Plains").getSet(); - break; - - case Block: // Draft from cards by block or set - final List blocks = SetUtils.getBlocks(); - - final Object o = GuiUtils.getChoice("Choose Block", blocks.toArray()); - final CardBlock block = (CardBlock) o; - - final CardSet[] cardSets = block.getSets(); - final String[] sets = new String[cardSets.length]; - for (int k = cardSets.length - 1; k >= 0; --k) { - sets[k] = cardSets[k].getCode(); - } - - final int nPacks = block.getCntBoostersDraft(); - - final ArrayList setCombos = new ArrayList(); - if (sets.length >= 2) { - setCombos.add(String.format("%s/%s/%s", sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s/%s/%s", sets[1], sets[0], sets[0])); - setCombos.add(String.format("%s/%s/%s", sets[1], sets[1], sets[0])); - setCombos.add(String.format("%s/%s/%s", sets[1], sets[1], sets[1])); - } - if (sets.length >= 3) { - setCombos.add(String.format("%s/%s/%s", sets[2], sets[1], sets[0])); - setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[0])); - setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[1])); - setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[2])); - } - - if (sets.length > 1) { - final Object p = GuiUtils.getChoice("Choose Set Combination", setCombos.toArray()); - final String[] pp = p.toString().split("/"); - for (int i = 0; i < nPacks; i++) { - final BoosterGenerator bpMulti = new BoosterGenerator(SetUtils.getSetByCode(pp[i])); - this.packs.add(BoosterGenerator.getSimplePicker(bpMulti)); - } - - } else { - final BoosterGenerator bpOne = new BoosterGenerator(SetUtils.getSetByCode(sets[0])); - final Closure1, BoosterGenerator> pick1 = BoosterGenerator.getSimplePicker(bpOne); - for (int i = 0; i < nPacks; i++) { - this.packs.add(pick1); - } - } - - BoosterDraft.LAND_SET_CODE[0] = block.getLandSet().getCode(); - break; - - case Custom: - final List myDrafts = this.loadCustomDrafts("res/draft/", ".draft"); - - if (myDrafts.size() < 1) { - JOptionPane - .showMessageDialog(null, "No custom draft files found.", "", JOptionPane.INFORMATION_MESSAGE); - } else { - final CustomLimited draft = (CustomLimited) GuiUtils.getChoice("Choose Custom Draft", - myDrafts.toArray()); - this.setupCustomDraft(draft); - } - break; - default: - throw new NoSuchElementException("Draft for mode " + draftType + " has not been set up!"); - } - - this.pack = this.get8BoosterPack(); - } - - private void setupCustomDraft(final CustomLimited draft) { - final DeckManager dio = AllZone.getDeckManager(); - final Deck dPool = dio.getDeck(draft.getDeckFile()); - if (dPool == null) { - throw new RuntimeException("BoosterGenerator : deck not found - " + draft.getDeckFile()); - } - - final BoosterGenerator bpCustom = new BoosterGenerator(dPool); - final Lambda1, BoosterGenerator> fnPick = new Lambda1, BoosterGenerator>() { - @Override - public List apply(final BoosterGenerator pack) { - if (draft.getIgnoreRarity()) { - if (!draft.getSingleton()) { - return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.getNumCards(), 0); - } else { - return pack.getSingletonBoosterPack(draft.getNumCards()); - } - } - return pack.getBoosterPack(draft.getNumCommons(), draft.getNumUncommons(), 0, draft.getNumRares(), draft.getNumMythics(), - draft.getNumSpecials(), 0, 0, 0); - } - }; - - final Closure1, BoosterGenerator> picker = new Closure1, BoosterGenerator>( - fnPick, bpCustom); - for (int i = 0; i < draft.getNumPacks(); i++) { - this.packs.add(picker); - } - - BoosterDraft.LAND_SET_CODE[0] = draft.getLandSetCode(); - } - - /** Looks for res/draft/*.draft files, reads them, returns a list. */ - private List loadCustomDrafts(final String lookupFolder, final String fileExtension) { - String[] dList; - final ArrayList customs = new ArrayList(); - - // get list of custom draft files - final File dFolder = new File(lookupFolder); - if (!dFolder.exists()) { - throw new RuntimeException("BoosterDraft : folder not found -- folder is " + dFolder.getAbsolutePath()); - } - - if (!dFolder.isDirectory()) { - throw new RuntimeException("BoosterDraft : not a folder -- " + dFolder.getAbsolutePath()); - } - - dList = dFolder.list(); - - for (final String element : dList) { - if (element.endsWith(fileExtension)) { - final List dfData = FileUtil.readFile(lookupFolder + element); - customs.add(CustomLimited.parse(dfData)); - } - } - return customs; - } - - /** - *

- * nextChoice. - *

- * - * @return a {@link forge.CardList} object. - */ - @Override - public ItemPoolView nextChoice() { - if (this.pack.get(this.getCurrentBoosterIndex()).size() == 0) { - this.pack = this.get8BoosterPack(); - } - - this.computerChoose(); - return ItemPool.createFrom(this.pack.get(this.getCurrentBoosterIndex()), CardPrinted.class); - } - - /** - *

- * get8BoosterPack. - *

- * - * @return an array of {@link forge.CardList} objects. - */ - public List> get8BoosterPack() { - if (this.nextBoosterGroup >= this.packs.size()) { - return null; - } - - final List> list = new ArrayList>(); - for (int i = 0; i < 8; i++) { - list.add(this.packs.get(this.nextBoosterGroup).apply()); - } - - this.nextBoosterGroup++; - this.currentBoosterSize = list.get(0).size(); - this.currentBoosterPick = 0; - return list; - } - - // size 7, all the computers decks - - /** - *

- * getDecks. - *

- * - * @return an array of {@link forge.deck.Deck} objects. - */ - @Override - public Deck[] getDecks() { - return this.draftAI.getDecks(); - } - - private void computerChoose() { - - final int iHumansBooster = this.getCurrentBoosterIndex(); - int iPlayer = 0; - for (int i = 0; i < this.pack.size(); i++) { - if (iHumansBooster == i) { - continue; - } // don't touch player's booster - - final CardList forAi = new CardList(); - final List booster = this.pack.get(i); - for (final CardPrinted cr : booster) { - forAi.add(cr.toForgeCard()); - } - // TODO: Please write this drafting code to work without heavy card - // objects - final Card aiPick = this.draftAI.choose(forAi, iPlayer++); - final String pickedName = aiPick.getName(); - - for (int pick = booster.size() - 1; pick >= 0; pick--) { - final CardPrinted cp = booster.get(pick); - if (cp.getName().equalsIgnoreCase(pickedName)) { - booster.remove(pick); - break; - } - } - } - } // computerChoose() - - private int getCurrentBoosterIndex() { - return this.currentBoosterPick % BoosterDraft_1.N_PLAYERS; - } - - /** - *

- * hasNextChoice. - *

- * - * @return a boolean. - */ - @Override - public boolean hasNextChoice() { - final boolean isLastGroup = this.nextBoosterGroup >= this.packs.size(); - final boolean isBoosterDepleted = this.currentBoosterPick >= this.currentBoosterSize; - final boolean noMoreCards = isLastGroup && isBoosterDepleted; - return !noMoreCards; - } - - /** {@inheritDoc} */ - @Override - public void setChoice(final CardPrinted c) { - final List thisBooster = this.pack.get(this.getCurrentBoosterIndex()); - - if (!thisBooster.contains(c)) { - throw new RuntimeException("BoosterDraft : setChoice() error - card not found - " + c - + " - booster pack = " + thisBooster); - } - - if (Constant.Runtime.UPLOAD_DRAFT[0]) { - for (int i = 0; i < thisBooster.size(); i++) { - final CardPrinted cc = thisBooster.get(i); - final String cnBk = cc.getName() + "|" + cc.getSet(); - - float pickValue = 0; - if (cc.equals(c)) { - pickValue = thisBooster.size() - * (1f - (((float) this.currentBoosterPick / this.currentBoosterSize) * 2f)); - } else { - pickValue = 0; - } - - if (!this.draftPicks.containsKey(cnBk)) { - this.draftPicks.put(cnBk, pickValue); - } else { - final float curValue = this.draftPicks.get(cnBk); - final float newValue = (curValue + pickValue) / 2; - this.draftPicks.put(cnBk, newValue); - } - } - } - - thisBooster.remove(c); - this.currentBoosterPick++; - } // setChoice() - - /** This will upload drafting picks to cardforge HQ. */ - @Override - public void finishedDrafting() { - if (Constant.Runtime.UPLOAD_DRAFT[0]) { - if (this.draftPicks.size() > 1) { - final ArrayList outDraftData = new ArrayList(); - - final String[] keys = this.draftPicks.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY); - - for (final String key : keys) { - outDraftData.add(key + "|" + this.draftPicks.get(key)); - } - - FileUtil.writeFile("res/draft/tmpDraftData.txt", outDraftData); - - final HttpUtil poster = new HttpUtil(); - poster.upload("http://cardforge.org/draftAI/submitDraftData.php?fmt=" + this.draftFormat, - "res/draft/tmpDraftData.txt"); - } - } - } -} diff --git a/src/main/java/forge/game/limited/IBoosterDraft.java b/src/main/java/forge/game/limited/IBoosterDraft.java new file mode 100644 index 00000000000..7507b746d0e --- /dev/null +++ b/src/main/java/forge/game/limited/IBoosterDraft.java @@ -0,0 +1,61 @@ +package forge.game.limited; + +import forge.deck.Deck; +import forge.item.CardPrinted; +import forge.item.ItemPoolView; + +/** + *

+ * BoosterDraft interface. + *

+ * + * @author Forge + * @version $Id$ + */ +public interface IBoosterDraft { + /** + *

+ * nextChoice. + *

+ * + * @return a {@link forge.CardList} object. + */ + ItemPoolView nextChoice(); + + /** + *

+ * setChoice. + *

+ * + * @param c + * a {@link forge.Card} object. + */ + void setChoice(CardPrinted c); + + /** + *

+ * hasNextChoice. + *

+ * + * @return a boolean. + */ + boolean hasNextChoice(); + + /** + *

+ * getDecks. + *

+ * + * @return an array of {@link forge.deck.Deck} objects. + */ + Deck[] getDecks(); // size 7, all the computers decks + + /** Constant LandSetCode="{}". */ + String[] LAND_SET_CODE = { "" }; + + /** + * Called when drafting is over - to upload picks. + */ + void finishedDrafting(); + +} diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java index 2d63e5ffca0..7d8884d53a9 100644 --- a/src/main/java/forge/game/limited/SealedDeck.java +++ b/src/main/java/forge/game/limited/SealedDeck.java @@ -20,7 +20,7 @@ import forge.SetUtils; import forge.card.BoosterGenerator; import forge.card.CardBlock; import forge.card.CardSet; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.deck.Deck; import forge.deck.DeckManager; import forge.game.GameType; @@ -311,7 +311,7 @@ public class SealedDeck { lands.filter(new CardListFilter() { @Override public boolean addCard(final Card c) { - final ArrayList maList = c.getManaAbility(); + final ArrayList maList = c.getManaAbility(); for (int j = 0; j < maList.size(); j++) { if (maList.get(j).canProduce(aiDC.mana1) || maList.get(j).canProduce(aiDC.mana2)) { return true; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java index 43c537093c9..2f45c31ab47 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java @@ -26,7 +26,7 @@ import forge.deck.Deck; import forge.deck.DeckManager; import forge.error.ErrorViewer; import forge.game.GameType; -import forge.game.limited.BoosterDraft; +import forge.game.limited.IBoosterDraft; import forge.gui.GuiUtils; import forge.item.CardDb; import forge.item.CardPrinted; @@ -53,7 +53,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New */ private static final long serialVersionUID = -6055633915602448260L; - private BoosterDraft boosterDraft; + private IBoosterDraft boosterDraft; private final JButton jButtonPick = new JButton(); @@ -93,7 +93,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New * @param inBoosterDraft * the in_booster draft */ - public final void showGui(final BoosterDraft inBoosterDraft) { + public final void showGui(final IBoosterDraft inBoosterDraft) { this.boosterDraft = inBoosterDraft; this.setup(); @@ -298,7 +298,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New final ItemPoolView list = ItemPool.createFrom(this.getBottomTableWithCards().getCards(), CardPrinted.class); deck.addSideboard(list); - final String landSet = BoosterDraft.LAND_SET_CODE[0]; + final String landSet = IBoosterDraft.LAND_SET_CODE[0]; final int landsCount = 20; deck.addSideboard(CardDb.instance().getCard("Forest", landSet), landsCount); deck.addSideboard(CardDb.instance().getCard("Mountain", landSet), landsCount); diff --git a/src/main/java/forge/gui/input/Input_Attack.java b/src/main/java/forge/gui/input/InputAttack.java similarity index 99% rename from src/main/java/forge/gui/input/Input_Attack.java rename to src/main/java/forge/gui/input/InputAttack.java index 60a2fb522ea..8ad95a3ffed 100644 --- a/src/main/java/forge/gui/input/Input_Attack.java +++ b/src/main/java/forge/gui/input/InputAttack.java @@ -19,7 +19,7 @@ import forge.PlayerZone; * @author Forge * @version $Id$ */ -public class Input_Attack extends Input { +public class InputAttack extends Input { /** Constant serialVersionUID=7849903731842214245L. */ private static final long serialVersionUID = 7849903731842214245L; diff --git a/src/main/java/forge/gui/input/Input_Block.java b/src/main/java/forge/gui/input/InputBlock.java similarity index 98% rename from src/main/java/forge/gui/input/Input_Block.java rename to src/main/java/forge/gui/input/InputBlock.java index 99b1efe270b..d0f08bd0c1e 100644 --- a/src/main/java/forge/gui/input/Input_Block.java +++ b/src/main/java/forge/gui/input/InputBlock.java @@ -20,7 +20,7 @@ import forge.PlayerZone; * @author Forge * @version $Id$ */ -public class Input_Block extends Input { +public class InputBlock extends Input { /** Constant serialVersionUID=6120743598368928128L. */ private static final long serialVersionUID = 6120743598368928128L; diff --git a/src/main/java/forge/gui/input/Input_Cleanup.java b/src/main/java/forge/gui/input/InputCleanup.java similarity index 98% rename from src/main/java/forge/gui/input/Input_Cleanup.java rename to src/main/java/forge/gui/input/InputCleanup.java index b4a5b257c21..76124b72a3b 100644 --- a/src/main/java/forge/gui/input/Input_Cleanup.java +++ b/src/main/java/forge/gui/input/InputCleanup.java @@ -16,7 +16,7 @@ import forge.PlayerZone; * @author Forge * @version $Id$ */ -public class Input_Cleanup extends Input { +public class InputCleanup extends Input { /** Constant serialVersionUID=-4164275418971547948L. */ private static final long serialVersionUID = -4164275418971547948L; diff --git a/src/main/java/forge/gui/input/InputControl.java b/src/main/java/forge/gui/input/InputControl.java index dbb666d247b..07b50a18829 100644 --- a/src/main/java/forge/gui/input/InputControl.java +++ b/src/main/java/forge/gui/input/InputControl.java @@ -54,7 +54,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { */ public final void setInput(final Input in) { if (this.model.getGameState().getStack().getResolving() - || !((this.input == null) || (this.input instanceof Input_PassPriority))) { + || !((this.input == null) || (this.input instanceof InputPassPriority))) { this.inputStack.add(in); } else { this.input = in; @@ -197,7 +197,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { this.model.getGameState().getStack().freezeStack(); if (playerTurn.isHuman()) { - return new Input_Attack(); + return new InputAttack(); } } else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) { this.model.getGameState().getStack().freezeStack(); @@ -210,7 +210,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { this.model.getGameState().getPhase().setNeedToNextPhase(true); return null; } else { - return new Input_Block(); + return new InputBlock(); } } } else if (phase.equals(Constant.Phase.CLEANUP)) { @@ -218,7 +218,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { if (this.model.getGameState().getStack().size() == 0) { // resolve things // like Madness - return new Input_Cleanup(); + return new InputCleanup(); } } @@ -234,7 +234,7 @@ public class InputControl extends MyObservable implements java.io.Serializable { this.model.getGameState().getPhase().passPriority(); return null; } else { - return new Input_PassPriority(); + return new InputPassPriority(); } } else if (playerTurn.isComputer()) { return this.aiInput; diff --git a/src/main/java/forge/gui/input/Input_Mulligan.java b/src/main/java/forge/gui/input/InputMulligan.java similarity index 96% rename from src/main/java/forge/gui/input/Input_Mulligan.java rename to src/main/java/forge/gui/input/InputMulligan.java index 7054822e2da..57c8af357c6 100644 --- a/src/main/java/forge/gui/input/Input_Mulligan.java +++ b/src/main/java/forge/gui/input/InputMulligan.java @@ -26,7 +26,7 @@ import forge.quest.data.QuestData; * @author Forge * @version $Id$ */ -public class Input_Mulligan extends Input { +public class InputMulligan extends Input { /** Constant serialVersionUID=-8112954303001155622L. */ private static final long serialVersionUID = -8112954303001155622L; @@ -63,7 +63,7 @@ public class Input_Mulligan extends Input { for (final Card c : hand) { AllZone.getGameAction().moveToLibrary(c); } - for (int i = 0; i < Input_Mulligan.MAGIC_NUMBER_OF_SHUFFLES; i++) { + for (int i = 0; i < InputMulligan.MAGIC_NUMBER_OF_SHUFFLES; i++) { player.shuffle(); } final int newHand = hand.size() - 1; @@ -111,7 +111,7 @@ public class Input_Mulligan extends Input { final CardList handList = aiPlayer.getCardsIn(Zone.Hand); final boolean hasLittleCmc0Cards = handList.getValidCards("Card.cmcEQ0", aiPlayer, null).size() < 2; - aiTakesMulligan = (handList.size() > Input_Mulligan.AI_MULLIGAN_THRESHOLD) && hasLittleCmc0Cards; + aiTakesMulligan = (handList.size() > InputMulligan.AI_MULLIGAN_THRESHOLD) && hasLittleCmc0Cards; if (aiTakesMulligan) { this.doMulligan(aiPlayer, aiRating); diff --git a/src/main/java/forge/gui/input/Input_PassPriority.java b/src/main/java/forge/gui/input/InputPassPriority.java similarity index 96% rename from src/main/java/forge/gui/input/Input_PassPriority.java rename to src/main/java/forge/gui/input/InputPassPriority.java index 261ad80a5df..3a298f4a1d8 100644 --- a/src/main/java/forge/gui/input/Input_PassPriority.java +++ b/src/main/java/forge/gui/input/InputPassPriority.java @@ -15,7 +15,7 @@ import forge.PlayerZone; * @author Forge * @version $Id$ */ -public class Input_PassPriority extends Input implements java.io.Serializable { +public class InputPassPriority extends Input implements java.io.Serializable { /** Constant serialVersionUID=-581477682214137181L. */ private static final long serialVersionUID = -581477682214137181L; diff --git a/src/main/java/forge/gui/input/Input_PayManaCost.java b/src/main/java/forge/gui/input/InputPayManaCost.java similarity index 96% rename from src/main/java/forge/gui/input/Input_PayManaCost.java rename to src/main/java/forge/gui/input/InputPayManaCost.java index 31381b29aae..8ab7cdc2a86 100644 --- a/src/main/java/forge/gui/input/Input_PayManaCost.java +++ b/src/main/java/forge/gui/input/InputPayManaCost.java @@ -21,7 +21,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Input_PayManaCost extends Input { +public class InputPayManaCost extends Input { // anything that uses this should be converted to Ability_Cost /** Constant serialVersionUID=3467312982164195091L. */ private static final long serialVersionUID = 3467312982164195091L; @@ -49,7 +49,7 @@ public class Input_PayManaCost extends Input { * @param noStack * a boolean. */ - public Input_PayManaCost(final SpellAbility sa, final boolean noStack) { + public InputPayManaCost(final SpellAbility sa, final boolean noStack) { this.skipStack = noStack; this.originalManaCost = sa.getManaCost(); // Change this.originalCard = sa.getSourceCard(); @@ -80,7 +80,7 @@ public class Input_PayManaCost extends Input { * @param sa * a {@link forge.card.spellability.SpellAbility} object. */ - public Input_PayManaCost(final SpellAbility sa) { + public InputPayManaCost(final SpellAbility sa) { this.originalManaCost = sa.getManaCost(); // Change this.originalCard = sa.getSourceCard(); @@ -126,7 +126,7 @@ public class Input_PayManaCost extends Input { return; } - this.manaCost = Input_PayManaCostUtil.activateManaAbility(this.spell, card, this.manaCost); + this.manaCost = InputPayManaCostUtil.activateManaAbility(this.spell, card, this.manaCost); // only show message if this is the active input if (AllZone.getInputControl().getInput() == this) { diff --git a/src/main/java/forge/gui/input/Input_PayManaCost_Ability.java b/src/main/java/forge/gui/input/InputPayManaCostAbility.java similarity index 88% rename from src/main/java/forge/gui/input/Input_PayManaCost_Ability.java rename to src/main/java/forge/gui/input/InputPayManaCostAbility.java index eaa6f42a0a2..0a959a63892 100644 --- a/src/main/java/forge/gui/input/Input_PayManaCost_Ability.java +++ b/src/main/java/forge/gui/input/InputPayManaCostAbility.java @@ -18,7 +18,7 @@ import forge.card.spellability.SpellAbility; * @author Forge * @version $Id$ */ -public class Input_PayManaCost_Ability extends Input { +public class InputPayManaCostAbility extends Input { /** * Constant serialVersionUID=3836655722696348713L. */ @@ -45,7 +45,7 @@ public class Input_PayManaCost_Ability extends Input { * @param paid * a {@link forge.Command} object. */ - public Input_PayManaCost_Ability(final String manaCost, final Command paid) { + public InputPayManaCostAbility(final String manaCost, final Command paid) { this(manaCost, paid, Command.BLANK); } @@ -61,7 +61,7 @@ public class Input_PayManaCost_Ability extends Input { * @param unpaidCommand2 * a {@link forge.Command} object. */ - public Input_PayManaCost_Ability(final String manaCost2, final Command paidCommand2, final Command unpaidCommand2) { + public InputPayManaCostAbility(final String manaCost2, final Command paidCommand2, final Command unpaidCommand2) { this("", manaCost2, paidCommand2, unpaidCommand2); } @@ -79,7 +79,7 @@ public class Input_PayManaCost_Ability extends Input { * @param unpaidCommand2 * a {@link forge.Command} object. */ - public Input_PayManaCost_Ability(final String m, final String manaCost2, final Command paidCommand2, + public InputPayManaCostAbility(final String m, final String manaCost2, final Command paidCommand2, final Command unpaidCommand2) { this(m, manaCost2, paidCommand2, unpaidCommand2, false); } @@ -100,7 +100,7 @@ public class Input_PayManaCost_Ability extends Input { * @param showOKButton * a boolean. */ - public Input_PayManaCost_Ability(final String m, final String manaCost2, final Command paidCommand2, + public InputPayManaCostAbility(final String m, final String manaCost2, final Command paidCommand2, final Command unpaidCommand2, final boolean showOKButton) { this.fakeAbility = new SpellAbility(SpellAbility.getAbility(), null) { @Override @@ -134,7 +134,7 @@ public class Input_PayManaCost_Ability extends Input { @Override public final void selectCard(final Card card, final PlayerZone zone) { // only tap card if the mana is needed - this.manaCost = Input_PayManaCostUtil.activateManaAbility(this.fakeAbility, card, this.manaCost); + this.manaCost = InputPayManaCostUtil.activateManaAbility(this.fakeAbility, card, this.manaCost); if (this.manaCost.isPaid()) { this.resetManaCost(); diff --git a/src/main/java/forge/gui/input/Input_PayManaCostUtil.java b/src/main/java/forge/gui/input/InputPayManaCostUtil.java similarity index 85% rename from src/main/java/forge/gui/input/Input_PayManaCostUtil.java rename to src/main/java/forge/gui/input/InputPayManaCostUtil.java index 4cbeb855218..6876c0ed42c 100644 --- a/src/main/java/forge/gui/input/Input_PayManaCostUtil.java +++ b/src/main/java/forge/gui/input/InputPayManaCostUtil.java @@ -12,7 +12,7 @@ import forge.Constant.Zone; import forge.card.abilityFactory.AbilityFactoryMana; import forge.card.mana.ManaCost; import forge.card.mana.ManaPool; -import forge.card.spellability.Ability_Mana; +import forge.card.spellability.AbilityMana; import forge.card.spellability.SpellAbility; import forge.gui.GuiUtils; @@ -24,7 +24,7 @@ import forge.gui.GuiUtils; * @author Forge * @version $Id$ */ -public class Input_PayManaCostUtil { +public class InputPayManaCostUtil { // all mana abilities start with this and typical look like "tap: add G" // mana abilities are Strings and are retrieved by calling card.getKeyword() // taps any card that has mana ability, not just land @@ -51,29 +51,29 @@ public class Input_PayManaCostUtil { return ((ManaPool) card).subtractMana(sa, manaCost); } - ArrayList abilities = Input_PayManaCostUtil.getManaAbilities(card); + ArrayList abilities = InputPayManaCostUtil.getManaAbilities(card); final StringBuilder cneeded = new StringBuilder(); boolean choice = true; boolean skipExpress = false; for (final String color : Constant.Color.MANA_COLORS) { if (manaCost.isNeeded(color)) { - cneeded.append(Input_PayManaCostUtil.getShortColorString(color)); + cneeded.append(InputPayManaCostUtil.getShortColorString(color)); } } - final Iterator it = abilities.iterator(); // you can't + final Iterator it = abilities.iterator(); // you can't // remove // unneeded abilities // inside a // for(am:abilities) // loop :( while (it.hasNext()) { - final Ability_Mana ma = it.next(); + final AbilityMana ma = it.next(); ma.setActivatingPlayer(AllZone.getHumanPlayer()); if (!ma.canPlay()) { it.remove(); - } else if (!Input_PayManaCostUtil.canMake(ma, cneeded.toString())) { + } else if (!InputPayManaCostUtil.canMake(ma, cneeded.toString())) { it.remove(); } @@ -96,9 +96,9 @@ public class Input_PayManaCostUtil { if (!skipExpress) { // express Mana Choice - final ArrayList colorMatches = new ArrayList(); + final ArrayList colorMatches = new ArrayList(); - for (final Ability_Mana am : abilities) { + for (final AbilityMana am : abilities) { if (am.isReflectedMana()) { final ArrayList reflectableColors = AbilityFactoryMana.reflectableMana(am, am.getAbilityFactory(), new ArrayList(), new ArrayList()); @@ -128,13 +128,13 @@ public class Input_PayManaCostUtil { } } - Ability_Mana chosen = abilities.get(0); + AbilityMana chosen = abilities.get(0); if ((1 < abilities.size()) && choice) { - final HashMap ability = new HashMap(); - for (final Ability_Mana am : abilities) { + final HashMap ability = new HashMap(); + for (final AbilityMana am : abilities) { ability.put(am.toString(), am); } - chosen = (Ability_Mana) GuiUtils.getChoice("Choose mana ability", abilities.toArray()); + chosen = (AbilityMana) GuiUtils.getChoice("Choose mana ability", abilities.toArray()); } AllZone.getGameAction().playSpellAbility(chosen); @@ -156,7 +156,7 @@ public class Input_PayManaCostUtil { * a {@link forge.Card} object. * @return a {@link java.util.ArrayList} object. */ - public static ArrayList getManaAbilities(final Card card) { + public static ArrayList getManaAbilities(final Card card) { return card.getManaAbility(); } @@ -167,12 +167,12 @@ public class Input_PayManaCostUtil { *

* * @param am - * a {@link forge.card.spellability.Ability_Mana} object. + * a {@link forge.card.spellability.AbilityMana} object. * @param mana * a {@link java.lang.String} object. * @return a boolean. */ - public static boolean canMake(final Ability_Mana am, final String mana) { + public static boolean canMake(final AbilityMana am, final String mana) { if (mana.contains("1")) { return true; } @@ -184,7 +184,7 @@ public class Input_PayManaCostUtil { final ArrayList reflectableColors = AbilityFactoryMana.reflectableMana(am, am.getAbilityFactory(), new ArrayList(), new ArrayList()); for (final String color : reflectableColors) { - if (mana.contains(Input_PayManaCostUtil.getShortColorString(color))) { + if (mana.contains(InputPayManaCostUtil.getShortColorString(color))) { return true; } } diff --git a/src/main/java/forge/quest/data/pet/QuestPetPlant.java b/src/main/java/forge/quest/data/pet/QuestPetPlant.java index 0a8f31c5805..76e90ea00ae 100644 --- a/src/main/java/forge/quest/data/pet/QuestPetPlant.java +++ b/src/main/java/forge/quest/data/pet/QuestPetPlant.java @@ -4,7 +4,7 @@ import forge.AllZone; import forge.Card; import forge.Constant; import forge.card.cost.Cost; -import forge.card.spellability.Ability_Activated; +import forge.card.spellability.AbilityActivated; import forge.card.spellability.SpellAbility; import forge.quest.data.bazaar.QuestStallManager; @@ -67,7 +67,7 @@ public class QuestPetPlant extends QuestPetAbstract { petCard.addIntrinsicKeyword("Deathtouch"); final Cost abCost = new Cost("T", petCard.getName(), true); - final SpellAbility ability = new Ability_Activated(petCard, abCost, null) { + final SpellAbility ability = new AbilityActivated(petCard, abCost, null) { private static final long serialVersionUID = 7546242087593613719L; @Override diff --git a/src/main/java/forge/view/swing/Gui_HomeScreen.java b/src/main/java/forge/view/swing/Gui_HomeScreen.java index 7d7e8451b2b..1b00d7b9922 100644 --- a/src/main/java/forge/view/swing/Gui_HomeScreen.java +++ b/src/main/java/forge/view/swing/Gui_HomeScreen.java @@ -53,7 +53,7 @@ import forge.deck.DeckManager; import forge.error.BugzReporter; import forge.error.ErrorViewer; import forge.game.GameType; -import forge.game.limited.BoosterDraft_1; +import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; import forge.game.limited.SealedDeck; import forge.gui.GuiUtils; @@ -945,15 +945,15 @@ public class Gui_HomeScreen { final Object o = GuiUtils.getChoice(prompt, draftTypes.toArray()); if (o.toString().equals(draftTypes.get(0))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Full)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Full)); } else if (o.toString().equals(draftTypes.get(1))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Block)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Block)); } else if (o.toString().equals(draftTypes.get(2))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Custom)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Custom)); } } diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java index db2ce238bfd..34deab14640 100644 --- a/src/main/java/forge/view/swing/OldGuiNewGame.java +++ b/src/main/java/forge/view/swing/OldGuiNewGame.java @@ -65,7 +65,7 @@ import forge.deck.DeckManager; import forge.error.BugzReporter; import forge.error.ErrorViewer; import forge.game.GameType; -import forge.game.limited.BoosterDraft_1; +import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; import forge.game.limited.SealedDeck; import forge.gui.GuiUtils; @@ -449,15 +449,15 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants. final Object o = GuiUtils.getChoice(prompt, draftTypes.toArray()); if (o.toString().equals(draftTypes.get(0))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Full)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Full)); } else if (o.toString().equals(draftTypes.get(1))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Block)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Block)); } else if (o.toString().equals(draftTypes.get(2))) { - draft.showGui(new BoosterDraft_1(CardPoolLimitation.Custom)); + draft.showGui(new BoosterDraft(CardPoolLimitation.Custom)); } } diff --git a/src/test/java/forge/BoosterDraftTest.java b/src/test/java/forge/BoosterDraftTest.java index ee0aae8a0fc..b2243a81699 100644 --- a/src/test/java/forge/BoosterDraftTest.java +++ b/src/test/java/forge/BoosterDraftTest.java @@ -3,7 +3,7 @@ package forge; import forge.card.BoosterGenerator; import forge.deck.Deck; -import forge.game.limited.BoosterDraft; +import forge.game.limited.IBoosterDraft; import forge.item.CardPrinted; import forge.item.ItemPool; import forge.item.ItemPoolView; @@ -17,7 +17,7 @@ import org.testng.annotations.Test; * @version $Id$ */ @Test(groups = {"UnitTest"}, timeOut = 1000, enabled = false) -public class BoosterDraftTest implements BoosterDraft { +public class BoosterDraftTest implements IBoosterDraft { int n = 3; /** diff --git a/src/test/java/forge/BoosterDraft_1Test.java b/src/test/java/forge/BoosterDraft_1Test.java index bbeb48133ad..c423d8c9c00 100644 --- a/src/test/java/forge/BoosterDraft_1Test.java +++ b/src/test/java/forge/BoosterDraft_1Test.java @@ -3,7 +3,7 @@ package forge; import org.testng.annotations.Test; -import forge.game.limited.BoosterDraft_1; +import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; import forge.item.CardPrinted; import forge.item.ItemPoolView; @@ -20,7 +20,7 @@ public class BoosterDraft_1Test { */ @Test(groups = {"UnitTest", "fast"}, timeOut = 1000) public void BoosterDraft_1Test1() throws Exception { - BoosterDraft_1 draft = new BoosterDraft_1(CardPoolLimitation.Full); + BoosterDraft draft = new BoosterDraft(CardPoolLimitation.Full); while (draft.hasNextChoice()) { ItemPoolView list = draft.nextChoice(); System.out.println(list.countAll()); diff --git a/src/test/java/forge/GuiBoosterDraftTest.java b/src/test/java/forge/GuiBoosterDraftTest.java index dc1e3caf14e..94fb0566a79 100644 --- a/src/test/java/forge/GuiBoosterDraftTest.java +++ b/src/test/java/forge/GuiBoosterDraftTest.java @@ -2,7 +2,7 @@ package forge; import forge.deck.Deck; import forge.game.GameType; -import forge.game.limited.BoosterDraft_1; +import forge.game.limited.BoosterDraft; import forge.game.limited.CardPoolLimitation; import forge.gui.deckeditor.DeckEditorDraft; @@ -26,7 +26,7 @@ public class GuiBoosterDraftTest { Constant.Runtime.HUMAN_DECK[0] = new Deck(GameType.Sealed); DeckEditorDraft g = new DeckEditorDraft(); - g.showGui(new BoosterDraft_1(CardPoolLimitation.Full)); + g.showGui(new BoosterDraft(CardPoolLimitation.Full)); Assert.assertNotNull(g); g.dispose(); } diff --git a/src/test/java/forge/RunTest.java b/src/test/java/forge/RunTest.java index 629fb36bb16..2fa57ff7cd3 100644 --- a/src/test/java/forge/RunTest.java +++ b/src/test/java/forge/RunTest.java @@ -2,7 +2,7 @@ package forge; import forge.card.cardFactory.CardFactoryInterface; import forge.card.mana.ManaCost; -import forge.gui.input.Input_PayManaCostUtil; +import forge.gui.input.InputPayManaCostUtil; import org.testng.annotations.Test; import java.util.ArrayList; @@ -210,8 +210,8 @@ public class RunTest { check("97", c.isUntapped()); //test Input_PayManaCostUtil - check("98", Input_PayManaCostUtil.getLongColorString("G").equals(Constant.Color.GREEN)); - check("99", Input_PayManaCostUtil.getLongColorString("1").equals(Constant.Color.COLORLESS)); + check("98", InputPayManaCostUtil.getLongColorString("G").equals(Constant.Color.GREEN)); + check("99", InputPayManaCostUtil.getLongColorString("1").equals(Constant.Color.COLORLESS)); /* check("101", Input_PayManaCostUtil.isManaNeeded(Constant.Color.Green, new ManaCost("5")) == true);