From a2761c868c8e8aa3ff74aef0aa473698e47cd653 Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 9 Oct 2018 23:10:31 +0800 Subject: [PATCH] - Updated more scripts --- .../src/main/java/forge/game/cost/CostAdjustment.java | 9 --------- forge-gui/res/cardsfolder/m/myth_unbound.txt | 6 +++--- forge-gui/res/cardsfolder/t/thirsting_axe.txt | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java index 455949c58d5..1ad50114869 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java +++ b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java @@ -503,15 +503,6 @@ public class CostAdjustment { if (!sa.isSpell() || !((Spell) sa).isCastFaceDown()) { return false; } - } else if (type.equals("SelfMonstrosity")) { - if (!(sa instanceof AbilityActivated) || !sa.hasParam("Monstrosity") || sa.isTemporary()) { - // Nemesis of Mortals - return false; - } - } else if (type.equals("SelfIntrinsicAbility")) { - if (!(sa instanceof AbilityActivated) || sa.isReplacementAbility() || sa.isTemporary()) { - return false; - } } } if (params.containsKey("AffectedZone")) { diff --git a/forge-gui/res/cardsfolder/m/myth_unbound.txt b/forge-gui/res/cardsfolder/m/myth_unbound.txt index c304efb05e6..3855b57b5b0 100644 --- a/forge-gui/res/cardsfolder/m/myth_unbound.txt +++ b/forge-gui/res/cardsfolder/m/myth_unbound.txt @@ -1,9 +1,9 @@ Name:Myth Unbound ManaCost:2 G Types:Enchantment -S:Mode$ ReduceCost | ValidCard$ Card.IsCommander | Type$ Spell | Amount$ X | EffectZone$ Command | Description$ Your commander costs {1} less to cast for each time it's been cast from the command zone this game. -T:Mode$ ChangesZone | ValidCard$ Card.IsCommander+YouOwn | TriggerZones$ Command | Origin$ Any | Destination$ Command | Execute$ TrigDraw | TriggerDescription$ Whenever your commander is put into the command zone from anywhere, draw a card. +S:Mode$ ReduceCost | ValidCard$ Card.IsCommander+YouOwn | Type$ Spell | Amount$ AffectedX | Description$ Your commander costs {1} less to cast for each time it's been cast from the command zone this game. +T:Mode$ ChangesZoneAll | ValidCard$ Card.IsCommander+YouOwn | Origin$ Any | Destination$ Command | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever your commander is put into the command zone from anywhere, draw a card. SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 -SVar:X:Count$CommanderCastFromCommandZone +SVar:AffectedX:Count$CommanderCastFromCommandZone SVar:RemRandomDeck:True Oracle:Your commander costs {1} less to cast for each time it's been cast from the command zone this game.\nWhenever your commander is put into the command zone from anywhere, draw a card. diff --git a/forge-gui/res/cardsfolder/t/thirsting_axe.txt b/forge-gui/res/cardsfolder/t/thirsting_axe.txt index a1b1326de42..cce75513ddd 100644 --- a/forge-gui/res/cardsfolder/t/thirsting_axe.txt +++ b/forge-gui/res/cardsfolder/t/thirsting_axe.txt @@ -3,7 +3,7 @@ ManaCost:3 Types:Artifact Equipment K:Equip:2 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 4 | Description$ Equipped creature gets +4/+0. -T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | IsPresent$ Card.EquippedBy+notDealtCombatDamageThisTurn Creature | TriggerZone$ Battlefield | Execute$ SacrificeEquippee | TriggerDescription$ At the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it. +T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | IsPresent$ Card.EquippedBy+notDealtCombatDamageThisTurn Creature | TriggerZones$ Battlefield | Execute$ SacrificeEquippee | TriggerDescription$ At the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it. SVar:SacrificeEquippee:DB$ SacrificeAll | Defined$ Equipped SVar:Picture:http://www.wizards.com/global/images/magic/general/thirsting_axe.jpg Oracle:Equipped creature gets +4/+0.\nAt the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it.\nEquip {2}