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

overgrown_pest.txt + refactor

Browse Source
This commit is contained in:
Northmoc
2023-04-17 16:23:08 -04:00
parent 482e42309c
commit 22187b05f3
13 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -2316,7 +2316,7 @@ public class ComputerUtilCombat {
* @return transform creature if possible, original creature otherwise * @return transform creature if possible, original creature otherwise
*/ */
private final static Card canTransform(Card original) { private final static Card canTransform(Card original) {
if (original.isDoubleFaced() && !original.isInAlternateState()) { if (original.isTransformable() && !original.isInAlternateState()) {
for (SpellAbility sa : original.getSpellAbilities()) { for (SpellAbility sa : original.getSpellAbilities()) {
if (sa.getApi() == ApiType.SetState && ComputerUtilCost.canPayCost(sa, original.getController(), false)) { if (sa.getApi() == ApiType.SetState && ComputerUtilCost.canPayCost(sa, original.getController(), false)) {
Card transformed = CardUtil.getLKICopy(original); Card transformed = CardUtil.getLKICopy(original);

2
forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
View File

@@ -46,7 +46,7 @@ public class CreatureEvaluator implements Function<Card, Integer> {
value += addValue(toughness * 10, "toughness: " + toughness); value += addValue(toughness * 10, "toughness: " + toughness);
// because backside is always stronger the potential makes it better than a single faced card // because backside is always stronger the potential makes it better than a single faced card
if (c.hasKeyword(Keyword.DAYBOUND) && c.hasBackSide()) { if (c.hasKeyword(Keyword.DAYBOUND) && c.isDoubleFaced()) {
value += addValue(power * 10, "transforming"); value += addValue(power * 10, "transforming");
} }
} }

2
forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
View File

@@ -173,7 +173,7 @@ public class SetStateAi extends SpellAbilityAi {
} }
} else { } else {
// doublefaced or meld cards can't be turned face down // doublefaced or meld cards can't be turned face down
if (card.isDoubleFaced() || card.isMeldable()) { if (card.isTransformable() || card.isMeldable()) {
return false; return false;
} }
} }

4
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -592,7 +592,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
gameCard.setTapped(false); gameCard.setTapped(false);
} }
if (sa.hasParam("Transformed")) { if (sa.hasParam("Transformed")) {
if (gameCard.isDoubleFaced()) { if (gameCard.isTransformable()) {
// need LKI before Animate does apply // need LKI before Animate does apply
if (!moveParams.containsKey(AbilityKey.CardLKI)) { if (!moveParams.containsKey(AbilityKey.CardLKI)) {
moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(gameCard)); moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(gameCard));
@@ -1320,7 +1320,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
c.addEtbCounter(cType, cAmount, player); c.addEtbCounter(cType, cAmount, player);
} }
if (sa.hasParam("Transformed")) { if (sa.hasParam("Transformed")) {
if (c.isDoubleFaced()) { if (c.isTransformable()) {
// need LKI before Animate does apply // need LKI before Animate does apply
if (!moveParams.containsKey(AbilityKey.CardLKI)) { if (!moveParams.containsKey(AbilityKey.CardLKI)) {
moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c)); moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c));

4
forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
View File

@@ -129,7 +129,7 @@ public class SetStateEffect extends SpellAbilityEffect {
&& gameCard.hasMergedCard()) { && gameCard.hasMergedCard()) {
boolean hasBackSide = false; boolean hasBackSide = false;
for (final Card c : gameCard.getMergedCards()) { for (final Card c : gameCard.getMergedCards()) {
if (c.hasBackSide()) { if (c.isDoubleFaced()) {
hasBackSide = true; hasBackSide = true;
break; break;
} }
@@ -200,7 +200,7 @@ public class SetStateEffect extends SpellAbilityEffect {
if (remChanged) { if (remChanged) {
host.addRemembered(gameCard); host.addRemembered(gameCard);
} }
if (!gameCard.isDoubleFaced()) if (!gameCard.isTransformable())
transformedCards.add(gameCard); transformedCards.add(gameCard);
if ("Specialize".equals(mode)) { if ("Specialize".equals(mode)) {
gameCard.setSpecialized(true); gameCard.setSpecialized(true);

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

@@ -596,7 +596,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// and then any effect have it turn upface again and demand its former flip state to be restored // and then any effect have it turn upface again and demand its former flip state to be restored
// Proof: Morph cards never have ability that makes them flip, Ixidron does not suppose cards to be turned face up again, // Proof: Morph cards never have ability that makes them flip, Ixidron does not suppose cards to be turned face up again,
// Illusionary Mask affects cards in hand. // Illusionary Mask affects cards in hand.
if (mode.equals("Transform") && (isDoubleFaced() || hasMergedCard())) { if (mode.equals("Transform") && (isTransformable() || hasMergedCard())) {
if (!canTransform(cause)) { if (!canTransform(cause)) {
return false; return false;
} }
@@ -608,7 +608,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
CardCollectionView cards = hasMergedCard() ? getMergedCards() : new CardCollection(this); CardCollectionView cards = hasMergedCard() ? getMergedCards() : new CardCollection(this);
boolean retResult = false; boolean retResult = false;
for (final Card c : cards) { for (final Card c : cards) {
if (!c.isDoubleFaced()) { if (!c.isTransformable()) {
continue; continue;
} }
c.backside = !c.backside; c.backside = !c.backside;
@@ -726,7 +726,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
CardCollectionView cards = hasMergedCard() ? getMergedCards() : new CardCollection(this); CardCollectionView cards = hasMergedCard() ? getMergedCards() : new CardCollection(this);
boolean retResult = false; boolean retResult = false;
for (final Card c : cards) { for (final Card c : cards) {
if (override || !c.hasBackSide()) { if (override || !c.isDoubleFaced()) {
c.facedown = true; c.facedown = true;
if (c.setState(CardStateName.FaceDown, true)) { if (c.setState(CardStateName.FaceDown, true)) {
c.runFacedownCommands(); c.runFacedownCommands();
@@ -810,7 +810,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
if (hasMergedCard()) { if (hasMergedCard()) {
boolean hasTransformCard = false; boolean hasTransformCard = false;
for (final Card c : getMergedCards()) { for (final Card c : getMergedCards()) {
if (c.isDoubleFaced()) { if (c.isTransformable()) {
hasTransformCard = true; hasTransformCard = true;
transformCard = c; transformCard = c;
break; break;
@@ -819,7 +819,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
if (!hasTransformCard) { if (!hasTransformCard) {
return false; return false;
} }
} else if (!isDoubleFaced()) { } else if (!isTransformable()) {
return false; return false;
} }
@@ -931,7 +931,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return numStates > threshold; return numStates > threshold;
} }
public final boolean isDoubleFaced() { public final boolean isTransformable() {
return getRules() != null && getRules().getSplitType() == CardSplitType.Transform; return getRules() != null && getRules().getSplitType() == CardSplitType.Transform;
} }
@@ -943,8 +943,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return getRules() != null && getRules().getSplitType() == CardSplitType.Modal; return getRules() != null && getRules().getSplitType() == CardSplitType.Modal;
} }
public final boolean hasBackSide() { public final boolean isDoubleFaced() {
return isDoubleFaced() || isMeldable() || isModal(); return isTransformable() || isMeldable() || isModal();
} }
public final boolean isFlipCard() { public final boolean isFlipCard() {
@@ -2467,7 +2467,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// Check if the saga card does not have the keyword Read ahead // Check if the saga card does not have the keyword Read ahead
if (type.hasSubtype("Saga") && !this.hasStartOfKeyword("Read ahead")) { if (type.hasSubtype("Saga") && !this.hasStartOfKeyword("Read ahead")) {
sb.append("(").append(Localizer.getInstance().getMessage("lblSagaHeader")); sb.append("(").append(Localizer.getInstance().getMessage("lblSagaHeader"));
if (!state.getCard().isDoubleFaced()) { if (!state.getCard().isTransformable()) {
sb.append(" ").append(Localizer.getInstance().getMessage("lblSagaFooter")).append(" ").append(TextUtil.toRoman(getFinalChapterNr())).append("."); sb.append(" ").append(Localizer.getInstance().getMessage("lblSagaFooter")).append(" ").append(TextUtil.toRoman(getFinalChapterNr())).append(".");
} }
sb.append(")").append(linebreak); sb.append(")").append(linebreak);
@@ -4106,7 +4106,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return CardStateName.Flipped; return CardStateName.Flipped;
} else if (isSpecialized()) { } else if (isSpecialized()) {
return getCurrentStateName(); return getCurrentStateName();
} else if (backside && hasBackSide()) { } else if (backside && isDoubleFaced()) {
CardStateName stateName = getRules().getSplitType().getChangedStateName(); CardStateName stateName = getRules().getSplitType().getChangedStateName();
if (hasState(stateName)) { if (hasState(stateName)) {
return stateName; return stateName;
@@ -6667,7 +6667,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
if (stateName != null && hasState(stateName) && this.getCurrentStateName() != stateName) { if (stateName != null && hasState(stateName) && this.getCurrentStateName() != stateName) {
setState(stateName, true); setState(stateName, true);
// need to set backSide value according to the SplitType // need to set backSide value according to the SplitType
if (hasBackSide()) { if (isDoubleFaced()) {
setBackSide(getRules().getSplitType().getChangedStateName().equals(stateName)); setBackSide(getRules().getSplitType().getChangedStateName().equals(stateName));
} }
} }

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

@@ -253,7 +253,7 @@ public class CardFactory {
c.setState(CardStateName.Flipped, false); c.setState(CardStateName.Flipped, false);
c.setImageKey(cp.getImageKey(true)); c.setImageKey(cp.getImageKey(true));
} }
else if (c.hasBackSide() && cardRules != null) { else if (c.isDoubleFaced() && cardRules != null) {
c.setState(cardRules.getSplitType().getChangedStateName(), false); c.setState(cardRules.getSplitType().getChangedStateName(), false);
c.setImageKey(cp.getImageKey(true)); c.setImageKey(cp.getImageKey(true));
} }
@@ -300,7 +300,7 @@ public class CardFactory {
private static void buildAbilities(final Card card) { private static void buildAbilities(final Card card) {
for (final CardStateName state : card.getStates()) { for (final CardStateName state : card.getStates()) {
if (card.hasBackSide() && state == CardStateName.FaceDown) { if (card.isDoubleFaced() && state == CardStateName.FaceDown) {
continue; // Ignore FaceDown for DFC since they have none. continue; // Ignore FaceDown for DFC since they have none.
} }
card.setState(state, false); card.setState(state, false);

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

@@ -143,6 +143,10 @@ public class CardProperty {
if (!card.isBackSide()) { if (!card.isBackSide()) {
return false; return false;
} }
} else if (property.equals("CanTransform")) {
if (!card.isTransformable()) {
return false;
}
} else if (property.equals("Transformed")) { } else if (property.equals("Transformed")) {
if (!card.isTransformed()) { if (!card.isTransformed()) {
return false; return false;

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

@@ -922,7 +922,7 @@ public class CardView extends GameEntityView {
updateIntensity(c); updateIntensity(c);
} }
if (getBackup() == null && !c.isFaceDown() && (c.hasBackSide()||c.isFlipCard()||c.isAdventureCard())) { if (getBackup() == null && !c.isFaceDown() && (c.isDoubleFaced()||c.isFlipCard()||c.isAdventureCard())) {
set(TrackableProperty.PaperCardBackup, c.getPaperCard()); set(TrackableProperty.PaperCardBackup, c.getPaperCard());
} }
@@ -939,7 +939,7 @@ public class CardView extends GameEntityView {
//backside //backside
if (c.getAlternateState() != null) if (c.getAlternateState() != null)
updateBackSide(c.getAlternateState().getName(), c.hasBackSide()); updateBackSide(c.getAlternateState().getName(), c.isDoubleFaced());
final Card cloner = c.getCloner(); final Card cloner = c.getCloner();
@@ -1005,7 +1005,7 @@ public class CardView extends GameEntityView {
alternateState = c.getState(CardStateName.Original); alternateState = c.getState(CardStateName.Original);
} }
if (c.hasBackSide() && isFaceDown()) //fixes facedown cards with backside... if (c.isDoubleFaced() && isFaceDown()) //fixes facedown cards with backside...
alternateState = c.getState(CardStateName.Original); alternateState = c.getState(CardStateName.Original);
if (alternateState == null) { if (alternateState == null) {

2
forge-game/src/main/java/forge/game/spellability/Spell.java
View File

@@ -186,7 +186,7 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
} }
source.setState(stateName, false); source.setState(stateName, false);
if (getHostCard().hasBackSide()) { if (getHostCard().isDoubleFaced()) {
source.setBackSide(getHostCard().getRules().getSplitType().getChangedStateName().equals(stateName)); source.setBackSide(getHostCard().getRules().getSplitType().getChangedStateName().equals(stateName));
} }

12
forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
View File

@@ -1745,12 +1745,12 @@ public class GameSimulationTest extends SimulationTest {
Card giant = addCard(hillGiantName, p); Card giant = addCard(hillGiantName, p);
AssertJUnit.assertFalse(outlaw.isCloned()); AssertJUnit.assertFalse(outlaw.isCloned());
AssertJUnit.assertTrue(outlaw.isDoubleFaced()); AssertJUnit.assertTrue(outlaw.isTransformable());
AssertJUnit.assertTrue(outlaw.hasState(CardStateName.Transformed)); AssertJUnit.assertTrue(outlaw.hasState(CardStateName.Transformed));
AssertJUnit.assertTrue(outlaw.canTransform(null)); AssertJUnit.assertTrue(outlaw.canTransform(null));
AssertJUnit.assertFalse(outlaw.isBackSide()); AssertJUnit.assertFalse(outlaw.isBackSide());
AssertJUnit.assertFalse(giant.isDoubleFaced()); AssertJUnit.assertFalse(giant.isTransformable());
AssertJUnit.assertFalse(giant.canTransform(null)); AssertJUnit.assertFalse(giant.canTransform(null));
addCards("Forest", 4, p); addCards("Forest", 4, p);
@@ -1778,14 +1778,14 @@ public class GameSimulationTest extends SimulationTest {
Card clonedOutLaw = (Card) sim.getGameCopier().find(outlaw); Card clonedOutLaw = (Card) sim.getGameCopier().find(outlaw);
AssertJUnit.assertTrue(clonedOutLaw.isCloned()); AssertJUnit.assertTrue(clonedOutLaw.isCloned());
AssertJUnit.assertTrue(clonedOutLaw.isDoubleFaced()); AssertJUnit.assertTrue(clonedOutLaw.isTransformable());
AssertJUnit.assertFalse(clonedOutLaw.hasState(CardStateName.Transformed)); AssertJUnit.assertFalse(clonedOutLaw.hasState(CardStateName.Transformed));
AssertJUnit.assertTrue(clonedOutLaw.canTransform(null)); AssertJUnit.assertTrue(clonedOutLaw.canTransform(null));
AssertJUnit.assertFalse(clonedOutLaw.isBackSide()); AssertJUnit.assertFalse(clonedOutLaw.isBackSide());
AssertJUnit.assertEquals(clonedOutLaw.getName(), hillGiantName); AssertJUnit.assertEquals(clonedOutLaw.getName(), hillGiantName);
AssertJUnit.assertTrue(clonedOutLaw.isDoubleFaced()); AssertJUnit.assertTrue(clonedOutLaw.isTransformable());
score = sim.simulateSpellAbility(moonmistSA).value; score = sim.simulateSpellAbility(moonmistSA).value;
AssertJUnit.assertTrue(score > 0); AssertJUnit.assertTrue(score > 0);
@@ -1799,7 +1799,7 @@ public class GameSimulationTest extends SimulationTest {
Card transformOutLaw = (Card) sim.getGameCopier().find(outlaw); Card transformOutLaw = (Card) sim.getGameCopier().find(outlaw);
AssertJUnit.assertTrue(transformOutLaw.isCloned()); AssertJUnit.assertTrue(transformOutLaw.isCloned());
AssertJUnit.assertTrue(transformOutLaw.isDoubleFaced()); AssertJUnit.assertTrue(transformOutLaw.isTransformable());
AssertJUnit.assertFalse(transformOutLaw.hasState(CardStateName.Transformed)); AssertJUnit.assertFalse(transformOutLaw.hasState(CardStateName.Transformed));
AssertJUnit.assertTrue(transformOutLaw.canTransform(null)); AssertJUnit.assertTrue(transformOutLaw.canTransform(null));
AssertJUnit.assertTrue(transformOutLaw.isBackSide()); AssertJUnit.assertTrue(transformOutLaw.isBackSide());
@@ -1814,7 +1814,7 @@ public class GameSimulationTest extends SimulationTest {
AssertJUnit.assertEquals(1, countCardsWithName(simGame, terrorName)); AssertJUnit.assertEquals(1, countCardsWithName(simGame, terrorName));
AssertJUnit.assertFalse(transformOutLaw.isCloned()); AssertJUnit.assertFalse(transformOutLaw.isCloned());
AssertJUnit.assertTrue(transformOutLaw.isDoubleFaced()); AssertJUnit.assertTrue(transformOutLaw.isTransformable());
AssertJUnit.assertTrue(transformOutLaw.hasState(CardStateName.Transformed)); AssertJUnit.assertTrue(transformOutLaw.hasState(CardStateName.Transformed));
AssertJUnit.assertTrue(transformOutLaw.canTransform(null)); AssertJUnit.assertTrue(transformOutLaw.canTransform(null));
AssertJUnit.assertTrue(transformOutLaw.isBackSide()); AssertJUnit.assertTrue(transformOutLaw.isBackSide());

4
forge-gui/res/cardsfolder/t/tovolar_dire_overlord_tovolar_the_midnight_scourge.txt
View File

@@ -6,9 +6,9 @@ T:Mode$ DamageDone | ValidSource$ Wolf.YouCtrl,Werewolf.YouCtrl | ValidTarget$ P
SVar:TrigDrawD:DB$ Draw | Defined$ You | NumCards$ 1 SVar:TrigDrawD:DB$ Draw | Defined$ You | NumCards$ 1
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigNight | TriggerDescription$ At the beginning of your upkeep, if you control three or more Wolves and/or Werewolves, it becomes night. Then transform any number of Human Werewolves you control. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigNight | TriggerDescription$ At the beginning of your upkeep, if you control three or more Wolves and/or Werewolves, it becomes night. Then transform any number of Human Werewolves you control.
SVar:TrigNight:DB$ DayTime | Value$ Night | SubAbility$ DBTransform SVar:TrigNight:DB$ DayTime | Value$ Night | SubAbility$ DBTransform
SVar:DBTransform:DB$ SetState | MinAmount$ 0 | Amount$ NumHumanWerewolves | Choices$ Human.Werewolf+YouCtrl+DoubleFaced | ChoiceTitle$ Choose any number of Human Werewolves you control | Mode$ Transform SVar:DBTransform:DB$ SetState | MinAmount$ 0 | Amount$ NumHumanWerewolves | Choices$ Human.Werewolf+YouCtrl+CanTransform | ChoiceTitle$ Choose any number of Human Werewolves you control | Mode$ Transform
K:Daybound K:Daybound
SVar:NumHumanWerewolves:Count$Valid Human.Werewolf+YouCtrl+DoubleFaced SVar:NumHumanWerewolves:Count$Valid Human.Werewolf+YouCtrl+CanTransform
SVar:X:Count$Valid Wolf.YouCtrl,Werewolf.YouCtrl SVar:X:Count$Valid Wolf.YouCtrl,Werewolf.YouCtrl
DeckHints:Type$Wolf|Werewolf DeckHints:Type$Wolf|Werewolf
AlternateMode:DoubleFaced AlternateMode:DoubleFaced

7
forge-gui/res/cardsfolder/upcoming/overgrown_pest.txt Normal file
View File

@@ -0,0 +1,7 @@
Name:Overgrown Pest
ManaCost:2 G
Types:Creature Pest
PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Land,Card.DoubleFaced | RestRandomOrder$ True
Oracle:When Overgrown Pest enters the battlefield, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.