From c6d56e61f511f1c6f5a7b4b823ce4d65b37e7ad8 Mon Sep 17 00:00:00 2001 From: friarsol Date: Fri, 7 Apr 2023 08:48:03 -0400 Subject: [PATCH] Small cleanup --- .../java/forge/game/card/CardFactory.java | 28 +++++++++---------- .../main/java/forge/game/card/CardView.java | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index c17d14507ec..f4acec29250 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -370,26 +370,26 @@ public class CardFactory { //K:etbCounter:DEFENSE:3 if (card.getType().hasSubtype("Siege")) { - StringBuilder triggerSB = new StringBuilder(); - triggerSB.append("Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Static$ True | "); - triggerSB.append("TriggerDescription$ (As a Siege enters the battlefield, choose an opponent to protect it. You and others can attack it. When it’s defeated, exile it, then cast it transformed.)"); + StringBuilder triggerSB = new StringBuilder(); + triggerSB.append("Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Static$ True | "); + triggerSB.append("TriggerDescription$ (As a Siege enters the battlefield, choose an opponent to protect it. You and others can attack it. When it’s defeated, exile it, then cast it transformed.)"); - String chooseProtector = "DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | Protect$ True | ChoiceTitle$ Choose an opponent to protect this battle | AILogic$ Curse"; + String chooseProtector = "DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | Protect$ True | ChoiceTitle$ Choose an opponent to protect this battle | AILogic$ Curse"; - Trigger protectTrigger = TriggerHandler.parseTrigger(triggerSB.toString(), card, true); - protectTrigger.setOverridingAbility(AbilityFactory.getAbility(chooseProtector, card)); - card.addTrigger(protectTrigger); + Trigger protectTrigger = TriggerHandler.parseTrigger(triggerSB.toString(), card, true); + protectTrigger.setOverridingAbility(AbilityFactory.getAbility(chooseProtector, card)); + card.addTrigger(protectTrigger); - StringBuilder triggerDefeated = new StringBuilder(); - triggerDefeated.append("Mode$ Defeated | ValidCard$ Card.Self | Secondary$ True | "); - triggerDefeated.append(" TriggerDescription$ When CARDNAME is defeated, exile it, then cast it transformed."); + StringBuilder triggerDefeated = new StringBuilder(); + triggerDefeated.append("Mode$ Defeated | ValidCard$ Card.Self | Secondary$ True | "); + triggerDefeated.append(" TriggerDescription$ When CARDNAME is defeated, exile it, then cast it transformed."); - String castDefeatedBattle = "DB$ Play | Defined$ Self | WithoutManaCost$ True | CastTransformed$ True"; + String castDefeatedBattle = "DB$ Play | Defined$ Self | WithoutManaCost$ True | CastTransformed$ True"; - Trigger defeatedTrigger = TriggerHandler.parseTrigger(triggerDefeated.toString(), card, true); - defeatedTrigger.setOverridingAbility(AbilityFactory.getAbility(castDefeatedBattle, card)); - card.addTrigger(defeatedTrigger); + Trigger defeatedTrigger = TriggerHandler.parseTrigger(triggerDefeated.toString(), card, true); + defeatedTrigger.setOverridingAbility(AbilityFactory.getAbility(castDefeatedBattle, card)); + card.addTrigger(defeatedTrigger); } } diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index d767a8e8714..85ded527dc6 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -1378,7 +1378,7 @@ public class CardView extends GameEntityView { return; } } - updateDefense("0"); //alternates don't need loyalty + updateDefense("0"); } public String getSetCode() {