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

- Simplified the code found in forge.Card and forge.CombatUtil. This should finish the conversion of getKeyword().contains(string) to hasKeyword(string).

Browse Source
This commit is contained in:
jendave
2011-08-07 01:04:42 +00:00
parent 215b32c361
commit a88b644723
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/forge/Card.java
View File

@@ -451,7 +451,7 @@ public class Card extends MyObservable {
} }
public boolean getSacrificeAtEOT() { public boolean getSacrificeAtEOT() {
return sacrificeAtEOT || getKeyword().contains("At the beginning of the end step, sacrifice CARDNAME."); return sacrificeAtEOT || hasKeyword("At the beginning of the end step, sacrifice CARDNAME.");
} }
public void setSacrificeAtEOT(boolean sacrificeAtEOT) { public void setSacrificeAtEOT(boolean sacrificeAtEOT) {
@@ -475,7 +475,7 @@ public class Card extends MyObservable {
} }
public boolean hasFirstStrike() { public boolean hasFirstStrike() {
return firstStrike || getKeyword().contains("First Strike"); return firstStrike || hasKeyword("First Strike");
} }
public void setFirstStrike(boolean firstStrike) { public void setFirstStrike(boolean firstStrike) {
@@ -487,7 +487,7 @@ public class Card extends MyObservable {
} }
public boolean hasDoubleStrike() { public boolean hasDoubleStrike() {
return doubleStrike || getKeyword().contains("Double Strike"); return doubleStrike || hasKeyword("Double Strike");
} }
public boolean hasSecondStrike() { public boolean hasSecondStrike() {
@@ -1108,7 +1108,7 @@ public class Card extends MyObservable {
} }
// Storm // Storm
if (getKeyword().contains("Storm") && !sb.toString().contains("Storm (When you ")) { if (hasKeyword("Storm") && !sb.toString().contains("Storm (When you ")) {
if (sb.toString().endsWith("\r\n\r\n")) { if (sb.toString().endsWith("\r\n\r\n")) {
sb.delete(sb.lastIndexOf("\r\n"), sb.lastIndexOf("\r\n")+3); sb.delete(sb.lastIndexOf("\r\n"), sb.lastIndexOf("\r\n")+3);
} }
@@ -1677,13 +1677,13 @@ public class Card extends MyObservable {
} }
public boolean hasSickness() { public boolean hasSickness() {
if(getKeyword().contains("Haste")) return false; if(hasKeyword("Haste")) return false;
return sickness; return sickness;
} }
public boolean isSick() { public boolean isSick() {
if(getKeyword().contains("Haste")) return false; if(hasKeyword("Haste")) return false;
return sickness && isCreature(); return sickness && isCreature();
} }
@@ -2330,7 +2330,7 @@ public class Card extends MyObservable {
} }
public void addExtrinsicKeyword(String s) { public void addExtrinsicKeyword(String s) {
//if(!getKeyword().contains(s)){ //if(!hasKeyword(s)){
if (s.startsWith("HIDDEN")) addHiddenExtrinsicKeyword(s); if (s.startsWith("HIDDEN")) addHiddenExtrinsicKeyword(s);
else else
extrinsicKeyword.add((getName().trim().length()==0 ? s :s.replaceAll(getName(), "CARDNAME"))); extrinsicKeyword.add((getName().trim().length()==0 ? s :s.replaceAll(getName(), "CARDNAME")));
@@ -2448,7 +2448,7 @@ public class Card extends MyObservable {
} }
public boolean isInstant() { public boolean isInstant() {
return type.contains("Instant") /*|| getKeyword().contains("Flash")*/; return type.contains("Instant") /*|| hasKeyword("Flash")*/;
} }
public boolean isArtifact() { public boolean isArtifact() {
@@ -2706,7 +2706,7 @@ public class Card extends MyObservable {
if (type.contains(cardType) if (type.contains(cardType)
|| ( (isCreature() || isTribal()) || ( (isCreature() || isTribal())
&& CardUtil.isACreatureType(cardType) && getKeyword().contains("Changeling"))) return true; && CardUtil.isACreatureType(cardType) && hasKeyword("Changeling"))) return true;
return false; return false;
} }
@@ -3097,7 +3097,7 @@ public class Card extends MyObservable {
public int getEnoughDamageToKill(int maxDamage, Card source, boolean isCombat, boolean noPrevention) { public int getEnoughDamageToKill(int maxDamage, Card source, boolean isCombat, boolean noPrevention) {
int killDamage = getKillDamage(); int killDamage = getKillDamage();
if (getKeyword().contains("Indestructible") || getShield() > 0) { if (hasKeyword("Indestructible") || getShield() > 0) {
if (!(source.hasKeyword("Wither") || source.hasKeyword("Infect"))) if (!(source.hasKeyword("Wither") || source.hasKeyword("Infect")))
return maxDamage + 1; return maxDamage + 1;
} }
@@ -3264,13 +3264,13 @@ public class Card extends MyObservable {
if(CardFactoryUtil.hasProtectionFrom(source,this)) return 0; if(CardFactoryUtil.hasProtectionFrom(source,this)) return 0;
if (isCombat) { if (isCombat) {
if (getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")) return 0; if (hasKeyword("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")) return 0;
if (getKeyword().contains("Prevent all combat damage that would be dealt to CARDNAME.")) return 0; if (hasKeyword("Prevent all combat damage that would be dealt to CARDNAME.")) return 0;
if (source.hasKeyword("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")) return 0; if (source.hasKeyword("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")) return 0;
if (source.hasKeyword("Prevent all combat damage that would be dealt by CARDNAME.")) return 0; if (source.hasKeyword("Prevent all combat damage that would be dealt by CARDNAME.")) return 0;
} }
if (getKeyword().contains("Prevent all damage that would be dealt to CARDNAME.")) return 0; if (hasKeyword("Prevent all damage that would be dealt to CARDNAME.")) return 0;
if (getKeyword().contains("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0; if (hasKeyword("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0;
if (source.hasKeyword("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0; if (source.hasKeyword("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0;
if (source.hasKeyword("Prevent all damage that would be dealt by CARDNAME.")) return 0; if (source.hasKeyword("Prevent all damage that would be dealt by CARDNAME.")) return 0;

4
src/forge/CombatUtil.java
View File

@@ -347,9 +347,9 @@ public class CombatUtil {
if (asSeparateWords[8].matches("[0-9][0-9]?")) { if (asSeparateWords[8].matches("[0-9][0-9]?")) {
powerLimit2[0] = Integer.parseInt((asSeparateWords[8]).trim()); powerLimit2[0] = Integer.parseInt((asSeparateWords[8]).trim());
if (blocker.getNetAttack() >= powerLimit2[0] && attacker.getKeyword().contains if (blocker.getNetAttack() >= powerLimit2[0] && attacker.hasKeyword
("CARDNAME can't be blocked by creatures with power " + powerLimit2[0] + " or greater.")) return false; ("CARDNAME can't be blocked by creatures with power " + powerLimit2[0] + " or greater.")) return false;
if (blocker.getNetAttack() <= powerLimit2[0] && attacker.getKeyword().contains if (blocker.getNetAttack() <= powerLimit2[0] && attacker.hasKeyword
("CARDNAME can't be blocked by creatures with power " + powerLimit2[0] + " or less.")) return false; ("CARDNAME can't be blocked by creatures with power " + powerLimit2[0] + " or less.")) return false;
} }
} }