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

add option to "keep supertypes" in the stAnimate keyword

Browse Source
This commit is contained in:
jendave
2011-08-07 00:00:11 +00:00
parent 880d3d08c4
commit 722f04a7ac
2 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/forge/GameActionUtil.java
View File

@@ -7441,8 +7441,7 @@ public class GameActionUtil {
final String affected = k[1]; final String affected = k[1];
final String specific[] = affected.split(","); final String specific[] = affected.split(",");
CardList affectedCards = getAffectedCards(cardWithKeyword, k); // options are All, Self, Enchanted etc. CardList affectedCards = getAffectedCards(cardWithKeyword, k, specific); // options are All, Self, Enchanted etc.
affectedCards = affectedCards.getValidCards(specific, cardWithKeyword.getController(), cardWithKeyword);
se.setAffectedCards(affectedCards); se.setAffectedCards(affectedCards);
String[] pt = k[2].split("/"); String[] pt = k[2].split("/");
@@ -7464,6 +7463,10 @@ public class GameActionUtil {
types.remove("Overwrite"); types.remove("Overwrite");
se.setOverwriteTypes(true); se.setOverwriteTypes(true);
} }
if(types.contains("KeepSupertype")) {
types.remove("KeepSupertype");
se.setKeepSupertype(true);
}
} }
String colors = ""; String colors = "";
@@ -7505,7 +7508,15 @@ public class GameActionUtil {
if(se.isOverwriteTypes()) { if(se.isOverwriteTypes()) {
se.addOriginalTypes(affectedCard, affectedCard.getType()); se.addOriginalTypes(affectedCard, affectedCard.getType());
affectedCard.clearAllTypes(); if(!se.isKeepSupertype()) {
affectedCard.clearAllTypes();
}
else {
ArrayList<String> acTypes = affectedCard.getType();
for(String t : acTypes) {
if(!CardUtil.isASuperType(t)) affectedCard.removeType(t);
}
}
} }
for(String type : types) { for(String type : types) {
if(!affectedCard.isType(type)) { if(!affectedCard.isType(type)) {
@@ -7525,21 +7536,7 @@ public class GameActionUtil {
String keywords[] = keyword[2].split(" & "); String keywords[] = keyword[2].split(" & ");
for(int j = 0; j < keywords.length; j++) { for(int j = 0; j < keywords.length; j++) {
String kw = keywords[j]; String kw = keywords[j];
/*if(kw.startsWith("SVar=")) { affectedCard.addExtrinsicKeyword(kw);
String sVar = source.getSVar(kw.split("SVar=")[1]);
if (sVar.startsWith("AB")) { // grant the ability
AbilityFactory AF = new AbilityFactory();
SpellAbility sa = AF.getAbility(sVar, affectedCard);
sa.setType("Temporary");
affectedCard.addSpellAbility(sa);
}
else { // Copy this SVar
affectedCard.setSVar(kw.split("SVar=")[1], sVar);
}
}
else */ affectedCard.addExtrinsicKeyword(kw);
} }
} }
} }
@@ -7580,7 +7577,11 @@ public class GameActionUtil {
affectedCard.removeType(type); affectedCard.removeType(type);
} }
if(se.isOverwriteTypes()) { if(se.isOverwriteTypes()) {
for(String type : se.getOriginalTypes(affectedCard)) affectedCard.addType(type); for(String type : se.getOriginalTypes(affectedCard)) {
if(!se.isKeepSupertype() || (se.isKeepSupertype() && !CardUtil.isASuperType(type))) {
affectedCard.addType(type);
}
}
} }
if(se.isOverwriteKeywords()) { if(se.isOverwriteKeywords()) {
@@ -7592,19 +7593,7 @@ public class GameActionUtil {
String kws[] = kw[2].split(" & "); String kws[] = kw[2].split(" & ");
for(int j = 0; j < kws.length; j++) { for(int j = 0; j < kws.length; j++) {
String keyword = kws[j]; String keyword = kws[j];
/* affectedCard.removeExtrinsicKeyword(keyword);
if(keyword.startsWith("SVar=")) {
String sVar = source.getSVar(keyword.split("SVar=")[1]);
if (sVar.startsWith("AB")) { // remove granted abilities
SpellAbility[] spellAbility = affectedCard.getSpellAbility();
for(SpellAbility s : spellAbility) {
if (s.getType().equals("Temporary")) {
affectedCard.removeSpellAbility(s);
}
}
}
}
else */ affectedCard.removeExtrinsicKeyword(keyword);
} }
} }
} }
@@ -7635,7 +7624,7 @@ public class GameActionUtil {
return true; return true;
}//end areSpecialConditionsMet() }//end areSpecialConditionsMet()
private CardList getAffectedCards(Card source, String[] details) { private CardList getAffectedCards(Card source, String[] details, String[] specific) {
// [Self], [All], [Enchanted] // [Self], [All], [Enchanted]
CardList affected = new CardList(); CardList affected = new CardList();
String range = details[0].replaceFirst("stAnimate", ""); String range = details[0].replaceFirst("stAnimate", "");
@@ -7651,6 +7640,7 @@ public class GameActionUtil {
affected.addAll(source.getEnchanting().toArray()); affected.addAll(source.getEnchanting().toArray());
} }
} }
affected = affected.getValidCards(specific, source.getController(), source);
return affected; return affected;
}//end getAffectedCards() }//end getAffectedCards()

9
src/forge/StaticEffect.java
View File

@@ -18,6 +18,7 @@ public class StaticEffect {
//for types //for types
private boolean overwriteTypes = false; private boolean overwriteTypes = false;
private boolean keepSupertype = false;
private HashMap<Card, ArrayList<String>> types = new HashMap<Card, ArrayList<String>>(); private HashMap<Card, ArrayList<String>> types = new HashMap<Card, ArrayList<String>>();
private HashMap<Card, ArrayList<String>> originalTypes = new HashMap<Card, ArrayList<String>>(); private HashMap<Card, ArrayList<String>> originalTypes = new HashMap<Card, ArrayList<String>>();
@@ -166,6 +167,14 @@ public class StaticEffect {
public void setOverwriteTypes(boolean overwriteTypes) { public void setOverwriteTypes(boolean overwriteTypes) {
this.overwriteTypes = overwriteTypes; this.overwriteTypes = overwriteTypes;
} }
public boolean isKeepSupertype() {
return keepSupertype;
}
public void setKeepSupertype(boolean keepSupertype) {
this.keepSupertype = keepSupertype;
}
//original types //original types
public void addOriginalType(Card c, String s) { public void addOriginalType(Card c, String s) {