From 2a604e9d1311aa2e103b725fa35c05f183b207c4 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Sun, 28 Jun 2020 03:46:49 -0700 Subject: [PATCH 1/7] Make browsing the deck editor a little more keyboard friendly. --- .../main/java/forge/screens/deckeditor/CDeckEditorUI.java | 8 ++++++-- .../screens/deckeditor/controllers/ACEditorBase.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java index 80f2ac05ea1..be7750966f8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java @@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc { addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { + if (e.isControlDown() || e.isMetaDown()) { deckView.focus(); e.consume(); //prevent losing selection +} } } }); @@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc { removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { - catView.focus(); - e.consume(); //prevent losing selection + if (e.isControlDown() || e.isMetaDown()) { + catView.focus(); + e.consume(); //prevent losing selection + } } else if (KeyEvent.VK_F == e.getKeyCode()) { // let ctrl/cmd-F set focus to the text filter box diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index 3bd75e1d858..2ad7fa6106f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -458,7 +458,7 @@ public abstract class ACEditorBase Date: Mon, 29 Jun 2020 12:31:04 -0700 Subject: [PATCH 2/7] Add announcement about the keyboard change. --- forge-gui/release-files/ANNOUNCEMENTS.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt index c797a1dcaff..69a9880567c 100644 --- a/forge-gui/release-files/ANNOUNCEMENTS.txt +++ b/forge-gui/release-files/ANNOUNCEMENTS.txt @@ -1,5 +1,2 @@ #Add one announcement per line -IKO Release. Sorry Companions and Mutate will take some more time. They are still very much on the radar. -We believe the issue with 1.8.0_211 or greater have been resolved. Let us know if you are still on the latest version and things are better now. -[b]Forge now requires Java 8 (or newer). You will not be able to start the game if you are not yet running Java 8.[/b] -We have a Discord server for hanging out with Forge devs and other Forge fans. Feel free to [url=https://discord.gg/3v9JCVr]jump on in and say hi[/url]! \ No newline at end of file +Keyboard shortcut change: to help improve accessibility, the arrow key shortcuts to move between deck editor tables now require control or Command, depending on which platform you're on. From 760563e484b0ce5f39ebfeebe2ce455b3322953d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 29 Jun 2020 14:14:22 -0400 Subject: [PATCH 3/7] eliminate.txt actual fix --- forge-gui/res/cardsfolder/e/eliminate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/e/eliminate.txt b/forge-gui/res/cardsfolder/e/eliminate.txt index 169a5a30d87..9d5f1ddd6de 100644 --- a/forge-gui/res/cardsfolder/e/eliminate.txt +++ b/forge-gui/res/cardsfolder/e/eliminate.txt @@ -1,5 +1,5 @@ Name:Eliminate ManaCost:1 B Types:Instant -A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature+cmcLE3,Planeswalker+cmcLE3 | TgtPrompt$ Select target creature or planeswalker with converted mana cost 3 or less | SpellDescription$ Destroy target creature or planeswalker with converted mana cost 3 or less. +A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature.cmcLE3,Planeswalker.cmcLE3 | TgtPrompt$ Select target creature or planeswalker with converted mana cost 3 or less | SpellDescription$ Destroy target creature or planeswalker with converted mana cost 3 or less. Oracle:Destroy target creature or planeswalker with converted mana cost 3 or less. From b14e13a5631d28f96f6796c3f784a6f16e5ce18c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 29 Jun 2020 20:15:08 -0400 Subject: [PATCH 4/7] cleanup a few missing spaces to facilitate searches --- forge-gui/res/cardsfolder/g/gisa_and_geralf.txt | 6 +++--- forge-gui/res/cardsfolder/j/jaces_erasure.txt | 3 ++- forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/forge-gui/res/cardsfolder/g/gisa_and_geralf.txt b/forge-gui/res/cardsfolder/g/gisa_and_geralf.txt index 49a81caf55c..8f7f4e80b91 100644 --- a/forge-gui/res/cardsfolder/g/gisa_and_geralf.txt +++ b/forge-gui/res/cardsfolder/g/gisa_and_geralf.txt @@ -1,10 +1,10 @@ Name:Gisa and Geralf -ManaCost: 2 U B +ManaCost:2 U B Types:Legendary Creature Human Wizard PT:4/4 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill four cards. -SVar:TrigMill:DB$Mill | NumCards$ 4 | Defined$ You +SVar:TrigMill:DB$ Mill | NumCards$ 4 | Defined$ You S:Mode$ Continuous | Affected$ Zombie.YouCtrl | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ During each of your turns, you may cast a Zombie creature card from your graveyard. DeckHints:Type$Zombie -DeckHas:Ability$Graveyard +DeckHas:Ability$Graveyard & Ability$Mill Oracle:When Gisa and Geralf enters the battlefield, mill four cards.\nDuring each of your turns, you may cast a Zombie creature card from your graveyard. diff --git a/forge-gui/res/cardsfolder/j/jaces_erasure.txt b/forge-gui/res/cardsfolder/j/jaces_erasure.txt index 45c3259ee5c..155972bb9e9 100644 --- a/forge-gui/res/cardsfolder/j/jaces_erasure.txt +++ b/forge-gui/res/cardsfolder/j/jaces_erasure.txt @@ -2,5 +2,6 @@ Name:Jace's Erasure ManaCost:1 U Types:Enchantment T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, you may have target player mill a card. -SVar:TrigMill:DB$Mill | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player +SVar:TrigMill:DB$ Mill | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player +DeckHas:Ability$Mill Oracle:Whenever you draw a card, you may have target player mill a card. diff --git a/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt b/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt index 3c76fe33b2e..82d70493340 100644 --- a/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt +++ b/forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt @@ -5,7 +5,7 @@ PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards. T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token. -SVar:TrigMill:DB$Mill | NumCards$ 3 | Defined$ You +SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You -DeckHas:Ability$Token & Ability$Graveyard +DeckHas:Ability$Token & Ability$Graveyard & Ability$Mill Oracle:Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, mill three cards.\nWhenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token. From be4d30b200d2025ac2881b1cddb540ff198c9c79 Mon Sep 17 00:00:00 2001 From: Tim Mocny Date: Tue, 30 Jun 2020 02:42:32 +0000 Subject: [PATCH 5/7] more M21 --- forge-gui/res/cardsfolder/k/keen_glidemaster.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/k/keen_glidemaster.txt b/forge-gui/res/cardsfolder/k/keen_glidemaster.txt index d3ba937f724..5f48f523ad0 100644 --- a/forge-gui/res/cardsfolder/k/keen_glidemaster.txt +++ b/forge-gui/res/cardsfolder/k/keen_glidemaster.txt @@ -1,6 +1,6 @@ Name:Keen Glidemaster ManaCost:1 U Types:Creature Human Soldier -PT:2/2 -A:AB$ Pump | Cost$ 2 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. +PT:2/1 +A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. Oracle:{2}{U}: Target creature gains flying until end of turn. From 126152d6381200fdeaa62cc57c3d6651b5ff86e2 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Sun, 28 Jun 2020 03:46:49 -0700 Subject: [PATCH 6/7] Make browsing the deck editor a little more keyboard friendly. --- .../main/java/forge/screens/deckeditor/CDeckEditorUI.java | 8 ++++++-- .../screens/deckeditor/controllers/ACEditorBase.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java index 80f2ac05ea1..be7750966f8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java @@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc { addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { + if (e.isControlDown() || e.isMetaDown()) { deckView.focus(); e.consume(); //prevent losing selection +} } } }); @@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc { removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { - catView.focus(); - e.consume(); //prevent losing selection + if (e.isControlDown() || e.isMetaDown()) { + catView.focus(); + e.consume(); //prevent losing selection + } } else if (KeyEvent.VK_F == e.getKeyCode()) { // let ctrl/cmd-F set focus to the text filter box diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index 3bd75e1d858..2ad7fa6106f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -458,7 +458,7 @@ public abstract class ACEditorBase Date: Mon, 29 Jun 2020 12:31:04 -0700 Subject: [PATCH 7/7] Add announcement about the keyboard change. --- forge-gui/release-files/ANNOUNCEMENTS.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt index 5c195ff539f..69a9880567c 100644 --- a/forge-gui/release-files/ANNOUNCEMENTS.txt +++ b/forge-gui/release-files/ANNOUNCEMENTS.txt @@ -1,6 +1,2 @@ #Add one announcement per line -M21 Pre-release. -Mutate is NOT finished yet. Please be patient. -Companion is in, but unfortunately Wizards changed the rules on us. We'll get the new rules in when we can. -[b]Forge now requires Java 8 (or newer). You will not be able to start the game if you are not yet running Java 8.[/b] -We have a Discord server for hanging out with Forge devs and other Forge fans. Feel free to [url=https://discord.gg/3v9JCVr]jump on in and say hi[/url]! \ No newline at end of file +Keyboard shortcut change: to help improve accessibility, the arrow key shortcuts to move between deck editor tables now require control or Command, depending on which platform you're on.