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

- Reverting the lifelink change for now, better solution needed.

Browse Source
This commit is contained in:
Agetian
2016-12-20 10:18:06 +00:00
parent 3fc05d6940
commit ae608246d1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6140,10 +6140,8 @@ public class Card extends GameEntity implements Comparable<Card> {
source.addDealtDamageToThisTurn(this, damageIn); source.addDealtDamageToThisTurn(this, damageIn);
if (isCombat) { if (isCombat) {
game.getCombat().addDealtDamageTo(source, this); game.getCombat().addDealtDamageTo(source, this);
} } else if (source.hasKeyword("Lifelink")) {
// LifeLink not for Combat Damage at this place
// Both combat and non-combat lifelink is handled here
if (source.hasKeyword("Lifelink")) {
source.getController().gainLife(damageIn, source); source.getController().gainLife(damageIn, source);
} }

4
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -767,6 +767,10 @@ public class Combat {
for (final Card damageSource : dealtDamageTo.keySet()) { for (final Card damageSource : dealtDamageTo.keySet()) {
final HashMap<String, Object> runParams = new HashMap<String, Object>(); final HashMap<String, Object> runParams = new HashMap<String, Object>();
int dealtDamage = damageDealtThisCombat.containsKey(damageSource) ? damageDealtThisCombat.get(damageSource) : 0; int dealtDamage = damageDealtThisCombat.containsKey(damageSource) ? damageDealtThisCombat.get(damageSource) : 0;
// LifeLink for Combat Damage at this place
if (dealtDamage > 0 && damageSource.hasKeyword("Lifelink")) {
damageSource.getController().gainLife(dealtDamage, damageSource);
}
runParams.put("DamageSource", damageSource); runParams.put("DamageSource", damageSource);
runParams.put("DamageTargets", dealtDamageTo.get(damageSource)); runParams.put("DamageTargets", dealtDamageTo.get(damageSource));
runParams.put("DamageAmount", dealtDamage); runParams.put("DamageAmount", dealtDamage);

6
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -560,10 +560,8 @@ public class Player extends GameEntity implements Comparable<Player> {
for (final String type : source.getType()) { for (final String type : source.getType()) {
source.getController().addProwlType(type); source.getController().addProwlType(type);
} }
} } else if (source.hasKeyword("Lifelink")) {
// LifeLink not for Combat Damage at this place
// Both combat and non-combat lifelink is handled here
if (source.hasKeyword("Lifelink")) {
source.getController().gainLife(amount, source); source.getController().gainLife(amount, source);
} }