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

Fix Multiple Choice (#3057)

Browse Source 
Co-authored-by: TRT <>
This commit is contained in:
tool4ever
2023-05-03 19:18:37 +02:00
committed by GitHub
parent c54fd5323a
commit 06df4451d2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ public class ChoosePlayerEffect extends SpellAbilityEffect {
if (random) { if (random) {
chosen = choices.isEmpty() ? null : Aggregates.random(choices); chosen = choices.isEmpty() ? null : Aggregates.random(choices);
} else { } else {
chosen = choices.isEmpty() ? null : p.getController().chooseSingleEntityForEffect(choices, sa, choiceDesc, null); chosen = choices.isEmpty() ? null : p.getController().chooseSingleEntityForEffect(choices, sa, choiceDesc, sa.hasParam("Optional"), null);
} }
if (null != chosen) { if (null != chosen) {
if (sa.hasParam("Secretly")) { if (sa.hasParam("Secretly")) {

2
forge-gui/res/cardsfolder/m/multiple_choice.txt
View File

@@ -3,7 +3,7 @@ ManaCost:X U
Types:Sorcery Types:Sorcery
A:SP$ Scry | Cost$ X U | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBDraw | AILogic$ MultipleChoice | AICheckCanPlayWithDefinedX$ True | StackDescription$ SpellDescription | SpellDescription$ If X is 1, scry 1, A:SP$ Scry | Cost$ X U | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBDraw | AILogic$ MultipleChoice | AICheckCanPlayWithDefinedX$ True | StackDescription$ SpellDescription | SpellDescription$ If X is 1, scry 1,
SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBChoosePlayer | StackDescription$ SpellDescription | SpellDescription$ then draw a card. SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBChoosePlayer | StackDescription$ SpellDescription | SpellDescription$ then draw a card.
SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player | AILogic$ Curse | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ If X is 2, you may choose a player. SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player | Optional$ True | AILogic$ Curse | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ If X is 2, you may choose a player.
SVar:DBChangeZone:DB$ ChangeZone | DefinedPlayer$ ChosenPlayer | Chooser$ ChosenPlayer | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.ChosenCtrl | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ They return a creature they control to its owner's hand. SVar:DBChangeZone:DB$ ChangeZone | DefinedPlayer$ ChosenPlayer | Chooser$ ChosenPlayer | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.ChosenCtrl | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ2 | OrOtherConditionSVarCompare$ GE4 | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ They return a creature they control to its owner's hand.
SVar:DBToken:DB$ Token | TokenScript$ ur_4_4_elemental | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | SpellDescription$ If X is 3, create a 4/4 blue and red Elemental creature token. If X is 4 or more, do all of the above. SVar:DBToken:DB$ Token | TokenScript$ ur_4_4_elemental | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | SpellDescription$ If X is 3, create a 4/4 blue and red Elemental creature token. If X is 4 or more, do all of the above.
SVar:X:Count$xPaid SVar:X:Count$xPaid