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

+ inferno trap

Browse Source
This commit is contained in:
Maxmtg
2013-05-08 09:03:27 +00:00
parent d1b415e39f
commit 8cdcb5e01d
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1298,6 +1298,12 @@ public class CardFactoryUtil {
// Count$YourTypeDamageThisTurn Type
if (sq[0].contains("YourTypeDamageThisTurn")) return doXMath(cc.getAssignedDamage(sq[0].split(" ")[1]), m, c);
if (sq[0].contains("YourDamageSourcesThisTurn")) {
Iterable<Card> allSrc = cc.getAssignedDamageSources();
String restriction = sq[0].split(" ")[1];
List<Card> filtered = CardLists.getValidCards(allSrc, restriction, cc, c);
return doXMath(filtered.size(), m, c);
}
if (sq[0].contains("YourLandsPlayed")) return doXMath(cc.getNumLandsPlayed(), m, c);
if (sq[0].contains("OppLandsPlayed")) return doXMath(ccOpp.getNumLandsPlayed(), m, c);

4
src/main/java/forge/game/player/Player.java
View File

@@ -937,6 +937,10 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
}
return num;
}
public final Iterable<Card> getAssignedDamageSources() {
return assignedDamage.keySet();
}
/**
* <p>