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

- Cleanup of P/T calculation.

Browse Source
This commit is contained in:
Sloth
2013-04-21 21:14:55 +00:00
parent 0345b1a846
commit d5f9616ac5
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/forge/Card.java
View File

@@ -3798,13 +3798,19 @@ public class Card extends GameEntity implements Comparable<Card> {
* *
* @return a int. * @return a int.
*/ */
public final int getUnswitchedAttack() { public final int getUnswitchedPower() {
int total = this.getCurrentPower(); int total = this.getCurrentPower();
total += ((this.getTempAttackBoost() + this.getSemiPermanentAttackBoost() + this.getCounters(CounterType.P1P1) total += this.getTempAttackBoost() + this.getSemiPermanentAttackBoost() + getPowerBonusFromCounters();
+ this.getCounters(CounterType.P1P2) + this.getCounters(CounterType.P1P0)) - this.getCounters(CounterType.M1M1)) return total;
+ ((2 * this.getCounters(CounterType.P2P2)) - (2 * this.getCounters(CounterType.M2M1)) }
- (2 * this.getCounters(CounterType.M2M2)) - this.getCounters(CounterType.M1M0));
public final int getPowerBonusFromCounters() {
int total = 0;
total += this.getCounters(CounterType.P1P1) + this.getCounters(CounterType.P1P2) + this.getCounters(CounterType.P1P0)
- this.getCounters(CounterType.M1M1) + 2 * this.getCounters(CounterType.P2P2) - 2 * this.getCounters(CounterType.M2M1)
- 2 * this.getCounters(CounterType.M2M2) - this.getCounters(CounterType.M1M0);
return total; return total;
} }
@@ -3817,9 +3823,9 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final int getNetAttack() { public final int getNetAttack() {
if ((this.getAmountOfKeyword("CARDNAME's power and toughness are switched") % 2) != 0) { if ((this.getAmountOfKeyword("CARDNAME's power and toughness are switched") % 2) != 0) {
return this.getUnswitchedDefense(); return this.getUnswitchedToughness();
} }
return this.getUnswitchedAttack(); return this.getUnswitchedPower();
} }
/** /**
@@ -3846,16 +3852,19 @@ public class Card extends GameEntity implements Comparable<Card> {
* *
* @return a int. * @return a int.
*/ */
public final int getUnswitchedDefense() { public final int getUnswitchedToughness() {
int total = this.getCurrentToughness(); int total = this.getCurrentToughness();
total += (((((this.getTempDefenseBoost() + this.getSemiPermanentDefenseBoost() total += this.getTempDefenseBoost() + this.getSemiPermanentDefenseBoost() + getToughnessBonusFromCounters();
+ this.getCounters(CounterType.P1P1) + (2 * this.getCounters(CounterType.P1P2))) - this return total;
.getCounters(CounterType.M1M1)) + this.getCounters(CounterType.P0P1)) - (2 * this.getCounters(CounterType.M0M2))) + (2 * this }
.getCounters(CounterType.P2P2)))
- this.getCounters(CounterType.M0M1) public final int getToughnessBonusFromCounters() {
- this.getCounters(CounterType.M2M1) int total = 0;
- (2 * this.getCounters(CounterType.M2M2));
total += this.getCounters(CounterType.P1P1) + 2 * this.getCounters(CounterType.P1P2) - this.getCounters(CounterType.M1M1)
+ this.getCounters(CounterType.P0P1) - 2 * this.getCounters(CounterType.M0M2) + 2 * this.getCounters(CounterType.P2P2)
- this.getCounters(CounterType.M0M1) - this.getCounters(CounterType.M2M1) - 2 * this.getCounters(CounterType.M2M2);
return total; return total;
} }
@@ -3868,9 +3877,9 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final int getNetDefense() { public final int getNetDefense() {
if ((this.getAmountOfKeyword("CARDNAME's power and toughness are switched") % 2) != 0) { if ((this.getAmountOfKeyword("CARDNAME's power and toughness are switched") % 2) != 0) {
return this.getUnswitchedAttack(); return this.getUnswitchedPower();
} }
return this.getUnswitchedDefense(); return this.getUnswitchedToughness();
} }
// How much combat damage does the card deal // How much combat damage does the card deal