From: oskar.wiksten@gmail.com <oskar.wiksten@gmail.com@08aca716-68be-ccc6-4d58-36f5abd142ac>
Date: Sat, 8 Oct 2011 13:42:40 +0000 (+0000)
Subject: Fixed issue with automatic calculation of item store prices that have a use effect... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a114d5c1ca80b66f5b6108c7fd5973f912eb7287;p=users%2Fmchehab%2Fandors-trail.git

Fixed issue with automatic calculation of item store prices that have a use effect (such as potions).

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 d8a2053..12782d8 100644
--- 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 6022747..eee8c3d 100644
--- 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;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
 	public static final int CURRENT_VERSION = 24;
-	public static final String CURRENT_VERSION_DISPLAY = "0.6.10a1";
+	public static final String CURRENT_VERSION_DISPLAY = "0.6.10a2";
 	
 	public final WorldContext world = new WorldContext();
 	public final WorldSetup setup = new WorldSetup(world, this);
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 85812a6..cdfa7e0 100644
--- 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);
 		this.displayType = displayType;
 		this.hasManualPrice = hasManualPrice;
-		this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_hit);
+		this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use);
 		this.fixedBaseMarketCost = fixedBaseMarketCost;
 		this.effects_equip = effects_equip;
 		this.effects_use = effects_use;