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

Added a button that starts a duel against a random opponent in quest mode.

Browse Source 
Fixed some Android pom spacing.
Fixed a bug when generating booster boxes.
This commit is contained in:
Krazy
2014-05-27 02:52:01 +00:00
parent c646adf1e5
commit 22ae54c2bd
6 changed files with 107 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
forge-gui-android/pom.xml
View File

@@ -277,12 +277,21 @@
<include name="res/**" />
<exclude name="res/cardsfolder/**" />
</fileset>
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-signed-aligned.apk" />
<fileset dir="${project.build.directory}"
includes="${project.build.finalName}-signed-aligned.apk" />
</copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res.zip" basedir="${basedir}/../forge-gui/res" level="1" />
<zip destfile="${project.build.directory}/${project.build.finalName}.zip" basedir="${project.build.directory}/${project.build.finalName}" level="1" />
<mkdir
dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip
destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip"
basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
<zip
destfile="${project.build.directory}/${project.build.finalName}/res.zip"
basedir="${basedir}/../forge-gui/res" level="1" />
<zip
destfile="${project.build.directory}/${project.build.finalName}.zip"
basedir="${project.build.directory}/${project.build.finalName}"
level="1" />
</target>
</configuration>
<goals>
@@ -328,9 +337,14 @@
<phase>package</phase>
<configuration>
<target>
<ftp action="mkdir" password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}" />
<ftp password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}/">
<fileset dir="${project.build.directory}/${project.build.finalName}">
<ftp action="mkdir" password="${cardforge.pass}" server="ftp.cardforge.org"
userid="${cardforge.user}" passive="true"
remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}" />
<ftp password="${cardforge.pass}" server="ftp.cardforge.org"
userid="${cardforge.user}" passive="true"
remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}/">
<fileset
dir="${project.build.directory}/${project.build.finalName}">
<include name="${project.build.finalName}-signed-aligned.apk" />
<include name="res.zip" />
</fileset>

11
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java
View File

@@ -81,6 +81,17 @@ public enum CSubmenuDuels implements ICDoc {
quest.save();
}
});
view.getBtnRandomOpponent().setCommand(new UiCommand() {
@Override
public void run() {
FModel.getQuest().getDuelsManager().randomizeOpponents();
final List<QuestEventDuel> duels = FModel.getQuest().getDuelsManager().generateDuels();
SSubmenuQuestUtil.setEvent(duels.get((int) (Math.random() * duels.size())));
SSubmenuQuestUtil.startGame();
}
});
}
private final KeyAdapter _startOnEnter = new KeyAdapter() {

4
forge-gui-desktop/src/main/java/forge/screens/home/quest/IVQuestStats.java
View File

@@ -7,6 +7,10 @@ import forge.toolbox.FLabel;
/** Dictates methods required for a panel with stats/pet display. */
public interface IVQuestStats {
/** @return {@link forge.toolbox.FLabel} */
FLabel getBtnRandomOpponent();
/** @return {@link forge.toolbox.FLabel} */
FLabel getBtnBazaar();

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
View File

@@ -285,4 +285,10 @@ public enum VSubmenuChallenges implements IVSubmenu<CSubmenuChallenges>, IVQuest
public FCheckBox getCbCharm() {
return cbCharm;
}
@Override
public FLabel getBtnRandomOpponent() {
return null;
}
}

11
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java
View File

@@ -73,15 +73,18 @@ public enum VSubmenuDuels implements IVSubmenu<CSubmenuDuels>, IVQuestStats {
private final FLabel btnTravel = new FLabel.ButtonBuilder().text("Travel").fontSize(16).build();
private final FLabel btnBazaar = new FLabel.ButtonBuilder().text("Bazaar").fontSize(16).build();
private final FLabel btnSpellShop = new FLabel.ButtonBuilder().text("Spell Shop").fontSize(16).build();
private final FLabel btnRandomOpponent = new FLabel.ButtonBuilder().text("Random Duel").fontSize(16).build();
/**
* Constructor.
*/
private VSubmenuDuels() {
final String constraints = "h 30px!, gap 0 0 0 5px";
pnlStats.setLayout(new MigLayout("insets 0, gap 0, wrap, hidemode 0"));
pnlStats.add(btnUnlock, "w 150px!, h 30px!, gap 0 0 0 10px");
pnlStats.add(btnTravel, "w 150px!, h 30px!, gap 0 0 0 10px");
pnlStats.add(btnRandomOpponent, "w 150px!, h 30px!, gap 0 0 0 10px");
pnlStats.add(btnSpellShop, "w 150px!, h 30px!, gap 0 0 0 10px");
pnlStats.add(btnBazaar, "w 150px!, h 30px!, gap 0 0 0 10px");
pnlStats.add(lblWins, constraints);
@@ -94,6 +97,9 @@ public enum VSubmenuDuels implements IVSubmenu<CSubmenuDuels>, IVQuestStats {
pnlStats.add(cbCharm, constraints);
cbxPet.addTo(pnlStats, constraints);
pnlStats.setOpaque(false);
btnRandomOpponent.setToolTipText("Starts a duel against a randomly selected opponent.");
}
/* (non-Javadoc)
@@ -211,6 +217,11 @@ public enum VSubmenuDuels implements IVSubmenu<CSubmenuDuels>, IVQuestStats {
return btnSpellShop;
}
@Override
public FLabel getBtnRandomOpponent() {
return btnRandomOpponent;
}
@Override
public FCheckBox getCbPlant() {
return cbPlant;

8
forge-gui/src/main/java/forge/quest/QuestUtilCards.java
View File

@@ -605,7 +605,13 @@ public final class QuestUtilCards {
Collections.shuffle(editions);
editions = editions.subList(0, Math.max(count / 2, 1));
int numberOfBoxes = Math.min(Math.max(count / 2, 1), editions.size());
if (numberOfBoxes == 0) {
return;
}
editions = editions.subList(0, numberOfBoxes);
List<BoosterBox> output = new ArrayList<>();
for (CardEdition e : editions) {