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

Use timestamps

Browse Source
This commit is contained in:
tool4EvEr
2022-03-23 23:00:45 +01:00
parent 4a37f78c82
commit 5ae86d51f0
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import forge.game.card.Card;
import forge.game.event.GameEventCardStatsChanged;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
public class LifeExchangeVariantEffect extends SpellAbilityEffect {

13
forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
View File

@@ -59,13 +59,15 @@ public class MustBlockEffect extends SpellAbilityEffect {
final boolean mustBlockAll = sa.hasParam("BlockAllDefined");
long ts = game.getNextTimestamp();
for (final Card c : tgtCards) {
if ((!sa.usesTargeting()) || c.canBeTargetedBy(sa)) {
if (mustBlockAll) {
c.addMustBlockCards(cards);
c.addMustBlockCards(ts, cards);
} else {
final Card attacker = cards.get(0);
c.addMustBlockCard(attacker);
c.addMustBlockCard(ts, attacker);
}
}
}
@@ -77,12 +79,7 @@ public class MustBlockEffect extends SpellAbilityEffect {
@Override
public void run() {
for (final Card c : tgtCards) {
if (mustBlockAll) {
c.removeMustBlockCards(cards);
} else {
final Card attacker = cards.get(0);
c.removeMustBlockCard(attacker);
}
c.removeMustBlockCards(ts);
}
}
};

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

@@ -108,8 +108,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// cards attached or otherwise linked to this card
private CardCollection hauntedBy, devouredCards, exploitedCards, delvedCards, convokedCards, imprintedCards, encodedCards;
private CardCollection mustBlockCards, gainControlTargets, chosenCards;
private CardCollection gainControlTargets, chosenCards;
private CardCollection mergedCards;
private Map<Long, CardCollection> mustBlockCards = Maps.newHashMap();
private List<Card> blockedThisTurn = Lists.newArrayList();
private List<Card> blockedByThisTurn = Lists.newArrayList();
@@ -1313,22 +1314,22 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
//MustBlockCards are cards that this Card must block if able in an upcoming combat.
//This is cleared at the end of each turn.
public final CardCollectionView getMustBlockCards() {
return CardCollection.getView(mustBlockCards);
return CardCollection.getView(Iterables.concat(mustBlockCards.values()));
}
public final void addMustBlockCard(final Card c) {
mustBlockCards = view.addCard(mustBlockCards, c, TrackableProperty.MustBlockCards);
public final void addMustBlockCard(long ts, final Card c) {
mustBlockCards.put(ts, new CardCollection(c));
view.setCards(null, Iterables.concat(mustBlockCards.values()), TrackableProperty.MustBlockCards);
}
public final void addMustBlockCards(final Iterable<Card> attackersToBlock) {
mustBlockCards = view.addCards(mustBlockCards, attackersToBlock, TrackableProperty.MustBlockCards);
public final void addMustBlockCards(long ts, final Iterable<Card> attackersToBlock) {
mustBlockCards.put(ts, new CardCollection(attackersToBlock));
view.setCards(null, Iterables.concat(mustBlockCards.values()), TrackableProperty.MustBlockCards);
}
public final void removeMustBlockCard(final Card c) {
mustBlockCards = view.removeCard(mustBlockCards, c, TrackableProperty.MustBlockCards);
}
public final void removeMustBlockCards(final Iterable<Card> attackersToBlock) {
mustBlockCards = view.removeCards(mustBlockCards, attackersToBlock, TrackableProperty.MustBlockCards);
public final void removeMustBlockCards(long ts) {
mustBlockCards.remove(ts);
view.setCards(null, Iterables.concat(mustBlockCards.values()), TrackableProperty.MustBlockCards);
}
public final void clearMustBlockCards() {
mustBlockCards = view.clearCards(mustBlockCards, TrackableProperty.MustBlockCards);
view.setCards(null, null, TrackableProperty.MustBlockCards);
}
public final void setMustAttackEntity(final GameEntity e) {