From 587539290cb4a403f78671b6401d3aa5eadacc79 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sun, 6 Mar 2022 20:30:23 +0300 Subject: [PATCH 1/5] [maven-release-plugin] prepare release forge-1.6.48 --- forge-adventure/pom.xml | 4 ++-- forge-ai/pom.xml | 2 +- forge-core/pom.xml | 2 +- forge-game/pom.xml | 2 +- forge-gui-android/pom.xml | 2 +- forge-gui-desktop/pom.xml | 2 +- forge-gui-ios/pom.xml | 2 +- forge-gui-mobile-dev/pom.xml | 2 +- forge-gui-mobile/pom.xml | 2 +- forge-gui/pom.xml | 2 +- forge-lda/pom.xml | 2 +- pom.xml | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml index 2f629626f9f..8fb358185c2 100644 --- a/forge-adventure/pom.xml +++ b/forge-adventure/pom.xml @@ -3,7 +3,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 4.0.0 @@ -274,7 +274,7 @@ forge forge-gui-mobile - 1.6.48-SNAPSHOT + 1.6.48 compile diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml index 299065d7c43..75756674273 100644 --- a/forge-ai/pom.xml +++ b/forge-ai/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-ai diff --git a/forge-core/pom.xml b/forge-core/pom.xml index b5577790d3c..b54bcdf3315 100644 --- a/forge-core/pom.xml +++ b/forge-core/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-core diff --git a/forge-game/pom.xml b/forge-game/pom.xml index de17ccc767d..6ccdcf9cd33 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-game diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 04dc74f19b4..d6b1036fb1b 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -19,7 +19,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui-android diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 23ed922b220..69aa42f4bab 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui-desktop diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index b9b4c6b5d3c..e4cc6f90227 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -12,7 +12,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui-ios diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index e251a25517a..d2573b1a087 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui-mobile-dev diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 5c23a47f872..545211ae923 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui-mobile diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 7f4f3f24020..e7b2841bfa7 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-gui diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index 953e5212059..6d7278f7e84 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48-SNAPSHOT + 1.6.48 forge-lda diff --git a/pom.xml b/pom.xml index 1e81d4cd879..2f415f8e1b8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ forge pom Forge Parent - 1.6.48-SNAPSHOT + 1.6.48 Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. @@ -36,7 +36,7 @@ scm:git:ssh://git@git.cardforge.org/core-developers/forge.git scm:git:ssh://git@git.cardforge.org/core-developers/forge.git - HEAD + forge-1.6.48 From 5142549c0dfec733d2bed79520e409b1595a3b2d Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sun, 6 Mar 2022 20:30:40 +0300 Subject: [PATCH 2/5] [maven-release-plugin] prepare for next development iteration --- forge-adventure/pom.xml | 4 ++-- forge-ai/pom.xml | 2 +- forge-core/pom.xml | 2 +- forge-game/pom.xml | 2 +- forge-gui-android/pom.xml | 2 +- forge-gui-desktop/pom.xml | 2 +- forge-gui-ios/pom.xml | 2 +- forge-gui-mobile-dev/pom.xml | 2 +- forge-gui-mobile/pom.xml | 2 +- forge-gui/pom.xml | 2 +- forge-lda/pom.xml | 2 +- pom.xml | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml index 8fb358185c2..ac93389622d 100644 --- a/forge-adventure/pom.xml +++ b/forge-adventure/pom.xml @@ -3,7 +3,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT 4.0.0 @@ -274,7 +274,7 @@ forge forge-gui-mobile - 1.6.48 + 1.6.49-SNAPSHOT compile diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml index 75756674273..3a204d069dc 100644 --- a/forge-ai/pom.xml +++ b/forge-ai/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-ai diff --git a/forge-core/pom.xml b/forge-core/pom.xml index b54bcdf3315..aa0d904c3e1 100644 --- a/forge-core/pom.xml +++ b/forge-core/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-core diff --git a/forge-game/pom.xml b/forge-game/pom.xml index 6ccdcf9cd33..002607cd494 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -6,7 +6,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-game diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index d6b1036fb1b..695751741a4 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -19,7 +19,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui-android diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 69aa42f4bab..8ba58c34c3a 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui-desktop diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml index e4cc6f90227..5e9e1dafacf 100644 --- a/forge-gui-ios/pom.xml +++ b/forge-gui-ios/pom.xml @@ -12,7 +12,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui-ios diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index d2573b1a087..1a543a88e6b 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui-mobile-dev diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 545211ae923..a35bb71378c 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui-mobile diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index e7b2841bfa7..1c7f5297ba9 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-gui diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml index 6d7278f7e84..f9ad95e5114 100644 --- a/forge-lda/pom.xml +++ b/forge-lda/pom.xml @@ -4,7 +4,7 @@ forge forge - 1.6.48 + 1.6.49-SNAPSHOT forge-lda diff --git a/pom.xml b/pom.xml index 2f415f8e1b8..5b4c4d59d39 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ forge pom Forge Parent - 1.6.48 + 1.6.49-SNAPSHOT Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules. @@ -36,7 +36,7 @@ scm:git:ssh://git@git.cardforge.org/core-developers/forge.git scm:git:ssh://git@git.cardforge.org/core-developers/forge.git - forge-1.6.48 + HEAD From 76966aa9811e51c2b8949ab85b71638fa814d85b Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Sat, 12 Mar 2022 13:56:44 +0000 Subject: [PATCH 3/5] Update forge-gui/res/cardsfolder/b/boon_of_boseiju.txt --- forge-gui/res/cardsfolder/b/boon_of_boseiju.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/b/boon_of_boseiju.txt b/forge-gui/res/cardsfolder/b/boon_of_boseiju.txt index 75bfe5edff8..1085fe0e614 100644 --- a/forge-gui/res/cardsfolder/b/boon_of_boseiju.txt +++ b/forge-gui/res/cardsfolder/b/boon_of_boseiju.txt @@ -3,5 +3,5 @@ ManaCost:2 G Types:Instant A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | SubAbility$ DBUntap | SpellDescription$ Target creature gets +X/+X until end of turn, where X is the greatest mana value among permanents you control. SVar:DBUntap:DB$ Untap | Defined$ Targeted | SpellDescription$ Untap it. -SVar:X:Count$HighestCMC_Permanent.YouCtrl +SVar:X:Count$MaxCMCYouCtrl Oracle:Target creature gets +X/+X until end of turn, where X is the greatest mana value among permanents you control. Untap it. From 13f30b5e7d2706f1d01c68fe7ade85f158ed8edd Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sat, 12 Mar 2022 21:58:49 +0300 Subject: [PATCH 4/5] - Added NEO/NEC achievements by Marek14. --- forge-gui/res/lists/altwin-achievements.txt | 1 + forge-gui/res/lists/planeswalker-achievements.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/forge-gui/res/lists/altwin-achievements.txt b/forge-gui/res/lists/altwin-achievements.txt index d0bdb6b0a50..32390d65bc3 100644 --- a/forge-gui/res/lists/altwin-achievements.txt +++ b/forge-gui/res/lists/altwin-achievements.txt @@ -37,5 +37,6 @@ The Cheese Stands Alone|The Cheese|It's cheesy, but hey, it works! The Deck of Many Things's Effect|Down on the Deck|Lucky draw! Triskaidekaphile|The Luckiest Number|13, 169, 2197, 28561... Triskaidekaphobia|The Fear of 13|It's just a silly ancient superstition... right? +Vessel of the All-Consuming|Consumed by Hidetsugu|Fade into nothingness. Vorpal Sword|Snicker-Snack!|He left it dead, and with its head / He went galumphing back. Emblem - Vraska, Golgari Queen|The Flurry of Assassins|How good is your dodging? diff --git a/forge-gui/res/lists/planeswalker-achievements.txt b/forge-gui/res/lists/planeswalker-achievements.txt index fdf9108deb5..5649ba787a7 100644 --- a/forge-gui/res/lists/planeswalker-achievements.txt +++ b/forge-gui/res/lists/planeswalker-achievements.txt @@ -87,6 +87,7 @@ Jace, the Mind Sculptor|Jace's Lobotomy|What do you mean, "overpowered"? Jace, Unraveler of Secrets|Jace's Perfect Plan|So, I've read about this neat guy named Erayo... Jace, Wielder of Mysteries|Jace's Neat Solution|Everything is solved. No loose ends. Jaya Ballard|Jaya's Flashback|Fire is easily rekindled. +Kaito Shizuki|Kaito's Stealth Army|Assemble. Karn Liberated|Karn's Reset|Let's do this again! Kasmina, Enigma Sage|Kasmina's Private Tutoring|This will be on the spelling test next week. Kaya the Inexorable|Kaya's Dimensional Breach|A little help here? @@ -160,6 +161,7 @@ Sorin, Imperious Bloodlord|Sorin's Progeny|Welcome to your new life. You serve m Sorin, Lord of Innistrad|Sorin's Recruitment|My favorite game is Shogi! Sorin, Solemn Visitor|Sorin's Abyss|Don't get so close to the edge! Sorin, Vampire Lord|Sorin's Siring Party|Go forth and multiply. +Tamiyo, Compleated Sage|Tamiyo's Final Entry|I will support my family. Whatever it takes. Tamiyo, Field Researcher|Tamiyo's Omniscience|I know exactly how your story ends... Tamiyo, the Moon Sage|Tamiyo's Recycling|Wash, rinse, repeat! Teferi, Hero of Dominaria|Teferi's Oblivion|Don't worry. It's just a phase. @@ -172,6 +174,7 @@ Tezzeret the Schemer|Tezzeret's Assembly Line|Smashing, isn't it? Tezzeret the Seeker|Tezzeret's Robots|You can't stop the progress! Tezzeret, Agent of Bolas|Tezzeret's Drain|Technological superiority for the win! Tezzeret, Artifice Master|Tezzeret's Planar Bridge|What's behind the door number one? +Tezzeret, Betrayer of Flesh|Tezzeret's Cycle of Knowledge|From knowledge, machines. From machines, knowledge. Tezzeret, Cruel Machinist|Tezzeret's Artificial Morph|Ixidor, Ugin... THIS is how you do it! Tezzeret, Master of Metal|Tezzeret's Confiscation|Your stuff will serve a grander design - mine. Tezzeret, Master of the Bridge|Tezzeret's Mass Transit|Just for today, everyone rides free. From 06d58604d69b19faecb34b9df8c40e867b16ff0d Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Sun, 13 Mar 2022 04:25:53 +0000 Subject: [PATCH 5/5] changeHiddenOriginResolve: Fix default fallback --- .../java/forge/game/ability/effects/ChangeZoneEffect.java | 7 +------ forge-gui/res/cardsfolder/w/whirlpool_whelm.txt | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index d39918466bb..664d4ff960f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -859,12 +859,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { if (sa.hasParam("DefinedPlayer")) { fetchers = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("DefinedPlayer"), sa); } else { - fetchers = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa); - } - - // handle case when Defined is for a Card - if (fetchers.isEmpty()) { - fetchers.add(sa.getHostCard().getController()); + fetchers = Lists.newArrayList(sa.getActivatingPlayer()); } Player chooser = null; diff --git a/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt b/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt index 7a93f2f5cbc..8e980279979 100644 --- a/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt +++ b/forge-gui/res/cardsfolder/w/whirlpool_whelm.txt @@ -2,7 +2,7 @@ Name:Whirlpool Whelm ManaCost:1 U Types:Instant A:SP$ Clash | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | WinSubAbility$ DBLibrary | OtherwiseSubAbility$ DBHand | RememberTargets$ True | SpellDescription$ Clash with an opponent, then return target creature to its owner's hand. If you win, you may put that creature on top of its owner's library instead. -SVar:DBLibrary:DB$ ChangeZone | Defined$ TargetedController | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ChangeType$ Card.IsRemembered | Hidden$ True | Chooser$ You | SubAbility$ DBDeclined +SVar:DBLibrary:DB$ ChangeZone | DefinedPlayer$ TargetedController | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ChangeType$ Card.IsRemembered | Hidden$ True | Chooser$ You | SubAbility$ DBDeclined SVar:DBDeclined:DB$ ChangeZone | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 SVar:DBHand:DB$ ChangeZone | Defined$ Targeted | Origin$ Battlefield | Destination$ Hand SVar:X:Remembered$Amount