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

Sunburst: rewrite using ETB counter

Browse Source
This commit is contained in:
Hans Mackowiak
2019-01-13 14:10:44 +00:00
committed by Michael Kamensky
parent e2eb957af9
commit 2640a509f9
20 changed files with 70 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1051,7 +1051,8 @@ public class Card extends GameEntity implements Comparable<Card> {
}
public final boolean hasConverge() {
return "Count$Converge".equals(getSVar("X")) || "Count$Converge".equals(getSVar("Y")) || hasKeyword("Sunburst");
return "Count$Converge".equals(getSVar("X")) || "Count$Converge".equals(getSVar("Y")) ||
hasKeyword(Keyword.SUNBURST) || hasKeyword("Modular:Sunburst");
}
@Override
@@ -1594,7 +1595,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|| keyword.equals("Soulbond") || keyword.equals("Partner") || keyword.equals("Retrace")
|| keyword.equals("Living Weapon") || keyword.equals("Myriad") || keyword.equals("Exploit")
|| keyword.equals("Changeling") || keyword.equals("Delve")
|| keyword.equals("Split second")
|| keyword.equals("Split second") || keyword.equals("Sunburst")
|| keyword.equals("Suspend") // for the ones without amounnt
|| keyword.equals("Hideaway") || keyword.equals("Ascend")
|| keyword.equals("Totem armor") || keyword.equals("Battle cry")

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

@@ -25,7 +25,6 @@ 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.*;
import forge.card.mana.ManaAtom;
import forge.card.mana.ManaCost;
@@ -2099,7 +2098,7 @@ public class CardFactoryUtil {
String abStr = "DB$ PutCounter | Defined$ Self | CounterType$ " + splitkw[1]
+ " | ETB$ True | CounterNum$ " + amount;
if (!StringUtils.isNumeric(amount)) {
if (!StringUtils.isNumeric(amount) && card.hasSVar(amount)) {
abStr += " | References$ " + amount;
}
@@ -3452,12 +3451,10 @@ public class CardFactoryUtil {
sb.append(m);
sb.append(" (").append(inst.getReminderText()).append(")");
if ("Sunburst".equals(m)) {
card.setSVar(m, "Count$Converge");
}
final ReplacementEffect re = makeEtbCounter(sb.toString(), card, intrinsic);
if ("Sunburst".equals(m)) {
re.getOverridingAbility().setSVar("Sunburst", "Count$Converge");
}
inst.addReplacement(re);
} else if (keyword.equals("Rebound")) {
String repeffstr = "Event$ Moved | ValidCard$ Card.Self+wasCastFromHand+YouOwn+YouCtrl "
@@ -3512,6 +3509,19 @@ public class CardFactoryUtil {
String sb = "etbCounter:LORE:1:no Condition:no desc";
final ReplacementEffect re = makeEtbCounter(sb, card, intrinsic);
inst.addReplacement(re);
} else if (keyword.equals("Sunburst")) {
// Rule 702.43a If this object is entering the battlefield as a creature,
// ignoring any type-changing effects that would affect it
CounterType t = card.isCreature() ? CounterType.P1P1 : CounterType.CHARGE;
StringBuilder sb = new StringBuilder("etbCounter:");
sb.append(t).append(":Sunburst:no Condition:");
sb.append("Sunburst (").append(inst.getReminderText()).append(")");
final ReplacementEffect re = makeEtbCounter(sb.toString(), card, intrinsic);
re.getOverridingAbility().setSVar("Sunburst", "Count$Converge");
inst.addReplacement(re);
} else if (keyword.equals("Totem armor")) {
String repeffstr = "Event$ Destroy | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy"
@@ -4182,18 +4192,17 @@ public class CardFactoryUtil {
String effect = "AB$ PutCounter | Cost$ " + manacost + " ExileFromGrave<1/CARDNAME> " +
"| ActivationZone$ Graveyard | ValidTgts$ Creature | CounterType$ P1P1 " +
"| CounterNum$ ScavengeX | SorcerySpeed$ True | References$ ScavengeX " +
"| CounterNum$ ScavengeX | SorcerySpeed$ True " +
"| PrecostDesc$ Scavenge | CostDesc$ " + ManaCostParser.parse(manacost) +
"| SpellDescription$ (" + inst.getReminderText() + ")";
card.setSVar("ScavengeX", "Count$CardPower");
final SpellAbility sa = AbilityFactory.getAbility(effect, card);
sa.setSVar("ScavengeX", "Count$CardPower");
sa.setIntrinsic(intrinsic);
sa.setTemporary(!intrinsic);
inst.addSpellAbility(sa);
} else if (keyword.startsWith("Spectacle")) {
final String[] k = keyword.split(":");
final Cost cost = new Cost(k[1], false);
@@ -4211,28 +4220,6 @@ public class CardFactoryUtil {
newSA.setTemporary(!intrinsic);
inst.addSpellAbility(newSA);
} else if (keyword.equals("Sunburst") && intrinsic) {
final GameCommand sunburstCIP = new GameCommand() {
private static final long serialVersionUID = 1489845860231758299L;
@Override
public void run() {
CounterType t = card.isCreature() ? CounterType.P1P1 : CounterType.CHARGE;
card.addCounter(t, card.getSunburstValue(), card.getController(), true);
}
};
final GameCommand sunburstLP = new GameCommand() {
private static final long serialVersionUID = -7564420917490677427L;
@Override
public void run() {
card.setSunburstValue(0);
}
};
card.addComesIntoPlayCommand(sunburstCIP);
card.addLeavesPlayCommand(sunburstLP);
} else if (keyword.startsWith("Surge")) {
final String[] k = keyword.split(":");
final Cost surgeCost = new Cost(k[1], false);

2
forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
View File

@@ -39,7 +39,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
/** The ID. */
private int id;
private ReplacementLayer layer = ReplacementLayer.None;
private ReplacementLayer layer = ReplacementLayer.Other;
/** The has run. */
private boolean hasRun = false;

3
forge-game/src/main/java/forge/game/replacement/ReplacementLayer.java
View File

@@ -8,8 +8,7 @@ package forge.game.replacement;
public enum ReplacementLayer {
Control,
Copy,
Other,
None;
Other;
/**
* TODO: Write javadoc for this method.