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

CardFactoryUtil: do Devoid as Static Ability

Browse Source 
remove Entwine because it's optional Cost now
This commit is contained in:
Hanmac
2017-06-26 04:42:14 +00:00
parent 2a9083a113
commit c7a8b25b5b
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2170,9 +2170,6 @@ public class CardFactoryUtil {
else if (keyword.startsWith("Embalm")) { else if (keyword.startsWith("Embalm")) {
addSpellAbility(keyword, card, null); addSpellAbility(keyword, card, null);
} }
else if (keyword.startsWith("Entwine")) {
addSpellAbility(keyword, card, null);
}
else if (keyword.startsWith("Escalate")) { else if (keyword.startsWith("Escalate")) {
addStaticAbility(keyword, card, null); addStaticAbility(keyword, card, null);
} }
@@ -3706,25 +3703,6 @@ public class CardFactoryUtil {
kws.addSpellAbility(sa); kws.addSpellAbility(sa);
} }
card.addSpellAbility(sa); card.addSpellAbility(sa);
} else if (keyword.startsWith("Entwine")) {
final String[] kw = keyword.split(":");
String costStr = kw[1];
final SpellAbility sa = card.getFirstSpellAbility();
final SpellAbility newSA = sa.copy();
newSA.getMapParams().put("Secondary", "True");
newSA.setBasicSpell(false);
newSA.setPayCosts(new Cost(costStr, false).add(sa.getPayCosts()));
newSA.addOptionalCost(OptionalCost.Entwine);
newSA.setDescription(sa.getDescription() + " (Entwine)");
newSA.setStackDescription(""); // Empty StackDescription to rebuild it.
newSA.setIntrinsic(intrinsic);
if (!intrinsic) {
newSA.setTemporary(true);
kws.addSpellAbility(newSA);
}
card.addSpellAbility(newSA);
} else if (keyword.equals("Epic")) { } else if (keyword.equals("Epic")) {
// Epic does modify existing SA, and does not add new one // Epic does modify existing SA, and does not add new one
@@ -4150,6 +4128,10 @@ public class CardFactoryUtil {
card.setSVar("CipherTrigger", trig); card.setSVar("CipherTrigger", trig);
card.setSVar("PlayEncoded", ab); card.setSVar("PlayEncoded", ab);
} else if (keyword.equals("Devoid")) {
effect = "Mode$ Continuous | EffectZone$ All | Affected$ Card.Self" +
" | CharacteristicDefining$ True | SetColor$ Colorless | Secondary$ True" +
" | Description$ Devoid (" + Keyword.getInstance(keyword).getReminderText() + ")";
} else if (keyword.startsWith("Escalate")) { } else if (keyword.startsWith("Escalate")) {
final String[] k = keyword.split(":"); final String[] k = keyword.split(":");
final String manacost = k[1]; final String manacost = k[1];
@@ -4310,7 +4292,7 @@ public class CardFactoryUtil {
} }
if (hasKeyword(card, "Devoid") != -1) { if (hasKeyword(card, "Devoid") != -1) {
card.setColor("1"); addStaticAbility("Devoid", card, null);
} }
if (hasKeyword(card, "Morph") != -1) { if (hasKeyword(card, "Morph") != -1) {