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

Merge branch 'master' into 'master'

Browse Source 
Forge for Android 1.6.19.001 update files, removed an off-color land from a Kamigawa event deck.

See merge request core-developers/forge!1196
This commit is contained in:
Michael Kamensky
2018-12-09 11:20:53 +00:00
parent f0e739889b bcfae4ba40
commit d82941498d
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -1311,7 +1311,6 @@ public class ComputerUtilCard {
//2. grant haste //2. grant haste
if (keywords.contains("Haste") && c.hasSickness() && !c.isTapped()) { if (keywords.contains("Haste") && c.hasSickness() && !c.isTapped()) {
//chance += 0.5f;
if (ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, pumped)) { if (ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, pumped)) {
chance += 0.5f + (0.5f * ComputerUtilCombat.damageIfUnblocked(pumped, opp, combat, true) / opp.getLife()); chance += 0.5f + (0.5f * ComputerUtilCombat.damageIfUnblocked(pumped, opp, combat, true) / opp.getLife());
} }

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

@@ -6,7 +6,7 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms1024m</build.min.memory> <build.min.memory>-Xms1024m</build.min.memory>
<build.max.memory>-Xmx1536m</build.max.memory> <build.max.memory>-Xmx1536m</build.max.memory>
<alpha-version>1.6.18.004</alpha-version> <alpha-version>1.6.19.001</alpha-version>
<sign.keystore>keystore</sign.keystore> <sign.keystore>keystore</sign.keystore>
<sign.alias>alias</sign.alias> <sign.alias>alias</sign.alias>
<sign.storepass>storepass</sign.storepass> <sign.storepass>storepass</sign.storepass>

2
forge-gui-ios/pom.xml
View File

@@ -6,7 +6,7 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory> <build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory> <build.max.memory>-Xmx2048m</build.max.memory>
<alpha-version>1.6.18.004</alpha-version> <alpha-version>1.6.19.001</alpha-version>
</properties> </properties>
<parent> <parent>

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Stack; import java.util.Stack;
public class Forge implements ApplicationListener { public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.18.004"; public static final String CURRENT_VERSION = "1.6.19.001";
private static final ApplicationListener app = new Forge(); private static final ApplicationListener app = new Forge();
private static Clipboard clipboard; private static Clipboard clipboard;

3
forge-gui/res/conquest/planes/Kamigawa/Towabara/Takeno, Samurai General.dck
View File

@@ -4,7 +4,6 @@ Name=Takeno, Samurai General
1 Takeno, Samurai General|CHK 1 Takeno, Samurai General|CHK
[Main] [Main]
1 Araba Mothrider|SOK 1 Araba Mothrider|SOK
1 Cloudcrest Lake|CHK
1 Devoted Retainer|CHK 1 Devoted Retainer|CHK
1 Eiganjo Castle|CHK 1 Eiganjo Castle|CHK
1 Genju of the Fields|BOK 1 Genju of the Fields|BOK
@@ -21,7 +20,7 @@ Name=Takeno, Samurai General
1 No-Dachi|CHK 1 No-Dachi|CHK
1 O-Naginata|SOK 1 O-Naginata|SOK
1 Oathkeeper, Takeno's Daisho|CHK 1 Oathkeeper, Takeno's Daisho|CHK
15 Plains|CHK 16 Plains|CHK
1 Promise of Bunrei|SOK 1 Promise of Bunrei|SOK
1 Reverence|SOK 1 Reverence|SOK
1 Samurai Enforcers|CHK 1 Samurai Enforcers|CHK