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

- Fixed the AI changing targets of triggers with "OptionalDecider" before resolving.

Browse Source
This commit is contained in:
Sloth
2012-09-27 16:14:55 +00:00
parent 1f7a5906ec
commit 4e039e9ba4
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/r/razormane_masticore.txt
View File

@@ -10,7 +10,7 @@ SVar:DBSacrifice:DB$ Sacrifice | ConditionCheckSVar$ X | ConditionSVarCompare$ E
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Remembered$Amount
T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your draw step, you may have CARDNAME deal 3 damage to target creature.
SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 3
SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 3
SVar:RemAIDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/razormane_masticore.jpg

11
src/main/java/forge/card/spellability/TargetChoices.java
View File

@@ -124,6 +124,17 @@ public class TargetChoices {
return false;
}
/**
* <p>
* clear.
* </p>
*/
public final void clear() {
this.targetPlayers.clear();
this.targetCards.clear();
this.targetSAs.clear();
}
/**
* <p>
* removeTarget.

11
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -978,10 +978,21 @@ public class TriggerHandler {
}
}
} else {
ArrayList<Object> tgts = null;
// make sure the targets won't change
if (sa[0].getTarget() != null) {
tgts = new ArrayList<Object>(sa[0].getTarget().getTargetChoices().getTargets());
}
// This isn't quite right, but better than canPlayAI
if (!sa[0].doTrigger(isMandatory)) {
return;
}
if (sa[0].getTarget() != null) {
for (Object tgt : tgts) {
sa[0].getTarget().getTargetChoices().clear();
sa[0].getTarget().getTargetChoices().addTarget(tgt);
}
}
}
}