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

CostPayment & IndividualCostPaymentInstance: need access to the SpellAblity from the PaymentInstance over the CostPayment object

Browse Source
This commit is contained in:
Hanmac
2016-07-15 14:45:00 +00:00
parent 5ff0845311
commit 80ffb62a4a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/cost/CostPayment.java
View File

@@ -50,6 +50,10 @@ public class CostPayment {
return this.cost;
}
public final SpellAbility getAbility() {
return this.ability;
}
/**
* <p>
* Constructor for Cost_Payment.
@@ -135,7 +139,7 @@ public class CostPayment {
final List<CostPart> costParts = this.getCost().getCostPartsWithZeroMana();
for (final CostPart part : costParts) {
// Wrap the cost and push onto the cost stack
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part));
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part, this));
PaymentDecision pd = part.accept(decisionMaker);
@@ -173,7 +177,7 @@ public class CostPayment {
if (null == decision) return false;
// wrap the payment and push onto the cost stack
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part));
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part, this));
if (decisionMaker.paysRightAfterDecision() && !part.payAsDecided(decisionMaker.getPlayer(), decision, ability)) {
decisionMaker.getPlayer().getGame().costPaymentStack.pop(); // cost is resolved
return false;
@@ -185,7 +189,7 @@ public class CostPayment {
for (final CostPart part : this.cost.getCostParts()) {
// wrap the payment and push onto the cost stack
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part));
decisionMaker.getPlayer().getGame().costPaymentStack.push(new IndividualCostPaymentInstance(part, this));
if (!part.payAsDecided(decisionMaker.getPlayer(), decisions.get(part), this.ability)) {
decisionMaker.getPlayer().getGame().costPaymentStack.pop(); // cost is resolved

5
forge-game/src/main/java/forge/game/cost/IndividualCostPaymentInstance.java
View File

@@ -8,14 +8,17 @@ public class IndividualCostPaymentInstance implements IIdentifiable {
private final int id;
private final CostPart cost;
private final CostPayment payment;
public IndividualCostPaymentInstance(final CostPart cost) {
public IndividualCostPaymentInstance(final CostPart cost, final CostPayment payment) {
id = nextId();
this.cost = cost;
this.payment = payment;
}
public int getId() { return id; }
public CostPart getCost() { return cost; }
public CostPayment getPayment() { return payment; }
}