mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 19:28:01 +00:00
*Added Torpor Orb.
*Triggered Abilities no longer trigger AbilityCast.
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -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
|
||||
|
||||
6
res/cardsfolder/t/torpor_orb.txt
Normal file
6
res/cardsfolder/t/torpor_orb.txt
Normal 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
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -337,6 +337,21 @@ 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];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user