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

- A couple fixes and improvements to Planar Conquest mode: the Commander card now goes into your main deck for non-EDH matches (e.g. Vanguard, standard Magic etc.); it's now possible to pay mana manually from the pool (was previously impossible due to the fact that the GUI player name was rigged in a hacky way, which caused the code to misbehave - thanks to nefigah for finding and debugging this).

Browse Source
This commit is contained in:
Agetian
2017-05-09 05:56:04 +00:00
parent 546b9ac214
commit 0f4811ed71
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -93,7 +93,9 @@ public class ConquestController {
aiStart.setStartingLife(aiStart.getStartingLife() + 10); aiStart.setStartingLife(aiStart.getStartingLife() + 10);
humanStart.assignCommander(); humanStart.assignCommander();
aiStart.assignCommander(); aiStart.assignCommander();
} } else { // Add commander as just a normal card in the deck
CardPool main = humanStart.getDeck().getOrCreate(DeckSection.Main);
main.add(humanStart.getDeck().getOrCreate(DeckSection.Commander).toFlatList());}
if (variants.contains(GameType.Vanguard)) { //add opponent vanguard to player deck if (variants.contains(GameType.Vanguard)) { //add opponent vanguard to player deck
CardPool avatarPool = humanStart.getDeck().getOrCreate(DeckSection.Avatar); CardPool avatarPool = humanStart.getDeck().getOrCreate(DeckSection.Avatar);
avatarPool.clear(); avatarPool.clear();
@@ -111,7 +113,9 @@ public class ConquestController {
aiStart.setPlanes(planes); aiStart.setPlanes(planes);
} }
String humanPlayerName = commander.getPlayerName(); //String humanPlayerName = commander.getPlayerName(); // TODO: this currently makes it impossible to manually pay mana from pool (see VManaPool#tap)
String humanPlayerName = GamePlayerUtil.getGuiPlayer().getName();
String aiPlayerName = battle.getOpponentName(); String aiPlayerName = battle.getOpponentName();
if (humanPlayerName.equals(aiPlayerName)) { if (humanPlayerName.equals(aiPlayerName)) {
aiPlayerName += " (AI)"; //ensure player names are distinct aiPlayerName += " (AI)"; //ensure player names are distinct