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 AttackerBlocked triggers.

Browse Source
This commit is contained in:
Sloth
2013-05-28 07:34:46 +00:00
parent f5603d239e
commit 081879bca4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/cardsfolder/m/minion_reflector.txt
View File

@@ -3,6 +3,7 @@ ManaCost:5
Types:Artifact Types:Artifact
T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay 2. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent." T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay 2. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent."
SVar:TrigCopy:AB$CopyPermanent | Cost$ 2 | Defined$ TriggeredCard | Keywords$ Haste | AtEOT$ Sacrifice SVar:TrigCopy:AB$CopyPermanent | Cost$ 2 | Defined$ TriggeredCard | Keywords$ Haste | AtEOT$ Sacrifice
SVar:BuffedBy:Creature
SVar:Picture:http://www.wizards.com/global/images/magic/general/minion_reflector.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/minion_reflector.jpg
Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent." Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent."
SetInfo:ALA Rare SetInfo:ALA Rare

6
src/main/java/forge/game/phase/CombatUtil.java
View File

@@ -1180,7 +1180,10 @@ public class CombatUtil {
* a {@link forge.Card} object. * a {@link forge.Card} object.
*/ */
public static void checkBlockedAttackers(final GameState game, final Card a, final List<Card> blockers) { public static void checkBlockedAttackers(final GameState game, final Card a, final List<Card> blockers) {
// System.out.println(a.getName() + " got blocked by " + b.getName());
if (blockers.isEmpty()) {
return;
}
// Run triggers // Run triggers
final HashMap<String, Object> runParams = new HashMap<String, Object>(); final HashMap<String, Object> runParams = new HashMap<String, Object>();
@@ -1188,7 +1191,6 @@ public class CombatUtil {
runParams.put("Blockers", blockers); runParams.put("Blockers", blockers);
runParams.put("NumBlockers", blockers.size()); runParams.put("NumBlockers", blockers.size());
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false); game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false);
//game.getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false);
if (!a.getDamageHistory().getCreatureGotBlockedThisCombat()) { if (!a.getDamageHistory().getCreatureGotBlockedThisCombat()) {
// Bushido // Bushido