Merge branch 'production'

AndorsTrail/.gitignore

@@ -1,4 +1,5 @@
 gen
 bin
+assets
 .metadata
 .svn

AndorsTrail/res/values/content_conversationlist.xml

@@ -3388,7 +3388,7 @@
 {algangror_task2_9|You will place them by the beds of five particular persons, and you must hide it well so that the person does not find the idol itself.||{{N|algangror_task2_10|||||}}|};
 {algangror_task2_10|Remember, it is of utmost importance that you be as discreet as possible about this. The idols must not be found once you have placed them, and no one must notice that you place the idols.|{{0|fiveidols|30|}}|{{Go on.|algangror_task2_11|||||}}|};
 {algangror_task2_11|So, the first person that I want you to visit is Jhaeld. I hear that he spends most of his time in the Remgard tavern these days.|{{0|fiveidols|31|}}|{{N|algangror_task2_12|||||}}|};
-{algangror_task2_12|Secondly, I want you to visit one of the farmers named Larni. He lives with his wife Caeda here in Remgard in one of the northen cabins.|{{0|fiveidols|32|}}|{{N|algangror_task2_13|||||}}|};
+{algangror_task2_12|Secondly, I want you to visit one of the farmers named Larni. He lives with his wife Caeda here in Remgard in one of the northern cabins.|{{0|fiveidols|32|}}|{{N|algangror_task2_13|||||}}|};
 {algangror_task2_13|The third person is Arnal the weapon-smith, that lives in the northwest of Remgard.|{{0|fiveidols|33|}}|{{N|algangror_task2_14|||||}}|};
 {algangror_task2_14|Fourth is Emerei, that can probably be found in his house to the southeast of Remgard.|{{0|fiveidols|34|}}|{{N|algangror_task2_15|||||}}|};
 {algangror_task2_15|The fifth person is the farmer Carthe. Carthe lives on the eastern shore of Remgard, near the tavern.|{{0|fiveidols|35|}}|{{N|algangror_task2_16|||||}}|};
@@ -3874,7 +3874,7 @@
 	{It\'s not that bad. I have had worse.|talion_infect_4|||||}
 	}|};
 {talion_infect_4|It\'s good that you came to see me. I might be able to help you.||{{N|talion_demon_1|||||}}|};
-{talion_infect_5|A lich of Kazaul eh? Then I am sure that whatever ails you are those curse rotworms.||{{N|talion_infect_3|||||}}|};
+{talion_infect_5|A lich of Kazaul eh? Then I am sure that whatever ails you are those cursed rotworms.||{{N|talion_infect_3|||||}}|};
 {talion_demon_1|Just to be sure, you did kill whatever creature that infected you with this, right?||{
 	{Yes, I killed that lich.|talion_demon_2|darkprotector:10||||}
 	{No, I have not killed it yet.|talion_demon_3|||||}

AndorsTrail/res/values/strings.xml

@@ -480,7 +480,7 @@
 	
 	<string name="skill_title_shadow_bless">Dark blessing of the Shadow</string>
     <string name="skill_shortdescription_shadow_bless">Resistance against all types of conditions</string>
-    <string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
+    <string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types of conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
     
     <string name="inventory_movetop">Move to top</string>
     <string name="inventory_movebottom">Move to bottom</string>

AndorsTrail/res/xml/waterway11.tmx

@@ -58,12 +58,12 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytV8tywjAMTDrmE/oN9NoLzaEXSAvntqFMPyeFb4R+Tq3BO9kIP0N2xsMQR7uSbElQVbdYP1TVh10vi6pq7Po11+f4jv0QZH9v15tdR2v7Y2229fXzZNJ2G2cLvdY9+07oftm9LWmzbgxi90m2G9J7d3sd6f65GM5mzMH2gpSu1ufFeqxzMYO+z3+BxC5n1kZyNSfWTmdPedM4K59rM88ScN58Wpyvx8j9KwXz4s5I7rV+yKYEmvNMsfOdF1xm0kfd4T5vSKM3w52P1WQsFyE9rjsBx7eq0zysyTHwGYX0OtezpG9wfC2910XiBS9z6t6i9dDnBK/1OMYcTZz3mt4Fp+4tsocefKQ8SbzP1Nvxbs758TzQ3L2yl74kz+Dftr7lKMXK5Qy5y1lNPZxTqS58RWwSA5+hnnHIBXpy7j3y6fJcRe44x0cz9qW/U1Pgm22oI1996fk5RZO1ubfDD11fsfkJxHqfb6aH/JgSj49XP7sEfJgyM+6dqTn+a8z5eyN3buBu59pwLqfOYq6nFNcUjVBN6Xoqma0l/KF6Wmb+ng3ppPgFPD9E72lx7Wclej4d4Rcu4dzZdVgMOj1pYb9J/FdpA3EhDuFCLz6Q5o5iWarnB/IhpKljw7kgT+I34tHcgj7gU+Ps/wERQ4t7
+   eJytV1tuwkAMTKrlCD0D/a0q0Xz0B9KG77ZQ1OOk9IzQ43St7CiD2WfISCtENp6xvWsbquoa67uqerfreVFVjV0/ZniO79gPQfb3dr3adbS239amq4fPX5O22zhb6LXu2VdC99PudaTNujGI3QfZbkjvze3tSPfPxXAylxxsL0jpan1erMc6ZzPq+/wXSOxyZm0kV3Ni7XT2lDeNk/K5NvMsAefNp8X5uo/cv1IwL+6M5F7rh2xKoDlPFDvfecF5Jn3UHe7zhjR6M975WE3GchHS47oTcHyrOs3DmhwDn1FIb+d6lvQNjq+l93aReMHLnLq3aD30OcFLfRljjibOe03vglP3FtlDDz5SniTeR+rteDfn/HgeaO7efT65+KQvyTP419XXHKVYuZwhdzmrqcdzKtWFr4hNYuAz1DMOuUBPzr1HPl2eq8hdT3pHc+lLf6OmwDfbUEe++tLzc4oma3Nvhx+6vmLzE4j1Pt9MD/kxJR4fr352DvgwZWbcOlNz/NeY8/dG7tzA3c614VxOncVcTymuKRqhmtL1VDJbS/hD9bTM/D0b0knxC3h+iN7DYuhnJXo+HeEXLuHc2nVYjDo9aWG/SfxXaQNxIQ7hQi8+kOaWYlmq5wfyIaSpY8O5IE/iN+LR3II+4FPj7P8Bvg2Lsw==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYCAM1FkZGDRYiVBIJDCnolnEAmr7AR+IRLIH5FcLOvs3cgDCFwQ+MA+Mvf9JsBfkRmEWBgYRKBZlIY9Pqr2kqKWmWdS09/0A2UsKoMReYsqIQ8yY6QKfvbQudygNZ2zuO0SEmaTaa0ynMokW4S2MlvcPEul3etY5IwUMhTpmONhLSlmPDCitW0fByAH0LB/VsdhDK7ux2YUM6N0fgAFi/AsA6pMcWg==
+   eJxjYCAM1FkZGDRYiVBIJDCnolnEAmr7AR+IRLIH5FcLOvs3cgDCFwQ+MA+Mvf9JsBfkRmEWBgYRKBZlIY9Pqr2kqKWmWdS09/0A2UsKoMReYsqIQ8yY6QKfvbQudygNZ2zuO0SEmQMVv4QALcJbGC3vHyTS7/Ssc0YKGAp1zHCwl5SyHhlQWreOgpED6Fk+qmOxh1Z2Y7MLGdC7PwADxPgXAD3JHCI=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">

AndorsTrail/res/xml/waytomountaincave0.tmx

@@ -63,7 +63,7 @@
  </layer>
  <layer name="Above" width="15" height="29">
   <data encoding="base64" compression="zlib">
-   eJxjYEAF6qwMWIEFDnEQ0MAjR0uAbC+yu4l1Dy51tPYPpeaD/IpuBjYxYs2CgScshNXD7CAnvLEBfOkKGyDVXlxqiLUXm35KwplU/1JqL60BLjc5E+lWYtVRG4DcTW6eoZb9Qw2QGleU+pFU/QCSmAfy
+   eJxjYEAF6qwMWIEFDnEQ0MAjR0uAbC+yu4l1Dy51tPYPpeaD/IpuBjYxYs0iBcDsICe8sQF86QobINVeXGqItRebfkrCmVT/UmovrQEuNzkT6VZi1VEbgNxNbp6hlv1DDZAaV5T6kVT9AERgBwo=
   </data>
  </layer>
  <layer name="Walkable" width="15" height="29">

AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java

@@ -110,7 +110,7 @@ public final class CombatView extends RelativeLayout {
 		statusTextView.setText(res.getString(R.string.combat_status_ap, range.current));
 	}
 	public void updateCombatSelection(Monster selectedMonster, Coord selectedMovePosition) {
-		if (currentMonster == selectedMonster) return;
+		if (currentMonster != null && currentMonster == selectedMonster) return;
 		
 		attackMoveButton.setEnabled(true);
 		monsterBar.setVisibility(View.INVISIBLE);