From fc36a0ba74c98f6e63b3e1980c9d7ae404ea0d7b Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:36:17 +0000 Subject: [PATCH] - Reverted Conquering Manticore to AB. --- res/cardsfolder/conquering_manticore.txt | 2 +- src/forge/ComputerUtil_Block2.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/conquering_manticore.txt b/res/cardsfolder/conquering_manticore.txt index 64f46a5b5b3..7126bba3bf7 100644 --- a/res/cardsfolder/conquering_manticore.txt +++ b/res/cardsfolder/conquering_manticore.txt @@ -5,7 +5,7 @@ Text:no text PT:5/5 K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. -SVar:TrigChange:DB$GainControl | TgtPrompt$ Choose target creature you don't control | ValidTgts$ Creature.YouDontCtrl | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. +SVar:TrigChange:AB$GainControl | Cost$ 0 | TgtPrompt$ Choose target creature you don't control | ValidTgts$ Creature.YouDontCtrl | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/conquering_manticore.jpg SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/139.jpg diff --git a/src/forge/ComputerUtil_Block2.java b/src/forge/ComputerUtil_Block2.java index 762f6c16580..f28b598a7ae 100644 --- a/src/forge/ComputerUtil_Block2.java +++ b/src/forge/ComputerUtil_Block2.java @@ -10,7 +10,7 @@ public class ComputerUtil_Block2 { private static CardList attackers = new CardList(); //all attackers private static CardList attackersLeft = new CardList(); //keeps track of all currently unblocked attackers - private static CardList blockedButUnkilled = new CardList(); //keeps track of all blocked attackers that currently wouldn't be destroyed + private static CardList blockedButUnkilled = new CardList(); //blocked attackers that currently wouldn't be destroyed private static CardList blockersLeft = new CardList(); //keeps track of all unassigned blockers private static int diff = 0; @@ -213,7 +213,7 @@ public class ComputerUtil_Block2 if(attacker.getKillDamage() > currentDamage && !(attacker.getKillDamage() > currentDamage + additionalDamage) //The attacker will be killed && (absorbedDamage2 + absorbedDamage > attacker.getNetCombatDamage() //only one blocker can be killed - || currentValue + addedValue - 50 <= CardFactoryUtil.evaluateCreature(attacker)) //attacker is worth than the sum + || currentValue + addedValue - 50 <= CardFactoryUtil.evaluateCreature(attacker)) //attacker is worth more && CombatUtil.canBlock(attacker,blocker,combat)) {//this is needed for attackers that can't be blocked by more than 1 currentAttackers.remove(attacker); combat.addBlocker(attacker, blocker);