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

Merge branch 'pako-haldan' into 'master'

Browse Source 
C20: Pako & Haldan play fetch!!

Closes #1365

See merge request core-developers/forge!2729
This commit is contained in:
Michael Kamensky
2020-11-22 12:29:57 +00:00
parent ba37bf2312 757c9208d9
commit b90a377fef
10 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -783,6 +783,7 @@ public abstract class GameState {
Card exiledWith = idToCard.get(Integer.parseInt(id));
c.setExiledWith(exiledWith);
c.setExiledBy(exiledWith.getController());
}
}
@@ -1241,6 +1242,7 @@ public abstract class GameState {
saAdventure.setActivatingPlayer(c.getOwner());
saAdventure.resolve();
c.setExiledWith(c); // This seems to be the way it's set up internally. Potentially not needed here?
c.setExiledBy(c.getController());
} else if (info.startsWith("IsCommander")) {
// TODO: This doesn't seem to properly restore the ability to play the commander. Why?
c.setCommander(true);

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

@@ -302,6 +302,7 @@ public class GameAction {
zoneFrom.remove(c);
if (!zoneTo.is(ZoneType.Exile) && !zoneTo.is(ZoneType.Stack)) {
c.setExiledWith(null);
c.setExiledBy(null);
}
// cleanup Encoding

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

@@ -188,6 +188,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
host = sa.getHostCard();
}
movedCard.setExiledWith(host);
movedCard.setExiledBy(host.getController());
}
if (sa.hasParam("ExileFaceDown")) {
movedCard.turnFaceDown(true);

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

@@ -667,6 +667,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
host = sa.getHostCard();
}
gameCard.setExiledWith(host);
gameCard.setExiledBy(host.getController());
}
movedCard = game.getAction().moveTo(destination, gameCard, cause);
if (ZoneType.Hand.equals(destination) && ZoneType.Command.equals(originZone.getZoneType())) {
@@ -687,6 +688,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
// might set after card is moved again if something has changed
if (destination.equals(ZoneType.Exile) && !movedCard.isToken()) {
movedCard.setExiledWith(host);
if (host != null) {
movedCard.setExiledBy(host.getController());
}
}
if (sa.hasParam("ExileFaceDown")) {
@@ -1214,6 +1218,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
host = sa.getHostCard();
}
movedCard.setExiledWith(host);
movedCard.setExiledBy(host.getController());
}
if (sa.hasParam("ExileFaceDown")) {
movedCard.turnFaceDown(true);
@@ -1319,6 +1324,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
movedCard = game.getAction().exile(tgtHost, srcSA, params);
movedCard.setExiledWith(host);
movedCard.setExiledBy(host.getController());
} else if (srcSA.getParam("Destination").equals("TopOfLibrary")) {
movedCard = game.getAction().moveToLibrary(tgtHost, srcSA, params);
} else if (srcSA.getParam("Destination").equals("Hand")) {

6
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -318,7 +318,12 @@ public class DigEffect extends SpellAbilityEffect {
combatChanged = true;
}
} else if (destZone1.equals(ZoneType.Exile)) {
if (sa.hasParam("ExileWithCounter")) {
c.addCounter(CounterType.getType(sa.getParam("ExileWithCounter")),
1, player, true, counterTable);
}
c.setExiledWith(effectHost);
c.setExiledBy(effectHost.getController());
}
}
if (!origin.equals(c.getZone().getZoneType())) {
@@ -387,6 +392,7 @@ public class DigEffect extends SpellAbilityEffect {
1, player, true, counterTable);
}
c.setExiledWith(effectHost);
c.setExiledBy(effectHost.getController());
}
}
}

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

@@ -239,6 +239,7 @@ public class Card extends GameEntity implements Comparable<Card> {
private String chosenMode = "";
private Card exiledWith = null;
private Player exiledBy = null;
private Map<Long, Player> goad = Maps.newTreeMap();
@@ -1463,6 +1464,11 @@ public class Card extends GameEntity implements Comparable<Card> {
exiledWith = e;
}
public final Player getExiledBy() { return exiledBy; }
public final void setExiledBy(final Player ep) {
exiledBy = ep;
}
// used for cards like Belbe's Portal, Conspiracy, Cover of Darkness, etc.
public final String getChosenType() {
return chosenType;

7
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -350,6 +350,13 @@ public class CardProperty {
if (!card.equals(source)) {
return false;
}
} else if (property.startsWith("ExiledByYou")) {
if (card.getExiledBy() == null) {
return false;
}
if (!card.getExiledBy().equals(sourceController)) {
return false;
}
} else if (property.startsWith("ExiledWithSource")) {
if (card.getExiledWith() == null) {
return false;

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

@@ -105,6 +105,8 @@ public enum CounterEnumType {
FEATHER("FTHR", 195, 202, 165),
FETCH("FETCH", 180, 235, 52),
FILIBUSTER("FLBTR", 255, 179, 119),
FLAME("FLAME", 255, 143, 43),

9
forge-gui/res/cardsfolder/h/haldan_avid_arcanist.txt Executable file
View File

@@ -0,0 +1,9 @@
Name:Haldan, Avid Arcanist
ManaCost:2 U
Types:Legendary Creature Human Wizard
PT:1/4
K:Partner:Pako, Arcane Retriever:Pako
SVar:PlayMain1:TRUE
S:Mode$ Continuous | Affected$ Card.nonCreature+ExiledByYou+counters_GE1_FETCH | AffectedZone$ Exile | MayPlay$ True | MayPlayIgnoreColor$ True | Description$ You may play noncreature cards from exile with fetch counters on them if you exiled them, and you may spend mana as though it were mana of any color to cast those spells.
DeckNeeds:Name$Pako, Arcane Retriever
Oracle:Partner with Pako, Arcane Retriever (When this creature enters the battlefield, target player may put Pako into their hand from their library, then shuffle.)\nYou may play noncreature cards from exile with fetch counters on them if you exiled them, and you may spend mana as though it were mana of any color to cast those spells.

15
forge-gui/res/cardsfolder/p/pako_arcane_retriever.txt Executable file
View File

@@ -0,0 +1,15 @@
Name:Pako, Arcane Retriever
ManaCost:3 R G
Types:Legendary Creature Elemental Hound
PT:3/3
K:Partner:Haldan, Avid Arcanist:Haldan
K:Haste
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, exile the top card of each player's library and put a counter counter on each of them. Put a +1/+1 counter on CARDNAME for each noncreature card exiled this way.
SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | Defined$ Player | DestinationZone$ Exile | ExileWithCounter$ FETCH | RememberChanged$ True | SubAbility$ DBPutCounter
SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Count$ValidExile Card.IsRemembered+nonCreature
DeckHas:Ability$Counters
SVar:HasAttackEffect:TRUE
DeckHints:Name$Haldan, Avid Arcanist
Oracle:Partner with Haldan, Avid Arcanist\nHaste\nWhenever Pako, Arcane Retriever attacks, exile the top card of each player's library and put a fetch counter on each of them. Put a +1/+1 counter on Pako for each noncreature card exiled this way.