From ddd24cbeaa35da61ae88bf357494c11cfd9c0e8a Mon Sep 17 00:00:00 2001 From: jendave Date: Thu, 27 Oct 2011 18:01:14 +0000 Subject: [PATCH] checkstyle --- .../j/jolrael_empress_of_beasts.txt | 24 +++++++-------- res/cardsfolder/s/sigil_of_sleep.txt | 30 +++++++++---------- res/cardsfolder/u/urzas_incubator.txt | 26 ++++++++-------- .../abilityFactory/AbilityFactory_Attach.java | 6 ++-- .../AbilityFactory_ChangeZone.java | 2 +- .../AbilityFactory_CounterMagic.java | 6 ++-- .../AbilityFactory_Counters.java | 4 +-- src/main/java/forge/quest/data/QuestData.java | 1 - .../quest/data/item/QuestItemZeppelin.java | 1 - .../quest/gui/bazaar/QuestBazaarStall.java | 1 - 10 files changed, 49 insertions(+), 52 deletions(-) diff --git a/res/cardsfolder/j/jolrael_empress_of_beasts.txt b/res/cardsfolder/j/jolrael_empress_of_beasts.txt index 99a6d66b44c..e34c4803927 100644 --- a/res/cardsfolder/j/jolrael_empress_of_beasts.txt +++ b/res/cardsfolder/j/jolrael_empress_of_beasts.txt @@ -1,12 +1,12 @@ -Name:Jolrael, Empress of Beasts -ManaCost:3 G G -Types:Legendary Creature Human Spellshaper -Text:no text -PT:3/3 -A:AB$ AnimateAll | Cost$ 2 G T Discard<2/Card> | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ All lands target player controls become 3/3 creatures until end of turn. They're still lands. -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/jolrael_empress_of_beasts.jpg -SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/115.jpg -SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/81.jpg -Oracle:{2}{G}, {T}, Discard two cards: All lands target player controls become 3/3 creatures until end of turn. They're still lands. -End \ No newline at end of file +Name:Jolrael, Empress of Beasts +ManaCost:3 G G +Types:Legendary Creature Human Spellshaper +Text:no text +PT:3/3 +A:AB$ AnimateAll | Cost$ 2 G T Discard<2/Card> | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ All lands target player controls become 3/3 creatures until end of turn. They're still lands. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/jolrael_empress_of_beasts.jpg +Oracle:{2}{G}, {T}, Discard two cards: All lands target player controls become 3/3 creatures until end of turn. They're still lands. +SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/115.jpg +SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/81.jpg +End diff --git a/res/cardsfolder/s/sigil_of_sleep.txt b/res/cardsfolder/s/sigil_of_sleep.txt index 44f9ee6004b..c2b75fd807d 100644 --- a/res/cardsfolder/s/sigil_of_sleep.txt +++ b/res/cardsfolder/s/sigil_of_sleep.txt @@ -1,15 +1,15 @@ -Name:Sigil of Sleep -ManaCost:U -Types:Enchantment Aura -Text:no text -K:Enchant creature -A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump -T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ You | Execute$ TrigReturnYou | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. -SVar:TrigReturnYou:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | IsCurse$ True | Origin$ Battlefield | Destination$ Hand -T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | Execute$ TrigReturnOpp | Secondary$ True | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. -SVar:TrigReturnOpp:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature your opponent controls | IsCurse$ True | Origin$ Battlefield | Destination$ Hand -SVar:Rarity:Common -SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_of_sleep.jpg -SetInfo:UDS|Common|http://magiccards.info/scans/en/ud/46.jpg -Oracle:Enchant creature\nWhenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. -End \ No newline at end of file +Name:Sigil of Sleep +ManaCost:U +Types:Enchantment Aura +Text:no text +K:Enchant creature +A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump +T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ You | Execute$ TrigReturnYou | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. +SVar:TrigReturnYou:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | IsCurse$ True | Origin$ Battlefield | Destination$ Hand +T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | Execute$ TrigReturnOpp | Secondary$ True | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. +SVar:TrigReturnOpp:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature your opponent controls | IsCurse$ True | Origin$ Battlefield | Destination$ Hand +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_of_sleep.jpg +Oracle:Enchant creature\nWhenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. +SetInfo:UDS|Common|http://magiccards.info/scans/en/ud/46.jpg +End diff --git a/res/cardsfolder/u/urzas_incubator.txt b/res/cardsfolder/u/urzas_incubator.txt index f817bf23325..79936162e37 100644 --- a/res/cardsfolder/u/urzas_incubator.txt +++ b/res/cardsfolder/u/urzas_incubator.txt @@ -1,13 +1,13 @@ -Name:Urza's Incubator -ManaCost:3 -Types:Artifact -Text:no text -T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Static$ True | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ As CARDNAME enters the battlefield, choose a creature type. Creature spells of the chosen type cost 2 less to cast. -SVar:TrigChoose:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature -K:CostChange:Player:Less:2:Spell:All:ChosenType:NoSpecial -SVar:RemAIDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_incubator.jpg -SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/142.jpg -Oracle:As Urza's Incubator enters the battlefield, choose a creature type.\nCreature spells of the chosen type cost {2} less to cast. -End \ No newline at end of file +Name:Urza's Incubator +ManaCost:3 +Types:Artifact +Text:no text +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Static$ True | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ As CARDNAME enters the battlefield, choose a creature type. Creature spells of the chosen type cost 2 less to cast. +SVar:TrigChoose:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature +K:CostChange:Player:Less:2:Spell:All:ChosenType:NoSpecial +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_incubator.jpg +Oracle:As Urza's Incubator enters the battlefield, choose a creature type.\nCreature spells of the chosen type cost {2} less to cast. +SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/142.jpg +End diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java index 64ccfb25e4e..3981e38ca2e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java @@ -233,7 +233,7 @@ public class AbilityFactory_Attach { CardList list = AllZoneUtil.getCardsIn(tgt.getZone()); list = list.getValidCards(tgt.getValidTgts(), sa.getActivatingPlayer(), attachSource); - // TODO: If Attaching without casting, don't need to actually target. + // TODO If Attaching without casting, don't need to actually target. // I believe this is the only case where mandatory will be true, so just // check that when starting that work // But we shouldn't attach to things with Protection @@ -350,7 +350,7 @@ public class AbilityFactory_Attach { return c; } - // TODO: If Not Mandatory, make sure the card is "good enough" + // TODO If Not Mandatory, make sure the card is "good enough" if (c.isCreature()) { int eval = CardFactoryUtil.evaluateCreature(c); if (eval < 160 && (eval < 130 || AllZone.getComputerPlayer().getLife() > 5)) { @@ -511,7 +511,7 @@ public class AbilityFactory_Attach { } if (attachSource.isAura()) { - // TODO: For Auras like Rancor, that aren't as likely to lead to + // TODO For Auras like Rancor, that aren't as likely to lead to // card disadvantage, this check should be skipped prefList = prefList.filter(new CardListFilter() { diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index b0f61a3529c..5501f1acd16 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -1342,7 +1342,7 @@ public final class AbilityFactory_ChangeZone { { return false; // don't blink something with } - // counters TODO: check good and + // counters TODO check good and // bad counters return Spell_Permanent.checkETBEffects(c, null, null); // checks // only diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java index ec13dbe608e..e5a579b340e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_CounterMagic.java @@ -255,7 +255,7 @@ public class AbilityFactory_CounterMagic { } } - // TODO: Improve AI + // TODO Improve AI // Will return true if this spell can counter (or is Reusable and can // force the Human into making decisions) @@ -334,7 +334,7 @@ public class AbilityFactory_CounterMagic { } } - // TODO: Improve AI + // TODO Improve AI // Will return true if this spell can counter (or is Reusable and can // force the Human into making decisions) @@ -361,7 +361,7 @@ public class AbilityFactory_CounterMagic { */ private void counterResolve(final AbilityFactory af, final SpellAbility sa) { - // TODO: Before this resolves we should see if any of our targets are + // TODO Before this resolves we should see if any of our targets are // still on the stack ArrayList sas; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java index be2cdada96a..be4aa5207dd 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java @@ -1225,7 +1225,7 @@ public class AbilityFactory_Counters { chance &= subAb.chkAI_Drawback(); } - // TODO: Make sure Human has poison counters or there are some counters + // TODO Make sure Human has poison counters or there are some counters // we want to proliferate return chance; } @@ -1248,7 +1248,7 @@ public class AbilityFactory_Counters { chance &= subAb.doTrigger(mandatory); } - // TODO: Make sure Human has poison counters or there are some counters + // TODO Make sure Human has poison counters or there are some counters // we want to proliferate return chance; } diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java index 4ab231509d2..681278a022c 100644 --- a/src/main/java/forge/quest/data/QuestData.java +++ b/src/main/java/forge/quest/data/QuestData.java @@ -18,7 +18,6 @@ import forge.properties.NewConstants; import forge.quest.data.item.QuestInventory; import forge.quest.data.pet.QuestPetManager; -// TODO: Auto-generated Javadoc //when you create QuestDataOld and AFTER you copy the AI decks over //you have to call one of these two methods below //see Gui_QuestOptions for more details diff --git a/src/main/java/forge/quest/data/item/QuestItemZeppelin.java b/src/main/java/forge/quest/data/item/QuestItemZeppelin.java index c64b361db47..41548546942 100644 --- a/src/main/java/forge/quest/data/item/QuestItemZeppelin.java +++ b/src/main/java/forge/quest/data/item/QuestItemZeppelin.java @@ -3,7 +3,6 @@ package forge.quest.data.item; import forge.AllZone; import forge.quest.data.bazaar.QuestStallManager; -// TODO: Auto-generated Javadoc /** *

* QuestItemZeppelin class. diff --git a/src/main/java/forge/quest/gui/bazaar/QuestBazaarStall.java b/src/main/java/forge/quest/gui/bazaar/QuestBazaarStall.java index 0ac1a264b8b..603da6ca2b3 100644 --- a/src/main/java/forge/quest/gui/bazaar/QuestBazaarStall.java +++ b/src/main/java/forge/quest/gui/bazaar/QuestBazaarStall.java @@ -13,7 +13,6 @@ import javax.swing.border.EmptyBorder; import java.awt.*; import java.util.ArrayList; -// TODO: Auto-generated Javadoc /** *

QuestBazaarStall class.

*