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

Fixed an issue with non-copyable abilities. Scripted Vesuva

Browse Source
This commit is contained in:
ArsenalNut
2012-07-01 07:57:58 +00:00
parent 7cc5d88dfd
commit 02bc27ff93
4 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java
View File

@@ -580,7 +580,10 @@ public final class AbilityFactoryClone {
stateToCopy = cardToCopy.getCurState();
}
CardFactoryUtil.copyState(cardToCopy, stateToCopy, tgtCard, "Cloned");
CardFactoryUtil.copyState(cardToCopy, stateToCopy, tgtCard);
// must call this before addAbilityFactoryAbilities so cloned added abilities are handled correctly
addExtraCharacteristics(tgtCard, params, origSVars);
CardFactoryUtil.addAbilityFactoryAbilities(tgtCard);
for (int i = 0; i < tgtCard.getStaticAbilityStrings().size(); i++) {
tgtCard.addStaticAbility(tgtCard.getStaticAbilityStrings().get(i));
}
@@ -588,21 +591,20 @@ public final class AbilityFactoryClone {
tgtCard.setName(originalName);
}
addExtraCharacteristics(tgtCard, params, origSVars);
// If target is a flipped card, also copy the flipped
// state.
if (cardToCopy.isFlip()) {
tgtCard.addAlternateState(CardCharactersticName.Flipped);
tgtCard.setState(CardCharactersticName.Flipped);
CardFactoryUtil.copyState(cardToCopy, CardCharactersticName.Flipped, tgtCard, "Cloned");
CardFactoryUtil.copyState(cardToCopy, CardCharactersticName.Flipped, tgtCard);
addExtraCharacteristics(tgtCard, params, origSVars);
CardFactoryUtil.addAbilityFactoryAbilities(tgtCard);
for (int i = 0; i < tgtCard.getStaticAbilityStrings().size(); i++) {
tgtCard.addStaticAbility(tgtCard.getStaticAbilityStrings().get(i));
}
if (keepName) {
tgtCard.setName(originalName);
}
addExtraCharacteristics(tgtCard, params, origSVars);
tgtCard.setFlip(true);
tgtCard.setState(CardCharactersticName.Original);
@@ -651,14 +653,40 @@ public final class AbilityFactoryClone {
if (params.containsKey("AddAbilities")) {
for (final String s : Arrays.asList(params.get("AddAbilities").split(","))) {
if (origSVars.containsKey(s)) {
final AbilityFactory newAF = new AbilityFactory();
//final AbilityFactory newAF = new AbilityFactory();
final String actualAbility = origSVars.get(s);
final SpellAbility grantedAbility = newAF.getAbility(actualAbility, tgtCard);
tgtCard.addSpellAbility(grantedAbility);
// final SpellAbility grantedAbility = newAF.getAbility(actualAbility, tgtCard);
// tgtCard.addSpellAbility(grantedAbility);
tgtCard.getIntrinsicAbilities().add(actualAbility);
}
}
}
// keywords to add to clone
final ArrayList<String> keywords = new ArrayList<String>();
if (params.containsKey("AddKeywords")) {
keywords.addAll(Arrays.asList(params.get("AddKeywords").split(" & ")));
// allow SVar substitution for keywords
for (int i = 0; i < keywords.size(); i++) {
final String k = keywords.get(i);
if (origSVars.containsKey(k)) {
keywords.add("\"" + k + "\"");
keywords.remove(k);
}
if (keywords.get(i).startsWith("HIDDEN")) {
tgtCard.addExtrinsicKeyword(keywords.get(i));
}
else {
tgtCard.addIntrinsicKeyword(keywords.get(i));
}
}
}
// set power of clone
if (params.containsKey("IntoPlayTapped")) {
tgtCard.setTapped(true);
}
// set power of clone
if (params.containsKey("SetPower")) {
String rhs = params.get("SetPower");

29
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -3942,7 +3942,7 @@ public class CardFactoryUtil {
* @param to
* the to
*/
public static void copyState(final Card from, final CardCharactersticName stateToCopy, final Card to, final String type) {
public static void copyState(final Card from, final CardCharactersticName stateToCopy, final Card to) {
// copy characteristics not associated with a state
to.setCurSetCode(from.getCurSetCode());
@@ -3969,33 +3969,6 @@ public class CardFactoryUtil {
to.setTriggers(characteristics.getTriggers());
to.setReplacementEffects(characteristics.getReplacementEffects());
to.setStaticAbilityStrings(characteristics.getStaticAbilityStrings());
// copy activated abilities
for (SpellAbility sa : characteristics.getSpellAbility()) {
if (sa instanceof AbilityActivated) {
SpellAbility newSA = ((AbilityActivated) sa).getCopy();
if (newSA == null) {
System.out.println("Uh-oh...");
}
newSA.setType(type);
CardFactoryUtil.correctAbilityChainSourceCard(newSA, to);
to.addSpellAbility(newSA);
}
}
// copy activated mana abilities
for (SpellAbility sa : characteristics.getManaAbility()) {
if (sa instanceof AbilityActivated) {
SpellAbility newSA = ((AbilityActivated) sa).getCopy();
if (newSA == null) {
System.out.println("Uh-oh...");
}
newSA.setType(type);
CardFactoryUtil.correctAbilityChainSourceCard(newSA, to);
to.addSpellAbility(newSA);
}
}
}
public static void copySpellAbility(SpellAbility from, SpellAbility to) {