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

several mechanical refactorings

Browse Source
This commit is contained in:
Ryan1729
2019-09-11 21:23:27 -06:00
parent 434027c14f
commit b76a3c3efa
13 changed files with 117 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -894,10 +894,10 @@ public class GameAction {
// preList means that this is run by a pre Check with LKI objects
// in that case Always trigger should not Run
if (preList.isEmpty()) {
final Map<String, Object> runParams = Maps.newHashMap();
game.getTriggerHandler().runTriggerOld(TriggerType.Always, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false);
game.getTriggerHandler().runTriggerOld(TriggerType.Immediate, runParams, false);
game.getTriggerHandler().runTrigger(TriggerType.Immediate, runParams, false);
}
// Update P/T and type in the view only once after all the cards have been processed, to avoid flickering
@@ -1416,10 +1416,10 @@ public class GameAction {
game.fireEvent(new GameEventCardDestroyed());
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", c);
runParams.put("Causer", activator);
game.getTriggerHandler().runTriggerOld(TriggerType.Destroyed, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, c);
runParams.put(AbilityKey.Causer, activator);
game.getTriggerHandler().runTrigger(TriggerType.Destroyed, runParams, false);
final Card sacrificed = sacrificeDestroy(c, sa, table);
return sacrificed != null;
@@ -1596,8 +1596,7 @@ public class GameAction {
checkStateEffects(true); // why?
// Run Trigger beginning of the game
final Map<String, Object> runParams = Maps.newHashMap();
game.getTriggerHandler().runTriggerOld(TriggerType.NewGame, runParams, true);
game.getTriggerHandler().runTrigger(TriggerType.NewGame, AbilityKey.newMap(), true);
//</THIS CODE WILL WORK WITH PHASE = NULL>
@@ -1760,9 +1759,9 @@ public class GameAction {
game.setMonarch(p);
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Player", p);
game.getTriggerHandler().runTriggerOld(TriggerType.BecomeMonarch, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, p);
game.getTriggerHandler().runTrigger(TriggerType.BecomeMonarch, runParams, false);
}
// Make scry an action function so that it can be used for mulligans (with a null cause)
@@ -1822,9 +1821,9 @@ public class GameAction {
if (cause != null) {
// set up triggers (but not actually do them until later)
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Player", p);
game.getTriggerHandler().runTriggerOld(TriggerType.Scry, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, p);
game.getTriggerHandler().runTrigger(TriggerType.Scry, runParams, false);
}
}
}

13
forge-game/src/main/java/forge/game/GameEntity.java
View File

@@ -17,6 +17,7 @@
*/
package forge.game;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardCollectionView;
@@ -214,13 +215,13 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
int prevent = damage - restDamage;
preventMap.put(source, this, damage - restDamage);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("DamageTarget", this);
runParams.put("DamageAmount", prevent);
runParams.put("DamageSource", source);
runParams.put("IsCombatDamage", isCombat);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.DamageTarget, this);
runParams.put(AbilityKey.DamageAmount, prevent);
runParams.put(AbilityKey.DamageSource, source);
runParams.put(AbilityKey.IsCombatDamage, isCombat);
getGame().getTriggerHandler().runTriggerOld(TriggerType.DamagePrevented, runParams, false);
getGame().getTriggerHandler().runTrigger(TriggerType.DamagePrevented, runParams, false);
}
return restDamage;

7
forge-game/src/main/java/forge/game/GameEntityCounterTable.java
View File

@@ -7,6 +7,7 @@ import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Maps;
import com.google.common.collect.Table;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.card.CounterType;
import forge.game.spellability.SpellAbility;
@@ -47,9 +48,9 @@ public class GameEntityCounterTable extends ForwardingTable<GameEntity, CounterT
public void triggerCountersPutAll(final Game game) {
if (!isEmpty()) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Objects", this);
game.getTriggerHandler().runTriggerOld(TriggerType.CounterAddedAll, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Objects, this);
game.getTriggerHandler().runTrigger(TriggerType.CounterAddedAll, runParams, false);
}
}
}

12
forge-game/src/main/java/forge/game/PlanarDice.java
View File

@@ -1,9 +1,11 @@
package forge.game;
import forge.game.ability.AbilityKey;
import forge.game.player.Player;
import forge.game.trigger.TriggerType;
import java.util.HashMap;
import java.util.Map;
import com.google.common.collect.ImmutableList;
@@ -35,11 +37,11 @@ public enum PlanarDice {
{
trigRes = Chaos;
}
HashMap<String,Object> runParams = new HashMap<>();
runParams.put("Player", roller);
runParams.put("Result", trigRes);
roller.getGame().getTriggerHandler().runTriggerOld(TriggerType.PlanarDice, runParams,false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, roller);
runParams.put(AbilityKey.Result, trigRes);
roller.getGame().getTriggerHandler().runTrigger(TriggerType.PlanarDice, runParams,false);
return res;

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

@@ -7,23 +7,41 @@ import java.util.EnumMap;
*/
public enum AbilityKey {
Affected("Affected"),
Attacker("Attacker"),
Attackers("Attackers"),
AttackingPlayer("AttackingPlayer"),
AttackedTarget("AttackedTarget"),
Blocker("Blocker"),
Blockers("Blockers"),
Card("Card"),
CardLKI("CardLKI"),
Cause("Cause"),
Causer("Causer"),
Championed("Championed"),
CounteredSA("CounteredSA"),
DamageAmount("DamageAmount"),
DamageSource("DamageSource"),
DamageTarget("DamageTarget"),
Defender("Defender"),
DefendingPlayer("DefendingPlayer"),
Destination("Destination"),
Event("Event"),
Fizzle("Fizzle"),
IsCombatDamage("IsCombatDamage"),
Player("Player"),
IndividualCostPaymentInstance("IndividualCostPaymentInstance"),
MonstrosityAmount("MonstrosityAmount"),
NumBlockers("NumBlockers"),
Objects("Objects"),
Origin("Origin"),
OriginalController("OriginalController"),
Result("Result"),
Scheme("Scheme"),
SpellAbilityStackInstance("SpellAbilityStackInstance"),
StackSa("StackSa"),
StackSi("StackSi");
StackSi("StackSi"),
Target("Target"),
Won("Won");
private String key;

7
forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
View File

@@ -2,6 +2,7 @@ package forge.game.ability.effects;
import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.ability.AbilityKey;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.player.Player;
@@ -40,9 +41,9 @@ public class AbandonEffect extends SpellAbilityEffect {
controller.getZone(ZoneType.SchemeDeck).add(source);
// Run triggers
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Scheme", source);
game.getTriggerHandler().runTriggerOld(TriggerType.Abandoned, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Scheme, source);
game.getTriggerHandler().runTrigger(TriggerType.Abandoned, runParams, false);
}
}

15
forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.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.GameEventCombatChanged;
@@ -40,13 +41,13 @@ public class BecomesBlockedEffect extends SpellAbilityEffect {
game.getCombat().setBlocked(c, true);
if (!c.getDamageHistory().getCreatureGotBlockedThisCombat()) {
isCombatChanged = true;
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Attacker", c);
runParams.put("Blockers", Lists.<Card>newArrayList());
runParams.put("NumBlockers", 0);
runParams.put("Defender", game.getCombat().getDefenderByAttacker(c));
runParams.put("DefendingPlayer", game.getCombat().getDefenderPlayerByAttacker(c));
game.getTriggerHandler().runTriggerOld(TriggerType.AttackerBlocked, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, c);
runParams.put(AbilityKey.Blockers, Lists.<Card>newArrayList());
runParams.put(AbilityKey.NumBlockers, 0);
runParams.put(AbilityKey.Defender, game.getCombat().getDefenderByAttacker(c));
runParams.put(AbilityKey.DefendingPlayer, game.getCombat().getDefenderPlayerByAttacker(c));
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false);
}
}
}

33
forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
View File

@@ -1,6 +1,7 @@
package forge.game.ability.effects;
import com.google.common.collect.Maps;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
@@ -53,26 +54,28 @@ public class BlockEffect extends SpellAbilityEffect {
blocker.addBlockedThisTurn(attacker);
attacker.addBlockedByThisTurn(blocker);
Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Attacker", attacker);
runParams.put("Blocker", blocker);
game.getTriggerHandler().runTriggerOld(TriggerType.AttackerBlockedByCreature, runParams, false);
{
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, attacker);
runParams.put(AbilityKey.Blocker, blocker);
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlockedByCreature, runParams, false);
}
runParams = Maps.newHashMap();
runParams.put("Blocker", blocker);
runParams.put("Attackers", attacker);
game.getTriggerHandler().runTriggerOld(TriggerType.Blocks, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Blocker, blocker);
runParams.put(AbilityKey.Attackers, attacker);
game.getTriggerHandler().runTrigger(TriggerType.Blocks, runParams, false);
}
attacker.getDamageHistory().setCreatureGotBlockedThisCombat(true);
if (!wasBlocked) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Attacker", attacker);
runParams.put("Blockers", blockers);
runParams.put("NumBlockers", blockers.size());
runParams.put("Defender", combat.getDefenderByAttacker(attacker));
runParams.put("DefendingPlayer", combat.getDefenderPlayerByAttacker(attacker));
game.getTriggerHandler().runTriggerOld(TriggerType.AttackerBlocked, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Attacker, attacker);
runParams.put(AbilityKey.Blockers, blockers);
runParams.put(AbilityKey.NumBlockers, blockers.size());
runParams.put(AbilityKey.Defender, combat.getDefenderByAttacker(attacker));
runParams.put(AbilityKey.DefendingPlayer, combat.getDefenderPlayerByAttacker(attacker));
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false);
combat.orderBlockersForDamageAssignment(attacker, new CardCollection(blockers));
}

9
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
View File

@@ -4,6 +4,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import forge.game.Game;
import forge.game.GameActionUtil;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.*;
@@ -79,10 +80,10 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
if (!libCards.isEmpty()) {
sa.getActivatingPlayer().getController().reveal(libCards, ZoneType.Library, libCards.get(0).getOwner());
}
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Player", sa.getActivatingPlayer());
runParams.put("Target", tgtPlayers);
game.getTriggerHandler().runTriggerOld(TriggerType.SearchedLibrary, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, sa.getActivatingPlayer());
runParams.put(AbilityKey.Target, tgtPlayers);
game.getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
}
if (origin.contains(ZoneType.Hand) && sa.hasParam("Search")) {
CardCollection handCards = CardLists.filterControlledBy(CardLists.getValidCards(cards, "Card.inZoneHand", sa.getActivatingPlayer(), source),

16
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -831,10 +831,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
}
}
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Player", decider);
runParams.put("Target", Lists.newArrayList(player));
decider.getGame().getTriggerHandler().runTriggerOld(TriggerType.SearchedLibrary, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, decider);
runParams.put(AbilityKey.Target, Lists.newArrayList(player));
decider.getGame().getTriggerHandler().runTrigger(TriggerType.SearchedLibrary, runParams, false);
}
if (!defined && changeType != null) {
@@ -1132,10 +1132,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
if (champion) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", source);
runParams.put("Championed", c);
game.getTriggerHandler().runTriggerOld(TriggerType.Championed, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, source);
runParams.put(AbilityKey.Championed, c);
game.getTriggerHandler().runTrigger(TriggerType.Championed, runParams, false);
}
if (remember) {

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

@@ -2,6 +2,7 @@ package forge.game.ability.effects;
import forge.game.GameAction;
import forge.game.GameLogEntryType;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
@@ -13,6 +14,7 @@ import forge.game.zone.PlayerZone;
import forge.game.zone.ZoneType;
import java.util.HashMap;
import java.util.Map;
public class ClashEffect extends SpellAbilityEffect {
@@ -32,8 +34,8 @@ public class ClashEffect extends SpellAbilityEffect {
final boolean victory = clashWithOpponent(sa);
// Run triggers
final HashMap<String, Object> runParams = new HashMap<>();
runParams.put("Player", sa.getHostCard().getController());
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Player, sa.getHostCard().getController());
if (victory) {
@@ -42,18 +44,18 @@ public class ClashEffect extends SpellAbilityEffect {
AbilityUtils.resolve(sub);
}
runParams.put("Won", "True");
runParams.put(AbilityKey.Won, "True");
} else {
AbilitySub sub = sa.getAdditionalAbility("OtherwiseSubAbility");
if (sub != null) {
AbilityUtils.resolve(sub);
}
runParams.put("Won", "False");
runParams.put(AbilityKey.Won, "False");
}
sa.getHostCard().getGame().getTriggerHandler().runTriggerOld(TriggerType.Clashed, runParams, false);
sa.getHostCard().getGame().getTriggerHandler().runTrigger(TriggerType.Clashed, runParams, false);
}
/**

27
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -8,6 +8,7 @@ import forge.game.Game;
import forge.game.GameEntity;
import forge.game.GameEntityCounterTable;
import forge.game.GameObject;
import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
@@ -260,29 +261,29 @@ public class CountersPutEffect extends SpellAbilityEffect {
}
if (sa.hasParam("Evolve")) {
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", tgtCard);
game.getTriggerHandler().runTriggerOld(TriggerType.Evolved, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, tgtCard);
game.getTriggerHandler().runTrigger(TriggerType.Evolved, runParams, false);
}
if (sa.hasParam("Monstrosity")) {
tgtCard.setMonstrous(true);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", tgtCard);
runParams.put("MonstrosityAmount", counterAmount);
game.getTriggerHandler().runTriggerOld(TriggerType.BecomeMonstrous, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, tgtCard);
runParams.put(AbilityKey.MonstrosityAmount, counterAmount);
game.getTriggerHandler().runTrigger(TriggerType.BecomeMonstrous, runParams, false);
}
if (sa.hasParam("Renown")) {
tgtCard.setRenowned(true);
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", tgtCard);
game.getTriggerHandler().runTriggerOld(TriggerType.BecomeRenowned, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, tgtCard);
game.getTriggerHandler().runTrigger(TriggerType.BecomeRenowned, runParams, false);
}
if (sa.hasParam("Adapt")) {
// need to remove special keyword
tgtCard.removeHiddenExtrinsicKeyword("CARDNAME adapts as though it had no +1/+1 counters");
final Map<String, Object> runParams = Maps.newHashMap();
runParams.put("Card", tgtCard);
game.getTriggerHandler().runTriggerOld(TriggerType.Adapt, runParams, false);
final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
runParams.put(AbilityKey.Card, tgtCard);
game.getTriggerHandler().runTrigger(TriggerType.Adapt, runParams, false);
}
} else {
// adding counters to something like re-suspend cards

4
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
View File

@@ -2,6 +2,7 @@ package forge.gamesimulationtests.util;
import forge.deck.Deck;
import forge.game.*;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.event.GameEventGameFinished;
import forge.game.player.Player;
@@ -137,8 +138,7 @@ public class GameWrapper {
//game.getAction().startGame( null ) determines starting player, draws starting hands, handles mulligans, and initiates the first turn
//skip drawing initial hand and mulliganing
game.setAge( GameStage.Play );
final HashMap<String, Object> runParams = new HashMap<>();
game.getTriggerHandler().runTriggerOld( TriggerType.NewGame, runParams, false );
game.getTriggerHandler().runTrigger(TriggerType.NewGame, AbilityKey.newMap(), false);
//first player in the list starts, no coin toss etc
game.getPhaseHandler().startFirstTurn( game.getPlayers().get( 0 ) );