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

Clean up logic (#6928)

Browse Source
This commit is contained in:
tool4ever
2025-01-29 19:53:39 +01:00
committed by GitHub
parent e6fc666012
commit 2a7bd8bbd2
11 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/Game.java
View File

@@ -1185,6 +1185,12 @@ public class Game {
for (Player player : getRegisteredPlayers()) {
player.onCleanupPhase();
}
for (final Card c : getCardsIncludePhasingIn(ZoneType.Battlefield)) {
c.onCleanupPhase(getPhaseHandler().getPlayerTurn());
}
for (final Card card : getCardsInGame()) {
card.resetActivationsPerTurn();
}
}
public void addCounterAddedThisTurn(Player putter, CounterType cType, Card card, Integer value) {

6
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -82,12 +82,6 @@ public class GameAction {
game = game0;
}
public final void resetActivationsPerTurn() {
for (final Card card : game.getCardsInGame()) {
card.resetActivationsPerTurn();
}
}
public Card changeZone(final Zone zoneFrom, Zone zoneTo, final Card c, Integer position, SpellAbility cause) {
return changeZone(zoneFrom, zoneTo, c, position, cause, null);
}

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -7271,10 +7271,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
}
public void onCleanupPhase(final Player turn) {
if (!StaticAbilityNoCleanupDamage.damageNotRemoved(this)) {
setDamage(0);
}
setHasBeenDealtDeathtouchDamage(false);
resetExcessDamage();
setRegeneratedThisTurn(0);
resetShieldCount();

1
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -374,7 +374,6 @@ public class CombatUtil {
final GameEntity defender = combat.getDefenderByAttacker(c);
final List<Card> otherAttackers = combat.getAttackers();
// Run triggers
if (triggers) {
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, c);

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

@@ -36,6 +36,7 @@ import forge.game.replacement.ReplacementResult;
import forge.game.replacement.ReplacementType;
import forge.game.spellability.SpellAbility;
import forge.game.staticability.StaticAbilityNoCleanupDamage;
import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerType;
import forge.game.zone.Zone;
@@ -180,8 +181,6 @@ public class PhaseHandler implements java.io.Serializable {
}
playerTurn.incrementTurn();
game.getAction().resetActivationsPerTurn();
final int lands = CardLists.count(playerTurn.getLandsInPlay(), CardPredicates.UNTAPPED);
playerTurn.setNumPowerSurgeLands(lands);
}
@@ -395,7 +394,10 @@ public class PhaseHandler implements java.io.Serializable {
// Rule 514.2
// Reset Damage received map
for (final Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) {
c.onCleanupPhase(playerTurn);
if (!StaticAbilityNoCleanupDamage.damageNotRemoved(c)) {
c.setDamage(0);
}
c.setHasBeenDealtDeathtouchDamage(false);
}
game.getEndOfTurn().executeUntil();

4
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1994,8 +1994,8 @@ public class Player extends GameEntity implements Comparable<Player> {
final PlayerZone com = getZone(ZoneType.Command);
DetachedCardEffect eff = new DetachedCardEffect(this, "Speed Effect");
String trigger = "Mode$ LifeLost | ValidPlayer$ Opponent | TriggerZones$ Command | ActivationLimit$ 1 | " +
"PlayerTurn$ True | TriggerDescription$ Your speed increases once on each of your turns when an " +
"opponent loses life.";
"PlayerTurn$ True | CheckSVar$ Count$YourSpeed | SVarCompare$ LT4 | "
+ "TriggerDescription$ Your speed increases once on each of your turns when an opponent loses life.";
String speedUp = "DB$ ChangeSpeed";
Trigger lifeLostTrigger = TriggerHandler.parseTrigger(trigger, eff, true);
lifeLostTrigger.setOverridingAbility(AbilityFactory.getAbility(speedUp, eff));

3
forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java
View File

@@ -56,9 +56,6 @@ public class TriggerAttackerBlockedByCreature extends Trigger {
public final boolean performTest(final Map<AbilityKey, Object> runParams) {
final Object a = runParams.get(AbilityKey.Attacker),
b = runParams.get(AbilityKey.Blocker);
if (!(a instanceof Card && b instanceof Card)) {
return false;
}
final Card attacker = (Card) a,
blocker = (Card) b;

2
forge-gui/res/cardsfolder/b/battle_cry.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 W
Types:Instant
A:SP$ UntapAll | ValidCards$ Creature.White+YouCtrl | SubAbility$ Battlecry | SpellDescription$ Untap all white creatures you control. Whenever a creature blocks this turn, it gets +0/+1 until end of turn.
SVar:Battlecry:DB$ Effect | Triggers$ TrigBlocking
SVar:TrigBlocking:Mode$ AttackerBlocked | Execute$ Pump | TriggerDescription$ Whenever a creature blocks this turn, it gets +0/+1 until end of turn.
SVar:TrigBlocking:Mode$ Blocks | Execute$ Pump | TriggerDescription$ Whenever a creature blocks this turn, it gets +0/+1 until end of turn.
SVar:Pump:DB$ Pump | Defined$ TriggeredBlockerLKICopy | NumDef$ 1
AI:RemoveDeck:All
Oracle:Untap all white creatures you control.\nWhenever a creature blocks this turn, it gets +0/+1 until end of turn.

2
forge-gui/res/cardsfolder/i/ian_malcolm_chaotician.txt
View File

@@ -4,5 +4,5 @@ Types:Legendary Creature Human Scientist
PT:2/2
T:Mode$ Drawn | ValidPlayer$ Player | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever a player draws their second card each turn, that player exiles the top card of their library.
SVar:TrigDig:DB$ Dig | Defined$ TriggeredPlayer | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | RememberChanged$ True | DestinationZone$ Exile
S:Mode$ Continuous | Affected$ Card.ExiledWithSource+YouDontOwn | MayPlay$ True | MayPlayLimit$ 1 | MayPlayIgnoreType$ True | MayPlayPlayer$ ActivePlayer | EffectZone$ Battlefield | AffectedZone$ Exile | Description$ During each player's turn, that player may cast a spell from among the cards they don't own exiled with CARDNAME and mana of any type can be spent to cast it.
S:Mode$ Continuous | Affected$ Card.ExiledWithSource+!OwnedBy ActivePlayer | MayPlay$ True | MayPlayLimit$ 1 | MayPlayIgnoreType$ True | MayPlayPlayer$ ActivePlayer | EffectZone$ Battlefield | AffectedZone$ Exile | Description$ During each player's turn, that player may cast a spell from among the cards they don't own exiled with CARDNAME and mana of any type can be spent to cast it.
Oracle:Whenever a player draws their second card each turn, that player exiles the top card of their library.\nDuring each player's turn, that player may cast a spell from among the cards they don't own exiled with Ian Malcolm, Chaotician, and mana of any type can be spent to cast it.

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

@@ -3,6 +3,6 @@ ManaCost:2 B B
Types:Sorcery
A:SP$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SubAbility$ DBEffect | SpellDescription$ Destroy target creature or planeswalker.
SVar:DBEffect:DB$ Effect | Triggers$ TrigBlocking
SVar:TrigBlocking:Mode$ AttackerBlocked | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature blocks this turn, its controller loses 1 life.
SVar:TrigBlocking:Mode$ Blocks | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature blocks this turn, its controller loses 1 life.
SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredBlockerController | LifeAmount$ 1
Oracle:Destroy target creature or planeswalker.\nWhenever a creature blocks this turn, its controller loses 1 life.

6
forge-gui/res/cardsfolder/s/swashbuckler_extraordinaire.txt
View File

@@ -6,10 +6,10 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.
SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | SacValid$ Treasure | SacMessage$ treasure | Optional$ True | RememberSacrificed$ True | SubAbility$ TrigImmediateTrig
SVar:TrigImmediateTrig:DB$ ImmediateTrigger | Execute$ DBPump | TriggerDescription$ When you do, up to that many target creatures gain double strike until end of turn.
SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 | TargetMax$ DBSize | SubAbility$ DBCleanup | TgtPrompt$ Select target creatures | StackDescription$ {c:Targeted} gain double strike until end of turn. | SpellDescription$ Up to that many target creatures gain double strike until end of turn.
SVar:TrigImmediateTrig:DB$ ImmediateTrigger | Execute$ DBPump | ConditionDefined$ RememberedLKI | ConditionPresent$ Card | RememberObjects$ RememberedLKI | SubAbility$ DBCleanup | TriggerDescription$ When you do, up to that many target creatures gain double strike until end of turn.
SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 | TargetMax$ DBSize | TgtPrompt$ Select target creatures | StackDescription$ {c:Targeted} gain double strike until end of turn. | SpellDescription$ Up to that many target creatures gain double strike until end of turn.
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:DBSize:Count$RememberedSize
SVar:DBSize:TriggerRemembered$Amount
SVar:X:Count$Valid Treasure.YouCtrl
AI:RemoveDeck:All
DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact