diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 8d81411249d..7ddab93c1e2 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1134,9 +1134,6 @@ public class CardFactory_Creatures { card.getController().getOpponent(), "B", new String[] { "Creature", "Angel"}, 3, 3, new String[] {"Flying"}); - - //remove this card from the graveyard and from the game - //fixed - error if this card is copied like with Kiki, Jiki mirror breaker //null pointer exception @@ -1915,7 +1912,7 @@ public class CardFactory_Creatures { @Override public void showMessage() { - AllZone.Display.showMessage("Discard from your hand a non-creature card"); + AllZone.Display.showMessage("Select a noncreature card to discard"); ButtonUtil.enableOnlyCancel(); } @@ -1957,7 +1954,7 @@ public class CardFactory_Creatures { public void execute() { StringBuilder sb = new StringBuilder(); - sb.append(card.getController()).append(" sacrifices Drekavac unless he discards a non-creature card"); + sb.append(card.getController()).append(" sacrifices Drekavac unless he discards a noncreature card"); ability.setStackDescription(sb.toString()); AllZone.Stack.add(ability); @@ -2220,7 +2217,7 @@ public class CardFactory_Creatures { AllZone.Stack.add(ability); } }; - ability.setStackDescription("Child of Alara - Destroy all non-land permanents, they can't be regenerated"); + ability.setStackDescription("Child of Alara - Destroy all nonland permanents, they can't be regenerated"); card.addDestroyCommand(destroy); }//*************** END ************ END ************************** @@ -9582,7 +9579,7 @@ public class CardFactory_Creatures { if(card.getController().equals(AllZone.HumanPlayer)) { AllZone.Display.getChoiceOptional("Revealing hand", list.toArray()); if(nonLandList.size() > 0) { - Object o = AllZone.Display.getChoiceOptional("Select target non-land card", + Object o = AllZone.Display.getChoiceOptional("Select nonland card", nonLandList.toArray()); if(o != null) { Card c = (Card) o; diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index 3789279d043..f70fd51b2b1 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -1511,7 +1511,7 @@ public class CardFactory_Instants { @Override public void showMessage() { - AllZone.Display.showMessage("Select target non-land permanent for " + spell.getSourceCard()); + AllZone.Display.showMessage("Select target nonland permanent for " + spell.getSourceCard()); ButtonUtil.enableOnlyCancel(); } @@ -2011,7 +2011,7 @@ public class CardFactory_Instants { } public void computerResolve() { - //TODO: somehow select a good non-creature card for AI + //TODO: somehow select a good noncreature card for AI CardList creature = new CardList(AllZone.Computer_Library.getCards()); creature = creature.getType("Creature"); if(creature.size() != 0) { diff --git a/src/forge/CardFactory_Sorceries.java b/src/forge/CardFactory_Sorceries.java index 79f5d97e01a..d981f8ef557 100644 --- a/src/forge/CardFactory_Sorceries.java +++ b/src/forge/CardFactory_Sorceries.java @@ -1617,7 +1617,7 @@ public class CardFactory_Sorceries { @Override public void showMessage() { - AllZone.Display.showMessage("Select target non-land permanent for " + spell.getSourceCard()); + AllZone.Display.showMessage("Select target nonland permanent for " + spell.getSourceCard()); ButtonUtil.enableOnlyCancel(); } @@ -3258,7 +3258,7 @@ public class CardFactory_Sorceries { } public void computerResolve() { - //TODO: somehow select a good non-creature card for AI + //TODO: somehow select a good noncreature card for AI CardList creature = new CardList(AllZone.Computer_Library.getCards()); creature = creature.getType("Creature"); if(creature.size() != 0) { diff --git a/src/forge/GuiDisplayUtil.java b/src/forge/GuiDisplayUtil.java index 3e18196da72..f5e333c4ed2 100644 --- a/src/forge/GuiDisplayUtil.java +++ b/src/forge/GuiDisplayUtil.java @@ -182,11 +182,11 @@ public class GuiDisplayUtil implements NewConstants { //!artifact because of Memnarch turning planeswalkers into artifacts. if (c[i].isCreature() || (c[i].isPlaneswalker() && !c[i].isArtifact())) a.add(c[i]); - //(non-creature, non-enchantment,non-land) artifacts + //(noncreature, non-enchantment,nonland) artifacts for(int i = 0; i < c.length; i++) if (c[i].isArtifact() && !c[i].isCreature() && !c[i].isLand() && !c[i].isGlobalEnchantment() ) a.add(c[i]); - //(non-creature) enchantments + //(noncreature) enchantments for(int i = 0; i < c.length; i++) if (c[i].isGlobalEnchantment() && !c[i].isCreature()) a.add(c[i]); diff --git a/src/forge/MenuItem_HowToPlay.java b/src/forge/MenuItem_HowToPlay.java index 385c3fd3252..6f457b21fbc 100644 --- a/src/forge/MenuItem_HowToPlay.java +++ b/src/forge/MenuItem_HowToPlay.java @@ -56,7 +56,7 @@ public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.LANG.H s.append(" Plains make W\r\n"); s.append(" Islands make U\r\n"); s.append(" Mountains make R").append(newLine); - s.append("4. Each non-land card has a name and a cost. The cost looks like this \"2GG\" A cost like that would require two Forest lands and two other lands. The number 2 can be paid for by any land. A cost like \"R\", would require a Mountain land.") + s.append("4. Each nonland card has a name and a cost. The cost looks like this \"2GG\" A cost like that would require two Forest lands and two other lands. The number 2 can be paid for by any land. A cost like \"R\", would require a Mountain land.") .append(newLine); s.append("5. Creature cards stay in play and can attack on the turn AFTER they are played. A creature's attack and defense is shown like 2/4 meaning that the creature has an attack power of 2 and a defense of 4. If this creature receives 4 damage it is put into the graveyard.") .append(newLine); @@ -111,7 +111,7 @@ public class MenuItem_HowToPlay extends JMenuItem implements NewConstants.LANG.H s.append("Resizable Game Area & Stack AI Land").append(newLine); s.append("1. The \"Resizable Game Area\" check box should be set to on if your monitor will display more than 1024 x 768 pixels. The window containing the Battlefield and the informational displays will fill the entire screen.") .append(newLine); - s.append("2. The \"Stack AI Land\" option will make the computer a more difficult opponent to beat. The computer will draw non-land cards from it's library after it has drawn enough lands to cover the cost of it's spells. Set the check box to on for a stronger opponent and set the check box to off for a weaker opponent.") + s.append("2. The \"Stack AI Land\" option will make the computer a more difficult opponent to beat. The computer will draw nonland cards from it's library after it has drawn enough lands to cover the cost of it's spells. Set the check box to on for a stronger opponent and set the check box to off for a weaker opponent.") .append(newLine); s.append("At times, you may notice that when you click the \"Start Game\" button that the match fails to begin. In this case you should turn the \"Stack AI Land\" option to off.\r\n\r\n\r\n"); diff --git a/src/forge/QuestData_BoosterPack.java b/src/forge/QuestData_BoosterPack.java index 1bad0726b4c..8a9d4324ba2 100644 --- a/src/forge/QuestData_BoosterPack.java +++ b/src/forge/QuestData_BoosterPack.java @@ -76,7 +76,7 @@ public class QuestData_BoosterPack implements NewConstants { colorTest.add(getColor(c)); }//for - System.out.println("creatures " + nCreature + " - non-creatures " + nSpell); + System.out.println("creatures " + nCreature + " - noncreatures " + nSpell); }//print() //testing diff --git a/src/forge/ReadBoosterPack.java b/src/forge/ReadBoosterPack.java index 127da28a3c7..9f0be18bded 100644 --- a/src/forge/ReadBoosterPack.java +++ b/src/forge/ReadBoosterPack.java @@ -36,7 +36,7 @@ public class ReadBoosterPack implements NewConstants { }//main() /* - //average creature versus non-creature + //average creature versus noncreature ReadBoosterPack r = new ReadBoosterPack(); double n = 0; //total @@ -117,7 +117,7 @@ public class ReadBoosterPack implements NewConstants { for(int i = 0; i < 3; i++) pack.add(getRandomCard(uncommonList)); - //11 commons, 7 creature 4 non-creature + //11 commons, 7 creature 4 noncreature CardList variety; for(int i = 0; i < 7; i++) { variety = getVariety(commonCreatureList); diff --git a/src/forge/ReadDraftBoosterPack.java b/src/forge/ReadDraftBoosterPack.java index 7940d6096bf..4b08317b30d 100644 --- a/src/forge/ReadDraftBoosterPack.java +++ b/src/forge/ReadDraftBoosterPack.java @@ -82,7 +82,7 @@ public class ReadDraftBoosterPack implements NewConstants { for(int i = 0; i < 3; i++) pack.add(getRandomCard(uncommonList)); - //11 commons, 7 creature 4 non-creature + //11 commons, 7 creature 4 noncreature CardList variety; for(int i = 0; i < 7; i++) { variety = getVariety(commonCreatureList);