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

Don't treat a copied ability's host like it's a copy of a card

Browse Source 
Bugfix follow up to commit that solved https://git.cardforge.org/core-developers/forge/issues/615
This commit is contained in:
kms70847
2018-07-13 18:20:58 -04:00
parent f92fd358c8
commit 8f4eb8596d
2 changed files with 73 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
View File

@@ -86,7 +86,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
String prompt = "Select " + Lang.getOrdinal(multi + 1) + " spell to copy to stack";
SpellAbility chosen = controller.getController().chooseSingleSpellForEffect(tgtSpells, sa, prompt,
ImmutableMap.of());
SpellAbility copiedSpell = CardFactory.copySpellAbilityAndSrcCard(card, chosen.getHostCard(), chosen, true);
SpellAbility copiedSpell = CardFactory.copySpellAbilityAndPossiblyHost(card, chosen.getHostCard(), chosen, true);
copiedSpell.getHostCard().setController(card.getController(), card.getGame().getNextTimestamp());
copiedSpell.setActivatingPlayer(controller);
copies.add(copiedSpell);
@@ -117,7 +117,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
mayChooseNewTargets = false;
for (GameEntity o : candidates) {
SpellAbility copy = CardFactory.copySpellAbilityAndSrcCard(card, chosenSA.getHostCard(), chosenSA, true);
SpellAbility copy = CardFactory.copySpellAbilityAndPossiblyHost(card, chosenSA.getHostCard(), chosenSA, true);
resetFirstTargetOnCopy(copy, o, targetedSA);
copies.add(copy);
}
@@ -143,12 +143,12 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
valid.remove(originalTarget);
mayChooseNewTargets = false;
for (final Card c : valid) {
SpellAbility copy = CardFactory.copySpellAbilityAndSrcCard(card, chosenSA.getHostCard(), chosenSA, true);
SpellAbility copy = CardFactory.copySpellAbilityAndPossiblyHost(card, chosenSA.getHostCard(), chosenSA, true);
resetFirstTargetOnCopy(copy, c, targetedSA);
copies.add(copy);
}
for (final Player p : players) {
SpellAbility copy = CardFactory.copySpellAbilityAndSrcCard(card, chosenSA.getHostCard(), chosenSA, true);
SpellAbility copy = CardFactory.copySpellAbilityAndPossiblyHost(card, chosenSA.getHostCard(), chosenSA, true);
resetFirstTargetOnCopy(copy, p, targetedSA);
copies.add(copy);
}
@@ -159,7 +159,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
"Select a spell to copy", ImmutableMap.of());
chosenSA.setActivatingPlayer(controller);
for (int i = 0; i < amount; i++) {
copies.add(CardFactory.copySpellAbilityAndSrcCard(card, chosenSA.getHostCard(), chosenSA, true));
copies.add(CardFactory.copySpellAbilityAndPossiblyHost(card, chosenSA.getHostCard(), chosenSA, true));
}
}

101
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -147,22 +147,16 @@ public class CardFactory {
/**
* <p>
* copySpellontoStack.
* copySpellHost.
* Helper function for copySpellAbilityAndPossiblyHost.
* creates a copy of the card hosting the ability we want to copy.
* Updates various attributes of the card that the copy needs,
* which wouldn't ordinarily get set during a simple Card.copy() call.
* </p>
*
* @param source
* a {@link forge.game.card.Card} object.
* @param original
* a {@link forge.game.card.Card} object.
* @param sa
* a {@link forge.game.spellability.SpellAbility} object.
* @param bCopyDetails
* a boolean.
*/
public final static SpellAbility copySpellAbilityAndSrcCard(final Card source, final Card original, final SpellAbility sa, final boolean bCopyDetails) {
//Player originalController = original.getController();
* */
private final static Card copySpellHost(final Card source, final Card original, final SpellAbility sa, final boolean bCopyDetails){
Player controller = sa.getActivatingPlayer();
final Card c = (sa.isSpell() ? copyCard(original, true) : original); //copy spells, but not abilities
final Card c = copyCard(original, true);
// change the color of the copy (eg: Fork)
final SpellAbility sourceSA = source.getFirstSpellAbility();
@@ -178,29 +172,11 @@ public class CardFactory {
c.addColor(finalColors, !sourceSA.hasParam("OverwriteColors"), c.getTimestamp());
}
c.clearControllers();
c.setOwner(controller);
c.setCopiedSpell(true);
final SpellAbility copySA;
if (sa.isTrigger()) {
copySA = getCopiedTriggeredAbility(sa);
} else {
copySA = sa.copy(c, false);
}
c.getCurrentState().setNonManaAbilities(copySA);
copySA.setCopied(true);
//remove all costs
if (!copySA.isTrigger()) {
copySA.setPayCosts(new Cost("", sa.isAbility()));
}
if (sa.getTargetRestrictions() != null) {
TargetRestrictions target = new TargetRestrictions(sa.getTargetRestrictions());
copySA.setTargetRestrictions(target);
}
copySA.setActivatingPlayer(controller);
if (bCopyDetails) {
c.setXManaCostPaid(original.getXManaCostPaid());
c.setXManaCostPaidByColor(original.getXManaCostPaidByColor());
@@ -219,6 +195,65 @@ public class CardFactory {
for (OptionalCost cost : original.getOptionalCostsPaid()) {
c.addOptionalCostPaid(cost);
}
}
return c;
}
/**
* <p>
* copySpellAbilityAndPossiblyHost.
* creates a copy of the Spell/ability `sa`, and puts it on the stack.
* if sa is a spell, that spell's host is also copied.
* </p>
*
* @param source
* a {@link forge.game.card.Card} object. The card doing the copying.
* @param original
* a {@link forge.game.card.Card} object. The host of the spell or ability being copied.
* @param sa
* a {@link forge.game.spellability.SpellAbility} object. The spell or ability being copied.
* @param bCopyDetails
* a boolean.
*/
public final static SpellAbility copySpellAbilityAndPossiblyHost(final Card source, final Card original, final SpellAbility sa, final boolean bCopyDetails) {
Player controller = sa.getActivatingPlayer();
//it is only necessary to copy the host card if the SpellAbility is a spell, not an ability
final Card c;
if (sa.isSpell()){
c = copySpellHost(source, original, sa, bCopyDetails);
}
else {
c = original;
}
final SpellAbility copySA;
if (sa.isTrigger()) {
copySA = getCopiedTriggeredAbility(sa);
} else {
copySA = sa.copy(c, false);
}
if (sa.isSpell()){
//only update c's abilities if c is a copy.
//(it would be nice to move this into `copySpellHost`,
// so all the c-mutating code is together in one place.
// but copySA doesn't exist until after `copySpellHost` finishes executing,
// so it's hard to resolve that dependency.)
c.getCurrentState().setNonManaAbilities(copySA);
}
copySA.setCopied(true);
//remove all costs
if (!copySA.isTrigger()) {
copySA.setPayCosts(new Cost("", sa.isAbility()));
}
if (sa.getTargetRestrictions() != null) {
TargetRestrictions target = new TargetRestrictions(sa.getTargetRestrictions());
copySA.setTargetRestrictions(target);
}
copySA.setActivatingPlayer(controller);
if (bCopyDetails) {
copySA.setPaidHash(sa.getPaidHash());
}
return copySA;