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

*Made Delved cards not exile until cost is fully paid

Browse Source
This commit is contained in:
Hellfish
2015-02-14 09:09:04 +00:00
parent e0e38b6cc4
commit 8e62e17f65
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java
View File

@@ -89,6 +89,7 @@ public class ManaCostAdjustment {
if (sa.isSpell()) {
if (sa.isDelve()) {
sa.getHostCard().clearDelved();
final Player pc = sa.getActivatingPlayer();
final CardCollection mutableGrave = new CardCollection(pc.getCardsIn(ZoneType.Graveyard));
final CardCollectionView toExile = pc.getController().chooseCardsToDelve(cost.getUnpaidShards(ManaCostShard.COLORLESS), mutableGrave);
@@ -96,7 +97,7 @@ public class ManaCostAdjustment {
cost.decreaseColorlessMana(1);
if (!test) {
sa.getHostCard().addDelved(c);
pc.getGame().getAction().exile(c);
//pc.getGame().getAction().exile(c);
}
}
}

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

@@ -40,7 +40,7 @@ import java.util.Map;
public class HumanPlay {
private HumanPlay() {
private HumanPlay() {
}
/**
@@ -98,8 +98,16 @@ public class HumanPlay {
if (sa.isSpell() && !source.isCopiedSpell()) {
sa.setHostCard(p.getGame().getAction().moveToStack(source));
}
p.getGame().getStack().add(sa);
}
if(sa.isDelve()) {
for(Card c : sa.getHostCard().getDelved()) {
p.getGame().getAction().exile(c);
}
sa.getHostCard().clearDelved();
}
}
/**
@@ -738,7 +746,7 @@ public class HumanPlay {
source.setXManaCostPaidByColor(toPay.getXManaCostPaidByColor());
source.setColorsPaid(toPay.getColorsPaid());
source.setSunburstValue(toPay.getSunburst());
}
}
// Handle convoke and offerings
if (ability.isOffering() && ability.getSacrificedAsOffering() != null) {