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

- Adding Damage Dealing strings to the Game Log so it's clear how much damage things are doing (with occasional extra info)

Browse Source
This commit is contained in:
Sol
2013-02-22 19:27:01 +00:00
parent cf50a39ad4
commit 2180f2d5c8
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/forge/Card.java
View File

@@ -8390,12 +8390,10 @@ public class Card extends GameEntity implements Comparable<Card> {
@Override @Override
public final boolean addDamageAfterPrevention(final int damageIn, final Card source, final boolean isCombat) { public final boolean addDamageAfterPrevention(final int damageIn, final Card source, final boolean isCombat) {
final int damageToAdd = damageIn; final int damageToAdd = damageIn;
boolean wither = false;
if (damageToAdd == 0) { if (damageToAdd == 0) {
return false; // Rule 119.8 return false; // Rule 119.8
} }
Log.debug("Adding " + damageToAdd + " damage to " + this.getName());
this.addReceivedDamageFromThisTurn(source, damageToAdd); this.addReceivedDamageFromThisTurn(source, damageToAdd);
source.addDealtDamageToThisTurn(this, damageToAdd); source.addDealtDamageToThisTurn(this, damageToAdd);
@@ -8410,26 +8408,30 @@ public class Card extends GameEntity implements Comparable<Card> {
runParams.put("IsCombatDamage", isCombat); runParams.put("IsCombatDamage", isCombat);
Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false); Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
String additionalLog = "";
if (this.isPlaneswalker()) { if (this.isPlaneswalker()) {
this.subtractCounter(CounterType.LOYALTY, damageToAdd); this.subtractCounter(CounterType.LOYALTY, damageToAdd);
return true; additionalLog = String.format("(Removing %d Loyalty Counters)", damageToAdd);
} else {
boolean wither = (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.alwaysWither)
|| source.hasKeyword("Wither") || source.hasKeyword("Infect"));
GameActionUtil.executeDamageToCreatureEffects(source, this, damageToAdd);
if (this.isInPlay() && wither) {
this.addCounter(CounterType.M1M1, damageToAdd, true);
additionalLog = "(As -1/-1 Counters)";
}
if (source.hasKeyword("Deathtouch") && this.isCreature()) {
Singletons.getModel().getGame().getAction().destroy(this);
additionalLog = "(Deathtouch)";
} else if (this.isInPlay() && !wither) {
this.damage += damageToAdd;
}
} }
if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.alwaysWither) Singletons.getModel().getGame().getGameLog().add("Damage", String.format("Dealing %d damage to %s. %s",
|| source.hasKeyword("Wither") || source.hasKeyword("Infect")) { damageToAdd, this.getName(), additionalLog), 3);
wither = true;
}
GameActionUtil.executeDamageToCreatureEffects(source, this, damageToAdd);
if (this.isInPlay() && wither) {
this.addCounter(CounterType.M1M1, damageToAdd, true);
}
if (source.hasKeyword("Deathtouch") && this.isCreature()) {
Singletons.getModel().getGame().getAction().destroy(this);
} else if (this.isInPlay() && !wither) {
this.damage += damageToAdd;
}
return true; return true;
} }

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

@@ -608,7 +608,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
if (damageToDo == 0) { if (damageToDo == 0) {
return false; return false;
} }
String additionalLog = "";
source.addDealtDamageToPlayerThisTurn(this.getName(), damageToDo); source.addDealtDamageToPlayerThisTurn(this.getName(), damageToDo);
boolean infect = source.hasKeyword("Infect") boolean infect = source.hasKeyword("Infect")
@@ -616,12 +616,14 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
if (infect) { if (infect) {
this.addPoisonCounters(damageToDo, source); this.addPoisonCounters(damageToDo, source);
additionalLog = "(as Poison Counters)";
} else { } else {
// Worship does not reduce the damage dealt but changes the effect // Worship does not reduce the damage dealt but changes the effect
// of the damage // of the damage
if (this.hasKeyword("Damage that would reduce your life total to less than 1 reduces it to 1 instead.") if (this.hasKeyword("Damage that would reduce your life total to less than 1 reduces it to 1 instead.")
&& this.life <= damageToDo) { && this.life <= damageToDo) {
this.loseLife(Math.min(damageToDo, this.life - 1)); this.loseLife(Math.min(damageToDo, this.life - 1));
additionalLog = "(would reduce life total to less than 1, reduced to 1 instead.)";
} else { } else {
// rule 118.2. Damage dealt to a player normally causes that // rule 118.2. Damage dealt to a player normally causes that
// player to lose that much life. // player to lose that much life.
@@ -648,6 +650,9 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
runParams.put("IsCombatDamage", isCombat); runParams.put("IsCombatDamage", isCombat);
game.getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false); game.getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
Singletons.getModel().getGame().getGameLog().add("Damage", String.format("Dealing %d damage to %s. %s",
damageToDo, this.getName(), additionalLog), 3);
return true; return true;
} }