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

- Spread usage of hasSVar.

Browse Source
This commit is contained in:
Sloth
2013-05-05 07:01:45 +00:00
parent ec069fb7a3
commit 5838357050
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/ability/ai/ChangeZoneAi.java
View File

@@ -1163,7 +1163,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
fetchList = CardLists.filter(fetchList, new Predicate<Card>() { fetchList = CardLists.filter(fetchList, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
if (!c.getSVar("RemAIDeck").equals("") || !c.getSVar("RemRandomDeck").equals("")) { if (c.hasSVar("RemAIDeck") || c.hasSVar("RemRandomDeck")) {
return false; return false;
} }
return true; return true;

2
src/main/java/forge/card/ability/ai/SacrificeAi.java
View File

@@ -128,7 +128,7 @@ public class SacrificeAi extends SpellAbilityAi {
List<Card> computerList = List<Card> computerList =
CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), valid.split(","), sa.getActivatingPlayer(), sa.getSourceCard()); CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), valid.split(","), sa.getActivatingPlayer(), sa.getSourceCard());
for (Card c : computerList) { for (Card c : computerList) {
if (!c.getSVar("SacMe").equals("") || ComputerUtilCard.evaluateCreature(c) <= 135) { if (c.hasSVar("SacMe") || ComputerUtilCard.evaluateCreature(c) <= 135) {
return true; return true;
} }
} }

2
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2352,7 +2352,7 @@ public class CardFactoryUtil {
} // Vanishing } // Vanishing
// AddCost // AddCost
if (!card.getSVar("FullCost").equals("")) { if (card.hasSVar("FullCost")) {
final SpellAbility sa1 = card.getFirstSpellAbility(); final SpellAbility sa1 = card.getFirstSpellAbility();
if (sa1 != null && sa1.isSpell()) { if (sa1 != null && sa1.isSpell()) {
sa1.setPayCosts(new Cost(card.getSVar("FullCost"), sa1.isAbility())); sa1.setPayCosts(new Cost(card.getSVar("FullCost"), sa1.isAbility()));

2
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -213,7 +213,7 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
String colorsNeeded = colorRequired.toString(); String colorsNeeded = colorRequired.toString();
if ("1".equals(colorsNeeded)) { // only colorless left if ("1".equals(colorsNeeded)) { // only colorless left
if (saPaidFor.getSourceCard() != null if (saPaidFor.getSourceCard() != null
&& !saPaidFor.getSourceCard().getSVar("ManaNeededToAvoidNegativeEffect").equals("")) { && saPaidFor.getSourceCard().hasSVar("ManaNeededToAvoidNegativeEffect")) {
colorsNeeded = ""; colorsNeeded = "";
String[] negEffects = saPaidFor.getSourceCard().getSVar("ManaNeededToAvoidNegativeEffect").split(","); String[] negEffects = saPaidFor.getSourceCard().getSVar("ManaNeededToAvoidNegativeEffect").split(",");
for (String negColor : negEffects) { for (String negColor : negEffects) {

10
src/main/java/forge/game/ai/ComputerUtil.java
View File

@@ -352,7 +352,7 @@ public class ComputerUtil {
final List<Card> sacMeList = CardLists.filter(typeList, new Predicate<Card>() { final List<Card> sacMeList = CardLists.filter(typeList, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return (!c.getSVar("SacMe").equals("") && (Integer.parseInt(c.getSVar("SacMe")) == priority)); return (c.hasSVar("SacMe") && (Integer.parseInt(c.getSVar("SacMe")) == priority));
} }
}); });
if (sacMeList.size() != 0) { if (sacMeList.size() != 0) {
@@ -372,7 +372,7 @@ public class ComputerUtil {
&& !ai.getCardsIn(ZoneType.Battlefield, "Crucible of Worlds").isEmpty()) { && !ai.getCardsIn(ZoneType.Battlefield, "Crucible of Worlds").isEmpty()) {
return c; return c;
} }
if (!c.getSVar("DiscardMe").equals("") && (Integer.parseInt(c.getSVar("DiscardMe")) == priority)) { if (c.hasSVar("DiscardMe") && Integer.parseInt(c.getSVar("DiscardMe")) == priority) {
return c; return c;
} }
} }
@@ -667,7 +667,7 @@ public class ComputerUtil {
for (int ip = 0; ip < 6; ip++) { // priority 0 is the lowest, priority 5 the highest for (int ip = 0; ip < 6; ip++) { // priority 0 is the lowest, priority 5 the highest
final int priority = 6 - ip; final int priority = 6 - ip;
for (Card card : remaining) { for (Card card : remaining) {
if (!card.getSVar("SacMe").equals("") && Integer.parseInt(card.getSVar("SacMe")) == priority) { if (card.hasSVar("SacMe") && Integer.parseInt(card.getSVar("SacMe")) == priority) {
return card; return card;
} }
} }
@@ -937,7 +937,7 @@ public class ComputerUtil {
* @return boolean * @return boolean
*/ */
public static boolean isWorseThanDraw(final Player ai, Card discard) { public static boolean isWorseThanDraw(final Player ai, Card discard) {
if (!discard.getSVar("DiscardMe").equals("")) { if (discard.hasSVar("DiscardMe")) {
return true; return true;
} }
@@ -1326,7 +1326,7 @@ public class ComputerUtil {
List<Card> goodChoices = CardLists.filter(validCards, new Predicate<Card>() { List<Card> goodChoices = CardLists.filter(validCards, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
if (!c.getSVar("DiscardMeByOpp").equals("") || !c.getSVar("DiscardMe").equals("")) { if (c.hasSVar("DiscardMeByOpp") || c.hasSVar("DiscardMe")) {
return false; return false;
} }
return true; return true;