external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'core/master'

Browse Source
This commit is contained in:
Anthony Calosa
2022-03-13 13:11:09 +08:00
parent 895e7034be bee2705cc5
commit 11d4cd9f9d
17 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-adventure/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -274,7 +274,7 @@
<dependency>
<groupId>forge</groupId>
<artifactId>forge-gui-mobile</artifactId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
forge-ai/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-ai</artifactId>

2
forge-core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-core</artifactId>

2
forge-game/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-game</artifactId>

7
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -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;

2
forge-gui-android/pom.xml
View File

@@ -19,7 +19,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-android</artifactId>

2
forge-gui-desktop/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-desktop</artifactId>

2
forge-gui-ios/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-ios</artifactId>

2
forge-gui-mobile-dev/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-mobile-dev</artifactId>

2
forge-gui-mobile/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-mobile</artifactId>

2
forge-gui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-gui</artifactId>

2
forge-gui/res/cardsfolder/b/boon_of_boseiju.txt
View File

@@ -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.

2
forge-gui/res/cardsfolder/w/whirlpool_whelm.txt
View File

@@ -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

1
forge-gui/res/lists/altwin-achievements.txt
View File

@@ -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?

3
forge-gui/res/lists/planeswalker-achievements.txt
View File

@@ -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.

2
forge-lda/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
</parent>
<artifactId>forge-lda</artifactId>

2
pom.xml
View File

@@ -4,7 +4,7 @@
<artifactId>forge</artifactId>
<packaging>pom</packaging>
<name>Forge Parent</name>
<version>1.6.48-SNAPSHOT</version>
<version>1.6.49-SNAPSHOT</version>
<description>
Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules.