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

Merge branch 'esix_fractal_bloom' into 'master'

Browse Source 
Add Esix, Fractal Bloom and necessary supports

See merge request core-developers/forge!4557
This commit is contained in:
Michael Kamensky
2021-04-20 16:44:22 +00:00
parent 5806ef248f e6714bf45e
commit 062ad5d92f
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,15 +550,21 @@ public class AbilityUtils {
players.remove(game.getPhaseHandler().getPlayerTurn()); players.remove(game.getPhaseHandler().getPlayerTurn());
val = CardFactoryUtil.playerXCount(players, calcX[1], card); val = CardFactoryUtil.playerXCount(players, calcX[1], card);
} }
else if (hType.startsWith("PropertyYou") && ability instanceof SpellAbility) { else if (hType.startsWith("PropertyYou")) {
// Hollow One if (ability instanceof SpellAbility) {
players.add(((SpellAbility) ability).getActivatingPlayer()); // Hollow One
players.add(((SpellAbility) ability).getActivatingPlayer());
} else {
players.add(player);
}
val = CardFactoryUtil.playerXCount(players, calcX[1], card); val = CardFactoryUtil.playerXCount(players, calcX[1], card);
} }
else if (hType.startsWith("Property") && ability instanceof SpellAbility) { else if (hType.startsWith("Property")) {
String defined = hType.split("Property")[1]; String defined = hType.split("Property")[1];
for (Player p : game.getPlayersInTurnOrder()) { for (Player p : game.getPlayersInTurnOrder()) {
if (p.hasProperty(defined, ((SpellAbility) ability).getActivatingPlayer(), ability.getHostCard(), ability)) { if (ability instanceof SpellAbility && p.hasProperty(defined, ((SpellAbility) ability).getActivatingPlayer(), ability.getHostCard(), ability)) {
players.add(p);
} else if (!(ability instanceof SpellAbility) && p.hasProperty(defined, player, ability.getHostCard(), ability)) {
players.add(p); players.add(p);
} }
} }

11
forge-gui/res/cardsfolder/upcoming/esix_fractal_bloom.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Esix, Fractal Bloom
ManaCost:4 G U
Types:Legendary Creature Fractal
PT:4/4
K:Flying
R:Event$ CreateToken | ActiveZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ0 | ValidPlayer$ You | PlayerTurn$ True | Optional$ True | ReplaceWith$ DBCopy | Description$ The first time you would create one or more tokens during each of your turns, you may instead choose a creature other than CARDNAME and create that many tokens that are copies of that creature.
SVar:DBCopy:DB$ CopyPermanent | Choices$ Creature.YouCtrl+Other | NumCopies$ Y
SVar:X:PlayerCountPropertyYou$TokensCreatedThisTurn
SVar:Y:ReplaceCount$TokenNum
DeckHas:Ability$Token
Oracle:Flying\nThe first time you would create one or more tokens during each of your turns, you may instead choose a creature other than Esix, Fractal Bloom and create that many tokens that are copies of that creature.