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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
CCTV-1
2019-09-15 08:24:46 +08:00
parent df98af5294 334a0ea0b4
commit acfcabe2b7
24 changed files with 241 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -1601,8 +1601,8 @@ public class ComputerUtilCard {
}
pumped.addNewPT(c.getCurrentPower(), c.getCurrentToughness(), timestamp);
pumped.setPTBoost(c.getPTBoostMap());
pumped.addPTBoost(power + berserkPower, toughness, timestamp);
pumped.setPTBoost(c.getPTBoostTable());
pumped.addPTBoost(power + berserkPower, toughness, timestamp, null);
pumped.addChangedCardKeywords(kws, null, false, false, timestamp);
Set<CounterType> types = c.getCounters().keySet();
for(CounterType ct : types) {
@@ -1649,8 +1649,8 @@ public class ComputerUtilCard {
list.add(vCard); // account for the static abilities that may be present on the card itself
for (final Card c : list) {
// remove old boost that might be copied
vCard.removePTBoost(c.getTimestamp());
for (final StaticAbility stAb : c.getStaticAbilities()) {
vCard.removePTBoost(c.getTimestamp(), stAb.getId());
final Map<String, String> params = stAb.getMapParams();
if (!params.get("Mode").equals("Continuous")) {
continue;
@@ -1683,7 +1683,7 @@ public class ComputerUtilCard {
def = AbilityUtils.calculateAmount(c, addT, stAb);
}
}
vCard.addPTBoost(att, def, c.getTimestamp());
vCard.addPTBoost(att, def, c.getTimestamp(), stAb.getId());
}
}
}

4
forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
View File

@@ -246,7 +246,7 @@ public class GameCopier {
newCard.addType(type);
}
for (StaticAbility stAb : c.getStaticAbilities()) {
newCard.addStaticAbility(stAb);
newCard.addStaticAbility(stAb.copy(newCard, true));
}
for (SpellAbility sa : c.getSpellAbilities()) {
SpellAbility saCopy = sa.copy(newCard, true);
@@ -277,7 +277,7 @@ public class GameCopier {
// TODO: Copy the full list with timestamps.
newCard.addNewPT(setPower, setToughness, newGame.getNextTimestamp());
}
newCard.setPTBoost(c.getPTBoostMap());
newCard.setPTBoost(c.getPTBoostTable());
newCard.setDamage(c.getDamage());
newCard.setChangedCardTypes(c.getChangedCardTypesMap());

2
forge-game/src/main/java/forge/game/StaticEffect.java
View File

@@ -798,7 +798,7 @@ public class StaticEffect {
}
// remove P/T bonus
affectedCard.removePTBoost(getTimestamp());
affectedCard.removePTBoost(getTimestamp(), ability.getId());
// the view is updated in GameAction#checkStaticAbilities to avoid flickering

21
forge-game/src/main/java/forge/game/ability/AbilityKey.java
View File

@@ -9,6 +9,11 @@ import java.util.Map;
public enum AbilityKey {
AbilityMana("AbilityMana"),
Affected("Affected"),
Attach("Attach"),
AllVotes("AllVotes"),
AttachSource("AttachSource"),
AttachTarget("AttachTarget"),
Attacked("Attacked"),
Attacker("Attacker"),
Attackers("Attackers"),
AttackingPlayer("AttackingPlayer"),
@@ -16,35 +21,51 @@ public enum AbilityKey {
Blocker("Blocker"),
Blockers("Blockers"),
Card("Card"),
Cards("Cards"),
CardLKI("CardLKI"),
Cause("Cause"),
Causer("Causer"),
Championed("Championed"),
CounterAmount("CounterAmount"),
CounteredSA("CounteredSA"),
CounterType("CounterType"),
CumulativeUpkeepPaid("CumulativeUpkeepPaid"),
DamageAmount("DamageAmount"),
DamageSource("DamageSource"),
DamageSources("DamageSources"),
DamageTarget("DamageTarget"),
DamageTargets("DamageTargets"),
Defender("Defender"),
Defenders("Defenders"),
DefendingPlayer("DefendingPlayer"),
Destination("Destination"),
Devoured("Devoured"),
EchoPaid("EchoPaid"),
Exploited("Exploited"),
Event("Event"),
Fighter("Fighter"),
Fizzle("Fizzle"),
IsCombatDamage("IsCombatDamage"),
PayingMana("PayingMana"),
Player("Player"),
IndividualCostPaymentInstance("IndividualCostPaymentInstance"),
MonstrosityAmount("MonstrosityAmount"),
NewCounterAmount("NewCounterAmount"),
NumBlockers("NumBlockers"),
Object("Object"),
Objects("Objects"),
OtherAttackers("OtherAttackers"),
Origin("Origin"),
OriginalController("OriginalController"),
Produced("Produced"),
Result("Result"),
Scheme("Scheme"),
Source("Source"),
SpellAbilityStackInstance("SpellAbilityStackInstance"),
StackSa("StackSa"),
StackSi("StackSi"),
Target("Target"),
Transformer("Transformer"),
Won("Won");

4
forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java
View File

@@ -52,7 +52,7 @@ public class PumpAllEffect extends SpellAbilityEffect {
boolean redrawPT = false;
if (a != 0 || d != 0) {
tgtC.addPTBoost(a, d, timestamp);
tgtC.addPTBoost(a, d, timestamp, 0);
redrawPT = true;
}
@@ -76,7 +76,7 @@ public class PumpAllEffect extends SpellAbilityEffect {
@Override
public void run() {
tgtC.removePTBoost(timestamp);
tgtC.removePTBoost(timestamp, 0);
tgtC.removeChangedCardKeywords(timestamp);
for (String kw : hiddenkws) {

4
forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
View File

@@ -56,7 +56,7 @@ public class PumpEffect extends SpellAbilityEffect {
}
if (a != 0 || d != 0) {
gameCard.addPTBoost(a, d, timestamp);
gameCard.addPTBoost(a, d, timestamp, 0);
redrawPT = true;
}
@@ -84,7 +84,7 @@ public class PumpEffect extends SpellAbilityEffect {
@Override
public void run() {
gameCard.removePTBoost(timestamp);
gameCard.removePTBoost(timestamp, 0);
boolean updateText = false;
updateText = gameCard.removeCanBlockAny(timestamp) || updateText;
updateText = gameCard.removeCanBlockAdditional(timestamp) || updateText;

10
forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java
View File

@@ -1,6 +1,7 @@
package forge.game.ability.effects;
import forge.game.Game;
import forge.game.ability.AbilityKey;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.event.GameEventCardRegenerated;
@@ -9,8 +10,6 @@ import forge.game.trigger.TriggerType;
import java.util.Map;
import com.google.common.collect.Maps;
public class RegenerationEffect extends SpellAbilityEffect {
/*
@@ -44,10 +43,9 @@ public class RegenerationEffect extends SpellAbilityEffect {
}
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", c);
runParams.put("Cause", host);
game.getTriggerHandler().runTriggerOld(TriggerType.Regenerated, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(c);
runParams.put(AbilityKey.Cause, host);
game.getTriggerHandler().runTrigger(TriggerType.Regenerated, runParams, false);
}
}

12
forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java
View File

@@ -1,6 +1,7 @@
package forge.game.ability.effects;
import forge.game.Game;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
@@ -14,9 +15,7 @@ import forge.game.zone.ZoneType;
import forge.util.Aggregates;
import java.util.List;
import java.util.Map;
import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
public class RevealEffect extends SpellAbilityEffect {
@@ -74,14 +73,7 @@ public class RevealEffect extends SpellAbilityEffect {
game.getAction().reveal(revealed, p);
for (final Card c : revealed) {
Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", c);
/*
if (sa.hasParam("MiracleCost")) {
runParams.put("Miracle", true);
}
//*/
game.getTriggerHandler().runTriggerOld(TriggerType.Revealed, runParams, false);
game.getTriggerHandler().runTrigger(TriggerType.Revealed, AbilityKey.mapFromCard(c), false);
if (sa.hasParam("RememberRevealed")) {
host.addRemembered(c);
}

31
forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
View File

@@ -1,10 +1,10 @@
package forge.game.ability.effects;
import com.google.common.collect.Maps;
import forge.card.mana.ManaCost;
import forge.game.Game;
import forge.game.GameActionUtil;
import forge.game.GameEntityCounterTable;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.*;
@@ -36,10 +36,9 @@ public class SacrificeEffect extends SpellAbilityEffect {
isPaid = activator.getController().payManaOptional(card, new Cost(sa.getParam("Echo"), true),
sa, "Pay Echo", ManaPaymentPurpose.Echo);
}
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("EchoPaid", Boolean.valueOf(isPaid));
runParams.put("Card", card);
game.getTriggerHandler().runTriggerOld(TriggerType.PayEcho, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(card);
runParams.put(AbilityKey.EchoPaid, isPaid);
game.getTriggerHandler().runTrigger(TriggerType.PayEcho, runParams, false);
if (isPaid || !card.getController().equals(activator)) {
return;
}
@@ -65,11 +64,10 @@ public class SacrificeEffect extends SpellAbilityEffect {
sb.append("Cumulative upkeep for ").append(card);
boolean isPaid = activator.getController().payManaOptional(card, payCost, sa, sb.toString(), ManaPaymentPurpose.CumulativeUpkeep);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("CumulativeUpkeepPaid", Boolean.valueOf(isPaid));
runParams.put("Card", card);
runParams.put("PayingMana", StringUtils.join(sa.getPayingMana(), ""));
game.getTriggerHandler().runTriggerOld(TriggerType.PayCumulativeUpkeep, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(card);
runParams.put(AbilityKey.CumulativeUpkeepPaid, isPaid);
runParams.put(AbilityKey.PayingMana, StringUtils.join(sa.getPayingMana(), ""));
game.getTriggerHandler().runTrigger(TriggerType.PayCumulativeUpkeep, runParams, false);
if (isPaid || !card.getController().equals(activator)) {
return;
}
@@ -147,16 +145,15 @@ public class SacrificeEffect extends SpellAbilityEffect {
// Run Devour Trigger
if (devour) {
card.addDevoured(lKICopy);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Devoured", sac);
game.getTriggerHandler().runTriggerOld(TriggerType.Devoured, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Devoured, sac);
game.getTriggerHandler().runTrigger(TriggerType.Devoured, runParams, false);
}
if (exploit) {
card.addExploited(lKICopy);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Exploited", lKICopy);
runParams.put("Card", card);
game.getTriggerHandler().runTriggerOld(TriggerType.Exploited, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(card);
runParams.put(AbilityKey.Exploited, lKICopy);
game.getTriggerHandler().runTrigger(TriggerType.Exploited, runParams, false);
}
if (wasDestroyed || wasSacrificed) {
countSacrificed++;

8
forge-game/src/main/java/forge/game/ability/effects/SetInMotionEffect.java
View File

@@ -1,8 +1,8 @@
package forge.game.ability.effects;
import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
@@ -46,9 +46,9 @@ public class SetInMotionEffect extends SpellAbilityEffect {
game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Scheme", controller.getActiveScheme());
game.getTriggerHandler().runTriggerOld(TriggerType.SetInMotion, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Scheme, controller.getActiveScheme());
game.getTriggerHandler().runTrigger(TriggerType.SetInMotion, runParams, false);
} else {
controller.setSchemeInMotion();
}

10
forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java
View File

@@ -5,13 +5,13 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import forge.game.ability.AbilityKey;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.ability.AbilityFactory;
@@ -98,10 +98,10 @@ public class VoteEffect extends SpellAbilityEffect {
host.getGame().getAction().nofityOfValue(sa, p, result + "\r\nCurrent Votes:" + votes, p);
}
}
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("AllVotes", votes);
game.getTriggerHandler().runTriggerOld(TriggerType.Vote, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.AllVotes, votes);
game.getTriggerHandler().runTrigger(TriggerType.Vote, runParams, false);
List<String> subAbs = Lists.newArrayList();
final List<Object> mostVotes = getMostVotes(votes);

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

@@ -30,6 +30,7 @@ import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostParser;
import forge.game.*;
import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.ApiType;
import forge.game.ability.effects.CharmEffect;
@@ -197,7 +198,9 @@ public class Card extends GameEntity implements Comparable<Card> {
// stack of set power/toughness
private Map<Long, Pair<Integer,Integer>> newPT = Maps.newTreeMap();
private Map<Long, Pair<Integer,Integer>> newPTCharacterDefining = Maps.newTreeMap();
private Map<Long, Pair<Integer,Integer>> boostPT = Maps.newTreeMap();
// x=Static Avility id or 0, y=timestamp
private Table<Integer, Long, Pair<Integer,Integer>> boostPT = TreeBasedTable.create();
private String basePowerString = null;
private String baseToughnessString = null;
@@ -567,9 +570,9 @@ public class Card extends GameEntity implements Comparable<Card> {
// Clear old dfc trigger from the trigger handler
getGame().getTriggerHandler().clearInstrinsicActiveTriggers(this, null);
getGame().getTriggerHandler().registerActiveTrigger(this, false);
Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Transformer", this);
getGame().getTriggerHandler().runTriggerOld(TriggerType.Transformed, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Transformer, this);
getGame().getTriggerHandler().runTrigger(TriggerType.Transformed, runParams, false);
incrementTransformedTimestamp();
return result;
@@ -687,9 +690,7 @@ public class Card extends GameEntity implements Comparable<Card> {
// Run triggers
getGame().getTriggerHandler().registerActiveTrigger(this, false);
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Card", this);
getGame().getTriggerHandler().runTriggerOld(TriggerType.TurnFaceUp, runParams, false);
getGame().getTriggerHandler().runTrigger(TriggerType.TurnFaceUp, AbilityKey.mapFromCard(this), false);
}
return result;
}
@@ -1281,18 +1282,17 @@ public class Card extends GameEntity implements Comparable<Card> {
}
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", this);
runParams.put("Source", source);
runParams.put("CounterType", counterType);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
runParams.put(AbilityKey.Source, source);
runParams.put(AbilityKey.CounterType, counterType);
for (int i = 0; i < addAmount; i++) {
runParams.put("CounterAmount", oldValue + i + 1);
getGame().getTriggerHandler().runTriggerOld(
runParams.put(AbilityKey.CounterAmount, oldValue + i + 1);
getGame().getTriggerHandler().runTrigger(
TriggerType.CounterAdded, Maps.newHashMap(runParams), false);
}
if (addAmount > 0) {
runParams.put("CounterAmount", addAmount);
getGame().getTriggerHandler().runTriggerOld(
runParams.put(AbilityKey.CounterAmount, addAmount);
getGame().getTriggerHandler().runTrigger(
TriggerType.CounterAddedOnce, Maps.newHashMap(runParams), false);
}
} else {
@@ -1340,10 +1340,10 @@ public class Card extends GameEntity implements Comparable<Card> {
@Override
public final void subtractCounter(final CounterType counterName, final int n) {
Integer oldValue = getCounters(counterName);
int newValue = oldValue == null ? 0 : Math.max(oldValue - n, 0);
int oldValue = getCounters(counterName);
int newValue = Math.max(oldValue - n, 0);
final int delta = (oldValue == null ? 0 : oldValue) - newValue;
final int delta = oldValue - newValue;
if (delta == 0) { return; }
int powerBonusBefore = getPowerBonusFromCounters();
@@ -1359,19 +1359,18 @@ public class Card extends GameEntity implements Comparable<Card> {
}
// Play the Subtract Counter sound
getGame().fireEvent(new GameEventCardCounters(this, counterName, oldValue == null ? 0 : oldValue, newValue));
getGame().fireEvent(new GameEventCardCounters(this, counterName, oldValue, newValue));
// Run triggers
int curCounters = oldValue == null ? 0 : oldValue;
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Card", this);
runParams.put("CounterType", counterName);
int curCounters = oldValue;
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
runParams.put(AbilityKey.CounterType, counterName);
for (int i = 0; i < delta && curCounters != 0; i++) {
runParams.put("NewCounterAmount", --curCounters);
getGame().getTriggerHandler().runTriggerOld(TriggerType.CounterRemoved, runParams, false);
runParams.put(AbilityKey.NewCounterAmount, --curCounters);
getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemoved, runParams, false);
}
runParams.put("CounterAmount", delta);
getGame().getTriggerHandler().runTriggerOld(TriggerType.CounterRemovedOnce, runParams, false);
runParams.put(AbilityKey.CounterAmount, delta);
getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemovedOnce, runParams, false);
}
@Override
@@ -2935,10 +2934,10 @@ public class Card extends GameEntity implements Comparable<Card> {
getGame().fireEvent(new GameEventCardAttachment(this, oldTarget, entity));
// run trigger
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("AttachSource", this);
runParams.put("AttachTarget", entity);
getController().getGame().getTriggerHandler().runTriggerOld(TriggerType.Attached, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.AttachSource, this);
runParams.put(AbilityKey.AttachTarget, entity);
getController().getGame().getTriggerHandler().runTrigger(TriggerType.Attached, runParams, false);
}
@@ -2957,10 +2956,10 @@ public class Card extends GameEntity implements Comparable<Card> {
getGame().fireEvent(new GameEventCardAttachment(this, entity, null));
// Run triggers
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Attach", this);
runParams.put("Object", entity);
getGame().getTriggerHandler().runTriggerOld(TriggerType.Unattach, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attach, this);
runParams.put(AbilityKey.Object, entity);
getGame().getTriggerHandler().runTrigger(TriggerType.Unattach, runParams, false);
runUnattachCommands();
}
@@ -3477,23 +3476,21 @@ public class Card extends GameEntity implements Comparable<Card> {
return result;
}
public void addPTBoost(final Integer power, final Integer toughness, final long timestamp) {
boostPT.put(timestamp, Pair.of(power, toughness));
public void addPTBoost(final Integer power, final Integer toughness, final long timestamp, final Integer staticId) {
boostPT.put(staticId == null ? 0 : staticId, timestamp, Pair.of(power, toughness));
}
public void removePTBoost(final long timestamp) {
boostPT.remove(timestamp);
public void removePTBoost(final long timestamp, final Integer staticId) {
boostPT.remove(staticId, timestamp);
}
public Map<Long, Pair<Integer, Integer>> getPTBoostMap() {
return ImmutableMap.copyOf(boostPT);
public Table<Integer, Long, Pair<Integer, Integer>> getPTBoostTable() {
return ImmutableTable.copyOf(boostPT);
}
public void setPTBoost(Map<Long, Pair<Integer, Integer>> map) {
public void setPTBoost(Table<Integer, Long, Pair<Integer, Integer>> table) {
this.boostPT.clear();
for (Map.Entry<Long, Pair<Integer,Integer>> e : map.entrySet()) {
this.boostPT.put(e.getKey(), Pair.of(e.getValue().getLeft(), e.getValue().getRight()));
}
boostPT.putAll(table);
}
public final boolean isUntapped() {
@@ -3516,10 +3513,9 @@ public class Card extends GameEntity implements Comparable<Card> {
if (tapped) { return; }
// Run triggers
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Card", this);
runParams.put("Attacker", attacker);
getGame().getTriggerHandler().runTriggerOld(TriggerType.Taps, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
runParams.put(AbilityKey.Attacker, attacker);
getGame().getTriggerHandler().runTrigger(TriggerType.Taps, runParams, false);
setTapped(true);
getGame().fireEvent(new GameEventCardTapped(this, true));
@@ -3538,9 +3534,7 @@ public class Card extends GameEntity implements Comparable<Card> {
}
// Run triggers
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Card", this);
getGame().getTriggerHandler().runTriggerOld(TriggerType.Untaps, runParams, false);
getGame().getTriggerHandler().runTrigger(TriggerType.Untaps, AbilityKey.mapFromCard(this), false);
for (final GameCommand var : untapCommandList) {
var.run();
@@ -3971,12 +3965,8 @@ public class Card extends GameEntity implements Comparable<Card> {
return null;
}
public final StaticAbility addStaticAbility(final StaticAbility stAb) {
return addStaticAbility(stAb, false);
}
public final StaticAbility addStaticAbility(final StaticAbility stAb, boolean intrinsic) {
final StaticAbility stAbCopy = new StaticAbility(stAb, this);
currentState.addStaticAbility(stAbCopy);
return stAbCopy;
currentState.addStaticAbility(stAb);
return stAb;
}
public final void removeStaticAbility(StaticAbility stAb) {
currentState.removeStaticAbility(stAb);
@@ -4099,13 +4089,12 @@ public class Card extends GameEntity implements Comparable<Card> {
return false;
}
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("Card", this);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
if (!isPhasedOut()) {
// If this is currently PhasedIn, it's about to phase out.
// Run trigger before it does because triggers don't work with phased out objects
getGame().getTriggerHandler().runTriggerOld(TriggerType.PhaseOut, runParams, false);
getGame().getTriggerHandler().runTrigger(TriggerType.PhaseOut, runParams, false);
}
setPhasedOut(!phasedOut);
@@ -4117,7 +4106,7 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!phasedOut) {
// Just phased in, time to run the phased in trigger
getGame().getTriggerHandler().registerActiveTrigger(this, false);
getGame().getTriggerHandler().runTriggerOld(TriggerType.PhaseIn, runParams, false);
getGame().getTriggerHandler().runTrigger(TriggerType.PhaseIn, runParams, false);
}
return true;
@@ -4900,17 +4889,17 @@ public class Card extends GameEntity implements Comparable<Card> {
source.addDealtDamageToThisTurn(this, damageIn);
// Run triggers
final Map<String, Object> runParams = Maps.newTreeMap();
runParams.put("DamageSource", source);
runParams.put("DamageTarget", this);
runParams.put("DamageAmount", damageIn);
runParams.put("IsCombatDamage", isCombat);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageSource, source);
runParams.put(AbilityKey.DamageTarget, this);
runParams.put(AbilityKey.DamageAmount, damageIn);
runParams.put(AbilityKey.IsCombatDamage, isCombat);
if (!isCombat) {
runParams.put("SpellAbilityStackInstance", game.stack.peek());
runParams.put(AbilityKey.SpellAbilityStackInstance, game.stack.peek());
}
// Defending player at the time the damage was dealt
runParams.put("DefendingPlayer", game.getCombat() != null ? game.getCombat().getDefendingPlayerRelatedTo(source) : null);
getGame().getTriggerHandler().runTriggerOld(TriggerType.DamageDone, runParams, false);
runParams.put(AbilityKey.DefendingPlayer, game.getCombat() != null ? game.getCombat().getDefendingPlayerRelatedTo(source) : null);
getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
GameEventCardDamaged.DamageType damageType = DamageType.Normal;
if (isPlaneswalker()) {
@@ -5008,10 +4997,9 @@ public class Card extends GameEntity implements Comparable<Card> {
exertedByPlayer.add(getController());
exertThisTurn++;
view.updateExertedThisTurn(this, true);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", this);
runParams.put("Player", getController());
game.getTriggerHandler().runTriggerOld(TriggerType.Exerted, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
runParams.put(AbilityKey.Player, getController());
game.getTriggerHandler().runTrigger(TriggerType.Exerted, runParams, false);
}
public boolean isExertedBy(final Player player) {

36
forge-game/src/main/java/forge/game/card/CardDamageMap.java
View File

@@ -7,11 +7,11 @@ import java.util.Map;
import com.google.common.collect.ForwardingTable;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.collect.Table;
import forge.game.GameEntity;
import forge.game.ability.AbilityKey;
import forge.game.keyword.Keyword;
import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType;
@@ -34,12 +34,12 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
}
if (sum > 0) {
final GameEntity ge = e.getKey();
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("DamageTarget", ge);
runParams.put("DamageAmount", sum);
runParams.put("IsCombatDamage", isCombat);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageTarget, ge);
runParams.put(AbilityKey.DamageAmount, sum);
runParams.put(AbilityKey.IsCombatDamage, isCombat);
ge.getGame().getTriggerHandler().runTriggerOld(TriggerType.DamagePreventedOnce, runParams, false);
ge.getGame().getTriggerHandler().runTrigger(TriggerType.DamagePreventedOnce, runParams, false);
}
}
}
@@ -53,13 +53,13 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
sum += i;
}
if (sum > 0) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("DamageSource", sourceLKI);
runParams.put("DamageTargets", Sets.newHashSet(e.getValue().keySet()));
runParams.put("DamageAmount", sum);
runParams.put("IsCombatDamage", isCombat);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageSource, sourceLKI);
runParams.put(AbilityKey.DamageTargets, Sets.newHashSet(e.getValue().keySet()));
runParams.put(AbilityKey.DamageAmount, sum);
runParams.put(AbilityKey.IsCombatDamage, isCombat);
sourceLKI.getGame().getTriggerHandler().runTriggerOld(TriggerType.DamageDealtOnce, runParams, false);
sourceLKI.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDealtOnce, runParams, false);
if (sourceLKI.hasKeyword(Keyword.LIFELINK)) {
sourceLKI.getController().gainLife(sum, sourceLKI, sa);
@@ -74,13 +74,13 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
}
if (sum > 0) {
final GameEntity ge = e.getKey();
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("DamageTarget", ge);
runParams.put("DamageSources", Sets.newHashSet(e.getValue().keySet()));
runParams.put("DamageAmount", sum);
runParams.put("IsCombatDamage", isCombat);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageTarget, ge);
runParams.put(AbilityKey.DamageSources, Sets.newHashSet(e.getValue().keySet()));
runParams.put(AbilityKey.DamageAmount, sum);
runParams.put(AbilityKey.IsCombatDamage, isCombat);
ge.getGame().getTriggerHandler().runTriggerOld(TriggerType.DamageDoneOnce, runParams, false);
ge.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDoneOnce, runParams, false);
}
}
}

2
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -529,7 +529,7 @@ public class CardState extends GameObject {
staticAbilities.clear();
for (StaticAbility sa : source.staticAbilities) {
if (sa.isIntrinsic()) {
staticAbilities.add(new StaticAbility(sa, this.card));
staticAbilities.add(sa.copy(card, lki));
}
}
}

8
forge-game/src/main/java/forge/game/card/CardZoneTable.java
View File

@@ -7,10 +7,10 @@ import java.util.Map;
import com.google.common.collect.ForwardingTable;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Maps;
import com.google.common.collect.Table;
import forge.game.Game;
import forge.game.ability.AbilityKey;
import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType;
@@ -54,9 +54,9 @@ public class CardZoneTable extends ForwardingTable<ZoneType, ZoneType, CardColle
public void triggerChangesZoneAll(final Game game) {
if (!isEmpty()) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Cards", new CardZoneTable(this));
game.getTriggerHandler().runTriggerOld(TriggerType.ChangesZoneAll, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Cards, new CardZoneTable(this));
game.getTriggerHandler().runTrigger(TriggerType.ChangesZoneAll, runParams, false);
}
}

19
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -24,6 +24,7 @@ import forge.game.GameEntity;
import forge.game.GameEntityCounterTable;
import forge.game.GameLogEntryType;
import forge.game.GameObjectMap;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
@@ -632,11 +633,11 @@ public class Combat {
defenders.add(getDefenderByAttacker(ab));
for (Card attacker : ab.getAttackers()) {
// Run Unblocked Trigger
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Attacker", attacker);
runParams.put("Defender",getDefenderByAttacker(attacker));
runParams.put("DefendingPlayer", getDefenderPlayerByAttacker(attacker));
game.getTriggerHandler().runTriggerOld(TriggerType.AttackerUnblocked, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, attacker);
runParams.put(AbilityKey.Defender,getDefenderByAttacker(attacker));
runParams.put(AbilityKey.DefendingPlayer, getDefenderPlayerByAttacker(attacker));
game.getTriggerHandler().runTrigger(TriggerType.AttackerUnblocked, runParams, false);
}
}
}
@@ -644,10 +645,10 @@ public class Combat {
// triggers for Coveted Jewel
// currently there is only one attacking player
// should be updated when two-headed-giant is done
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("AttackingPlayer", getAttackingPlayer());
runParams.put("Defenders", defenders);
game.getTriggerHandler().runTriggerOld(TriggerType.AttackerUnblockedOnce, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.AttackingPlayer, getAttackingPlayer());
runParams.put(AbilityKey.Defenders, defenders);
game.getTriggerHandler().runTrigger(TriggerType.AttackerUnblockedOnce, runParams, false);
}
}

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

@@ -20,13 +20,13 @@ package forge.game.combat;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import forge.card.CardType;
import forge.card.MagicColor;
import forge.card.mana.ManaCost;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.GlobalRuleChange;
import forge.game.ability.AbilityKey;
import forge.game.card.*;
import forge.game.cost.Cost;
import forge.game.keyword.Keyword;
@@ -305,15 +305,15 @@ public class CombatUtil {
*/
public static void checkDeclaredAttacker(final Game game, final Card c, final Combat combat) {
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Attacker", c);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, c);
final List<Card> otherAttackers = combat.getAttackers();
otherAttackers.remove(c);
runParams.put("OtherAttackers", otherAttackers);
runParams.put("Attacked", combat.getDefenderByAttacker(c));
runParams.put("DefendingPlayer", combat.getDefenderPlayerByAttacker(c));
runParams.put("Defenders", combat.getDefenders());
game.getTriggerHandler().runTriggerOld(TriggerType.Attacks, runParams, false);
runParams.put(AbilityKey.OtherAttackers, otherAttackers);
runParams.put(AbilityKey.Attacked, combat.getDefenderByAttacker(c));
runParams.put(AbilityKey.DefendingPlayer, combat.getDefenderPlayerByAttacker(c));
runParams.put(AbilityKey.Defenders, combat.getDefenders());
game.getTriggerHandler().runTrigger(TriggerType.Attacks, runParams, false);
c.getDamageHistory().setCreatureAttackedThisCombat(true);
c.getDamageHistory().clearNotAttackedSinceLastUpkeepOf();

2
forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
View File

@@ -228,7 +228,7 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
result.staticAbilities = Lists.newArrayList();
for (StaticAbility sa : this.staticAbilities) {
result.staticAbilities.add(new StaticAbility(sa, host));
result.staticAbilities.add(sa.copy(host, lki));
}
return result;

3
forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
View File

@@ -27,6 +27,7 @@ import forge.util.TextUtil;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* TODO: Write javadoc for this type.
@@ -261,6 +262,6 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
/** {@inheritDoc} */
@Override
public int hashCode() {
return 42 * (42 + this.getId());
return Objects.hash(ReplacementEffect.class, getId());
}
}

2
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -205,7 +205,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
}
@Override
public int hashCode() {
return getId();
return Objects.hash(SpellAbility.class, getId());
}
@Override
public boolean equals(final Object obj) {

68
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -17,6 +17,7 @@
*/
package forge.game.staticability;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import forge.card.MagicColor;
@@ -24,6 +25,7 @@ import forge.game.CardTraitBase;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.GameStage;
import forge.game.IIdentifiable;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
import forge.game.card.CardCollection;
@@ -43,18 +45,38 @@ import forge.util.TextUtil;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
/**
* The Class StaticAbility.
*/
public class StaticAbility extends CardTraitBase implements Comparable<StaticAbility> {
public class StaticAbility extends CardTraitBase implements IIdentifiable, Cloneable, Comparable<StaticAbility> {
private static int maxId = 0;
private static int nextId() { return ++maxId; }
private final Set<StaticAbilityLayer> layers;
private int id;
private Set<StaticAbilityLayer> layers;
private CardCollectionView ignoreEffectCards = new CardCollection();
private final List<Player> ignoreEffectPlayers = Lists.newArrayList();
private int mayPlayTurn = 0;
@Override
public final int getId() {
return id;
}
@Override
public int hashCode() {
return Objects.hash(StaticAbility.class, getId());
}
@Override
public boolean equals(final Object obj) {
return obj instanceof StaticAbility && this.id == ((StaticAbility) obj).id;
}
/**
* <p>
* Getter for the field <code>mapParams</code>.
@@ -228,6 +250,7 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
* the host
*/
private StaticAbility(final Map<String, String> params, final Card host) {
this.id = nextId();
this.originalMapParams.putAll(params);
this.mapParams.putAll(params);
this.layers = this.generateLayer();
@@ -235,19 +258,6 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
buildCommonAttributes(host);
}
public StaticAbility(StaticAbility stAb, Card host) {
this.originalMapParams.putAll(stAb.originalMapParams);
this.mapParams.putAll(stAb.mapParams);
this.layers = this.generateLayer();
this.hostCard = host;
this.intrinsic = stAb.intrinsic;
// Copy old sVars
this.sVars.putAll(stAb.sVars);
// but if they are References use this ones
buildCommonAttributes(host);
}
public final CardCollectionView applyContinuousAbilityBefore(final StaticAbilityLayer layer, final CardCollectionView preList) {
if (!shouldApplyContinuousAbility(layer, false)) {
return null;
@@ -769,6 +779,32 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
@Override
public int compareTo(StaticAbility arg0) {
return getHostCard().compareTo(arg0.getHostCard());
return ComparisonChain.start()
.compare(getHostCard(),arg0.getHostCard())
.compare(getId(), arg0.getId())
.result();
}
public StaticAbility copy(Card host, final boolean lki) {
StaticAbility clone = null;
try {
clone = (StaticAbility) clone();
clone.id = lki ? id : nextId();
// dont use setHostCard to not trigger the not copied parts yet
clone.hostCard = host;
// need to clone the maps too so they can be changed
clone.originalMapParams = Maps.newHashMap(this.originalMapParams);
clone.mapParams = Maps.newHashMap(this.mapParams);
clone.sVars = Maps.newHashMap(this.sVars);
clone.layers = this.generateLayer();
clone.buildCommonAttributes(host);
} catch (final CloneNotSupportedException e) {
System.err.println(e);
}
return clone;
}
} // end class StaticAbility

2
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -532,7 +532,7 @@ public final class StaticAbilityContinuous {
if (addT.startsWith("AffectedX")) {
toughnessBonus = CardFactoryUtil.xCount(affectedCard, AbilityUtils.getSVar(stAb, addT));
}
affectedCard.addPTBoost(powerBonus, toughnessBonus, se.getTimestamp());
affectedCard.addPTBoost(powerBonus, toughnessBonus, se.getTimestamp(), stAb.getId());
}
// add keywords

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

@@ -431,7 +431,7 @@ public abstract class Trigger extends TriggerReplacementBase {
/** {@inheritDoc} */
@Override
public int hashCode() {
return 41 * (41 + this.getId());
return Objects.hash(Trigger.class, getId());
}
/**

19
forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
View File

@@ -2036,4 +2036,23 @@ public class GameSimulatorTest extends SimulationTestCase {
assertTrue(dimirdgAfterCopy2.isFlipped());
assertFalse(dimirdgAfterCopy2.getType().isLegendary());
}
public void testStaticMultiPump() {
Game game = initAndCreateGame();
Player p = game.getPlayers().get(1);
Card c1 = addCard("Creakwood Liege", p);
Card c2 = addCard("Creakwood Liege", p);
game.getPhaseHandler().devModeSet(PhaseType.MAIN1, p);
// update stats state
game.getAction().checkStateEffects(true);
assertTrue(c1.getNetPower() == 4);
assertTrue(c1.getNetToughness() == 4);
assertTrue(c2.getNetPower() == 4);
assertTrue(c2.getNetToughness() == 4);
}
}