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

Big Damage Rewrite Part 2: now use CombatDamageMap everywhere

Browse Source
This commit is contained in:
Hanmac
2016-12-30 14:50:45 +00:00
parent 4aa68c3fa6
commit 1738f49798
11 changed files with 175 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -25,6 +25,7 @@ import forge.game.ability.effects.FlipCoinEffect;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
import forge.game.card.CardDamageMap;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.CardPredicates.Presets;
@@ -385,8 +386,11 @@ public class HumanPlay {
if (!p.getController().confirmPayment(part, "Do you want " + source + " to deal " + amount + " damage to you?")) {
return false;
}
CardDamageMap damageMap = new CardDamageMap();
p.addDamage(amount, source);
p.addDamage(amount, source, damageMap);
damageMap.dealLifelinkDamage();
}
else if (part instanceof CostPutCounter) {
CounterType counterType = ((CostPutCounter) part).getCounter();