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

CardFactory getCloneStates set PT for Vehicle (#2713)

Browse Source 
* Update CardFactory.java

Set PT should also be done for vehicle

* Update CardFactory.java

* Clean up

* Clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
This commit is contained in:
Hans Mackowiak
2023-03-29 04:53:26 +02:00
committed by GitHub
parent 4329e2b0c8
commit 03924a4044
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -3934,38 +3934,32 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
currentState.setBaseLoyalty(Integer.toString(n));
}
// values that are printed on card
public final int getBasePower() {
return currentState.getBasePower();
}
public final int getBaseToughness() {
return currentState.getBaseToughness();
}
// values that are printed on card
public final void setBasePower(final int n) {
currentState.setBasePower(n);
}
public final void setBaseToughness(final int n) {
currentState.setBaseToughness(n);
}
// values that are printed on card
public final String getBasePowerString() {
return currentState.getBasePowerString();
return (null == currentState.getBasePowerString()) ? String.valueOf(getBasePower()) : currentState.getBasePowerString();
}
public final String getBaseToughnessString() {
return currentState.getBaseToughnessString();
return (null == currentState.getBaseToughnessString()) ? String.valueOf(getBaseToughness()) : currentState.getBaseToughnessString();
}
// values that are printed on card
public final void setBasePowerString(final String s) {
currentState.setBasePowerString(s);
}
public final void setBaseToughnessString(final String s) {
currentState.setBaseToughnessString(s);
}

10
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -568,7 +568,7 @@ public class CardFactory {
c.setRules(in.getRules());
return c;
} // copyStats()
}
/**
* Copy characteristics of a particular state of one card to those of a
@@ -764,12 +764,14 @@ public class CardFactory {
state.removeIntrinsicKeyword(kw);
}
if (state.getType().isCreature()) {
// CR 208.3 A noncreature object not on the battlefield has power or toughness only if it has a power and toughness printed on it.
// currently only LKI can be trusted?
if (state.getType().isCreature() || in.getOriginalState(originalState.getStateName()).getBasePowerString() != null) {
if (sa.hasParam("SetPower")) {
state.setBasePower(AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("SetPower"), sa));
state.setBasePower(AbilityUtils.calculateAmount(host, sa.getParam("SetPower"), sa));
}
if (sa.hasParam("SetToughness")) {
state.setBaseToughness(AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("SetToughness"), sa));
state.setBaseToughness(AbilityUtils.calculateAmount(host, sa.getParam("SetToughness"), sa));
}
}

4
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -202,10 +202,10 @@ public class CardState extends GameObject implements IHasSVars {
// values that are printed on card
public final String getBasePowerString() {
return (null == basePowerString) ? "" + getBasePower() : basePowerString;
return basePowerString;
}
public final String getBaseToughnessString() {
return (null == baseToughnessString) ? "" + getBaseToughness() : baseToughnessString;
return baseToughnessString;
}
// values that are printed on card

6
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -222,7 +222,7 @@ public final class CardUtil {
newCopy.addAlternateState(CardStateName.Cloner, false);
newCopy.getState(CardStateName.Cloner).copyFrom(in.getState(CardStateName.Cloner), true);
}
//*/
*/
newCopy.setToken(in.isToken());
newCopy.setCopiedSpell(in.isCopiedSpell());
@@ -233,6 +233,10 @@ public final class CardUtil {
newCopy.setBasePower(in.getCurrentPower());
newCopy.setBaseToughness(in.getCurrentToughness());
// printed P/T
newCopy.setBasePowerString(in.getCurrentState().getBasePowerString());
newCopy.setBaseToughnessString(in.getCurrentState().getBaseToughnessString());
// extra copy PT boost
newCopy.setPTBoost(in.getPTBoostTable());