External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Game: fixed random sort order of choices in choose dialogs

Browse source
This commit is contained in:
Oleg Agafonov 2023-03-21 03:11:55 +04:00
parent 6b05562336
commit a7480aeab1
40 changed files with 78 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/components/ext/dlg/DlgParams.java
View file

@ -3,13 +3,11 @@ package mage.client.components.ext.dlg;
import mage.client.cards.BigCard; import mage.client.cards.BigCard;
import mage.client.components.ext.MessageDialogType; import mage.client.components.ext.MessageDialogType;
import mage.client.game.FeedbackPanel; import mage.client.game.FeedbackPanel;
import mage.util.CardUtil;
import mage.view.CardsView; import mage.view.CardsView;
import java.awt.*; import java.awt.*;
import java.util.ArrayList; import java.util.*;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/** /**
* GUI: parameters for dialogs, uses to store useful data * GUI: parameters for dialogs, uses to store useful data
@ -39,7 +37,7 @@ public class DlgParams {
private boolean isAI = false; private boolean isAI = false;
private Set<String> manaChoices = new HashSet<>(); private Set<String> manaChoices = new LinkedHashSet<>();
public int getPlayerID() { public int getPlayerID() {
return playerID; return playerID;
@ -80,6 +78,7 @@ public class DlgParams {
} }
public void setManaChoices(Set<String> manaChoices) { public void setManaChoices(Set<String> manaChoices) {
CardUtil.checkSetParamForSerializationCompatibility(manaChoices);
this.manaChoices = manaChoices; this.manaChoices = manaChoices;
} }

2
Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java
View file

@ -56,7 +56,7 @@ public class PickChoiceDialog extends MageDialog {
cbSpecial.setToolTipText(choice.getSpecialHint()); cbSpecial.setToolTipText(choice.getSpecialHint());
// 2 modes: string or key-values // 2 modes: string or key-values
// sore data in allItems for inremental filtering // store data in allItems for inremental filtering
// http://logicbig.com/tutorials/core-java-tutorial/swing/list-filter/ // http://logicbig.com/tutorials/core-java-tutorial/swing/list-filter/
this.allItems.clear(); this.allItems.clear();
if (choice.isKeyChoice()) { if (choice.isKeyChoice()) {

8
Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java
View file

@ -1,10 +1,8 @@
package mage.cards.a; package mage.cards.a;
import java.util.HashSet; import java.util.*;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.common.BeginningOfCombatTriggeredAbility;
@ -72,7 +70,7 @@ class AngelicSkirmisherEffect extends OneShotEffect {
Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (controller != null && sourcePermanent != null) { if (controller != null && sourcePermanent != null) {
Choice abilityChoice = new ChoiceImpl(true); Choice abilityChoice = new ChoiceImpl(true);
Set<String> abilityChoices = new HashSet<>(3); Set<String> abilityChoices = new LinkedHashSet<>(3);
abilityChoice.setMessage("Choose ability for your creatures"); abilityChoice.setMessage("Choose ability for your creatures");
abilityChoices.add("First strike"); abilityChoices.add("First strike");
abilityChoices.add("Vigilance"); abilityChoices.add("Vigilance");

5
Mage.Sets/src/mage/cards/a/AnimationModule.java
View file

@ -2,6 +2,7 @@
package mage.cards.a; package mage.cards.a;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -125,7 +126,7 @@ class AnimationModuleEffect extends OneShotEffect {
} }
} else { } else {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(permanent.getCounters(game).size()); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : permanent.getCounters(game).values()) { for (Counter counter : permanent.getCounters(game).values()) {
choices.add(counter.getName()); choices.add(counter.getName());
} }
@ -155,7 +156,7 @@ class AnimationModuleEffect extends OneShotEffect {
} }
} else { } else {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(player.getCounters().size()); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : player.getCounters().values()) { for (Counter counter : player.getCounters().values()) {
choices.add(counter.getName()); choices.add(counter.getName());
} }

5
Mage.Sets/src/mage/cards/c/Clockspinning.java
View file

@ -20,6 +20,7 @@ import mage.target.common.TargetPermanentOrSuspendedCard;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -71,7 +72,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect {
String counterName = null; String counterName = null;
if (permanent.getCounters(game).size() > 1) { if (permanent.getCounters(game).size() > 1) {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(2); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : permanent.getCounters(game).values()) { for (Counter counter : permanent.getCounters(game).values()) {
if (permanent.getCounters(game).getCount(counter.getName()) > 0) { if (permanent.getCounters(game).getCount(counter.getName()) > 0) {
choices.add(counter.getName()); choices.add(counter.getName());
@ -103,7 +104,7 @@ class ClockspinningAddOrRemoveCounterEffect extends OneShotEffect {
String counterName = null; String counterName = null;
if (card.getCounters(game).size() > 1) { if (card.getCounters(game).size() > 1) {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : card.getCounters(game).values()) { for (Counter counter : card.getCounters(game).values()) {
if (card.getCounters(game).getCount(counter.getName()) > 0) { if (card.getCounters(game).getCount(counter.getName()) > 0) {
choices.add(counter.getName()); choices.add(counter.getName());

3
Mage.Sets/src/mage/cards/d/DwarvenArmorer.java
View file

@ -2,6 +2,7 @@
package mage.cards.d; package mage.cards.d;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -60,7 +61,7 @@ public final class DwarvenArmorer extends CardImpl {
class DwarvenArmorerEffect extends OneShotEffect { class DwarvenArmorerEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("+0/+1"); choices.add("+0/+1");

7
Mage.Sets/src/mage/cards/e/ElspethResplendent.java
View file

@ -20,10 +20,7 @@ import mage.target.TargetCard;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.HashSet; import java.util.*;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
/** /**
* @author TheElk801 * @author TheElk801
@ -61,7 +58,7 @@ public final class ElspethResplendent extends CardImpl {
class ElspethResplendentCounterEffect extends OneShotEffect { class ElspethResplendentCounterEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Flying"); choices.add("Flying");

8
Mage.Sets/src/mage/cards/f/Fatespinner.java
View file

@ -1,10 +1,8 @@
package mage.cards.f; package mage.cards.f;
import java.util.HashSet; import java.util.*;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -50,7 +48,7 @@ public final class Fatespinner extends CardImpl {
class FatespinnerChooseEffect extends OneShotEffect { class FatespinnerChooseEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Draw step"); choices.add("Draw step");

3
Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java
View file

@ -2,6 +2,7 @@
package mage.cards.f; package mage.cards.f;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -58,7 +59,7 @@ public final class FlowstoneSculpture extends CardImpl {
class FlowstoneSculptureEffect extends OneShotEffect { class FlowstoneSculptureEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("+1/+1 counter"); choices.add("+1/+1 counter");

2
Mage.Sets/src/mage/cards/g/GarthOneEye.java
View file

@ -96,7 +96,7 @@ class GarthOneEyeEffect extends OneShotEffect {
return false; return false;
} }
Set<String> alreadyChosen = getAlreadyChosen(game, source); Set<String> alreadyChosen = getAlreadyChosen(game, source);
Set<String> choices = new HashSet<>(names); Set<String> choices = new LinkedHashSet<>(names);
choices.removeAll(alreadyChosen); choices.removeAll(alreadyChosen);
String chosen; String chosen;
switch (choices.size()) { switch (choices.size()) {

3
Mage.Sets/src/mage/cards/g/GideonBlackblade.java
View file

@ -32,6 +32,7 @@ import mage.target.TargetPermanent;
import mage.target.common.TargetNonlandPermanent; import mage.target.common.TargetNonlandPermanent;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -111,7 +112,7 @@ class GideonBlackbladeToken extends TokenImpl {
} }
class GideonBlackbladeEffect extends OneShotEffect { class GideonBlackbladeEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Vigilance"); choices.add("Vigilance");

3
Mage.Sets/src/mage/cards/g/Grimdancer.java
View file

@ -18,6 +18,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -49,7 +50,7 @@ public final class Grimdancer extends CardImpl {
class GrimdancerEffect extends OneShotEffect { class GrimdancerEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Menace and deathtouch"); choices.add("Menace and deathtouch");

3
Mage.Sets/src/mage/cards/i/IchormoonGauntlet.java
View file

@ -23,6 +23,7 @@ import mage.players.Player;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -96,7 +97,7 @@ class IchormoonGauntletEffect extends OneShotEffect {
} }
} else { } else {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(permanent.getCounters(game).size()); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : permanent.getCounters(game).values()) { for (Counter counter : permanent.getCounters(game).values()) {
choices.add(counter.getName()); choices.add(counter.getName());
} }

2
Mage.Sets/src/mage/cards/i/InvokeTheAncients.java
View file

@ -43,7 +43,7 @@ public final class InvokeTheAncients extends CardImpl {
class InvokeTheAncientsEffect extends OneShotEffect { class InvokeTheAncientsEffect extends OneShotEffect {
private static final Token token = new SpiritGreenToken(); private static final Token token = new SpiritGreenToken();
private static final Set<String> choices = new HashSet<>(Arrays.asList( private static final Set<String> choices = new LinkedHashSet<>(Arrays.asList(
"Vigilance", "Reach", "Trample" "Vigilance", "Reach", "Trample"
)); ));

3
Mage.Sets/src/mage/cards/j/JodahsAvenger.java
View file

@ -2,6 +2,7 @@
package mage.cards.j; package mage.cards.j;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -53,7 +54,7 @@ public final class JodahsAvenger extends CardImpl {
class JodahsAvengerEffect extends ContinuousEffectImpl { class JodahsAvengerEffect extends ContinuousEffectImpl {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
private Ability gainedAbility; private Ability gainedAbility;
static { static {

3
Mage.Sets/src/mage/cards/l/LeechBonder.java
View file

@ -26,6 +26,7 @@ import mage.players.Player;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -100,7 +101,7 @@ class LeechBonderEffect extends OneShotEffect {
return false; return false;
} }
Set<String> possibleChoices = new HashSet<>(fromPermanent.getCounters(game).keySet()); Set<String> possibleChoices = new LinkedHashSet<>(fromPermanent.getCounters(game).keySet());
if (possibleChoices.size() == 0) { if (possibleChoices.size() == 0) {
return false; return false;
} }

3
Mage.Sets/src/mage/cards/l/LunarAvenger.java
View file

@ -2,6 +2,7 @@
package mage.cards.l; package mage.cards.l;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -58,7 +59,7 @@ public final class LunarAvenger extends CardImpl {
class LunarAvengerEffect extends OneShotEffect { class LunarAvengerEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Flying"); choices.add("Flying");

3
Mage.Sets/src/mage/cards/m/MaintenanceDroid.java
View file

@ -2,6 +2,7 @@
package mage.cards.m; package mage.cards.m;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -65,7 +66,7 @@ public final class MaintenanceDroid extends CardImpl {
class MaintenanceDroidEffect extends OneShotEffect { class MaintenanceDroidEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Remove a repair counter"); choices.add("Remove a repair counter");

3
Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java
View file

@ -2,6 +2,7 @@
package mage.cards.m; package mage.cards.m;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -79,7 +80,7 @@ class ChooseLetterEffect extends OneShotEffect {
ChoiceImpl choice = new ChoiceImpl(true); ChoiceImpl choice = new ChoiceImpl(true);
choice.setMessage("Choose letter"); choice.setMessage("Choose letter");
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (char letter = 'A'; letter <= 'Z'; letter++) { for (char letter = 'A'; letter <= 'Z'; letter++) {
choices.add(Character.toString(letter)); choices.add(Character.toString(letter));
} }

3
Mage.Sets/src/mage/cards/m/MultiformWonder.java
View file

@ -2,6 +2,7 @@
package mage.cards.m; package mage.cards.m;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -60,7 +61,7 @@ public final class MultiformWonder extends CardImpl {
class MultiformWonderEffect extends OneShotEffect { class MultiformWonderEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Flying"); choices.add("Flying");

3
Mage.Sets/src/mage/cards/n/NaturesBlessing.java
View file

@ -24,6 +24,7 @@ import mage.players.Player;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -54,7 +55,7 @@ public final class NaturesBlessing extends CardImpl {
class NaturesBlessingEffect extends OneShotEffect { class NaturesBlessingEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
private Ability gainedAbility; private Ability gainedAbility;
static { static {

7
Mage.Sets/src/mage/cards/n/NeganTheColdBlooded.java
View file

@ -20,10 +20,7 @@ import mage.players.Player;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
import java.util.HashSet; import java.util.*;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
/** /**
* @author TheElk801 * @author TheElk801
@ -93,7 +90,7 @@ class NeganTheColdBloodedEffect extends OneShotEffect {
if (!target.canChoose(source.getControllerId(), source, game)) { if (!target.canChoose(source.getControllerId(), source, game)) {
return false; return false;
} }
Set<UUID> choices = new HashSet<>(); Set<UUID> choices = new LinkedHashSet<>();
controller.choose(Outcome.DestroyPermanent, target, source, game); controller.choose(Outcome.DestroyPermanent, target, source, game);
UUID controllerChoice = target.getFirstTarget(); UUID controllerChoice = target.getFirstTarget();
choices.add(controllerChoice); choices.add(controllerChoice);

3
Mage.Sets/src/mage/cards/n/NestingGrounds.java
View file

@ -25,6 +25,7 @@ import mage.target.TargetPermanent;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -93,7 +94,7 @@ class NestingGroundsEffect extends OneShotEffect {
return false; return false;
} }
Set<String> possibleChoices = new HashSet<>(fromPermanent.getCounters(game).keySet()); Set<String> possibleChoices = new LinkedHashSet<>(fromPermanent.getCounters(game).keySet());
if (possibleChoices.size() == 0) { if (possibleChoices.size() == 0) {
return false; return false;
} }

3
Mage.Sets/src/mage/cards/r/ReverseTheSands.java
View file

@ -2,6 +2,7 @@
package mage.cards.r; package mage.cards.r;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -59,7 +60,7 @@ class ReverseTheSandsEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { if (controller != null) {
Choice lifeChoice = new ChoiceImpl(true); Choice lifeChoice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {

3
Mage.Sets/src/mage/cards/r/RickSteadfastLeader.java
View file

@ -26,6 +26,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -77,7 +78,7 @@ public final class RickSteadfastLeader extends CardImpl {
class RickSteadfastLeaderChooseEffect extends OneShotEffect { class RickSteadfastLeaderChooseEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("First strike and vigilance"); choices.add("First strike and vigilance");

2
Mage.Sets/src/mage/cards/r/RiteOfRuin.java
View file

@ -60,7 +60,7 @@ class RiteOfRuinEffect extends OneShotEffect {
return false; return false;
} }
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
choices.add("Artifacts"); choices.add("Artifacts");
choices.add("Creatures"); choices.add("Creatures");
choices.add("Lands"); choices.add("Lands");

3
Mage.Sets/src/mage/cards/s/ShiftingCeratops.java
View file

@ -24,6 +24,7 @@ import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -60,7 +61,7 @@ public final class ShiftingCeratops extends CardImpl {
} }
class ShiftingCeratopsEffect extends OneShotEffect { class ShiftingCeratopsEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet(); private static final Set<String> choices = new LinkedHashSet();
static { static {
choices.add("Reach"); choices.add("Reach");

3
Mage.Sets/src/mage/cards/s/SithEvoker.java
View file

@ -2,6 +2,7 @@
package mage.cards.s; package mage.cards.s;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -60,7 +61,7 @@ public final class SithEvoker extends CardImpl {
class SithEvokerEffect extends OneShotEffect { class SithEvokerEffect extends OneShotEffect {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add("Gain life equal to creature's power"); choices.add("Gain life equal to creature's power");

7
Mage.Sets/src/mage/cards/s/StaffOfTheLetterMagus.java
View file

@ -19,10 +19,7 @@ import mage.game.stack.Spell;
import mage.players.Player; import mage.players.Player;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.Arrays; import java.util.*;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/** /**
* @author L_J * @author L_J
@ -70,7 +67,7 @@ class StaffOfTheLetterMagusChooseLetterEffect extends OneShotEffect {
ChoiceImpl choice = new ChoiceImpl(true); ChoiceImpl choice = new ChoiceImpl(true);
choice.setMessage("Choose letter"); choice.setMessage("Choose letter");
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
// Can I choose Y? // Can I choose Y?
// Yes. We play by popular game show rules here. Y is a consonant. // Yes. We play by popular game show rules here. Y is a consonant.
// https://magic.wizards.com/en/articles/archive/news/unstable-faqawaslfaqpaftidawabiajtbt-2017-12-06 // https://magic.wizards.com/en/articles/archive/news/unstable-faqawaslfaqpaftidawabiajtbt-2017-12-06

3
Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java
View file

@ -32,6 +32,7 @@ import mage.target.TargetPermanent;
import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCardInYourGraveyard;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -101,7 +102,7 @@ class TayamLuminousEnigmaCost extends RemoveCounterCost {
String counterName = null; String counterName = null;
if (permanent.getCounters(game).size() > 1) { if (permanent.getCounters(game).size() > 1) {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : permanent.getCounters(game).values()) { for (Counter counter : permanent.getCounters(game).values()) {
if (permanent.getCounters(game).getCount(counter.getName()) > 0) { if (permanent.getCounters(game).getCount(counter.getName()) > 0) {
choices.add(counter.getName()); choices.add(counter.getName());

9
Mage.Sets/src/mage/cards/t/TeferisRealm.java
View file

@ -1,11 +1,8 @@
package mage.cards.t; package mage.cards.t;
import java.util.ArrayList; import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -52,7 +49,7 @@ class TeferisRealmEffect extends OneShotEffect {
private static final String CREATURE = "Creature"; private static final String CREATURE = "Creature";
private static final String LAND = "Land"; private static final String LAND = "Land";
private static final String NON_AURA_ENCHANTMENT = "Non-Aura enchantment"; private static final String NON_AURA_ENCHANTMENT = "Non-Aura enchantment";
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
static { static {
choices.add(ARTIFACT); choices.add(ARTIFACT);

3
Mage.Sets/src/mage/cards/u/UrzasAvenger.java
View file

@ -2,6 +2,7 @@
package mage.cards.u; package mage.cards.u;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
@ -52,7 +53,7 @@ public final class UrzasAvenger extends CardImpl {
class UrzasAvengerEffect extends ContinuousEffectImpl { class UrzasAvengerEffect extends ContinuousEffectImpl {
private static final Set<String> choices = new HashSet<>(); private static final Set<String> choices = new LinkedHashSet<>();
private Ability gainedAbility; private Ability gainedAbility;
static { static {

2
Mage.Sets/src/mage/cards/v/VivienMonstersAdvocate.java
View file

@ -74,7 +74,7 @@ public final class VivienMonstersAdvocate extends CardImpl {
class VivienMonstersAdvocateTokenEffect extends OneShotEffect { class VivienMonstersAdvocateTokenEffect extends OneShotEffect {
private static final Token token = new BeastToken(); private static final Token token = new BeastToken();
private static final Set<String> choices = new HashSet<>(Arrays.asList( private static final Set<String> choices = new LinkedHashSet<>(Arrays.asList(
"Vigilance", "Reach", "Trample" "Vigilance", "Reach", "Trample"
)); ));

3
Mage.Sets/src/mage/cards/w/WhenFluffyBunniesAttack.java
View file

@ -17,6 +17,7 @@ import mage.target.common.TargetCreaturePermanent;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -62,7 +63,7 @@ class WhenFluffyBunniesAttackEffect extends OneShotEffect {
ChoiceImpl choice = new ChoiceImpl(true); ChoiceImpl choice = new ChoiceImpl(true);
choice.setMessage("Choose letter"); choice.setMessage("Choose letter");
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (Character letter = 'A'; letter <= 'Z'; letter++) { for (Character letter = 'A'; letter <= 'Z'; letter++) {
choices.add(letter.toString()); choices.add(letter.toString());
} }

2
Mage.Tests/src/test/java/org/mage/test/serverside/performance/SerializationTest.java
View file

@ -192,7 +192,7 @@ public class SerializationTest extends CardTestPlayerBase {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
choice.setMessage("Choose an ability"); choice.setMessage("Choose an ability");
choice.setChoices(new HashSet<>(abilityMap.keySet())); choice.setChoices(new LinkedHashSet<>(abilityMap.keySet()));
Object compressed = CompressUtil.compress(choice); Object compressed = CompressUtil.compress(choice);
Assert.assertTrue("Must be zip", compressed instanceof ZippedObjectImpl); Assert.assertTrue("Must be zip", compressed instanceof ZippedObjectImpl);

3
Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java
View file

@ -19,6 +19,7 @@ import mage.target.TargetPermanent;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -108,7 +109,7 @@ public class RemoveCounterCost extends CostImpl {
} }
} else { // Multiple counters, player much choose which type to remove from } else { // Multiple counters, player much choose which type to remove from
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (Counter counter : targetObject.getCounters(game).values()) { for (Counter counter : targetObject.getCounters(game).values()) {
if (targetObject.getCounters(game).getCount(counter.getName()) > 0) { if (targetObject.getCounters(game).getCount(counter.getName()) > 0) {
choices.add(counter.getName()); choices.add(counter.getName());

2
Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
View file

@ -338,7 +338,7 @@ public class ContinuousEffects implements Serializable {
* event * event
*/ */
private Map<ReplacementEffect, Set<Ability>> getApplicableReplacementEffects(GameEvent event, Game game) { private Map<ReplacementEffect, Set<Ability>> getApplicableReplacementEffects(GameEvent event, Game game) {
Map<ReplacementEffect, Set<Ability>> replaceEffects = new HashMap<>(); Map<ReplacementEffect, Set<Ability>> replaceEffects = new LinkedHashMap<>();
if (auraReplacementEffect.checksEventType(event, game) && auraReplacementEffect.applies(event, null, game)) { if (auraReplacementEffect.checksEventType(event, game) && auraReplacementEffect.applies(event, null, game)) {
replaceEffects.put(auraReplacementEffect, null); replaceEffects.put(auraReplacementEffect, null);
} }

3
Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java
View file

@ -13,6 +13,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
/** /**
@ -69,7 +70,7 @@ public class RemoveCounterTargetEffect extends OneShotEffect {
String counterName = null; String counterName = null;
if (permanent.getCounters(game).size() > 1) { if (permanent.getCounters(game).size() > 1) {
Choice choice = new ChoiceImpl(true); Choice choice = new ChoiceImpl(true);
Set<String> choices = new HashSet<>(); Set<String> choices = new LinkedHashSet<>();
for (Counter counterOnPermanent : permanent.getCounters(game).values()) { for (Counter counterOnPermanent : permanent.getCounters(game).values()) {
if (permanent.getCounters(game).getCount(counterOnPermanent.getName()) > 0) { if (permanent.getCounters(game).getCount(counterOnPermanent.getName()) > 0) {
choices.add(counterOnPermanent.getName()); choices.add(counterOnPermanent.getName());

2
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2906,7 +2906,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (rollsAmount == 1) { if (rollsAmount == 1) {
return rollDieInnerWithReplacement(game, source, rollDieType, sidesAmount, chaosSidesAmount, planarSidesAmount); return rollDieInnerWithReplacement(game, source, rollDieType, sidesAmount, chaosSidesAmount, planarSidesAmount);
} }
Set<Object> choices = new HashSet<>(); Set<Object> choices = new LinkedHashSet<>();
for (int j = 0; j < rollsAmount; j++) { for (int j = 0; j < rollsAmount; j++) {
choices.add(rollDieInnerWithReplacement(game, source, rollDieType, sidesAmount, chaosSidesAmount, planarSidesAmount)); choices.add(rollDieInnerWithReplacement(game, source, rollDieType, sidesAmount, chaosSidesAmount, planarSidesAmount));
} }

2
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -1738,7 +1738,7 @@ public final class CardUtil {
// HashMap uses inner class for Keys without serialization support, // HashMap uses inner class for Keys without serialization support,
// so you can't use it for client-server data // so you can't use it for client-server data
if (data != null && data.getClass().getName().endsWith("$KeySet")) { if (data != null && data.getClass().getName().endsWith("$KeySet")) {
throw new IllegalArgumentException("Can't use KeySet as param, use new HashSet<>(data.keySet()) instead"); throw new IllegalArgumentException("Can't use KeySet as param, use new LinkedHashSet<>(data.keySet()) instead");
} }
} }
} }