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

Merge branch 'chorusRework' into 'master'

Browse Source 
Chorus of the Conclave: moved to addExtraKeywordCost

See merge request core-developers/forge!1955
This commit is contained in:
Michael Kamensky
2019-07-14 17:54:41 +00:00
parent 2992b1cd68 af2e2caf24
commit 0dad6068c3
3 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -21,6 +21,8 @@ import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostParser;
import forge.game.ability.AbilityUtils;
import forge.game.ability.ApiType;
@@ -362,7 +364,8 @@ public final class GameActionUtil {
}
SpellAbility result = null;
final Card host = sa.getHostCard();
final PlayerController pc = sa.getActivatingPlayer().getController();
final Player activator = sa.getActivatingPlayer();
final PlayerController pc = activator.getController();
host.getGame().getAction().checkStaticAbilities(false);
@@ -413,6 +416,33 @@ public final class GameActionUtil {
}
}
if (host.isCreature()) {
String kw = "As an additional cost to cast creature spells," +
" you may pay any amount of mana. If you do, that creature enters " +
"the battlefield with that many additional +1/+1 counters on it.";
for (final Card c : activator.getZone(ZoneType.Battlefield)) {
for (KeywordInterface ki : c.getKeywords()) {
if (kw.equals(ki.getOriginal())) {
final Cost cost = new Cost(ManaCost.ONE, false);
String str = "Choose Amount for " + c.getName() + ": " + cost.toSimpleString();
int v = pc.chooseNumberForKeywordCost(sa, cost, ki, str, Integer.MAX_VALUE);
if (v > 0) {
host.addReplacementEffect(CardFactoryUtil.makeEtbCounter("etbCounter:P1P1:" + v, host, false));
if (result == null) {
result = sa.copy();
}
for (int i = 0; i < v; i++) {
result.getPayCosts().add(cost);
}
}
}
}
}
}
// reset active Trigger
if (reset) {
host.getGame().getTriggerHandler().resetActiveTriggers(false);

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

@@ -2125,7 +2125,7 @@ public class CardFactoryUtil {
}
private static ReplacementEffect makeEtbCounter(final String kw, final Card card, final boolean intrinsic)
public static ReplacementEffect makeEtbCounter(final String kw, final Card card, final boolean intrinsic)
{
String parse = kw;

43
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -28,13 +28,11 @@ import java.util.concurrent.LinkedBlockingDeque;
import com.esotericsoftware.minlog.Log;
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 com.google.common.collect.Sets;
import forge.GameCommand;
import forge.card.mana.ManaCost;
import forge.game.Game;
import forge.game.GameLogEntryType;
import forge.game.GameObject;
@@ -43,8 +41,6 @@ import forge.game.ability.ApiType;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardFactoryUtil;
import forge.game.card.CardPredicates;
import forge.game.cost.Cost;
import forge.game.event.EventValueChangeType;
import forge.game.event.GameEventCardStatsChanged;
import forge.game.event.GameEventSpellAbilityCast;
@@ -53,10 +49,6 @@ import forge.game.event.GameEventSpellResolved;
import forge.game.event.GameEventZone;
import forge.game.keyword.Keyword;
import forge.game.player.Player;
import forge.game.player.PlayerController.ManaPaymentPurpose;
import forge.game.replacement.ReplacementEffect;
import forge.game.replacement.ReplacementHandler;
import forge.game.replacement.ReplacementLayer;
import forge.game.spellability.AbilityStatic;
import forge.game.spellability.OptionalCost;
import forge.game.spellability.Spell;
@@ -280,41 +272,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
si = push(sp);
}
else {
if (sp.isSpell() && source.isCreature() && Iterables.any(activator.getCardsIn(ZoneType.Battlefield),
CardPredicates.hasKeyword("As an additional cost to cast creature spells," +
" you may pay any amount of mana. If you do, that creature enters " +
"the battlefield with that many additional +1/+1 counters on it."))) {
final Cost costPseudoKicker = new Cost(ManaCost.ONE, false);
boolean hasPaid = false;
do {
int mkMagnitude = source.getPseudoKickerMagnitude();
String prompt = TextUtil.concatWithSpace("Additional Cost for",source.toString(),"\r\nTimes Kicked:", String.valueOf(mkMagnitude),"\r\n");
hasPaid = activator.getController().payManaOptional(source, costPseudoKicker, sp, prompt, ManaPaymentPurpose.Multikicker);
if (hasPaid) {
source.addPseudoMultiKickerMagnitude(1);
totManaSpent += 1;
}
} while (hasPaid);
if (source.getPseudoKickerMagnitude() > 0) {
String abStr = "DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ P1P1 | CounterNum$ "
+ source.getPseudoKickerMagnitude() + " | SubAbility$ ChorusDBETBCounters";
String dbStr = "DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield"
+ "| Defined$ ReplacedCard";
source.setSVar("ChorusETBCounters", abStr);
source.setSVar("ChorusDBETBCounters", dbStr);
String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield "
+ "| ReplaceWith$ ChorusETBCounters | Secondary$ True | Description$ CARDNAME"
+ " enters the battlefield with " + source.getPseudoKickerMagnitude() + " +1/+1 counters.";
ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, source, false);
re.setLayer(ReplacementLayer.Other);
source.addReplacementEffect(re);
}
}
// The ability is added to stack HERE
si = push(sp);
}