fixed typo

Currently translated at 89.9% (9032 of 10037 strings)

AndorsTrail/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="47"
-	android:versionName="0.7.6dev"
+	android:versionCode="51"
+	android:versionName="0.7.9"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -23,7 +23,6 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	
-	<uses-permission android:name="android.permission.READ_LOGS"/>
 	
 		
 	<application 

AndorsTrail/res/layout/heroinfo_stats.xml

@@ -30,7 +30,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/ui_theme_stdframe_bitmap" >
+                <TableRow>
 
+                    <TextView
+                        style="@style/traitsinfo_label"
+                        android:text="@string/heroinfo_mode" />
+
+                    <TextView
+                        android:id="@+id/heroinfo_mode"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@android:string/unknownName" />
+
+                </TableRow>
                 <TableRow>
 
                     <TextView

AndorsTrail/res/layout/startscreen_newgame.xml

@@ -80,6 +80,38 @@
             android:layout_height="wrap_content"
             android:inputType="textPersonName" />
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:background="?attr/ui_theme_stdframe_bitmap"
+        android:clickable="true"
+        android:gravity="bottom|start"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/startscreen_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:text="@string/startscreen_game_mode" />
+    </LinearLayout>
+    <LinearLayout
+        style="@style/AndorsTrail_Style_StdFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:orientation="horizontal" >
+        <Button
+            android:id="@+id/startscreen_mode_selector_button"
+            style="@style/AndorsTrail_Style_SpinnerEmulator"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:gravity="left"
+            android:text="" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"

AndorsTrail/res/raw/actorconditions_arulir_mountain.json

@@ -0,0 +1,67 @@
+[
+    {
+        "id":"crushed",
+        "iconID":"actorconditions_1:13",
+        "name":"Crushed",
+        "category":"physical",
+        "isStacking":1,
+        "roundEffect":{
+            "visualEffectID":"redSplash",
+            "increaseCurrentHP":{
+                "min":-1,
+                "max":-1
+            }
+        },
+        "abilityEffect":{
+            "increaseMaxHP":-5,
+            "increaseDamageResistance":-2
+        }
+    },
+    {
+        "id":"head_wound",
+        "iconID":"actorconditions_1:48",
+        "name":"Head wound",
+        "category":"physical",
+        "roundEffect":{
+            "increaseCurrentHP":{
+                "min":-2,
+                "max":-2
+            }
+        },
+        "abilityEffect":{
+            "increaseAttackChance":-20,
+            "increaseBlockChance":-20
+        }
+    },
+    {
+        "id":"mermaid_scale",
+        "iconID":"actorconditions_1:22",
+        "name":"Mermaid curse",
+        "category":"spiritual",
+        "roundEffect":{
+            "increaseCurrentHP":{
+                "min":-1,
+                "max":0
+            }
+        },
+        "abilityEffect":{
+            "increaseAttackChance":-20,
+            "increaseMaxHP":-15,
+            "increaseMaxAP":-3,
+            "increaseBlockChance":-10,
+            "increaseDamageResistance":-1
+        }
+    },
+    {
+        "id":"increased_defense",
+        "iconID":"actorconditions_1:107",
+        "name":"Increased defense",
+        "category":"physical",
+        "isPositive":1,
+        "abilityEffect":{
+            "increaseMaxHP":0,
+            "increaseBlockChance":15,
+            "increaseDamageResistance":2
+        }
+    }
+]

AndorsTrail/res/raw/actorconditions_graveyard1.json

@@ -1,72 +1,72 @@
-[
-    {
-        "id":"contagion2",
-        "iconID":"actorconditions_1:62",
-        "name":"Spore contagion",
-        "category":"blood",
-        "roundEffect":{
-            "visualEffectID":"greenSplash",
-            "increaseCurrentHP":{
-                "min":-1,
-                "max":-3
-            }
-        }
-    },
-    {
-        "id":"petrification",
-        "iconID":"actorconditions_1:9",
-        "name":"Petrification",
-        "category":"physical",
-        "isStacking":1,
-        "abilityEffect":{
-            "increaseMaxAP":-1,
-            "increaseMoveCost":0,
-            "increaseUseItemCost":0,
-            "increaseReequipCost":0,
-            "increaseAttackCost":0
-        }
-    },
-    {
-        "id":"vulnerability",
-        "iconID":"actorconditions_1:66",
-        "name":"Vulnerability",
-        "category":"physical",
-        "roundEffect":{
-            "visualEffectID":"redSplash"
-        },
-        "abilityEffect":{
-            "increaseDamageResistance":-1
-        }
-    },
-    {
-        "id":"flesh_rot",
-        "iconID":"actorconditions_1:82",
-        "name":"Flesh rot",
-        "category":"physical",
-        "isStacking":1,
-        "roundEffect":{
-            "visualEffectID":"redSplash",
-            "increaseCurrentHP":{
-                "min":-1,
-                "max":-1
-            }
-        },
-        "abilityEffect":{
-            "increaseBlockChance":-5
-        }
-    },
-    {
-        "id":"putrefaction",
-        "iconID":"actorconditions_1:21",
-        "name":"Putrefaction",
-        "category":"physical",
-        "isStacking":1,
-        "roundEffect":{
-            "visualEffectID":"greenSplash"
-        },
-        "abilityEffect":{
-            "increaseMaxHP":0,
-            "increaseMaxAP":-1
-        }
-    }
+[
+    {
+        "id":"contagion2",
+        "iconID":"actorconditions_1:62",
+        "name":"Spore contagion",
+        "category":"blood",
+        "roundEffect":{
+            "visualEffectID":"greenSplash",
+            "increaseCurrentHP":{
+                "min":-3,
+                "max":-1
+            }
+        }
+    },
+    {
+        "id":"petrification",
+        "iconID":"actorconditions_1:9",
+        "name":"Petrification",
+        "category":"physical",
+        "isStacking":1,
+        "abilityEffect":{
+            "increaseMaxAP":-1,
+            "increaseMoveCost":0,
+            "increaseUseItemCost":0,
+            "increaseReequipCost":0,
+            "increaseAttackCost":0
+        }
+    },
+    {
+        "id":"vulnerability",
+        "iconID":"actorconditions_1:66",
+        "name":"Vulnerability",
+        "category":"physical",
+        "roundEffect":{
+            "visualEffectID":"redSplash"
+        },
+        "abilityEffect":{
+            "increaseDamageResistance":-1
+        }
+    },
+    {
+        "id":"flesh_rot",
+        "iconID":"actorconditions_1:82",
+        "name":"Flesh rot",
+        "category":"physical",
+        "isStacking":1,
+        "roundEffect":{
+            "visualEffectID":"redSplash",
+            "increaseCurrentHP":{
+                "min":-1,
+                "max":-1
+            }
+        },
+        "abilityEffect":{
+            "increaseBlockChance":-5
+        }
+    },
+    {
+        "id":"putrefaction",
+        "iconID":"actorconditions_1:21",
+        "name":"Putrefaction",
+        "category":"physical",
+        "isStacking":1,
+        "roundEffect":{
+            "visualEffectID":"greenSplash"
+        },
+        "abilityEffect":{
+            "increaseMaxHP":0,
+            "increaseMaxAP":-1
+        }
+    }
 ]

AndorsTrail/res/raw/actorconditions_omicronrg9.json

@@ -0,0 +1,61 @@
+[
+    {
+        "id":"guild03_restingAC",
+        "iconID":"actorconditions_omi1:0",
+        "name":"Resting",
+        "category":"physical",
+        "isPositive":1,
+        "roundEffect":{
+            "visualEffectID":"blueSwirl",
+            "increaseCurrentHP":{
+                "min":100,
+                "max":100
+            }
+        }
+    },
+    {
+        "id":"g03_concentration",
+        "iconID":"actorconditions_1:106",
+        "name":"Concentration",
+        "category":"mental",
+        "isPositive":1,
+        "abilityEffect":{
+            "increaseAttackChance":10,
+            "increaseCriticalSkill":10,
+            "increaseBlockChance":10
+        }
+    },
+    {
+        "id":"g03_combo",
+        "iconID":"actorconditions_1:108",
+        "name":"Combo",
+        "category":"physical",
+        "isPositive":1,
+        "isStacking":1,
+        "fullRoundEffect":{
+            "visualEffectID":"blueSwirl"
+        },
+        "abilityEffect":{
+            "increaseAttackDamage":{
+                "min":0,
+                "max":1
+            },
+            "increaseAttackCost":-1,
+            "increaseCriticalSkill":2
+        }
+    },
+    {
+        "id":"carrying_ambelie",
+        "iconID":"actorconditions_omi1:1",
+        "name":"Carrying Ambelie",
+        "category":"physical",
+        "abilityEffect":{
+            "increaseAttackDamage":{
+                "min":-1,
+                "max":-1
+            },
+            "increaseMoveCost":2,
+            "increaseAttackCost":2
+        }
+    }
+]

AndorsTrail/res/raw/actorconditions_stoutford.json

@@ -26,9 +26,9 @@
         "category":"spiritual",
         "roundEffect":{
             "increaseCurrentHP":{
-                "min":-1,
-                "max":-2
+                "min":-2,
+                "max":-1
             }
         }
     }
-]
+]

AndorsTrail/res/raw/actorconditions_stoutford_combined.json

@@ -17,8 +17,8 @@
         "roundEffect":{
             "visualEffectID":"greenSplash",
             "increaseCurrentHP":{
-                "min":-1,
-                "max":-2
+                "min":-2,
+                "max":-1
             }
         }
     },

AndorsTrail/res/raw/actorconditions_v070.json

@@ -7,8 +7,8 @@
         "isStacking":1,
         "roundEffect":{
             "increaseCurrentHP":{
-                "min":-1,
-                "max":-2
+                "min":-2,
+                "max":-1
             },
             "increaseCurrentAP":{
                 "min":-1,
@@ -194,4 +194,4 @@
             }
         }
     }
-]
+]

AndorsTrail/res/raw/conversationlist_algangror.json

@@ -575,7 +575,7 @@
         "message":"You should probably leave before you tip something over that might ... ahem ... break. He he.",
         "replies":[
             {
-                "text":"I am sent by Jhaeld to end whatever it is you do to the people of Remgard.",
+                "text":"I was sent by Jhaeld to end whatever it is you are doing to the people of Remgard.",
                 "nextPhraseID":"algangror_fight_1",
                 "requires":[
                     {

AndorsTrail/res/raw/conversationlist_ambelie.json

@@ -66,6 +66,7 @@
     {
         "id":"ambelie_6",
         "message":"An excursion to see if Nor City really is all that I have heard about it. If it really can compare itself to the glamour of the great city of Feygard.",
+        "switchToNPC":"ambelie",
         "replies":[
             {
                 "text":"Nor City, where is that?",
@@ -74,6 +75,23 @@
             {
                 "text":"If you like it so much in Feygard, why would you even leave?",
                 "nextPhraseID":"ambelie_9"
+            },
+            {
+                "text":"Ehh ... I'm here to ... escort you safely to Nor City.",
+                "nextPhraseID":"ambelie_guild02_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":4
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_aulowenn.json

@@ -177,7 +177,7 @@
     },
     {
         "id":"aulowenn8",
-        "message":"I don't know if was just me imagining things or if something truly happened to them. Anyway, one by one, we started to get fewer and fewer.",
+        "message":"I don't know if it was just me imagining things or if something truly happened to them. Anyway, one by one, we started to get fewer and fewer.",
         "replies":[
             {
                 "text":"N",
@@ -510,4 +510,4 @@
             }
         ]
     }
-]
+]

AndorsTrail/res/raw/conversationlist_benbyr.json

@@ -2,6 +2,22 @@
     {
         "id":"benbyr",
         "replies":[
+            {
+                "nextPhraseID":"benbyr_guild03_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":11,
+                        "negate":true
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"benbyr_declined",
                 "requires":[

AndorsTrail/res/raw/conversationlist_buceth.json

@@ -281,7 +281,7 @@
     },
     {
         "id":"buceth_10",
-        "message":"Then, one day, a group of men come walking into the village. Shining armour, white teeth, combed hair, trimmed beards.",
+        "message":"Then, one day, a group of men come walking into the village. Shining armor, white teeth, combed hair, trimmed beards.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_crossglen_leta.json

@@ -2,14 +2,44 @@
     {
         "id":"leta1",
         "message":"Hey, this is my house, get out of here!",
+        "switchToNPC":"leta",
         "replies":[
             {
-                "text":"But I was just...",
+                "text":"But I was just ...",
                 "nextPhraseID":"leta2"
             },
             {
                 "text":"What about your husband Oromir?",
                 "nextPhraseID":"leta_oromir_select"
+            },
+            {
+                "text":"Umar sent me.",
+                "nextPhraseID":"leta_guild_1a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":25,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Umar sent me.",
+                "nextPhraseID":"leta_guild_1b",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":25,
+                        "negate":false
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_crossroads_1.json

@@ -61,11 +61,40 @@
     },
     {
         "id":"fanamor_6",
-        "message":"This is my hiding spot! Now leave me."
+        "message":"This is my hiding spot! Now leave me.",
+        "replies":[
+            {
+                "text":"Umar sent me with the words \"You are no one.No one knows you.No one has seen you.\" Now give me the journal please.",
+                "nextPhraseID":"fanamor_guild_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":30
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"crossroads_guard",
         "replies":[
+            {
+                "nextPhraseID":"crossroads_guild03_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":15,
+                        "negate":true
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"crossroads_guard_r_1",
                 "requires":[
@@ -107,7 +136,7 @@
     },
     {
         "id":"crossroads_guard_1",
-        "message":"Aren't you a bit young to be travelling around here all by yourself?",
+        "message":"Aren't you a bit young to be traveling around here all by yourself?",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_crossroads_2.json

@@ -89,7 +89,7 @@
     },
     {
         "id":"celdar_2",
-        "message":"Let me tell you something son. I do not want to buy anything from you, nor do I want to sell you anything. I just want to be left alone here, now that I have made it all the way to this safe haven.",
+        "message":"Let me tell you something. I do not want to buy anything from you, nor do I want to sell you anything. I just want to be left alone here, now that I have made it all the way to this safe haven.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_elythom_1.json

@@ -327,7 +327,7 @@
                 "nextPhraseID":"elythom_knight1_2"
             },
             {
-                "text":"That's a very nice suit of armour you have there.",
+                "text":"That's a very nice suit of armor you have there.",
                 "nextPhraseID":"elythom_knight1_3"
             }
         ]
@@ -338,7 +338,7 @@
     },
     {
         "id":"elythom_knight1_3",
-        "message":"Thank you, it's our standard set of armour that we use in the order. It takes a lot of scrubbing and polishing to make it this clean though."
+        "message":"Thank you, it's our standard set of armor that we use in the order. It takes a lot of scrubbing and polishing to make it this clean though."
     },
     {
         "id":"elythom_knight2",
@@ -349,7 +349,7 @@
                 "nextPhraseID":"elythom_knight1_2"
             },
             {
-                "text":"That's a very nice suit of armour you have there.",
+                "text":"That's a very nice suit of armor you have there.",
                 "nextPhraseID":"elythom_knight1_3"
             }
         ]

AndorsTrail/res/raw/conversationlist_fallhaven_church.json

@@ -16,7 +16,7 @@
                 "nextPhraseID":"thoronir_church_1"
             },
             {
-                "text":"Are the bonemeal potions ready yet?",
+                "text":"Are the Bonemeal potions ready yet?",
                 "nextPhraseID":"thoronir_trade_bonemeal",
                 "requires":[
                     {
@@ -25,6 +25,28 @@
                         "value":100
                     }
                 ]
+            },
+            {
+                "text":"I really need your help!",
+                "nextPhraseID":"thoronir_guild_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":45
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bonemeal",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":50,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_fallhaven_potions.json

@@ -191,6 +191,38 @@
                         "requireType":"inventoryRemove",
                         "requireID":"gold",
                         "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"antifoodp",
+                        "value":35,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have those ingredients for you.",
+                "nextPhraseID":"fallhaven_pot_antifp_q3",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gland",
+                        "value":1
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"hair",
+                        "value":2
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"antifoodp",
+                        "value":35
                     }
                 ]
             },

AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json

@@ -28,6 +28,23 @@
                     }
                 ]
             },
+            {
+                "text":"I really need to rest but I don't have 10 gold. I will wash the dishes. [Wash the dishes]",
+                "nextPhraseID":"bela_room_2",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"gold",
+                        "value":10,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":1
+                    }
+                ]
+            },
             {
                 "text":"No thanks.",
                 "nextPhraseID":"bela"

AndorsTrail/res/raw/conversationlist_fallhaven_warden.json

@@ -362,7 +362,7 @@
     },
     {
         "id":"fallhaven_warden_23",
-        "message":"Thank you again for the information. While I'm not sure how you may know this, I really appreciate you telling me.",
+        "message":"Thank you again for the information. I'm not sure how you may know this, but I really appreciate you telling me.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_falothen.json

@@ -354,7 +354,7 @@
     },
     {
         "id":"falothen1_7_a1",
-        "message":"I can teach you how to get better at fighting with all types of axes, from the small hatchet up to the larger two-handed greataxes. That way, you can be very versatile in your choice of weapons.",
+        "message":"I can teach you how to get better at fighting with all types of axes, from the small hatchet up to the larger two-handed greataxes. Even a scythe, although not designed for combat, can do a lot of damage if you know how to use it. That way, you can be very versatile in your choice of weapons.",
         "replies":[
             {
                 "text":"Sounds good. Teach me how to fight with axes.",
@@ -390,7 +390,7 @@
     },
     {
         "id":"falothen1_7_b",
-        "message":"Now, blunt weapons is my way of categorizing everything from the simple club, to maces up to quarterstaves. The technique for using them well is mostly the same.",
+        "message":"Now, blunt weapons is my way of categorizing everything from the simple club, to maces up to quarterstaves, and even whips. The technique for using them well is mostly the same, although whips are obviously somewhat different.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_farrik.json

@@ -59,7 +59,7 @@
     },
     {
         "id":"farrik_6",
-        "message":"The Fallhaven guard has started to get really annoyed at us lately. Probably because we have been very successful in our recent missions.",
+        "message":"The Fallhaven guard has started to get really annoyed with us lately. Probably because we have been very successful in our recent missions.",
         "replies":[
             {
                 "text":"N",
@@ -132,10 +132,6 @@
         "id":"farrik_12",
         "message":"Yeah, I guess so. But for the guild's sake, we would rather have our friend freed than imprisoned.",
         "replies":[
-            {
-                "text":"Maybe I should tell the guards that you are planning to get him out?",
-                "nextPhraseID":"farrik_15"
-            },
             {
                 "text":"Don't worry, your secret plan to free him is safe with me.",
                 "nextPhraseID":"farrik_14"
@@ -143,6 +139,18 @@
             {
                 "text":"[Lie] Don't worry, your secret plan to free him is safe with me.",
                 "nextPhraseID":"farrik_14"
+            },
+            {
+                "text":"Maybe I should tell the guards that you are planning to get him out?",
+                "nextPhraseID":"farrik_15",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -199,7 +207,15 @@
             },
             {
                 "text":"Maybe I should tell the guards that you are planning to get him out?",
-                "nextPhraseID":"farrik_15"
+                "nextPhraseID":"farrik_15",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -257,17 +273,33 @@
         "id":"farrik_22",
         "message":"How does that sound to you? Do you think you are up to it?",
         "replies":[
+            {
+                "text":"No, this is really starting to sound like a bad idea.",
+                "nextPhraseID":"farrik_17"
+            },
             {
                 "text":"Sure, sounds easy!",
-                "nextPhraseID":"farrik_23"
+                "nextPhraseID":"farrik_23",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
             },
             {
                 "text":"Sounds a bit dangerous, but I guess I'll try.",
-                "nextPhraseID":"farrik_23"
-            },
-            {
-                "text":"No, this is really starting to sound like a bad idea.",
-                "nextPhraseID":"farrik_17"
+                "nextPhraseID":"farrik_23",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -296,17 +328,6 @@
                 "text":"I am not done yet, but I am working on it.",
                 "nextPhraseID":"farrik_23"
             },
-            {
-                "text":"[Lie] It is done. He should be no problem during the night.",
-                "nextPhraseID":"farrik_26",
-                "requires":[
-                    {
-                        "requireType":"questProgress",
-                        "requireID":"farrik",
-                        "value":50
-                    }
-                ]
-            },
             {
                 "text":"It is done. He should be no problem during the night.",
                 "nextPhraseID":"farrik_24",
@@ -358,6 +379,28 @@
                         "requireType":"questProgress",
                         "requireID":"farrik",
                         "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"farrik_return_3",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":20,
+                        "negate":true
                     }
                 ]
             },
@@ -414,7 +457,7 @@
     },
     {
         "id":"farrik_26",
-        "message":"Oh you did? Well done. You have my thanks, friend.",
+        "message":"That's very useful information. Well done. You have my thanks, friend.",
         "rewards":[
             {
                 "rewardType":"questProgress",
@@ -422,5 +465,26 @@
                 "value":80
             }
         ]
+    },
+    {
+        "id":"farrik_return_3",
+        "message":"So did you tell the Warden about our plan then?",
+        "replies":[
+            {
+                "text":"No, I haven't talked to him.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"[Lie]. No. I went there, but I overheard the Warden saying there was no real threat, so they will lower security. So maybe you can carry out your mission without me being involved.",
+                "nextPhraseID":"farrik_26",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"farrik",
+                        "value":50
+                    }
+                ]
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_foamingflask_guards.json

@@ -85,6 +85,7 @@
     {
         "id":"ff_captain_1",
         "message":"Are you lost, son? This is no place for a kid like you.",
+        "switchToNPC":"feygard_patrol_captain",
         "replies":[
             {
                 "text":"I have a shipment of iron swords from Gandoren for you.",
@@ -132,6 +133,23 @@
                         "value":41
                     }
                 ]
+            },
+            {
+                "text":"Hi! I have been sent by Herg ... Hertzsen Laumwill, patriarch of the Laumwill family, to bring back his daughter!",
+                "nextPhraseID":"ff_captain_guild02_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":15,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_glasforn_fixes.json

@@ -21,7 +21,7 @@
     },
     {
         "id":"glasforn_rumblings60_5_3",
-        "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would able to remove the necklace. I'm no fighter though. I was too scared to even go near it.",
+        "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would be able to remove the necklace. I'm no fighter though. I was too scared to even go near it.",
         "replies":[
             {
                 "text":"I guess you are lucky I visited, although just asking me to kill it would have been easier. And nicer.",

AndorsTrail/res/raw/conversationlist_graveyard1.json

@@ -18,7 +18,7 @@
         "message":"That chest is something of a local legend. Been there for generations. They say it is sealed with magic and can only be opened with a special key, which hangs on the neck of one of the undead that roam in a cemetery directly south of here.",
         "replies":[
             {
-                "text":"Killing the undead is my speciality.",
+                "text":"Killing the undead is my specialty.",
                 "nextPhraseID":"graveyardtraveler_30"
             },
             {
@@ -540,7 +540,7 @@
     },
     {
         "id":"algore_99a",
-        "message":"Lets go.",
+        "message":"Let's go.",
         "replies":[
             {
                 "text":"I'm sorry it has come to this.",
@@ -1647,7 +1647,7 @@
     },
     {
         "id":"algore_x81",
-        "message":"The magical barrier at the cemetary could only be penetrated by someone carrying the text, which contained several magical inscriptions.",
+        "message":"The magical barrier at the cemetery could only be penetrated by someone carrying the text, which contained several magical inscriptions.",
         "replies":[
             {
                 "text":"N",
@@ -1667,7 +1667,7 @@
     },
     {
         "id":"graveyardtraveler_60",
-        "message":" Maybe he knows more. You should give him a visit.",
+        "message":"Maybe he knows more. You should give him a visit.",
         "replies":[
             {
                 "text":"OK, I'll do that.",
@@ -2590,7 +2590,7 @@
         "message":"I gave you the text you needed to get that sword. I think some of that gold should be mine. If you don't give me some then I'll take it from you.",
         "replies":[
             {
-                "text":"OK, OK. I guess it's fair that you should get a share. Here's 1000 gp.",
+                "text":"OK, OK. I guess it's fair that you should get a share. Here's 1000 gold.",
                 "nextPhraseID":"algore_99g",
                 "requires":[
                     {
@@ -2654,4 +2654,4 @@
             }
         ]
     }
-]
+]

AndorsTrail/res/raw/conversationlist_guynmart2_npc.json

@@ -171,7 +171,7 @@
     },
     {
         "id":"guynmart_farmer_40",
-        "message":"Our land belongs to Guynmart Castle, but old Guynmart is a friendly and rightious man. He never takes too much from us.",
+        "message":"Our land belongs to Guynmart Castle, but old Guynmart is a friendly and righteous man. He never takes too much from us.",
         "replies":[
             {
                 "text":"N",
@@ -1636,7 +1636,7 @@
     },
     {
         "id":"guynmart_wise_200",
-        "message":"Cheddar! I can't belive it!",
+        "message":"Cheddar! I can't believe it!",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_guynmart_npc.json

@@ -5975,7 +5975,7 @@
     },
     {
         "id":"guynmart_100",
-        "message":"Then you must open the gate! Go to the gatehouse and open it, so that my men can get in. Be quick.\nAfter that go to the farm south of here. I expect a feroucious battle.",
+        "message":"Then you must open the gate! Go to the gatehouse and open it, so that my men can get in. Be quick.\nAfter that go to the farm south of here. I expect a ferocious battle.",
         "replies":[
             {
                 "text":"OK.",

AndorsTrail/res/raw/conversationlist_jhaeld.json

@@ -1102,7 +1102,7 @@
     },
     {
         "id":"jhaeld_killalg_1",
-        "message":"I find this very hard to believe. For to have killed Algangror would have been a difficult task, given her power.",
+        "message":"I find this very hard to believe. For you to have killed Algangror would have been a difficult task, given her power.",
         "replies":[
             {
                 "text":"I have brought you her ring as proof that what I say is true.",

AndorsTrail/res/raw/conversationlist_lodar.json

@@ -1818,7 +1818,7 @@
     },
     {
         "id":"lodar_andor21",
-        "message":"I tell you, something affected the forest. Myself, I felt my stomach turning even more often that it usually does.",
+        "message":"I tell you, something affected the forest. Myself, I felt my stomach turning even more often than it usually does.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_stoutford.json

@@ -1304,7 +1304,7 @@
     },
     {
         "id":"tahalendor_rumblings80_4",
-        "message":"I'm surprised such a young boy as you managed to survive encountering one, let alone actually kill it.",
+        "message":"I'm surprised such a young kid as you managed to survive encountering one, let alone actually kill it.",
         "replies":[
             {
                 "text":"N",
@@ -1757,7 +1757,7 @@
     },
     {
         "id":"glasforn_rumblings60_5_3",
-        "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would able to remove the necklace. I'm no fighter though. I was too scared to even go near it.",
+        "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would be able to remove the necklace. I'm no fighter though. I was too scared to even go near it.",
         "replies":[
             {
                 "text":"I guess you are lucky I visited, although just asking me to kill it would have been easier. And nicer.",

AndorsTrail/res/raw/conversationlist_stoutford_combined.json

@@ -611,7 +611,7 @@
     },
     {
         "id":"caeda_root10_4",
-        "message":"I still have some. Here, take these to her, and send her my condolances.",
+        "message":"I still have some. Here, take these to her, and send her my condolences.",
         "replies":[
             {
                 "text":"Thanks. I'll make sure she gets them.",
@@ -1035,7 +1035,7 @@
     },
     {
         "id":"lakecave2_script_keycheck3a",
-        "message":"Hey, this looks like Caedas lost key.",
+        "message":"Hey, this looks like Caeda's lost key.",
         "rewards":[
             {
                 "rewardType":"giveItem",
@@ -3274,7 +3274,7 @@
     },
     {
         "id":"script_lakecave0_1",
-        "message":"You see large shapes moving in the shadows to the East. It looks dangerous that way!",
+        "message":"You see large shapes moving in the shadows to the east. It looks dangerous that way!",
         "replies":[
             {
                 "text":"N",
@@ -4377,7 +4377,7 @@
                 ]
             },
             {
-                "text":"I cleared flagstone of an evil demon.",
+                "text":"I cleared Flagstone of an evil demon.",
                 "nextPhraseID":"yolgen_flagstone_10",
                 "requires":[
                     {
@@ -4771,7 +4771,7 @@
     },
     {
         "id":"stoutford_castle_3b",
-        "message":"Gain? I am the the one who gains!",
+        "message":"Gain? I am the one who gains!",
         "replies":[
             {
                 "text":"No, that's not acceptable. Do you have anything better to offer?",
@@ -11742,5 +11742,9 @@
                 "value":48
             }
         ]
+    },
+    {
+        "id":"erwyn_skel_band",
+        "message":"Please don't disturb. We have to practice."
     }
 ]

AndorsTrail/res/raw/conversationlist_thievesguild_1.json

@@ -286,6 +286,17 @@
             {
                 "text":"Can I take a look at what supplies you have available?",
                 "nextPhraseID":"S"
+            },
+            {
+                "text":"Umar sent me to talk about my first job here.",
+                "nextPhraseID":"troublemaker_guild_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":10
+                    }
+                ]
             }
         ]
     },

AndorsTrail/res/raw/conversationlist_ulirfendor.json

@@ -1094,7 +1094,7 @@
     },
     {
         "id":"ulirfendor_helmet_4",
-        "message":"I am not certain of what the term 'The Dark Protector' refers to. At first I thought it might be some creature protecting something, but this helmet seems to fit better in on what the shrine speaks of.",
+        "message":"I am not certain of what the term 'The Dark Protector' refers to. At first I thought it might be some creature protecting something, but this helmet seems to better fit what the shrine speaks of.",
         "replies":[
             {
                 "text":"N",
@@ -1514,7 +1514,7 @@
     },
     {
         "id":"ulirfendor_dp_bless_2",
-        "message":"The blessing will grant you the aid of the Shadow while in combat, protecting you from harmful effects that you opponent might inflict upon you.",
+        "message":"The blessing will grant you the aid of the Shadow while in combat, protecting you from harmful effects that your opponent might inflict upon you.",
         "replies":[
             {
                 "text":"Thank you, but that will not be necessary. I am just happy to help.",
@@ -1638,4 +1638,4 @@
             }
         ]
     }
-]
+]

AndorsTrail/res/raw/conversationlist_umar.json

@@ -21,6 +21,364 @@
         "id":"umar_return_1",
         "message":"Hello again, my friend.",
         "replies":[
+            {
+                "text":"Do you have any tasks for me?",
+                "nextPhraseID":"umar_guild04_0",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"ThievesGuild",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "text":"Are you going to tell me about the key?",
+                "nextPhraseID":"umar_guild03_27c",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":45
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":50,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Crackshot is dead.",
+                "nextPhraseID":"umar_guild03_25",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"What am I supposed to do again?",
+                "nextPhraseID":"umar_guild03_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":40,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"What are your plans for the traitors?",
+                "nextPhraseID":"umar_guild03_14",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":5
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Can you continue with what you were telling me about the traitors?",
+                "nextPhraseID":"umar_guild03_10c",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":4
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":5,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"We are supposed to talk about something.",
+                "nextPhraseID":"umar_guild03_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":3
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":4,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"We were supposed to talk about something, right?",
+                "nextPhraseID":"umar_guild02_26",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":76
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":75,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"We were supposed to talk about something, right?",
+                "nextPhraseID":"umar_guild02_26",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":75
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves03",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I've finally finished the job.",
+                "nextPhraseID":"umar_guild02_22",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"Thieves02",
+                        "value":75,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":70
+                    }
+                ]
+            },
+            {
+                "text":"What am I suppossed to do again?",
+                "nextPhraseID":"umar_guild02_21",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"What am I supposed to do with the noblewoman?",
+                "nextPhraseID":"umar_guild02_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":35
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":40,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"What am I supposed to do with the noblewoman?",
+                "nextPhraseID":"umar_guild02_19",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":35,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have to talk to you about the noblewoman.",
+                "nextPhraseID":"umar_guild02_28",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":24
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":21
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":20,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":30,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":76,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have brought the hostage.",
+                "nextPhraseID":"umar_guild02_16",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":30,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":21,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":24,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Anything more about my new task?",
+                "nextPhraseID":"umar_guild02_15",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":6
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":15,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Anything more about my new task?",
+                "nextPhraseID":"umar_guild02_10",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"Thieves02",
+                        "value":2
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":4,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Anything more about my new task?",
+                "nextPhraseID":"umar_guild02_13",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"Thieves02",
+                        "value":4
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":6,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":15,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Troublemaker sent me. I have finished the job.",
+                "nextPhraseID":"umar_guild02_1",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"Thieves01",
+                        "value":60
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            },
             {
                 "text":"Hello.",
                 "nextPhraseID":"umar_return_2"
@@ -42,6 +400,47 @@
             {
                 "text":"Nice to meet you. Goodbye.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"Yes, I want to know more about the Thieves' Guild.",
+                "nextPhraseID":"umar_guild_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bucus",
+                        "value":100,
+                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":5,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I've been thinking about joining the guild.",
+                "nextPhraseID":"umar_guild_4b",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":5
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":10,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"Thieves01",
+                        "value":60,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -121,7 +520,7 @@
         "message":"We try to be above their bickering and differences. They may fight as much as they want, but the Thieves' Guild will outlive them all.",
         "replies":[
             {
-                "text":"What conflict?",
+                "text":"What differences?",
                 "nextPhraseID":"umar_conflict_1"
             },
             {
@@ -142,7 +541,7 @@
     },
     {
         "id":"umar_conflict_2",
-        "message":"The royal guard, led by Lord Geomyr in Feygard, are trying to ward off the recent increase in illegal activities, and are therefore imposing more restrictions on what is allowed and not.",
+        "message":"The royal guard, led by Lord Geomyr in Feygard, are trying to ward off the recent increase in illegal activities, and are therefore imposing more restrictions on what is or is not allowed.",
         "replies":[
             {
                 "text":"N",
@@ -152,7 +551,7 @@
     },
     {
         "id":"umar_conflict_3",
-        "message":"The priests of the Shadow, mostly seated in Nor City, are opponents to the new restrictions, saying that they limit the ways that they can please the Shadow.",
+        "message":"The priests of the Shadow, mostly seated in Nor City, are opposed to the new restrictions, saying that they limit the ways that they can please the Shadow.",
         "replies":[
             {
                 "text":"N",
@@ -206,7 +605,7 @@
     },
     {
         "id":"umar_andor_1",
-        "message":"He asked me for my support, and asked of how to find Lodar.",
+        "message":"He asked me for my support, and asked about how to find Lodar.",
         "replies":[
             {
                 "text":"Who is Lodar?",
@@ -263,7 +662,7 @@
     },
     {
         "id":"umar_lodar_2",
-        "message":"However, I heard that you helped us find the key of Luthor. This is something we have been trying to get to for a long time.",
+        "message":"However, I heard that you helped us find the key of Luthor. This is something we have been trying to get for a long time.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_v070signs1.json

@@ -57,7 +57,7 @@
     },
     {
         "id":"sign_rbfcr1_3",
-        "message":"While examining them, you recall the the old man Ogam in Vilegard spoke of some 'Rocky Formations'. Could this be what he was referring to? If that is the case, you wonder if this path might lead to Lodar's hideaway.",
+        "message":"While examining them, you recall the old man Ogam in Vilegard spoke of some 'Rocky Formations'. Could this be what he was referring to? If that is the case, you wonder if this path might lead to Lodar's hideaway.",
         "rewards":[
             {
                 "rewardType":"questProgress",

AndorsTrail/res/raw/conversationlist_vilegard_tavern.json

@@ -2,6 +2,7 @@
     {
         "id":"dunla_default",
         "message":"You look like a smart fellow. Need any supplies?",
+        "switchToNPC":"dunla",
         "replies":[
             {
                 "text":"Sure, let me see what you have available.",
@@ -15,7 +16,26 @@
     },
     {
         "id":"dunla_1",
-        "message":"Me? I am no one. You didn't even see me. You certainly did not talk to me."
+        "message":"Me? I am no one. You didn't even see me. You certainly did not talk to me.",
+        "replies":[
+            {
+                "text":"Troublemaker sent me to get your report.",
+                "nextPhraseID":"dunla_guild_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":25
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves01",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"tharwyn_select",

AndorsTrail/res/raw/droplists_arulir_mountain.json

@@ -0,0 +1,392 @@
+[
+    {
+        "id":"arulirskin",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":1,
+                    "max":12
+                }
+            },
+            {
+                "itemID":"meat",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"arulir_skin",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secretloot",
+        "items":[
+            {
+                "itemID":"gem4",
+                "chance":"80",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"gem5",
+                "chance":"70",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":1000
+                }
+            },
+            {
+                "itemID":"gem3",
+                "chance":"90",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave1_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":300
+                }
+            },
+            {
+                "itemID":"shirt1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"ring1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave1_loot2",
+        "items":[
+            {
+                "itemID":"rusted_iron_sword",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            },
+            {
+                "itemID":"shield_cracked_wooden",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem1",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem2",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem3",
+        "items":[
+            {
+                "itemID":"gem4",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem4",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem5",
+        "items":[
+            {
+                "itemID":"gem5",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gornaud",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":5,
+                    "max":80
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"meat",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"hunters_sword",
+                "chance":"1/10000",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_demonic",
+        "items":[
+            {
+                "itemID":"arulir_skin",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":10,
+                    "max":60
+                }
+            },
+            {
+                "itemID":"hunters_sword",
+                "chance":"1/1000",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"3",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"3",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_leader",
+        "items":[
+            {
+                "itemID":"arulir_skin",
+                "chance":"90",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":20,
+                    "max":80
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"flail_giant",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"haub_giant",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"bernhar_shop",
+        "items":[
+            {
+                "itemID":"arulir_cap",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"arulir_boots",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"lonely_wolf",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"meat2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/droplists_omicronrg9.json

@@ -0,0 +1,205 @@
+[
+    {
+        "id":"Feygard_scout",
+        "items":[
+            {
+                "itemID":"Fanamor_journal",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"feygard_iron_dagger",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            }
+        ]
+    },
+    {
+        "id":"guildbrig_2",
+        "items":[
+            {
+                "itemID":"boots1",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"bone",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":6
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"75",
+                "quantity":{
+                    "min":5,
+                    "max":55
+                }
+            },
+            {
+                "itemID":"ring_dmg1",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"guildbrig_1",
+        "items":[
+            {
+                "itemID":"meat2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_g03_rebthief_1",
+        "items":[
+            {
+                "itemID":"shield1",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gem2",
+                "chance":"50",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"boots1",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"75",
+                "quantity":{
+                    "min":25,
+                    "max":50
+                }
+            },
+            {
+                "itemID":"dagger0",
+                "chance":"25",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"g04_package1",
+        "items":[
+            {
+                "itemID":"g04_package",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_g03_rebthief_2",
+        "items":[
+            {
+                "itemID":"shield3",
+                "chance":"40",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"ironsword1",
+                "chance":"60",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"drop_g03_crackshot",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":125
+                }
+            },
+            {
+                "itemID":"armour_leather_villain",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"sword_g03_crackshot",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"g03_luthor",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/itemcategories_1.json

@@ -97,6 +97,13 @@
         "size":"large",
         "inventorySlot":"weapon"
     },
+    {
+        "id":"pole",
+        "name":"Pole weapon",
+        "actionType":"equip",
+        "size":"large",
+        "inventorySlot":"weapon"
+    },
     {
         "id":"buckler",
         "name":"Buckler",

AndorsTrail/res/raw/itemcategories_omicronrg9.json

@@ -0,0 +1,15 @@
+[
+    {
+        "id":"healing",
+        "name":"Healing item",
+        "actionType":"use",
+        "size":"none"
+    },
+    {
+        "id":"gauntlet",
+        "name":"Gauntlet",
+        "actionType":"equip",
+        "size":"light",
+        "inventorySlot":"hand"
+    }
+]

AndorsTrail/res/raw/itemcategories_stoutford_combined.json

@@ -5,12 +5,5 @@
         "actionType":"equip",
         "size":"std",
         "inventorySlot":"weapon"
-    },
-    {
-        "id":"scythe",
-        "name":"Scythe",
-        "actionType":"equip",
-        "size":"large",
-        "inventorySlot":"weapon"
     }
 ]

AndorsTrail/res/raw/itemlist_armour.json

@@ -44,7 +44,7 @@
     {
         "id":"armor2",
         "iconID":"items_armours:15",
-        "name":"Superior leather armour",
+        "name":"Superior leather armor",
         "baseMarketCost":624,
         "category":"bdy_lthr",
         "equipEffect":{
@@ -54,7 +54,7 @@
     {
         "id":"armor3",
         "iconID":"items_armours:16",
-        "name":"Hard leather armour",
+        "name":"Hard leather armor",
         "baseMarketCost":2407,
         "category":"bdy_lthr",
         "equipEffect":{
@@ -64,7 +64,7 @@
     {
         "id":"armor4",
         "iconID":"items_armours:16",
-        "name":"Superior hard leather armour",
+        "name":"Superior hard leather armor",
         "baseMarketCost":3866,
         "category":"bdy_lthr",
         "equipEffect":{

AndorsTrail/res/raw/itemlist_arulir_mountain.json

@@ -0,0 +1,143 @@
+[
+    {
+        "id":"crystal_blue",
+        "iconID":"items_misc:31",
+        "name":"Blue Crystals",
+        "hasManualPrice":1,
+        "baseMarketCost":5,
+        "category":"gem",
+        "description":"Some blue shimmering crystals."
+    },
+    {
+        "id":"crystal_red",
+        "iconID":"items_misc:34",
+        "name":"Red Crystals",
+        "hasManualPrice":1,
+        "baseMarketCost":4,
+        "category":"gem",
+        "description":"Some red shimmering crystals."
+    },
+    {
+        "id":"hunters_sword",
+        "iconID":"items_misc_5:42",
+        "name":"Hunters Sword",
+        "displaytype":"extraordinary",
+        "category":"lsword",
+        "description":"When venery is your game, you need a superior sword.",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":8
+            },
+            "increaseAttackCost":4,
+            "increaseAttackChance":25
+        },
+        "hitEffect":{
+            "increaseCurrentAP":{
+                "min":1,
+                "max":1
+            }
+        },
+        "killEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"rage_minor",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"10"
+                }
+            ]
+        }
+    },
+    {
+        "id":"lava_rock_hot",
+        "iconID":"items_misc_3:102",
+        "name":"Fierce Lava Rock",
+        "category":"other",
+        "description":"It's burning through your clothes"
+    },
+    {
+        "id":"lava_rock_cold",
+        "iconID":"items_misc:13",
+        "name":"Cold Lava Rock",
+        "category":"other",
+        "description":"A cold piece of magma"
+    },
+    {
+        "id":"arulir_cap",
+        "iconID":"items_misc_4:4",
+        "name":"Rockfall deflecting cap",
+        "hasManualPrice":1,
+        "baseMarketCost":80,
+        "category":"hd_cloth"
+    },
+    {
+        "id":"arulir_boots",
+        "iconID":"items_armours:28",
+        "name":"Sure step boots",
+        "hasManualPrice":1,
+        "baseMarketCost":120,
+        "category":"feet_lthr"
+    },
+    {
+        "id":"silver_bar",
+        "iconID":"items_misc:8",
+        "name":"Silver bar",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":319,
+        "category":"gem",
+        "description":"A small bar made of silver."
+    },
+    {
+        "id":"flail_giant",
+        "iconID":"items_misc_6:16",
+        "name":"Giant's flail",
+        "displaytype":"extraordinary",
+        "category":"mace",
+        "description":"This is a very heavy weapon!",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":11,
+                "max":40
+            },
+            "increaseAttackCost":14,
+            "increaseAttackChance":20,
+            "increaseCriticalSkill":5,
+            "setCriticalMultiplier":3.0
+        },
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"20"
+                }
+            ]
+        }
+    },
+    {
+        "id":"haub_giant",
+        "iconID":"items_tometik2:44",
+        "name":"Giant's hauberk",
+        "displaytype":"extraordinary",
+        "category":"bdy_hv",
+        "equipEffect":{
+            "increaseMaxHP":3,
+            "increaseAttackCost":1,
+            "increaseBlockChance":23,
+            "increaseDamageResistance":1
+        },
+        "hitReceivedEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"increased_defense",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"15"
+                }
+            ]
+        }
+    }
+]

AndorsTrail/res/raw/itemlist_burhczyd.json

@@ -0,0 +1,8 @@
+[
+    {
+        "id":"stuffed_rat",
+        "iconID":"items_misc:13",
+        "name":"Stuffed rat from Andor",
+        "category":"other"
+    }
+]

AndorsTrail/res/raw/itemlist_graveyard1.json

@@ -14,6 +14,7 @@
         "iconID":"items_misc_3:231",
         "name":"LifeTaker",
         "displaytype":"extraordinary",
+        "hasManualPrice":1,
         "baseMarketCost":5045,
         "category":"lsword",
         "description":"A fine blade enhanced by undead forces.",

AndorsTrail/res/raw/itemlist_guynmart.json

@@ -83,7 +83,7 @@
         "id":"guynmart_flute",
         "iconID":"items_japozero:371",
         "name":"Lovis' Flute",
-        "displaytype":"extraordinary",
+        "displaytype":"quest",
         "category":"other"
     },
     {

AndorsTrail/res/raw/itemlist_omicronrg9.json

@@ -0,0 +1,174 @@
+[
+    {
+        "id":"Dunla_journal",
+        "iconID":"items_books:4",
+        "name":"Dunla's Journal",
+        "displaytype":"quest",
+        "category":"other"
+    },
+    {
+        "id":"Fanamor_journal",
+        "iconID":"items_books:4",
+        "name":"Fanamor's Journal",
+        "displaytype":"quest",
+        "category":"other"
+    },
+    {
+        "id":"Leta_journal",
+        "iconID":"items_books:4",
+        "name":"Leta's Journal",
+        "displaytype":"quest",
+        "category":"other"
+    },
+    {
+        "id":"feygard_iron_dagger",
+        "iconID":"items_weapons:14",
+        "name":"Feygard iron dagger",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":567,
+        "category":"dagger",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":5
+            },
+            "increaseReequipCost":0,
+            "increaseAttackCost":4,
+            "increaseAttackChance":15,
+            "increaseCriticalSkill":10,
+            "increaseBlockChance":2,
+            "setCriticalMultiplier":2.5
+        }
+    },
+    {
+        "id":"bandage",
+        "iconID":"items_misc:53",
+        "name":"Bandage",
+        "displaytype":"quest",
+        "baseMarketCost":256,
+        "category":"healing",
+        "useEffect":{
+            "increaseCurrentHP":{
+                "min":12,
+                "max":24
+            },
+            "conditionsSource":[
+                {
+                    "condition":"bleeding_wound",
+                    "magnitude":-99,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"guildbrigK",
+        "iconID":"items_misc:21",
+        "name":"Guild brig key",
+        "displaytype":"quest",
+        "category":"other",
+        "description":""
+    },
+    {
+        "id":"meat2",
+        "iconID":"items_consumables_omi1:0",
+        "name":"Rotten meat",
+        "hasManualPrice":1,
+        "baseMarketCost":0,
+        "category":"food",
+        "description":"Even fly larvae have died eating this.",
+        "useEffect":{
+
+
+            "increaseCurrentHP":{
+                "min":-15,
+                "max":-10
+            },
+            "conditionsSource":[
+                {
+                    "condition":"foodp",
+                    "magnitude":5,
+                    "duration":10,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"g04_package",
+        "iconID":"items_g03_package_omi1:0",
+        "name":"Suspicious package",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"This box has a mark that you don't understand. Better not to open it."
+    },
+    {
+        "id":"sword_g03_crackshot",
+        "iconID":"items_weapons_2:2",
+        "name":"Yatagan",
+        "displaytype":"extraordinary",
+        "category":"bsword",
+        "description":"Crackshot's personal weapon",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":4,
+                "max":12
+            },
+            "increaseMaxHP":0,
+            "increaseAttackCost":5,
+            "increaseAttackChance":19,
+            "increaseCriticalSkill":10,
+            "increaseBlockChance":0,
+            "increaseDamageResistance":0,
+            "setCriticalMultiplier":2.0
+        }
+    },
+    {
+        "id":"g03_luthor",
+        "iconID":"items_misc:21",
+        "name":"Key of Luthor",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"The ancient key has a bluish glow."
+    },
+    {
+        "id":"g03_luthor2",
+        "iconID":"items_misc:23",
+        "name":"Blessed key of luthor",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"The curse has disappeared."
+    },
+    {
+        "id":"g02_ambelie",
+        "iconID":"items_necklaces_1:0",
+        "name":"Sapphire Necklace",
+        "displaytype":"quest",
+        "hasManualPrice":1,
+        "baseMarketCost":5000,
+        "category":"neck",
+        "description":"The jewelry that Ambelie gave me in exchange for her life.",
+        "equipEffect":{
+            "increaseMaxHP":5
+        }
+    },
+    {
+        "id":"gauntlet_omi2_1",
+        "iconID":"items_weapons:23",
+        "name":"Spiked Gloves",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":1994,
+        "category":"gauntlet",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":3,
+                "max":4
+            },
+            "increaseAttackCost":4,
+            "increaseAttackChance":9,
+            "increaseBlockChance":11
+        }
+    }
+]

AndorsTrail/res/raw/itemlist_stoutford_combined.json

@@ -177,7 +177,7 @@
                 {
                     "condition":"speed_minor",
                     "magnitude":2,
-                    "duration":1,
+                    "duration":2,
                     "chance":"5"
                 }
             ]
@@ -188,7 +188,7 @@
         "iconID":"items_weapons_3:3",
         "name":"Scythe",
         "displaytype":"ordinary",
-        "category":"scythe",
+        "category":"pole",
         "description":"This looks more suited to farming than fighting",
         "equipEffect":{
             "increaseAttackDamage":{
@@ -207,7 +207,7 @@
         "displaytype":"ordinary",
         "hasManualPrice":1,
         "baseMarketCost":464,
-        "category":"scythe",
+        "category":"pole",
         "description":"This looks more suited to farming than fighting",
         "equipEffect":{
             "increaseAttackDamage":{
@@ -261,6 +261,7 @@
                 "max":14
             },
             "increaseAttackCost":6,
+            "increaseAttackChance":8,
             "increaseCriticalSkill":10,
             "setCriticalMultiplier":2.0
         }
@@ -975,9 +976,9 @@
         "id":"erwyn_coin",
         "iconID":"items_misc:10",
         "name":"Gold coins",
+        "displaytype":"quest",
         "hasManualPrice":1,
         "baseMarketCost":1,
-        "displaytype":"quest",
         "category":"other",
         "description":"Special coins against powerful undead"
     },

AndorsTrail/res/raw/itemlist_v0610_1.json

@@ -417,7 +417,7 @@
     {
         "id":"armour_crude_leather",
         "iconID":"items_armours:16",
-        "name":"Crude leather armour",
+        "name":"Crude leather armor",
         "hasManualPrice":0,
         "baseMarketCost":514,
         "category":"bdy_lthr",
@@ -429,7 +429,7 @@
     {
         "id":"armour_firm_leather",
         "iconID":"items_armours:16",
-        "name":"Firm leather armour",
+        "name":"Firm leather armor",
         "hasManualPrice":0,
         "baseMarketCost":417,
         "category":"bdy_lthr",
@@ -441,7 +441,7 @@
     {
         "id":"armour_rigid_leather",
         "iconID":"items_armours:16",
-        "name":"Rigid leather armour",
+        "name":"Rigid leather armor",
         "hasManualPrice":0,
         "baseMarketCost":625,
         "category":"bdy_lthr",
@@ -493,7 +493,7 @@
     {
         "id":"armour_leather_villain",
         "iconID":"items_armours:16",
-        "name":"Villain's leather armour",
+        "name":"Villain's leather armor",
         "hasManualPrice":0,
         "baseMarketCost":3700,
         "category":"bdy_lthr",

AndorsTrail/res/raw/itemlist_v069.json

@@ -233,7 +233,7 @@
     {
         "id":"bwm_leather_armour",
         "iconID":"items_armours:15",
-        "name":"Blackwater leather armour",
+        "name":"Blackwater leather armor",
         "displaytype":"rare",
         "hasManualPrice":1,
         "baseMarketCost":2551,