diff --git a/AndorsTrail/app/src/main/AndroidManifest.xml b/AndorsTrail/app/src/main/AndroidManifest.xml index 16d1a81fb..fc20f6ce4 100644 --- a/AndorsTrail/app/src/main/AndroidManifest.xml +++ b/AndorsTrail/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="com.gpl.rpg.AndorsTrail" android:versionCode="73" - android:versionName="0.8.7beta" + android:versionName="0.8.7" android:installLocation="auto" > diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index 25ae5e805..4edee5686 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -28,7 +28,7 @@ public final class AndorsTrailApplication extends Application { public static final boolean DEVELOPMENT_FASTSPEED = false; public static final boolean DEVELOPMENT_VALIDATEDATA = false; public static final boolean DEVELOPMENT_DEBUGMESSAGES = false; - public static final String CURRENT_VERSION_DISPLAY = "0.8.7beta"; + public static final String CURRENT_VERSION_DISPLAY = "0.8.7"; public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*"); public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION; public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java index 730afd5ac..2af96372d 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java @@ -17,7 +17,7 @@ import com.gpl.rpg.AndorsTrail.util.Range; public final class MonsterSpawnArea { public final CoordRect area; public final Range quantity; - private final Range spawnChance; + private final Range respawnspeed; public final String areaID; public final String[] monsterTypeIDs; public final List monsters = new CopyOnWriteArrayList(); @@ -30,7 +30,7 @@ public final class MonsterSpawnArea { public MonsterSpawnArea( CoordRect area , Range quantity - , Range spawnChance + , Range respawnspeed , String areaID , String[] monsterTypeIDs , boolean isUnique @@ -40,7 +40,7 @@ public final class MonsterSpawnArea { ) { this.area = area; this.quantity = quantity; - this.spawnChance = spawnChance; + this.respawnspeed = respawnspeed; this.areaID = areaID; this.monsterTypeIDs = monsterTypeIDs; this.isUnique = isUnique; @@ -101,7 +101,7 @@ public final class MonsterSpawnArea { } public boolean rollShouldSpawn() { - return Constants.rollResult(spawnChance); + return Constants.rollResult(respawnspeed); } public void removeAllMonsters() { diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java index daf916449..52fcd653d 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java @@ -115,7 +115,7 @@ public final class TMXMapTranslator { boolean isActiveForNewGame = true; boolean ignoreAreas = false; int maxQuantity = 1; - int spawnChance = 10; + int respawnspeed = 10; String spawnGroup = object.name; for (TMXProperty p : object.properties) { if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) { @@ -126,8 +126,8 @@ public final class TMXMapTranslator { } if (p.name.equalsIgnoreCase("quantity")) { maxQuantity = Integer.parseInt(p.value); - } else if (p.name.equalsIgnoreCase("spawnchance")) { - spawnChance = Integer.parseInt(p.value); + } else if (p.name.equalsIgnoreCase("respawnspeed")) { + respawnspeed = Integer.parseInt(p.value); } else if (p.name.equalsIgnoreCase("active")) { isActiveForNewGame = Boolean.parseBoolean(p.value); } else if (p.name.equalsIgnoreCase("ignoreAreas")) { @@ -155,7 +155,7 @@ public final class TMXMapTranslator { MonsterSpawnArea area = new MonsterSpawnArea( position ,new Range(maxQuantity, 0) - ,new Range(1000, spawnChance) + ,new Range(1000, respawnspeed) ,object.name ,monsterTypeIDs ,isUnique