external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some cards

Browse Source
This commit is contained in:
tool4EvEr
2021-06-14 20:45:52 +02:00
parent 4049a3eea3
commit f447ab64ce
15 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -125,7 +125,6 @@ public class ForgeScript {
}
public static boolean spellAbilityHasProperty(SpellAbility sa, String property, Player sourceController,
Card source, CardTraitBase spellAbility) {
if (property.equals("ManaAbility")) {

3
forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
View File

@@ -193,7 +193,7 @@ public class CounterEffect extends SpellAbilityEffect {
params.put(AbilityKey.StackSi, si);
String destination = srcSA.hasParam("Destination") ? srcSA.getParam("Destination") : tgtSA.isAftermath() ? "Exile" : "Graveyard";
if (srcSA.hasParam("DestinationChoice")) {//Hinder
if (srcSA.hasParam("DestinationChoice")) { //Hinder
List<String> pos = Arrays.asList(srcSA.getParam("DestinationChoice").split(","));
destination = srcSA.getActivatingPlayer().getController().chooseSomeType(Localizer.getInstance().getMessage("lblRemoveDestination"), tgtSA, pos, null);
}
@@ -211,7 +211,6 @@ public class CounterEffect extends SpellAbilityEffect {
} else if (destination.equals("Battlefield")) {
if (tgtSA instanceof SpellPermanent) {
Card c = tgtSA.getHostCard();
System.out.println(c + " is SpellPermanent");
c.setController(srcSA.getActivatingPlayer(), 0);
game.getAction().moveToPlay(c, srcSA.getActivatingPlayer(), srcSA, params);
} else {

1
forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
View File

@@ -44,7 +44,6 @@ public class ReplaceDiscard extends ReplacementEffect {
*/
@Override
public boolean canReplace(Map<AbilityKey, Object> runParams) {
if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Affected))) {
return false;
}

1
forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java
View File

@@ -28,7 +28,6 @@ public class ReplaceMoved extends ReplacementEffect {
*/
@Override
public boolean canReplace(Map<AbilityKey, Object> runParams) {
if (!matchesValidParam("ValidCard", runParams.get(AbilityKey.Affected))) {
return false;
}

2
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -281,7 +281,7 @@ public class ReplacementHandler {
// Updated Replacements need to be logged elsewhere because its otherwise in the wrong order
if (res != ReplacementResult.Updated) {
String message = chosenRE.getDescription();
if ( !StringUtils.isEmpty(message))
if (!StringUtils.isEmpty(message))
if (chosenRE.getHostCard() != null) {
message = TextUtil.fastReplace(message, "CARDNAME", chosenRE.getHostCard().getName());
}

1
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -385,7 +385,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
manaPart = manaPart0;
}
// Spell, and Ability, and other Ability objects override this method
public abstract boolean canPlay();

1
forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
View File

@@ -73,7 +73,6 @@ public class TriggerDiscarded extends Trigger {
return true;
}
/** {@inheritDoc} */
@Override
public final void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {

4
forge-gui/res/cardsfolder/b/butcher_of_malakir.txt
View File

@@ -3,8 +3,6 @@ ManaCost:5 B B
Types:Creature Vampire Warrior
PT:5/4
K:Flying
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent sacrifices a creature.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent sacrifices a creature.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent sacrifices a creature.
SVar:TrigSac:DB$ Sacrifice | Defined$ Player.Opponent | SacValid$ Creature
SVar:Picture:http://www.wizards.com/global/images/magic/general/butcher_of_malakir.jpg
Oracle:Flying\nWhenever Butcher of Malakir or another creature you control dies, each opponent sacrifices a creature.

3
forge-gui/res/cardsfolder/m/mycoid_shepherd.txt
View File

@@ -2,8 +2,7 @@ Name:Mycoid Shepherd
ManaCost:1 G G W
Types:Creature Fungus
PT:5/4
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME or another creature you control with power 5 or greater dies, you may gain 5 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+powerGE5+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | Secondary$ True | TriggerDescription$ When CARDNAME or another creature you control with power 5 or greater dies, you may gain 5 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+powerGE5+YouCtrl | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME or another creature you control with power 5 or greater dies, you may gain 5 life.
SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ 5
SVar:Picture:http://www.wizards.com/global/images/magic/general/mycoid_shepherd.jpg
Oracle:Whenever Mycoid Shepherd or another creature you control with power 5 or greater dies, you may gain 5 life.

6
forge-gui/res/cardsfolder/p/pious_evangel_wayward_disciple.txt
View File

@@ -2,8 +2,7 @@ Name:Pious Evangel
ManaCost:2 W
Types:Creature Human Cleric
PT:2/2
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, you gain 1 life.
T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigGainLife | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, you gain 1 life.
T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigGainLife | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, you gain 1 life.
SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
A:AB$SetState | Cost$ 2 T Sac<1/Permanent.Other/another permanent> | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
SVar:Picture:http://www.wizards.com/global/images/magic/general/pious_evangel.jpg
@@ -17,8 +16,7 @@ ManaCost:no cost
Colors:black
Types:Creature Human Cleric
PT:2/4
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature you control dies, target opponent loses 1 life and you gain 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDrain | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control dies, target opponent loses 1 life and you gain 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature you control dies, target opponent loses 1 life and you gain 1 life.
SVar:TrigDrain:DB$LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/wayward_disciple.jpg

4
forge-gui/res/cardsfolder/s/silhouette.txt
View File

@@ -1,10 +1,6 @@
Name:Silhouette
ManaCost:1 U
Types:Instant
A:SP$ Effect | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberObjects$ Targeted | ReplacementEffects$ RPrevent | StackDescription$ SpellDescription | SpellDescription$ Choose target creature. If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
SVar:RPrevent:Event$ DamageDone | ValidCause$ Spell.IsTargeting Remembered,Activated.IsTargeting Remembered | ValidTarget$ Card.IsRemembered | Prevent$ True | Description$ If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
SVar:Picture:http://www.wizards.com/global/images/magic/general/silhouette.jpg
Oracle:Choose target creature. If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.

2
forge-gui/res/cardsfolder/s/slurrk_all_ingesting.txt
View File

@@ -3,7 +3,7 @@ ManaCost:5 G
Types:Legendary Creature Ooze
PT:0/0
K:etbCounter:P1P1:5
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_GE1_P1P1,Creature.Other+YouCtrl+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever NICKNAME or another creature dies, if it had a +1/+1 counter on it, put a +1/+1 counter on each creature you control that has a +1/+1 counter on it.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_GE1_P1P1,Creature.Other+YouCtrl+counters_GE1_P1P1 | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever NICKNAME or another creature dies, if it had a +1/+1 counter on it, put a +1/+1 counter on each creature you control that has a +1/+1 counter on it.
SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1
K:Partner
DeckHas:Ability$Counters

3
forge-gui/res/cardsfolder/v/vela_the_night_clad.txt
View File

@@ -4,8 +4,7 @@ Types:Legendary Creature Human Wizard
PT:4/4
K:Intimidate
S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.) | Description$ Other creatures you control have Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.).
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigLoseLife | TriggerDescription$ Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life.
SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/vela_the_night_clad.jpg
Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)\nOther creatures you control have intimidate.\nWhenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life.

3
forge-gui/res/cardsfolder/w/warteye_witch.txt
View File

@@ -2,7 +2,6 @@ Name:Warteye Witch
ManaCost:2 B
Types:Creature Goblin Shaman
PT:3/2
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever CARDNAME or another creature you control dies, scry 1.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigScry | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control dies, scry 1.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigScry | TriggerController$ TriggeredCardController| TriggerDescription$ Whenever CARDNAME or another creature you control dies, scry 1.
SVar:TrigScry:DB$ Scry | ScryNum$ 1
Oracle:Whenever Warteye Witch or another creature you control dies, scry 1.

3
forge-gui/res/cardsfolder/z/zulaport_cutthroat.txt
View File

@@ -2,8 +2,7 @@ Name:Zulaport Cutthroat
ManaCost:1 B
Types:Creature Human Rogue Ally
PT:1/1
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent loses 1 life and you gain 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ TrigDrain | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent loses 1 life and you gain 1 life.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME or another creature you control dies, each opponent loses 1 life and you gain 1 life.
SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
DeckHas:Ability$LifeGain