From c9cdf2f0e1c5195fd23ecdd036b9493748205e9e Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 16 Sep 2020 07:53:58 -0400 Subject: [PATCH 1/5] vindictive_lich.txt trigger fix --- forge-gui/res/cardsfolder/v/vindictive_lich.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/v/vindictive_lich.txt b/forge-gui/res/cardsfolder/v/vindictive_lich.txt index 6755a847f28..8c94811a0f7 100644 --- a/forge-gui/res/cardsfolder/v/vindictive_lich.txt +++ b/forge-gui/res/cardsfolder/v/vindictive_lich.txt @@ -2,7 +2,7 @@ Name:Vindictive Lich ManaCost:3 B Types:Creature Zombie Wizard PT:4/1 -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME dies, ABILITY +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, ABILITY SVar:TrigCharm:DB$ Charm | MinCharmNum$ 1 | CharmNum$ 3 | CharmNumOnResolve$ MaxUniqueOpponents | Choices$ SacCreature,DiscardCards,LoseLife | References$ MaxUniqueOpponents | AdditionalDescription$ Each mode must target a different player. SVar:SacCreature:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Creature | SacMessage$ Creature | SpellDescription$ Target opponent sacrifices a creature. SVar:DiscardCards:DB$ Discard | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 2 | Mode$ TgtChoose | SpellDescription$ Target opponent discards two cards. @@ -10,5 +10,4 @@ SVar:LoseLife:DB$ LoseLife | ValidTgts$ Opponent | TargetUnique$ True | LifeAmou SVar:MaxUniqueOpponents:PlayerCountOpponents$Amount #TODO: The AI is able to target the same player with multiple modes, usually all three. This should not happen. AI:RemoveDeck:All -SVar:Picture:http://www.wizards.com/global/images/magic/general/vindictive_lich.jpg -Oracle:When Vindictive Lich dies, choose one or more. Each mode must target a different player.\n• Target opponent sacrifices a creature.\n• Target opponent discards two cards.\n• Target opponent loses 5 life. \ No newline at end of file +Oracle:When Vindictive Lich dies, choose one or more. Each mode must target a different player.\n• Target opponent sacrifices a creature.\n• Target opponent discards two cards.\n• Target opponent loses 5 life. From 2b480735ed2739bdeaf84b9a34dd2a5a7f8ed33e Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 16 Sep 2020 08:12:04 -0400 Subject: [PATCH 2/5] Gainlands AI hint --- forge-gui/res/cardsfolder/a/akoum_refuge.txt | 4 ++-- forge-gui/res/cardsfolder/b/bloodfell_caves.txt | 4 ++-- forge-gui/res/cardsfolder/b/blossoming_sands.txt | 4 ++-- forge-gui/res/cardsfolder/d/dismal_backwater.txt | 4 ++-- forge-gui/res/cardsfolder/g/graypelt_refuge.txt | 4 ++-- forge-gui/res/cardsfolder/j/jungle_hollow.txt | 4 ++-- forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt | 4 ++-- forge-gui/res/cardsfolder/k/kazandu_refuge.txt | 4 ++-- forge-gui/res/cardsfolder/r/rugged_highlands.txt | 4 ++-- forge-gui/res/cardsfolder/s/scoured_barrens.txt | 4 ++-- forge-gui/res/cardsfolder/s/sejiri_refuge.txt | 2 +- forge-gui/res/cardsfolder/s/swiftwater_cliffs.txt | 4 ++-- forge-gui/res/cardsfolder/t/thornwood_falls.txt | 4 ++-- forge-gui/res/cardsfolder/t/tranquil_cove.txt | 4 ++-- forge-gui/res/cardsfolder/w/wind_scarred_crag.txt | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/forge-gui/res/cardsfolder/a/akoum_refuge.txt b/forge-gui/res/cardsfolder/a/akoum_refuge.txt index f747544b42c..5b9cf211bf1 100644 --- a/forge-gui/res/cardsfolder/a/akoum_refuge.txt +++ b/forge-gui/res/cardsfolder/a/akoum_refuge.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum_refuge.jpg +DeckHas:Ability$LifeGain Oracle:Akoum Refuge enters the battlefield tapped.\nWhen Akoum Refuge enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R}. diff --git a/forge-gui/res/cardsfolder/b/bloodfell_caves.txt b/forge-gui/res/cardsfolder/b/bloodfell_caves.txt index 179fb629a24..fa236f09d2c 100644 --- a/forge-gui/res/cardsfolder/b/bloodfell_caves.txt +++ b/forge-gui/res/cardsfolder/b/bloodfell_caves.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodfell_caves.jpg +DeckHas:Ability$LifeGain Oracle:Bloodfell Caves enters the battlefield tapped.\nWhen Bloodfell Caves enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R}. diff --git a/forge-gui/res/cardsfolder/b/blossoming_sands.txt b/forge-gui/res/cardsfolder/b/blossoming_sands.txt index 6ec5fc73b93..cd3fa4936d6 100644 --- a/forge-gui/res/cardsfolder/b/blossoming_sands.txt +++ b/forge-gui/res/cardsfolder/b/blossoming_sands.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/blossoming_sands.jpg +DeckHas:Ability$LifeGain Oracle:Blossoming Sands enters the battlefield tapped.\nWhen Blossoming Sands enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W}. diff --git a/forge-gui/res/cardsfolder/d/dismal_backwater.txt b/forge-gui/res/cardsfolder/d/dismal_backwater.txt index a500b6b02c1..6d8c64f3f7e 100644 --- a/forge-gui/res/cardsfolder/d/dismal_backwater.txt +++ b/forge-gui/res/cardsfolder/d/dismal_backwater.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/dismal_backwater.jpg +DeckHas:Ability$LifeGain Oracle:Dismal Backwater enters the battlefield tapped.\nWhen Dismal Backwater enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B}. diff --git a/forge-gui/res/cardsfolder/g/graypelt_refuge.txt b/forge-gui/res/cardsfolder/g/graypelt_refuge.txt index 9fe9fe46498..19039822797 100644 --- a/forge-gui/res/cardsfolder/g/graypelt_refuge.txt +++ b/forge-gui/res/cardsfolder/g/graypelt_refuge.txt @@ -5,6 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. K:CARDNAME enters the battlefield tapped. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 -SVar:Picture:http://www.wizards.com/global/images/magic/general/graypelt_refuge.jpg +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 +DeckHas:Ability$LifeGain Oracle:Graypelt Refuge enters the battlefield tapped.\nWhen Graypelt Refuge enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W}. diff --git a/forge-gui/res/cardsfolder/j/jungle_hollow.txt b/forge-gui/res/cardsfolder/j/jungle_hollow.txt index 206b30d14b7..9b2209c8ac4 100644 --- a/forge-gui/res/cardsfolder/j/jungle_hollow.txt +++ b/forge-gui/res/cardsfolder/j/jungle_hollow.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_hollow.jpg +DeckHas:Ability$LifeGain Oracle:Jungle Hollow enters the battlefield tapped.\nWhen Jungle Hollow enters the battlefield, you gain 1 life.\n{T}: Add {B} or {G}. diff --git a/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt b/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt index 95282524ea9..50bd8e20c80 100644 --- a/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt +++ b/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt @@ -5,6 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. K:CARDNAME enters the battlefield tapped. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 -SVar:Picture:http://www.wizards.com/global/images/magic/general/jwar_isle_refuge.jpg +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 +DeckHas:Ability$LifeGain Oracle:Jwar Isle Refuge enters the battlefield tapped.\nWhen Jwar Isle Refuge enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B}. diff --git a/forge-gui/res/cardsfolder/k/kazandu_refuge.txt b/forge-gui/res/cardsfolder/k/kazandu_refuge.txt index 3ff2d2e17ca..f32472e5b7a 100644 --- a/forge-gui/res/cardsfolder/k/kazandu_refuge.txt +++ b/forge-gui/res/cardsfolder/k/kazandu_refuge.txt @@ -5,6 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. K:CARDNAME enters the battlefield tapped. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 -SVar:Picture:http://www.wizards.com/global/images/magic/general/kazandu_refuge.jpg +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 +DeckHas:Ability$LifeGain Oracle:Kazandu Refuge enters the battlefield tapped.\nWhen Kazandu Refuge enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G}. diff --git a/forge-gui/res/cardsfolder/r/rugged_highlands.txt b/forge-gui/res/cardsfolder/r/rugged_highlands.txt index 796e361355e..231a036bace 100644 --- a/forge-gui/res/cardsfolder/r/rugged_highlands.txt +++ b/forge-gui/res/cardsfolder/r/rugged_highlands.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/rugged_highlands.jpg +DeckHas:Ability$LifeGain Oracle:Rugged Highlands enters the battlefield tapped.\nWhen Rugged Highlands enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G}. diff --git a/forge-gui/res/cardsfolder/s/scoured_barrens.txt b/forge-gui/res/cardsfolder/s/scoured_barrens.txt index edd6e9c3961..5c435645156 100644 --- a/forge-gui/res/cardsfolder/s/scoured_barrens.txt +++ b/forge-gui/res/cardsfolder/s/scoured_barrens.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/scoured_barrens.jpg +DeckHas:Ability$LifeGain Oracle:Scoured Barrens enters the battlefield tapped.\nWhen Scoured Barrens enters the battlefield, you gain 1 life.\n{T}: Add {W} or {B}. diff --git a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt index 80fff086dd1..069dae1e38b 100644 --- a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt +++ b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt @@ -6,5 +6,5 @@ A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. K:CARDNAME enters the battlefield tapped. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 -SVar:Picture:http://www.wizards.com/global/images/magic/general/sejiri_refuge.jpg +DeckHas:Ability$LifeGain Oracle:Sejiri Refuge enters the battlefield tapped.\nWhen Sejiri Refuge enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U}. diff --git a/forge-gui/res/cardsfolder/s/swiftwater_cliffs.txt b/forge-gui/res/cardsfolder/s/swiftwater_cliffs.txt index 50153f7eb20..c7f7f4a1883 100644 --- a/forge-gui/res/cardsfolder/s/swiftwater_cliffs.txt +++ b/forge-gui/res/cardsfolder/s/swiftwater_cliffs.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/swiftwater_cliffs.jpg +DeckHas:Ability$LifeGain Oracle:Swiftwater Cliffs enters the battlefield tapped.\nWhen Swiftwater Cliffs enters the battlefield, you gain 1 life.\n{T}: Add {U} or {R}. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/t/thornwood_falls.txt b/forge-gui/res/cardsfolder/t/thornwood_falls.txt index c3d99e1e7a5..fbf13004ae6 100644 --- a/forge-gui/res/cardsfolder/t/thornwood_falls.txt +++ b/forge-gui/res/cardsfolder/t/thornwood_falls.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/thornwood_falls.jpg +DeckHas:Ability$LifeGain Oracle:Thornwood Falls enters the battlefield tapped.\nWhen Thornwood Falls enters the battlefield, you gain 1 life.\n{T}: Add {G} or {U}. diff --git a/forge-gui/res/cardsfolder/t/tranquil_cove.txt b/forge-gui/res/cardsfolder/t/tranquil_cove.txt index 060ea72195e..64879213c88 100644 --- a/forge-gui/res/cardsfolder/t/tranquil_cove.txt +++ b/forge-gui/res/cardsfolder/t/tranquil_cove.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/tranquil_cove.jpg +DeckHas:Ability$LifeGain Oracle:Tranquil Cove enters the battlefield tapped.\nWhen Tranquil Cove enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U}. diff --git a/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt b/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt index 7eeb3e6f006..d26480fedf7 100644 --- a/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt +++ b/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt @@ -4,7 +4,7 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life. -SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1 +SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 K:CARDNAME enters the battlefield tapped. -SVar:Picture:http://www.wizards.com/global/images/magic/general/wind_scarred_crag.jpg +DeckHas:Ability$LifeGain Oracle:Wind-Scarred Crag enters the battlefield tapped.\nWhen Wind-Scarred Crag enters the battlefield, you gain 1 life.\n{T}: Add {R} or {W}. From ab778ab188371c6d5d7c3eb147bfdf956c693561 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 16 Sep 2020 08:55:19 -0400 Subject: [PATCH 3/5] fix Upto popup from DrawEffect.java --- .../src/main/java/forge/game/ability/effects/DrawEffect.java | 2 +- forge-gui/res/languages/de-DE.properties | 2 +- forge-gui/res/languages/en-US.properties | 2 +- forge-gui/res/languages/es-ES.properties | 2 +- forge-gui/res/languages/it-IT.properties | 2 +- forge-gui/res/languages/zh-CN.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java index e68dbd5ca75..f5d918af8c2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java @@ -55,7 +55,7 @@ public class DrawEffect extends SpellAbilityEffect { int actualNum = numCards; if (upto) { - actualNum = p.getController().chooseNumber(sa, "lblHowMayCardDoYouWantDraw", 0, numCards); + actualNum = p.getController().chooseNumber(sa, Localizer.getInstance().getMessage("lblHowManyCardDoYouWantDraw"),0, numCards); } final CardCollectionView drawn = p.drawCards(actualNum, sa); diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index a5b1be57c39..f7ef60e3d03 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=Möchtest du {0} zufällige Karte(n) abwe lblPlayerHasChosenCardsFrom={0} hat Karte(n) gewählt von #DrawEffect.java lblDoYouWantDrawCards=Möchtest du {0} ziehen? -lblHowMayCardDoYouWantDraw=Wie viele Karten möchtest du ziehen? +lblHowManyCardDoYouWantDraw=Wie viele Karten möchtest du ziehen? #EncodeEffect.java lblDoYouWantExileCardAndEncodeOntoYouCreature=Möchtest du {0} ins Exil schicken und auf eine deiner Kreaturen codieren? lblChooseACreatureYouControlToEncode=Wähle eine Kreatur unter deiner Kontrolle zum Codieren diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index b405d29f7df..7c1cc2d7adc 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard {0} random card lblPlayerHasChosenCardsFrom={0} has chosen card(s) from #DrawEffect.java lblDoYouWantDrawCards=Do you want to draw {0}? -lblHowMayCardDoYouWantDraw=How may cards do you want to draw? +lblHowManyCardDoYouWantDraw=How many cards do you want to draw? #EncodeEffect.java lblDoYouWantExileCardAndEncodeOntoYouCreature=Do you want to exile {0} and encode it onto a creature you control? lblChooseACreatureYouControlToEncode=Choose a creature you control to encode diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 11f919424d2..804e036e11d 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=¿Te gustaría descartar {0} carta(s) ale lblPlayerHasChosenCardsFrom={0} ha elegido una o varias cartas de #DrawEffect.java lblDoYouWantDrawCards=¿Quieres robar {0}? -lblHowMayCardDoYouWantDraw=¿Cuántas cartas quieres robar? +lblHowManyCardDoYouWantDraw=¿Cuántas cartas quieres robar? #EncodeEffect.java lblDoYouWantExileCardAndEncodeOntoYouCreature=¿Quieres exiliar a {0} y codificarlo en una criatura que controlas? lblChooseACreatureYouControlToEncode=Elige una criatura que controlas para codificar diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index a3066f8ff18..a184ec1e714 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard {0} random card lblPlayerHasChosenCardsFrom={0} has chosen card(s) from #DrawEffect.java lblDoYouWantDrawCards=Do you want to draw {0}? -lblHowMayCardDoYouWantDraw=How may cards do you want to draw? +lblHowManyCardDoYouWantDraw=How may cards do you want to draw? #EncodeEffect.java lblDoYouWantExileCardAndEncodeOntoYouCreature=Do you want to exile {0} and encode it onto a creature you control? lblChooseACreatureYouControlToEncode=Choose a creature you control to encode diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 204f94d6a42..1e4e6252a5f 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=你想随机弃掉%d张牌吗？ lblPlayerHasChosenCardsFrom={0}选择了牌自 #DrawEffect.java lblDoYouWantDrawCards=你想抓{0}张牌吗？ -lblHowMayCardDoYouWantDraw=你想怎么抓牌？ +lblHowManyCardDoYouWantDraw=你想怎么抓牌？ #EncodeEffect.java lblDoYouWantExileCardAndEncodeOntoYouCreature=你想放逐{0}并将之赋码到你控制的生物吗？ lblChooseACreatureYouControlToEncode=选择你控制的生物进场赋码 From e23906ce81862f290700285427c8ba24aa259705 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 16 Sep 2020 09:00:02 -0400 Subject: [PATCH 4/5] crackling_doom.txt simultaneous sac/UI --- forge-gui/res/cardsfolder/c/crackling_doom.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-gui/res/cardsfolder/c/crackling_doom.txt b/forge-gui/res/cardsfolder/c/crackling_doom.txt index 5853c8446d3..c1e59339a9b 100644 --- a/forge-gui/res/cardsfolder/c/crackling_doom.txt +++ b/forge-gui/res/cardsfolder/c/crackling_doom.txt @@ -2,8 +2,8 @@ Name:Crackling Doom ManaCost:R W B Types:Instant A:SP$ DealDamage | Cost$ R B W | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ OpponentHasCreatures | SubAbility$ DBRepeat | SpellDescription$ CARDNAME deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures they control. -SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard -SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | Mandatory$ True | SubAbility$ DBSac -SVar:DBSac:DB$ Sacrifice | Defined$ Player.IsRemembered | SacValid$ Card.ChosenCard | SacMessage$ the creature with the highest power -SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_doom.jpg +SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard | SubAbility$ DBSac +SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | ChoiceTitle$ Choose a creature you control with the greatest power | Mandatory$ True | RememberChosen$ True +SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup | StackDescription$ Each opponent sacrifices a creature with the greatest power among creatures they control. +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True Oracle:Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures they control. From 239b1390ea2146cb05c3c7fcfb56f153b06fc52e Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 16 Sep 2020 09:07:54 -0400 Subject: [PATCH 5/5] diminishing_returns.txt add Upto, fix StackDescriptions --- forge-gui/res/cardsfolder/d/diminishing_returns.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/d/diminishing_returns.txt b/forge-gui/res/cardsfolder/d/diminishing_returns.txt index 82b939a6bcd..63ba60d8d72 100644 --- a/forge-gui/res/cardsfolder/d/diminishing_returns.txt +++ b/forge-gui/res/cardsfolder/d/diminishing_returns.txt @@ -2,7 +2,7 @@ Name:Diminishing Returns ManaCost:2 U U Types:Sorcery A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard,Hand | Destination$ Library | Shuffle$ True | Random$ True | SubAbility$ DBExile | UseAllOriginZones$ True | SpellDescription$ Each player shuffles their hand and graveyard into their library. -SVar:DBExile:DB$ Dig | Defined$ You | DigNum$ 10 | ChangeNum$ All | DestinationZone$ Exile | SubAbility$ DBDraw | SpellDescription$ You exile the top ten cards of your library. -SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 7 | SpellDescription$ Then each player draws up to seven cards. +SVar:DBExile:DB$ Dig | Defined$ You | DigNum$ 10 | ChangeNum$ All | DestinationZone$ Exile | SubAbility$ DBDraw | StackDescription$ {p:You} exiles the top ten cards of their library. | SpellDescription$ You exile the top ten cards of your library. +SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 7 | Upto$ True | AILogic$ OptionalDraw | StackDescription$ SpellDescription | SpellDescription$ Then each player draws up to seven cards. AI:RemoveDeck:All Oracle:Each player shuffles their hand and graveyard into their library. You exile the top ten cards of your library. Then each player draws up to seven cards.