mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
replace P0M2 counter with M0M2 counter (only affected Spirit Shackle)
This commit is contained in:
@@ -1825,7 +1825,7 @@ public class Card extends MyObservable {
|
|||||||
total += getTempDefenseBoost() + getSemiPermanentDefenseBoost() + getOtherDefenseBoost()
|
total += getTempDefenseBoost() + getSemiPermanentDefenseBoost() + getOtherDefenseBoost()
|
||||||
+ getCounters(Counters.P1P1) + (2*getCounters(Counters.P1P2))
|
+ getCounters(Counters.P1P1) + (2*getCounters(Counters.P1P2))
|
||||||
- getCounters(Counters.M1M1) + getCounters(Counters.P0P1 )
|
- getCounters(Counters.M1M1) + getCounters(Counters.P0P1 )
|
||||||
- (2*getCounters(Counters.P0M2))
|
- (2*getCounters(Counters.M0M2))
|
||||||
+ (2*getCounters(Counters.P2P2)) - getCounters(Counters.M0M1)
|
+ (2*getCounters(Counters.P2P2)) - getCounters(Counters.M0M1)
|
||||||
- getCounters(Counters.M2M1);
|
- getCounters(Counters.M2M1);
|
||||||
return total;
|
return total;
|
||||||
|
|||||||
@@ -4422,11 +4422,10 @@ public class CardFactoryUtil {
|
|||||||
BRIBERY(),
|
BRIBERY(),
|
||||||
ICE(),
|
ICE(),
|
||||||
M1M1("-1/-1"),
|
M1M1("-1/-1"),
|
||||||
P0M2("+0/-2"),
|
|
||||||
TIME(),
|
TIME(),
|
||||||
*/
|
*/
|
||||||
return c == Counters.AGE || c == Counters.BLAZE || c == Counters.BRIBERY || c == Counters.DOOM || c == Counters.ICE ||
|
return c == Counters.AGE || c == Counters.BLAZE || c == Counters.BRIBERY || c == Counters.DOOM || c == Counters.ICE ||
|
||||||
c == Counters.M1M1 || c == Counters.P0M2 || c == Counters.TIME;
|
c == Counters.M1M1 || c == Counters.M0M2 || c == Counters.M0M1|| c == Counters.TIME;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String checkEmblemKeyword(Card c)
|
public static String checkEmblemKeyword(Card c)
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ public enum Counters {
|
|||||||
LOYALTY(),
|
LOYALTY(),
|
||||||
LUCK(),
|
LUCK(),
|
||||||
M0M1("-0/-1"),
|
M0M1("-0/-1"),
|
||||||
|
M0M2("-0/-2"),
|
||||||
M1M1("-1/-1"),
|
M1M1("-1/-1"),
|
||||||
M2M1("-2/-1"),
|
M2M1("-2/-1"),
|
||||||
MANA(),
|
MANA(),
|
||||||
@@ -55,7 +56,6 @@ public enum Counters {
|
|||||||
PHYLACTERY,
|
PHYLACTERY,
|
||||||
POLYP(),
|
POLYP(),
|
||||||
PUPA(),
|
PUPA(),
|
||||||
P0M2("+0/-2"),
|
|
||||||
P0P1("+0/+1"),
|
P0P1("+0/+1"),
|
||||||
P1P0("+1/+0"),
|
P1P0("+1/+0"),
|
||||||
P1P1("+1/+1"),
|
P1P1("+1/+1"),
|
||||||
|
|||||||
@@ -382,7 +382,7 @@ public class GameActionUtil {
|
|||||||
Ability ability = new Ability(card, "0") {
|
Ability ability = new Ability(card, "0") {
|
||||||
@Override
|
@Override
|
||||||
public void resolve() {
|
public void resolve() {
|
||||||
enchantedCard.addCounter(Counters.P0M2, 1);
|
enchantedCard.addCounter(Counters.M0M2, 1);
|
||||||
}
|
}
|
||||||
};//Ability
|
};//Ability
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user