Fixed issue with automatic calculation of item store prices that have a use effect...

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@172 08aca716-68be-ccc6-4d58-36f5abd142ac

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index d8a2053b7bbb0842c766e30cb908fbf26ad4f76c..12782d8f7797803db49a1a782c0e3a9a8fd9320f 100644 (file)
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
        xmlns:android="http://schemas.android.com/apk/res/android" 
        package="com.gpl.rpg.AndorsTrail"
        android:versionCode="24"
-       android:versionName="0.6.10a1"
+       android:versionName="0.6.10a2"
        android:installLocation="auto"
        >
        <uses-sdk 

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 6022747b9cff03b0c778d0a5acb6dbf8a45aa9f3..eee8c3dc2d4912d27b8f2e8a778aac7110722a8b 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -20,7 +20,7 @@ public final class AndorsTrailApplication extends Application {
        public static final boolean DEVELOPMENT_VALIDATEDATA = false;\r
        public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;\r
        public static final int CURRENT_VERSION = 24;\r
-       public static final String CURRENT_VERSION_DISPLAY = "0.6.10a1";\r
+       public static final String CURRENT_VERSION_DISPLAY = "0.6.10a2";\r
        \r
        public final WorldContext world = new WorldContext();\r
        public final WorldSetup setup = new WorldSetup(world, this);\r

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
index 85812a69d3c72430fcd72b54b2df7cfd1f4ebae7..cdfa7e03331b0f66120c5eb854e6596374f43c38 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
@@ -54,7 +54,7 @@ public final class ItemType {
                this.actionType = getActionType(category);\r
                this.displayType = displayType;\r
                this.hasManualPrice = hasManualPrice;\r
-               this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_hit);\r
+               this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use);\r
                this.fixedBaseMarketCost = fixedBaseMarketCost;\r
                this.effects_equip = effects_equip;\r
                this.effects_use = effects_use;\r