fix language

Correct count of maps+quests

AndorsTrail/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="54"
-	android:versionName="0.7.11"
+	android:versionCode="55"
+	android:versionName="0.7.12"
 	android:installLocation="auto"
 	>
 	<uses-sdk 

AndorsTrail/play/listings/en-UK/full-description.txt

@@ -1,86 +0,0 @@
-Explore the world of Dhayavar looking for your brother Andor in this quest-driven fantasy RPG inspired by old-school classics like Ultima, Rogue and Legend of Zelda.
-
-Battle monsters in turn-based combat, become stronger through level ups and skills, choose from a wide range of equipment, interact with numerous NPCs, visit shops, inns and taverns, search for treasure, and solve quests to follow the trail of your brother and uncover the secrets of the powers at play in Dhayavar. With luck, you may even find a legendary item!
-
-You can currently visit up to 497 maps and complete up to 63 quests.
-
-The game is completely free. There is no payment to install, no ads, no in-app purchases, and no DLCs. There is no internet access required, and it can run on all versions of Android from 1.6 (Eclair), so it should run on any device, even low-end oldies.
-
-Andor's Trail is open-source software, released under the GPL v2 license.
-You can get the sources from https://github.com/Zukero/andors-trail
-
-Game translation is crowd-sourced on https://hosted.weblate.org/translate/andors-trail
-
-Andor's Trail is a work in progress, and while there is a lot of content to play, the game isn't completed. You can participate in the development or give ideas on our forums too!
-
-If you wish to participate, we have released a content editor called ATCS, downloadable for free from www.andorstrail.com that makes it possible for anyone to create new material and expand the game, with no coding required! If you like the game, you can join others that have already created some of the content in the current release. You can see your own ideas come to life in a game that hundreds of thousands of people have played!
-*This requires a PC (Windows or Linux) or a Mac. See the forums for details regarding content creation.
-
-Visit our forums on www.andorstrail.com for help, hints, tips and general discussion. We love our community's feedback!
-
-Changelog:
-
-v0.7.9
-For a better overview you can now reduce the view to 75% or 50%
-A certain person has found another, rather unfrequented tavern
-Fixed the Arulir crashes
-Fixed Ukrainian language crash and change language crash on older phones
-Updated translations
-
-v0.7.8
-A few new quests and several new maps.
-
-For new characters you can choose one of the new hardcore modes: No Saves, Limited Lives, or Permadeath.
-
-Up to now, languages have been limited to English or your local language, as determined by your device settings. Now you can choose between different languages that are translated to a significant extent.
-
-v0.7.7
-Content:
- 	Fixed typos
-
-Translations:
- 	Fixed issues with translations integration in 0.7.6
- 	Fixed crashes for Greek players
-
-v0.7.6
-Content
- 	Three quests with well known thieves.
- 	Five new maps.
-
-Translations:
- 	100% Italian, Polish, Russian, Spanish
- 	99% German
- 	87% Portuguese
- 	84% Portuguese Brazil
- 	65% Basque
- 	64% French
- 	48% Hungarian
- 	20% Czech
- 	20% Turkish
-
-v0.7.5
-Content
-- Fix for crash in guynmart after special exit
-- Fix for loading pl, ar, and pt_BR content translations
-Code
-- Workaround for failure to save on first start
-- Workaround for weird NPE in Taunt messages
-
-v0.7.4
-Translations
-- Russian & Belarusian 100%
-- German and Italian >99%
-- Polish, Portuguese and Brazilian Portuguese >70%
-- Basque and French >50%
-Code
-- Fixed causes of most occuring "Force Close" a.k.a. crashes.
-- Fixed worldmap bug on towwn names for non-latin scripts (like Cyrillic)
-- Fixed reporting of skills' effects on combat (Cleave, Fracture...).
-- Fixed disappearing red X on worldmap in Remgard.
-- Fixed movement animation sometimes missing after map change
-Content
-- Fixed minor visual issues on many maps.
-- Fixed a few quest bugs and typos
-- Fixed issue with Feygard bridge guard on some old saves.
-- Three new places to visit.
-- Avoid monster stunning by "Robe of the Sublimate"

AndorsTrail/play/listings/en-UK/whatsnew.txt

@@ -1,15 +0,0 @@
-Weapon Rebalancing
-Rebalancing of level 1 to 5 rewards
-A new skill, "The way of the monk" and some equipment
-Sorting of quest logs by time
-Fixes for monster difficulty
-Better explanation for permissions
-Conversation will not close when you click outside of dialogues
-Fix toast crashes (e.g. after fights)
-Fix listener crashes
-Fix Mapchange crashes
-Fix minor bugs and typos
-Translations actualized
-
-Finally a warning:
-For any PERMADEATH characters it would be a good idea to save before updating.

AndorsTrail/play/listings/en-US/full-description.txt

@@ -1,8 +1,8 @@
-Explore the world of Dhayavar looking for your brother Andor in this quest-driven fantasy RPG inspired by old-school classics like Ultima, Rogue and Legend of Zelda.
+Explore the world of Dhayavar looking for your brother Andor in this quest-driven fantasy RPG inspired by old-school classics.
 
 Battle monsters in turn-based combat, become stronger through level ups and skills, choose from a wide range of equipment, interact with numerous NPCs, visit shops, inns and taverns, search for treasure, and solve quests to follow the trail of your brother and uncover the secrets of the powers at play in Dhayavar. With luck, you may even find a legendary item!
 
-You can currently visit up to 551 maps and complete up to 75 quests.
+You can currently visit up to 555 maps and complete up to 78 quests.
 
 The game is completely free. There is no payment to install, no ads, no in-app purchases, and no DLCs. There is no internet access required, and it can run on all versions of Android from 1.6 (Eclair), so it should run on any device, even low-end oldies.
 
@@ -20,6 +20,15 @@ Visit our forums on www.andorstrail.com for help, hints, tips and general discus
 
 Changelog:
 
+v0.7.11
+A new city located east of Loneford
+Seven new quests
+37 new maps
+One new extraordinary item by rare drop
+Remember Bonemeal is illegal - And now there are consequences for its possession
+Various bug fixes - Burhczyd fix
+Translations actualized
+
 v0.7.10
 Weapon Rebalancing
 Rebalancing of level 1 to 5 rewards
@@ -79,22 +88,3 @@ Content
 Code
 - Workaround for failure to save on first start
 - Workaround for weird NPE in Taunt messages
-
-v0.7.4
-Translations
-- Russian & Belarusian 100%
-- German and Italian >99%
-- Polish, Portuguese and Brazilian Portuguese >70%
-- Basque and French >50%
-Code
-- Fixed causes of most occuring "Force Close" a.k.a. crashes.
-- Fixed worldmap bug on towwn names for non-latin scripts (like Cyrillic)
-- Fixed reporting of skills' effects on combat (Cleave, Fracture...).
-- Fixed disappearing red X on worldmap in Remgard.
-- Fixed movement animation sometimes missing after map change
-Content
-- Fixed minor visual issues on many maps.
-- Fixed a few quest bugs and typos
-- Fixed issue with Feygard bridge guard on some old saves.
-- Three new places to visit.
-- Avoid monster stunning by "Robe of the Sublimate"

AndorsTrail/play/listings/en-US/whatsnew.txt

@@ -1,11 +1,10 @@
-A new city located east of Loneford
-Seven new quests
-37 new maps
-One new extraordinary item by rare drop
-Remember Bonemeal is illegal - And now there are consequences for its possession
-Various bug fixes - Burhczyd fix
+Changes in the start village Crossglen to make it even more fun and easier in the beginning
+4 new quests and one enhanced quest
+4 new maps
+New weapon class "Pole arm weapons" and fighting style
+When dpad is active (both visible and not minimized), normal touch-based movement is prevented
+Various small changes and bug fixes
 Translations actualized
 
 Finally a warning:
 For any PERMADEATH characters it would be a good idea to save before updating.
-

AndorsTrail/res/raw/conversationlist_arulir_mountain.json

@@ -2066,5 +2066,39 @@
     {
         "id":"arulircave_trap10_30",
         "message":"Maybe the current will wash you ashore somewhere?"
+    },
+    {
+        "id":"arulircave_trap101",
+        "message":"The ground over there is very slippery. You don't want to fall into the water again."
+    },
+    {
+        "id":"arulircave_trap101_chk",
+        "replies":[
+            {
+                "nextPhraseID":"arulircave_trap101_chk_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_trap",
+                        "value":10
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap101_chk_2",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":101
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"arulircave_trap",
+                "value":10
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_brimhaven.json

@@ -1626,7 +1626,24 @@
     },
     {
         "id":"brv_tavern1_guest2",
-        "message":"I hate myself, because I'm drinking..."
+        "message":"I'm drinking because my wife left me and took my beagle with her.  Now how am I supposed to hunt?",
+        "replies":[
+            {
+                "text":"I'm so sorry to hear about your problems.  I love dogs too.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Hey, speaking of killing, I'm wondering if you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_tavern1_guest2_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_tavern1_landlord",
@@ -2678,7 +2695,21 @@
     },
     {
         "id":"brimhaven_church_guard",
-        "message":"Stop! You are not allowed to go any further."
+        "message":"Stop! You are not allowed to go any further.",
+        "replies":[
+            {
+                "text":"I'm on a mission.",
+                "nextPhraseID":"brimhaven_church_guard_1"
+            },
+            {
+                "text":"OK, I'll leave.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"OK. I'll leave [lie].",
+                "nextPhraseID":"X"
+            }
+        ]
     },
     {
         "id":"arlish_0",
@@ -2719,6 +2750,87 @@
                         "value":42
                     }
                 ]
+            },
+            {
+                "text":"What can you tell me about Lawellyn's dagger?",
+                "nextPhraseID":"arlish_asd_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":110
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":115,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":120,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I want to talk about the investigation.",
+                "nextPhraseID":"arlish_asd_100",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130,
+                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I need to find a large empty bottle. Do you have one?",
+                "nextPhraseID":"arlish_bottle_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":40,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -2848,7 +2960,32 @@
     },
     {
         "id":"blackjack_gambler2",
-        "message":"I already made a fortune. Want to join us? Then take a seat in the empty chair and talk to the dealer."
+        "message":"I already made a fortune. Want to join us? Then take a seat in the empty chair and talk to the dealer.",
+        "replies":[
+            {
+                "text":"Excuse me sir, but you look like someone that may be able to help me.",
+                "nextPhraseID":"blackjack_gambler2_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"blackjack_left_seat",
@@ -3138,7 +3275,7 @@
                 "nextPhraseID":"blackjack_bet_select"
             },
             {
-                "text":"I have enough.",
+                "text":"I have had enough.",
                 "nextPhraseID":"X"
             },
             {
@@ -3182,7 +3319,32 @@
     },
     {
         "id":"brv_tavern_west_guest",
-        "message":"Go away and let me eat."
+        "message":"Go away and let me eat.",
+        "replies":[
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_tavern_west_guest_asd_inquiry_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_laundry_worker_0",
@@ -3324,6 +3486,29 @@
             {
                 "text":"I have to go.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_asd_no_info_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -3354,7 +3539,7 @@
                     {
                         "requireType":"questProgress",
                         "requireID":"brv_nondisplay_multipurpose",
-                        "value":10
+                        "value":15
                     }
                 ]
             },
@@ -3372,6 +3557,22 @@
             {
                 "text":"I am looking for my brother, Andor. He looks a bit like me.",
                 "nextPhraseID":"brv_laundry_boss_0b"
+            },
+            {
+                "text":"Have you ever seen a glove like this? [Shows Venanra the glove.]",
+                "nextPhraseID":"brv_laundry_boss_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":170
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    }
+                ]
             }
         ]
     },
@@ -3393,6 +3594,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"brv_nondisplay_multipurpose",
                 "value":10
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay_multipurpose",
+                "value":15
             }
         ]
     },
@@ -3686,7 +3892,7 @@
     },
     {
         "id":"brv_brothers_3",
-        "message":"HEH HEH yEa",
+        "message":"HEH HEH. Yeah!",
         "switchToNPC":"brv_attohead",
         "replies":[
             {
@@ -4455,6 +4661,16 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"brv_prison_guard_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"brv_prison_guard_10"
             }
@@ -4462,7 +4678,7 @@
     },
     {
         "id":"brv_prison_guard_20",
-        "message":"Are you looking for the captain? He has been gone for a while now, arresting the person that destroyed the dam."
+        "message":"Are you looking for the captain? She has been gone for a while now, arresting the person that destroyed the dam."
     },
     {
         "id":"brv_prison_guard_10",
@@ -4502,7 +4718,21 @@
     },
     {
         "id":"brv2_grave_9",
-        "message":"Here lies Connat, who spent his life complaining that he was dying. In the end, he was right."
+        "replies":[
+            {
+                "nextPhraseID":"brv2_grave_9_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":105
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv2_grave_9_0"
+            }
+        ]
     },
     {
         "id":"brv2_grave_10",
@@ -5002,7 +5232,32 @@
     },
     {
         "id":"brv_villager1",
-        "message":"Hello"
+        "message":"Hello",
+        "replies":[
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_asd_no_info_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_villager2",
@@ -5010,7 +5265,59 @@
     },
     {
         "id":"brv_villager3",
-        "message":"You are not from Brimhaven, are you? If you need a place to stay, visit the inn in the eastern part of the town. There are beds available for rent. But it is bit untidy there."
+        "message":"You are not from Brimhaven, are you? If you need a place to stay, visit the inn in the eastern part of the town. There are beds available for rent. But it is a bit untidy there.",
+        "replies":[
+            {
+                "text":"I suspect that you killed Lawellyn or that you were at the very least at the scene of the murder at the time of his death.",
+                "nextPhraseID":"brv_villager3_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":180
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"No need to pretend we've never met. I do believe you are innocent.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190
+                    }
+                ]
+            },
+            {
+                "text":"Don't pretend we've never met. Soon you will be in jail.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_villager4",
@@ -5380,7 +5687,7 @@
     },
     {
         "id":"tamarukh_10",
-        "message":"Sure. We had built this dam in Brimhaven to get more space for arable land, but someone must have sabotated it.",
+        "message":"Sure. We had built this dam in Brimhaven to get more space for arable land, but someone must have sabotaged it.",
         "replies":[
             {
                 "text":"Would you like to repair the dam again?",
@@ -5612,7 +5919,7 @@
     },
     {
         "id":"quiet_thief_2_3",
-        "message":"I think 1000gp would be fair. Is that acceptable?",
+        "message":"I think 1000 gold would be fair. Is that acceptable?",
         "replies":[
             {
                 "text":"No. That's too much for me.",
@@ -5668,7 +5975,7 @@
     },
     {
         "id":"quiet_thief_3_3",
-        "message":"I think 1500gp would be fair. Is that acceptable?",
+        "message":"I think 1500 gold would be fair. Is that acceptable?",
         "replies":[
             {
                 "text":"No, that's too much for me.",
@@ -5705,7 +6012,7 @@
     },
     {
         "id":"edrin_2_1",
-        "message":"I recognize this. I made it, many years ago. See this recess in the pommel? There used to be an unusual gem in that. It gave the dagger some special properties. If you can find the gem, I can repair it for you.",
+        "message":"I recognize this. I made it, many years ago, for a man called Lawellyn. Alas, I hear he is now dead. See this recess in the pommel? There used to be an unusual gem in that. It gave the dagger some special properties. If you can find the gem, I can repair it for you.",
         "replies":[
             {
                 "text":"I think I know where to find that. I'll go and get it.",
@@ -5730,7 +6037,7 @@
     },
     {
         "id":"edrin_3_1",
-        "message":"I recognize this. It was used in something I made, many years ago. It was set into the pommel of a dagger. It gave the dagger some special properties. If you can find the dagger, I can repair it for you.",
+        "message":"I recognize this. It was used in something I made, many years ago. It was set into the pommel of a dagger I made for a man called Lawellyn. Alas, I hear he is now dead. It gave the dagger some special properties. If you can find the dagger, I can repair it for you.",
         "replies":[
             {
                 "text":"I think I know where to find that. I'll be right back.",
@@ -5755,7 +6062,7 @@
     },
     {
         "id":"edrin_4_1",
-        "message":"I recognize these. I made the dagger, many years ago. See this recess in the pommel? The gem you have fits in that. It gave the dagger some special properties. If you wish, I can repair it for you.",
+        "message":"I recognize these. I made the dagger, many years ago, for a man called Lawellyn. Alas, I hear he is now dead. See this recess in the pommel? The gem you have fits in that. It gave the dagger some special properties. If you wish, I can repair it for you.",
         "replies":[
             {
                 "text":"How much will that cost?",
@@ -5967,7 +6274,7 @@
     },
     {
         "id":"edrin_4_2",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6068,7 +6375,7 @@
     },
     {
         "id":"edrin_7_1a",
-        "message":"Yes, it is done. Here is the repaired dagger.",
+        "message":"Yes, it is done. Here is the repaired dagger.  It's nice to see Lawellyn's dagger brought back to its original glory. There is some mystery about his death. I don't know anything about it though. Maybe someone else in town can tell you more.",
         "rewards":[
             {
                 "rewardType":"giveItem",
@@ -6084,11 +6391,11 @@
     },
     {
         "id":"edrin_7_1b",
-        "message":"Yes, it is done. Here is the repaired dagger.",
+        "message":"Yes, it is done. Here is the repaired dagger.  It's nice to see Lawellyn's dagger brought back to its original glory. There is some mystery about his death. I don't know anything about it though. Maybe someone else in town can tell you more.",
         "rewards":[
             {
                 "rewardType":"giveItem",
-                "rewardID":"strange_dagger",
+                "rewardID":"dagger_assassin",
                 "value":1
             },
             {
@@ -6115,7 +6422,7 @@
     },
     {
         "id":"edrin_5_1",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6150,7 +6457,7 @@
     },
     {
         "id":"edrin_6_1",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6289,7 +6596,7 @@
     },
     {
         "id":"brv_shop_owner_2",
-        "message":"Are you lookng for something in particular?",
+        "message":"Are you looking for something in particular?",
         "replies":[
             {
                 "text":"[You point to a very expensive looking necklace] How much is this?",
@@ -6500,7 +6807,7 @@
     },
     {
         "id":"mikhail_present_20",
-        "message":"Oh, you are such a good son.",
+        "message":"Oh, you are such a nice child.",
         "replies":[
             {
                 "text":"[Give him the cheap necklace]",
@@ -6580,7 +6887,7 @@
     },
     {
         "id":"mikhail_present_20_2",
-        "message":"Thank you my son for this wonderful necklace. Oh and it is in our family colors!",
+        "message":"Thank you my child for this wonderful necklace. Oh and it is in our family colors!",
         "replies":[
             {
                 "text":"N",
@@ -6748,7 +7055,7 @@
     },
     {
         "id":"mikhail_news_50",
-        "message":"Thank you my son. Keep on searching for Andor.",
+        "message":"Thank you my child. Keep on searching for Andor.",
         "replies":[
             {
                 "text":"N",
@@ -8041,7 +8348,7 @@
                 ]
             },
             {
-                "text":"Explain to me the rules, please.",
+                "text":"Please explain the rules to me.",
                 "nextPhraseID":"blackjack_rules"
             }
         ],
@@ -8103,7 +8410,7 @@
     },
     {
         "id":"thelry_1",
-        "message":"No, sorry, I haven't seen onyone like that.",
+        "message":"No, sorry, I haven't seen anyone like that.",
         "replies":[
             {
                 "text":"OK. Thanks. What do you have to sell?",

AndorsTrail/res/raw/conversationlist_brimhaven2.json

@@ -464,7 +464,7 @@
     },
     {
         "id":"brv_school_history_30",
-        "message":"Just imagine all those mighty churches and splendid palaces! It was a merry time, down under Mt. Galmor, the highest mountain in whole Dhayavar.",
+        "message":"Just imagine all those mighty churches and splendid palaces! It was a merry time, down under Mt. Galmore, the highest mountain in whole of Dhayavar.",
         "replies":[
             {
                 "text":"Sigh.",
@@ -538,7 +538,7 @@
     },
     {
         "id":"brv_school_history_46",
-        "message":"The cultists worshipped the blinding and cleansing light of Elythara. Clever and sneaky as they were, they have gained people's trust.",
+        "message":"The cultists worshipped the blinding and cleansing light of Elythara. Clever and sneaky as they were, they gained people's trust.",
         "replies":[
             {
                 "text":"N",
@@ -620,7 +620,7 @@
     },
     {
         "id":"brv_school_history_60",
-        "message":"However Elythara and her cultists failed to completely annihilate the old ways. Many true men managed to hide in remote places in the total darkness, unknown to the Elytharans. Also Elythara's power is diminished underground.",
+        "message":"However Elythara and her cultists failed to completely annihilate the old ways. Many true men managed to hide in remote places in the total darkness, unknown to the Elytharans. Also, Elythara's power is diminished underground.",
         "switchToNPC":"brv_teacher",
         "replies":[
             {
@@ -653,7 +653,7 @@
     },
     {
         "id":"brv_school_history_71",
-        "message":"The Elytharans built several towns and cities, dedicated to their goddess. Several aristocratic houses were formed by that time.",
+        "message":"The Elytharans built several towns and cities, dedicated to their goddess. Several aristocratic houses were formed at that time.",
         "replies":[
             {
                 "text":"N",
@@ -673,7 +673,7 @@
     },
     {
         "id":"brv_school_history_73",
-        "message":"The town of Loneford was founded and it soon became famous for its fertile fields and healthy vegetable which fed the northern parts of the Forgotten Kingdom.",
+        "message":"The town of Loneford was founded and it soon became famous for its fertile fields and healthy vegetables which fed the northern parts of the Forgotten Kingdom.",
         "replies":[
             {
                 "text":"N",
@@ -874,7 +874,7 @@
     },
     {
         "id":"brv_school_history_200",
-        "message":"And now we get to a completely different thing. Let's have some practice with fighting.",
+        "message":"And now we will do something completely different. Let's practice fighting, so that you learn how to defend yourselves.",
         "replies":[
             {
                 "text":"Finally. I thought her talking would never cease.",
@@ -4392,6 +4392,29 @@
                         "requireID":"20"
                     }
                 ]
+            },
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"guard_advent_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_brimhaven_2b.json

@@ -0,0 +1,586 @@
+[
+    {
+        "id":"hettar",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_80",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_50",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":50
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_1"
+            }
+        ]
+    },
+    {
+        "id":"hettar_1",
+        "message":"Norry!  Nooorryyyy!",
+        "replies":[
+            {
+                "text":"Hush! Don't make such noise with all these monsters around!",
+                "nextPhraseID":"hettar_1_4"
+            },
+            {
+                "text":"Who is Norry?",
+                "nextPhraseID":"hettar_1_2"
+            }
+        ]
+    },
+    {
+        "id":"hettar_1_2",
+        "message":"Norry is my little doggie. He fell down the steep slope and has not found his way back yet.",
+        "replies":[
+            {
+                "text":"Oh dear.",
+                "nextPhraseID":"hettar_10"
+            },
+            {
+                "text":"A dog! He will be back soon... I better go now.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I have seen a great wolfhound down there a short while ago. But you say you are missing a little doggie.",
+                "nextPhraseID":"hettar_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"hettar_1_4",
+        "message":"I can see these Gornauds myself. That's why I must find Norry urgently.\nNooorryyyy!",
+        "replies":[
+            {
+                "text":"Who is Norry?",
+                "nextPhraseID":"hettar_1_2"
+            }
+        ]
+    },
+    {
+        "id":"hettar_10",
+        "message":"Please help to find Norry. He is my only friend, and he is helpless without me.",
+        "replies":[
+            {
+                "text":"How can I help you?",
+                "nextPhraseID":"hettar_20"
+            },
+            {
+                "text":"The wolfhound down there had brown fur with a white patch on the breast. He was enjoying himself gnawing some huge bones.",
+                "nextPhraseID":"hettar_10_4",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"hettar_10_4",
+        "message":"This must be him! Go and get him here - be quick!",
+        "replies":[
+            {
+                "text":"That would be of no use. This brute had attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"This brute growled at me, but I got away unharmed.",
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Eh, I have to leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_10_6",
+        "message":"[Hettar fell on the floor]\nNooo! What did you do?!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"hettar_20",
+        "message":"Please go down there and look for my doggie. Maybe he is injured? Bring him back! You must!",
+        "replies":[
+            {
+                "text":"OK, I'll do it.",
+                "nextPhraseID":"hettar_20_10",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"This brute attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Eh, I have to leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_20_10",
+        "message":"Great! Go immediately, as long as he might be alive still.",
+        "replies":[
+            {
+                "text":"I hope he will follow me.",
+                "nextPhraseID":"hettar_20_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I hope he will follow me.",
+                "nextPhraseID":"hettar_20_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "text":"I have no time just now. I'll be back soon.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":20
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog3",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            }
+        ]
+    },
+    {
+        "id":"hettar_20_20",
+        "message":"I gave you my last piece of Wyrm meat for Norry. Did you lose it?"
+    },
+    {
+        "id":"hettar_20_30",
+        "message":"Good that you have mentioned it. I'll give you a nice raw piece of Wyrm meat that I have as food for Norry. He loves them.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":30
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"hettar_bone",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_30",
+        "message":"I can read it in your face - there is no hope for Norry.",
+        "replies":[
+            {
+                "text":"This brute attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"This brute growled at me, but I got away and let it live.",
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I am still searching.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_50",
+        "message":"Haha! You know what? Norry has come back all alone! You have made all the way down unnecessarily.",
+        "replies":[
+            {
+                "text":"Now guess who had persuaded him to do so? He was absorbed by a pile of monster bones.",
+                "nextPhraseID":"hettar_50_10"
+            }
+        ]
+    },
+    {
+        "id":"hettar_50_10",
+        "message":"Oh. Thank you then.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"hettar_80",
+        "message":"Thank you again a thousand times for rescuing my little Norry!"
+    },
+    {
+        "id":"hettar_90",
+        "message":"My poor Norry! Why did you have to die so young?\n* Sob *",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"hettar_90_10"
+            }
+        ]
+    },
+    {
+        "id":"hettar_90_10",
+        "message":"Go away! I hate you!"
+    },
+    {
+        "id":"hettar_bones",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_bones_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_10",
+        "message":"You see several huge bones of a monstrous skeleton. Good that this creature is dead now and not attacking you.",
+        "replies":[
+            {
+                "text":"Take the bones.",
+                "nextPhraseID":"hettar_bones_20"
+            },
+            {
+                "text":"Leave the bones where they are.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_20",
+        "message":"GROWL!",
+        "switchToNPC":"hettar_dog",
+        "replies":[
+            {
+                "text":"The wolfhound doesn't want you to take 'his' bones.\nTake them nevertheless.",
+                "nextPhraseID":"hettar_bones_30"
+            },
+            {
+                "text":"Leave the bones where they are.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_30",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_bones_40",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"hettar_bone",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"bwm_bones",
+                "value":1
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_40",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog3",
+                "mapName":"blackwater_mountain55"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog",
+        "message":"Growl!",
+        "replies":[
+            {
+                "text":"Hey Norry, look here! I have some much better food for you from Hettar.",
+                "nextPhraseID":"hettar_dog_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"hettar_bone",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "text":"Hey Norry, look here! I have a Wyrm steak for you from Hettar.",
+                "nextPhraseID":"hettar_dog_50",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"hettar_bone",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Now run to Hettar! He is waiting for you.",
+                "nextPhraseID":"hettar_dog_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "text":"OK, I go. Stupid dog.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_10",
+        "message":"The wolfhound fetched the meat from your hand and devoured it greedily in a few seconds.",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"There, there. And now run to Hettar! He is waiting for you.",
+                "nextPhraseID":"hettar_dog_20"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":2
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":40
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_20",
+        "message":"A moment later the huge wolfhound was gone.",
+        "switchToNPC":"none",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog2",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_50",
+        "message":"Grrrowl.",
+        "replies":[
+            {
+                "text":"Ah, I see. These monstrous bones here on the ground are delicious too.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog2",
+        "message":"Growl!"
+    }
+]

AndorsTrail/res/raw/conversationlist_burhczyd.json

@@ -1798,7 +1798,7 @@
     },
     {
         "id":"burhczydx_3a_2",
-        "message":"Don't ask. Still no orders. And I have now idea why.",
+        "message":"Don't ask. Still no orders. And I have no idea why.",
         "replies":[
             {
                 "text":"That's horrible! What did you call your company? It should be short and memorable.",

AndorsTrail/res/raw/conversationlist_crossglen_leta.json

@@ -67,7 +67,31 @@
                 ]
             },
             {
-                "nextPhraseID":"leta_oromir1"
+                "nextPhraseID":"leta_oromir1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":100,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"leta_oromir_complete2_helped_oromir",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105
+                    }
+                ]
             }
         ]
     },
@@ -81,12 +105,150 @@
             },
             {
                 "text":"Yes, I found him. He is hiding among some trees to the east.",
-                "nextPhraseID":"leta_oromir_complete",
+                "nextPhraseID":"leta_oromir1_trees",
                 "requires":[
                     {
                         "requireType":"questProgress",
                         "requireID":"leta",
                         "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":40,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":25,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_trees_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":25
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_behind_inn_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_behind_haystack_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45
+                    }
+                ]
+            },
+            {
+                "text":"He's found a new hiding spot.",
+                "nextPhraseID":"leta_oromir1_behind_inn_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"He's found another new hiding spot. Give him credit, he is great at avoiding work.",
+                "nextPhraseID":"leta_oromir1_behind_haystack_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"He's in your basement.",
+                "nextPhraseID":"leta_oromir1_basement_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80
                     }
                 ]
             }
@@ -133,8 +295,20 @@
         "message":"I'm hiding here from my wife Leta. She is always getting angry at me for not helping out on the farm. Please don't tell her that I'm here.",
         "replies":[
             {
-                "text":"OK.",
+                "text":"[Lie] OK.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"Your secret is safe with me.",
+                "nextPhraseID":"oromir_trees_help_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":100,
+                        "negate":true
+                    }
+                ]
             }
         ],
         "rewards":[

AndorsTrail/res/raw/conversationlist_erinith.json

@@ -368,7 +368,7 @@
                 ]
             },
             {
-                "text":"Here, take this potion of major health.",
+                "text":"Here, take this major potion of health.",
                 "nextPhraseID":"erinith_gavepotion_major_1",
                 "requires":[
                     {
@@ -379,7 +379,7 @@
                 ]
             },
             {
-                "text":"Here, take this potion of major health.",
+                "text":"Here, take this major flask of health.",
                 "nextPhraseID":"erinith_gavepotion_major_1",
                 "requires":[
                     {

AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json

@@ -45,6 +45,17 @@
                     }
                 ]
             },
+            {
+                "text":"Umar sent me.",
+                "nextPhraseID":"bela_room_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"misc_nondisplay ",
+                        "value":20
+                    }
+                ]
+            },
             {
                 "text":"No thanks.",
                 "nextPhraseID":"bela"
@@ -53,7 +64,7 @@
     },
     {
         "id":"bela_room_2",
-        "message":"Thanks. Take the last room down at the end of the hall.",
+        "message":"OK. Take the last room down at the end of the hall.",
         "replies":[
             {
                 "text":"Thank you. There was something else I wanted to talk about.",

AndorsTrail/res/raw/conversationlist_falothen.json

@@ -62,6 +62,16 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"falothen1_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"charwood1",
+                        "value":76
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"falothen1_1"
             }
@@ -109,7 +119,7 @@
     },
     {
         "id":"falothen1_5",
-        "message":"I can teach you about swords, either one-handed or two-handed ones. I know a bit about daggers, axes and blunt weapons. I also know a fair deal about fighting with your bare fists.",
+        "message":"I can teach you about swords, either one-handed or two-handed ones. I know a bit about daggers, axes, polearms, and blunt weapons. I also know a fair deal about fighting with your bare fists.",
         "replies":[
             {
                 "text":"N",
@@ -145,6 +155,10 @@
                 "text":"Tell me more about blunt weapons.",
                 "nextPhraseID":"falothen1_7_b"
             },
+            {
+                "text":"Tell me more about polearms.",
+                "nextPhraseID":"falothen1_7_pa"
+            },
             {
                 "text":"I'll be right back.",
                 "nextPhraseID":"X"
@@ -658,6 +672,10 @@
                 "text":"Tell me more about blunt weapons.",
                 "nextPhraseID":"falothen1_2nd_b"
             },
+            {
+                "text":"Tell me more about polearms.",
+                "nextPhraseID":"falothen1_2nd_pa"
+            },
             {
                 "text":"I'll be right back.",
                 "nextPhraseID":"X"

AndorsTrail/res/raw/conversationlist_gandoren.json

@@ -476,6 +476,18 @@
                         "value":60
                     }
                 ]
+            },
+            {
+                "text":"I'd rather talk about the troubles in Loneford that you had mentioned.",
+                "nextPhraseID":"cr_loneford_st_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"loneford",
+                        "value":21,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_graveyard1.json

@@ -1072,8 +1072,8 @@
                     },
                     {
                         "requireType":"questProgress",
-                        "requireID":"graveyard_quest",
-                        "value":80,
+                        "requireID":"nondisplay_2",
+                        "value":240,
                         "negate":true
                     },
                     {
@@ -1082,6 +1082,23 @@
                         "value":1
                     }
                 ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"graveyardday2a",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"graveyardking",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":240,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -1391,6 +1408,11 @@
                 "rewardType":"removeSpawnArea",
                 "rewardID":"graveyard_corpse_boss_patrol",
                 "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":240
             }
         ]
     },
@@ -1746,7 +1768,7 @@
         "message":"What's a kid like you doing around here? It's a dangerous place to be.",
         "replies":[
             {
-                "text":"I'm looking for my Brother, Andor. He looks a bit like me.",
+                "text":"I'm looking for my brother, Andor. He looks a bit like me.",
                 "nextPhraseID":"cithurn_65"
             },
             {

AndorsTrail/res/raw/conversationlist_guynmart2_npc.json

@@ -265,7 +265,8 @@
     },
     {
         "id":"guynmart_dog10_10",
-        "message":"Grrrrrr"
+        "message":"Grrrrrr",
+        "switchToNPC":"guynmart_dog10"
     },
     {
         "id":"guynmart_cguard_10",

AndorsTrail/res/raw/conversationlist_lodar.json

@@ -1569,7 +1569,7 @@
     },
     {
         "id":"lodar_andor0",
-        "message":"Oh, you must be referring to that other boy that was here recently.",
+        "message":"Oh, you must be referring to that older boy that was here recently.",
         "replies":[
             {
                 "text":"You've seen him? Andor has been here?",

AndorsTrail/res/raw/conversationlist_loneford_2.json

@@ -225,7 +225,7 @@
     },
     {
         "id":"landa_16",
-        "message":"Also, isn't it strange how Buceth has not gotten ill, while all the others in the village has gotten ill?",
+        "message":"Also, isn't it strange how Buceth has not gotten ill, while all the others in the village have gotten ill?",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_loneford_4.json

@@ -189,6 +189,48 @@
     },
     {
         "id":"loneford_tavern_patron",
-        "message":"This is no place for a kid like you. I think you better leave now."
+        "message":"This is no place for a kid like you. I think you had better leave now.",
+        "replies":[
+            {
+                "text":"I met a man named Forlin who recomended that I speak with you in regards to a possible murder investigation that I am conducting.",
+                "nextPhraseID":"kizzo_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":140
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":150,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I did as you suggested and found the scene of a murder and I found this glove.",
+                "nextPhraseID":"kizzo_asd_40",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_mikhail.json

@@ -533,7 +533,7 @@
     },
     {
         "id":"mikhail_rats_complete",
-        "message":"Oh you did? Wow, thanks a lot for your help!\n\nIf you are hurt, use your bed over there to rest and regain your strength.",
+        "message":"Oh you did? Wow, thanks a lot for your help! Please take Andor's training shield - you're going to need it.\n\nIf you are hurt, use your bed over there to rest and regain your strength.",
         "replies":[
             {
                 "text":"N",
@@ -545,6 +545,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"mikhail_rats",
                 "value":100
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"kids_shield",
+                "value":1
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_minarra.json

@@ -392,6 +392,18 @@
                         "value":45
                     }
                 ]
+            },
+            {
+                "text":"I'd rather talk about the troubles in Loneford that you had mentioned.",
+                "nextPhraseID":"cr_loneford_st_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"loneford",
+                        "value":21,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_omicronrg9.json

@@ -1964,7 +1964,7 @@
     },
     {
         "id":"guild02_hatchlever_2b",
-        "message":"Looking around the room, you see an unusual mechanism. A crowbar with a locked chain that prevents a lever from beng moved.",
+        "message":"Looking around the room, you see an unusual mechanism. A crowbar with a locked chain that prevents a lever from being moved.",
         "replies":[
             {
                 "text":"Try to break the chain.",
@@ -4760,6 +4760,13 @@
                 "text":"I'll do that.",
                 "nextPhraseID":"X"
             }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"misc_nondisplay ",
+                "value":20
+            }
         ]
     },
     {

AndorsTrail/res/raw/conversationlist_stoutford.json

@@ -883,7 +883,7 @@
     },
     {
         "id":"glasforn_rumblings20_2",
-        "message":"OK, I can believe that you are Andor's brother. You should have told me earlier!",
+        "message":"OK, I can believe that you are Andor's sibling. You should have told me earlier!",
         "replies":[
             {
                 "text":"Why?",

AndorsTrail/res/raw/conversationlist_stoutford_combined.json

@@ -9688,7 +9688,7 @@
                     {
                         "requireType":"killedMonster",
                         "requireID":"erwyn_soldier",
-                        "value":12
+                        "value":13
                     },
                     {
                         "requireType":"killedMonster",

AndorsTrail/res/raw/droplists_brimhaven.json

@@ -181,6 +181,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"fauchard_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },

AndorsTrail/res/raw/droplists_brimhaven_2.json

@@ -0,0 +1,36 @@
+[
+    {
+        "id":"arlish_bottle",
+        "items":[
+            {
+                "itemID":"large_bottle",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"trapped_mouse",
+        "items":[
+            {
+                "itemID":"trapped_mouse",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":20
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_brimhaven_2b.json

@@ -0,0 +1,15 @@
+[
+    {
+        "id":"hettar_dog3",
+        "items":[
+            {
+                "itemID":"meat",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_crossglen.json

@@ -54,6 +54,22 @@
                     "min":12,
                     "max":12
                 }
+            },
+            {
+                "itemID":"kids_shirt",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"kids_gloves",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -126,17 +142,17 @@
         ]
     },
     {
-      "id":"gold20",
-      "items":[
-        {
-          "itemID":"gold",
-          "chance":"100",
-          "quantity":{
-            "min":20,
-            "max":20
-          }
-        }
-      ]
+        "id":"gold20",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":20
+                }
+            }
+        ]
     },
     {
         "id":"canine",

AndorsTrail/res/raw/droplists_crossglen_outside.json

@@ -244,6 +244,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"inspiring_snake_master_map",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     }

AndorsTrail/res/raw/droplists_trader_teksin.json

@@ -129,6 +129,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"brandistock",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     }

AndorsTrail/res/raw/droplists_v0610_shops.json

@@ -169,6 +169,22 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_iron",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"spear_rusty",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -395,6 +411,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -738,6 +762,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"halberd_iron",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },

AndorsTrail/res/raw/droplists_v0611_shops.json

@@ -261,6 +261,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_steel_remgard",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },

AndorsTrail/res/raw/droplists_v070_shops.json

@@ -150,6 +150,14 @@
                     "min":1,
                     "max":5
                 }
+            },
+            {
+                "itemID":"glaive_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -326,7 +334,7 @@
                     "max":5
                 }
             }
-		]
+        ]
     },
     {
         "id":"shop_lodar",

AndorsTrail/res/raw/itemlist_brimhaven_2.json

@@ -0,0 +1,221 @@
+[
+    {
+        "id":"ogea_glove",
+        "iconID":"items_armours_2:1",
+        "name":"Suspect's glove",
+        "displaytype":"quest",
+        "category":"hnd_lthr",
+        "description":"Is that dried up human blood on there or something less sinister?"
+    },
+    {
+        "id":"kids_shirt",
+        "iconID":"items_japozero:150",
+        "name":"Kid's shirt",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":50,
+        "category":"bdy_clth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseBlockChance":3
+        }
+    },
+    {
+        "id":"kids_gloves",
+        "iconID":"items_japozero:224",
+        "name":"Kid's gloves",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":50,
+        "category":"hnd_cloth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseBlockChance":2
+        }
+    },
+    {
+        "id":"kids_shield",
+        "iconID":"items_japozero:181",
+        "name":"Kid's shield",
+        "displaytype":"rare",
+        "hasManualPrice":1,
+        "baseMarketCost":100,
+        "category":"shld_wd_li",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseBlockChance":1,
+            "increaseDamageResistance":1
+        }
+    },
+    {
+        "id":"inspiring_snake_master_map",
+        "iconID":"items_japozero:422",
+        "name":"Ewmondold's map",
+        "displaytype":"quest",
+        "hasManualPrice":1,
+        "baseMarketCost":0,
+        "category":"other",
+        "description":"Written in a language you do not understand, this appears to be a map.  But to where? You do not know."
+    },
+    {
+        "id":"spear_iron",
+        "iconID":"items_weapons:28",
+        "name":"Iron spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":3
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":4,
+            "setNonWeaponDamageModifier":150
+        }
+    },
+    {
+        "id":"spear_steel",
+        "iconID":"items_reterski_1:21",
+        "name":"Steel spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":5
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":155
+        }
+    },
+    {
+        "id":"halberd_iron",
+        "iconID":"items_weapons_3:56",
+        "name":"Iron halberd",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":5,
+                "max":9
+            },
+            "increaseAttackCost":8,
+            "increaseBlockChance":7,
+            "setNonWeaponDamageModifier":205
+        }
+    },
+    {
+        "id":"brandistock",
+        "iconID":"items_weapons:34",
+        "name":"Brandistock",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":3,
+                "max":4
+            },
+            "increaseAttackCost":5,
+            "increaseCriticalSkill":2,
+            "increaseBlockChance":4,
+            "setCriticalMultiplier":1.2,
+            "setNonWeaponDamageModifier":115
+        }
+    },
+    {
+        "id":"fauchard_steel",
+        "iconID":"items_weapons_3:53",
+        "name":"Steel fauchard",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":5,
+                "max":7
+            },
+            "increaseAttackCost":7,
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":160
+        }
+    },
+    {
+        "id":"glaive_steel",
+        "iconID":"items_weapons:33",
+        "name":"Steel glaive",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":1,
+                "max":7
+            },
+            "increaseAttackCost":7,
+            "increaseBlockChance":6,
+            "setNonWeaponDamageModifier":165
+        }
+    },
+    {
+        "id":"spear_steel_remgard",
+        "iconID":"items_weapons:40",
+        "name":"Remgard steel spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":6,
+                "max":8
+            },
+            "increaseAttackCost":5,
+            "increaseCriticalSkill":5,
+            "increaseBlockChance":6,
+            "setCriticalMultiplier":1.5,
+            "setNonWeaponDamageModifier":120
+        }
+    },
+    {
+        "id":"kids_boots",
+        "iconID":"items_japozero:210",
+        "name":"Kid's boots",
+        "displaytype":"rare",
+        "category":"feet_clth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseAttackChance":1,
+            "increaseBlockChance":2
+        }
+    },
+    {
+        "id":"large_bottle",
+        "iconID":"items_consumables:58",
+        "name":"Large empty bottle",
+        "displaytype":"ordinary",
+        "category":"other"
+    },
+    {
+        "id":"trapped_mouse",
+        "iconID":"items_rijackson_1:15",
+        "name":"Trapped mouse",
+        "displaytype":"ordinary",
+        "category":"other"
+    },
+    {
+        "id":"spear_rusty",
+        "iconID":"items_weapons_3:54",
+        "name":"Rusty iron spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":1,
+                "max":2
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":4,
+            "setNonWeaponDamageModifier":130
+        }
+    }
+]

AndorsTrail/res/raw/itemlist_brimhaven_2b.json

@@ -0,0 +1,21 @@
+[
+    {
+        "id":"bwm_bones",
+        "iconID":"items_misc:44",
+        "name":"Huge bones from the Blackwater Mountains",
+        "hasManualPrice":1,
+        "baseMarketCost":20,
+        "category":"animal",
+        "description":"Good that this creature is dead now and not attacking you."
+    },
+    {
+        "id":"hettar_bone",
+        "iconID":"items_consumables:25",
+        "name":"Wyrm meat",
+        "displaytype":"quest",
+        "hasManualPrice":1,
+        "baseMarketCost":2,
+        "category":"animal",
+        "description":"Norry's food."
+    }
+]

AndorsTrail/res/raw/itemlist_v0610_2.json

@@ -58,8 +58,8 @@
                 "max":5
             },
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":112,
-            "increaseAttackChance":10
+            "increaseAttackChance":10,
+            "setNonWeaponDamageModifier":112
         }
     },
     {
@@ -72,8 +72,8 @@
         "category":"lsword",
         "equipEffect":{
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":120,
-            "increaseAttackChance":-50
+            "increaseAttackChance":-50,
+            "setNonWeaponDamageModifier":120
         }
     },
     {
@@ -99,8 +99,10 @@
                 "max":2
             },
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":102,
-            "increaseAttackChance":-30
+            "increaseAttackChance":-10,
+            "increaseCriticalSkill":1,
+            "setCriticalMultiplier":1.5,
+            "setNonWeaponDamageModifier":102
         },
         "hitEffect":{
             "conditionsTarget":[
@@ -163,8 +165,8 @@
             },
             "increaseMaxHP":-20,
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":96,
-            "increaseAttackChance":40
+            "increaseAttackChance":40,
+            "setNonWeaponDamageModifier":96
         },
         "hitEffect":{
             "conditionsSource":[

AndorsTrail/res/raw/itemlist_v069.json

@@ -14,8 +14,8 @@
             },
             "increaseMaxHP":5,
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":131,
-            "increaseAttackChance":21
+            "increaseAttackChance":21,
+            "setNonWeaponDamageModifier":131
         },
         "hitEffect":{
             "increaseCurrentHP":{
@@ -40,9 +40,9 @@
         "category":"dagger",
         "equipEffect":{
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":107,
             "increaseAttackChance":15,
-            "increaseBlockChance":5
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":107
         },
         "hitEffect":{
             "conditionsTarget":[
@@ -70,9 +70,9 @@
             },
             "increaseMaxAP":2,
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":123,
             "increaseAttackChance":25,
             "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":123,
             "addedConditions":[
                 {
                     "condition":"bless",
@@ -95,9 +95,9 @@
                 "max":6
             },
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":115,
             "increaseAttackChance":21,
-            "increaseBlockChance":5
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":115
         },
         "killEffect":{
             "conditionsSource":[
@@ -125,10 +125,10 @@
             },
             "increaseMaxAP":2,
             "increaseAttackCost":7,
-            "setNonWeaponDamageModifier":185,
             "increaseAttackChance":25,
             "increaseCriticalSkill":10,
-            "setCriticalMultiplier":2.0
+            "setCriticalMultiplier":2.0,
+            "setNonWeaponDamageModifier":185
         },
         "killEffect":{
             "increaseCurrentHP":{
@@ -225,9 +225,9 @@
                 "max":7
             },
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":95,
             "increaseAttackChance":50,
             "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":115,
             "addedConditions":[
                 {
                     "condition":"blackwater_misery",
@@ -340,8 +340,8 @@
                 "max":12
             },
             "increaseAttackCost":6,
-            "setNonWeaponDamageModifier":140,
-            "increaseAttackChance":9
+            "increaseAttackChance":9,
+            "setNonWeaponDamageModifier":140
         }
     },
     {
@@ -368,10 +368,10 @@
                 "max":15
             },
             "increaseAttackCost":7,
-            "setNonWeaponDamageModifier":160,
             "increaseAttackChance":15,
             "increaseCriticalSkill":5,
-            "setCriticalMultiplier":3.0
+            "setCriticalMultiplier":3.0,
+            "setNonWeaponDamageModifier":160
         }
     },
     {

AndorsTrail/res/raw/monsterlist_brimhaven.json

@@ -85,7 +85,7 @@
     },
     {
         "id":"brv_tavern1_guest2",
-        "name":"Customer",
+        "name":"Forlin",
         "iconID":"monsters_ld1:64",
         "moveCost":5,
         "monsterClass":"humanoid",
@@ -346,7 +346,7 @@
     },
     {
         "id":"brv_laundry_boss",
-        "name":"Laundry owner",
+        "name":"Venanra",
         "iconID":"monsters_ld1:187",
         "phraseID":"brv_laundry_boss_0",
         "droplistID":"brv_laundry"
@@ -427,7 +427,7 @@
     },
     {
         "id":"quiet_thief",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -437,16 +437,16 @@
     },
     {
         "id":"quiet_thief_1",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
         "movementAggressionType":"none",
-        "droplistID":"quiet_thief"
+        "droplistID":"quiet_thief_1"
     },
     {
         "id":"quiet_thief_2",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -455,7 +455,7 @@
     },
     {
         "id":"quiet_thief_3",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -517,7 +517,7 @@
     },
     {
         "id":"brv_villager3",
-        "name":"Commoner",
+        "name":"Ogea",
         "iconID":"monsters_tometik2:63",
         "monsterClass":"humanoid",
         "spawnGroup":"brv_villager3",

AndorsTrail/res/raw/monsterlist_brimhaven_2.json

@@ -0,0 +1,159 @@
+[
+    {
+        "id":"brv_guard_deputy",
+        "name":"Ito",
+        "iconID":"monsters_ld1:109",
+        "monsterClass":"humanoid",
+        "spawnGroup":"brv_guard_deputy",
+        "phraseID":"brv_guard_deputy_10"
+    },
+    {
+        "id":"inspiring_snake_master",
+        "name":"Ewmondold",
+        "iconID":"monsters_rltiles2:82",
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"inspiring_snake_master",
+        "phraseID":"inspiring_snake_master_10"
+    },
+    {
+        "id":"ewmondold_snake_master",
+        "name":"Ewmondold",
+        "iconID":"monsters_tometik1:18",
+        "maxHP":70,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "attackDamage":{
+            "min":2,
+            "max":5
+        },
+        "phraseID":"ewmondold_snake_master_10",
+        "droplistID":"gold200",
+        "attackCost":5,
+        "attackChance":67,
+        "criticalSkill":200,
+        "criticalMultiplier":3.0,
+        "blockChance":13,
+        "damageResistance":4
+    },
+    {
+        "id":"oromir_behind_inn_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_inn_help",
+        "phraseID":"oromir_behind_inn_help_10"
+    },
+    {
+        "id":"oromir_behind_haystack_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_haystack_help",
+        "phraseID":"oromir_behind_haystack_help_10"
+    },
+    {
+        "id":"oromir_basement_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "monsterClass":"humanoid",
+        "phraseID":"oromir_basement_help_10"
+    },
+    {
+        "id":"oromir_behind_inn",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_inn",
+        "phraseID":"oromir_behind_inn_10"
+    },
+    {
+        "id":"oromir_behind_haystack",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_haystack",
+        "phraseID":"oromir_behind_haystack_10"
+    },
+    {
+        "id":"oromir_basement",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "spawnGroup":"oromir_basement",
+        "phraseID":"oromir_basement_10"
+    },
+    {
+        "id":"brv_undertaker",
+        "name":"Zorvan",
+        "iconID":"monsters_rltiles1:83",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"zorvan",
+        "phraseID":"zorvan_0"
+    },
+    {
+        "id":"hunchback",
+        "name":"Quasi",
+        "iconID":"monsters_ld2:58",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "phraseID":"quasi_0"
+    },
+    {
+        "id":"brv_churchman",
+        "name":"Seviron",
+        "iconID":"monsters_rltiles2:136",
+        "monsterClass":"humanoid",
+        "spawnGroup":"brv_churchman",
+        "phraseID":"brv_churchman_start"
+    },
+    {
+        "id":"brv_churchcat",
+        "name":"Cat",
+        "iconID":"monsters_ld2:103",
+        "maxHP":50,
+        "maxAP":30,
+        "moveCost":2,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":5
+        },
+        "spawnGroup":"brv_churchcat",
+        "phraseID":"brv_churchcat",
+        "attackCost":3,
+        "attackChance":80,
+        "blockChance":50
+    },
+    {
+        "id":"brv_churchmouse",
+        "name":"Mouse",
+        "iconID":"monsters_rats:0",
+        "maxHP":5,
+        "maxAP":10,
+        "moveCost":2,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":1,
+            "max":1
+        },
+        "spawnGroup":"brv_churchmouse",
+        "phraseID":"brv_churchmouse",
+        "droplistID":"rat",
+        "attackCost":5,
+        "attackChance":50,
+        "blockChance":30
+    }
+]

AndorsTrail/res/raw/monsterlist_brimhaven_2b.json

@@ -0,0 +1,44 @@
+[
+    {
+        "id":"hettar",
+        "name":"Little Hettar",
+        "iconID":"monsters_ld1:20",
+        "monsterClass":"humanoid",
+        "spawnGroup":"hettar",
+        "phraseID":"hettar"
+    },
+    {
+        "id":"hettar_dog",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "monsterClass":"animal",
+        "spawnGroup":"hettar_dog",
+        "phraseID":"hettar_dog"
+    },
+    {
+        "id":"hettar_dog2",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "monsterClass":"animal",
+        "spawnGroup":"hettar_dog2",
+        "phraseID":"hettar_dog2"
+    },
+    {
+        "id":"hettar_dog3",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "maxHP":40,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":1,
+            "max":8
+        },
+        "spawnGroup":"hettar_dog3",
+        "droplistID":"hettar_dog3",
+        "attackCost":4,
+        "attackChance":80,
+        "blockChance":150,
+        "damageResistance":5
+    }
+]

AndorsTrail/res/raw/monsterlist_graveyard1.json

@@ -125,7 +125,6 @@
             "max":19
         },
         "spawnGroup":"graveyard_corpse2",
-        "phraseID":"graveyard_corpse1",
         "droplistID":"gold200",
         "attackCost":3,
         "attackChance":170,
@@ -440,14 +439,52 @@
         "name":"Angry graveyard corpse",
         "iconID":"monsters_zombie2:0",
         "maxHP":90,
+        "maxAP":10,
         "moveCost":3,
         "monsterClass":"undead",
-        "movementAggressionType":"none",
         "attackDamage":{
             "min":6,
             "max":19
         },
         "spawnGroup":"graveyard_corpse3",
+        "phraseID":"graveyard_corpse1",
+        "droplistID":"gold200",
+        "attackCost":3,
+        "attackChance":170,
+        "criticalSkill":10,
+        "criticalMultiplier":2.0,
+        "blockChance":165,
+        "damageResistance":11,
+        "hitEffect":{
+            "increaseCurrentHP":{
+                "min":1,
+                "max":3
+            },
+            "conditionsTarget":[
+                {
+                    "condition":"putrefaction",
+                    "magnitude":2,
+                    "duration":3,
+                    "chance":"30"
+                }
+            ]
+        }
+    },
+    {
+        "id":"graveyard_corpse3",
+        "name":"Angry graveyard corpse",
+        "iconID":"monsters_zombie2:0",
+        "maxHP":90,
+        "maxAP":10,
+        "moveCost":3,
+        "monsterClass":"undead",
+        "attackDamage":{
+            "min":6,
+            "max":19
+        },
+        "spawnGroup":"graveyard_corpse3",
+        "phraseID":"graveyard_corpse1",
+        "droplistID":"gold200",
         "attackCost":3,
         "attackChance":170,
         "criticalSkill":10,

AndorsTrail/res/raw/monsterlist_v0610_npcs1.json

@@ -304,7 +304,7 @@
     },
     {
         "id":"loneford_tavern_patron",
-        "name":"Tavern owner",
+        "name":"Kizzo",
         "iconID":"monsters_karvis2:2",
         "monsterClass":"humanoid",
         "spawnGroup":"loneford_tavern_patron",

AndorsTrail/res/raw/questlist.json

@@ -132,11 +132,59 @@
                 "logText":"I have found Oromir in Crossglen village, hiding from his wife Leta.",
                 "finishesQuest":0
             },
+            {
+                "progress":25,
+                "logText":"I have found Oromir in Crossglen village, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":30,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":35,
+                "logText":"I have found Oromir behind the Crossglen village inn, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":40,
+                "logText":"I have found Oromir behind the Crossglen village inn, hiding from his wife Leta, but I should tell Leta of his whereabouts."
+            },
+            {
+                "progress":45,
+                "logText":"I have found Oromir in Crossglen village behind a haystack, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":50,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":60,
+                "logText":"I have found Oromir in Crossglen village behind a haystack, hiding from his wife Leta, I should tell Leta of his whereabouts."
+            },
+            {
+                "progress":70,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":80,
+                "logText":"I have found Oromir in the basement of his house, hiding from his wife Leta, I should tell Leta of his whereabouts."
+            },
             {
                 "progress":100,
-                "logText":"I have told Leta that Oromir is hiding in Crossglen village.",
+                "logText":"I have told Leta that Oromir is hiding in their basement.",
                 "rewardExperience":80,
                 "finishesQuest":1
+            },
+            {
+                "progress":105,
+                "logText":"Even after all my help, Oromir was still brought back home to Leta.",
+                "rewardExperience":50,
+                "finishesQuest":1
             }
         ]
     },

AndorsTrail/res/raw/questlist_arulir_mountain.json

@@ -68,6 +68,10 @@
             {
                 "progress":10,
                 "logText":"10=Slippery ground"
+            },
+            {
+                "progress":101,
+                "logText":"10=Slippery ground second time"
             }
         ]
     },
@@ -148,6 +152,10 @@
             {
                 "progress":10,
                 "logText":"Found silver bar at bwm"
+            },
+            {
+                "progress":20,
+                "logText":"Told by Umar to say he sent you at the inn."
             }
         ]
     }

AndorsTrail/res/raw/questlist_brimhaven.json

@@ -6,7 +6,7 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You found two not very bright brothers in a cellar of their house. They seemed to be talking about some sinister plan."
+                "logText":"I found two not very bright brothers in a cellar of their house. They seemed to be talking about some sinister plan."
             },
             {
                 "progress":20,
@@ -14,19 +14,19 @@
             },
             {
                 "progress":30,
-                "logText":"They asked you to help them."
+                "logText":"They asked me to help them."
             },
             {
                 "progress":50,
-                "logText":"You agreed to destroy the dam for them."
+                "logText":"I have agreed to destroy the dam for them."
             },
             {
                 "progress":52,
-                "logText":"They gave you a hand axe that could weaken the dam in a vulnerable place."
+                "logText":"The brothers gave me a hand axe that could weaken the dam in a vulnerable place."
             },
             {
                 "progress":54,
-                "logText":"You found the weak spot in the dam and started hacking at the wood.",
+                "logText":"I found the weak spot in the dam and started hacking at the wood.",
                 "rewardExperience":500
             },
             {
@@ -35,11 +35,11 @@
             },
             {
                 "progress":70,
-                "logText":"You refused to destroy the dam for them."
+                "logText":"I refused to destroy the dam for the brothers."
             },
             {
                 "progress":72,
-                "logText":"Given what you knew, you were not allowed to leave. The two brothers attacked you."
+                "logText":"Given what I overheard, I was not allowed to leave. The two brothers attacked me."
             },
             {
                 "progress":80,
@@ -47,11 +47,11 @@
             },
             {
                 "progress":100,
-                "logText":"You were not allowed to leave the city until it was investigated who destroyed the dam."
+                "logText":"The Brimhaven guards have informed me that I may not leave the city until they have investigated who destroyed the dam."
             },
             {
                 "progress":110,
-                "logText":"You promised to track down the real perpetrators. However, you should not leave the city."
+                "logText":"I have promised to track down the real perpetrators. However, I still cannot not leave the city."
             },
             {
                 "progress":120,
@@ -67,7 +67,7 @@
             },
             {
                 "progress":200,
-                "logText":"You gave the letters as a piece of evidence to the captain of the guard. Now it is up to them to deal with the rich man. ",
+                "logText":"I gave the letters as a piece of evidence to the captain of the guard. Now it is up to them to deal with the rich man.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             }
@@ -84,27 +84,27 @@
             },
             {
                 "progress":10,
-                "logText":"Stebbarik was ill at home in bed. He could not work and feared that he would lose his job. Because of his high debts, he feared that Gnossath would then take his house away.\nYou offered to do the work for Stebbarik."
+                "logText":"Stebbarik was ill at home in bed. He could not work and feared that he would lose his job. Because of his high debts, he feared that Gnossath would then take his house away.\nI have offered to do the work for Stebbarik."
             },
             {
                 "progress":30,
-                "logText":"Gnossath told you to carry 25 heavy boulders from the stock to the dam."
+                "logText":"Gnossath has asked me to carry 25 heavy boulders from the stock to the dam."
             },
             {
                 "progress":40,
-                "logText":"You carried the first boulder to the dam."
+                "logText":"I have carried the first boulder to the dam."
             },
             {
                 "progress":41,
-                "logText":"You have carried 5 boulders to the dam."
+                "logText":"I have carried 5 boulders to the dam."
             },
             {
                 "progress":42,
-                "logText":"You have moved 10 boulders."
+                "logText":"I have moved 10 boulders."
             },
             {
                 "progress":43,
-                "logText":"You have moved 15 boulders. You are getting tired!"
+                "logText":"I have moved 15 boulders. This work is exhausting!"
             },
             {
                 "progress":44,
@@ -112,7 +112,7 @@
             },
             {
                 "progress":90,
-                "logText":"Finally - that was the last boulder! Gnossath was very pleased with your work.",
+                "logText":"Finally - that was the last boulder! Gnossath was very pleased with my work.",
                 "finishesQuest":1
             }
         ]
@@ -272,7 +272,7 @@
             },
             {
                 "progress":15,
-                "logText":"I denied to help Anaksi to find his sister, Juttarka."
+                "logText":"I denied to help Anakis to find his sister, Juttarka."
             },
             {
                 "progress":20,
@@ -301,7 +301,7 @@
             },
             {
                 "progress":77,
-                "logText":"Fangwurm told me that the Basilisk's blood has special properties. It can protect against damage if applied to the skin. Fresh, warm, Basilisk's blood might even be able to heal a person that has been turned to stone.  "
+                "logText":"Fangwurm told me that the Basilisk's blood has special properties. It can protect against damage if applied to the skin. Fresh, warm, Basilisk's blood might even be able to heal a person that has been turned to stone."
             },
             {
                 "progress":78,
@@ -309,7 +309,7 @@
             },
             {
                 "progress":79,
-                "logText":"I should search the other rooms in this cave for a mirror that I can use to protect me from the glance of the Basilisk. "
+                "logText":"I should search the other rooms in this cave for a mirror that I can use to protect me from the glance of the Basilisk."
             },
             {
                 "progress":80,
@@ -479,6 +479,10 @@
                 "progress":10,
                 "logText":"Knows about laundry offering upgrades"
             },
+            {
+                "progress":15,
+                "logText":"Knows about dresses"
+            },
             {
                 "progress":20,
                 "logText":"brother2_door_opened"
@@ -490,25 +494,33 @@
             {
                 "progress":40,
                 "logText":"told father about andor"
+            },
+            {
+                "progress":50,
+                "logText":"Arlish took the dagger"
+            },
+            {
+                "progress":60,
+                "logText":"Gave Ito the glove"
             }
         ]
     },
     {
         "id":"brv_dagger",
-        "name":"A strange-looking dagger",
+        "name":"A strange looking dagger",
         "showInLog":1,
         "stages":[
             {
                 "progress":10,
-                "logText":"I asked Edrin about the strange-looking dagger I purchased. He told me he recognizes it because he made it many years ago, and it used to have a gem mounted in the pommel. If I can find the gem he can remount it in the dagger, and the dagger will have special properties."
+                "logText":"I asked Edrin about the strange-looking dagger I purchased. He told me he recognizes it because he made it many years ago, and it used to have a gem mounted in the pommel. If I can find the gem he can remount it in the dagger, and the dagger will have special properties. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":20,
-                "logText":"I asked Edrin about the strange-looking gem I purchased, and whether he has any idea what it might have been mounted in. He told me he recognizes it, and it used to be mounted in the pommel of a dagger that he made many years ago. If I can find the dagger he can remount the gem, and the dagger will have special properties."
+                "logText":"I asked Edrin about the strange-looking gem I purchased, and whether he has any idea what it might have been mounted in. He told me he recognizes it, and it used to be mounted in the pommel of a dagger that he made many years ago. If I can find the dagger he can remount the gem, and the dagger will have special properties. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":25,
-                "logText":"I asked Edrin about the strange-looking dagger and the strange-looking gem I purchased. He told me he recognizes them because he made the dagger many years ago. The gem was originally mounted in the pommel, giving the dagger special properties. He offered to repair it for me."
+                "logText":"I asked Edrin about the strange-looking dagger and the strange-looking gem I purchased. He told me he recognizes them because he made the dagger many years ago. The gem was originally mounted in the pommel, giving the dagger special properties. He offered to repair it for me. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":30,
@@ -524,27 +536,93 @@
             },
             {
                 "progress":60,
-                "logText":"Edrin wants 800gp to repair the dagger. I told him I will think about it."
+                "logText":"Edrin wants 800 gold to repair the dagger. I told him I will think about it."
             },
             {
                 "progress":70,
-                "logText":"Edrin wants 800gp to repair the dagger. I told him that was too expensive. I will keep the strange-looking dagger and the strange-looking gem.",
+                "logText":"Edrin wants 800 gold to repair the dagger. I told him that was too expensive. I will keep the strange-looking dagger and the strange-looking gem.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":80,
-                "logText":"Edrin wants 800gp to repair the dagger. I agreed. Edrin took the dagger and the gem and told me to come back later."
+                "logText":"Edrin wants 800 gold to repair the dagger. I agreed. Edrin took the dagger and the gem and told me to come back later."
             },
             {
                 "progress":90,
-                "logText":"I collected the repaired dagger from Edrin.",
-                "rewardExperience":2000,
-                "finishesQuest":1
+                "logText":"I collected the repaired dagger from Edrin. Apparently there was something mysterious about Lawellyn's death. I should ask people in town to find out more.",
+                "rewardExperience":600
             },
             {
                 "progress":100,
-                "logText":"I collected the repaired dagger from Edrin.",
+                "logText":"I collected the repaired dagger from Edrin. Apparently there was something mysterious about Lawellyn's death. I should ask people in town to find out more.",
+                "rewardExperience":300
+            },
+            {
+                "progress":105,
+                "logText":"Zorvan told me Lawellyn is dead and buried, but could tell me little more other than that his death was suspicious."
+            },
+            {
+                "progress":110,
+                "logText":"I've found a gravestone that told me that Lawellyn was related to Arlish. I should try to find her.",
+                "rewardExperience":100
+            },
+            {
+                "progress":115,
+                "logText":"Arlish couldn't tell me anything about the dagger because I no longer have it.",
+                "finishesQuest":1
+            },
+            {
+                "progress":120,
+                "logText":"I decided to not help Arlish by investigating Lawellyn's disappearance.",
+                "finishesQuest":1
+            },
+            {
+                "progress":130,
+                "logText":"I decided to help Arlish by investigating Lawellyn's disappearance."
+            },
+            {
+                "progress":140,
+                "logText":"In Brimhaven's western tavern, I met a man named Forlin who recommended that I speak to Kizzo in the Loneford tavern."
+            },
+            {
+                "progress":150,
+                "logText":"Kizzo suggested that I look for the scene of the murder in the woods between Loneford and Brimhaven."
+            },
+            {
+                "progress":160,
+                "logText":"I should take the evidence to Kizzo.",
+                "rewardExperience":200
+            },
+            {
+                "progress":170,
+                "logText":"Kizzo recommended that I ask Venanra in Brimhaven about the glove."
+            },
+            {
+                "progress":180,
+                "logText":"After speaking with Venanra, I learned that the glove belonged to Ogea."
+            },
+            {
+                "progress":190,
+                "logText":"I accepted Ogea's side of the story."
+            },
+            {
+                "progress":200,
+                "logText":"I was not able to help Arlish find out more about the death of her father.",
+                "rewardExperience":300,
+                "finishesQuest":1
+            },
+            {
+                "progress":210,
+                "logText":"I decided that Ogea should be punished."
+            },
+            {
+                "progress":220,
+                "logText":"I informed the authorities of the results of my investigation."
+            },
+            {
+                "progress":230,
+                "logText":"Arlish thanked me for finding her father's murderer, and gave me his dagger as a gift.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             }
@@ -557,31 +635,31 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You thought it would be a good idea to give a necklace to your father, in your family colors of red, green, and white. "
+                "logText":"I have decided to give a necklace to my father Mikhail, in our family colors of red, green, and white."
             },
             {
                 "progress":20,
-                "logText":"You bought a necklace."
+                "logText":"I have purchased a necklace."
             },
             {
                 "progress":30,
-                "logText":"Your father didn't want to take the necklace. He was angry because you didn't focus on finding your brother Andor. "
+                "logText":"Mikhail didn't want to take the necklace. He was angry because I didn't focus on finding Andor."
             },
             {
                 "progress":40,
-                "logText":"Your father didn't seem very happy with the cheap necklace.",
+                "logText":"My father didn't seem very happy with the cheap necklace.",
                 "rewardExperience":50,
                 "finishesQuest":1
             },
             {
                 "progress":50,
-                "logText":"Your father was very happy with the nice necklace.",
+                "logText":"My father was very happy with the nice necklace.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":60,
-                "logText":"Your father was disappointed with your pretentious necklace.",
+                "logText":"My father was disappointed with the pretentious necklace I bought.",
                 "rewardExperience":50,
                 "finishesQuest":1
             }

AndorsTrail/res/raw/questlist_brimhaven2.json

@@ -6,15 +6,15 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You entered a classroom in Brimhaven's school. The teacher told you to sit down."
+                "logText":"I entered a classroom in Brimhaven's school. The teacher told me to sit down."
             },
             {
                 "progress":12,
-                "logText":"You noticed an evil-looking statue in a corner. Who on earth puts such an ugly, hideous thing in a school?"
+                "logText":"I noticed an evil-looking statue in a corner. Who on earth puts such an ugly, hideous thing in a school?"
             },
             {
                 "progress":20,
-                "logText":"You found a free place next to Golin."
+                "logText":"I found a free place next to a student named Golin."
             },
             {
                 "progress":30,
@@ -30,78 +30,78 @@
             },
             {
                 "progress":60,
-                "logText":"You should look for a dueling partner."
+                "logText":"I should look for a dueling partner."
             },
             {
                 "progress":100,
-                "logText":"You started a fight with Golin."
+                "logText":"I started a fight with Golin."
             },
             {
                 "progress":102,
-                "logText":"You started a fight with Golin and killed him."
+                "logText":"I started a fight with Golin and killed him."
             },
             {
                 "progress":104,
-                "logText":"You started a fight with Golin, but you broke off the duel. Very good.",
+                "logText":"I started a fight with Golin, but I broke off the duel. Very good.",
                 "rewardExperience":500
             },
             {
                 "progress":110,
-                "logText":"You tried to fight a pupil, but they all ran away screaming."
+                "logText":"I tried to fight a pupil, but they all ran away screaming."
             },
             {
                 "progress":120,
-                "logText":"You started a fight with the teacher."
+                "logText":"I started a fight with the teacher."
             },
             {
                 "progress":122,
-                "logText":"You started a fight with the teacher and killed her.",
+                "logText":"I started a fight with the teacher and killed her.",
                 "rewardExperience":1000
             },
             {
                 "progress":124,
-                "logText":"You started a fight with the teacher, but you broke off the duel. Very good.",
+                "logText":"I started a fight with the teacher, but I broke off the duel. Very good.",
                 "rewardExperience":500
             },
             {
                 "progress":130,
-                "logText":"You feel the evil stare of the statue."
+                "logText":"I feel the evil stare of the statue."
             },
             {
                 "progress":150,
-                "logText":"The evil grinning statue suddenly grew to an incredible size and attacked you!"
+                "logText":"The evil grinning statue suddenly grew to an incredible size and attacked me!"
             },
             {
                 "progress":152,
-                "logText":"You killed the evil statue."
+                "logText":"I killed the evil statue."
             },
             {
                 "progress":200,
-                "logText":"The teacher thanked you for saving him. School is over for you. You could go to the general store and get a cake for good performance.",
+                "logText":"The teacher thanked me for saving her. School is over for me. I can go to the general store and get a cake for good performance.",
                 "rewardExperience":5000,
                 "finishesQuest":1
             },
             {
                 "progress":210,
-                "logText":"You cheated during the duel. The teacher noticed it and banned you from the school.",
+                "logText":"I cheated during the duel. The teacher noticed it and banned me from the school.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":220,
-                "logText":"The teacher was very satisfied with your performance in the duel. School is over for you. You could go to the general store and get a cake for good performance.",
+                "logText":"The teacher was very satisfied with my performance in the duel. School is over for me. I can go to the general store and get a cake for good performance.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             },
             {
                 "progress":230,
-                "logText":"The teacher sent you away, because you killed Golin in the duel.",
+                "logText":"The teacher sent me away, because I killed Golin in the duel.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":240,
-                "logText":"Golin was horrified by your murder of the teacher and attacked you to avenge her.",
+                "logText":"Golin was horrified by my murder of the teacher and attacked me to avenge her.",
                 "rewardExperience":500,
                 "finishesQuest":1
             }
@@ -114,47 +114,47 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"Facutloni asked you to help him check the storage. You should check if there is a pair of every item."
+                "logText":"Facutloni asked me to help him check the storage. I should check if there is a pair of every item."
             },
             {
                 "progress":100,
-                "logText":"You have found a pair of crystal globes."
+                "logText":"I have found a pair of crystal globes."
             },
             {
                 "progress":101,
-                "logText":"You have found a pair of plush pillows."
+                "logText":"I have found a pair of plush pillows."
             },
             {
                 "progress":102,
-                "logText":"You have found a pair of lyras."
+                "logText":"I have found a pair of lyras."
             },
             {
                 "progress":103,
-                "logText":"You have found a pair of boots."
+                "logText":"I have found a pair of boots."
             },
             {
                 "progress":104,
-                "logText":"You have found a pair of chandeliers."
+                "logText":"I have found a pair of chandeliers."
             },
             {
                 "progress":105,
-                "logText":"You have found a pair of mysterious green somethings."
+                "logText":"I have found a pair of mysterious green somethings."
             },
             {
                 "progress":106,
-                "logText":"You have found a pair of old, worn capes."
+                "logText":"I have found a pair of old, worn capes."
             },
             {
                 "progress":107,
-                "logText":"You have found a pair of pretty porcelain figures."
+                "logText":"I have found a pair of pretty porcelain figures."
             },
             {
                 "progress":108,
-                "logText":"You have found a pair of striped hammers."
+                "logText":"I have found a pair of striped hammers."
             },
             {
                 "progress":109,
-                "logText":"You have found a pair of dusty old books."
+                "logText":"I have found a pair of dusty old books."
             },
             {
                 "progress":900,
@@ -200,6 +200,10 @@
             {
                 "progress":50,
                 "logText":"Pupils ran out"
+            },
+            {
+                "progress":60,
+                "logText":"60=banned fromtower"
             }
         ]
     }

AndorsTrail/res/raw/questlist_brimhaven_2.json

@@ -0,0 +1,79 @@
+[
+    {
+        "id":"new_snake_master",
+        "name":"Perception is not reality",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":25,
+                "logText":"I must stop Ewmondold from getting stronger."
+            },
+            {
+                "progress":5,
+                "logText":"A traveler named Ewmondold had asked me to venture into the Snake Cave to retrieve his map."
+            },
+            {
+                "progress":10,
+                "logText":"Ewmondold had thanked me for killing the Snake master, and that his way to rule would be free. I should better find him."
+            },
+            {
+                "progress":30,
+                "logText":"I've destroyed Ewmondold and eliminated his threat to Crossglen and the surrounding area.",
+                "rewardExperience":250,
+                "finishesQuest":1
+            },
+            {
+                "progress":20,
+                "logText":"I've returned Ewmondold's map to him.",
+                "rewardExperience":450
+            }
+        ]
+    },
+    {
+        "id":"cat_and_mouse",
+        "name":"A cat and mouse game",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I agreed to help Seviron trap the mouse that the cat cannot catch. I need to get some cheese, a large empty bottle, and three rocks."
+            },
+            {
+                "progress":20,
+                "logText":"I have given Seviron the rocks."
+            },
+            {
+                "progress":30,
+                "logText":"I have given Seviron the cheese."
+            },
+            {
+                "progress":40,
+                "logText":"I obtained a suitable bottle from Arlish."
+            },
+            {
+                "progress":50,
+                "logText":"I have given Seviron the bottle. Seviron will set the trap, but it may take some time to catch the mouse. I should come back later."
+            },
+            {
+                "progress":60,
+                "logText":"The mouse has been caught! Seviron gave it to me in the bottle. He said I can decide what to do with it."
+            },
+            {
+                "progress":70,
+                "logText":"I decided to give the mouse to the cat. The cat would have eventually killed it anyway.",
+                "rewardExperience":1000,
+                "finishesQuest":1
+            },
+            {
+                "progress":80,
+                "logText":"I decided to release the mouse outside. Seviron told me to do that outside the town."
+            },
+            {
+                "progress":90,
+                "logText":"I released the mouse.",
+                "rewardExperience":1500,
+                "finishesQuest":1
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/questlist_brimhaven_2b.json

@@ -0,0 +1,56 @@
+[
+    {
+        "id":"hettar_dog_nd",
+        "name":"hettar_dog_nd",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":1,
+                "logText":"1=found dog"
+            },
+            {
+                "progress":2,
+                "logText":"2=picked up bones"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog",
+        "name":"Where is Norry?",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I found Hettar, a tough boy about my age, on top of Blackwater mountain. He kept calling for a certain Norry."
+            },
+            {
+                "progress":20,
+                "logText":"Hettar's little dog Norry has run away. He was very anxious to find him. I promised to get Norry back."
+            },
+            {
+                "progress":30,
+                "logText":"Hettar has given me a piece of Norry's favourite food."
+            },
+            {
+                "progress":40,
+                "logText":"I have offered Hettar's piece of Wyrm meat to Norry, who took it eagerly."
+            },
+            {
+                "progress":50,
+                "logText":"Norry ran off to reunite with Hettar."
+            },
+            {
+                "progress":80,
+                "logText":"Hettar thanked me a thousand times for my help in finding Norry.",
+                "rewardExperience":2000,
+                "finishesQuest":1
+            },
+            {
+                "progress":90,
+                "logText":"I explained to Hettar that I killed Norry. Hettar broke down on the floor in agony.",
+                "rewardExperience":200,
+                "finishesQuest":1
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/questlist_graveyard1.json

@@ -229,6 +229,10 @@
             {
                 "progress":230,
                 "logText":"bought Brimhaven bed"
+            },
+            {
+                "progress":240,
+                "logText":"Despawned monsters in graveyard"
             }
         ]
     }

AndorsTrail/res/raw/questlist_guynmart.json

@@ -166,7 +166,7 @@
             },
             {
                 "progress":210,
-                "logText":"Lovis prepared a surprise for me west of the castle.",
+                "logText":"Lovis prepared a surprise for me east of the castle.",
                 "finishesQuest":1
             },
             {

AndorsTrail/res/raw/questlist_v070_charwood.json

@@ -88,6 +88,10 @@
                 "progress":75,
                 "logText":"Falothen has taught me how to be better at fighting unarmed, without weapons."
             },
+            {
+                "progress":76,
+                "logText":"Falothen has taught me how to better handle polearms."
+            },
             {
                 "progress":80,
                 "logText":"Falothen offered me the chance to learn about the other weapon types, but to teach me, he needs 5000 gold and two Oegyth crystals for each skill that I want to get better at."

AndorsTrail/res/values-pt/strings.xml

@@ -486,7 +486,7 @@
 \nCada nível de habilidade aumenta a potência do dano de armas de duas mãos com %1$d %% do potêncial do dano original.</string>
     <string name="skill_longdescription_fightstyle_weapon_shield">Dá benefícios quando se luta com uma arma na mão principal e se tem um escudo ou uma arma de proteção equipada na mão secundária.
 \n
-\nCada nível de habilidade aumenta a hipótese de ataque das armas na mão principal com %1$d % das suas hipóteses de ataque originais e a hipótese de bloqueio de escudos ou armas de corte em %2$d % das suas hipóteses de bloqueio originais.</string>
+\nCada nível de habilidade aumenta a hipótese de ataque das armas na mão principal com %1$d %% das suas hipóteses de ataque originais e a hipótese de bloqueio de escudos ou armas de corte em %2$d %% das suas hipóteses de bloqueio originais.</string>
     <string name="skill_longdescription_specialization_dualwield">Aumenta a chance de ataque de ambas as armas empunhadas e dá um adicional %1$d %% da chance de ataque original das armas, além dos benefícios oferecidos pela habilidade do estilo da arma. A chance de bloqueio de ambas as armas também são aumentadas em %2$d %% da chance de bloqueio original das armas.</string>
     <string name="skill_longdescription_specialization_2hand">Aumenta o potencial das dano de armas de duas mãos num adicional de %1$d %% do potencial de dano original, em acréscimo aos benefícios dados pela habilidade estilo de arma. A chance de ataque das armas de duas mãos são, também, aumentadas em %2$d %% das suas chances de ataque originais.</string>
     <string name="skill_longdescription_specialization_weapon_shield">Aumenta a chance de ataque e o potencial de dano das armas na mão principal. A chance de ataque é aumentada em %1$d %% da chance de ataque original, e o potencial de dano é aumentado em %2$d %% do potencial de dano original.</string>

AndorsTrail/res/values-ru/strings.xml

@@ -428,7 +428,7 @@
     <string name="skill_longdescription_weapon_prof_1hsword">Каждый уровень этого умения при использовании рапир, длинных и полуторных мечей увеличивает (в %% от базового): шанс атаки на %1$d %%, шанс блока на %2$d %%, шанс критического удара на %3$d %%.</string>
     <string name="skill_longdescription_weapon_prof_2hsword">Каждый уровень этого умения при использовании двуручных мечей увеличивает (в %% от базового): шанс атаки на %1$d %%, шанс блока на %2$d %%, шанс критического удара на %3$d %%.</string>
     <string name="skill_longdescription_weapon_prof_axe">Каждый уровень этого умения при использовании топоров и секир увеличивает (в %% от базового): шанс атаки на %1$d %%, шанс блока на %2$d %%, шанс критического удара на %3$d %%.</string>
-    <string name="skill_longdescription_weapon_prof_blunt">Каждый уровень этого умения при использовании дробящего оружия увеличивает (в %% от базового): шанс атаки на %1$d %%, шанс блока на %2$d %%, шанс критического удара на %3$d %%. К дробящему оружию относятся дубинки, булавы, посохи, скипетры, а так же боевые и гигантские молоты.</string>
+    <string name="skill_longdescription_weapon_prof_blunt">Каждый уровень этого умения при использовании дробящего оружия увеличивает (в %% от базового): шанс атаки на %1$d %%, шанс блока на %2$d %%, шанс критического удара на %3$d %%. К дробящему оружию относятся дубинки, булавы, посохи, скипетры, кнуты, а так же боевые и гигантские молоты.</string>
     <string name="skill_longdescription_weapon_prof_unarmed">Каждый уровень этого умения при бездоспешном бое увеличивает: шанс атаки на %1$d, силу атаки на %2$d, шанс блока на %3$d.</string>
     <string name="skill_longdescription_armor_prof_shield">Каждый уровень этого умения при использовании щита или парировании оружия, увеличивает сопротивление повреждениям на %1$d.</string>
     <string name="skill_longdescription_armor_prof_unarmored">Каждый уровень этого умения при бездоспешном бое увеличивает шанс блока на %1$d. Одежда из ткани не считается доспехами.</string>

AndorsTrail/res/values-tl/strings.xml

@@ -42,7 +42,7 @@
     <string name="dialog_rest_confirm_message">Gusto mo bang matulog dito\?</string>
     <string name="dialog_rest_title">Matulog</string>
     <string name="levelup_add_blockchance_description">Nagdagdag ng %1$d sa yong base block chance.</string>
-    <string name="levelup_add_blockchance">Pataasin ang block chance (+1%$d)</string>
+    <string name="levelup_add_blockchance">Pataasin ang block chance (+%1$d)</string>
     <string name="levelup_add_attackdamage_description">Nagdagdag %1$d sayong base attack damage.</string>
     <string name="levelup_add_attackdamage">Pataasin ang attack damage (+%1$d)</string>
     <string name="levelup_add_attackchance_description">Nagdagdag ng %1$d sayong base attack chance.</string>
@@ -384,4 +384,134 @@
     <string name="skill_number_of_increases_several">Ikaw at maaring pumili ng %1$d skills to improve.</string>
     <string name="skill_number_of_increases_one">Maaari kang pumili ng isang skill to improve .</string>
     <string name="skill_prerequisite_stat">Upang mai-level up ang kasanayang ito, kailangan mo ng hindi bababa sa %1$d %2$s (base stats).</string>
+    <string name="skill_longdescription_fightstyle_2hand">Nagbibigay ng mga benepisyo kapag gumagamit ng sandata na nangangailangan ng magkabilang kamay upang magamit, tulad ng mga dalawang kamay na espada, greataxes o higanteng martilyo.
+\n
+\nAng bawat antas ng kasanayan ay nagdaragdag ng potensyal na pinsala ng dalawang-kamay na sandata na may %1$d %% ng orihinal na potensyal na pinsala.</string>
+    <string name="skill_longdescription_fightstyle_dualwield">Nagbibigay ng mga benepisyo kapag nakikipaglaban sa dalawang sandata nang sabay, isa sa pangunahing kamay at isa sa off-hand.
+\n
+\nKung wala ang kasanayang ito, ang %1$d %% lamang ng mga katangian ng isang sandata ang maaaring magamit kapag may kagamitan sa off-hand. Kasama rito ang pag-atake ng pagkakataon, kritikal na kasanayan, potensyal na makapinsala at pag-block ng pagkakataon. Nang walang kasanayang ito, ang gastos sa pag-atake (AP gastos) ng paggawa ng pag-atake ay ang kabuuan ng gastos sa pag-atake ng pangunahing sandata at ng sandata na ginamit sa off-hand.
+\n
+\nSa isang antas ng kasanayang ito, maaaring magamit ang %2$d %% ng mga katangian ng sandata na off-hand, at ang gastos sa pag-atake ay ang pinakamataas na gastos sa pag-atake ng parehong mga armas plus %3$d %% ng pinakamababang gastos sa pag-atake ng pareho sandata.
+\n
+\nGamit ang dalawang antas ng kasanayang ito, maaaring magamit ang mga katangian ng armas na off-hand, %4$d %% ay maaaring magamit, at ang gastos sa pag-atake ay katumbas ng pinakamataas na gastos sa pag-atake ng dalawang gamit na armas.</string>
+    <string name="skill_longdescription_armor_prof_heavy">Para sa bawat antas ng kasanayan, pinatataas ang block na pagkakataon ng bawat piraso ng mabibigat na nakasuot na nakasuot ng %1$d %% ng kanilang orihinal na mga pagkakataon sa pag-block. Ang mga piraso ng mabibigat na nakasuot ay nabawasan ang mga parusa sa paggalaw ng %2$d %% bawat antas ng kasanayan, at ang kanilang mga parusa sa bilis ng pag-atake ay nabawasan ng %3$d %% bawat antas ng kasanayan. Ang mga mabibigat na armor ay may kasamang mga metal armors, chain mail at plate mail.</string>
+    <string name="skill_longdescription_armor_prof_light">Para sa bawat antas ng kasanayan, pinapataas ang block na pagkakataon ng bawat piraso ng light armor na isinusuot ng %1$d %% ng kanilang orihinal na mga pagkakataon sa block. Ang mga light armor ay may kasamang leather, light metal at mga balat na armor.</string>
+    <string name="skill_longdescription_armor_prof_unarmored">Habang nakikipaglaban nang walang pagkakaroon ng anumang piece of armor na kagamitan, makakuha ng %1$d na block chance sa bawat skill level. Ang mga item na gawa sa tela ay hindi isinasaalang-alang bilang nakasuot.</string>
+    <string name="skill_longdescription_armor_prof_shield">Patataasin ang Damage Resistance (DR) ng %1$d bawat antas ng kasanayan habang mayroong gamit na isang shield o parrying weapon.</string>
+    <string name="skill_longdescription_weapon_prof_unarmed">Kapag nakikipaglaban nang walang sandata at kalasag, makakuha ng %1$d na pagkakataon sa pag-atake, %2$d na potensyal na pinsala at %3$d na pag-block ng pagkakataon bawat antas ng kasanayan.</string>
+    <string name="skill_longdescription_weapon_prof_blunt">Para sa bawat antas ng kasanayan, pinapataas ang pagkakataon ng pag-atake ng mga blunt na sandata ng %1$d %% ng pagkakataon sa pag-atake ng item ng item, pinatataas ang pagkakataon ng block ng %2$d %% ng pagkakataon ng base block ng item, at pinatataas ang kritikal na kasanayan sa %3$d %% ng batayang kritikal na kasanayan ng item. Kasama rito ang mga club, quarterstaves, maces, scepters, whips, war hammer at higanteng martilyo.</string>
+    <string name="skill_longdescription_weapon_prof_axe">Para sa bawat antas ng kasanayan, pinatataas ang pagkakataon ng pag-atake ng mga palakol at greataxes ng %1$d %% ng pagkakataon sa pag-atake ng pangunahing item, pinapataas ang block na pagkakataon ng %2$d %% ng base block na pagkakataon ng item, at pinatataas ang kritikal na kasanayan sa %3$d %% ng batayang kritikal na kasanayan ng item.</string>
+    <string name="skill_longdescription_weapon_prof_2hsword">Para sa bawat antas ng kasanayan, pinatataas ang pagkakataon ng pag-atake ng dalawang-kamay na mga espada ng %1$d %% ng pagkakataon na pag-atake ng base ng item, pinatataas ang pagkakataon ng pag-block ng %2$d %% ng pagkakataong block ng item ng item, at pinatataas ang kritikal na kasanayan ng %3$d %% ng batayang kasanayan sa kritikal na item.</string>
+    <string name="skill_longdescription_weapon_prof_1hsword">Para sa bawat antas ng kasanayan, pinapataas ang pagkakataon ng pag-atake ng mga rapier, longswords at broadswords ng %1$d %% ng pagkakataon sa pag-atake ng item, pinapataas ang block na pagkakataon ng %2$d %% ng base block na pagkakataon ng item, at pinatataas ang kritikal na kasanayan ng %3$d %% ng pangunahing kasanayan sa kritikal na item.</string>
+    <string name="skill_longdescription_weapon_prof_dagger">Para sa bawat skill level, pinatataas ang attack chance kapag gumagamit ng mga dagger at shortsword ng %1$d %% ng base atake ng pagkakataon ng item, pinapataas ang block na pagkakataon ng %2$d %% ng base block na pagkakataon ng item, at pinatataas ang kritikal na kasanayan ng %3$d %% ng batayang kasanayan sa kritikal na item.</string>
+    <string name="skill_shortdescription_weapon_prof_pole">Mas magaling sa pakikipaglaban with pole weapons</string>
+    <string name="skill_shortdescription_specialization_weapon_shield">Expert sa pakikipaglaban with weapon at shield</string>
+    <string name="skill_shortdescription_specialization_2hand">Expert sa two-handed weapons</string>
+    <string name="skill_shortdescription_specialization_dualwield">Expert sa dual wielding</string>
+    <string name="skill_shortdescription_fightstyle_unarmed_unarmored">Mas mahusay na labanan ang walang sandata/walang armor</string>
+    <string name="skill_shortdescription_fightstyle_weapon_shield">Mas mahusay sa pakikipaglaban gamit ang sandata at shield</string>
+    <string name="skill_shortdescription_fightstyle_2hand">Mas mahusay na gumamit ng mga sandata na nangangailangan ng dalawang mga kamay</string>
+    <string name="skill_shortdescription_fightstyle_dualwield">Nagamit ng dalawang armas nang sabay</string>
+    <string name="skill_shortdescription_armor_prof_heavy">Mas mahusay na gumamit ng heavy armor</string>
+    <string name="skill_shortdescription_armor_prof_light">Mas mahusay na gumamit ng light armor</string>
+    <string name="skill_shortdescription_armor_prof_unarmored">Mas magaling sa labanan kahit walang armor</string>
+    <string name="skill_shortdescription_armor_prof_shield">Mas mahusay na gumamit ng mga shields at mga parrying weapons</string>
+    <string name="skill_shortdescription_weapon_prof_unarmed">Mas magaling sa labanan ng walang sandata</string>
+    <string name="skill_shortdescription_weapon_prof_blunt">Mas magaling sa labanan with blunt weapons</string>
+    <string name="skill_shortdescription_weapon_prof_axe">Mas magaling sa labanan with Axes</string>
+    <string name="skill_shortdescription_weapon_prof_2hsword">Mas magaling sa labanan with two-handed swords</string>
+    <string name="skill_shortdescription_weapon_prof_1hsword">MA\'s magaling with one-handed swords</string>
+    <string name="localize_resources_from_mo_filename">File</string>
+    <string name="skill_shortdescription_weapon_prof_dagger">Nas magaling lumabab with daggers</string>
+    <string name="skill_title_weapon_prof_pole">Proficiency ng Pole weapon</string>
+    <string name="skill_title_specialization_weapon_shield">Pagdadalubhasa: Weapon at shield</string>
+    <string name="skill_title_specialization_2hand">Pagdadalubhasa: Dalawang-kamay na sandata</string>
+    <string name="skill_title_specialization_dualwield">Pagdadalubhasa: Dual wield</string>
+    <string name="skill_title_fightstyle_unarmed_unarmored">Style ng pakikipaglaban: Way ng monghe</string>
+    <string name="skill_title_fightstyle_weapon_shield">Style ng pakikipaglaban: Weapon at shield</string>
+    <string name="skill_title_fightstyle_2hand">Style ng pakikipaglaban:Two-handed weapon</string>
+    <string name="skill_title_fightstyle_dualwield">Style ng pakikipaglaban: Dual wield</string>
+    <string name="skill_title_armor_prof_heavy">Proficiency ng Heavy Armor</string>
+    <string name="skill_title_armor_prof_light">Proficiency ng Light Armor</string>
+    <string name="skill_title_armor_prof_unarmored">Nalaban ng walang-armor</string>
+    <string name="skill_title_armor_prof_shield">Proficiency ng Shield</string>
+    <string name="skill_title_weapon_prof_unarmed">Nalaban ng walang-armas</string>
+    <string name="skill_title_weapon_prof_blunt">Proficiency ng Blunt weapon</string>
+    <string name="skill_title_weapon_prof_axe">Proficiency ng Axe</string>
+    <string name="skill_title_weapon_prof_2hsword">Proficiency ng Two-handed sword</string>
+    <string name="skill_title_weapon_prof_1hsword">Proficiency ng one-handed sword</string>
+    <string name="skill_title_weapon_prof_dagger">Proficiency sa Dagger</string>
+    <string name="conversation_reward_quest_updated">[Inapdate ang quest: \"%1$s\"]</string>
+    <string name="conversation_reward_quest_finished">[Tapos na ang Quest: \"%1$s\"]</string>
+    <string name="combat_log_noentries">Wala pang entries.</string>
+    <string name="combat_log_title">Log ng Combat</string>
+    <string name="combat_result_monstermoved">%1$s ay gumalaw.</string>
+    <string name="heroinfo_useitem_cost">Cost ng Paggamit ng item (AP):</string>
+    <string name="heroinfo_reequip_cost">Cost ng Pag Re-equip cost (AP):</string>
+    <string name="preferences_dialog_overwrite_savegame">Nagbibigay ng isang katanungan tungkol sa kung nais mong i-overwrite kapag nagse-save sa isang savegame slot na naglalaman ng isang savegame.</string>
+    <string name="preferences_dialog_overwrite_savegame_title">Kumpirmahin ang pag-o-overwrite ng mga savegames</string>
+    <string name="preferences_display_overwrite_savegame_entries_never_confirm">Huwag ipakita ang confirmation dialog box</string>
+    <string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Ipakita lamang kapag nag-o-overwrite ng ibang playername</string>
+    <string name="preferences_display_overwrite_savegame_entries_always_confirm">Palaging ipakita ang confirmation dialog box</string>
+    <string name="loadsave_empty_slot">%1$d.&lt;wala&gt;</string>
+    <string name="loadsave_save_overwrite_confirmation_slot">(Lagayan %1$d)</string>
+    <string name="loadsave_save_overwrite_confirmation_all">Sigurado ka bang nais mong mai-overwrite ang savegame na ito\?</string>
+    <string name="iteminfo_effect_decrease_reequip_cost">Pinabababa ang AP cost ng equipping items during combat ng %1$d AP</string>
+    <string name="iteminfo_effect_increase_reequip_cost">Pinatataas ang AP cost ng equipping items during combat ng %1$d AP</string>
+    <string name="iteminfo_effect_decrease_use_cost">Pinabababa ang paggamit ng items during combat ng %1$d AP</string>
+    <string name="iteminfo_effect_increase_use_cost">Pinatataas ang AP cost ng paggamit ng items during combat ng %1$d AP</string>
+    <string name="iteminfo_effect_decrease_damage_resistance">Pinabababa ang damage resistance ng %1$d</string>
+    <string name="iteminfo_effect_increase_damage_resistance">Pinatataas ang damage resistance ng %1$d</string>
+    <string name="iteminfo_effect_decrease_block_chance">Pinabababa ang block chance ng %1$d</string>
+    <string name="iteminfo_effect_increase_block_chance">Pinatataas ang block chance ng %1$d</string>
+    <string name="iteminfo_effect_critical_multiplier">Pinapagana ang critical hits ng multiplier na x%1$.1f</string>
+    <string name="iteminfo_effect_decrease_critical_skill">Pinabababa ang critical skill ng %1$d</string>
+    <string name="iteminfo_effect_increase_critical_skill">Pinatataas ang kritikal skill ng %1$d</string>
+    <string name="iteminfo_effect_decrease_attack_damage_minmax">Pabababain ang attack damage ng %1$d-%2$d</string>
+    <string name="iteminfo_effect_decrease_attack_damage">Pabababain ang attack damage ng %1$d</string>
+    <string name="iteminfo_effect_increase_attack_damage_minmax">Patataasin ang attack damage ng %1$d-%2$d</string>
+    <string name="iteminfo_effect_set_damage_modifier">Modifier ng damage: %1$d%%</string>
+    <string name="iteminfo_effect_increase_attack_damage">Patataasin ang attack damage by %1$d</string>
+    <string name="iteminfo_effect_weapon_attack_damage_minmax">Damage sa pag-atake: %1$d-%2$d</string>
+    <string name="iteminfo_effect_weapon_attack_damage">Pinsala sa pag-atake: %1$d</string>
+    <string name="iteminfo_effect_decrease_attack_chance">Pinabababa ang attack chance ng %1$d</string>
+    <string name="iteminfo_effect_increase_attack_chance">Patataasin ang attack chance ng %1$d</string>
+    <string name="iteminfo_effect_weapon_attack_chance">Chansa ng pag-atake: %1$d</string>
+    <string name="iteminfo_effect_decrease_attack_cost">Pinabababa ang cost sa pag-atake ng %1$dAP</string>
+    <string name="iteminfo_effect_increase_attack_cost">Dagdagan ang cost sa pag-atake ng %1$d AP</string>
+    <string name="iteminfo_effect_weapon_attack_cost">Cost ng pag-atake: %1$d AP</string>
+    <string name="inventory_equip_offhand">Isuot (offhand)</string>
+    <string name="display_worldmap_title">Mapa</string>
+    <string name="display_worldmap_not_available">Hindi maipakita ang mapa mula sa lokasyon na ito.</string>
+    <string name="menu_button_worldmap_failed">Hindi maipakita ang map.</string>
+    <string name="menu_button_worldmap">Mapa</string>
+    <string name="preferences_ui_enable_animations">Ipakita ang mga animation para sa iba\'t ibang mga elemento ng interface, tulad ng battle bar.</string>
+    <string name="preferences_ui_enable_animations_title">Paganahin ang mga animation</string>
+    <string name="preferences_ui_category">Interfaces</string>
+    <string name="about_button4">Tungkol</string>
+    <string name="skill_longdescription_concussion">Kapag gumagawa ng isang pag-atake sa isang target na ang block chance (BC) ay hindi bababa sa %1$d mas mababa kaysa sa iyong Attack chance (AC), mayroong isang %2$d%% pagkakataon na ang hit ay magdudulot ng Concussion sa target. Ang Concussion ay malubhang pabababain ng offensive abilities ng kalaban, na ginagawang mas hindi magagawang tumama ang target na matagumpay na pag-atake.</string>
+    <string name="skill_shortdescription_concussion">Chansa ng Concussion</string>
+    <string name="skill_title_concussion">Kalokohan</string>
+    <string name="skill_longdescription_taunt">Kapag ang isang umaatake ay gumawa ng isang pag-atake na nag-miss, mayroong %1$d%% pagkakataon na ang umaatake sayo ay mawalan ng %2$d na mga Attack Points (AP). Ina-apply ito sa lahat ng uri ng pag-atake ng walang-armas laban sa iyo.</string>
+    <string name="skill_shortdescription_taunt">Ang Attacker ay nawawalan ng AP kada miss</string>
+    <string name="skill_title_taunt">Pang-aasar</string>
+    <string name="skill_longdescription_rejuvenation">Kada round (6 seconds), mayroong %1$d%% pagkakataon na ang isa sa mga aktibong negatibong kondisyon ng aktor ay maibababa ng isang lakas. Nalalapat ito sa lahat ng mga pansamantalang uri ng epekto na nakakaapekto sa katawan; mga kundisyon sa pag-iisip tulad ng Dazed, mga kondisyong pisikal na kapasidad tulad ng Fatigue at pati na rin mga karamdaman sa dugo tulad ng Poison.</string>
+    <string name="skill_shortdescription_rejuvenation">Pagkakataon ng pagtanggal ng epekto</string>
+    <string name="skill_title_rejuvenation">Pagheheal</string>
+    <string name="skill_longdescription_crit2">Para sa bawat kritikal na hit na nagawa, mayroong isang %1$d%% pagkakataon na ang hit ay mabali ang ilang mga buto ng target, na mabisang sanhi ng kondisyong \'Fracture\' sa target. Sobra nitong pabababain ang mga kakayahan sa pagtatanggol sa pagtatanggol ng target, na ginagawang mas hindi magagawang ipagtanggol ang sarili sa mga kasunod na pag-atake.</string>
+    <string name="skill_shortdescription_crit2">Chansa ng pagkabali ng buto</string>
+    <string name="skill_title_crit2">Pagkabali</string>
+    <string name="skill_longdescription_crit1">Para sa bawat kritikal na hit na nagawa, mayroong isang %1$d%% pagkakataon na ang hit ay magdudulot ng panloob na pagdurugo sa target, na mabisang sanhi ng kondisyon na \'internal bleeding\' sa target. Ang internal bleeding ay labis na nagpapababa ng mga nakakasakit na kakayahan sa pagpapamuok, na ginagawang hindi gaanong tatama sa target na matagumpay na pag-atake.</string>
+    <string name="skill_shortdescription_crit1">Chansa ng internal bleeding</string>
+    <string name="skill_title_crit1">Internal na bleeding</string>
+    <string name="traitsinfo_criticalhit_effectivechance">Effective na critikal chance:</string>
+    <string name="actorinfo_immune_criticals">Immune sa critical hit</string>
+    <string name="inventory_movebottom">Ilipat sa ibaba</string>
+    <string name="inventory_movetop">Ilipat sa itaas</string>
+    <string name="skill_longdescription_shadow_bless">Ibinababa ang pagkakataon na mapinsala ng lahat ng uri ng mga kundisyon ng %1$d%%. Kasama rito ang lahat ng uri ng mga kundisyon sanhi ng pag-atake ng halimaw tulad ng Poison, Dazed o Fatigue.</string>
+    <string name="skill_shortdescription_shadow_bless">Paglaban laban sa lahat ng uri ng kundisyon</string>
+    <string name="skill_title_shadow_bless">Madilim na blessing ng Shadow</string>
+    <string name="preferences_high_quality_filters">Huwag paganahin ito kung nakakaranas ka ng mga isyu sa pagganap sa mga nai-filter na mapa (halimbawa ng madilim na mga kuweba). Ang pagpapagana ng pagpipiliang ito ay gagamitin ang laro na gumamit ng mga advanced na mga filter ng kulay, sa halip na mga solidong overlay ng kulay.</string>
+    <string name="preferences_high_quality_filters_title">Mga High quality filter</string>
+    <string name="preferences_optimized_drawing">Huwag paganahin ito kung nakakakita ka ng mga graphic na artifact. Ang pagpapagana ng pagpipiliang ito ay gagawing redraw lamang ng laro ng mga nabagong bahagi ng screen sa bawat frame.</string>
 </resources>

AndorsTrail/res/values-tr/strings.xml

@@ -430,7 +430,7 @@
     <string name="preferences_high_quality_filters">Filtre uygulanmış haritalarda (örneğin karanlık mağaralar) performans sorunlarıyla karşılaşıyorsanız bunu devre dışı kalın. Bu seçeneği etkinleştirmek, oyunun düz renk kaplamaları yerine gelişmiş renk filtreleri kullanmasını sağlayacaktır.</string>
     <string name="preferences_language">Dil</string>
     <string name="skill_title_fightstyle_unarmed_unarmored">Savaş stili: Keşiş yolu</string>
-    <string name="skill_title_weapon_prof_blunt">Gürz yeterliliği</string>
+    <string name="skill_title_weapon_prof_blunt">Küt silah yeterliliği</string>
     <string name="skill_title_weapon_prof_2hsword">Çift elli kılıç yeterliliği</string>
     <string name="skill_title_weapon_prof_1hsword">Tek elli kılıç yeterliliği</string>
     <string name="skill_title_weapon_prof_dagger">Hançer yeterliliği</string>
@@ -496,7 +496,7 @@
     <string name="skill_shortdescription_fightstyle_dualwield">Aynı anda iki silahı kullanma</string>
     <string name="skill_shortdescription_armor_prof_unarmored">Zırhsız daha iyi dövüşme</string>
     <string name="skill_shortdescription_weapon_prof_unarmed">Silahsız daha iyi dövüşme</string>
-    <string name="skill_shortdescription_weapon_prof_blunt">Sopa benzeri silahlarla daha iyi dövüşme</string>
+    <string name="skill_shortdescription_weapon_prof_blunt">Küt silahlarla daha iyi dövüşme</string>
     <string name="skill_shortdescription_weapon_prof_axe">Baltalarla daha iyi dövüşme</string>
     <string name="skill_shortdescription_weapon_prof_2hsword">İki elli kılıçlarla daha iyi dövüşme</string>
     <string name="skill_shortdescription_weapon_prof_1hsword">Tek elli kılıçlarla daha iyi dövüşme</string>
@@ -553,7 +553,7 @@
     <string name="skill_shortdescription_specialization_dualwield">Çift silah kullanımında uzman</string>
     <string name="skill_longdescription_weapon_prof_2hsword">Her beceri seviyesi için, iki elli kılıçların saldırı şansını eşyanın temel saldırı şansının %% %1$d\'i kadar, blok şansını eşyanın temel blok şansının %% %2$d\'i kadar ve kritik beceriyi eşyanın temel kritik becerisinin %% %3$d\'i kadar artırır.</string>
     <string name="skill_longdescription_weapon_prof_axe">Her beceri seviyesi için, balta ve büyük baltaların saldırı şansını eşyanın temel saldırı şansının %% %1$d\'i kadar, blok şansını eşyanın temel blok şansının %% %2$d\'i kadar ve kritik beceriyi eşyanın temel kritik becerisinin %% %3$d\'i kadar artırır.</string>
-    <string name="skill_longdescription_weapon_prof_blunt">Her beceri seviyesi için, sopa benzeri silahların saldırı şansını eşyanın temel saldırı şansının %% %1$d\'i kadar, blok şansını eşyanın temel blok şansının %% %2$d\'i kadar ve kritik beceriyi eşyanın temel kritik becerisinin %% %3$d\'i kadar artırır. Buna sopalar, bastonlar, topuzlar, asalar, savaş çekiçleri ve dev çekiçler dahildir.</string>
+    <string name="skill_longdescription_weapon_prof_blunt">Her beceri seviyesi için, küt silahların saldırı şansını eşyanın temel saldırı şansının %% %1$d\'i kadar, blok şansını eşyanın temel blok şansının %% %2$d\'i kadar ve kritik beceriyi eşyanın temel kritik becerisinin %% %3$d\'i kadar artırır. Buna sopalar, bastonlar, topuzlar, asalar, kırbaçlar, savaş çekiçleri ve dev çekiçler dahildir.</string>
     <string name="skill_longdescription_weapon_prof_unarmed">Silah ve kalkan olmadan savaşırken, beceri seviyesi başına %1$d saldırı şansı, %2$d hasar potansiyeli ve %3$d blok şansı kazanın.</string>
     <string name="skill_longdescription_armor_prof_shield">Bir kalkan veya savuşturma silahı kuşanırken, yetenek seviyesi başına hasar direncini %1$d artır.</string>
     <string name="skill_longdescription_armor_prof_unarmored">Herhangi bir zırh parçası olmadan savaşırken, beceri seviyesi başına %1$d blok şansı kazanın. Kumaştan yapılmış eşyalar zırh olarak kabul edilmez.</string>

AndorsTrail/res/values-uk/strings.xml

@@ -562,7 +562,7 @@
     <string name="startscreen_load_game">Завантаження гри</string>
     <string name="startscreen_game_mode">Режим</string>
     <string name="heroinfo_one_life">Реальність (1 життя)</string>
-    <string name="heroinfo_limited_lives">Обмежені життя (%1%d/%2$d залишилось)</string>
+    <string name="heroinfo_limited_lives">Обмежені життя (%1$d/%2$d залишилось)</string>
     <string name="heroinfo_unlimited_lives">Безліміт життів, 1 збереження</string>
     <string name="heroinfo_unlimited_lives_and_saves">Стандартна
 \n(Бізліміт життів та збережень)</string>

AndorsTrail/res/values/authors.xml

@@ -11,12 +11,13 @@
 		<b>Development team</b><br/>
 		• Oskar Wiksten<br/>
 		• Scott Devaney <b>*</b><br/>
-		• <a href="https://github.com/Zukero">Kevin Pochat</a> <b>*</b><br/>
+		• <a href="https://github.com/Zukero">Kevin Pochat</a><br/>
 		• Ian Haase<br/>
 		• <a href="https://github.com/Rijackson">Richard Jackson (rijackson741)</a> <b>*</b><br/>
 		• Christian Berlage <b>*</b><br/>
 		• <a href="http://gulisanolaw.com">Mike Gulisano</a><br/>
 		• Christian Zink <b>*</b><br/>
+		• Daniel-Ømicrón Rodríguez García (Omicronrg9) <b>*</b><br/>
 		<b>*</b> Currently active on team<br/>
 		<br/>
 		<b>Development tools (Andor\'s Trail Content Studio) by</b><br/>
@@ -34,6 +35,7 @@
 		• Olivier Dragon<br/>
 		• Christian Zink<br/>
 		• Antison<br/>
+		• Nathan Watson<br/>
 		<br/>
 		<b>Additional content created by</b><br/>
 		• Tom Jobes<br/>
@@ -46,19 +48,30 @@
 		• Christian Berlage<br/>
 		• Daniel-Ømicrón Rodríguez García (Omicronrg9)<br/>
 		• Moritz Arendt-Roth (Moerit)<br/>
+		• Antison<br/>
 		<br/>
 		<b>Translations</b><br/>
-		• Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br/>
-		• Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br/>
-		• French translation by LeSanglier, Misty Soul, zorun.42, Marwane K. and Olivier<br/>
-		• German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor, Tutar, Mütze, Moerit, Mayweed, Christian Berlage and Firefly84<br/>
-		• Hungarian translation by <a href="https://urbalazs.hu">Balázs Úr</a><br/>
+		• Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov, dromoz, avatar232 and Mingun<br/>
+		• Italian translation by k6blue, liogiu, Joker, Andrea Luciano Damico, NeoAugustus and Premoli Roberto<br/>
+		• French translation by LeSanglier, Misty Soul, zorun.42, Marwane K., Olivier, Sekhmet, Thomas Degave, Éfrit, Zeiko, Arliantir, Lacrom and yannubuntu<br/>
+		• German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor, Tutar, Mütze, Moerit, Mayweed, Christian Berlage, Firefly84 and Blackmore<br/>
+		• Hungarian translation by <a href="https://urbalazs.hu">Balázs Úr and Vala</a><br/>
 		• Hebrew translation by eitanbm<br/>
 		• Portuguese(PT) translation by mira<br/>
-		• Portuguese(BR) translation by Mauro Carvalho Chehab, Rafael Mendes (fifa1988)<br/>
-		• Japanese translation by surgecurrent<br/>
-		• Polish translation by tobik9090siemens, DanielS and Piotr Wieczorek<br/>
+		• Portuguese(BR) translation by Mauro Carvalho Chehab, Rafael Mendes (fifa1988), Anderson Nogueira Silva (Andxyz8), Lucas Araújo dos santos barbosa, Ueliton Alves Dos Santos<br/>
+		• Japanese translation by surgecurrent and Balance<br/>
+		• Polish translation by tobik9090siemens, DanielS, Piotr Wieczorek and mat9117 Mateusz Mendel<br/>
 		• Spanish translation by pahsito<br/>
+		• Dutch translation by GTK and Heimen Stoffels<br/>
+		• Punjabi translation by Satnam S Virdi<br/>
+		• Bulgarian translation by Voom<br/>
+		• Chinese translation (trad) by Yao-Rong(Dragon)<br/>
+		• Chinese translation (simpl) by Loman<br/>
+		• Czech translation by Petr Kadlec (Mormegil)<br/>
+		• Turkish translation by Hüseyin Karadağ, HaritaUstasi and Samet Develioğlu<br/>
+		• Ukrainian translation by zawarudo<br/>
+		• Indonesian translation by Frottle<br/>
+		• Catalan translation by David García Garzón (vokimon)<br/>
 		<br/>
 		<b>Graphics</b><br/>
 		• <a href="http://pixeljoint.com/p/101133.htm">Original hero sprites by Maksiu</a><br/>
@@ -104,6 +117,7 @@
 		• <a href="https://github.com/Rijackson">Richard Jackson (rijackson741)</a><br/>
 		• Antison<br/>
 		• <a href="https://urbalazs.hu">Balázs Úr</a><br/>
+		• Nathan Watson<br/>
 		<br/>
 		<b>Testing, feedback, &amp ideas by</b><br/>
 		• Stephen Stalnaker<br/>
@@ -125,4 +139,4 @@
 		<br/>
 		]]>
 	</string>
-</resources>
+</resources>

AndorsTrail/res/values/loadresources.xml

@@ -75,6 +75,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/itemlist_brimhaven</item>
         <item>@raw/itemlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/itemlist_brimhaven_2</item>
+        <item>@raw/itemlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_droplists">
@@ -113,6 +116,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/droplists_brimhaven</item>
         <item>@raw/droplists_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/droplists_brimhaven_2</item>
+        <item>@raw/droplists_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_quests">
@@ -131,7 +137,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                                        -		
+                                                -		
+        
         
         
         
@@ -150,6 +157,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/questlist_brimhaven</item>
         <item>@raw/questlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/questlist_brimhaven_2</item>
+        <item>@raw/questlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_conversationlists">
@@ -332,6 +342,9 @@
         <item>@raw/conversationlist_brimhaven2</item>
         <item>@raw/conversationlist_brimhaven_blackjack</item>
         <item>@raw/conversationlist_brimhaven_blackjack_game</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/conversationlist_brimhaven_2</item>
+        <item>@raw/conversationlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_monsters">
@@ -377,6 +390,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/monsterlist_brimhaven</item>
         <item>@raw/monsterlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/monsterlist_brimhaven_2</item>
+        <item>@raw/monsterlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_maps">
@@ -944,6 +960,12 @@
         <item>@xml/brimhaven_tavern_west_back</item>
         <item>@xml/brimhaven_warehouse</item>
         <item>@xml/brimhaven_weapon1</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@xml/blackwater_mountain55</item>
+        <item>@xml/blackwater_mountain56</item>
+        <item>@xml/brimhaven_church_basement</item>
+        <item>@xml/brimhaven_church_upstairs</item>
+        <item>@xml/brimhaven_exit</item>
     </array>
         
 </resources>

AndorsTrail/res/values/strings.xml

@@ -603,7 +603,7 @@
 	<string name="skill_title_weapon_prof_1hsword">One-handed sword proficiency</string>
 	<string name="skill_title_weapon_prof_2hsword">Two-handed sword proficiency</string>
 	<string name="skill_title_weapon_prof_axe">Axe proficiency</string>
-	<string name="skill_title_weapon_prof_blunt">Bludgeoning weapon proficiency</string>
+	<string name="skill_title_weapon_prof_blunt">Blunt weapon proficiency</string>
 	<string name="skill_title_weapon_prof_unarmed">Unarmed fighting</string>
 	<string name="skill_title_armor_prof_shield">Shield proficiency</string>
 	<string name="skill_title_armor_prof_unarmored">Unarmored fighting</string>
@@ -622,7 +622,7 @@
 	<string name="skill_shortdescription_weapon_prof_1hsword">Better at fighting with one-handed swords</string>
 	<string name="skill_shortdescription_weapon_prof_2hsword">Better at fighting with two-handed swords</string>
 	<string name="skill_shortdescription_weapon_prof_axe">Better at fighting with axes</string>
-	<string name="skill_shortdescription_weapon_prof_blunt">Better at fighting with bludgeoning weapons</string>
+	<string name="skill_shortdescription_weapon_prof_blunt">Better at fighting with blunt weapons</string>
 	<string name="skill_shortdescription_weapon_prof_unarmed">Better at fighting without weapons</string>
 	<string name="skill_shortdescription_armor_prof_shield">Make better use of shields and parrying weapons</string>
 	<string name="skill_shortdescription_armor_prof_unarmored">Better at fighting without armor</string>
@@ -641,7 +641,7 @@
 	<string name="skill_longdescription_weapon_prof_1hsword">For each skill level, increases attack chance of rapiers, longswords and broadswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_2hsword">For each skill level, increases attack chance of two-handed swords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_axe">For each skill level, increases attack chance of axes and greataxes by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, war hammers and giant hammers.</string>
+	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of blunt weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, whips, war hammers and giant hammers.</string>
 	<string name="skill_longdescription_weapon_prof_unarmed">When fighting without a weapon and shield, gain %1$d attack chance, %2$d damage potential and %3$d block chance per skill level.</string>
 	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield or parrying weapon equipped.</string>
 	<string name="skill_longdescription_armor_prof_unarmored">While fighting without having any piece of armor equipped, gain %1$d block chance per skill level. Items made of cloth are not considered as being armor.</string>

AndorsTrail/res/xml/arulircave3.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="17">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -200,7 +200,7 @@
    eJxjYCAfZAmTr7cKTW8SE/F6u3DYKwg046EQ+W6iBIDcf0kMt/wsPGGFTx8IrCIynFPEGRiuCxKnNhmHe3Hpd4bGjyQJ8XQNalYwCXrwAXYmBAYBV3HKzXw9QOkFGQAA8aoNWA==
   </data>
  </layer>
- <layer name="Walkable" width="15" height="15" visible="0">
+ <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsHEAMQzA2KTqQwbk6iNWPza1pNiNzY/oZpHrdlL1EhInJd7IiW966x3MGACNIIpf
   </data>
@@ -239,6 +239,11 @@
     <property name="place" value="trapexit"/>
    </properties>
   </object>
+  <object id="16" name="arulircave_trap101_chk" type="script" x="224" y="224" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
   <object id="6" name="arulir_2" type="spawn" x="64" y="64" width="160" height="224">
@@ -267,6 +272,15 @@
     <property name="requireValue" value="10"/>
    </properties>
   </object>
+  <object id="14" name="arulircave_trap:101" type="key" x="192" y="320" width="96" height="32">
+   <properties>
+    <property name="phrase" value="arulircave_trap101"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="101"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
   <object id="8" name="arulircave_trap:07" type="replace" x="160" y="224" width="32" height="64">