diff --git a/AndorsTrail/res/drawable/ui_doubleattackexample.png b/AndorsTrail/res/drawable/ui_doubleattackexample.png
new file mode 100644
index 000000000..9a839db99
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_doubleattackexample.png differ
diff --git a/AndorsTrail/res/drawable/ui_flee_example.png b/AndorsTrail/res/drawable/ui_flee_example.png
new file mode 100644
index 000000000..b6d094ae6
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_flee_example.png differ
diff --git a/AndorsTrail/res/layout/about.xml b/AndorsTrail/res/layout/about.xml
index d49ea06e0..7e518fd13 100644
--- a/AndorsTrail/res/layout/about.xml
+++ b/AndorsTrail/res/layout/about.xml
@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/about_button1"
+ android:text="@string/about_button4"
/>
+
@@ -4119,13 +4126,13 @@
{I have one of those potions of accuracy focus for you.|elwyl_res_1||pot_focus_ac|1|0|}
{I have a strong potion of accuracy focus for you.|elwyl_res_1||pot_focus_ac2|1|0|}
{You talked about some potion before. Could you repeat that?|elwyl_12|||||}
- {Some people have been complaining that your squabbling has kept people awake at night.|elwyl_10|sisterfight:10||||}
+ {Some people have been complaining that your squabbling has kept them awake at night.|elwyl_10|sisterfight:10||||}
}|};
{elwyl_res_1|Oh good. Give me that.|{{0|sisterfight|70|}}|{{N|elwyl_res_2|||||}}|};
-{elwyl_res_2|Huh, what\'s this? It\'s yellow.. I was sure that it used to be blue. Let me smell it to make sure that it the right kind of potion.||{{N|elwyl_res_3|||||}}|};
+{elwyl_res_2|Huh, what\'s this? It\'s yellow.. I was sure that it used to be blue. Let me smell it to make sure that it\'s the right kind of potion.||{{N|elwyl_res_3|||||}}|};
{elwyl_res_3|Hm, yes, it smells exactly as I remember it. It must be the right potion.||{{N|elwyl_res_4|||||}}|};
-{elwyl_res_4|But, this means .. that Elwel was wrong anyway!||{{N|elwyl_res_5|||||}}|};
-{elwyl_res_5|Elwel, look at this, you are wrong! The potion wasn\'t green as you said, it\'s yellow! Why didn\'t you just listen to me?!||{{N|elwyl_res_6|||||}}|};
+{elwyl_res_4|This means .. that Elwel was wrong anyway!||{{N|elwyl_res_5|||||}}|};
+{elwyl_res_5|Elwel, look at this, you were wrong! The potion wasn\'t green as you said, it\'s yellow! Why didn\'t you just listen to me?!||{{N|elwyl_res_6|||||}}|};
{elwyl_res_6|Elwel, you are always trying your best to prove me wrong. Well look at this, now you are wrong for once!||{
{Whatever, you two don\'t seem to get along very well. I\'ll leave you to your squabbling.|elwyl_res_7|||||}
{I hope that you two will get along some day.|elwyl_res_7|||||}
@@ -4190,9 +4197,9 @@
{hjaldar_r7|Time has not been on his side, I see.||{{N|hjaldar_r8|||||}}|};
{hjaldar_r8|Anyway. Let\'s make that potion that you asked for earlier. I even prepared the other ingredients for another potion beforehand.||{{N|hjaldar_r9|||||}}|};
{hjaldar_r9|Now, let\'s see. Some of these.. *Hjaldar pulls out some dried up berries and puts them in his mortar*||{{N|hjaldar_r10|||||}}|};
-{hjaldar_r10|And some of this into some clean vials..||{{N|hjaldar_r11|||||}}|};
+{hjaldar_r10|Add some of this into some clean vials..||{{N|hjaldar_r11|||||}}|};
{hjaldar_r11|Just a pinch of these into one of these vials..||{{N|hjaldar_r12|||||}}|};
-{hjaldar_r12|And finally, the Lyson marrow extract..||{{N|hjaldar_r13|||||}}|};
+{hjaldar_r12|Finally, the Lyson marrow extract..||{{N|hjaldar_r13|||||}}|};
{hjaldar_r13|There. Now we just need to give them a good shake.||{{N|hjaldar_r14|||||}}|};
{hjaldar_r14|*Hjaldar shakes the vials vigorously, one in each of his hands*||{{N|hjaldar_r15|||||}}|};
{hjaldar_r15|Ah, that should do it. Here you go. One potion of accuracy focus and one potion of damage focus. I hope they will be useful to you.|{{0|sisterfight|61|}{1|hjaldar_pots|0|}}|{
@@ -4213,11 +4220,11 @@
}|};
{mazeg_1|Welcome friend! Would you like to browse my selection of fine potions and ointments?||{
{Sure. Show me what you have.|S|||||}
- {I am looking for some Lyson Marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
+ {I am looking for some Lyson marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
}|};
{mazeg_2|Welcome traveller. Have you come to ask for help from me and my potions?||{
{Yes. Please show me what you have.|blackwater_notrust|||||}
- {I am looking for some Lyson Marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
+ {I am looking for some Lyson marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
}|};
{mazeg_e_1|||{
{|mazeg_d|sisterfight:55||||}
@@ -4951,6 +4958,7 @@
{sign_waterway9|West: Loneford\nEast: Brightport, Lake Laeroth|||};
{sign_waterway11|West: Loneford\nSouth: Brightport|||};
{sign_remgard0|Welcome to Lake Laeroth and the city of Remgard!|||};
+{wild16_cave|The thicket is too dense for you to get through.|||};
diff --git a/AndorsTrail/res/values/content_droplist.xml b/AndorsTrail/res/values/content_droplist.xml
index a24dd37ca..3fb48302f 100644
--- a/AndorsTrail/res/values/content_droplist.xml
+++ b/AndorsTrail/res/values/content_droplist.xml
@@ -696,16 +696,31 @@
{marrowtaint|{{marrowtaint|1|1|100|}}|};
{ervelyn_hat|{{hat_crit|1|1|100|}}|};
{oegyth1|{{oegyth|1|1|100|}}|};
+{wild16_cave1|{
+ {vial_empty|1|1|100|}
+ {vial_empty2|2|2|100|}
+ {health_minor2|2|2|100|}
+ }|};
+{wild16_cave2|{
+ {health|2|2|100|}
+ {milk|3|3|100|}
+ {pot_speed_1|1|1|5|}
+ {pot_poison_weak|3|3|5|}
+ {pot_poison_weak_antidote|1|1|100|}
+ {pot_blind_rage|1|1|100|}
+ {pot_bleeding_ointment|1|1|100|}
+ {health_major2|1|1|100|}
+ }|};
[id|items[itemID|quantity_Min|quantity_Max|chance|]|];
{shop_thorin|{{pot_scaradon|30|30|100|}}|};
{shop_hjaldar|{
- {pot_focus_dmg|5|5|100|}
- {pot_focus_ac|5|5|100|}
- {pot_focus_dmg2|1|1|100|}
- {pot_focus_ac2|1|1|100|}
+ {pot_focus_dmg|8|8|100|}
+ {pot_focus_ac|8|8|100|}
+ {pot_focus_dmg2|5|5|100|}
+ {pot_focus_ac2|5|5|100|}
}|};
{shop_rothses|{
{remgard_shield_1|1|1|100|}
diff --git a/AndorsTrail/res/values/content_monsterlist.xml b/AndorsTrail/res/values/content_monsterlist.xml
index f05a7f7de..5c1b73f84 100644
--- a/AndorsTrail/res/values/content_monsterlist.xml
+++ b/AndorsTrail/res/values/content_monsterlist.xml
@@ -507,9 +507,9 @@
{norath|monsters_ld1:8|Norath|norath||0|||||||||||||||norath||||||||};
{rothses|monsters_ld1:14|Rothses|rothses||0||||||||||||||shop_rothses|rothses||||||||};
{duaina|monsters_ld1:154|Duaina|duaina||0|||||||||||||||duaina||||||||};
-{rg_villager1|monsters_ld1:132|Villager|remgard_villager1||0|||||||||||||||remgard_villager1||||||||};
-{rg_villager2|monsters_ld1:20|Villager|remgard_villager2||0|||||||||||||||remgard_villager2||||||||};
-{rg_villager3|monsters_ld1:134|Villager|remgard_villager3||0|||||||||||||||remgard_villager3||||||||};
+{rg_villager1|monsters_ld1:132|Commoner|remgard_villager1||0|||||||||||||||remgard_villager1||||||||};
+{rg_villager2|monsters_ld1:20|Commoner|remgard_villager2||0|||||||||||||||remgard_villager2||||||||};
+{rg_villager3|monsters_ld1:134|Commoner|remgard_villager3||0|||||||||||||||remgard_villager3||||||||};
{jhaeld|monsters_mage:0|jhaeld|jhaeld||0|||||||||||||||jhaeld||||||||};
{krell|monsters_men2:6|Krell|krell||0|||||||||||||||krell||||||||};
{elythom_kn1|monsters_men:3|Knight of Elythom|elythom_knight1||0|||||||||||||||elythom_knight1||||||||};
@@ -542,11 +542,11 @@
{remgard_g2|monsters_ld1:5|Guard|remgard_guard||0|||||||||||||||blackwater_guard1||||||||};
{remgard_g3|monsters_ld1:67|Guard|remgard_guard2||0|||||||||||||||remgard_guard1||||||||};
{remgard_pg|monsters_ld1:11|Prison Guard|remgard_prison_guard||0|||||||||||||||remgard_prison_guard||||||||};
-{rg_villager4|monsters_ld1:164|Villager|remgard_villager4||0|||||||||||||||remgard_villager4||||||||};
-{rg_villager5|monsters_ld1:148|Villager|remgard_villager5||0|||||||||||||||remgard_villager5||||||||};
-{rg_villager6|monsters_ld1:188|Villager|remgard_villager6||0|||||||||||||||remgard_villager6||||||||};
-{rg_villager7|monsters_ld1:10|Villager|remgard_villager7||0|||||||||||||||remgard_villager7||||||||};
-{rg_villager8|monsters_rltiles3:18|Villager|remgard_villager8||0|||||||||||||||remgard_villager8||||||||};
+{rg_villager4|monsters_ld1:164|Commoner|remgard_villager4||0|||||||||||||||remgard_villager4||||||||};
+{rg_villager5|monsters_ld1:148|Commoner|remgard_villager5||0|||||||||||||||remgard_villager5||||||||};
+{rg_villager6|monsters_ld1:188|Commoner|remgard_villager6||0|||||||||||||||remgard_villager6||||||||};
+{rg_villager7|monsters_ld1:10|Commoner|remgard_villager7||0|||||||||||||||remgard_villager7||||||||};
+{rg_villager8|monsters_rltiles3:18|Commoner|remgard_villager8||0|||||||||||||||remgard_villager8||||||||};
{skylenar|monsters_ld1:3|Skylenar|skylenar||0||||||||||||||shop_skylenar|skylenar||||||||};
{taylin|monsters_rltiles1:74|Taylin|taylin||0|||||||||||||||taylin||||||||};
{petdog|monsters_dogs:0|Dog|petdog||4|||||||||||||||petdog||||||||};
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 0bf9b2da9..9e7d8abf5 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -199,8 +199,6 @@
<a href="http://code.google.com/p/andors-trail/">Project homepage on code.google.com for developers.</a><br />
<br />
Please visit the forums to discuss the game with other players.<br />
- <br />
- We really should add some info here about how to play the game :)<br />