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

- Fix the unless cost for abilities.

Browse Source
This commit is contained in:
jendave
2011-08-07 02:00:27 +00:00
parent b571ce64e6
commit 7effc3820f
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -1393,25 +1393,40 @@ public class AbilityFactory {
} }
}; };
final Command paidCommand = new Command() {
private static final long serialVersionUID = 8094833091127334678L;
public void execute() {
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
}
};
final Command unpaidCommand = new Command() { final Command unpaidCommand = new Command() {
private static final long serialVersionUID = 8094833091127334678L; private static final long serialVersionUID = 8094833091127334678L;
public void execute() { public void execute() {
sa.resolve(); sa.resolve();
if(params.containsKey("PowerSink")) GameActionUtil.doPowerSink(AllZone.HumanPlayer); if(params.containsKey("PowerSink")) GameActionUtil.doPowerSink(AllZone.HumanPlayer);
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
} }
}; };
if(payer.isHuman()) { if(payer.isHuman()) {
GameActionUtil.payManaDuringAbilityResolve(source + "\r\n", ability.getManaCost(), GameActionUtil.payManaDuringAbilityResolve(source + "\r\n", ability.getManaCost(),
Command.Blank, unpaidCommand); paidCommand, unpaidCommand);
} else { } else {
if(ComputerUtil.canPayCost(ability)) { if(ComputerUtil.canPayCost(ability)) {
ComputerUtil.playNoStack(ability); //Unless cost was payed - no resolve ComputerUtil.playNoStack(ability); //Unless cost was payed - no resolve
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
} }
else { else {
if(params.containsKey("PowerSink")) GameActionUtil.doPowerSink(AllZone.ComputerPlayer);
sa.resolve(); sa.resolve();
if(params.containsKey("PowerSink")) GameActionUtil.doPowerSink(AllZone.ComputerPlayer);
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
} }
} }
} }
@@ -1423,14 +1438,15 @@ public class AbilityFactory {
//check conditions //check conditions
if (AbilityFactory.checkConditional(params, sa)) { if (AbilityFactory.checkConditional(params, sa)) {
if (params.get("UnlessCost") == null) if (params.get("UnlessCost") == null) {
sa.resolve(); sa.resolve();
//try to resolve subabilities (see null check above)
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
}
else passUnlessCost(sa); else passUnlessCost(sa);
} }
//try to resolve subabilities (see null check above)
Ability_Sub abSub = sa.getSubAbility();
resolve(abSub);
} }
}//end class AbilityFactory }//end class AbilityFactory