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

Merge branch 'freezingFlame' into 'master'

Browse Source 
Extend DamagedBy and add Aegar the freezing Flame

See merge request core-developers/forge!3778
This commit is contained in:
Hans Mackowiak
2021-02-07 14:39:35 +00:00
parent 5cb2a0a8ee 15016ccf80
commit b03a641d34
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -651,24 +651,28 @@ public class CardProperty {
if ((property.endsWith("Source") || property.equals("DamagedBy")) &&
!card.getReceivedDamageFromThisTurn().containsKey(source)) {
return false;
} else if (property.endsWith("Remembered")) {
boolean matched = false;
for (final Object obj : source.getRemembered()) {
if (!(obj instanceof Card)) {
continue;
} else {
String prop = property.substring("DamagedBy".length());
boolean found = false;
for (Card d : card.getReceivedDamageFromThisTurn().keySet()) {
if (d.isValid(prop, sourceController, source, spellAbility)) {
found = true;
break;
}
matched |= card.getReceivedDamageFromThisTurn().containsKey(obj);
}
if (!matched)
return false;
} else if (property.endsWith("Equipped")) {
final Card equipee = source.getEquipping();
if (equipee == null || !card.getReceivedDamageFromThisTurn().containsKey(equipee))
return false;
} else if (property.endsWith("Enchanted")) {
final Card equipee = source.getEnchantingCard();
if (equipee == null || !card.getReceivedDamageFromThisTurn().containsKey(equipee))
if (!found) {
for (Card d : AbilityUtils.getDefinedCards(source, prop, spellAbility)) {
if (card.getReceivedDamageFromThisTurn().containsKey(d)) {
found = true;
break;
}
}
}
if (!found) {
return false;
}
}
} else if (property.startsWith("Damaged")) {
if (!card.getDealtDamageToThisTurn().containsKey(source)) {