From 7b83c72e06e83166e7fa1980870ccf1ef384f1eb Mon Sep 17 00:00:00 2001 From: kms70847 Date: Tue, 30 Jul 2019 07:24:48 -0400 Subject: [PATCH 1/3] fix another batch of oracle text typos --- forge-gui/res/cardsfolder/s/stolen_strategy.txt | 2 +- forge-gui/res/cardsfolder/t/thopter_spy_network.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/s/stolen_strategy.txt b/forge-gui/res/cardsfolder/s/stolen_strategy.txt index bea88f35b7a..82c78bab57d 100644 --- a/forge-gui/res/cardsfolder/s/stolen_strategy.txt +++ b/forge-gui/res/cardsfolder/s/stolen_strategy.txt @@ -1,7 +1,7 @@ Name:Stolen Strategy ManaCost:4 R Types:Enchantment -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile the top card of each opponent’s library. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of your upkeep, exile the top card of each opponent’s library. Until end of turn, you may cast nonland cards from among those exiled cards, and you may spend mana as though it were mana of any color to cast those spells. SVar:TrigExile:DB$ Mill | Defined$ Player.Opponent | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of each opponent's library. Until end of turn, you may cast nonland cards and you may spend mana as though it were mana of any color to cast those spells. SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | Triggers$ TriggerCastDoM | SVars$ TrigRemoveSelf | RememberObjects$ Remembered | SubAbility$ DBCleanup SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it. diff --git a/forge-gui/res/cardsfolder/t/thopter_spy_network.txt b/forge-gui/res/cardsfolder/t/thopter_spy_network.txt index f42302398f9..4ae1a59bd2b 100644 --- a/forge-gui/res/cardsfolder/t/thopter_spy_network.txt +++ b/forge-gui/res/cardsfolder/t/thopter_spy_network.txt @@ -1,10 +1,10 @@ Name:Thopter Spy Network ManaCost:2 U U Types:Enchantment -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | Execute$ TrigToken | TriggerDescription$ At the beginning of each upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You | LegacyImage$ c 1 1 a thopter flying ori T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Artifact+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | Execute$ TrigDraw | TriggerDescription$ Whenever one or more artifact creatures you control deal combat damage to a player, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 DeckHas:Ability$Token SVar:Picture:http://www.wizards.com/global/images/magic/general/thopter_spy_network.jpg -Oracle:At the beginning of each upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying.\nWhenever one or more artifact creatures you control deal combat damage to a player, draw a card. +Oracle:At the beginning of your upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying.\nWhenever one or more artifact creatures you control deal combat damage to a player, draw a card. From b23f3d9acc28553ad3fa55890787a48280a38a97 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 Jul 2019 14:24:54 +0200 Subject: [PATCH 2/3] Fix: We need to pass &face=back to API in order to download backface images correctly. --- .../src/main/java/forge/download/GuiDownloadPicturesHQ.java | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java index 8e3e5b95802..cd97aacc017 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java @@ -94,6 +94,7 @@ public class GuiDownloadPicturesHQ extends GuiDownloadService { cardname = cardname.replace("'", ""); String scryfallurl = ForgeConstants.URL_PIC_SCRYFALL_DOWNLOAD + "named?fuzzy=" + cardname; if(!setCode.equals("???")) scryfallurl += "&set=" + setCode.toLowerCase(); + if(backFace) scryfallurl += "&face=back"; scryfallurl += "&format=image"; downloads.put(destPath, scryfallurl); From 782c5949380826eec6fb911efa945c22b526fa44 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 Jul 2019 17:24:37 +0200 Subject: [PATCH 3/3] Mobile Backport: Cursor keys emulate swipe gestures First we touch the screen and later swipe (fling) in the direction of the key pressed --- forge-gui-mobile/src/forge/Forge.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index d24e17319b4..44cab2a5976 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -462,6 +462,26 @@ public class Forge implements ApplicationListener { if (keyCode == Keys.SHIFT_LEFT || keyCode == Keys.SHIFT_RIGHT) { shiftKeyDown = true; } + + // Cursor keys emulate swipe gestures + // First we touch the screen and later swipe (fling) in the direction of the key pressed + if (keyCode == Keys.LEFT) { + touchDown(0,0,0,0); + return fling(1000,0); + } + if (keyCode == Keys.RIGHT) { + touchDown(0,0,0,0); + return fling(-1000,0); + } + if (keyCode == Keys.UP) { + touchDown(0,0,0,0); + return fling(0,-1000); + } + if (keyCode == Keys.DOWN) { + touchDown(0,0,0,0); + return fling(0,1000); + } + if (keyInputAdapter == null) { if (KeyInputAdapter.isModifierKey(keyCode)) { return false; //don't process modifiers keys for unknown adapter