Upped version to v0.7.0dev. Changed default unarmed attack cost to 4AP.

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 5717d5a333852ec01f0efbbab6e363503dffc02e..cac7a030855d216026cd346d5ed6b521bf46a4e2 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="30"
-       android:versionName="0.6.12dev"
+       android:versionName="0.7.0dev"
        android:installLocation="auto"
        >
        <uses-sdk 

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index 7b97597dfb63cd7a87c40dc6c7b1081b725441bd..f3934944ae9ef51670df8a1a1421e578901d404f 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -28,6 +28,7 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class Player extends Actor {
        public static final int DEFAULT_PLAYER_MOVECOST = 6;
+       public static final int DEFAULT_PLAYER_ATTACKCOST = 4;
        public final Coord lastPosition;
        public final Coord nextPosition;
        public int level;
@@ -53,7 +54,7 @@ public final class Player extends Actor {
        
        public void initializeNewPlayer(ItemTypeCollection types, DropListCollection dropLists, String name) {
                CombatTraits combat = new CombatTraits();
-               combat.attackCost = 3;
+               combat.attackCost = DEFAULT_PLAYER_ATTACKCOST;
                combat.attackChance = 60;
                combat.criticalSkill = 0;
                combat.criticalMultiplier = 1;
@@ -279,13 +280,13 @@ public final class Player extends Actor {
                        if (hasExactQuestProgress("bwm_agent", 240)) addQuestProgress(new QuestProgress("prim_hunt", 250));
                }
                
-               if (fileversion < 26) return;
-               
-               final int size3 = src.readInt();
-               for(int i = 0; i < size3; ++i) {
-                       final String faction = src.readUTF();
-                       final int alignment = src.readInt();
-                       alignments.put(faction, alignment);
+               if (fileversion >= 26) {
+                       final int size3 = src.readInt();
+                       for(int i = 0; i < size3; ++i) {
+                               final String faction = src.readUTF();
+                               final int alignment = src.readInt();
+                               alignments.put(faction, alignment);
+                       }
                }
                
                if (fileversion <= 27) {
@@ -293,6 +294,10 @@ public final class Player extends Actor {
                        ItemController.correctActorConditionsFromItemsPre0611b1(this, "blackwater_misery", world, "bwm_dagger");
                        ItemController.correctActorConditionsFromItemsPre0611b1(this, "regen", world, "ring_shadow0");
                }
+               
+               if (fileversion <= 30) {
+                       this.actorTraits.baseCombatTraits.attackCost = DEFAULT_PLAYER_ATTACKCOST;
+               }
        }
        
        public void writeToParcel(DataOutputStream dest, int flags) throws IOException {