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

Code cleanup

Browse Source
This commit is contained in:
drdev
2013-12-06 04:37:39 +00:00
parent 39d1ef7e13
commit 9bd30e8d5d
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java
View File

@@ -50,8 +50,7 @@ public class HumanPlaySpellAbility {
this.payment = cp;
}
public final void playAbility(boolean mayChoseTargets, boolean isFree, boolean skipStack) {
public final void playAbility(boolean mayChooseTargets, boolean isFree, boolean skipStack) {
final Game game = ability.getActivatingPlayer().getGame();
// used to rollback
@@ -72,7 +71,7 @@ public class HumanPlaySpellAbility {
// is only executed or evaluated if the first argument does not suffice to determine the value of the expression
boolean prerequisitesMet = this.announceValuesLikeX()
&& this.announceType()
&& ( !mayChoseTargets || setupTargets() ) // if you can choose targets, then do choose them.
&& (!mayChooseTargets || setupTargets()) // if you can choose targets, then do choose them.
&& (isFree || this.payment.payCost(game));
@@ -88,7 +87,6 @@ public class HumanPlaySpellAbility {
return;
}
if (isFree || this.payment.isFullyPaid()) {
if (skipStack) {
AbilityUtils.resolve(this.ability);
@@ -100,11 +98,10 @@ public class HumanPlaySpellAbility {
// no worries here. The same thread must resolve, and by this moment ability will have been resolved already
// Triggers haven't resolved yet ??
if (mayChoseTargets) {
if (mayChooseTargets) {
clearTargets(ability);
}
}
}
private final boolean setupTargets() {
@@ -123,7 +120,8 @@ public class HumanPlaySpellAbility {
if (!select.chooseTargets(null)) {
return false;
}
} else { //AI
}
else { //AI
return currentAbility.doTrigger(true, targetingPlayer);
}
}
@@ -162,7 +160,6 @@ public class HumanPlaySpellAbility {
game.getStack().clearFrozen();
}
private boolean announceValuesLikeX() {
// Announcing Requirements like Choosing X or Multikicker
// SA Params as comma delimited list
@@ -176,13 +173,15 @@ public class HumanPlaySpellAbility {
boolean allowZero = !ability.hasParam("XCantBe0") && (!isX || manaCost == null || manaCost.canXbe0());
Integer value = ability.getActivatingPlayer().getController().announceRequirements(ability, varName, allowZero);
if ( null == value )
if (value == null) {
return false;
}
ability.setSVar(varName, value.toString());
if ("Multikicker".equals(varName)) {
ability.getSourceCard().setKickerMagnitude(value);
} else {
}
else {
ability.getSourceCard().setSVar(varName, value.toString());
}
}