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

Change deathtouch into a state-based action (as specified by the comp rules) rather than directly destroying the creature, fixing some bugs related to triggers.

Browse Source
This commit is contained in:
elcnesh
2014-11-23 14:51:41 +00:00
parent 2e5202e9f1
commit d7943d767f
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -210,6 +210,7 @@ public class GameAction {
if (fromBattlefield) {
c.setZone(zoneTo);
c.setDamage(0); //clear damage after a card leaves the battlefield
c.setHasBeenDealtDeathtouchDamage(false);
if (c.isTapped()) {
c.setTapped(false); //untap card after it leaves the battlefield if needed
game.fireEvent(new GameEventCardTapped(c, false));
@@ -703,7 +704,8 @@ public class GameAction {
}
}
// Rule 704.5g - Destroy due to lethal damage
else if (c.getNetToughness() <= c.getDamage()) {
// Rule 704.5h - Destroy due to deathtouch
else if (c.getNetToughness() <= c.getDamage() || c.hasBeenDealtDeathtouchDamage()) {
if (desCreats == null) {
desCreats = new LinkedList<Card>();
}
@@ -1129,6 +1131,7 @@ public class GameAction {
&& (c.getShieldCount() > 0 || c.hasKeyword("If CARDNAME would be destroyed, regenerate it."))) {
c.subtractShield(c.getController().getController().chooseRegenerationShield(c));
c.setDamage(0);
c.setHasBeenDealtDeathtouchDamage(false);
c.tap();
c.addRegeneratedThisTurn();
if (game.getCombat() != null) {

1
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
View File

@@ -143,6 +143,7 @@ public class DamageDealEffect extends SpellAbilityEffect {
if (c.isInPlay() && (!targeted || c.canBeTargetedBy(sa))) {
if (removeDamage) {
c.setDamage(0);
c.setHasBeenDealtDeathtouchDamage(false);
c.clearAssignedDamage();
}
else if (noPrevention) {

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

@@ -200,6 +200,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
private String oracleText = "";
private int damage;
private boolean hasBeenDealtDeathtouchDamage = false;
// regeneration
private List<CardShields> shields = new ArrayList<CardShields>();
@@ -5138,6 +5139,13 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
getGame().fireEvent(new GameEventCardStatsChanged(this));
}
public final boolean hasBeenDealtDeathtouchDamage() {
return hasBeenDealtDeathtouchDamage;
}
public final void setHasBeenDealtDeathtouchDamage(final boolean hasBeenDealtDeatchtouchDamage) {
this.hasBeenDealtDeathtouchDamage = hasBeenDealtDeatchtouchDamage;
}
public final Map<Card, Integer> getAssignedDamageMap() {
return assignedDamageMap;
}
@@ -5545,7 +5553,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
}
if (source.hasKeyword("Deathtouch") && isCreature()) {
game.getAction().destroy(this, null);
setHasBeenDealtDeathtouchDamage(true);
damageType = DamageType.Deathtouch;
}
@@ -6038,6 +6046,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
public void onCleanupPhase(final Player turn) {
setDamage(0);
setHasBeenDealtDeathtouchDamage(false);
resetPreventNextDamage();
resetPreventNextDamageWithEffect();
resetReceivedDamageFromThisTurn();