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

move Argothian Pixies "prevent" keyword to Card.java

Browse Source
This commit is contained in:
jendave
2011-08-06 09:35:12 +00:00
parent 623f6799f7
commit 9926bae930
2 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Card.java
View File

@@ -2625,7 +2625,11 @@ public class Card extends MyObservable {
reduce = reduce || getKeyword().contains("Prevent all damage that would be dealt to and dealt by CARDNAME.");
reduce = reduce || source.getKeyword().contains("Prevent all damage that would be dealt to and dealt by CARDNAME.");
reduce = reduce || source.getKeyword().contains("Prevent all damage that would be dealt by CARDNAME.");
return reduce;
//more specific prevents here:
reduce = reduce || (getKeyword().contains("Prevent all damage that would be dealt to CARDNAME by artifact creatures.")
&& source.isCreature() && source.isArtifact());
return reduce;
}
public void addDamage(HashMap<Card, Integer> sourcesMap) {

38
src/forge/CardFactoryUtil.java
View File

@@ -3313,45 +3313,9 @@ public class CardFactoryUtil {
public static boolean canDamage(Card spell, Card receiver) {
//this is for untargeted damage spells, such as Pestilence, Pyroclasm, Tremor, etc.
//and also combat damage?
ArrayList<String> list = receiver.getKeyword();
if(hasProtectionFrom(spell,receiver)) return false;
String kw = "";
for(int i = 0; i < list.size(); i++) {
kw = list.get(i);
if(kw.equals("Prevent all damage that would be dealt to CARDNAME by artifact creatures.")
&& spell.isCreature() && spell.isArtifact()) return false;
/* taken care of by hasProtectionFrom
if(kw.equals("Protection from white") && spell.isWhite()) return false;
if(kw.equals("Protection from blue") && spell.isBlue()) return false;
if(kw.equals("Protection from black") && spell.isBlack()) return false;
if(kw.equals("Protection from red") && spell.isRed()) return false;
if(kw.equals("Protection from green") && spell.isGreen()) return false;
if(kw.equals("Protection from creatures") && spell.isCreature()) return false;
if(kw.equals("Protection from artifacts") && spell.isArtifact()) return false;
if(kw.equals("Protection from Dragons")
&& (spell.getType().contains("Dragon") || spell.getKeyword().contains("Changeling"))) return false;
if(kw.equals("Protection from Demons")
&& (spell.getType().contains("Demon") || spell.getKeyword().contains("Changeling"))) return false;
if(kw.equals("Protection from Goblins")
&& (spell.getType().contains("Goblin") || spell.getKeyword().contains("Changeling"))) return false;
if(kw.equals("Protection from Clerics")
&& (spell.getType().contains("Cleric") || spell.getKeyword().contains("Changeling"))) return false;
if(kw.equals("Protection from enchantments") && spell.getType().contains("Enchantment")) return false;
if(kw.equals("Protection from everything")) return false;
if(kw.equals("Protection from colored spells") && !spell.isPermanent() && isColored(spell) ) return false;
*/
}
return true;
}