diff --git a/AndorsTrail/app/src/main/AndroidManifest.xml b/AndorsTrail/app/src/main/AndroidManifest.xml index 9736311cf..e76b1fdcd 100644 --- a/AndorsTrail/app/src/main/AndroidManifest.xml +++ b/AndorsTrail/app/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ 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 ac7f369e5..0d2cba8a1 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 @@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application { public static final boolean DEVELOPMENT_DEBUGRESOURCES = false; public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false; public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false; - public static final boolean DEVELOPMENT_DEBUGBUTTONS = false; + public static final boolean DEVELOPMENT_DEBUGBUTTONS = true; 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.12.1"; + public static final boolean DEVELOPMENT_VALIDATEDATA = true; + public static final boolean DEVELOPMENT_DEBUGMESSAGES = true; + public static final String CURRENT_VERSION_DISPLAY = "0.8.13dev"; 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; - public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 79; + public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 80; private final AndorsTrailPreferences preferences = new AndorsTrailPreferences(); private WorldContext world = new WorldContext(); diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java index 602fd7b3b..afa0e636e 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java @@ -187,12 +187,12 @@ public final class SkillCollection { initializeSkill(new SkillInfo(SkillID.resistanceBlood, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, null, position++)); initializeSkill(new SkillInfo(SkillID.shadowBless, 1, SkillInfo.LevelUpType.onlyByQuests, SkillCategory.immunity, null, position++)); initializeSkill(new SkillInfo(SkillID.crit1, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] { - SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 3) - ,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 3) + SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 2) + ,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 2) }, position++)); initializeSkill(new SkillInfo(SkillID.crit2, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.criticals, new SkillLevelRequirement[] { - SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 6) - ,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 6) + SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 4) + ,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 4) ,SkillLevelRequirement.requireOtherSkill(SkillID.crit1, 1) }, position++)); initializeSkill(new SkillInfo(SkillID.rejuvenation, 1, SkillInfo.LevelUpType.alwaysShown, SkillCategory.immunity, new SkillLevelRequirement[] { diff --git a/AndorsTrail/res/drawable/map_cavewall_3.png b/AndorsTrail/res/drawable/map_cavewall_3.png index b76e0b6c7..a22c4e523 100644 Binary files a/AndorsTrail/res/drawable/map_cavewall_3.png and b/AndorsTrail/res/drawable/map_cavewall_3.png differ