external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'regeneration' into 'master'

Browse Source 
Regeneration

See merge request core-developers/forge!168
This commit is contained in:
Michael Kamensky
2018-02-08 12:07:41 +00:00
parent 4421766850 068efaeba7
commit 2b3e39cbb8
23 changed files with 324 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1569,18 +1569,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
}
}
@Override
public CardShields chooseRegenerationShield(final Card c) {
if (c.getShieldCount() < 2) {
return Iterables.getFirst(c.getShields(), null);
}
final List<CardShields> shields = Lists.newArrayList();
for (final CardShields shield : c.getShields()) {
shields.add(shield);
}
return getGui().one("Choose a regeneration shield:", shields);
}
@Override
public List<PaperCard> chooseCardsYouWonToAddToDeck(final List<PaperCard> losses) {
return getGui().many("Select cards to add to your deck", "Add these to my deck", 0, losses.size(), losses,