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

Fix Ascendant Acolyte

Browse Source
This commit is contained in:
TRT
2022-05-02 14:44:01 +02:00
parent 0a50d4bbde
commit 1988d802f0
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1831,7 +1831,8 @@ public class AbilityUtils {
} }
if (sq[0].startsWith("LastStateBattlefield")) { if (sq[0].startsWith("LastStateBattlefield")) {
final String[] k = l[0].split(" "); String[] paidparts = l[0].split("\\$", 2);
final String[] k = paidparts[0].split(" ");
CardCollectionView list; CardCollectionView list;
// this is only for spells that were cast // this is only for spells that were cast
if (sq[0].contains("WithFallback")) { if (sq[0].contains("WithFallback")) {
@@ -1851,10 +1852,13 @@ public class AbilityUtils {
} }
} }
list = CardLists.getValidCards(list, k[1], sa.getActivatingPlayer(), c, sa); list = CardLists.getValidCards(list, k[1], sa.getActivatingPlayer(), c, sa);
if (k[0].contains("TotalToughness")) { int n;
return doXMath(Aggregates.sum(list, CardPredicates.Accessors.fnGetNetToughness), expr, c, ctb); if (paidparts.length > 1) {
n = handlePaid(new CardCollection(list), paidparts[1], c, ctb);
} else {
n = list.size();
} }
return doXMath(list.size(), expr, c, ctb); return doXMath(n, expr, c, ctb);
} }
if (sq[0].startsWith("LastStateGraveyard")) { if (sq[0].startsWith("LastStateGraveyard")) {
@@ -2416,16 +2420,6 @@ public class AbilityUtils {
return doXMath(cmc, expr, c, ctb); return doXMath(cmc, expr, c, ctb);
} }
if (sq[0].startsWith("ColorsCtrl")) {
final String restriction = l[0].substring(11);
final CardCollection list = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), restriction, player, c, ctb);
byte n = 0;
for (final Card card : list) {
n |= card.getColor().getColor();
}
return doXMath(ColorSet.fromMask(n).countColors(), expr, c, ctb);
}
// Count$AttackersDeclared // Count$AttackersDeclared
if (sq[0].startsWith("AttackersDeclared")) { if (sq[0].startsWith("AttackersDeclared")) {
List<Card> attackers = player.getCreaturesAttackedThisTurn(); List<Card> attackers = player.getCreaturesAttackedThisTurn();

2
forge-gui/res/cardsfolder/a/ascendant_acolyte.txt
View File

@@ -5,7 +5,7 @@ PT:1/1
K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each +1/+1 counter among other creatures you control. K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each +1/+1 counter among other creatures you control.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDouble | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, double the number of +1/+1 counters on CARDNAME. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDouble | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, double the number of +1/+1 counters on CARDNAME.
SVar:TrigDouble:DB$ MultiplyCounter | Defined$ Self | CounterType$ P1P1 SVar:TrigDouble:DB$ MultiplyCounter | Defined$ Self | CounterType$ P1P1
SVar:X:Count$Valid Creature.YouCtrl+Other$CardCounters.P1P1 SVar:X:Count$LastStateBattlefield Creature.YouCtrl+Other$CardCounters.P1P1
SVar:NeedsToPlay:Creature.YouCtrl+counters_GE1_P1P1 SVar:NeedsToPlay:Creature.YouCtrl+counters_GE1_P1P1
DeckHas:Ability$Counters DeckHas:Ability$Counters
Oracle:Ascendant Acolyte enters the battlefield with a +1/+1 counter on it for each +1/+1 counter among other creatures you control.\nAt the beginning of your upkeep, double the number of +1/+1 counters on Ascendant Acolyte. Oracle:Ascendant Acolyte enters the battlefield with a +1/+1 counter on it for each +1/+1 counter among other creatures you control.\nAt the beginning of your upkeep, double the number of +1/+1 counters on Ascendant Acolyte.

2
forge-gui/res/cardsfolder/t/towering_titan.txt
View File

@@ -3,7 +3,7 @@ ManaCost:4 G G
Types:Creature Giant Types:Creature Giant
PT:0/0 PT:0/0
K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total toughness of other creatures you control. K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total toughness of other creatures you control.
SVar:X:Count$LastStateBattlefieldTotalToughness Creature.Other+YouCtrl SVar:X:Count$LastStateBattlefield Creature.Other+YouCtrl$SumToughness
A:AB$ PumpAll | Cost$ Sac<1/Creature.withDefender/creature with defender> | ValidCards$ Creature | KW$ Trample | SpellDescription$ All creatures gain trample until end of turn. A:AB$ PumpAll | Cost$ Sac<1/Creature.withDefender/creature with defender> | ValidCards$ Creature | KW$ Trample | SpellDescription$ All creatures gain trample until end of turn.
SVar:NeedsToPlayVar:Z GE3 SVar:NeedsToPlayVar:Z GE3
SVar:Z:Count$Valid Creature.YouCtrl+toughnessGE2 SVar:Z:Count$Valid Creature.YouCtrl+toughnessGE2