mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
Added a button that starts a duel against a random opponent in quest mode.
Fixed some Android pom spacing. Fixed a bug when generating booster boxes.
This commit is contained in:
Krazy
@@ -1,7 +1,7 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
<properties>
|
||||
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
|
||||
<packaging.type>jar</packaging.type>
|
||||
@@ -18,7 +18,7 @@
|
||||
<artifactId>forge-gui-android</artifactId>
|
||||
<packaging>${packaging.type}</packaging>
|
||||
<name>Forge Android</name>
|
||||
|
||||
|
||||
<build>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<plugins>
|
||||
@@ -213,7 +213,7 @@
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
<removeExistingSignatures>true</removeExistingSignatures>
|
||||
<archiveDirectory/>
|
||||
<archiveDirectory />
|
||||
<includes>
|
||||
<include>${project.build.directory}/${project.build.finalName}/${project.build.finalName}.apk</include>
|
||||
</includes>
|
||||
@@ -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>
|
||||
@@ -299,52 +308,57 @@
|
||||
<properties>
|
||||
<packaging.type>apk</packaging.type>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.7</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant-nodeps</artifactId>
|
||||
<version>1.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ant</groupId>
|
||||
<artifactId>ant-commons-net</artifactId>
|
||||
<version>1.6.5</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>android-ftp</id>
|
||||
<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}">
|
||||
<include name="${project.build.finalName}-signed-aligned.apk"/>
|
||||
<include name="res.zip"/>
|
||||
</fileset>
|
||||
</ftp>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.7</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant-nodeps</artifactId>
|
||||
<version>1.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ant</groupId>
|
||||
<artifactId>ant-commons-net</artifactId>
|
||||
<version>1.6.5</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>android-ftp</id>
|
||||
<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}">
|
||||
<include name="${project.build.finalName}-signed-aligned.apk" />
|
||||
<include name="res.zip" />
|
||||
</fileset>
|
||||
</ftp>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
@@ -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() {
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -285,4 +285,10 @@ public enum VSubmenuChallenges implements IVSubmenu<CSubmenuChallenges>, IVQuest
|
||||
public FCheckBox getCbCharm() {
|
||||
return cbCharm;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FLabel getBtnRandomOpponent() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user