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

ComputerUtil & HumanPlay: fixed Splice onto Arcane only for Spells

Browse Source
This commit is contained in:
Hanmac
2016-12-24 11:01:48 +00:00
parent 0c2b9e7445
commit e2cbbd7575
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -93,16 +93,16 @@ public class ComputerUtil {
sa.setLastStateBattlefield(game.getLastStateBattlefield()); sa.setLastStateBattlefield(game.getLastStateBattlefield());
sa.setLastStateGraveyard(game.getLastStateGraveyard()); sa.setLastStateGraveyard(game.getLastStateGraveyard());
sa.setHostCard(game.getAction().moveToStack(source)); sa.setHostCard(game.getAction().moveToStack(source));
if (source.getType().hasStringType("Arcane")) {
sa = AbilityUtils.addSpliceEffects(sa);
}
} }
if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) { if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
CharmEffect.makeChoices(sa); CharmEffect.makeChoices(sa);
} }
if (source.getType().hasStringType("Arcane") && !source.isCopiedSpell()) {
sa = AbilityUtils.addSpliceEffects(sa);
}
if (sa.hasParam("Bestow")) { if (sa.hasParam("Bestow")) {
sa.getHostCard().animateBestow(); sa.getHostCard().animateBestow();
} }

8
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -87,7 +87,7 @@ public class HumanPlay {
CharmEffect.makeChoices(sa); CharmEffect.makeChoices(sa);
} }
if (source.getType().hasStringType("Arcane")) { if (sa.isSpell() && source.getType().hasStringType("Arcane")) {
sa = AbilityUtils.addSpliceEffects(sa); sa = AbilityUtils.addSpliceEffects(sa);
} }
@@ -184,12 +184,14 @@ public class HumanPlay {
source.setSplitStateToPlayAbility(sa); source.setSplitStateToPlayAbility(sa);
if (sa.getPayCosts() != null) { if (sa.getPayCosts() != null) {
if (sa.getApi() == ApiType.Charm && !sa.isWrapper() && !sa.isCopied()) { if (!sa.isCopied()) {
if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
CharmEffect.makeChoices(sa); CharmEffect.makeChoices(sa);
} }
if (source.getType().hasStringType("Arcane") && !sa.isCopied()) { if (sa.isSpell() && source.getType().hasStringType("Arcane")) {
sa = AbilityUtils.addSpliceEffects(sa); sa = AbilityUtils.addSpliceEffects(sa);
} }
}
final CostPayment payment = new CostPayment(sa.getPayCosts(), sa); final CostPayment payment = new CostPayment(sa.getPayCosts(), sa);
final HumanPlaySpellAbility req = new HumanPlaySpellAbility(controller, sa, payment); final HumanPlaySpellAbility req = new HumanPlaySpellAbility(controller, sa, payment);