From 24e32e7af6dc91a6c3a2800479a36d732a62d7cc Mon Sep 17 00:00:00 2001 From: tool4ever Date: Wed, 28 Dec 2022 22:45:53 +0100 Subject: [PATCH] Clean up (#2185) --- .../game/staticability/StaticAbilityPanharmonicon.java | 4 ++-- forge-gui/res/cardsfolder/a/acidic_sliver.txt | 2 +- forge-gui/res/cardsfolder/a/anavolver.txt | 2 +- forge-gui/res/cardsfolder/a/animal_boneyard.txt | 2 +- forge-gui/res/cardsfolder/a/arcane_teachings.txt | 2 +- forge-gui/res/cardsfolder/b/barbed_field.txt | 2 +- forge-gui/res/cardsfolder/b/basal_sliver.txt | 2 +- forge-gui/res/cardsfolder/c/cephalid_shrine.txt | 8 +++----- forge-gui/res/cardsfolder/e/emberwilde_captain.txt | 8 +++----- forge-gui/res/cardsfolder/e/eye_of_singularity.txt | 10 ++++------ forge-gui/res/cardsfolder/i/illuna_apex_of_wishes.txt | 6 ++---- forge-gui/res/cardsfolder/m/mentor_of_the_meek.txt | 2 +- forge-gui/res/cardsfolder/n/natures_will.txt | 8 +++----- forge-gui/res/cardsfolder/p/personal_incarnation.txt | 6 ++---- .../s/sasaya_orochi_ascendant_sasayas_essence.txt | 6 ++---- forge-gui/res/cardsfolder/s/sigil_of_valor.txt | 6 ++---- 16 files changed, 30 insertions(+), 46 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java index e71134638b5..00ee0ccc414 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java @@ -100,8 +100,8 @@ public class StaticAbilityPanharmonicon { } } else if (trigMode.equals(TriggerType.ChangesZoneAll)) { // Check if the cards have a trigger at all - final String origin = stAb.getParamOrDefault("Origin", null); - final String destination = stAb.getParamOrDefault("Destination", null); + final String origin = stAb.getParam("Origin"); + final String destination = stAb.getParam("Destination"); final CardZoneTable table = (CardZoneTable) runParams.get(AbilityKey.Cards); if (table.filterCards(origin == null ? null : ImmutableList.of(ZoneType.smartValueOf(origin)), ZoneType.smartValueOf(destination), stAb.getParam("ValidCause"), card, stAb).isEmpty()) { diff --git a/forge-gui/res/cardsfolder/a/acidic_sliver.txt b/forge-gui/res/cardsfolder/a/acidic_sliver.txt index c6f3144c5da..ee78d610d50 100644 --- a/forge-gui/res/cardsfolder/a/acidic_sliver.txt +++ b/forge-gui/res/cardsfolder/a/acidic_sliver.txt @@ -3,6 +3,6 @@ ManaCost:B R Types:Creature Sliver PT:2/2 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Damage | Description$ All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to any target." -SVar:Damage:AB$DealDamage | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target. +SVar:Damage:AB$ DealDamage | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target. SVar:BuffedBy:Sliver Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to any target." diff --git a/forge-gui/res/cardsfolder/a/anavolver.txt b/forge-gui/res/cardsfolder/a/anavolver.txt index c049d5713e1..d67913f4d16 100644 --- a/forge-gui/res/cardsfolder/a/anavolver.txt +++ b/forge-gui/res/cardsfolder/a/anavolver.txt @@ -9,7 +9,7 @@ SVar:VolverStrength:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | Counter SVar:VolverLaunch:DB$ Animate | Defined$ Self | Keywords$ Flying | Duration$ Permanent SVar:VolverPumped:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ETB$ True | SubAbility$ VolverResilience | SpellDescription$ If CARDNAME was kicked with its {B} kicker, it enters the battlefield with a +1/+1 counter on it and with "Pay 3 life: Regenerate CARDNAME." SVar:VolverResilience:DB$ Animate | Defined$ Self | Abilities$ ABRegen | Duration$ Permanent -SVar:ABRegen:AB$Regenerate | Cost$ PayLife<3> | SpellDescription$ Regenerate CARDNAME. +SVar:ABRegen:AB$ Regenerate | Cost$ PayLife<3> | SpellDescription$ Regenerate CARDNAME. AI:RemoveDeck:Random DeckNeeds:Color$Blue|Black DeckHas:Ability$Counters diff --git a/forge-gui/res/cardsfolder/a/animal_boneyard.txt b/forge-gui/res/cardsfolder/a/animal_boneyard.txt index d979cc8c48f..f4181417a46 100644 --- a/forge-gui/res/cardsfolder/a/animal_boneyard.txt +++ b/forge-gui/res/cardsfolder/a/animal_boneyard.txt @@ -4,7 +4,7 @@ Types:Enchantment Aura K:Enchant land A:SP$ Attach | Cost$ 2 W | ValidTgts$ Land | AILogic$ Pump S:Mode$ Continuous | Affected$ Land.AttachedBy | AddAbility$ GainLife | AddSVar$ AnimalBoneyardX | Description$ Enchanted land has "{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness." -SVar:GainLife:AB$GainLife | Cost$ T Sac<1/Creature> | LifeAmount$ AnimalBoneyardX | SpellDescription$ You gain life equal to the sacrificed creature's toughness. +SVar:GainLife:AB$ GainLife | Cost$ T Sac<1/Creature> | LifeAmount$ AnimalBoneyardX | SpellDescription$ You gain life equal to the sacrificed creature's toughness. SVar:AnimalBoneyardX:Sacrificed$CardToughness AI:RemoveDeck:All SVar:NonStackingAttachEffect:True diff --git a/forge-gui/res/cardsfolder/a/arcane_teachings.txt b/forge-gui/res/cardsfolder/a/arcane_teachings.txt index b214189fad8..54385c23da4 100644 --- a/forge-gui/res/cardsfolder/a/arcane_teachings.txt +++ b/forge-gui/res/cardsfolder/a/arcane_teachings.txt @@ -4,5 +4,5 @@ Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddAbility$ Damage | Description$ Enchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to any target." -SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nEnchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to any target." diff --git a/forge-gui/res/cardsfolder/b/barbed_field.txt b/forge-gui/res/cardsfolder/b/barbed_field.txt index 0efbeeee681..e57ce0fbd47 100644 --- a/forge-gui/res/cardsfolder/b/barbed_field.txt +++ b/forge-gui/res/cardsfolder/b/barbed_field.txt @@ -4,6 +4,6 @@ Types:Enchantment Aura K:Enchant land A:SP$ Attach | Cost$ 2 R R | ValidTgts$ Land | AILogic$ Pump S:Mode$ Continuous | Affected$ Land.EnchantedBy | AddAbility$ Damage | Description$ Enchanted land has "{T}: This land deals 1 damage to any target." -SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. SVar:NonStackingAttachEffect:True Oracle:Enchant land\nEnchanted land has "{T}: This land deals 1 damage to any target." diff --git a/forge-gui/res/cardsfolder/b/basal_sliver.txt b/forge-gui/res/cardsfolder/b/basal_sliver.txt index 5fe4e91b7df..c971ebafc71 100644 --- a/forge-gui/res/cardsfolder/b/basal_sliver.txt +++ b/forge-gui/res/cardsfolder/b/basal_sliver.txt @@ -3,6 +3,6 @@ ManaCost:2 B Types:Creature Sliver PT:2/2 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Mana | Description$ All Slivers have "Sacrifice this permanent: Add {B}{B}." -SVar:Mana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}. +SVar:Mana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}. AI:RemoveDeck:All Oracle:All Slivers have "Sacrifice this permanent: Add {B}{B}." diff --git a/forge-gui/res/cardsfolder/c/cephalid_shrine.txt b/forge-gui/res/cardsfolder/c/cephalid_shrine.txt index 3037a0bf0bb..a77fc4f2c45 100644 --- a/forge-gui/res/cardsfolder/c/cephalid_shrine.txt +++ b/forge-gui/res/cardsfolder/c/cephalid_shrine.txt @@ -1,10 +1,8 @@ Name:Cephalid Shrine ManaCost:1 U U Types:Enchantment -T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigCounterRem | TriggerDescription$ Whenever a player casts a spell, counter that spell unless that player pays {X}, where X is the number of cards in all graveyards with the same name as the spell. -SVar:TrigCounterRem:DB$ Pump | RememberObjects$ TriggeredCard | SubAbility$ DBCounter -SVar:DBCounter:DB$ Counter | Defined$ TriggeredSpellAbility | UnlessCost$ X | UnlessPayer$ TriggeredActivator | SubAbility$ DBCleanup -SVar:X:Count$ValidGraveyard Card.sharesNameWith Remembered -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a player casts a spell, counter that spell unless that player pays {X}, where X is the number of cards in all graveyards with the same name as the spell. +SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSpellAbility | UnlessCost$ X | UnlessPayer$ TriggeredActivator +SVar:X:Count$ValidGraveyard Card.sharesNameWith TriggeredCard AI:RemoveDeck:Random Oracle:Whenever a player casts a spell, counter that spell unless that player pays {X}, where X is the number of cards in all graveyards with the same name as the spell. diff --git a/forge-gui/res/cardsfolder/e/emberwilde_captain.txt b/forge-gui/res/cardsfolder/e/emberwilde_captain.txt index 5ad9b59621d..4da6db5ac1e 100644 --- a/forge-gui/res/cardsfolder/e/emberwilde_captain.txt +++ b/forge-gui/res/cardsfolder/e/emberwilde_captain.txt @@ -4,9 +4,7 @@ Types:Creature Djinn Pirate PT:4/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch. SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You -T:Mode$ AttackersDeclared | AttackingPlayer$ Player.Opponent | AttackedTarget$ You | NoResolvingCheck$ True | CheckDefinedPlayer$ You.isMonarch | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an opponent attacks you while you're the monarch, CARDNAME deals damage to that player equal to the number of cards in their hand. -SVar:TrigPump:DB$ Pump | RememberObjects$ TriggeredAttackingPlayer | SubAbility$ DBDmg -SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$ValidHand Card.RememberedPlayerCtrl +T:Mode$ AttackersDeclared | AttackingPlayer$ Player.Opponent | AttackedTarget$ You | NoResolvingCheck$ True | CheckDefinedPlayer$ You.isMonarch | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent attacks you while you're the monarch, CARDNAME deals damage to that player equal to the number of cards in their hand. +SVar:TrigDmg:DB$ DealDamage | Defined$ TriggeredAttackingPlayer | NumDmg$ X +SVar:X:Count$ValidHand Card.OwnedBy TriggeredAttackingPlayer Oracle:When Emberwilde Captain enters the battlefield, you become the monarch.\nWhenever an opponent attacks you while you're the monarch, Emberwilde Captain deals damage to that player equal to the number of cards in their hand. diff --git a/forge-gui/res/cardsfolder/e/eye_of_singularity.txt b/forge-gui/res/cardsfolder/e/eye_of_singularity.txt index 59c2fb204f6..f261f334185 100644 --- a/forge-gui/res/cardsfolder/e/eye_of_singularity.txt +++ b/forge-gui/res/cardsfolder/e/eye_of_singularity.txt @@ -2,11 +2,9 @@ Name:Eye of Singularity ManaCost:3 W Types:World Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ When CARDNAME enters the battlefield, destroy each permanent with the same name as another permanent, except for basic lands. They can't be regenerated. -SVar:TrigRepeat:DB$ RepeatEach | RepeatCards$ Permanent.nonBasic | RepeatSubAbility$ DBDestroy | UseImprinted$ True | SubAbility$ DBCleanup -SVar:DBDestroy:DB$ Destroy | Defined$ Valid Permanent.sharesNameWith Imprinted+IsNotImprinted | NoRegen$ True -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.nonBasic | TriggerZones$ Battlefield | Execute$ TrigDestroyRem | TriggerDescription$ Whenever a permanent other than a basic land enters the battlefield, destroy all other permanents with that name. They can't be regenerated. -SVar:TrigDestroyRem:DB$ Pump | RememberObjects$ TriggeredCard | SubAbility$ DBDestroyAll -SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Permanent.IsNotRemembered+sharesNameWith Remembered | NoRegen$ True | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:TrigRepeat:DB$ RepeatEach | RepeatCards$ Permanent.nonBasic | RepeatSubAbility$ DBDestroy +SVar:DBDestroy:DB$ Destroy | Defined$ Valid Permanent.sharesNameWith Remembered+IsNotRemembered | NoRegen$ True +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.nonBasic | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever a permanent other than a basic land enters the battlefield, destroy all other permanents with that name. They can't be regenerated. +SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Permanent.NotTriggeredCard+sharesNameWith TriggeredCard | NoRegen$ True AI:RemoveDeck:All Oracle:When Eye of Singularity enters the battlefield, destroy each permanent with the same name as another permanent, except for basic lands. They can't be regenerated.\nWhenever a permanent other than a basic land enters the battlefield, destroy all other permanents with that name. They can't be regenerated. diff --git a/forge-gui/res/cardsfolder/i/illuna_apex_of_wishes.txt b/forge-gui/res/cardsfolder/i/illuna_apex_of_wishes.txt index 8006aae5385..c51ca78b14d 100644 --- a/forge-gui/res/cardsfolder/i/illuna_apex_of_wishes.txt +++ b/forge-gui/res/cardsfolder/i/illuna_apex_of_wishes.txt @@ -6,9 +6,7 @@ K:Mutate:3 RG U U K:Flying K:Trample T:Mode$ Mutates | ValidCard$ Card.Self | Execute$ TrigDigUntil | TriggerDescription$ Whenever this creature mutates, exile cards from the top of your library until you exile a nonland permanent card. Put that card onto the battlefield or into your hand. -SVar:TrigDigUntil:DB$ DigUntil | Valid$ Permanent.nonLand | ValidDescription$ nonland permanent | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBChoose -SVar:DBChoose:DB$ GenericChoice | Choices$ Battlefield,Hand | Defined$ You -SVar:Battlefield:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup | SpellDescription$ Put the nonland permanent onto the battlefield -SVar:Hand:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Hand | SubAbility$ DBCleanup | SpellDescription$ Put the nonland permanent into your hand +SVar:TrigDigUntil:DB$ DigUntil | Valid$ Permanent.nonLand | ValidDescription$ nonland permanent | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBChange +SVar:DBChange:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | DestinationAlternative$ Hand | AlternativeDestinationMessage$ Put that card onto the battlefield instead of putting it into your hand? | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:Mutate {3}{R/G}{U}{U} (If you cast this spell for its mutate cost, put it over or under target non-Human creature you own. They mutate into the creature on top plus all abilities from under it.)\nFlying, trample\nWhenever this creature mutates, exile cards from the top of your library until you exile a nonland permanent card. Put that card onto the battlefield or into your hand. diff --git a/forge-gui/res/cardsfolder/m/mentor_of_the_meek.txt b/forge-gui/res/cardsfolder/m/mentor_of_the_meek.txt index f6bbf8e3f60..18f36c1f600 100644 --- a/forge-gui/res/cardsfolder/m/mentor_of_the_meek.txt +++ b/forge-gui/res/cardsfolder/m/mentor_of_the_meek.txt @@ -3,6 +3,6 @@ ManaCost:2 W Types:Creature Human Soldier PT:2/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDraw | Optional$ True | TriggerDescription$ Whenever another creature with power 2 or less enters the battlefield under your control, you may pay {1}. If you do, draw a card. -SVar:TrigDraw:AB$Draw | Cost$ 1 | NumCards$ 1 | SpellDescription$ Draw a card. +SVar:TrigDraw:AB$ Draw | Cost$ 1 | NumCards$ 1 | SpellDescription$ Draw a card. SVar:PlayMain1:TRUE Oracle:Whenever another creature with power 2 or less enters the battlefield under your control, you may pay {1}. If you do, draw a card. diff --git a/forge-gui/res/cardsfolder/n/natures_will.txt b/forge-gui/res/cardsfolder/n/natures_will.txt index f3988cc3a83..ea16cf4cace 100644 --- a/forge-gui/res/cardsfolder/n/natures_will.txt +++ b/forge-gui/res/cardsfolder/n/natures_will.txt @@ -1,10 +1,8 @@ Name:Nature's Will ManaCost:2 G G Types:Enchantment -T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigRememberTarget | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, tap all lands that player controls and untap all lands you control. -SVar:TrigRememberTarget:DB$ Pump | RememberObjects$ TriggeredTarget | SubAbility$ DBTapAll -SVar:DBTapAll:DB$ TapAll | ValidCards$ Land.RememberedPlayerCtrl | SubAbility$ DBUntapAll -SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Land.YouCtrl | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ DBTapAll | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, tap all lands that player controls and untap all lands you control. +SVar:DBTapAll:DB$ TapAll | ValidCards$ Land.ControlledBy TriggeredTarget | SubAbility$ DBUntapAll +SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Land.YouCtrl SVar:PlayMain1:TRUE Oracle:Whenever one or more creatures you control deal combat damage to a player, tap all lands that player controls and untap all lands you control. diff --git a/forge-gui/res/cardsfolder/p/personal_incarnation.txt b/forge-gui/res/cardsfolder/p/personal_incarnation.txt index a5609389dd0..401055f6c66 100644 --- a/forge-gui/res/cardsfolder/p/personal_incarnation.txt +++ b/forge-gui/res/cardsfolder/p/personal_incarnation.txt @@ -6,9 +6,7 @@ A:AB$ Effect | Cost$ 0 | Activator$ Player.Owner | Name$ Personal Incarnation Re SVar:RedirectDamage:Event$ DamageDone | ValidTarget$ Creature.EffectSource | ReplaceWith$ RedirectDmg | DamageTarget$ You | Description$ The next 1 damage that would be dealt to EFFECTSOURCE this turn is dealt to its owner instead. Only EFFECTSOURCE's owner may activate this ability. SVar:RedirectDmg:DB$ ReplaceSplitDamage | DamageTarget$ You T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME dies, its owner loses half their life, rounded up. -SVar:TrigLoseLife:DB$ Pump | RememberObjects$ TriggeredCardOwner | SubAbility$ DBLoseLife -SVar:DBLoseLife:DB$ LoseLife | Defined$ Remembered | LifeAmount$ HavocX | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:HavocX:PlayerCountRemembered$LifeTotal/HalfUp +SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardOwner | LifeAmount$ HavocX +SVar:HavocX:PlayerCountDefinedTriggeredCardOwner$LifeTotal/HalfUp AI:RemoveDeck:All Oracle:{0}: The next 1 damage that would be dealt to Personal Incarnation this turn is dealt to its owner instead. Only Personal Incarnation's owner may activate this ability.\nWhen Personal Incarnation dies, its owner loses half their life, rounded up. diff --git a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt index 88cf440bd17..fe1bafcc93f 100644 --- a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt +++ b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt @@ -13,9 +13,7 @@ Name:Sasaya's Essence ManaCost:1 G G Colors:green Types:Legendary Enchantment -T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a land you control is tapped for mana, add an additional one mana of any type that land produced for each other land you control with the same name as it. -SVar:TrigMana:DB$ Pump | RememberObjects$ TriggeredCard | SubAbility$ DBRepeat -SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Land.YouCtrl+IsNotRemembered+sharesNameWith Remembered | RepeatSubAbility$ DBManaReflect | SubAbility$ DBCleanup +T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBRepeat | Static$ True | TriggerDescription$ Whenever a land you control is tapped for mana, add an additional one mana of any type that land produced for each other land you control with the same name as it. +SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Land.YouCtrl+NotTriggeredCard+sharesNameWith TriggeredCard | RepeatSubAbility$ DBManaReflect SVar:DBManaReflect:DB$ ManaReflected | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ You -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:Whenever a land you control is tapped for mana, add an additional one mana of any type that land produced for each other land you control with the same name as it. diff --git a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt index b13987ae686..de392054a90 100644 --- a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt +++ b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt @@ -3,8 +3,6 @@ ManaCost:2 Types:Artifact Equipment K:Equip:1 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Alone$ True | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control. -SVar:TrigPump:DB$ Pump | RememberObjects$ TriggeredAttacker | SubAbility$ TrigPump2 -SVar:TrigPump2:DB$ Pump | Defined$ Remembered | NumAtt$ X | NumDef$ X | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$Valid Creature.YouCtrl+IsNotRemembered +SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ X | NumDef$ X +SVar:X:Count$Valid Creature.YouCtrl+NotTriggeredAttacker Oracle:Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)