*Added Torpor Orb.

*Triggered Abilities no longer trigger AbilityCast.
This commit is contained in:
Hellfish
2011-08-23 20:45:16 +00:00
parent d2f48dfa98
commit 8d29f7b3ce
4 changed files with 24 additions and 2 deletions

1
.gitattributes vendored
View File

@@ -7903,6 +7903,7 @@ res/cardsfolder/t/tormented_angel.txt svneol=native#text/plain
res/cardsfolder/t/tormented_soul.txt svneol=native#text/plain
res/cardsfolder/t/tormods_crypt.txt svneol=native#text/plain
res/cardsfolder/t/torpor_dust.txt svneol=native#text/plain
res/cardsfolder/t/torpor_orb.txt -text
res/cardsfolder/t/torrent_of_fire.txt svneol=native#text/plain
res/cardsfolder/t/torsten_von_ursus.txt svneol=native#text/plain
res/cardsfolder/t/tortoise_formation.txt svneol=native#text/plain

View File

@@ -0,0 +1,6 @@
Name:Torpor Orb
ManaCost:2
Types:Artifact
Text:Creatures entering the battlefield don't cause abilities to trigger.
SVar:Rarity:Rare
End

View File

@@ -535,7 +535,7 @@ public class MagicStack extends MyObservable {
}
//Run AbilityCast triggers
if (sp.isAbility()) {
if (sp.isAbility() && !sp.isTrigger()) {
AllZone.getTriggerHandler().runTrigger("AbilityCast", runParams);
}

View File

@@ -336,7 +336,22 @@ public class TriggerHandler {
{
return false; //Test failed.
}
//Torpor Orb check
CardList torporOrbs = AllZoneUtil.getCardsInPlay("Torpor Orb");
if(torporOrbs.size() != 0 && mode.equals("ChangesZone") && regtrig.getMapParams().get("ValidCard").contains("Creature"))
{
return false;
}
if(torporOrbs.size() != 0 && regtrig.getMapParams().containsKey("Destination"))
{
if(!regtrig.getMapParams().get("Destination").equals("Battlefield"))
{
return false;
}
}
HashMap<String, String> trigParams = regtrig.getMapParams();
final Player[] decider = new Player[1];