Updated version number to v0.6.11a1.

Enabled all resources for v0.6.11.
Fixed issue with splatter effects not being redrawn properly when using "optimized drawing".
Fixed issue with HP bar not being updated by the regeneration skill on maps without monsters.

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

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 304f386fa8dcad9779ac8a65b6e2ad29f19aac52..375ac965a485308653d719ff0a5ddd6dfb73b823 100644 (file)
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest 
        xmlns:android="http://schemas.android.com/apk/res/android" 
        package="com.gpl.rpg.AndorsTrail"
-       android:versionCode="25"
-       android:versionName="0.6.11dev"
+       android:versionCode="27"
+       android:versionName="0.6.11a1"
        android:installLocation="auto"
        >
        <uses-sdk 

diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 6613b52cac6c0082fbd0c49f941c2e0a30ae0afb..b20e5cdaef0a987b4bbb73b68cbfdc3e001b6161 100644 (file)
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -5,6 +5,7 @@
        <item>@string/actorconditions_v069_bwm</item>
        <item>@string/actorconditions_v0610</item>
        <item>@string/actorconditions_v0611</item>
+       <item>@string/actorconditions_v0611_2</item>
     </array>
 
     <array name="loadresource_items">
@@ -25,6 +26,8 @@
                <item>@string/itemlist_v0610_1</item>
                <item>@string/itemlist_v0610_2</item>
                <item>@string/itemlist_v0611_1</item>
+               <item>@string/itemlist_v0611_2</item>
+               <item>@string/itemlist_v0611_3</item>
     </array>
     
     <array name="loadresource_droplists">
@@ -38,6 +41,9 @@
         <item>@string/droplists_v0610_shops</item>
         <item>@string/droplists_v0610_npcs</item>
         <item>@string/droplists_v0610_monsters</item>
+        <item>@string/droplists_v0611_monsters</item>
+        <item>@string/droplists_v0611_npcs</item>
+        <item>@string/droplists_v0611_shops</item>
     </array>
     
     <array name="loadresource_quests">
@@ -46,6 +52,9 @@
        <item>@string/questlist_v068</item>
        <item>@string/questlist_v069</item>
                <item>@string/questlist_v0610</item>
+               <item>@string/questlist_v0611</item>
+               <item>@string/questlist_v0611_2</item>
+               <item>@string/questlist_v0611_3</item>
     </array>
     
     <array name="loadresource_conversationlists">
@@ -139,6 +148,37 @@
                <item>@string/conversationlist_loneford_3</item>
                <item>@string/conversationlist_loneford_4</item>
                <item>@string/conversationlist_pwcave</item>
+               <item>@string/conversationlist_thorin</item>
+               <item>@string/conversationlist_thorinbone</item>
+               <item>@string/conversationlist_algangror</item>
+               <item>@string/conversationlist_remgard_bridgeguard</item>
+               <item>@string/conversationlist_ulirfendor</item>
+               <item>@string/conversationlist_toszylae_guard</item>
+               <item>@string/conversationlist_toszylae</item>
+               <item>@string/conversationlist_sign_ulirfendor</item>
+               <item>@string/conversationlist_talion_2</item>
+               <item>@string/conversationlist_gylew</item>
+               <item>@string/conversationlist_ingus</item>
+               <item>@string/conversationlist_elwyl</item>
+               <item>@string/conversationlist_hjaldar</item>
+               <item>@string/conversationlist_mazeg</item>
+               <item>@string/conversationlist_sign_waterwaycave</item>
+               <item>@string/conversationlist_jhaeld</item>
+               <item>@string/conversationlist_norath</item>
+               <item>@string/conversationlist_elythom_1</item>
+               <item>@string/conversationlist_duaina</item>
+               <item>@string/conversationlist_rothses</item>
+               <item>@string/conversationlist_remgard_villagers1</item>
+               <item>@string/conversationlist_kendelow</item>
+               <item>@string/conversationlist_arghes</item>
+               <item>@string/conversationlist_remgard_villagers2</item>
+               <item>@string/conversationlist_ervelyn</item>
+               <item>@string/conversationlist_reinkarr</item>
+               <item>@string/conversationlist_remgard_idolsigns</item>
+               <item>@string/conversationlist_signs_v0611</item>
+               <item>@string/conversationlist_kaverin</item>
+               <item>@string/conversationlist_vacor2</item>
+               <item>@string/conversationlist_unzel2</item>
     </array>
 
     <array name="loadresource_monsters">
@@ -154,210 +194,296 @@
        <item>@string/monsterlist_v0610_npcs1</item>
                <item>@string/monsterlist_v0610_monsters2</item>
        <item>@string/monsterlist_v0611_monsters1</item>
+       <item>@string/monsterlist_v0611_npcs1</item>
+       <item>@string/monsterlist_v0611_npcs2</item>
     </array>
     
     <array name="loadresource_maps">
-       <item>@xml/home</item>
-       <item>@xml/crossglen</item>
-        <item>@xml/crossglen_farmhouse</item>
-        <item>@xml/crossglen_farmhouse_basement</item>
-        <item>@xml/crossglen_hall</item>
-        <item>@xml/crossglen_smith</item>
-        <item>@xml/crossglen_cave</item>
-        <item>@xml/wild1</item>
-        <item>@xml/wild2</item>
-        <item>@xml/wild3</item>
-        <item>@xml/jan_pitcave1</item>
-        <item>@xml/jan_pitcave2</item>
-        <item>@xml/jan_pitcave3</item>
-        <item>@xml/fallhaven_nw</item>
-        <item>@xml/snakecave1</item>
-        <item>@xml/snakecave2</item>
-        <item>@xml/snakecave3</item>
-        <item>@xml/wild4</item>
-        <item>@xml/hauntedhouse1</item>
-        <item>@xml/hauntedhouse2</item>
-        <item>@xml/fallhaven_ne</item>
-        <item>@xml/fallhaven_church</item>
-        <item>@xml/fallhaven_barn</item>
-        <item>@xml/fallhaven_potions</item>
-        <item>@xml/fallhaven_gravedigger</item>
-        <item>@xml/fallhaven_clothes</item>
-        <item>@xml/fallhaven_arcir</item>
-        <item>@xml/fallhaven_arcir_basement</item>
-        <item>@xml/fallhaven_athamyr</item>
-        <item>@xml/fallhaven_rigmor</item>
-        <item>@xml/fallhaven_tavern</item>
-        <item>@xml/fallhaven_prison</item>
-        <item>@xml/fallhaven_derelict</item>
-        <item>@xml/fallhaven_nocmar</item>
-        <item>@xml/catacombs1</item>
-        <item>@xml/catacombs2</item>
-        <item>@xml/catacombs3</item>
-        <item>@xml/catacombs4</item>
-        <item>@xml/hauntedhouse3</item>
-        <item>@xml/hauntedhouse4</item>
-        <item>@xml/fallhaven_sw</item>
-        <item>@xml/wild5</item>
-        <item>@xml/wild6</item>
-        <item>@xml/wild6_house</item>
-        <item>@xml/wild7</item>
-        <item>@xml/wild8</item>
-        <item>@xml/wild9</item>
-        <item>@xml/wild10</item>
-        <item>@xml/flagstone0</item>
-        <item>@xml/flagstone_inner</item>
-        <item>@xml/flagstone_upper</item>
-        <item>@xml/flagstone1</item>
-        <item>@xml/flagstone2</item>
-        <item>@xml/flagstone3</item>
-        <item>@xml/flagstone4</item>
-        <item>@xml/wild11</item>
-        <item>@xml/wild12</item>
-        <item>@xml/wild11_clearing</item>
-        <item>@xml/clearing_level1</item>
-        <item>@xml/clearing_level2</item>
-        <item>@xml/fallhaven_se</item>
-        <item>@xml/fallhaven_lumberjack</item>
-        <item>@xml/fallhaven_alaun</item>
-        <item>@xml/fallhaven_storage</item>
-        <item>@xml/fallhaven_farmer</item>
-        <item>@xml/wild13</item>
-        <item>@xml/wild14</item>
-        <item>@xml/wild14_cave</item>
-        <item>@xml/wild14_clearing</item>
-        <item>@xml/wild15</item>
-        <item>@xml/wild15_house</item>
-        <item>@xml/road1</item>
-        <item>@xml/foaming_flask</item>
-        <item>@xml/fallhaven_derelict2</item>
-        <item>@xml/vilegard_n</item>
-        <item>@xml/vilegard_s</item>
-        <item>@xml/vilegard_sw</item>
-        <item>@xml/vilegard_ogam</item>
-        <item>@xml/vilegard_chapel</item>
-        <item>@xml/vilegard_tavern</item>
-        <item>@xml/vilegard_armorer</item>
-        <item>@xml/vilegard_smith</item>
-        <item>@xml/vilegard_wrye</item>
-        <item>@xml/vilegard_kaori</item>
-        <item>@xml/vilegard_erttu</item>
-        <item>@xml/road2</item>
-        <item>@xml/road3</item>
-        <item>@xml/road4</item>
-        <item>@xml/road4_gargoylecave</item>
-        <item>@xml/road5</item>
-        <item>@xml/road5_house</item>
-        <item>@xml/gargoylecave1</item>
-        <item>@xml/gargoylecave2</item>
-        <item>@xml/gargoylecave3</item>
-        <item>@xml/gargoylecave4</item>
-        <item>@xml/blackwater_mountain0</item>
-        <item>@xml/blackwater_mountain1</item>
-        <item>@xml/blackwater_mountain2</item>
-        <item>@xml/blackwater_mountain3</item>
-        <item>@xml/blackwater_mountain4</item>
-        <item>@xml/blackwater_mountain5</item>
-        <item>@xml/blackwater_mountain6</item>
-        <item>@xml/blackwater_mountain7</item>
-        <item>@xml/blackwater_mountain8</item>
-        <item>@xml/blackwater_mountain9</item>
-        <item>@xml/blackwater_mountain10</item>
-        <item>@xml/blackwater_mountain11</item>
-        <item>@xml/blackwater_mountain12</item>
-        <item>@xml/blackwater_mountain13</item>
-        <item>@xml/blackwater_mountain14</item>
-        <item>@xml/blackwater_mountain15</item>
-        <item>@xml/blackwater_mountain16</item>
-        <item>@xml/blackwater_mountain17</item>
-        <item>@xml/blackwater_mountain18</item>
-        <item>@xml/blackwater_mountain19</item>
-        <item>@xml/blackwater_mountain20</item>
-        <item>@xml/blackwater_mountain21</item>
-        <item>@xml/blackwater_mountain22</item>
-        <item>@xml/blackwater_mountain23</item>
-        <item>@xml/blackwater_mountain24</item>
-        <item>@xml/blackwater_mountain25</item>
-        <item>@xml/blackwater_mountain26</item>
-        <item>@xml/blackwater_mountain27</item>
-        <item>@xml/blackwater_mountain28</item>
-        <item>@xml/blackwater_mountain29</item>
-        <item>@xml/blackwater_mountain30</item>
-        <item>@xml/blackwater_mountain31</item>
-        <item>@xml/blackwater_mountain32</item>
-        <item>@xml/blackwater_mountain33</item>
-        <item>@xml/blackwater_mountain34</item>
-        <item>@xml/blackwater_mountain35</item>
-        <item>@xml/blackwater_mountain36</item>
-        <item>@xml/blackwater_mountain37</item>
-        <item>@xml/blackwater_mountain38</item>
-        <item>@xml/blackwater_mountain39</item>
-        <item>@xml/blackwater_mountain40</item>
-        <item>@xml/blackwater_mountain41</item>
-        <item>@xml/blackwater_mountain42</item>
-        <item>@xml/blackwater_mountain43</item>
-        <item>@xml/blackwater_mountain44</item>
-        <item>@xml/blackwater_mountain45</item>
-        <item>@xml/blackwater_mountain46</item>
-        <item>@xml/blackwater_mountain47</item>
-        <item>@xml/blackwater_mountain48</item>
-        <item>@xml/blackwater_mountain49</item>
-        <item>@xml/blackwater_mountain50</item>
-        <item>@xml/blackwater_mountain51</item>
-        <item>@xml/blackwater_mountain52</item>
-        <item>@xml/wild0</item>
-        <item>@xml/crossroads</item>
-        <item>@xml/fields0</item>
-        <item>@xml/fields1</item>
-        <item>@xml/fields2</item>
-        <item>@xml/fields3</item>
-        <item>@xml/fields4</item>
-        <item>@xml/fields5</item>
-        <item>@xml/fields6</item>
-        <item>@xml/fields7</item>
-        <item>@xml/fields8</item>
-        <item>@xml/fields9</item>
-        <item>@xml/fields10</item>
-        <item>@xml/fields11</item>
-        <item>@xml/fields12</item>
-        <item>@xml/houseatcrossroads0</item>
-        <item>@xml/houseatcrossroads1</item>
-        <item>@xml/houseatcrossroads2</item>
-        <item>@xml/houseatcrossroads3</item>
-        <item>@xml/houseatcrossroads4</item>
-        <item>@xml/houseatcrossroads5</item>
-        <item>@xml/loneford1</item>
-        <item>@xml/loneford2</item>
-        <item>@xml/loneford3</item>
-        <item>@xml/loneford4</item>
-        <item>@xml/loneford5</item>
-        <item>@xml/loneford6</item>
-        <item>@xml/loneford7</item>
-        <item>@xml/loneford8</item>
-        <item>@xml/loneford9</item>
-        <item>@xml/loneford10</item>
-        <item>@xml/roadbeforecrossroads</item>
-        <item>@xml/roadtocarntower0</item>
-        <item>@xml/roadtocarntower1</item>
-        <item>@xml/roadtocarntower2</item>
-        <item>@xml/woodcave0</item>
-        <item>@xml/woodcave1</item>
-        <item>@xml/wild16</item>
-        <item>@xml/wild17</item>
-        <item>@xml/gapfiller1</item>
-        <item>@xml/gapfiller3</item>
-        <item>@xml/gapfiller4</item>
-        <item>@xml/waterway0</item>
-        <item>@xml/waterway1</item>
-        <item>@xml/waterway2</item>
-        <item>@xml/waterway3</item>
-        <item>@xml/waterwayhouse</item>
-        <item>@xml/waterwayextention</item>
-        <item>@xml/pwcave0</item>
-        <item>@xml/pwcave1</item>
-        <item>@xml/pwcave2</item>
-        <item>@xml/pwcave2a</item>
-        <item>@xml/pwcave3</item>
-        <item>@xml/pwcave4</item>
+               <item>@xml/home</item>
+               <item>@xml/crossglen</item>
+               <item>@xml/crossglen_farmhouse</item>
+               <item>@xml/crossglen_farmhouse_basement</item>
+               <item>@xml/crossglen_hall</item>
+               <item>@xml/crossglen_smith</item>
+               <item>@xml/crossglen_cave</item>
+               <item>@xml/wild1</item>
+               <item>@xml/wild2</item>
+               <item>@xml/wild3</item>
+               <item>@xml/jan_pitcave1</item>
+               <item>@xml/jan_pitcave2</item>
+               <item>@xml/jan_pitcave3</item>
+               <item>@xml/fallhaven_nw</item>
+               <item>@xml/snakecave1</item>
+               <item>@xml/snakecave2</item>
+               <item>@xml/snakecave3</item>
+               <item>@xml/wild4</item>
+               <item>@xml/hauntedhouse1</item>
+               <item>@xml/hauntedhouse2</item>
+               <item>@xml/fallhaven_ne</item>
+               <item>@xml/fallhaven_church</item>
+               <item>@xml/fallhaven_barn</item>
+               <item>@xml/fallhaven_potions</item>
+               <item>@xml/fallhaven_gravedigger</item>
+               <item>@xml/fallhaven_clothes</item>
+               <item>@xml/fallhaven_arcir</item>
+               <item>@xml/fallhaven_arcir_basement</item>
+               <item>@xml/fallhaven_athamyr</item>
+               <item>@xml/fallhaven_rigmor</item>
+               <item>@xml/fallhaven_tavern</item>
+               <item>@xml/fallhaven_prison</item>
+               <item>@xml/fallhaven_derelict</item>
+               <item>@xml/fallhaven_nocmar</item>
+               <item>@xml/catacombs1</item>
+               <item>@xml/catacombs2</item>
+               <item>@xml/catacombs3</item>
+               <item>@xml/catacombs4</item>
+               <item>@xml/hauntedhouse3</item>
+               <item>@xml/hauntedhouse4</item>
+               <item>@xml/fallhaven_sw</item>
+               <item>@xml/wild5</item>
+               <item>@xml/wild6</item>
+               <item>@xml/wild6_house</item>
+               <item>@xml/wild7</item>
+               <item>@xml/wild8</item>
+               <item>@xml/wild9</item>
+               <item>@xml/wild10</item>
+               <item>@xml/flagstone0</item>
+               <item>@xml/flagstone_inner</item>
+               <item>@xml/flagstone_upper</item>
+               <item>@xml/flagstone1</item>
+               <item>@xml/flagstone2</item>
+               <item>@xml/flagstone3</item>
+               <item>@xml/flagstone4</item>
+               <item>@xml/wild11</item>
+               <item>@xml/wild12</item>
+               <item>@xml/wild11_clearing</item>
+               <item>@xml/clearing_level1</item>
+               <item>@xml/clearing_level2</item>
+               <item>@xml/fallhaven_se</item>
+               <item>@xml/fallhaven_lumberjack</item>
+               <item>@xml/fallhaven_alaun</item>
+               <item>@xml/fallhaven_storage</item>
+               <item>@xml/fallhaven_farmer</item>
+               <item>@xml/wild13</item>
+               <item>@xml/wild14</item>
+               <item>@xml/wild14_cave</item>
+               <item>@xml/wild14_clearing</item>
+               <item>@xml/wild15</item>
+               <item>@xml/wild15_house</item>
+               <item>@xml/road1</item>
+               <item>@xml/foaming_flask</item>
+               <item>@xml/fallhaven_derelict2</item>
+               <item>@xml/vilegard_n</item>
+               <item>@xml/vilegard_s</item>
+               <item>@xml/vilegard_sw</item>
+               <item>@xml/vilegard_ogam</item>
+               <item>@xml/vilegard_chapel</item>
+               <item>@xml/vilegard_tavern</item>
+               <item>@xml/vilegard_armorer</item>
+               <item>@xml/vilegard_smith</item>
+               <item>@xml/vilegard_wrye</item>
+               <item>@xml/vilegard_kaori</item>
+               <item>@xml/vilegard_erttu</item>
+               <item>@xml/road2</item>
+               <item>@xml/road3</item>
+               <item>@xml/road4</item>
+               <item>@xml/road4_gargoylecave</item>
+               <item>@xml/road5</item>
+               <item>@xml/road5_house</item>
+               <item>@xml/gargoylecave1</item>
+               <item>@xml/gargoylecave2</item>
+               <item>@xml/gargoylecave3</item>
+               <item>@xml/gargoylecave4</item>
+               <item>@xml/blackwater_mountain0</item>
+               <item>@xml/blackwater_mountain1</item>
+               <item>@xml/blackwater_mountain2</item>
+               <item>@xml/blackwater_mountain3</item>
+               <item>@xml/blackwater_mountain4</item>
+               <item>@xml/blackwater_mountain5</item>
+               <item>@xml/blackwater_mountain6</item>
+               <item>@xml/blackwater_mountain7</item>
+               <item>@xml/blackwater_mountain8</item>
+               <item>@xml/blackwater_mountain9</item>
+               <item>@xml/blackwater_mountain10</item>
+               <item>@xml/blackwater_mountain11</item>
+               <item>@xml/blackwater_mountain12</item>
+               <item>@xml/blackwater_mountain13</item>
+               <item>@xml/blackwater_mountain14</item>
+               <item>@xml/blackwater_mountain15</item>
+               <item>@xml/blackwater_mountain16</item>
+               <item>@xml/blackwater_mountain17</item>
+               <item>@xml/blackwater_mountain18</item>
+               <item>@xml/blackwater_mountain19</item>
+               <item>@xml/blackwater_mountain20</item>
+               <item>@xml/blackwater_mountain21</item>
+               <item>@xml/blackwater_mountain22</item>
+               <item>@xml/blackwater_mountain23</item>
+               <item>@xml/blackwater_mountain24</item>
+               <item>@xml/blackwater_mountain25</item>
+               <item>@xml/blackwater_mountain26</item>
+               <item>@xml/blackwater_mountain27</item>
+               <item>@xml/blackwater_mountain28</item>
+               <item>@xml/blackwater_mountain29</item>
+               <item>@xml/blackwater_mountain30</item>
+               <item>@xml/blackwater_mountain31</item>
+               <item>@xml/blackwater_mountain32</item>
+               <item>@xml/blackwater_mountain33</item>
+               <item>@xml/blackwater_mountain34</item>
+               <item>@xml/blackwater_mountain35</item>
+               <item>@xml/blackwater_mountain36</item>
+               <item>@xml/blackwater_mountain37</item>
+               <item>@xml/blackwater_mountain38</item>
+               <item>@xml/blackwater_mountain39</item>
+               <item>@xml/blackwater_mountain40</item>
+               <item>@xml/blackwater_mountain41</item>
+               <item>@xml/blackwater_mountain42</item>
+               <item>@xml/blackwater_mountain43</item>
+               <item>@xml/blackwater_mountain44</item>
+               <item>@xml/blackwater_mountain45</item>
+               <item>@xml/blackwater_mountain46</item>
+               <item>@xml/blackwater_mountain47</item>
+               <item>@xml/blackwater_mountain48</item>
+               <item>@xml/blackwater_mountain49</item>
+               <item>@xml/blackwater_mountain50</item>
+               <item>@xml/blackwater_mountain51</item>
+               <item>@xml/blackwater_mountain52</item>
+               
+               <!-- maps for v0.6.10 -->
+               <item>@xml/wild0</item>
+               <item>@xml/crossroads</item>
+               <item>@xml/fields0</item>
+               <item>@xml/fields1</item>
+               <item>@xml/fields2</item>
+               <item>@xml/fields3</item>
+               <item>@xml/fields4</item>
+               <item>@xml/fields5</item>
+               <item>@xml/fields6</item>
+               <item>@xml/fields7</item>
+               <item>@xml/fields8</item>
+               <item>@xml/fields9</item>
+               <item>@xml/fields10</item>
+               <item>@xml/fields11</item>
+               <item>@xml/fields12</item>
+               <item>@xml/houseatcrossroads0</item>
+               <item>@xml/houseatcrossroads1</item>
+               <item>@xml/houseatcrossroads2</item>
+               <item>@xml/houseatcrossroads3</item>
+               <item>@xml/houseatcrossroads4</item>
+               <item>@xml/houseatcrossroads5</item>
+               <item>@xml/loneford1</item>
+               <item>@xml/loneford2</item>
+               <item>@xml/loneford3</item>
+               <item>@xml/loneford4</item>
+               <item>@xml/loneford5</item>
+               <item>@xml/loneford6</item>
+               <item>@xml/loneford7</item>
+               <item>@xml/loneford8</item>
+               <item>@xml/loneford9</item>
+               <item>@xml/loneford10</item>
+               <item>@xml/roadbeforecrossroads</item>
+               <item>@xml/roadtocarntower0</item>
+               <item>@xml/roadtocarntower1</item>
+               <item>@xml/roadtocarntower2</item>
+               <item>@xml/woodcave0</item>
+               <item>@xml/woodcave1</item>
+               <item>@xml/wild16</item>
+               <item>@xml/wild17</item>
+               <item>@xml/gapfiller1</item>
+               <item>@xml/gapfiller3</item>
+               <item>@xml/gapfiller4</item>
+               <item>@xml/waterway0</item>
+               <item>@xml/waterway1</item>
+               <item>@xml/waterway2</item>
+               <item>@xml/waterway3</item>
+               <item>@xml/waterwayhouse</item>
+               <item>@xml/waterwayextention</item>
+               <item>@xml/pwcave0</item>
+               <item>@xml/pwcave1</item>
+               <item>@xml/pwcave2</item>
+               <item>@xml/pwcave2a</item>
+               <item>@xml/pwcave3</item>
+               <item>@xml/pwcave4</item>
+               
+           <!-- maps for v0.6.11 -->
+               <item>@xml/waterway4</item>
+               <item>@xml/waterway5</item>
+               <item>@xml/waterway6</item>
+               <item>@xml/waterway7</item>
+               <item>@xml/waterway8</item>
+               <item>@xml/waterway9</item>
+               <item>@xml/waterway10</item>
+               <item>@xml/waterway11_east</item>
+               <item>@xml/waterway11</item>
+               <item>@xml/waterway12</item>
+               <item>@xml/waterway13</item>
+               <item>@xml/waterway14</item>
+               <item>@xml/waterway15</item>
+               <item>@xml/waterwaycave</item>
+               <item>@xml/mountaincave0</item>
+               <item>@xml/mountaincave1</item>
+               <item>@xml/mountaincave2</item>
+               <item>@xml/mountaincave3</item>
+               <item>@xml/mountainlake0</item>
+               <item>@xml/mountainlake1</item>
+               <item>@xml/mountainlake2</item>
+               <item>@xml/mountainlake3</item>
+               <item>@xml/mountainlake4</item>
+               <item>@xml/mountainlake5</item>
+               <item>@xml/mountainlake6</item>
+               <item>@xml/mountainlake7</item>
+               <item>@xml/mountainlake8</item>
+               <item>@xml/mountainlake9</item>
+               <item>@xml/mountainlake10</item>
+               <item>@xml/mountainlake10a</item>
+               <item>@xml/mountainlake11</item>
+               <item>@xml/mountainlake12</item>
+               <item>@xml/mountainlake13</item>
+               <item>@xml/mountainlake13a</item>
+               <item>@xml/remgard0</item>
+               <item>@xml/remgard1</item>
+               <item>@xml/remgard2</item>
+               <item>@xml/remgard3</item>
+               <item>@xml/remgard4</item>
+               <item>@xml/remgard_armour</item>
+               <item>@xml/remgard_barn</item>
+               <item>@xml/remgard_church</item>
+               <item>@xml/remgard_clothes</item>
+               <item>@xml/remgard_farmer1</item>
+               <item>@xml/remgard_farmer2</item>
+               <item>@xml/remgard_farmer3</item>
+               <item>@xml/remgard_prison</item>
+               <item>@xml/remgard_school</item>
+               <item>@xml/remgard_tavern0</item>
+               <item>@xml/remgard_tavern1</item>
+               <item>@xml/remgard_villager1</item>
+               <item>@xml/remgard_villager2</item>
+               <item>@xml/remgard_villager3</item>
+               <item>@xml/remgard_villager4</item>
+               <item>@xml/remgard_villager5</item>
+               <item>@xml/remgard_weapon</item>
+               <item>@xml/waytobrimhaven0</item>
+               <item>@xml/waytobrimhaven1</item>
+               <item>@xml/waytobrimhaven2</item>
+               <item>@xml/waytobrimhaven3</item>
+               <item>@xml/waytobrimhavencave0</item>
+               <item>@xml/waytobrimhavencave1a</item>
+               <item>@xml/waytobrimhavencave1</item>
+               <item>@xml/waytobrimhavencave2</item>
+               <item>@xml/waytobrimhavencave3a</item>
+               <item>@xml/waytobrimhavencave3b</item>
+               <item>@xml/waytobrimhavencave3</item>
+               <item>@xml/waytobrimhavencave4</item>
+               <item>@xml/waytolake0</item>
+               <item>@xml/waytolake1</item>
+               <item>@xml/waytolake2</item>
+               <item>@xml/waytolake3</item>
+               <item>@xml/waytolake4</item>
+               <item>@xml/waytolake5</item>
+               <item>@xml/waytomountaincave0</item>
+               <item>@xml/waytomountaincave1</item>
+               <item>@xml/waytomountaincave2</item>
+               <item>@xml/lonelyhouse0</item>
+               <item>@xml/lonelyhouse1</item>
+               <item>@xml/wild16_cave</item>
     </array>
 </resources>

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 96168f3b9df821aed2478cf4df591b886247db5f..1da0b1bdfb6d9e8f655cc3fd4a59f8c37b72c792 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -19,9 +19,9 @@ public final class AndorsTrailApplication extends Application {
        public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;\r
        public static final boolean DEVELOPMENT_VALIDATEDATA = false;\r
        public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;\r
-       public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || true;\r
-       public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 26;\r
-       public static final String CURRENT_VERSION_DISPLAY = "0.6.11dev";\r
+       public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || false;\r
+       public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 27;\r
+       public static final String CURRENT_VERSION_DISPLAY = "0.6.11a1";\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/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
index eef1ee1a42d096fe0810606d6dc01a3a5c55804e..e4e3eeeee07b4703d1131bed8f4b38d6b69a4911 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
@@ -193,7 +193,7 @@ public class ActorStatsController {
 
        public void applyConditionsToPlayer(Player player, boolean isFullRound) {
                if (player.conditions.isEmpty()) return;
-               removeConditionsFromSkillEffects(player);
+               if (!isFullRound) removeConditionsFromSkillEffects(player);
                
                applyStatsEffects(player, isFullRound);
                if (player.isDead()) {
@@ -202,7 +202,7 @@ public class ActorStatsController {
                }
                view.mainActivity.updateStatus();
 
-               decreaseDurationAndRemoveConditions(player);
+               if (!isFullRound) decreaseDurationAndRemoveConditions(player);
        }
 
        private static void removeConditionsFromSkillEffects(Player player) {
@@ -373,4 +373,11 @@ public class ActorStatsController {
                        applyUseEffect(player, null, type.effects_kill);
                }
        }
+
+       public void applySkillEffectsForNewRound(Player player) {
+               boolean changed = player.health.add(player.getSkillLevel(SkillCollection.SKILL_REGENERATION) * SkillCollection.PER_SKILLPOINT_INCREASE_REGENERATION, false);
+               if (changed) {
+                       view.mainActivity.updateStatus();
+               }
+       }
 }

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
index 378daea4c705a1aef05276bce24a312914ac1701..e4dc66cd1b2b1d9e79fce5d5017782d409c683dc 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
@@ -14,7 +14,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.util.Coord;
-import com.gpl.rpg.AndorsTrail.view.MainView;
 
 public final class Controller {
     
@@ -110,11 +109,10 @@ public final class Controller {
        }
        }
 
-       public void moveAndSpawnMonsters() {
+       public boolean moveAndSpawnMonsters() {
        boolean hasChanged = false;
        if (view.monsterMovementController.moveMonsters()) hasChanged = true;
        if (model.currentMap.maybeSpawn(world)) hasChanged = true;
-       
-       if (hasChanged) view.mainActivity.redrawAll(MainView.REDRAW_ALL_MONSTER_MOVED); //TODO: should only redraw spawned tiles
+       return hasChanged;
        }
 }

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index d82d1e4bb2b0ce5f541a2e3b287a72bea8b01e91..9503e55358a3f42dd73f31826d609275001df1dc 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -3,8 +3,8 @@ package com.gpl.rpg.AndorsTrail.controller;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
 import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
+import com.gpl.rpg.AndorsTrail.view.MainView;
 
 public final class GameRoundController implements TimedMessageTask.Callback {
     
@@ -46,13 +46,11 @@ public final class GameRoundController implements TimedMessageTask.Callback {
     }
     
     public void resume() {
-       //L.log("GameRoundController::resume() from " + from);
        view.mainActivity.updateStatus();
                model.uiSelections.isMainActivityVisible = true;
                roundTimer.start();
     }
     public void pause() {
-       //L.log("GameRoundController::pause() from " + from);
        roundTimer.stop();
        model.uiSelections.isMainActivityVisible = false;
     }
@@ -66,13 +64,15 @@ public final class GameRoundController implements TimedMessageTask.Callback {
     private void onNewRound() {
        view.actorStatsController.applyConditionsToMonsters(model.currentMap, false);
        view.actorStatsController.applyConditionsToPlayer(model.player, false);
-       
-       model.player.health.add(model.player.getSkillLevel(SkillCollection.SKILL_REGENERATION) * SkillCollection.PER_SKILLPOINT_INCREASE_REGENERATION, false);
+       view.actorStatsController.applySkillEffectsForNewRound(model.player);
     }
     
        private void onNewTick() {
-               view.controller.moveAndSpawnMonsters();
+               boolean hasChanged = false;
+               if (view.controller.moveAndSpawnMonsters()) hasChanged = true;
                view.monsterMovementController.attackWithAgressiveMonsters();
-               VisualEffectController.updateSplatters(model.currentMap);
+               if (VisualEffectController.updateSplatters(model.currentMap)) hasChanged = true;
+               
+       if (hasChanged) view.mainActivity.redrawAll(MainView.REDRAW_ALL_MONSTER_MOVED); //TODO: should only redraw spawned tiles
        }
 }

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index 5b7e1f26dc6159a4fe14043f3433710b389c7337..597f4c87e34317b8bcfc0885d3de5f2920c8b720 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -113,7 +113,7 @@ public final class VisualEffectController {
                public final long reduceIconAfter;
                public final Coord position;
                public int iconID;
-               public boolean updated = false;
+               public boolean reducedIcon = false;
                public BloodSplatter(int iconID, Coord position) {
                        this.iconID = iconID;
                        this.position = position;
@@ -123,16 +123,21 @@ public final class VisualEffectController {
                }
        }
        
-       public static void updateSplatters(PredefinedMap map) {
+       public static boolean updateSplatters(PredefinedMap map) {
                long now = System.currentTimeMillis();
+               boolean hasChanges = false;
                for (int i = map.splatters.size() - 1; i >= 0; --i) {
                        BloodSplatter b = map.splatters.get(i);
-                       if (b.removeAfter <= now) map.splatters.remove(i);
-                       else if (!b.updated && b.reduceIconAfter <= now) {
-                               b.updated = true;
+                       if (b.removeAfter <= now) {
+                               map.splatters.remove(i);
+                               hasChanges = true;
+                       } else if (!b.reducedIcon && b.reduceIconAfter <= now) {
+                               b.reducedIcon = true;
                                b.iconID++;
+                               hasChanges = true;
                        }
                }
+               return hasChanges;
        }
        
        public static void addSplatter(PredefinedMap map, Monster m) {
@@ -141,8 +146,6 @@ public final class VisualEffectController {
        }
        
        private static int getSplatterIconFromMonsterClass(int monsterClass) {
-               return -1;
-               /*
                switch (monsterClass) {
                case MonsterType.MONSTERCLASS_INSECT: 
                case MonsterType.MONSTERCLASS_UNDEAD: 
@@ -159,6 +162,5 @@ public final class VisualEffectController {
                default:
                        return -1;
                }
-               */
        }
 }

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
index 98c2089c019a2d6a9e942fba35f3af685900a29a..d9e0efc4087a0fbfd7ff3240b6675183dcdd1469 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
@@ -32,9 +32,11 @@ public final class Range {
                this.max = max;
                this.current = current;
        }
-       public void add(int value, boolean mayOverflow) {
+       public boolean add(int value, boolean mayOverflow) {
+               int valueBefore = current;
                this.current += value;
                if (!mayOverflow) capAtMax();
+               return (this.current != valueBefore);
        }
        public void capAtMax() {
                if (current > max) current = max;
@@ -42,9 +44,11 @@ public final class Range {
        public void addToMax(int value) {
                this.max += value;
        }
-       public void subtract(int value, boolean mayUnderflow) {
+       public boolean subtract(int value, boolean mayUnderflow) {
+               int valueBefore = current;
                this.current -= value;
                if (!mayUnderflow && current < 0) current = 0;
+               return (this.current != valueBefore);
        }
        public boolean change(int value, boolean mayUnderflow, boolean mayOverflow) {
                int valueBefore = current;