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

- Attempting to fix Spinal Parasite by adding support for negative power/toughness for creatures.

Browse Source 
- Warning: this is an experimental fix which changes several aspects of card loading and P/T get/set functions, may potentially break things. Please test and update as necessary.
This commit is contained in:
Agetian
2016-10-05 18:11:35 +00:00
parent e58c4f815d
commit 0dd3a36ca1
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-core/src/main/java/forge/card/CardFace.java
View File

@@ -34,8 +34,8 @@ final class CardFace implements ICardFace {
private ColorSet color = null;
private String oracleText = null;
private int iPower = -1;
private int iToughness = -1;
private int iPower = Integer.MAX_VALUE;
private int iToughness = Integer.MAX_VALUE;
private String power = null;
private String toughness = null;
private int initialLoyalty = -1;
@@ -91,10 +91,17 @@ final class CardFace implements ICardFace {
if (slashPos == -1) {
throw new RuntimeException(String.format("Creature '%s' has bad p/t stats", this.getName()));
}
this.power = value.substring(0, slashPos);
this.toughness = value.substring(slashPos + 1);
boolean negPower = value.charAt(0) == '-';
boolean negToughness = value.charAt(slashPos + 1) == '-';
this.power = negPower ? value.substring(1, slashPos) : value.substring(0, slashPos);
this.toughness = negToughness ? value.substring(slashPos + 2) : value.substring(slashPos + 1);
this.iPower = StringUtils.isNumeric(this.power) ? Integer.parseInt(this.power) : 0;
this.iToughness = StringUtils.isNumeric(this.toughness) ? Integer.parseInt(this.toughness) : 0;
if (negPower) { this.iPower *= -1; }
if (negToughness) { this.iToughness *= -1; }
}
// Raw fields used for Card creation

4
forge-core/src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -436,10 +436,10 @@ public final class CardRulesPredicates {
return this.op(card.getManaCost().getGenericCost(), this.operand);
case POWER:
value = card.getIntPower();
return value >= 0 ? this.op(value, this.operand) : false;
return value != Integer.MAX_VALUE ? this.op(value, this.operand) : false;
case TOUGHNESS:
value = card.getIntToughness();
return value >= 0 ? this.op(value, this.operand) : false;
return value != Integer.MAX_VALUE ? this.op(value, this.operand) : false;
default:
return false;
}