Split forge script handlign code

.gitattributes

@@ -495,6 +495,7 @@ forge-game/src/main/java/forge/game/card/CardLists.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/card/CardPlayOption.java -text
 forge-game/src/main/java/forge/game/card/CardPowerToughness.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/card/CardPredicates.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardProperty.java -text
 forge-game/src/main/java/forge/game/card/CardShields.java -text
 forge-game/src/main/java/forge/game/card/CardState.java -text
 forge-game/src/main/java/forge/game/card/CardUtil.java svneol=native#text/plain
@@ -634,6 +635,7 @@ forge-game/src/main/java/forge/game/player/PlayerCollection.java -text svneol=un
 forge-game/src/main/java/forge/game/player/PlayerController.java -text
 forge-game/src/main/java/forge/game/player/PlayerOutcome.java -text
 forge-game/src/main/java/forge/game/player/PlayerPredicates.java -text svneol=unset#text/plain
+forge-game/src/main/java/forge/game/player/PlayerProperty.java -text
 forge-game/src/main/java/forge/game/player/PlayerStatistics.java -text
 forge-game/src/main/java/forge/game/player/PlayerView.java -text
 forge-game/src/main/java/forge/game/player/RegisteredPlayer.java -text

forge-game/src/main/java/forge/game/card/Card.java

@@ -3882,7 +3882,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     // Takes arguments like Blue or withFlying
     @Override
     public boolean hasProperty(final String property, final Player sourceController, final Card source, SpellAbility spellAbility) {
-        return ForgeScript.cardHasProperty(this, property, sourceController, source, spellAbility);
+        return CardProperty.cardHasProperty(this, property, sourceController, source, spellAbility);
     }
 
     public final boolean isImmutable() {

forge-game/src/main/java/forge/game/player/Player.java

@@ -39,7 +39,6 @@ import com.google.common.collect.Maps;
 
 import forge.LobbyPlayer;
 import forge.card.MagicColor;
-import forge.game.ForgeScript;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.GameLogEntryType;
@@ -2030,7 +2029,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
     @Override
     public final boolean hasProperty(final String property, final Player sourceController, final Card source, SpellAbility spellAbility) {
-        return ForgeScript.playerHasProperty(this, property, sourceController, source, spellAbility);
+        return PlayerProperty.playerHasProperty(this, property, sourceController, source, spellAbility);
     }
 
     public final int getMaxHandSize() {

forge-game/src/main/java/forge/game/player/PlayerProperty.java

@@ -0,0 +1,329 @@
+package forge.game.player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
+import forge.game.Game;
+import forge.game.ability.AbilityUtils;
+import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardPredicates.Presets;
+import forge.game.spellability.SpellAbility;
+import forge.game.zone.ZoneType;
+import forge.util.Expressions;
+
+public class PlayerProperty {
+
+    public static boolean playerHasProperty(Player player, String property, Player sourceController, Card source, SpellAbility spellAbility) {
+
+        Game game = player.getGame();
+        if (property.equals("You")) {
+            if (!player.equals(sourceController)) {
+                return false;
+            }
+        } else if (property.equals("Opponent")) {
+            if (player.equals(sourceController) || !player.isOpponentOf(sourceController)) {
+                return false;
+            }
+        } else if (property.startsWith("OpponentOf ")) {
+            final String v = property.split(" ")[1];
+            final List<Player> players = AbilityUtils.getDefinedPlayers(source, v, spellAbility);
+            for (final Player p : players) {
+                if (player.equals(p) || !player.isOpponentOf(p)) {
+                    return false;
+                }
+            }
+        } else if (property.equals("Allies")) {
+            if (player.equals(sourceController) || player.isOpponentOf(sourceController)) {
+                return false;
+            }
+        } else if (property.equals("Active")) {
+            if (!player.equals(game.getPhaseHandler().getPlayerTurn())) {
+                return false;
+            }
+        } else if (property.equals("NonActive")) {
+            if (player.equals(game.getPhaseHandler().getPlayerTurn())) {
+                return false;
+            }
+        } else if (property.equals("OpponentToActive")) {
+            final Player active = game.getPhaseHandler().getPlayerTurn();
+            if (player.equals(active) || !player.isOpponentOf(active)) {
+                return false;
+            }
+        } else if (property.equals("Other")) {
+            if (player.equals(sourceController)) {
+                return false;
+            }
+        } else if (property.equals("OtherThanSourceOwner")) {
+            if (player.equals(source.getOwner())) {
+                return false;
+            }
+        } else if (property.equals("isMonarch")) {
+            if (!player.equals(game.getMonarch())) {
+                return false;
+            }
+        } else if (property.startsWith("wasDealtCombatDamageThisCombatBy ")) {
+            final String v = property.split(" ")[1];
+            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
+            boolean found = false;
+            for (final Card card : cards) {
+                if (card.getDamageHistory().getThisCombatDamaged().contains(player)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                return false;
+            }
+        } else if (property.startsWith("wasDealtDamageThisGameBy ")) {
+            final String v = property.split(" ")[1];
+            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
+            boolean found = false;
+            for (final Card card : cards) {
+                if (card.getDamageHistory().getThisGameDamaged().contains(player)) {
+                    found = true;
+                    break;
+                    }
+            }
+            if (!found) {
+                return false;
+            }
+        } else if (property.startsWith("wasDealtDamageThisTurnBy ")) {
+            final String v = property.split(" ")[1];
+            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
+            boolean found = false;
+            for (final Card card : cards) {
+                if (card.getDamageHistory().getThisTurnDamaged().contains(player)) {
+                    found = true;
+                    break;
+                    }
+            }
+            if (!found) {
+                return false;
+            }
+        } else if (property.startsWith("wasDealtCombatDamageThisTurnBy ")) {
+            final String v = property.split(" ")[1];
+            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
+            
+            boolean found = false;
+            for (final Card card : cards) {
+                if (card.getDamageHistory().getThisTurnCombatDamaged().contains(player)) {
+                    found = true;
+                    break;
+                    }
+            }
+            if (!found) {
+                return false;
+            }
+        } else if (property.equals("attackedBySourceThisCombat")) {
+            if (game.getCombat() == null || !player.equals(game.getCombat().getDefenderPlayerByAttacker(source))) {
+                return false;
+            }
+        } else if (property.equals("wasDealtDamageThisTurn")) {
+            if (player.getAssignedDamage() == 0) {
+                return false;
+            }
+        } else if (property.equals("wasDealtCombatDamageThisTurn")) {
+            if (player.getAssignedCombatDamage() == 0) {
+                return false;
+            }
+        } else if (property.equals("LostLifeThisTurn")) {
+            if (player.getLifeLostThisTurn() <= 0) {
+                return false;
+            }
+        } else if (property.equals("DeclaredAttackerThisTurn")) {
+            if (player.getAttackersDeclaredThisTurn() <= 0) {
+                return false;
+            }
+        } else if (property.equals("TappedLandForManaThisTurn")) {
+            if (!player.hasTappedLandForManaThisTurn()) {
+                return false;
+            }
+        } else if (property.equals("NoCardsInHandAtBeginningOfTurn")) {
+            if (player.getNumCardsInHandStartedThisTurnWith() > 0) {
+                return false;
+            }
+        } else if (property.equals("CardsInHandAtBeginningOfTurn")) {
+            if (player.getNumCardsInHandStartedThisTurnWith() <= 0) {
+                return false;
+            }
+        } else if (property.startsWith("WithCardsInHand")) {
+            if (property.contains("AtLeast")) {
+                int amount = Integer.parseInt(property.split("AtLeast")[1]);
+                if (player.getCardsIn(ZoneType.Hand).size() < amount) {
+                    return false;
+                }
+            }
+        } else if (property.equals("IsRemembered")) {
+            if (!source.isRemembered(player)) {
+                return false;
+            }
+        } else if (property.equals("IsNotRemembered")) {
+            if (source.isRemembered(player)) {
+                return false;
+            }
+        } else if (property.equals("EnchantedBy")) {
+            if (!player.isEnchantedBy(source)) {
+                return false;
+            }
+        } else if (property.equals("Chosen")) {
+            if (source.getChosenPlayer() == null || !source.getChosenPlayer().equals(player)) {
+                return false;
+            }
+        } else if (property.startsWith("LifeEquals_")) {
+            int life = AbilityUtils.calculateAmount(source, property.substring(11), null);
+            if (player.getLife() != life) {
+                return false;
+            }
+        } else if (property.equals("IsPoisoned")) {
+            if (player.getPoisonCounters() <= 0) {
+                return false;
+            }
+        } else if (property.startsWith("controls")) {
+            final String[] type = property.substring(8).split("_");
+            final CardCollectionView list = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), type[0], sourceController, source);
+            String comparator = type[1];
+            String compareTo = comparator.substring(2);
+            int y = StringUtils.isNumeric(compareTo) ? Integer.parseInt(compareTo) : 0;
+            if (!Expressions.compare(list.size(), comparator, y)) {
+                return false;
+            }
+        } else if (property.startsWith("withMore")) {
+            final String cardType = property.split("sThan")[0].substring(8);
+            final Player controller = "Active".equals(property.split("sThan")[1]) ? game.getPhaseHandler().getPlayerTurn() : sourceController;
+            final CardCollectionView oppList = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), CardPredicates.isType(cardType));
+            final CardCollectionView yourList = CardLists.filter(controller.getCardsIn(ZoneType.Battlefield), CardPredicates.isType(cardType));
+            if (oppList.size() <= yourList.size()) {
+                return false;
+            }
+        } else if (property.startsWith("withAtLeast")) {
+            final String cardType = property.split("More")[1].split("sThan")[0];
+            final int amount = Integer.parseInt(property.substring(11, 12));
+            final Player controller = "Active".equals(property.split("sThan")[1]) ? game.getPhaseHandler().getPlayerTurn() : sourceController;
+            final CardCollectionView oppList = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), CardPredicates.isType(cardType));
+            final CardCollectionView yourList = CardLists.filter(controller.getCardsIn(ZoneType.Battlefield), CardPredicates.isType(cardType));
+            System.out.println(yourList.size());
+            if (oppList.size() < yourList.size() + amount) {
+                return false;
+            }
+        } else if (property.startsWith("hasMore")) {
+            final Player controller = property.contains("Than") && "Active".equals(property.split("Than")[1]) ? game.getPhaseHandler().getPlayerTurn() : sourceController;
+            if (property.substring(7).startsWith("Life") && player.getLife() <= controller.getLife()) {
+                return false;
+            } else if (property.substring(7).startsWith("CardsInHand")
+                    && player.getCardsIn(ZoneType.Hand).size() <= controller.getCardsIn(ZoneType.Hand).size()) {
+                return false;
+            }
+        } else if (property.startsWith("hasFewer")) {
+            final Player controller = "Active".equals(property.split("Than")[1]) ? game.getPhaseHandler().getPlayerTurn() : sourceController;
+            if (property.substring(8).startsWith("CreaturesInYard")) {
+                final CardCollectionView oppList = CardLists.filter(player.getCardsIn(ZoneType.Graveyard), Presets.CREATURES);
+                final CardCollectionView yourList = CardLists.filter(controller.getCardsIn(ZoneType.Graveyard), Presets.CREATURES);
+                if (oppList.size() >= yourList.size()) {
+                    return false;
+                }
+            }
+        } else if (property.startsWith("withMost")) {
+            final String kind = property.substring(8);
+            if (kind.equals("Life")) {
+                int highestLife = player.getLife(); // Negative base just in case a few Lich's are running around
+                for (final Player p : game.getPlayers()) {
+                    if (p.getLife() > highestLife) {
+                        highestLife = p.getLife();
+                    }
+                }
+                if (player.getLife() != highestLife) {
+                    return false;
+                }
+            }
+            else if (kind.equals("PermanentInPlay")) {
+                int typeNum = 0;
+                List<Player> controlmost = new ArrayList<Player>();
+                for (final Player p : game.getPlayers()) {
+                    final int num = p.getCardsIn(ZoneType.Battlefield).size();
+                    if (num > typeNum) {
+                        typeNum = num;
+                        controlmost.clear();
+                    }
+                    if (num == typeNum) {
+                        controlmost.add(p);
+                    }
+                }
+
+                if (controlmost.size() != 1 || !controlmost.contains(player)) {
+                    return false;
+                }
+            }
+            else if (kind.equals("CardsInHand")) {
+                int largestHand = 0;
+                Player withLargestHand = null;
+                for (final Player p : game.getPlayers()) {
+                    if (p.getCardsIn(ZoneType.Hand).size() > largestHand) {
+                        largestHand = p.getCardsIn(ZoneType.Hand).size();
+                        withLargestHand = p;
+                    }
+                }
+                if (!player.equals(withLargestHand)) {
+                    return false;
+                }
+            }
+            else if (kind.startsWith("Type")) {
+                String type = property.split("Type")[1];
+                boolean checkOnly = false;
+                if (type.endsWith("Only")) {
+                    checkOnly = true;
+                    type = type.replace("Only", "");
+                }
+                int typeNum = 0;
+                List<Player> controlmost = new ArrayList<Player>();
+                for (final Player p : game.getPlayers()) {
+                    final int num = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), type).size();
+                    if (num > typeNum) {
+                        typeNum = num;
+                        controlmost.clear();
+                    }
+                    if (num == typeNum) {
+                        controlmost.add(p);
+                    }
+                }
+                if (checkOnly && controlmost.size() != 1) {
+                    return false;
+                }
+                if (!controlmost.contains(player)) {
+                    return false;
+                }
+            }
+        } else if (property.startsWith("withLowest")) {
+            if (property.substring(10).equals("Life")) {
+                int lowestLife = player.getLife();
+                List<Player> lowestlifep = new ArrayList<Player>();
+                for (final Player p : game.getPlayers()) {
+                    if (p.getLife() == lowestLife) {
+                        lowestlifep.add(p);
+                    } else if (p.getLife() < lowestLife) {
+                        lowestLife = p.getLife();
+                        lowestlifep.clear();
+                        lowestlifep.add(p);
+                    }
+                }
+                if (!lowestlifep.contains(player)) {
+                    return false;
+                }
+            }
+        } else if (property.startsWith("LessThanHalfStartingLifeTotal")) {
+            if (player.getLife() >= (int) Math.ceil(player.getStartingLife() / 2.0)) {
+                return false;
+            }
+        } else if (property.startsWith("Triggered")) {
+            if (!AbilityUtils.getDefinedPlayers(source, property, spellAbility).contains(player)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}