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

Cleanup

Browse Source
This commit is contained in:
tool4EvEr
2022-10-29 12:47:16 +02:00
parent b926401f3d
commit 93bcfaaf7c
6 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1317,22 +1317,6 @@ public class AbilityUtils {
final Object o = root.getTriggeringObject(AbilityKey.fromString(triggeringType));
if (o instanceof SpellAbility) {
s = (SpellAbility) o;
// if there is no target information in SA but targets are listed in SpellAbilityTargeting cards, copy that
// information so it's not lost if the calling code is interested in targets of the triggered SA.
if (triggeringType.equals("SpellAbility")) {
final List<GameEntity> tgtList = (List<GameEntity>) root.getTriggeringObject(AbilityKey.SpellAbilityTargets);
if (s.getTargets() != null && s.getTargets().size() == 0) {
if (tgtList != null && tgtList.size() > 0) {
TargetChoices tc = new TargetChoices();
for (GameEntity ge : tgtList) {
if (ge instanceof Card) {
tc.add((Card) ge);
}
}
s.setTargets(tc);
}
}
}
} else if (o instanceof SpellAbilityStackInstance) {
s = ((SpellAbilityStackInstance) o).getSpellAbility(true);
}

2
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -561,7 +561,7 @@ public class TriggerHandler {
sa.setTriggerRemembered(regtrig.getTriggerRemembered());
if (regtrig.hasParam("TriggerController")) {
Player p = AbilityUtils.getDefinedPlayers(regtrig.getHostCard(), regtrig.getParam("TriggerController"), sa).get(0);
Player p = AbilityUtils.getDefinedPlayers(host, regtrig.getParam("TriggerController"), sa).get(0);
sa.setActivatingPlayer(p);
}

2
forge-gui/res/cardsfolder/b/blood_divination.txt
View File

@@ -1,6 +1,6 @@
Name:Blood Divination
ManaCost:3 B
Types:Sorcery
A:SP$ Draw | Cost$ 3 B Sac<1/Creature> | NumCards$ 3 | SpellDescription$ As an additional cost to cast this spell, sacrifice a creature. Draw three cards.
A:SP$ Draw | Cost$ 3 B Sac<1/Creature> | NumCards$ 3 | SpellDescription$ Draw three cards.
SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE3
Oracle:As an additional cost to cast this spell, sacrifice a creature.\nDraw three cards.

2
forge-gui/res/cardsfolder/c/charge_of_the_forever_beast.txt
View File

@@ -1,7 +1,7 @@
Name:Charge of the Forever-Beast
ManaCost:2 G
Types:Sorcery
A:SP$ DealDamage | Cost$ 2 G Reveal<1/Creature> | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SpellDescription$ As an additional cost to cast this spell, reveal a creature card from your hand. CARDNAME deals damage to target creature or planeswalker equal to the revealed card's power.
A:SP$ DealDamage | Cost$ 2 G Reveal<1/Creature> | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target creature or planeswalker equal to the revealed card's power.
SVar:X:Revealed$CardPower
AI:RemoveDeck:All
Oracle:As an additional cost to cast this spell, reveal a creature card from your hand.\nCharge of the Forever-Beast deals damage to target creature or planeswalker equal to the revealed card's power.

3
forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt
View File

@@ -7,5 +7,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | Defined$ Player | DestinationZone$ Exile | ExileWithCounter$ COLLECTION
S:Mode$ Continuous | MayPlayLimit$ 1 | Affected$ Card.ExiledByYou+counters_GE1_COLLECTION | AffectedZone$ Exile | MayPlay$ True | MayPlayIgnoreColor$ True | Description$ Once each turn, you may play a card from exile with a collection counter on it if it was exiled by an ability you controlled, and you may spend mana as though it were any color to cast it.
DeckHints:Type$Vampire
Oracle:Flash\nWhenever Evelyn, the Covetous or another Vampire enters the battlefield under your control, exile the top card of each player's library with a collection counter on it.
\nOnce each turn, you may play a card from exile with a collection counter on it if it was exiled by an ability you controlled, and you may spend mana as though it were mana of any color to cast it.
Oracle:Flash\nWhenever Evelyn, the Covetous or another Vampire enters the battlefield under your control, exile the top card of each player's library with a collection counter on it.\nOnce each turn, you may play a card from exile with a collection counter on it if it was exiled by an ability you controlled, and you may spend mana as though it were mana of any color to cast it.

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

@@ -1,7 +1,7 @@
Name:Swallow Whole
ManaCost:W
Types:Sorcery
A:SP$ ChangeZone | Cost$ W tapXType<1/Creature> | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBPutCounter | SpellDescription$ As an additional cost to cast this spell, tap an untapped creature you control. Exile target tapped creature.
A:SP$ ChangeZone | Cost$ W tapXType<1/Creature> | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBPutCounter | SpellDescription$ Exile target tapped creature.
SVar:DBPutCounter:DB$ PutCounter | Defined$ Tapped | CounterType$ P1P1 | SpellDescription$ Put a +1/+1 counter on the creature tapped to cast this spell.
DeckHas:Ability$Counters
Oracle:As an additional cost to cast this spell, tap an untapped creature you control.\nExile target tapped creature. Put a +1/+1 counter on the creature tapped to pay this spell's additional cost.