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

Merge pull request #3195 from tool4ever/tweakresolve

Browse Source 
Follow-up tweak for when triggers are checked during resolve
This commit is contained in:
Anthony Calosa
2023-06-04 09:29:17 +08:00
committed by GitHub
parent ae15121c4a ab33b81047
commit b2d154e0eb
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1450,6 +1450,7 @@ public class AbilityUtils {
// Needed - Equip an untapped creature with Sword of the Paruns then cast Deadshot on it. Should deal 2 more damage. // Needed - Equip an untapped creature with Sword of the Paruns then cast Deadshot on it. Should deal 2 more damage.
game.getAction().checkStaticAbilities(); // this will refresh continuous abilities for players and permanents. game.getAction().checkStaticAbilities(); // this will refresh continuous abilities for players and permanents.
game.getTriggerHandler().collectTriggerForWaiting();
AbilityUtils.resolveApiAbility(abSub, game); AbilityUtils.resolveApiAbility(abSub, game);
} }

1
forge-game/src/main/java/forge/game/ability/effects/RemoveFromGameEffect.java
View File

@@ -8,7 +8,6 @@ public class RemoveFromGameEffect extends SpellAbilityEffect {
@Override @Override
public void resolve(SpellAbility sa) { public void resolve(SpellAbility sa) {
for (final Card tgtC : getTargetCards(sa)) { for (final Card tgtC : getTargetCards(sa)) {
tgtC.getGame().getAction().ceaseToExist(tgtC, true); tgtC.getGame().getAction().ceaseToExist(tgtC, true);
} }

7
forge-gui/res/cardsfolder/k/kynaios_and_tiro_of_meletis.txt
View File

@@ -4,8 +4,7 @@ Types:Legendary Creature Human Soldier
PT:2/8 PT:2/8
T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card. T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card.
SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ EachPlayLand SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ EachPlayLand
SVar:EachPlayLand:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ MayPlayLand | SubAbility$ DBCleanup SVar:EachPlayLand:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | DefinedPlayer$ Player | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DrawAbstainers
SVar:MayPlayLand:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | DefinedPlayer$ Remembered | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DrawAbstainers SVar:DrawAbstainers:DB$ Draw | Defined$ OppNonRememberedOwner | SubAbility$ DBCleanup
SVar:DrawAbstainers:DB$ Draw | Defined$ Player.Opponent+IsRemembered | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Land.RememberedPlayerCtrl | ConditionCompare$ EQ0 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
Oracle:At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card. Oracle:At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card.

15
forge-gui/res/cardsfolder/t/the_great_aurora.txt
View File

@@ -1,18 +1,13 @@
Name:The Great Aurora Name:The Great Aurora
ManaCost:6 G G G ManaCost:6 G G G
Types:Sorcery Types:Sorcery
A:SP$ RepeatEach | Cost$ 6 G G G | RepeatPlayers$ Player | RepeatSubAbility$ DBStoreAmount | SubAbility$ RepeatLands | StackDescription$ SpellDescription | SpellDescription$ Each player shuffles all cards from their hand and all permanents they own into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield. Exile The Great Aurora. A:SP$ RepeatEach | Cost$ 6 G G G | RepeatPlayers$ Player | RepeatSubAbility$ DBShuffle | SubAbility$ RepeatLands | StackDescription$ SpellDescription | SpellDescription$ Each player shuffles all cards from their hand and all permanents they own into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield. Exile CARDNAME.
# ChangeType is fine being "Card" because if it's on the battlefield, it has to be a permanent # ChangeType is fine being "Card" because if it's on the battlefield, it has to be a permanent
SVar:DBStoreAmount:DB$ StoreSVar | SVar$ AuroraY | Type$ Count | Expression$ Valid Card.RememberedPlayerOwn | SubAbility$ DBStoreAmount2 SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Card.RememberedPlayerOwn | Origin$ Hand,Battlefield | Destination$ Library | Shuffle$ True | RememberChanged$ True | SubAbility$ DBDraw
SVar:DBStoreAmount2:DB$ StoreSVar | SVar$ AuroraZ | Type$ Count | Expression$ ValidHand Card.RememberedPlayerOwn | SubAbility$ DBShuffle SVar:DBDraw:DB$ Draw | Defined$ Remembered | NumCards$ Remembered$Amount | SubAbility$ DBCleanup
SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Card.RememberedPlayerOwn | Origin$ Hand,Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBDraw SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:DBDraw:DB$ Draw | Defined$ Remembered | NumCards$ AuroraX SVar:RepeatLands:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBAurora | SubAbility$ ExileAurora
SVar:AuroraX:SVar$AuroraY/Plus.AuroraZ
SVar:AuroraY:Number$0
SVar:AuroraZ:Number$0
SVar:RepeatLands:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBAurora | SubAbility$ DBCleanup
SVar:DBAurora:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land | ChangeNum$ HandSize SVar:DBAurora:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land | ChangeNum$ HandSize
SVar:HandSize:Count$ValidHand Land.RememberedPlayerCtrl SVar:HandSize:Count$ValidHand Land.RememberedPlayerCtrl
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ ExileAurora
SVar:ExileAurora:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | Defined$ Self SVar:ExileAurora:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | Defined$ Self
Oracle:Each player shuffles all cards from their hand and all permanents they own into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield. Exile The Great Aurora. Oracle:Each player shuffles all cards from their hand and all permanents they own into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield. Exile The Great Aurora.