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

Merge pull request #2524 from Northmoc/defined+target

Browse Source 
Allow Defined and Targets to coexist on one effect
This commit is contained in:
Anthony Calosa
2023-02-22 05:08:34 +08:00
committed by GitHub
parent 66db85b1bc 5fde87c84a
commit dec89cabee
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -209,6 +209,12 @@ public abstract class SpellAbilityEffect {
private static CardCollection getCards(final boolean definedFirst, final String definedParam, final SpellAbility sa) {
final boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam));
if (sa.hasParam("ThisDefinedAndTgts")) {
CardCollection cards =
AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("ThisDefinedAndTgts"), sa);
cards.addAll(sa.getTargets().getTargetCards());
return cards;
}
return useTargets ? new CardCollection(sa.getTargets().getTargetCards())
: AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam(definedParam), sa);
}

2
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -330,7 +330,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
tgts = sa.knownDetermineDefined(sa.getParam("Defined"));
}
sbTargets.append(" ").append(sa.getParamOrDefault("DefinedDesc", StringUtils.join(tgts, ", ")));
sbTargets.append(" ").append(sa.getParamOrDefault("DefinedDesc", Lang.joinHomogenous(tgts)));
final String targetname = sbTargets.toString();

3
forge-gui/res/cardsfolder/c/coastal_wizard.txt
View File

@@ -2,7 +2,6 @@ Name:Coastal Wizard
ManaCost:2 U U
Types:Creature Human Wizard
PT:1/1
A:AB$ ChangeZone | Cost$ T | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBChangeZone | PlayerTurn$ True | ActivationPhases$ Upkeep->BeginCombat | ActivationFirstCombat$ True | SpellDescription$ Return CARDNAME and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.
SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
A:AB$ ChangeZone | Cost$ T | ThisDefinedAndTgts$ Self | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | ActivationPhases$ Upkeep->BeginCombat | ActivationFirstCombat$ True | SpellDescription$ Return CARDNAME and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.
AI:RemoveDeck:All
Oracle:{T}: Return Coastal Wizard and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.

3
forge-gui/res/cardsfolder/l/lady_sun.txt
View File

@@ -2,7 +2,6 @@ Name:Lady Sun
ManaCost:1 U U
Types:Legendary Creature Human Advisor
PT:1/1
A:AB$ ChangeZone | Cost$ T | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBChangeZone | PlayerTurn$ True | ActivationPhases$ Upkeep->BeginCombat | ActivationFirstCombat$ True | SpellDescription$ Return CARDNAME and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.
SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
A:AB$ ChangeZone | Cost$ T | ThisDefinedAndTgts$ Self | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | ActivationPhases$ Upkeep->BeginCombat | ActivationFirstCombat$ True | SpellDescription$ Return CARDNAME and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.
AI:RemoveDeck:All
Oracle:{T}: Return Lady Sun and another target creature to their owners' hands. Activate only during your turn, before attackers are declared.

3
forge-gui/res/cardsfolder/s/snow_hound.txt
View File

@@ -2,7 +2,6 @@ Name:Snow Hound
ManaCost:2 W
Types:Creature Dog
PT:1/1
A:AB$ ChangeZone | Cost$ 1 T | ValidTgts$ Creature.Blue+YouCtrl,Creature.Green+YouCtrl | TgtPrompt$ Select target blue or green creature you control | Origin$ Battlefield | Destination$ Hand | SubAbility$ Return | SpellDescription$ Return CARDNAME and target green or blue creature you control to their owner's hand.
SVar:Return:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand
A:AB$ ChangeZone | Cost$ 1 T | ThisDefinedAndTgts$ Self | ValidTgts$ Creature.Blue+YouCtrl,Creature.Green+YouCtrl | TgtPrompt$ Select target blue or green creature you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME and target green or blue creature you control to their owner's hand.
AI:RemoveDeck:Random
Oracle:{1}, {T}: Return Snow Hound and target green or blue creature you control to their owner's hand.

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

@@ -2,7 +2,6 @@ Name:Wizard Mentor
ManaCost:2 U
Types:Creature Human Wizard
PT:2/2
A:AB$ ChangeZone | Cost$ T | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature. | SubAbility$ DBChangeZone | SpellDescription$ Return CARDNAME and target creature you control to owner's hand.
SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand
A:AB$ ChangeZone | Cost$ T | ThisDefinedAndTgts$ Self | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Return CARDNAME and target creature you control to their owner's hand.
AI:RemoveDeck:All
Oracle:{T}: Return Wizard Mentor and target creature you control to their owner's hand.