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

Trigger tweak

Browse Source
This commit is contained in:
tool4EvEr
2023-02-03 17:56:09 +01:00
parent e224166b32
commit e5b3d28428
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -1010,4 +1010,8 @@ public class ReplacementHandler {
}); });
return !list.isEmpty(); return !list.isEmpty();
} }
public boolean isReplacing() {
return !hasRun.isEmpty();
}
} }

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

@@ -367,8 +367,8 @@ public class TriggerHandler {
for (final Trigger deltrig : delayedTriggersWorkingCopy) { for (final Trigger deltrig : delayedTriggersWorkingCopy) {
if (deltrig.getHostCard().getController().equals(player)) { if (deltrig.getHostCard().getController().equals(player)) {
if (isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) { if (isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) {
runSingleTrigger(deltrig, runParams);
delayedTriggers.remove(deltrig); delayedTriggers.remove(deltrig);
runSingleTrigger(deltrig, runParams);
} }
} }
} }

4
forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java
View File

@@ -34,6 +34,10 @@ public class TriggerImmediate extends Trigger {
* @param runParams*/ * @param runParams*/
@Override @Override
public final boolean performTest(final Map<AbilityKey, Object> runParams) { public final boolean performTest(final Map<AbilityKey, Object> runParams) {
if (hasParam("AfterReplacement") && hostCard.getGame().getReplacementHandler().isReplacing()) {
return false;
}
return true; return true;
} }

4
forge-gui/res/cardsfolder/upcoming/melira_the_living_cure.txt
View File

@@ -3,8 +3,8 @@ ManaCost:G W
Types:Legendary Creature Human Scout Types:Legendary Creature Human Scout
PT:3/3 PT:3/3
R:Event$ AddCounter | ActiveZones$ Battlefield | ValidPlayer$ You | ValidCounterType$ POISON | ReplaceWith$ OnlyOnePoison | Description$ If you would get one or more poison counters, instead you get one poison counter and you can't get additional poison counters this turn. R:Event$ AddCounter | ActiveZones$ Battlefield | ValidPlayer$ You | ValidCounterType$ POISON | ReplaceWith$ OnlyOnePoison | Description$ If you would get one or more poison counters, instead you get one poison counter and you can't get additional poison counters this turn.
SVar:OnlyOnePoison:DB$ ReplaceCounter | ValidCounterType$ POISON | Amount$ 1 | SubAbility$ DBDelayedTrigger SVar:OnlyOnePoison:DB$ ReplaceCounter | ValidCounterType$ POISON | Amount$ 1 | SubAbility$ DBImmediateTrigger
SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ CounterAddedOnce | ValidPlayer$ You | CounterType$ POISON | TriggerZones$ Battlefield | Static$ True | Execute$ TrigEffect SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Static$ True | Execute$ TrigEffect | AfterReplacement$ True
SVar:TrigEffect:DB$ Effect | StaticAbilities$ NoMorePoison SVar:TrigEffect:DB$ Effect | StaticAbilities$ NoMorePoison
SVar:NoMorePoison:Mode$ CantPutCounter | ValidPlayer$ You | CounterType$ POISON | Description$ You can't get additional poison counters this turn. SVar:NoMorePoison:Mode$ CantPutCounter | ValidPlayer$ You | CounterType$ POISON | Description$ You can't get additional poison counters this turn.
A:AB$ DelayedTrigger | Cost$ Exile<1/CARDNAME> | ValidTgts$ Creature.Other,Artifact.Other | TgtPrompt$ Select another target creature or artifact | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigReturn | StackDescription$ When {c:Targeted} is put into a graveyard this turn, return it to the battlefield under its owner's control. | SpellDescription$ Choose another target creature or artifact. When it's put into a graveyard this turn, return that card to the battlefield under its owner's control. A:AB$ DelayedTrigger | Cost$ Exile<1/CARDNAME> | ValidTgts$ Creature.Other,Artifact.Other | TgtPrompt$ Select another target creature or artifact | Mode$ ChangesZone | RememberObjects$ Targeted | ValidCard$ Card.IsTriggerRemembered | Origin$ Battlefield | Destination$ Graveyard | ThisTurn$ True | Execute$ TrigReturn | StackDescription$ When {c:Targeted} is put into a graveyard this turn, return it to the battlefield under its owner's control. | SpellDescription$ Choose another target creature or artifact. When it's put into a graveyard this turn, return that card to the battlefield under its owner's control.