Merge branch 'variousfix' into 'master'

Various fixes

See merge request core-developers/forge!3142
This commit is contained in:
Sol
2020-09-16 13:23:30 +00:00
24 changed files with 43 additions and 44 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1812,7 +1812,7 @@ lblWouldYouLikeRandomDiscardTargetCard=你想随机弃掉%d张牌吗
lblPlayerHasChosenCardsFrom={0}选择了牌自
#DrawEffect.java
lblDoYouWantDrawCards=你想抓{0}张牌吗?
lblHowMayCardDoYouWantDraw=你想怎么抓牌?
lblHowManyCardDoYouWantDraw=你想怎么抓牌?
#EncodeEffect.java
lblDoYouWantExileCardAndEncodeOntoYouCreature=你想放逐{0}并将之赋码到你控制的生物吗?
lblChooseACreatureYouControlToEncode=选择你控制的生物进场赋码