Merge pull request #1 from NutAndor/v077

V077

AndorsTrail/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="43"
-	android:versionName="0.7.2dev"
+	android:versionCode="48"
+	android:versionName="0.7.7"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -20,10 +20,10 @@
 		android:anyDensity="true"
 		/>
 	
-	<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"/>
+	<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/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_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_bugfix_0_7_4.json

@@ -0,0 +1,426 @@
+[
+    {
+        "id":"mountainlake0_sign",
+        "message":"You can see no way to descend the cliffs from here."
+    },
+    {
+        "id":"lookout_0",
+        "message":"Standing on the top of the mountain, you have a great view in all directions.",
+        "replies":[
+            {
+                "text":"Look down.",
+                "nextPhraseID":"lookout_down"
+            }
+        ]
+    },
+    {
+        "id":"lookout_north",
+        "message":"You see a town across the lake, but you can see no way to cross the water to get there.",
+        "replies":[
+            {
+                "text":"Look closer at the town.",
+                "nextPhraseID":"lookout_north_2"
+            }
+        ]
+    },
+    {
+        "id":"lookout_east",
+        "message":"You see the southern shore of a large lake. It looks like it might be possible to walk around the lake in that direction, but there are a number of large, dangerous looking creatures moving around."
+    },
+    {
+        "id":"lookout_south",
+        "message":"The mountain drops away below you. There is not much to see in this direction."
+    },
+    {
+        "id":"lookout_west",
+        "message":"You see more cliffs, but the view beyond that is hidden in mist. ",
+        "replies":[
+            {
+                "text":"Keep looking west.",
+                "nextPhraseID":"lookout_west_2"
+            }
+        ]
+    },
+    {
+        "id":"lookout_west_2",
+        "message":"The mist briefly clears, and you can make out a town in the distance."
+    },
+    {
+        "id":"lookout_up_1",
+        "message":"You see a bird, perhaps a hawk, high in the sky.",
+        "replies":[
+            {
+                "text":"Watch the bird.",
+                "nextPhraseID":"lookout_up_2"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":200
+            }
+        ]
+    },
+    {
+        "id":"lookout_up_2",
+        "message":"Suddenly, the bird folds its wings and dives. You realize that it is not a hawk, but a falcon.",
+        "replies":[
+            {
+                "text":"Watch the falcon.",
+                "nextPhraseID":"lookout_up_3"
+            }
+        ]
+    },
+    {
+        "id":"lookout_up_3",
+        "message":"The falcon hurtles towards the mountain. It is going so fast it seems that surely it must crash into the rocks. ",
+        "replies":[
+            {
+                "text":"Continue watching the falcon.",
+                "nextPhraseID":"lookout_up_4"
+            }
+        ]
+    },
+    {
+        "id":"lookout_up_4",
+        "message":"At what seems like the last possible moment, the falcon flares its wings and lands hard on whatever unfortunate creature it spied from high above.",
+        "replies":[
+            {
+                "text":"Continue watching the falcon.",
+                "nextPhraseID":"lookout_up_5"
+            }
+        ]
+    },
+    {
+        "id":"lookout_up_5",
+        "message":"The falcon soars back into the sky. It has something in its talons, but you can't make out what it is. What an amazing thing to witness!"
+    },
+    {
+        "id":"lookout_north_2",
+        "message":"You see a few houses, and what appears to be an inn, or tavern."
+    },
+    {
+        "id":"lookout_northeast",
+        "message":"You see a large lake. It is difficult to make out any details on the distant shore, but there are trees and cliffs."
+    },
+    {
+        "id":"lookout_southeast",
+        "message":"The view is blocked by mountains. You can see some creatures moving on the slopes.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_souteast_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":200,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"lookout_southwest",
+        "message":"You see the river, far below. You can't believe you climbed all the way up from there!"
+    },
+    {
+        "id":"lookout_northwest",
+        "message":"You see a town across the lake, but you can see no way to cross the water to get there. You can see a few people in the town.",
+        "replies":[
+            {
+                "text":"Watch the people.",
+                "nextPhraseID":"lookout_northwest_1"
+            }
+        ]
+    },
+    {
+        "id":"lookout_northwest_1",
+        "message":"You see two women that appear to be arguing.",
+        "replies":[
+            {
+                "text":"Continue to watch the women.",
+                "nextPhraseID":"lookout_northwest_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"sisterfight",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Continue to watch the women.",
+                "nextPhraseID":"lookout_northwest_3",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"sisterfight",
+                        "value":10
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"lookout_northwest_2",
+        "message":"The two women eventually separate and walk away from each other. You wonder what the argument was about."
+    },
+    {
+        "id":"lookout_northwest_3",
+        "message":"The two women eventually separate and walk away from each other. You can't make out their faces from here, but you know who they probably are."
+    },
+    {
+        "id":"lookout_down",
+        "message":"You see the montain top you are standing on.",
+        "replies":[
+            {
+                "text":"Look closer at the rocks.",
+                "nextPhraseID":"lookout_down_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Look closer at the rocks.",
+                "nextPhraseID":"lookout_down_2a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":210
+                    }
+                ]
+            },
+            {
+                "text":"Look in another direction.",
+                "nextPhraseID":"lookout_0"
+            }
+        ]
+    },
+    {
+        "id":"lookout_down_2",
+        "message":"You see something glinting by your feet.",
+        "replies":[
+            {
+                "text":"Bend down to look closer.",
+                "nextPhraseID":"lookout_down_3"
+            },
+            {
+                "text":"Look in another direction.",
+                "nextPhraseID":"lookout_0"
+            }
+        ]
+    },
+    {
+        "id":"lookout_down_3",
+        "message":"You have found a gem!",
+        "replies":[
+            {
+                "text":"Look in another direction.",
+                "nextPhraseID":"lookout_0"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"dropList",
+                "rewardID":"opal"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":210
+            }
+        ]
+    },
+    {
+        "id":"lookout_down_2a",
+        "message":"There is nothing more to be found here.",
+        "replies":[
+            {
+                "text":"Look in another direction.",
+                "nextPhraseID":"lookout_0"
+            }
+        ]
+    },
+    {
+        "id":"lookout_north_0",
+        "message":"You look to the north.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_north"
+            }
+        ]
+    },
+    {
+        "id":"lookout_northeast_0",
+        "message":"You look to the northeast.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_northeast"
+            }
+        ]
+    },
+    {
+        "id":"lookout_east_0",
+        "message":"You look to the east.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_east"
+            }
+        ]
+    },
+    {
+        "id":"lookout_southeast_0",
+        "message":"You look to the southeast.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_southeast"
+            }
+        ]
+    },
+    {
+        "id":"lookout_souteast_1",
+        "message":"Suddenly, something in the sky catches your eye.",
+        "replies":[
+            {
+                "text":"Look up at the sky.",
+                "nextPhraseID":"lookout_up_1"
+            }
+        ]
+    },
+    {
+        "id":"lookout_south_0",
+        "message":"You look to the south.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_south"
+            }
+        ]
+    },
+    {
+        "id":"lookout_southwest_0",
+        "message":"You look to the southwest.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_southwest"
+            }
+        ]
+    },
+    {
+        "id":"lookout_west_0",
+        "message":"You look to the west.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_west"
+            }
+        ]
+    },
+    {
+        "id":"lookout_northwest_0",
+        "message":"You look to the northwest.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"lookout_northwest"
+            }
+        ]
+    },
+    {
+        "id":"lookout_sign",
+        "message":"The sign is old and worn, but you can make out the words \"Lake Laeroth watchtower\"."
+    },
+    {
+        "id":"lookout_bed_0",
+		"rewards": [
+			{
+				"rewardType": "alignmentSet",
+				"rewardID": "lookout_bed",
+				"value": 1
+			}
+		]
+	},
+    {
+        "id":"lookout_bed",
+		"rewards": [
+			{
+				"rewardType": "alignmentChange",
+				"rewardID": "lookout_bed",
+				"value": 1
+			}
+		],
+        "replies":[
+            {
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+						"requireType": "factionScore",
+						"requireID": "lookout_bed",
+						"value": 16
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"lookout_bed_20",
+                "requires":[
+                    {
+						"requireType": "factionScore",
+						"requireID": "lookout_bed",
+						"value": 15
+                    }
+
+                ]
+            },
+            {
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+						"requireType": "factionScore",
+						"requireID": "lookout_bed",
+						"value": 6
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"lookout_bed_10",
+                "requires":[
+                    {
+						"requireType": "factionScore",
+						"requireID": "lookout_bed",
+						"value": 5
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"lookout_bed_10",
+        "message":"You toss and turn, but sleep won't come."
+    },
+    {
+        "id":"lookout_bed_20",
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"stunned",
+                "value":7
+            }
+        ],
+        "message":"Now you have got a headache. You really should give up trying to sleep."
+    }
+]

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_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_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 her 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_graveyard1.json

@@ -911,7 +911,7 @@
     },
     {
         "id":"waterwayacaveenter_20",
-        "message":"You have found the enterance to the cave Cithurn was talking about.",
+        "message":"You have found the entrance to the cave Cithurn was talking about.",
         "rewards":[
             {
                 "rewardType":"questProgress",
@@ -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":[
                     {

AndorsTrail/res/raw/conversationlist_guynmart2.json

@@ -302,6 +302,11 @@
     {
         "id":"guynmart_s_lake_3",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":1
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -317,6 +322,11 @@
     {
         "id":"guynmart_s_lake_4",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":2
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -332,6 +342,11 @@
     {
         "id":"guynmart_s_lake_5",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":3
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -347,6 +362,11 @@
     {
         "id":"guynmart_s_lake_6",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":4
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -362,6 +382,11 @@
     {
         "id":"guynmart_s_lake_7",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":5
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -377,6 +402,11 @@
     {
         "id":"guynmart_s_lake_8",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":6
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -392,6 +422,11 @@
     {
         "id":"guynmart_s_lake_9",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":7
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -407,6 +442,11 @@
     {
         "id":"guynmart_s_lake_10",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":8
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -422,6 +462,51 @@
     {
         "id":"guynmart_s_lake_11",
         "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":2
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":3
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":4
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":5
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":6
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":7
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":8
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":9
+            },
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"guynmart_r_lake",
@@ -434,6 +519,66 @@
             }
         ]
     },
+    {
+        "id":"guynmart_s_lake_11b",
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":2
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":3
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":4
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":5
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":6
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":7
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":8
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":9
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":10
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"guynmart_r_lake",
+                "value":11
+            }
+        ]
+    },
     {
         "id":"guynmart_s_lake_3x",
         "replies":[
@@ -1309,5 +1454,15 @@
                 "nextPhraseID":"guynmart_sign_fog_10a"
             }
         ]
+    },
+    {
+        "id":"guynmart_rmv_bridgeguard",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"feygard_bridgeguard",
+                "mapName":"fields5"
+            }
+        ]
     }
 ]

AndorsTrail/res/raw/conversationlist_guynmart2_npc.json

@@ -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

@@ -3392,11 +3392,6 @@
                 "rewardType":"spawnAll",
                 "rewardID":"guynmart_olav",
                 "mapName":"guynmart"
-            },
-            {
-                "rewardType":"removeSpawnArea",
-                "rewardID":"guynmart_steward3",
-                "mapName":"guynmart"
             }
         ]
     },
@@ -3414,6 +3409,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"guynmart",
                 "value":80
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"guynmart_steward3",
+                "mapName":"guynmart"
             }
         ]
     },

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

@@ -1389,7 +1389,7 @@
     },
     {
         "id":"lodar_hira1",
-        "message":"That's the effects of the Hira'zinn. Its desires is to consume the minds of all it finds.",
+        "message":"That's the effect of the Hira'zinn. Its desire is to consume the minds of all it finds.",
         "replies":[
             {
                 "text":"N",
@@ -2130,4 +2130,4 @@
             }
         ]
     }
-]
+]

AndorsTrail/res/raw/conversationlist_mikhail.json

@@ -246,7 +246,7 @@
     },
     {
         "id":"mikhail_andor1",
-        "message":"As I said, Andor went out yesterday and hasn't been back since. I'm starting to worry about him. Please go look for your brother, he said he would only be out a short while.",
+        "message":"As I said, Andor went out and hasn't been back since. I worry about him. Please go look for your brother. He said he would only be out for a short while.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_pwcave.json

@@ -80,7 +80,7 @@
     },
     {
         "id":"gauward_1",
-        "message":"This place used to be a safe house for travellers between Loneford and Brimhaven, before they had finished the road between the villages.",
+        "message":"This place used to be a safe house for travelers between Loneford and Brimhaven, before they had finished the road between the villages.",
         "replies":[
             {
                 "text":"N",

AndorsTrail/res/raw/conversationlist_stoutford.json

@@ -92,7 +92,8 @@
                     {
                         "requireType":"questProgress",
                         "requireID":"halvor_surprise",
-                        "value":190
+                        "value":190,
+                        "negate":true
                     }
                 ]
             }
@@ -114,7 +115,7 @@
     },
     {
         "id":"soutford_gateguard_what_0",
-        "message":"This is Stoutford. Our small town was the resting place of choice for many merchants on their way between Fallhaven and the Blackwater moutain.",
+        "message":"This is Stoutford. Our small town was the resting place of choice for many merchants on their way between Fallhaven and the Blackwater mountain.",
         "replies":[
             {
                 "text":"Was?",
@@ -1303,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",
@@ -1515,7 +1516,7 @@
                         "requireType":"killedMonster",
                         "requireID":"erwyn",
                         "value":1,
-						"negate":true
+                        "negate":true
                     }
                 ]
             }
@@ -1847,4 +1848,4 @@
             }
         ]
     }
-]
+]

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_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_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_bugfix_0_7_4.json

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

AndorsTrail/res/raw/droplists_debug.json

@@ -1,185 +1,185 @@
-[
-    {
-        "id": "debugshop1",
-        "items": [
-            {
-                "itemID": "club1",
-                "quantity": {
-                    "min": 10,
-                    "max": 10
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "club3",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "hammer0",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "hammer1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "shirt2",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            }
-        ]
-    },
-    {
-        "id": "debuglist1",
-        "items": [
-            {
-                "itemID": "gold",
-                "quantity": {
-                    "min": 3,
-                    "max": 3
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "club3",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            }
-        ]
-    },
-    {
-        "id": "debuglist2",
-        "items": [{
-                "itemID": "gold",
-                "quantity": {
-                    "min": 3,
-                    "max": 3
-                },
-                "chance": 100
-            }]
-    },
-    {
-        "id": "startitems",
-        "items": [
-            {
-                "itemID": "gold",
-                "quantity": {
-                    "min": 12,
-                    "max": 12
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "club1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "shirt1",
-                "quantity": {
-                    "min": 5,
-                    "max": 5
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "dagger0",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "debug_dagger1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "debug_ring1",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            },
-            {
-                "itemID": "shadow_slayer",
-                "quantity": {
-                    "min": 1,
-                    "max": 1
-                },
-                "chance": 100
-            }
-        ]
-    },
-     {
-    "id": "debugrequires10gold_droplist",
-    "items": [
-      {
-        "quantity": {
-          "min": 10,
-          "max": 10
-        },
-        "itemID": "gold",
-        "chance": 100
-      }
-    ]
-  }
-]
+[
+    {
+        "id": "debugshop1",
+        "items": [
+            {
+                "itemID": "club1",
+                "quantity": {
+                    "min": 10,
+                    "max": 10
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "club3",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "hammer0",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "hammer1",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "shirt1",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "shirt2",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "dagger0",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            }
+        ]
+    },
+    {
+        "id": "debuglist1",
+        "items": [
+            {
+                "itemID": "gold",
+                "quantity": {
+                    "min": 3,
+                    "max": 3
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "dagger0",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "shirt1",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "club3",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            }
+        ]
+    },
+    {
+        "id": "debuglist2",
+        "items": [{
+                "itemID": "gold",
+                "quantity": {
+                    "min": 3,
+                    "max": 3
+                },
+                "chance": "100"
+            }]
+    },
+    {
+        "id": "startitems",
+        "items": [
+            {
+                "itemID": "gold",
+                "quantity": {
+                    "min": 12,
+                    "max": 12
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "club1",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "shirt1",
+                "quantity": {
+                    "min": 5,
+                    "max": 5
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "dagger0",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "debug_dagger1",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "debug_ring1",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            },
+            {
+                "itemID": "shadow_slayer",
+                "quantity": {
+                    "min": 1,
+                    "max": 1
+                },
+                "chance": "100"
+            }
+        ]
+    },
+     {
+    "id": "debugrequires10gold_droplist",
+    "items": [
+      {
+        "quantity": {
+          "min": 10,
+          "max": 10
+        },
+        "itemID": "gold",
+        "chance": "100"
+      }
+    ]
+  }
+]

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_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/itemlist_bugfix_0_7_4.json

@@ -0,0 +1,10 @@
+[
+    {
+        "id":"gem7",
+        "iconID":"items_misc:4",
+        "name":"Shimmering opal",
+        "hasManualPrice":1,
+        "baseMarketCost":125,
+        "category":"gem"
+    }
+]

AndorsTrail/res/raw/itemlist_food.json

@@ -1,288 +1,206 @@
-[
-    {
-        "id":"apple_green",
-        "iconID":"items_consumables:2",
-        "name":"Green apple",
-        "hasManualPrice":1,
-        "baseMarketCost":14,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":8,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"apple_red",
-        "iconID":"items_consumables:3",
-        "name":"Red apple",
-        "hasManualPrice":1,
-        "baseMarketCost":22,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":12,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"meat",
-        "iconID":"items_consumables:25",
-        "name":"Meat",
-        "hasManualPrice":1,
-        "baseMarketCost":29,
-        "category":"animal_e",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":2,
-                    "duration":12,
-                    "chance":"100"
-                },
-                {
-                    "condition":"foodp",
-                    "magnitude":3,
-                    "duration":10,
-                    "chance":"10"
-                }
-            ]
-        }
-    },
-    {
-        "id":"meat_cooked",
-        "iconID":"items_consumables:27",
-        "name":"Cooked meat",
-        "hasManualPrice":1,
-        "baseMarketCost":78,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":3,
-                    "duration":11,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"strawberry",
-        "iconID":"items_consumables:8",
-        "name":"Strawberry",
-        "hasManualPrice":1,
-        "baseMarketCost":3,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":2,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"carrot",
-        "iconID":"items_consumables:15",
-        "name":"Carrot",
-        "hasManualPrice":1,
-        "baseMarketCost":14,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":8,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"bread",
-        "iconID":"items_consumables:21",
-        "name":"Bread",
-        "hasManualPrice":1,
-        "baseMarketCost":6,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":10,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"mushroom",
-        "iconID":"items_consumables:19",
-        "name":"Mushroom",
-        "hasManualPrice":1,
-        "baseMarketCost":3,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":2,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"pear",
-        "iconID":"items_consumables:9",
-        "name":"Pear",
-        "hasManualPrice":1,
-        "baseMarketCost":14,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":8,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"eggs",
-        "iconID":"items_consumables:20",
-        "name":"Eggs",
-        "hasManualPrice":1,
-        "baseMarketCost":10,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":6,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id":"radish",
-        "iconID":"items_consumables:14",
-        "name":"Radish",
-        "hasManualPrice":1,
-        "baseMarketCost":6,
-        "category":"food",
-        "useEffect":{
-            "conditionsSource":[
-                {
-                    "condition":"food",
-                    "magnitude":1,
-                    "duration":4,
-                    "chance":"100"
-                }
-            ]
-        }
-    },
-    {
-        "id": "chaotic_penalty",
-        "iconID": "items_weapons:61",
-        "name": "Chaotic Penalty",
-        "category": "lsword",
-        "displaytype": "extraordinary",
-        "hasManualPrice": 1,
-        "baseMarketCost": 0,
-        "equipEffect": {
-            "increaseMaxAP": 2,
-            "increaseAttackCost": 7,
-            "increaseAttackChance": 25,
-            "increaseCriticalSkill": 10,
-            "setCriticalMultiplier": 2,
-            "increaseAttackDamage": {
-                "min": -10,
-                "max": -10
-            },
-            "addedConditions":[
-            	{
-                	"condition":"courage",
-                	"magnitude": 5
-            	}
-        	]
-        },
-        "killEffect": {
-            "increaseCurrentHP": {
-                "min": 1,
-                "max": 1
-            }
-        },
-        "hitEffect":{
-        	"conditionsTarget":[
-            	{
-                	"condition":"fear",
-                	"magnitude":5,
-                	"duration":2,
-                	"chance":"100"
-            	}
-        	]
-    	},
-    	"hitReceivedEffect" : {
-        	"increaseCurrentHP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseCurrentAP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseAttackerCurrentHP": {
-                "min": 1,
-                "max": 1
-            },
-            "increaseAttackerCurrentAP": {
-                "min": 1,
-                "max": 1
-            },
-            "conditionsSource":[
-            	{
-                "condition":"crit_aware",
-                "magnitude": 2,
-                "duration": 5,
-                "chance":"50"
-            	}
-        	],
-            "conditionsTarget":[
-            	{
-                "condition":"def",
-                "magnitude": 2,
-                "duration": 5,
-                "chance":"80"
-            	},
-            	{
-                "condition":"regen2",
-                "magnitude":3,
-                "duration":4,
-                "chance":"50"
-            	}
-        	]
-        }
-    }
+[
+    {
+        "id":"apple_green",
+        "iconID":"items_consumables:2",
+        "name":"Green apple",
+        "hasManualPrice":1,
+        "baseMarketCost":14,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":8,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"apple_red",
+        "iconID":"items_consumables:3",
+        "name":"Red apple",
+        "hasManualPrice":1,
+        "baseMarketCost":22,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":12,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"meat",
+        "iconID":"items_consumables:25",
+        "name":"Meat",
+        "hasManualPrice":1,
+        "baseMarketCost":29,
+        "category":"animal_e",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":2,
+                    "duration":12,
+                    "chance":"100"
+                },
+                {
+                    "condition":"foodp",
+                    "magnitude":3,
+                    "duration":10,
+                    "chance":"10"
+                }
+            ]
+        }
+    },
+    {
+        "id":"meat_cooked",
+        "iconID":"items_consumables:27",
+        "name":"Cooked meat",
+        "hasManualPrice":1,
+        "baseMarketCost":78,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":3,
+                    "duration":11,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"strawberry",
+        "iconID":"items_consumables:8",
+        "name":"Strawberry",
+        "hasManualPrice":1,
+        "baseMarketCost":3,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"carrot",
+        "iconID":"items_consumables:15",
+        "name":"Carrot",
+        "hasManualPrice":1,
+        "baseMarketCost":14,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":8,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"bread",
+        "iconID":"items_consumables:21",
+        "name":"Bread",
+        "hasManualPrice":1,
+        "baseMarketCost":6,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":10,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"mushroom",
+        "iconID":"items_consumables:19",
+        "name":"Mushroom",
+        "hasManualPrice":1,
+        "baseMarketCost":3,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"pear",
+        "iconID":"items_consumables:9",
+        "name":"Pear",
+        "hasManualPrice":1,
+        "baseMarketCost":14,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":8,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"eggs",
+        "iconID":"items_consumables:20",
+        "name":"Eggs",
+        "hasManualPrice":1,
+        "baseMarketCost":10,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":6,
+                    "chance":"100"
+                }
+            ]
+        }
+    },
+    {
+        "id":"radish",
+        "iconID":"items_consumables:14",
+        "name":"Radish",
+        "hasManualPrice":1,
+        "baseMarketCost":6,
+        "category":"food",
+        "useEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"food",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"100"
+                }
+            ]
+        }
+    }
 ]

AndorsTrail/res/raw/itemlist_omicronrg9.json

@@ -0,0 +1,172 @@
+[
+    {
+        "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":-10,
+                "max":-15
+            },
+            "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"
                 }
             ]
@@ -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_v070.json

@@ -698,7 +698,7 @@
     {
         "id":"hmr_iron",
         "iconID":"items_weapons_3:16",
-        "name":"Iron warhammer",
+        "name":"Iron war hammer",
         "baseMarketCost":1,
         "category":"hammer",
         "equipEffect":{

AndorsTrail/res/raw/monsterlist_crossglen_animals.json

@@ -12,7 +12,7 @@
         },
         "spawnGroup":"trainingrat",
         "droplistID":"trainingrat",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":50
     },
     {
@@ -27,7 +27,7 @@
         },
         "spawnGroup":"crossglen_caverat",
         "droplistID":"rat",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":90
     },
     {
@@ -74,7 +74,7 @@
         },
         "spawnGroup":"crossglen_ant",
         "droplistID":"insect",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":70
     },
     {
@@ -89,7 +89,7 @@
         },
         "spawnGroup":"crossglen_wasp",
         "droplistID":"wasp",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":70
     },
     {
@@ -104,7 +104,7 @@
         },
         "spawnGroup":"crossglen_beetle",
         "droplistID":"insect",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":70
     },
     {
@@ -119,7 +119,7 @@
         },
         "spawnGroup":"forestwasp",
         "droplistID":"wasp",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":70
     },
     {
@@ -134,7 +134,7 @@
         },
         "spawnGroup":"forestant",
         "droplistID":"insect",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":90,
         "blockChance":10
     },
@@ -150,7 +150,7 @@
         },
         "spawnGroup":"forestant",
         "droplistID":"insect",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":100,
         "blockChance":15
     },
@@ -166,7 +166,7 @@
         },
         "spawnGroup":"forestdog",
         "droplistID":"canine",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":90
     },
     {
@@ -181,7 +181,7 @@
         },
         "spawnGroup":"forestsnake",
         "droplistID":"snake",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":110,
         "blockChance":10
     },

AndorsTrail/res/raw/monsterlist_fallhaven_animals.json

@@ -12,7 +12,7 @@
         "spawnGroup":"minorhaunt1",
         "phraseID":"haunt",
         "droplistID":"haunt",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":50,
         "blockChance":10,
         "damageResistance":3
@@ -29,7 +29,7 @@
         },
         "spawnGroup":"minorhaunt2",
         "droplistID":"haunt",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":50,
         "blockChance":10,
         "damageResistance":4
@@ -107,7 +107,7 @@
         },
         "spawnGroup":"skeleton1",
         "droplistID":"skeleton",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":60,
         "blockChance":40
     },
@@ -127,7 +127,7 @@
         "spawnGroup":"catacombguard1",
         "phraseID":"catacombguard",
         "droplistID":"catacombguard",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":10,
         "blockChance":10,
         "damageResistance":3
@@ -259,7 +259,7 @@
         },
         "spawnGroup":"catacombguard3",
         "droplistID":"catacombguard",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":110,
         "criticalSkill":10,
         "criticalMultiplier":2.0,

AndorsTrail/res/raw/monsterlist_fallhaven_npcs.json

@@ -201,7 +201,7 @@
         "spawnGroup":"larcal",
         "phraseID":"larcal",
         "droplistID":"larcal",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":25,
         "blockChance":50
     },
@@ -303,7 +303,7 @@
         "spawnGroup":"unzel",
         "phraseID":"unzel",
         "droplistID":"unzel",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":80,
         "criticalSkill":30,
         "criticalMultiplier":3.0,

AndorsTrail/res/raw/monsterlist_guynmart.json

@@ -748,7 +748,7 @@
             "max":2
         },
         "droplistID":"canine",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":90
     },
     {

AndorsTrail/res/raw/monsterlist_omicronrg9.json

@@ -0,0 +1,211 @@
+[
+    {
+        "id":"feygard_scout",
+        "name":"Feygard scout",
+        "iconID":"monsters_omi1:0",
+        "maxHP":83,
+        "maxAP":10,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"protectSpawn",
+        "attackDamage":{
+            "min":6,
+            "max":11
+        },
+        "spawnGroup":"feygard_scout",
+        "phraseID":"feygard_scout_3",
+        "droplistID":"Feygard_scout",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":25,
+        "criticalMultiplier":2.5,
+        "blockChance":95,
+        "damageResistance":5
+    },
+    {
+        "id":"Feygard_BG",
+        "name":"Feygard barricade guard",
+        "iconID":"monsters_rltiles3:14",
+        "monsterClass":"humanoid",
+        "movementAggressionType":"protectSpawn",
+        "spawnGroup":"Feygard_BG",
+        "phraseID":"Feygard_BG_selector"
+    },
+    {
+        "id":"unknown",
+        "name":"???",
+        "iconID":"monsters_unknown:0"
+    },
+    {
+        "id":"g03_deadpatrol_1",
+        "name":"Dying patrol",
+        "iconID":"monsters_rltiles3:14",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"g03_deadpatrol_1",
+        "phraseID":"guild03_deadpatrol1_select"
+    },
+    {
+        "id":"g03_deadpatrol_2",
+        "name":"Dying Patrol",
+        "iconID":"monsters_rltiles3:14",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "spawnGroup":"g03_deadpatrol_2",
+        "phraseID":"guild03_deadpatrol_2_1"
+    },
+    {
+        "id":"guild03_rebthief_1",
+        "name":"Rebelled thief",
+        "iconID":"monsters_ld1:65",
+        "maxHP":60,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"helpOthers",
+        "attackDamage":{
+            "min":3,
+            "max":8
+        },
+        "spawnGroup":"g03_thief_1",
+        "faction":"rebthief_guild03_1",
+        "phraseID":"rebthief_guild03_1",
+        "droplistID":"drop_g03_rebthief_1",
+        "attackCost":5,
+        "attackChance":105,
+        "criticalSkill":10,
+        "criticalMultiplier":2.0,
+        "blockChance":85,
+        "damageResistance":1
+    },
+    {
+        "id":"g03_sergeant",
+        "name":"Feygard patrol sergeant",
+        "iconID":"monsters_rltiles1:76",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"g03_sergeant",
+        "phraseID":"FeygardSerg_guild03_select"
+    },
+    {
+        "id":"g03_thief_2",
+        "name":"Thief warden",
+        "iconID":"monsters_ld1:10",
+        "maxHP":68,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "attackDamage":{
+            "min":4,
+            "max":9
+        },
+        "spawnGroup":"guild03_rebthief_2",
+        "faction":"rebthief2_g03_1",
+        "phraseID":"rebthief2_g03_1",
+        "droplistID":"drop_g03_rebthief_2",
+        "attackCost":5,
+        "attackChance":100,
+        "criticalSkill":15,
+        "criticalMultiplier":2.0,
+        "blockChance":95,
+        "damageResistance":2,
+        "hitReceivedEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"g03_concentration",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"25"
+                }
+            ]
+        }
+    },
+    {
+        "id":"g03_thief_3",
+        "name":"Rebelled rogue",
+        "iconID":"monsters_ld1:138",
+        "maxHP":58,
+        "maxAP":12,
+        "moveCost":6,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"helpOthers",
+        "attackDamage":{
+            "min":3,
+            "max":6
+        },
+        "spawnGroup":"guild03_rebthief_3",
+        "attackCost":4,
+        "attackChance":120,
+        "criticalSkill":20,
+        "criticalMultiplier":2.0,
+        "blockChance":88,
+        "damageResistance":0,
+        "hitEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"g03_combo",
+                    "magnitude":1,
+                    "duration":1,
+                    "chance":"33"
+                }
+            ]
+        }
+    },
+    {
+        "id":"g03_crackshot",
+        "name":"Crackshot",
+        "iconID":"monsters_ld1:80",
+        "maxHP":133,
+        "maxAP":10,
+        "moveCost":5,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"protectSpawn",
+        "attackDamage":{
+            "min":5,
+            "max":11
+        },
+        "spawnGroup":"g03_crackshot",
+        "faction":"crackshot",
+        "phraseID":"guild03_crackshot_1",
+        "droplistID":"drop_g03_crackshot",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":20,
+        "criticalMultiplier":3.0,
+        "blockChance":100,
+        "damageResistance":4,
+        "hitEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"g03_combo",
+                    "magnitude":1,
+                    "duration":1,
+                    "chance":"25"
+                }
+            ]
+        },
+        "hitReceivedEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"g03_concentration",
+                    "magnitude":1,
+                    "duration":2,
+                    "chance":"33"
+                }
+            ]
+        }
+    },
+    {
+        "id":"g03_crackshot_dying",
+        "name":"Dying Crackshot",
+        "iconID":"monsters_ld1:80",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "spawnGroup":"crackshot_dying"
+    }
+]

AndorsTrail/res/raw/monsterlist_stoutford_combined.json

@@ -572,17 +572,22 @@
         "monsterClass":"undead",
         "movementAggressionType":"helpOthers",
         "attackDamage":{
-            "min":5,
-            "max":7
+            "min":13,
+            "max":22
         },
         "spawnGroup":"erwyn",
         "phraseID":"stoutford_castle_3",
-        "attackCost":53,
+        "attackCost":5,
         "attackChance":130,
         "criticalSkill":20,
         "criticalMultiplier":3.0,
         "blockChance":80,
+        "damageResistance":5,
         "hitEffect":{
+            "increaseCurrentHP":{
+                "min":3,
+                "max":3
+            },
             "conditionsTarget":[
                 {
                     "condition":"poison_weak",
@@ -602,18 +607,23 @@
         "monsterClass":"undead",
         "movementAggressionType":"helpOthers",
         "attackDamage":{
-            "min":5,
-            "max":7
+            "min":13,
+            "max":22
         },
         "spawnGroup":"erwyn2",
         "phraseID":"stoutford_castle_3",
         "droplistID":"erwyn",
-        "attackCost":53,
+        "attackCost":5,
         "attackChance":130,
         "criticalSkill":20,
         "criticalMultiplier":3.0,
         "blockChance":80,
+        "damageResistance":5,
         "hitEffect":{
+            "increaseCurrentHP":{
+                "min":3,
+                "max":3
+            },
             "conditionsTarget":[
                 {
                     "condition":"poison_weak",

AndorsTrail/res/raw/monsterlist_v0610_monsters2.json

@@ -351,7 +351,7 @@
         },
         "spawnGroup":"iqhan_chb_1",
         "droplistID":"iqhan_beast",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":150,
         "criticalSkill":10,
         "criticalMultiplier":3.0,
@@ -382,7 +382,7 @@
         },
         "spawnGroup":"iqhan_chb_1",
         "droplistID":"iqhan_beast",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":150,
         "criticalSkill":10,
         "criticalMultiplier":3.0,

AndorsTrail/res/raw/monsterlist_v0610_npcs1.json

@@ -186,8 +186,9 @@
         "name":"Fanamor",
         "iconID":"monsters_men:7",
         "monsterClass":"humanoid",
+        "movementAggressionType":"none",
         "spawnGroup":"fanamor",
-        "phraseID":"fanamor"
+        "phraseID":"fanamor_selector"
     },
     {
         "id":"feygard_bridgeguard",

AndorsTrail/res/raw/monsterlist_v0611_monsters1.json

@@ -1589,7 +1589,7 @@
         },
         "spawnGroup":"maonit_1",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":10,
         "criticalMultiplier":3.0,
@@ -1610,7 +1610,7 @@
         },
         "spawnGroup":"maonit_1",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":10,
         "criticalMultiplier":3.0,
@@ -1631,7 +1631,7 @@
         },
         "spawnGroup":"maonit_2",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":20,
         "criticalMultiplier":3.0,
@@ -1652,7 +1652,7 @@
         },
         "spawnGroup":"maonit_2",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":20,
         "criticalMultiplier":3.0,
@@ -1673,7 +1673,7 @@
         },
         "spawnGroup":"maonit_3",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":30,
         "criticalMultiplier":3.0,
@@ -1704,7 +1704,7 @@
         },
         "spawnGroup":"maonit_3",
         "droplistID":"maonit",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":30,
         "criticalMultiplier":3.0,
@@ -1735,7 +1735,7 @@
         },
         "spawnGroup":"arulir_1",
         "droplistID":"arulir",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":70,
         "criticalSkill":30,
         "criticalMultiplier":3.0,
@@ -1766,7 +1766,7 @@
         },
         "spawnGroup":"arulir_1",
         "droplistID":"arulir",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":70,
         "criticalSkill":30,
         "criticalMultiplier":3.0,

AndorsTrail/res/raw/monsterlist_v0611_npcs2.json

@@ -560,7 +560,7 @@
         },
         "spawnGroup":"maonit_cr",
         "droplistID":"oegyth1",
-        "attackCost":5,
+        "attackCost":4,
         "attackChance":65,
         "criticalSkill":30,
         "criticalMultiplier":3.0,

AndorsTrail/res/raw/monsterlist_v068_npcs.json

@@ -30,7 +30,7 @@
         "iconID":"monsters_men:8",
         "monsterClass":"humanoid",
         "spawnGroup":"troublemaker",
-        "phraseID":"thievesguild_troublemaker_1",
+        "phraseID":"troublemaker_selector",
         "droplistID":"shop_troublemaker"
     },
     {
@@ -198,7 +198,7 @@
         "iconID":"monsters_men:6",
         "monsterClass":"humanoid",
         "spawnGroup":"ambelie",
-        "phraseID":"ambelie_1"
+        "phraseID":"ambelie_selector"
     },
     {
         "id":"feygard_patrol",

AndorsTrail/res/raw/monsterlist_wilderness.json

@@ -27,7 +27,7 @@
         },
         "spawnGroup":"forestwasp2",
         "droplistID":"wasp",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":150,
         "blockChance":60
     },
@@ -59,7 +59,7 @@
         },
         "spawnGroup":"forestbeetle",
         "droplistID":"insect",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":150,
         "blockChance":60,
         "damageResistance":2
@@ -161,7 +161,7 @@
         "spawnGroup":"prisoner1",
         "phraseID":"prisoner1",
         "droplistID":"prisoner",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":50,
         "blockChance":20
     },
@@ -301,7 +301,7 @@
         "spawnGroup":"undead1",
         "phraseID":"zombie1",
         "droplistID":"undead1",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":30,
         "criticalSkill":50,
         "criticalMultiplier":2.0,
@@ -320,7 +320,7 @@
         },
         "spawnGroup":"undead1",
         "droplistID":"undead1",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":30,
         "criticalSkill":40,
         "criticalMultiplier":2.0,
@@ -339,7 +339,7 @@
         },
         "spawnGroup":"undead1",
         "droplistID":"undead1",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":110,
         "criticalSkill":10,
         "criticalMultiplier":2.0,
@@ -358,7 +358,7 @@
         },
         "spawnGroup":"undead1",
         "droplistID":"undead1",
-        "attackCost":10,
+        "attackCost":9,
         "attackChance":110,
         "blockChance":60,
         "damageResistance":2

AndorsTrail/res/raw/questlist_graveyard1.json

@@ -97,7 +97,7 @@
             },
             {
                 "progress":35,
-                "logText":"I promised Cithurn I would investigate the source of the monster invasion in the forest. I will have to pass though the forest to access an entrance to a cave northeast of Cithurn's home."
+                "logText":"I promised Cithurn I would investigate the source of the monster invasion in the forest. I will have to pass through the forest to access an entrance to a cave northeast of Cithurn's home."
             },
             {
                 "progress":40,
@@ -213,6 +213,18 @@
             {
                 "progress":190,
                 "logText":"Talked to Yolgen about Flagstone"
+            },
+            {
+                "progress":200,
+                "logText":"Saw bird from lookout"
+            },
+            {
+                "progress":210,
+                "logText":"Found opal at lookout"
+            },
+            {
+                "progress":220,
+                "logText":"You will never get this quest stage (used for lookout)"
             }
         ]
     }

AndorsTrail/res/raw/questlist_guynmart.json

@@ -44,7 +44,7 @@
             },
             {
                 "progress":60,
-                "logText":"I overheard the Unkorh the steward talking to himself. He plans for Guynmart to die in the castle dungeon, and after ursuping the throne he would marry Lady Hannah."
+                "logText":"I overheard Unkorh the steward talking to himself. He plans for Guynmart to die in the castle dungeon, and after ursuping the throne he would marry Lady Hannah."
             },
             {
                 "progress":62,

AndorsTrail/res/raw/questlist_halvor_surprise.json

@@ -10,7 +10,7 @@
             },
             {
                 "progress":15,
-                "logText":"I have given Halvor the 5 insect wings he wanted."
+                "logText":"I gave Halvor the 5 insect wings he wanted."
             },
             {
                 "progress":20,
@@ -18,7 +18,7 @@
             },
             {
                 "progress":25,
-                "logText":"I have given Halvor 5 rat tails."
+                "logText":"I gave Halvor 5 rat tails."
             },
             {
                 "progress":30,
@@ -35,7 +35,7 @@
             },
             {
                 "progress":60,
-                "logText":"Halvor is still looking for 5 rat tails. I agreed to help again."
+                "logText":"Halvor told me he is still looking for 5 rat tails. I agreed to help again."
             },
             {
                 "progress":65,
@@ -43,28 +43,28 @@
             },
             {
                 "progress":70,
-                "logText":"Halvor has now asked for 4 handfuls of animal hair."
+                "logText":"Halvor asked for 4 handfuls of animal hair."
             },
             {
                 "progress":75,
-                "logText":"I have given him 4 handfuls of animal hair."
+                "logText":"I gave him 4 handfuls of animal hair."
             },
             {
                 "progress":80,
-                "logText":"Halvor liked only one of my handfuls of animal hair. He wants me to bring him 3 more."
+                "logText":"Halvor liked only one of my handfuls of animal hair. He asked me to bring him 3 more."
             },
             {
                 "progress":90,
-                "logText":"I have given up on finding handfuls of animal hair that suit Halvor's taste. He has left.",
+                "logText":"I gave up on finding handfuls of animal hair that suit Halvor's taste. He has left.",
                 "rewardExperience":1500
             },
             {
                 "progress":100,
-                "logText":"I met Halvor again. He is standing by the lakeside, near an old house, in the north."
+                "logText":"I met Halvor again. He was standing by the lakeside, near an old house, in the north."
             },
             {
                 "progress":110,
-                "logText":"Halvor is in bad condition. He asked me to give him a healing potion."
+                "logText":"Halvor was in bad shape. He asked me to give him a healing potion."
             },
             {
                 "progress":111,
@@ -88,11 +88,11 @@
             },
             {
                 "progress":115,
-                "logText":"He is healed."
+                "logText":"He was healed by the potion I gave him."
             },
             {
                 "progress":120,
-                "logText":"Halvor is still looking for 3 tufts of animal hair."
+                "logText":"Halvor told me he is still looking for 3 tufts of animal hair."
             },
             {
                 "progress":125,
@@ -104,7 +104,7 @@
             },
             {
                 "progress":135,
-                "logText":"I have given Halvor two bones, but they weren't long enough. Should I really bring him more bones?"
+                "logText":"I gave Halvor two bones, but they weren't long enough. Should I really bring him more bones?"
             },
             {
                 "progress":140,
@@ -125,7 +125,7 @@
             },
             {
                 "progress":170,
-                "logText":"Now, Halvor wants me to find 10 scales from venomscale snakes."
+                "logText":"Halvor asked me to find 10 scales from venomscale snakes."
             },
             {
                 "progress":175,

AndorsTrail/res/raw/questlist_omicronrg9.json

@@ -0,0 +1,325 @@
+[
+    {
+        "id":"Thieves01",
+        "name":"Thief apprentice",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":5,
+                "logText":"After giving him the key of Luthor and talking with Umar about Andor, I needed to ask him about Thieves' Guild itself.\nI want to join them to see what kind of jobs they do."
+            },
+            {
+                "progress":10,
+                "logText":"Umar told me to talk with Troublemaker regarding my first task for the Guild."
+            },
+            {
+                "progress":15,
+                "logText":"Troublemaker told me to bring him three journals from spies of the guild. First I have to talk with Leta in my village, then with Dunla in Vilegard's tavern, and finally with Fanamor somewhere around Crossroads guardhouse."
+            },
+            {
+                "progress":20,
+                "logText":"I have to remember to tell them the password \"You are no one. No one knows you. No one has seen you.\""
+            },
+            {
+                "progress":25,
+                "logText":"Leta gave me her journal and advised me to not raise suspicion.",
+                "rewardExperience":250
+            },
+            {
+                "progress":30,
+                "logText":"I got Dunla's journal without any problem. I have set out to get the last journal.",
+                "rewardExperience":650
+            },
+            {
+                "progress":35,
+                "logText":"Fanamor gave me her journal."
+            },
+            {
+                "progress":40,
+                "logText":"Fanamor has been gravely wounded, and the Feygard Scout grabbed the journal.",
+                "rewardExperience":150
+            },
+            {
+                "progress":45,
+                "logText":"After I had killed the Feygard scout I talked again with Fanamor. She's losing blood quickly, so I have to bring her a bandage. I need to find a trustworthy priest.",
+                "rewardExperience":750
+            },
+            {
+                "progress":50,
+                "logText":"Thoronir gave me a bandage. I have to return to Fanamor as soon as possible."
+            },
+            {
+                "progress":51,
+                "logText":"Unfortunately, I was not able to save Fanamor's life. However, I did get her journal."
+            },
+            {
+                "progress":55,
+                "logText":"Fanamor is alive and will find her own way to return.",
+                "rewardExperience":1000
+            },
+            {
+                "progress":60,
+                "logText":"I returned to Troublemaker and gave him the journals. He told me to talk with Umar, maybe he has another task for me.",
+                "rewardExperience":1750,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"Thieves02",
+        "name":"Immaculate kidnapping",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":2,
+                "logText":"After completing my first task I'm considered a member of Thieves' Guild. Now I have to perform a very risky task. Umar sent me to kidnap a noble woman from Feygard, without being discovered."
+            },
+            {
+                "progress":4,
+                "logText":"She was recently seen in the Foaming Flask tavern."
+            },
+            {
+                "progress":6,
+                "logText":"Umar gave me some advice. My strength is not always the solution. I must \"use my tongue\" to avoid raising suspicion in the tavern."
+            },
+            {
+                "progress":10,
+                "logText":"Ambelie Laumwill doesn't want to come with me peacefully. I cannot make a scene, or the guards will alert other patrols. Maybe talking with them would solve the situation."
+            },
+            {
+                "progress":15,
+                "logText":"I have \"used my tongue\" with the main Feygard soldier in the Foaming Flask tavern. He gave me permission to \"escort back\" Ambelie."
+            },
+            {
+                "progress":20,
+                "logText":"I knocked out Ambelie. I will take her back to the Guild."
+            },
+            {
+                "progress":21,
+                "logText":"I have decided not to kidnap Ambelie. I must think of another solution."
+            },
+            {
+                "progress":24,
+                "logText":"Ambelie gave me a very valuable necklace. I must talk with Umar and persuade him to no longer pursue her."
+            },
+            {
+                "progress":30,
+                "logText":"I safely brought Ambelie to the basement. However, keeping her here could be dangerous.",
+                "rewardExperience":1200
+            },
+            {
+                "progress":35,
+                "logText":"Umar believes there is a secure room for these types of \"visitors\". I should talk to Troublemaker."
+            },
+            {
+                "progress":40,
+                "logText":"I have talked to Troublemaker about the place Umar believes it's okay to safely keep the hostage."
+            },
+            {
+                "progress":45,
+                "logText":"Troublemaker has given me the key to the Guild brig. I should take Ambelie there and leave her to wake up.",
+                "rewardExperience":1000
+            },
+            {
+                "progress":50,
+                "logText":"I've inserted the key and moved the lever. A hatchway has opened in the room."
+            },
+            {
+                "progress":55,
+                "logText":"I left Ambelie in that ugly, dark, and cold place. I should go back."
+            },
+            {
+                "progress":60,
+                "logText":"Troublemaker gave me some bread for Ambelie. The guild doesn't want her to starve to death. Indeed, they want her to be as comfortable as possible. I must go to the brig again."
+            },
+            {
+                "progress":65,
+                "logText":"I gave the bread to Ambelie. I should report Troublemaker that I completed the job.",
+                "rewardExperience":400
+            },
+            {
+                "progress":70,
+                "logText":"The job finally seems to be finished. I just have to talk with Umar again. However, I do not feel good about this. Kidnappings are definitely not my kind of job.",
+                "rewardExperience":0
+            },
+            {
+                "progress":75,
+                "logText":"I completed this task successfully. Umar told me they have sent couriers to Feygard, and the ransom is almost guaranteed. He paid me for my work.",
+                "rewardExperience":4500,
+                "finishesQuest":1
+            },
+            {
+                "progress":76,
+                "logText":"Umar took the necklace as compensation for my errors. Everything is fine again.",
+                "rewardExperience":2250,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"Thieves03",
+        "name":"The ruthless Crackshot",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":1,
+                "logText":"Time to rest and prepare myself to start the next job. I should go to the tavern."
+            },
+            {
+                "progress":2,
+                "logText":"I really need to take a break ...."
+            },
+            {
+                "progress":3,
+                "logText":"I am now fully rested, so I should go back to Umar."
+            },
+            {
+                "progress":4,
+                "logText":"Umar told me about a group of traitors led by a veteran of the Guild. It seems he stole the Key of Luthor."
+            },
+            {
+                "progress":5,
+                "logText":"Umar went on to say that this team leader  was known as \"Crackshot\". He is probably also the responsible for a murder on the Duleian road."
+            },
+            {
+                "progress":10,
+                "logText":"Crackshot and his henchmen are probably hiding somewhere near the Duleian road. I must ask people there whether they have seen them.",
+                "rewardExperience":0
+            },
+            {
+                "progress":11,
+                "logText":"It seems that Benbyr, a suspicious man outside Crossroads Guardhouse, doesn't know what I'm talking about."
+            },
+            {
+                "progress":15,
+                "logText":"A Crossroads guard told me that Feygard has sent more soldiers to the south, to try and find the criminals' hideout."
+            },
+            {
+                "progress":20,
+                "logText":"The barricade guard has a big mouth, and told me all I needed to know. The hideout is near a place full of larval burrowers. I need to move faster than the patrols to reach the hideout before them."
+            },
+            {
+                "progress":21,
+                "logText":"I found a small hole which seems to lead to a cave. Crackshot and his henchmen are probably hiding there."
+            },
+            {
+                "progress":22,
+                "logText":"I reached the hideout and saw some recent blood stains. Maybe there was a fight there."
+            },
+            {
+                "progress":23,
+                "logText":"The blood trail goes further ...."
+            },
+            {
+                "progress":24,
+                "logText":"I heard screams and sword clashes nearby. I should take a look."
+            },
+            {
+                "progress":25,
+                "logText":"There was a massacre. The Feygard patrol reached this place, but they seem to have all been killed. I must continue."
+            },
+            {
+                "progress":26,
+                "logText":"As I progressed down the corridor the air became thicker. The blood smell was stronger, and I found another dying soldier. He said something about his sergeant and some other guy."
+            },
+            {
+                "progress":27,
+                "logText":"As I progressed down the corridor the air became thicker. The blood smell was stronger, and I found a dying soldier. He said something about his sergeant and some other guy."
+            },
+            {
+                "progress":28,
+                "logText":"I found another dying soldier. There was a massacre. The Feygard patrol reached this place, but they seem to have all been killed. I must continue."
+            },
+            {
+                "progress":30,
+                "logText":"I've found the patrol sergeant. He advised me to leave this dangerous place."
+            },
+            {
+                "progress":31,
+                "logText":"The patrol sergeant told me about what happened before. He's tired and wounded, so I willl avenge his fellows. "
+            },
+            {
+                "progress":32,
+                "logText":"The patrol sergeant has left to call for backup. Now I'm alone again. Time to defeat Crackshot.",
+                "rewardExperience":1125
+            },
+            {
+                "progress":35,
+                "logText":"I killed Crackshot and he had the key of Luthor with him. I have to go back and report to Umar."
+            },
+            {
+                "progress":36,
+                "logText":"I tried to open the door behind Crackshot, but for some reason I cannot get the key into the lock."
+            },
+            {
+                "progress":40,
+                "logText":"The dying Crackshot said something about the key. If he told the truth, it could be cursed.",
+                "rewardExperience":1000
+            },
+            {
+                "progress":41,
+                "logText":"I tried to open the door behind Crackshot, but for some reason I could not get the key turned in the lock."
+            },
+            {
+                "progress":45,
+                "logText":"I reported about the situation to Umar, and gave him the key. He did not seem to want to tell me more about the key - yet."
+            },
+            {
+                "progress":50,
+                "logText":"Finally, this job is done. Now I should take a rest and regain my strength.",
+                "rewardExperience":7500,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"thieves_hidden",
+        "name":"Thieves Hidden",
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Must be never fulfilled"
+            },
+            {
+                "progress":20,
+                "logText":"Block road1"
+            },
+            {
+                "progress":30,
+                "logText":"Spoke to dying Crackshot. Remove block road1"
+            },
+            {
+                "progress":40,
+                "logText":"thieves3 - Found patrol 1"
+            },
+            {
+                "progress":50,
+                "logText":"thieves3 - Found patrol 2"
+            },
+            {
+                "progress":60,
+                "logText":"thieves3 - Open chest"
+            },
+            {
+                "progress":70,
+                "logText":"thieves3 - Open door (can currently not be fulfilled, beause the blessed key of luthor can't be obtained in the game)"
+            },
+            {
+                "progress":80,
+                "logText":"Talked about thieves to Thoronir"
+            },
+            {
+                "progress":90,
+                "logText":"Sergeant died."
+            },
+            {
+                "progress":100,
+                "logText":"Gave journals"
+            },
+            {
+                "progress":110,
+                "logText":"Got reward"
+            }
+        ]
+    }
+]

AndorsTrail/res/raw/questlist_stoutford_combined.json

@@ -119,7 +119,7 @@
             },
             {
                 "progress":71,
-                "logText":"Tahalendor came to hear Blonvale's confession."
+                "logText":"Tahalendor came to hear Blornvale's confession."
             },
             {
                 "progress":72,

AndorsTrail/res/values-ar/strings.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="exit_to_menu">الخروج للقائمة</string>
+    <string name="menu_settings">التفضيلات</string>
+    <string name="menu_save">حفظ</string>
+    <string name="loadsave_title_save">حفظ اللعبة</string>
+    <string name="loadsave_selectslot">اختر خانة</string>
+    <string name="dialog_loading_failed_title">فشل التحميل</string>
+    <string name="dialog_close">إغلاق</string>
+    <string name="dialog_more">المزيد</string>
+    <string name="dialog_monsterencounter_info">معلومات</string>
+    <string name="heroinfo_inventory_sort">ترتيب حسب</string>
+    <string name="combat_flee">هروب</string>
+    <string name="combat_flee_failed">لقد فشلت في الهرب!</string>
+    <string name="inventory_use">استخدام</string>
+    <string name="dialog_loot_pickall">التقاط الكل</string>
+    <string name="monster_difficulty_veryeasy">سهل جداً</string>
+    <string name="monster_difficulty_easy">سهل</string>
+    <string name="monster_difficulty_normal">عادي</string>
+    <string name="monster_difficulty_hard">صعب</string>
+    <string name="monster_difficulty_veryhard">صعب جداً</string>
+    <string name="monster_difficulty_impossible">مستحيل</string>
+    <string name="actorinfo_difficulty">الصعوبة:</string>
+    <string name="iteminfo_action_use">استخدام</string>
+    <string name="startscreen_continue">متابعة اللعبة الحالية</string>
+    <string name="startscreen_newgame">لعبة جديدة</string>
+    <string name="startscreen_newgame_start">بدء اللعبة</string>
+    <string name="startscreen_about">حول/المساعدة</string>
+    <string name="startscreen_selectherosprite">اختر بطلك</string>
+    <string name="startscreen_enterheroname">أدخل اسم البطل</string>
+    <string name="startscreen_load">تحميل</string>
+    <string name="conversation_next">التالي</string>
+    <string name="conversation_leave">مغادرة</string>
+    <string name="shop_buy">شراء</string>
+    <string name="shop_sell">بيع</string>
+    <string name="shop_infoitem">معلومات</string>
+    <string name="dialog_rest_confirm_message">هل تريد الراحة هنا؟</string>
+    <string name="dialog_newversion_title">مرحباً</string>
+    <string name="localize_resources_from_mo_filename">ar.mo</string>
+    <string name="app_name">على خطى اندور</string>
+    <string name="app_description">لعبة أدوار تحركها مهام</string>
+    <string name="menu_save_gamesaved">حفظ الملف للخانة %1$d</string>
+    <string name="menu_save_failed">فشل حفظ اللعبة! هل ركبت بطاقة ذاكرة قابلة للكتابة؟</string>
+    <string name="loadsave_title_load">فتح ملف الحفظ</string>
+    <string name="savegame_currenthero_displayinfo">"مستوى %1$d،  %2$d خبرة ، %3$d ذهب"</string>
+    <string name="dialog_loading_message">جار التحميل…</string>
+    <string name="dialog_loading_failed_message">عجزت اللعبة عن فتح ملف الحفظ.
+\n
+\n:(
+\n
+\nالملف تالف أو منقوص.</string>
+    <string name="dialog_loading_failed_incorrectversion">عجزت اللعبة عن فتح ملف الحفظ. ملف الحفظ صنع في نسخة لعبة أجد من النسخة الحالية.</string>
+    <string name="dialog_recenter">توسيط الشاشة</string>
+    <string name="dialog_monsterencounter_title">لقاء</string>
+    <string name="dialog_monsterencounter_message">أتريد أن تهاجم؟
+\nصعوبة: %1$s</string>
+    <string name="dialog_monsterencounter_conditions">حالات</string>
+    <string name="status_hp">صحة:</string>
+    <string name="status_ap">فعل:</string>
+    <string name="status_exp">خبرة:</string>
+</resources>