diff --git a/AndorsTrail/.classpath b/AndorsTrail/.classpath
index 7bc01d9a9..51769745b 100644
--- a/AndorsTrail/.classpath
+++ b/AndorsTrail/.classpath
@@ -1,9 +1,9 @@
-
-
+
+
diff --git a/AndorsTrail/res/raw/conversationlist_gorwath.json b/AndorsTrail/res/raw/conversationlist_gorwath.json
new file mode 100644
index 000000000..eb4120ee5
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_gorwath.json
@@ -0,0 +1,163 @@
+[
+ {
+ "id":"gorwath",
+ "replies":[
+ {
+ "nextPhraseID":"gorwath_done",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":30,
+ "requireID":"postman"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"gorwath_love",
+ "requires":[
+ {
+ "requireType":"questLatestProgress",
+ "value":20,
+ "requireID":"postman"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"gorwath_tmp",
+ "requires":[
+ {
+ "requireType":"questLatestProgress",
+ "value":10,
+ "requireID":"postman"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"gorwath_letter"
+ }
+ ]
+ },
+ {
+ "message":"I have a letter for...a lovely girl.",
+ "id":"gorwath_letter",
+ "replies":[
+ {
+ "nextPhraseID":"gorwath_letter_1",
+ "text":"Huh?"
+ }
+ ]
+ },
+ {
+ "message":"Thanks again.",
+ "id":"gorwath_done"
+ },
+ {
+ "message":"Yeah. Would be kind enough to give her that letter?",
+ "id":"gorwath_letter_1",
+ "replies":[
+ {
+ "nextPhraseID":"gorwath_letter_2",
+ "text":"Yeah sure, why not?"
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"No I'm busy. Good bye."
+ }
+ ]
+ },
+ {
+ "message":"Thanks a lot. Here's the letter. Go to Fallhaven and look for Arensia.",
+ "id":"gorwath_letter_2",
+ "rewards":[
+ {
+ "value":10,
+ "rewardID":"postman",
+ "rewardType":"questProgress"
+ },
+ {
+ "value":1,
+ "rewardID":"gorwath_letter",
+ "rewardType":"giveItem"
+ }
+ ]
+ },
+ {
+ "message":"Hi.",
+ "id":"arensia",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Hello"
+ },
+ {
+ "nextPhraseID":"arensia_letter",
+ "text":"I have a letter for you.",
+ "requires":[
+ {
+ "requireType":"inventoryKeep",
+ "value":1,
+ "requireID":"gorwath_letter"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"What a beautiful day, isn't it?",
+ "id":"arensia_done"
+ },
+ {
+ "message":"Oh really? From whom?",
+ "id":"arensia_letter",
+ "replies":[
+ {
+ "nextPhraseID":"arensia_letter_1",
+ "text":"Gorwath, from Crossglen !",
+ "requires":[
+ {
+ "requireType":"inventoryRemove",
+ "value":1,
+ "requireID":"gorwath_letter"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"Oh that's cute. Tell Gorwath I love him too.",
+ "id":"arensia_letter_1",
+ "replies":[
+ {
+ "nextPhraseID":"R",
+ "text":"Ok, I'll tell him."
+ }
+ ],
+ "rewards":[
+ {
+ "value":20,
+ "rewardID":"postman",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"Thanks.",
+ "id":"gorwath_love",
+ "rewards":[
+ {
+ "value":30,
+ "rewardID":"postman",
+ "rewardType":"questProgress"
+ },
+ {
+ "value":15,
+ "rewardID":"gold",
+ "rewardType":"giveItem"
+ }
+ ]
+ },
+ {
+ "message":"Did you give the letter yet?",
+ "id":"gorwath_tmp"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_halvor.json b/AndorsTrail/res/raw/conversationlist_halvor.json
new file mode 100644
index 000000000..bd425a4ff
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_halvor.json
@@ -0,0 +1,177 @@
+[
+ {
+ "id":"halvor_0",
+ "replies":[
+ {
+ "nextPhraseID":"halvor_loop",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"halvor_surprise"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"halvor_wings",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":10,
+ "requireID":"halvor_surprise"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"halvor_encounter"
+ }
+ ]
+ },
+ {
+ "message":"Hello. I have no time to speak with you. I look for something...",
+ "id":"halvor_encounter",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Ok. Good bye"
+ },
+ {
+ "nextPhraseID":"halvor_quest_start",
+ "text":"Maybe I can help you ?"
+ }
+ ]
+ },
+ {
+ "message":"Hey, why not ? I need something for surprising a friend. I think 5 insect wings would be enough.",
+ "id":"halvor_quest_start",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Ok, let's go"
+ }
+ ],
+ "rewards":[
+ {
+ "value":10,
+ "rewardID":"halvor_surprise",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"Hi, do you have some insect wings for me ?",
+ "id":"halvor_wings",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"No, I'll come back with your wings later."
+ },
+ {
+ "nextPhraseID":"halvor_wings_end",
+ "text":"Yes, I have !",
+ "requires":[
+ {
+ "requireType":"inventoryRemove",
+ "value":5,
+ "requireID":"insectwing"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"Thanks, but it won't be enough though. Can you found some rat tails for me?",
+ "id":"halvor_wings_end",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"I go found that for you"
+ }
+ ],
+ "rewards":[
+ {
+ "value":20,
+ "rewardID":"halvor_surprise",
+ "rewardType":"questProgress"
+ },
+ {
+ "value":2,
+ "rewardID":"gold",
+ "rewardType":"giveItem"
+ }
+ ]
+ },
+ {
+ "message":"So, these tails?",
+ "id":"halvor_loop",
+ "replies":[
+ {
+ "nextPhraseID":"halvor_loop_1",
+ "text":"Here they are",
+ "requires":[
+ {
+ "requireType":"inventoryRemove",
+ "value":5,
+ "requireID":"rat_tail"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"I'll come back"
+ }
+ ]
+ },
+ {
+ "message":"Thanks, but it will not be enough. Can you found 5 more tails for me?",
+ "id":"halvor_loop_1",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Ok, let's go"
+ },
+ {
+ "nextPhraseID":"halvor_quest_end",
+ "text":"Again ? Is this a joke ?"
+ }
+ ],
+ "rewards":[
+ {
+ "value":4,
+ "rewardID":"gold",
+ "rewardType":"giveItem"
+ }
+ ]
+ },
+ {
+ "message":"No, please, help me. I need these ones",
+ "id":"halvor_quest_end",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Ok, let's go another time ..."
+ },
+ {
+ "nextPhraseID":"halvor_quest_final",
+ "text":"No, you won't exploit me. Go get your stuff yourself"
+ }
+ ]
+ },
+ {
+ "message":"Ok, I don't need you anymore. Take that and get out.",
+ "id":"halvor_quest_final",
+ "replies":[
+ {
+ "nextPhraseID":"R",
+ "text":"Don't worry, I'll never come back"
+ }
+ ],
+ "rewards":[
+ {
+ "value":100,
+ "rewardID":"halvor_surprise",
+ "rewardType":"questProgress"
+ }
+ ]
+ }
+]
diff --git a/AndorsTrail/res/raw/itemlist_gorwath.json b/AndorsTrail/res/raw/itemlist_gorwath.json
new file mode 100644
index 000000000..7dc0dc9fe
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_gorwath.json
@@ -0,0 +1,8 @@
+[
+ {
+ "id":"gorwath_letter",
+ "category":"other",
+ "name":"Gorwath's letter",
+ "iconID":"items_misc_3:61"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_gorwath.json b/AndorsTrail/res/raw/monsterlist_gorwath.json
new file mode 100644
index 000000000..5569edc29
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_gorwath.json
@@ -0,0 +1,20 @@
+[
+ {
+ "id":"gorwath",
+ "phraseID":"gorwath",
+ "unique":1,
+ "monsterClass":"humanoid",
+ "name":"Gorwath",
+ "spawnGroup":"gorwath",
+ "iconID":"monsters_ld1:88"
+ },
+ {
+ "id":"arensia",
+ "phraseID":"arensia",
+ "unique":1,
+ "monsterClass":"humanoid",
+ "name":"Arensia",
+ "spawnGroup":"arensia",
+ "iconID":"monsters_ld1:145"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_halvor.json b/AndorsTrail/res/raw/monsterlist_halvor.json
new file mode 100644
index 000000000..9e92d87dc
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_halvor.json
@@ -0,0 +1,13 @@
+[
+ {
+ "id":"halvor",
+ "phraseID":"halvor_0",
+ "maxHP":5,
+ "unique":1,
+ "monsterClass":"humanoid",
+ "name":"Halvor",
+ "movementAggressionType":"none",
+ "spawnGroup":"Halvor",
+ "iconID":"monsters_mage2:0"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_gorwath.json b/AndorsTrail/res/raw/questlist_gorwath.json
new file mode 100644
index 000000000..39e755e7f
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_gorwath.json
@@ -0,0 +1,23 @@
+[
+ {
+ "id":"postman",
+ "name":"You're the postman",
+ "showInLog":1,
+ "stages":[
+ {
+ "progress":10,
+ "logText":"Gorwath would like me to give a letter to Arensia, in Fallhaven."
+ },
+ {
+ "progress":20,
+ "logText":"I gave the letter to Arensia. I need to tell Gorwath it's done."
+ },
+ {
+ "progress":30,
+ "rewardExperience":50,
+ "finishesQuest":1,
+ "logText":"I said Gorwath I gave the letter to Arensia. He's happy."
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_halvor.json b/AndorsTrail/res/raw/questlist_halvor.json
new file mode 100644
index 000000000..1c7e7e903
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_halvor.json
@@ -0,0 +1,24 @@
+[
+ {
+ "id":"halvor_surprise",
+ "name":"Surprise ?",
+ "showInLog":1,
+ "stages":[
+ {
+ "progress":10,
+ "logText":"Halvor need some insect wings for surprising somebody. "
+ },
+ {
+ "progress":20,
+ "rewardExperience":40,
+ "logText":"Halvor now need some more stuff. He just asked me to found some rat tails."
+ },
+ {
+ "progress":100,
+ "rewardExperience":100,
+ "finishesQuest":1,
+ "logText":""
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 66244fbe8..551d540c3 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -36,6 +36,7 @@
- @raw/itemlist_v0611_3
- @raw/itemlist_v070
- @raw/itemlist_v070_questitems
+ - @raw/itemlist_gorwath
@@ -70,6 +71,8 @@
- @raw/questlist_v070_lodar
- @raw/questlist_v070_lowyna
- @raw/questlist_v070_misc
+ - @raw/questlist_halvor
+ - @raw/questlist_gorwath
@@ -224,6 +227,8 @@
- @raw/conversationlist_lodarmobs
- @raw/conversationlist_vilegard_v070
- @raw/conversationlist_fallhaven_potions
+ - @raw/conversationlist_halvor
+ - @raw/conversationlist_gorwath
@@ -251,6 +256,8 @@
- @raw/monsterlist_v070_oldcave
- @raw/monsterlist_v070_roadcave
- @raw/monsterlist_v070_npcs
+ - @raw/monsterlist_halvor
+ - @raw/monsterlist_gorwath
diff --git a/AndorsTrail/res/xml/crossglen.tmx b/AndorsTrail/res/xml/crossglen.tmx
index 231e61521..6b6adffe3 100644
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -1,128 +1,128 @@
diff --git a/AndorsTrail/res/xml/fallhaven_sw.tmx b/AndorsTrail/res/xml/fallhaven_sw.tmx
index 2df42b5d4..430628086 100644
--- a/AndorsTrail/res/xml/fallhaven_sw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_sw.tmx
@@ -1,128 +1,128 @@