From c53a5ef74315c12de19b583de0e59c27888d9cb3 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 21 Sep 2020 08:20:05 -0400 Subject: [PATCH 1/5] TrigDesc comma --- forge-gui/res/cardsfolder/v/vampire_sovereign.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/v/vampire_sovereign.txt b/forge-gui/res/cardsfolder/v/vampire_sovereign.txt index be7235f77ad..23743974283 100644 --- a/forge-gui/res/cardsfolder/v/vampire_sovereign.txt +++ b/forge-gui/res/cardsfolder/v/vampire_sovereign.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Creature Vampire Noble PT:3/4 K:Flying -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBite | TriggerDescription$ When CARDNAME enters the battlefield target opponent loses 3 life and you gain 3 life. -SVar:TrigBite:DB$LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 3 life and you gain 3 life. -SVar:DBGainLife:DB$GainLife | LifeAmount$ 3 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBite | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 3 life and you gain 3 life. +SVar:TrigBite:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 3 life and you gain 3 life. +SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 Oracle:Flying\nWhen Vampire Sovereign enters the battlefield, target opponent loses 3 life and you gain 3 life. From 4ecae787f271008e024a1be0b03139e20e698499 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 21 Sep 2020 08:54:40 -0400 Subject: [PATCH 2/5] Fix attack prompt --- forge-gui/res/languages/en-US.properties | 2 +- forge-gui/src/main/java/forge/match/input/InputAttack.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index ea286757045..8fb1f5930c0 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1141,7 +1141,7 @@ lblStormCount=Storm Count #InputAttack.java lblCallBack=Call Back lblDisabled=Disabled -lblSelectAttackCreatures=Select creatures to attack +lblSelectAttackCreatures=Select creatures to attack lblSelectAttackTarget= or select player/planeswalker you wish to attack. lblSelectBandingTarget= To attack as a band, select an attacking creature to activate its ''band'' then select another to join it. #InputBlock.java diff --git a/forge-gui/src/main/java/forge/match/input/InputAttack.java b/forge-gui/src/main/java/forge/match/input/InputAttack.java index 956b94f5c31..5552774c24a 100644 --- a/forge-gui/src/main/java/forge/match/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/match/input/InputAttack.java @@ -328,7 +328,7 @@ public class InputAttack extends InputSyncronizedBase { private void updateMessage() { Localizer localizer = Localizer.getInstance(); - String message = localizer.getMessage("lblSelectAttackCreatures") + currentDefender + localizer.getMessage("lblSelectAttackTarget"); + String message = localizer.getMessage("lblSelectAttackCreatures") + " " + currentDefender + " " + localizer.getMessage("lblSelectAttackTarget"); if (potentialBanding) { message += localizer.getMessage("lblSelectBandingTarget"); } From 5312223a373ca07b556ad5c82324e4a6e885b080 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 21 Sep 2020 09:55:13 -0400 Subject: [PATCH 3/5] remove _ from ZNE editions file --- ...kar_Rising_Expeditions.txt => Zendikar Rising Expeditions.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename forge-gui/res/editions/{Zendikar_Rising_Expeditions.txt => Zendikar Rising Expeditions.txt} (100%) diff --git a/forge-gui/res/editions/Zendikar_Rising_Expeditions.txt b/forge-gui/res/editions/Zendikar Rising Expeditions.txt similarity index 100% rename from forge-gui/res/editions/Zendikar_Rising_Expeditions.txt rename to forge-gui/res/editions/Zendikar Rising Expeditions.txt From 3d9e458ab913559d6037b6c32dbe9339b9708e12 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 21 Sep 2020 10:12:43 -0400 Subject: [PATCH 4/5] spacing for select blocker prompt --- forge-gui/src/main/java/forge/match/input/InputBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/match/input/InputBlock.java b/forge-gui/src/main/java/forge/match/input/InputBlock.java index b3deff42243..dfc9977468e 100644 --- a/forge-gui/src/main/java/forge/match/input/InputBlock.java +++ b/forge-gui/src/main/java/forge/match/input/InputBlock.java @@ -86,7 +86,7 @@ public class InputBlock extends InputSyncronizedBase { } else { String attackerName = currentAttacker.isFaceDown() ? localizer.getMessage("lblMorph") : currentAttacker.getName() + " (" + currentAttacker.getId() + ")"; - String message = localizer.getMessage("lblSelectBlocker") + attackerName + localizer.getMessage("lblOrSelectBlockTarget"); + String message = localizer.getMessage("lblSelectBlocker") + attackerName + " " + localizer.getMessage("lblOrSelectBlockTarget"); showMessage(message); } From 6fb14b35c31b58a3ccb66ed405a9e3f66be6d64b Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 21 Sep 2020 14:17:25 -0400 Subject: [PATCH 5/5] issue1584 --- forge-gui/res/editions/Masters 25.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/editions/Masters 25.txt b/forge-gui/res/editions/Masters 25.txt index d15953355df..041803b48aa 100644 --- a/forge-gui/res/editions/Masters 25.txt +++ b/forge-gui/res/editions/Masters 25.txt @@ -54,7 +54,7 @@ FoilChanceInBooster=100 43 U Blue Elemental Blast 44 R Blue Sun's Zenith 45 C Borrowing 100,000 Arrows -46 U Brainstorm +46 C Brainstorm 47 U Brine Elemental 48 C Choking Tethers 49 C Coralhelm Guide