github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 01:06:34 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed double copypaste

Browse source
This commit is contained in:
Zzooouhh 2017-12-30 02:06:39 +01:00 • committed by GitHub
parent d671c2a06c
commit 818a005b59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2324,7 +2324,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (newTarget.choose(Outcome.Neutral, playerId, targetPlayerId, game)) { if (newTarget.choose(Outcome.Neutral, playerId, targetPlayerId, game)) {
finishedSearch = true; finishedSearch = true;
} }
if (!targetPlayerId.equals(playerId) || handleLibraryCastableCreatures(library, game, targetPlayerId)) { // for handling Panglacial Wurm if (!targetPlayerId.equals(playerId) || handleLibraryCastableCards(library, game, targetPlayerId)) { // for handling Panglacial Wurm
if (finishedSearch) { if (finishedSearch) {
target.getTargets().clear(); target.getTargets().clear();
for (UUID targetId : newTarget.getTargets()) { for (UUID targetId : newTarget.getTargets()) {
@ -2342,7 +2342,7 @@ public abstract class PlayerImpl implements Player, Serializable {
return false; return false;
} }
private boolean handleLibraryCastableCreatures(Library library, Game game, UUID targetPlayerId) { private boolean handleLibraryCastableCards(Library library, Game game, UUID targetPlayerId) {
// for handling Panglacial Wurm // for handling Panglacial Wurm
Map<UUID, String> libraryCastableCardTracker = new HashMap<>(); Map<UUID, String> libraryCastableCardTracker = new HashMap<>();
for (Card card : library.getCards(game)) { for (Card card : library.getCards(game)) {
@ -2389,55 +2389,6 @@ public abstract class PlayerImpl implements Player, Serializable {
return true; return true;
} }
private boolean handleLibraryCastableCreatures(Library library, Game game, UUID targetPlayerId, TargetCardInLibrary newTarget) {
// for handling Panglacial Wurm
Map<UUID, String> libraryCastableCardTracker = new HashMap<>();
for (Card card : library.getCards(game)) {
for (Ability ability : card.getAbilities()) {
if (ability.getClass() == WhileSearchingPlayFromLibraryAbility.class) {
libraryCastableCardTracker.put(card.getId(), card.getName() + " [" + card.getId().toString().substring(0, 3) + "]");
}
}
}
if (!libraryCastableCardTracker.isEmpty()) {
Player player = game.getPlayer(targetPlayerId);
if (player != null) {
if (player.isHuman() && player.chooseUse(Outcome.AIDontUseIt, "Cast a creature card from your library? (choose \"No\" to finish search)", null, game)) {
ChoiceImpl chooseCard = new ChoiceImpl();
chooseCard.setMessage("Which creature do you wish to cast from your library?");
Set<String> choice = new LinkedHashSet<>();
for (Entry<UUID, String> entry : libraryCastableCardTracker.entrySet()) {
choice.add(new java.util.AbstractMap.SimpleEntry<UUID, String>(entry).getValue());
}
chooseCard.setChoices(choice);
while (!choice.isEmpty()) {
if (player.choose(Outcome.AIDontUseIt, chooseCard, game)) {
String chosenCard = chooseCard.getChoice();
for (Entry<UUID, String> entry : libraryCastableCardTracker.entrySet()) {
if (chosenCard.equals(entry.getValue())) {
Card card = game.getCard(entry.getKey());
if (card != null) {
// TODO: fix first target being impossible to rechoose
// TODO: fix costs (why is Panglacial Wurm automatically accepting payment?)
if (player.cast(card.getSpellAbility(), game, false)) {
choice.remove(chosenCard);
chooseCard.setChoices(choice);
newTarget.remove(card.getId());
}
}
}
}
continue;
}
break;
}
return false;
}
}
}
return true;
}
@Override @Override
public boolean flipCoin(Game game) { public boolean flipCoin(Game game) {
return this.flipCoin(game, null); return this.flipCoin(game, null);