mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
- Conspiracy: Added Marchesa, the Black Rose
This commit is contained in:
@@ -3260,6 +3260,21 @@ public class CardFactoryUtil {
|
|||||||
|
|
||||||
ripplePos = hasKeyword(card, "Ripple", n + 1);
|
ripplePos = hasKeyword(card, "Ripple", n + 1);
|
||||||
} // Ripple
|
} // Ripple
|
||||||
|
|
||||||
|
final int dethrone = card.getKeywordAmount("Dethrone");
|
||||||
|
for (int i = 0; i < dethrone; i++) {
|
||||||
|
final StringBuilder trigScript = new StringBuilder(
|
||||||
|
"Mode$ Attacks | ValidCard$ Card.Self | Attacked$ Player.withMostLife | "
|
||||||
|
+ "TriggerZones$ Battlefield | Execute$ DethroneCounters | TriggerDescription$"
|
||||||
|
+ " Dethrone (Whenever this creature attacks the player with the most life or "
|
||||||
|
+ "tied for the most life, put a +1/+1 counter on it.)");
|
||||||
|
|
||||||
|
final String abString = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | "
|
||||||
|
+ "CounterNum$ 1";
|
||||||
|
card.setSVar("DethroneCounters", abString);
|
||||||
|
final Trigger cascadeTrigger = TriggerHandler.parseTrigger(trigScript.toString(), card, true);
|
||||||
|
card.addTrigger(cascadeTrigger);
|
||||||
|
} // Cascade
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2445,14 +2445,12 @@ public class Player extends GameEntity implements Comparable<Player> {
|
|||||||
} else if (property.startsWith("withMost")) {
|
} else if (property.startsWith("withMost")) {
|
||||||
if (property.substring(8).equals("Life")) {
|
if (property.substring(8).equals("Life")) {
|
||||||
int highestLife = this.getLife(); // Negative base just in case a few Lich's are running around
|
int highestLife = this.getLife(); // Negative base just in case a few Lich's are running around
|
||||||
Player healthiest = this;
|
|
||||||
for (final Player p : game.getPlayers()) {
|
for (final Player p : game.getPlayers()) {
|
||||||
if (p.getLife() > highestLife) {
|
if (p.getLife() > highestLife) {
|
||||||
highestLife = p.getLife();
|
highestLife = p.getLife();
|
||||||
healthiest = p;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!this.equals(healthiest)) {
|
if (this.getLife() != highestLife) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user