From b5e278e8ed4c2da6f41d2d69e2e7b392516ae9d4 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 17 Nov 2022 10:37:02 -0500 Subject: [PATCH] remove ChooseEntityEffect.java --- .../main/java/forge/game/ability/ApiType.java | 1 - .../ability/effects/ChooseEntityEffect.java | 61 ------------------- .../ability/effects/DamageDealEffect.java | 32 ++++++++++ .../ability/effects/DamagePreventEffect.java | 23 +++++++ forge-gui/res/cardsfolder/f/faerie_dragon.txt | 6 +- .../upcoming/comet_stellar_pup.txt | 3 +- forge-gui/res/cardsfolder/w/whimsy.txt | 6 +- forge-gui/res/languages/de-DE.properties | 3 +- forge-gui/res/languages/en-US.properties | 3 +- forge-gui/res/languages/es-ES.properties | 3 +- forge-gui/res/languages/fr-FR.properties | 3 +- forge-gui/res/languages/it-IT.properties | 3 +- forge-gui/res/languages/ja-JP.properties | 3 +- forge-gui/res/languages/pt-BR.properties | 3 +- forge-gui/res/languages/zh-CN.properties | 3 +- 15 files changed, 68 insertions(+), 88 deletions(-) delete mode 100644 forge-game/src/main/java/forge/game/ability/effects/ChooseEntityEffect.java diff --git a/forge-game/src/main/java/forge/game/ability/ApiType.java b/forge-game/src/main/java/forge/game/ability/ApiType.java index 1d1e13a525b..e19938646fb 100644 --- a/forge-game/src/main/java/forge/game/ability/ApiType.java +++ b/forge-game/src/main/java/forge/game/ability/ApiType.java @@ -41,7 +41,6 @@ public enum ApiType { ChooseCard (ChooseCardEffect.class), ChooseColor (ChooseColorEffect.class), ChooseDirection (ChooseDirectionEffect.class), - ChooseEntity (ChooseEntityEffect.class), ChooseEvenOdd (ChooseEvenOddEffect.class), ChooseNumber (ChooseNumberEffect.class), ChoosePlayer (ChoosePlayerEffect.class), diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseEntityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseEntityEffect.java deleted file mode 100644 index b626627eb02..00000000000 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseEntityEffect.java +++ /dev/null @@ -1,61 +0,0 @@ -package forge.game.ability.effects; - -import forge.game.Game; -import forge.game.GameEntity; -import forge.game.ability.AbilityUtils; -import forge.game.ability.SpellAbilityEffect; -import forge.game.card.Card; -import forge.game.card.CardLists; -import forge.game.player.Player; -import forge.game.spellability.SpellAbility; -import forge.game.zone.ZoneType; -import forge.util.Aggregates; -import forge.util.Localizer; -import forge.util.collect.FCollection; - -public class ChooseEntityEffect extends SpellAbilityEffect { - @Override - protected String getStackDescription(SpellAbility sa) { - return sa.hasParam("StackDescription") ? sa.getParam("StackDescription") : - sa.getParamOrDefault("SpellDescription", "Write a Stack/SpellDescription!"); - } - - @Override - public void resolve(SpellAbility sa) { - final Card host = sa.getHostCard(); - final Player activator = sa.getActivatingPlayer(); - final Game game = activator.getGame(); - - FCollection choices = new FCollection<>(); - if (sa.hasParam("CardChoices")) { - choices.addAll(CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), sa.getParam("CardChoices"), - activator, host, sa)); - } - if (sa.hasParam("PlayerChoices")) { - choices.addAll(AbilityUtils.getDefinedPlayers(host, sa.getParam("PlayerChoices"), sa)); - } - - FCollection chosen = new FCollection<>(); - int n = sa.hasParam("ChoiceAmount") ? AbilityUtils.calculateAmount(host, sa.getParam("ChoiceAmount"), sa) : 1; - if (sa.hasParam("Random")) { - for (int i = 0; i < n; i++) { - chosen.add(Aggregates.random(choices)); - choices.remove(chosen); - } else { - final String prompt = sa.hasParam("ChoicePrompt") ? sa.getParam("ChoicePrompt") : - Localizer.getInstance().getMessage("lblChooseEntity"); - chosen.addAll(activator.getController().chooseEntitiesForEffect(choices, n, n, null, sa, prompt, - null, null)); - } - if (chosen == null) { - System.err.println("Error: ChooseEntityEffect.java unable to choose an entity"); - return; - } - - if (sa.hasParam("RememberChosen")) { - for (GameEntity ge : chosen) { - host.addRemembered(ge); - } - } - } -} diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java index 5f303703298..8fcab5a2d64 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java @@ -17,13 +17,17 @@ import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardCollection; import forge.game.card.CardDamageMap; +import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.keyword.Keyword; import forge.game.player.Player; import forge.game.replacement.ReplacementType; import forge.game.spellability.SpellAbility; +import forge.game.zone.ZoneType; +import forge.util.Aggregates; import forge.util.Lang; import forge.util.Localizer; +import forge.util.collect.FCollection; public class DamageDealEffect extends DamageBaseEffect { @@ -154,6 +158,34 @@ public class DamageDealEffect extends DamageBaseEffect { final boolean divideOnResolution = sa.hasParam("DividerOnResolution"); List tgts = getTargets(sa); + if (sa.hasParam("CardChoices") || sa.hasParam("PlayerChoices")) { // choosing outside Defined/Targeted + final Player activator = sa.getActivatingPlayer(); + FCollection choices = new FCollection<>(); + if (sa.hasParam("CardChoices")) { + choices.addAll(CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), + sa.getParam("CardChoices"), activator, hostCard, sa)); + } + if (sa.hasParam("PlayerChoices")) { + choices.addAll(AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("PlayerChoices"), sa)); + } + + int n = sa.hasParam("ChoiceAmount") ? + AbilityUtils.calculateAmount(hostCard, sa.getParam("ChoiceAmount"), sa) : 1; + if (sa.hasParam("Random")) { // only for Whimsy and Faerie Dragon + for (int i = 0; i < n; i++) { + GameObject random = Aggregates.random(choices); + tgts.add(random); + choices.remove(random); + hostCard.addRemembered(random); // remember random choices for log + } + } else { // only for Comet, Stellar Pup + final String prompt = sa.hasParam("ChoicePrompt") ? sa.getParam("ChoicePrompt") : + Localizer.getInstance().getMessage("lblChooseEntityDmg"); + tgts.addAll(sa.getActivatingPlayer().getController().chooseEntitiesForEffect(choices, n, n, null, sa, + prompt, null, null)); + } + } + if (sa.hasParam("OptionalDecider")) { Player decider = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("OptionalDecider"), sa), null); if (decider != null && !decider.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantDealTargetDamageToTarget", String.valueOf(dmg), tgts.toString()), null)) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java index 4970b73264f..b84d1e582af 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java @@ -2,13 +2,19 @@ package forge.game.ability.effects; import java.util.List; +import forge.game.GameEntity; import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardCollection; +import forge.game.card.CardLists; import forge.game.card.CardUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.game.zone.ZoneType; +import forge.util.Aggregates; +import forge.util.Localizer; +import forge.util.collect.FCollection; public class DamagePreventEffect extends DamagePreventEffectBase { @@ -66,6 +72,23 @@ public class DamagePreventEffect extends DamagePreventEffectBase { int numDam = AbilityUtils.calculateAmount(host, sa.getParam("Amount"), sa); final List tgts = getTargets(sa); + if (sa.hasParam("CardChoices") || sa.hasParam("PlayerChoices")) { // choosing outside Defined/Targeted + // only for Whimsy, for more robust version see DamageDealEffect + FCollection choices = new FCollection<>(); + if (sa.hasParam("CardChoices")) { + choices.addAll(CardLists.getValidCards(host.getGame().getCardsIn(ZoneType.Battlefield), + sa.getParam("CardChoices"), sa.getActivatingPlayer(), host, sa)); + } + if (sa.hasParam("PlayerChoices")) { + choices.addAll(AbilityUtils.getDefinedPlayers(host, sa.getParam("PlayerChoices"), sa)); + } + if (sa.hasParam("Random")) { + GameObject random = Aggregates.random(choices); + tgts.add(random); + host.addRemembered(random); // remember random choices for log + } + } + final CardCollection untargetedCards = CardUtil.getRadiance(sa); final boolean targeted = sa.usesTargeting(); diff --git a/forge-gui/res/cardsfolder/f/faerie_dragon.txt b/forge-gui/res/cardsfolder/f/faerie_dragon.txt index bc6a8366519..bd249607b8a 100644 --- a/forge-gui/res/cardsfolder/f/faerie_dragon.txt +++ b/forge-gui/res/cardsfolder/f/faerie_dragon.txt @@ -22,8 +22,7 @@ SVar:White:DB$ ChooseCard | Choices$ Permanent | IncludeSpellsOnStack$ True | At SVar:DBAnimateW:DB$ Animate | Defined$ ChosenCard | Colors$ White | OverwriteColors$ True | Duration$ Permanent | LockInText$ True | SubAbility$ DBCleanup SVar:Red:DB$ ChooseCard | Choices$ Permanent | IncludeSpellsOnStack$ True | AtRandom$ True | LockInText$ True | SubAbility$ DBAnimateR | SpellDescription$ A spell or permanent chosen at random becomes red. (Mana symbols on that permanent remain unchanged.) SVar:DBAnimateR:DB$ Animate | Defined$ ChosenCard | Colors$ Red | OverwriteColors$ True | Duration$ Permanent | LockInText$ True | SubAbility$ DBCleanup -SVar:Damage3:DB$ ChooseEntity | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberChosen$ True | SubAbility$ DBDamage3 | SpellDescription$ CARDNAME deals 3 damage to a creature or player chosen at random. -SVar:DBDamage3:DB$ DealDamage | Defined$ Remembered | NumDmg$ 3 | SubAbility$ DBCleanup +SVar:Damage3:DB$ DealDamage | NumDmg$ 3 | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberRandomChoice$ True | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 3 damage to a creature or player chosen at random. SVar:Flying:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump8 | SpellDescription$ A creature chosen at random gains flying until end of turn. SVar:DBPump8:DB$ Pump | Defined$ ChosenCard | KW$ Flying | SubAbility$ DBCleanup SVar:P3P3:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump9 | SpellDescription$ A creature chosen at random gets +3/+3 until end of turn. @@ -43,8 +42,7 @@ SVar:M2M0:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPu SVar:DBPump15:DB$ Pump | Defined$ ChosenCard | NumAtt$ -2 | SubAbility$ DBCleanup SVar:ToHand:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBChangeZone16 | SpellDescription$ Return a creature chosen at random to its owner's hand. SVar:DBChangeZone16:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBCleanup -SVar:Damage1:DB$ ChooseEntity | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberChosen$ True | SubAbility$ DBDamage1 | SpellDescription$ CARDNAME deals 1 damage to a creature or player chosen at random. -SVar:DBDamage1:DB$ DealDamage | Defined$ Remembered | NumDmg$ 1 | SubAbility$ DBCleanup +SVar:Damage1:DB$ DealDamage | NumDmg$ 1 | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberRandomChoice$ True | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 1 damage to a creature or player chosen at random. SVar:Nerf:DB$ ChooseCard | Choices$ Creature.Other | AtRandom$ True | SubAbility$ DBAnimate18 | SpellDescription$ A creature other than CARDNAME chosen at random becomes 0/2 until end of turn. SVar:DBAnimate18:DB$ Animate | Defined$ ChosenCard | Power$ 0 | Toughness$ 2 | SubAbility$ DBCleanup SVar:Exile:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBChangeZone19 | SpellDescription$ Exile a creature chosen at random. Its controller gains life equal to its power. diff --git a/forge-gui/res/cardsfolder/upcoming/comet_stellar_pup.txt b/forge-gui/res/cardsfolder/upcoming/comet_stellar_pup.txt index 532e612f816..244f604b678 100644 --- a/forge-gui/res/cardsfolder/upcoming/comet_stellar_pup.txt +++ b/forge-gui/res/cardsfolder/upcoming/comet_stellar_pup.txt @@ -7,8 +7,7 @@ SVar:Token:DB$ PutCounter | CounterType$ LOYALTY | CounterNum$ 2 | SubAbility$ D SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_1_1_squirrel | PumpKeywords$ Haste | PumpDuration$ EOT SVar:Unearth:DB$ RemoveCounter | CounterType$ LOYALTY | CounterNum$ 1 | SubAbility$ DBChangeZone | SpellDescription$ 3 – [-1], then return a card with mana value 2 or less from your graveyard to your hand. SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | ChangeType$ Card.YouOwn+cmcLE2 | ChangeDescription$ Choose a card with mana value 2 or less | Hidden$ True -SVar:Damage:DB$ ChooseEntity | CardChoices$ Creature | PlayerChoices$ Player | RememberChosen$ True | SubAbility$ DBDamage | SpellDescription$ 4 or 5 – CARDNAME deals damage equal to the number of loyalty counters on him to a creature or player, then [-2]. -SVar:DBDamage:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | SubAbility$ DBRemoveCounters +SVar:Damage:DB$ DealDamage | NumDmg$ X | CardChoices$ Creature | PlayerChoices$ Player | SubAbility$ DBRemoveCounters | SpellDescription$ 4 or 5 – CARDNAME deals damage equal to the number of loyalty counters on him to a creature or player, then [-2]. SVar:X:Count$CardCounters.LOYALTY SVar:DBRemoveCounters:DB$ RemoveCounter | CounterType$ LOYALTY | CounterNum$ 2 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/forge-gui/res/cardsfolder/w/whimsy.txt b/forge-gui/res/cardsfolder/w/whimsy.txt index 175a4822260..4e5a0d51294 100644 --- a/forge-gui/res/cardsfolder/w/whimsy.txt +++ b/forge-gui/res/cardsfolder/w/whimsy.txt @@ -9,8 +9,7 @@ SVar:Untap:DB$ ChooseCard | Choices$ Artifact.tapped,Creature.tapped,Land.tapped SVar:DBUntap4:DB$ Untap | Defined$ ChosenCard | SubAbility$ DBCleanup SVar:Tap:DB$ ChooseCard | Choices$ Artifact.untapped,Creature.untapped,Land.untapped | AtRandom$ True | SubAbility$ DBTap5 | SpellDescription$ Tap an artifact, creature or land chosen at random. SVar:DBTap5:DB$ Tap | Defined$ ChosenCard | SubAbility$ DBCleanup -SVar:Damage:DB$ ChooseEntity | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberChosen$ True | SubAbility$ DBDamage6 | SpellDescription$ CARDNAME deals 4 damage to a creature or player chosen at random. -SVar:DBDamage6:DB$ DealDamage | Defined$ Remembered | NumDmg$ 4 | SubAbility$ DBCleanup +SVar:Damage:DB$ DealDamage | NumDmg$ 4 | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | SubAbility$ DBCleanup | SpellDescription$ CARDNAME deals 4 damage to a creature or player chosen at random. SVar:Draw3:DB$ ChoosePlayer | Choices$ Player | Random$ True | SubAbility$ DBDraw7 | SpellDescription$ A player chosen at random draws three cards. SVar:DBDraw7:DB$ Draw | NumCards$ 3 | Defined$ ChosenPlayer | SubAbility$ DBCleanup SVar:DestroyGain:DB$ ChooseCard | Choices$ Artifact | AtRandom$ True | SubAbility$ DBDestroy8 | SpellDescription$ Destroy an artifact chosen at random. It can't be regenerated. That artifact's controller gains life equal to its converted mana cost. @@ -21,8 +20,7 @@ SVar:DestroyAE:DB$ ChooseCard | Choices$ Artifact,Enchantment | AtRandom$ True | SVar:DBDestroy9:DB$ Destroy | Defined$ ChosenCard | SubAbility$ DBCleanup SVar:Gain3:DB$ ChoosePlayer | Choices$ Player | Random$ True | SubAbility$ DBGainLife10 | SpellDescription$ A player chosen at random gains 3 life. SVar:DBGainLife10:DB$ GainLife | Defined$ ChosenPlayer | LifeAmount$ 3 | SubAbility$ DBCleanup -SVar:Anoint:DB$ ChooseEntity | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | RememberChosen$ True | SubAbility$ DBPreventDamage11 | SpellDescription$ Prevent the next 3 damage that would be dealt to a creature or player chosen at random this turn. -SVar:DBPreventDamage11:DB$ PreventDamage | Defined$ Remembered | Amount$ 3 | SubAbility$ DBCleanup +SVar:Anoint:DB$ PreventDamage | Random$ True | CardChoices$ Creature | PlayerChoices$ Player | Amount$ 3 | SubAbility$ DBCleanup | SpellDescription$ Prevent the next 3 damage that would be dealt to a creature or player chosen at random this turn. SVar:DestroyCL:DB$ ChooseCard | Choices$ Creature,Land | AtRandom$ True | SubAbility$ DBDestroy12 | SpellDescription$ Destroy a creature or land chosen at random. It can't be regenerated. SVar:DBDestroy12:DB$ Destroy | Defined$ ChosenCard | NoRegen$ True | SubAbility$ DBCleanup SVar:Mill2:DB$ ChoosePlayer | Choices$ Player | Random$ True | SubAbility$ DBMill13 | SpellDescription$ A player chosen at random mills two cards. diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index ae692e0253f..8eaf0cdf173 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1876,8 +1876,6 @@ lblChooseSpecifiedRangeColors=Wähle {0} bis {1} Farbe(n) lblLeftClockwise=Links (Uhrzeigersinn) lblRightAntiClockwise=Rechts (gegen die Uhr) lblChooseDirection=Wähle eine Richtung -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Wähle eines #ChooseNumberEffect.java @@ -1946,6 +1944,7 @@ lblChooseCardsToTakeTargetCounters=Nimm {0}-Marken von welcher Karte lblSelectRemoveCountersNumberOfTarget=Wähle die zu entfernende Anzahl %s-Marken lblSelectCountersTypeToRemove=Wähle Marken-Typ fürs Entfernen #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=Soll {1} {0} Schaden erleiden? #DigEffect.java lblChooser=Auswählender diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 3dd8c2fd28b..66fcc0e914c 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1877,8 +1877,6 @@ lblChooseSpecifiedRangeColors=Choose {0} to {1} color lblLeftClockwise=Left (clockwise) lblRightAntiClockwise=Right (anticlockwise) lblChooseDirection=Choose a direction -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Choose one #ChooseNumberEffect.java @@ -1947,6 +1945,7 @@ lblChooseCardsToTakeTargetCounters=Choose cards to take {0} counters from lblSelectRemoveCountersNumberOfTarget=Select the number of {0} counters to remove lblSelectCountersTypeToRemove=Select type of counters to remove #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=Do you want to deal {0} damage to {1}? #DigEffect.java lblChooser=Chooser diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index f5c5c31f374..a1a5df2fb83 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -1875,8 +1875,6 @@ lblChooseSpecifiedRangeColors=Elige entre {0} y {1} colores lblLeftClockwise=Izquierda (sentido horario) lblRightAntiClockwise=Derecha (sentido antihorario) lblChooseDirection=Elige una dirección -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Elige uno #ChooseNumberEffect.java @@ -1945,6 +1943,7 @@ lblChooseCardsToTakeTargetCounters=Elige las cartas de las que coger {0} contado lblSelectRemoveCountersNumberOfTarget=Selecciona el número de {0} contadores a eliminar lblSelectCountersTypeToRemove=Selecciona el tipo de contadores a eliminar #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=¿Quieres hacer {0} de daño a {1}? #DigEffect.java lblChooser=Elector diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index 3b53a9ee4fb..fdd8dbc3bd6 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -1878,8 +1878,6 @@ lblChooseSpecifiedRangeColors=Choisir {0} à {1} couleur lblLeftClockwise=Gauche (dans le sens des aiguilles d''une montre) lblRightAntiClockwise=Droite (sens inverse des aiguilles d''une montre) lblChooseDirection=Choisir une direction -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Choisissez-en un #ChooseNumberEffect.java @@ -1948,6 +1946,7 @@ lblChooseCardsToTakeTargetCounters=Choisissez des cartes pour prendre {0} marque lblSelectRemoveCountersNumberOfTarget=Sélectionnez le nombre de {0} marqueurs à supprimer lblSelectCountersTypeToRemove=Sélectionner le type de marqueurs à supprimer #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=Voulez-vous infliger {0} dégâts à {1} ? #DigEffect.java lblChooser=Sélecteur diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 914faae0fea..5230f87f331 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -1874,8 +1874,6 @@ lblChooseSpecifiedRangeColors=Scegli da {0} a {1} colori lblLeftClockwise=Sinistra (senso orario) lblRightAntiClockwise=Destra (senso antiorario) lblChooseDirection=Scegli una direzione -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Scegli uno #ChooseNumberEffect.java @@ -1944,6 +1942,7 @@ lblChooseCardsToTakeTargetCounters=Scegli le carte da cui prendere i segnalini { lblSelectRemoveCountersNumberOfTarget=Scegli il numero di segnalini {0} da rimuovere lblSelectCountersTypeToRemove=Scegli il tipo di segnalini da rimuovere #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=Vuoi infliggere {0} danno/i a {1}? #DigEffect.java lblChooser=Fai la tua scelta diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index 1bf2231b768..cf8a1c42230 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -1874,8 +1874,6 @@ lblChooseSpecifiedRangeColors=色 {0}～{1}色を選ぶ lblLeftClockwise=左（時計回り） lblRightAntiClockwise=右（反時計回り） lblChooseDirection=方向を選ぶ -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=以下から 1つを選ぶ #ChooseNumberEffect.java @@ -1944,6 +1942,7 @@ lblChooseCardsToTakeTargetCounters={0}カウンターを取り除くカードを lblSelectRemoveCountersNumberOfTarget=取り除く {0}カウンターの数を選ぶ lblSelectCountersTypeToRemove=取り除くカウンターの種類を選ぶ #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget={1}に {0}点のダメージを与えますか？ #DigEffect.java lblChooser=選択者 diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index 1eb32aacc79..7bfa690f3df 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -1936,8 +1936,6 @@ lblChooseSpecifiedRangeColors=Escolha {0} a {1} cor lblLeftClockwise=Esquerda (horário) lblRightAntiClockwise=Direita (anti-horário) lblChooseDirection=Escolha a direção -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=Escolha um #ChooseNumberEffect.java @@ -2006,6 +2004,7 @@ lblChooseCardsToTakeTargetCounters=Escolha as cartas para pegar {0} marcadores lblSelectRemoveCountersNumberOfTarget=Selecione o número de {0} marcadores para remover lblSelectCountersTypeToRemove=Selecione o tipo de marcadores para remover #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=Você quer dar {0} de dano em {1}? #DigEffect.java lblChooser=Seletor diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 0f0e2cfbab1..b701c5bdf86 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -1878,8 +1878,6 @@ lblChooseSpecifiedRangeColors=选择{0}到{1}种颜色 lblLeftClockwise=左（顺时针） lblRightAntiClockwise=右（逆时针） lblChooseDirection=选择一个方向 -#ChooseEntityEffect.java -lblChooseEntity=Choose entity #ChooseGenericEffect.java lblChooseOne=选择一个 #ChooseNumberEffect.java @@ -1948,6 +1946,7 @@ lblChooseCardsToTakeTargetCounters=选择牌要获得{0}指示物自 lblSelectRemoveCountersNumberOfTarget=选择要删除的{0}指示物的数量 lblSelectCountersTypeToRemove=选择要删除的指示物类型 #DamageDealEffect.java +lblChooseEntityDmg=Choose entity for damage lblDoyouWantDealTargetDamageToTarget=你想对{1}造成{0}伤害吗？ #DigEffect.java lblChooser=选择者