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

- "DamageDone" replacement effects can now have the parameter "PreventionEffect$ True" to mark them as damage prevention effects.

Browse Source 
- Fixed Vigor.
This commit is contained in:
Sloth
2012-02-06 17:40:57 +00:00
parent f2b67e0e30
commit cfb9434cee
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/v/vigor.txt
View File

@@ -4,7 +4,7 @@ Types:Creature Elemental Incarnation
Text:no text
PT:6/6
K:Trample
R:Event$ DamageDone | ValidTarget$ Creature.YouCtrl+Other | ReplaceWith$ Counters | Description$ If damage would be dealt to a creature you control other than Vigor, prevent that damage. Put a +1/+1 counter on that creature for each 1 damage prevented this way.
R:Event$ DamageDone | ValidTarget$ Creature.YouCtrl+Other | ReplaceWith$ Counters | PreventionEffect$ True | Description$ If damage would be dealt to a creature you control other than Vigor, prevent that damage. Put a +1/+1 counter on that creature for each 1 damage prevented this way.
SVar:Counters:AB$PutCounter | Cost$ 0 | Defined$ ReplacedTarget | CounterType$ P1P1 | CounterNum$ X
SVar:X:ReplaceCount$DamageAmount
T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.Self | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.

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

@@ -7994,6 +7994,18 @@ public class Card extends GameEntity implements Comparable<Card> {
return 0;
}
final HashMap<String, Object> repParams = new HashMap<String, Object>();
repParams.put("Event", "DamageDone");
repParams.put("Affected", this);
repParams.put("DamageSource", source);
repParams.put("DamageAmount", damage);
repParams.put("IsCombat", isCombat);
repParams.put("Prevention", false);
if (AllZone.getReplacementHandler().run(repParams)) {
return 0;
}
restDamage = this.staticDamagePrevention(restDamage, source, isCombat);
if (restDamage == 0) {

3
src/main/java/forge/card/replacement/ReplaceDamage.java
View File

@@ -48,6 +48,9 @@ public class ReplaceDamage extends ReplacementEffect {
if (!runParams.get("Event").equals("DamageDone")) {
return false;
}
if (!(runParams.containsKey("Prevention") == getMapParams().containsKey("PreventionEffect"))) {
return false;
}
if (getMapParams().containsKey("ValidSource")) {
if (!matchesValid(runParams.get("DamageSource"), getMapParams().get("ValidSource").split(","), getHostCard())) {
return false;