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

brazen_cannonade.txt and support v2

Browse Source
This commit is contained in:
Northmoc
2022-11-23 11:19:39 -05:00
parent 92df823dd1
commit 8002029e79
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -322,11 +322,18 @@ public class EffectEffect extends SpellAbilityEffect {
game.getUpkeep().addUntil(controller, endEffect); game.getUpkeep().addUntil(controller, endEffect);
} else if (duration.equals("UntilEndOfCombat")) { } else if (duration.equals("UntilEndOfCombat")) {
game.getEndOfCombat().addUntil(endEffect); game.getEndOfCombat().addUntil(endEffect);
} else if (duration.equals("UntilEndOfYourNextCombat")) { } else if (duration.equals("UntilEndOfCombatYourNextTurn")) {
if (game.getPhaseHandler().inCombat()) { if (game.getPhaseHandler().isPlayerTurn(controller)) {
game.getEndOfCombat().registerUntilEnd(controller, endEffect); game.getEndOfTurn().addUntil(controller, new GameCommand() {
private static final long serialVersionUID = -5054153666503075717L;
@Override
public void run() {
game.getEndOfCombat().addUntil(controller, endEffect);
}
});
} else { } else {
game.getEndOfCombat().addUntilEnd(controller, endEffect); game.getEndOfCombat().addUntil(controller, endEffect);
} }
} else if (duration.equals("UntilYourNextEndStep")) { } else if (duration.equals("UntilYourNextEndStep")) {
game.getEndOfTurn().addUntil(controller, endEffect); game.getEndOfTurn().addUntil(controller, endEffect);

1
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -1239,6 +1239,7 @@ public class PhaseHandler implements java.io.Serializable {
game.getEndOfCombat().executeUntil(); game.getEndOfCombat().executeUntil();
if (combat != null) { if (combat != null) {
combat.endCombat(); combat.endCombat();
game.getEndOfCombat().executeUntil(playerTurn);
combat = null; combat = null;
} }
game.updateCombatForView(); game.updateCombatForView();

2
forge-gui/res/cardsfolder/upcoming/brazen_cannonade.txt
View File

@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2 SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigExile | TriggerDescription$ Raid — At the beginning of your postcombat main phase, if you attacked with a creature this turn, exile the top card of your library. Until end of combat on your next turn, you may play that card. T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigExile | TriggerDescription$ Raid — At the beginning of your postcombat main phase, if you attacked with a creature this turn, exile the top card of your library. Until end of combat on your next turn, you may play that card.
SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ UntilEndOfYourNextCombat SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ UntilEndOfCombatYourNextTurn
SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of combat on your next turn, you may play that card. SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of combat on your next turn, you may play that card.
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:RaidTest:Count$AttackersDeclared SVar:RaidTest:Count$AttackersDeclared