diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json
new file mode 100644
index 000000000..186c669d5
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_stoutford.json
@@ -0,0 +1,26 @@
+[
+ {
+ "message":"Welcome to Stoutford.",
+ "id":"sign_stoutford_gate"
+ },
+ {
+ "message":"I should go ask the inn keeper about this bed before using it.",
+ "id":"stoutford_bed_locked"
+ },
+ {
+ "message":"Don't cause trouble.",
+ "id":"stoutford_gateguard_0"
+ },
+ {
+ "message":"Sorry. I have work to do.",
+ "id":"stoutford_builder_0"
+ },
+ {
+ "message":"Hello.",
+ "id":"stoutford_widow_0"
+ },
+ {
+ "message":"Welcome to Stoutford kid.",
+ "id":"stoutford_commoner_0"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford.json b/AndorsTrail/res/raw/monsterlist_stoutford.json
new file mode 100644
index 000000000..9b6528b38
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_stoutford.json
@@ -0,0 +1,128 @@
+[
+ {
+ "id":"stoutford_gateguard",
+ "phraseID":"stoutford_gateguard_0",
+ "name":"Stoutford Guard",
+ "iconID":"monsters_tometik2:43"
+ },
+ {
+ "id":"stoutford_guard1",
+ "phraseID":"stoutford_gateguard_0",
+ "name":"Stoutford Guard",
+ "iconID":"monsters_tometik2:44"
+ },
+ {
+ "id":"stoutford_builder",
+ "phraseID":"stoutford_builder_0",
+ "name":"Builder",
+ "iconID":"monsters_ld1:22"
+ },
+ {
+ "id":"stoutford_widow",
+ "phraseID":"stoutford_widow_0",
+ "name":"Widow",
+ "iconID":"monsters_karvis2:0"
+ },
+ {
+ "id":"stoutford_commoner",
+ "phraseID":"stoutford_commoner_0",
+ "name":"Commoner",
+ "iconID":"monsters_karvis2:2"
+ },
+ {
+ "id":"stoutford_farmer1",
+ "phraseID":"stoutford_builder_0",
+ "name":"Farmer",
+ "iconID":"monsters_karvis2:1"
+ },
+ {
+ "id":"stoutford_commoner2",
+ "phraseID":"stoutford_commoner_0",
+ "name":"Commoner",
+ "iconID":"monsters_tometik5:0"
+ },
+ {
+ "id":"stouford_farmer2",
+ "phraseID":"stoutford_builder_0",
+ "name":"Farmer",
+ "iconID":"monsters_ld1:27"
+ },
+ {
+ "id":"stoutford_alchemist",
+ "phraseID":"stoutford_builder_0",
+ "name":"Alchemist",
+ "iconID":"monsters_rltiles1:70"
+ },
+ {
+ "id":"goat_1",
+ "name":"Goat",
+ "iconID":"monsters_ld2:0"
+ },
+ {
+ "id":"venomfang_1",
+ "name":"Venomfang",
+ "iconID":"monsters_tometik4:22"
+ },
+ {
+ "id":"stoutford_cottager",
+ "phraseID":"stoutford_commoner_0",
+ "name":"Cottager",
+ "iconID":"monsters_tometik2:55"
+ },
+ {
+ "id":"stoutford_cook",
+ "phraseID":"stoutford_builder_0",
+ "name":"Cook",
+ "iconID":"monsters_rltiles2:81"
+ },
+ {
+ "id":"stoutford_innkeeper",
+ "phraseID":"stoutford_builder_0",
+ "name":"Inn Keeper",
+ "iconID":"monsters_ld1:33"
+ },
+ {
+ "id":"stoutford_thief",
+ "phraseID":"stoutford_gateguard_0",
+ "name":"Thief",
+ "iconID":"monsters_rogue1:0"
+ },
+ {
+ "id":"stoutford_drinker_1",
+ "phraseID":"stoutford_commoner_0",
+ "name":"Customer",
+ "spawnGroup":"stoutford_drinkers",
+ "iconID":"monsters_ld1:35"
+ },
+ {
+ "id":"stoutford_drinker_2",
+ "phraseID":"stoutford_commoner_0",
+ "name":"Customer",
+ "spawnGroup":"stoutford_drinkers",
+ "iconID":"monsters_ld1:18"
+ },
+ {
+ "id":"stoutford_smith",
+ "phraseID":"stoutford_builder_0",
+ "name":"Blacksmith",
+ "iconID":"monsters_ld1:29"
+ },
+ {
+ "id":"stoutford_acolyte",
+ "phraseID":"chapelgoer",
+ "name":"Acolyte",
+ "iconID":"monsters_men:4"
+ },
+ {
+ "id":"stoutford_priest",
+ "phraseID":"chapelgoer",
+ "name":"Priest",
+ "iconID":"monsters_ld1:3"
+ },
+ {
+ "id":"stoutford_worshiper",
+ "phraseID":"chapelgoer",
+ "name":"Praying woman",
+ "iconID":"monsters_men:6"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_nondisplayed.json b/AndorsTrail/res/raw/questlist_nondisplayed.json
index 16a02e5bc..4a2410119 100644
--- a/AndorsTrail/res/raw/questlist_nondisplayed.json
+++ b/AndorsTrail/res/raw/questlist_nondisplayed.json
@@ -1,77 +1,81 @@
[
{
- "id": "nondisplay",
- "name": "Placeholder for hidden quest stages (not displayed)",
- "showInLog": 0,
- "stages": [
+ "id":"nondisplay",
+ "name":"Placeholder for hidden quest stages (not displayed)",
+ "showInLog":0,
+ "stages":[
{
- "progress": 5,
- "logText": "Back area of the smith in Crossglen"
+ "progress":5,
+ "logText":"Back area of the smith in Crossglen"
},
{
- "progress": 10,
- "logText": "Tavern room in Foaming Flask"
+ "progress":10,
+ "logText":"Tavern room in Foaming Flask"
},
{
- "progress": 16,
- "logText": "Sleeping quarters in Blackwater mountain"
+ "progress":16,
+ "logText":"Sleeping quarters in Blackwater mountain"
},
{
- "progress": 17,
- "logText": "Sleeping quarters in Crossroads1"
+ "progress":17,
+ "logText":"Sleeping quarters in Crossroads1"
},
{
- "progress": 18,
- "logText": "Shopping from Minarra in Crossroads tower"
+ "progress":18,
+ "logText":"Shopping from Minarra in Crossroads tower"
},
{
- "progress": 19,
- "logText": "Sleeping quarters in Loneford10"
+ "progress":19,
+ "logText":"Sleeping quarters in Loneford10"
},
{
- "progress": 20,
- "logText": "Selling Izthiel claws to Gauward"
+ "progress":20,
+ "logText":"Selling Izthiel claws to Gauward"
},
{
- "progress": 21,
- "logText": "Tavern room in Remgard"
+ "progress":21,
+ "logText":"Tavern room in Remgard"
+ },
+ {
+ "progress":22,
+ "logText":"Tavern room in stoutford_tavern"
}
]
},
{
- "id": "crossglen",
- "name": "TODO",
- "showInLog": 0,
- "stages": [
+ "id":"crossglen",
+ "name":"TODO",
+ "showInLog":0,
+ "stages":[
{
- "progress": 1,
- "finishesQuest": 0
+ "progress":1,
+ "finishesQuest":0
}
]
},
{
- "id": "fallhaventavern",
- "name": "Room to rent",
- "showInLog": 0,
- "stages": [
+ "id":"fallhaventavern",
+ "name":"Room to rent",
+ "showInLog":0,
+ "stages":[
{
- "progress": 10,
- "finishesQuest": 1
+ "progress":10,
+ "finishesQuest":1
},
{
- "progress": 20
+ "progress":20
}
]
},
{
- "id": "arcir",
- "name": "Elythara",
- "showInLog": 0,
- "stages": [
+ "id":"arcir",
+ "name":"Elythara",
+ "showInLog":0,
+ "stages":[
{
- "progress": 10,
- "finishesQuest": 0
+ "progress":10,
+ "finishesQuest":0
}
]
}
-]
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 26148c9b4..6f28f43b5 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -234,6 +234,7 @@
- @raw/conversationlist_shortcut_lodar
- @raw/conversationlist_pathway_fallhaven
- @raw/conversationlist_halvor_surprise
+ - @raw/conversationlist_stoutford
@@ -263,6 +264,7 @@
- @raw/monsterlist_v070_npcs
- @raw/monsterlist_pathway_fallhaven
- @raw/monsterlist_halvor_surprise
+ - @raw/monsterlist_stoutford
diff --git a/AndorsTrail/res/xml/stoutford_church.tmx b/AndorsTrail/res/xml/stoutford_church.tmx
index 31b37638d..5970157d8 100644
--- a/AndorsTrail/res/xml/stoutford_church.tmx
+++ b/AndorsTrail/res/xml/stoutford_church.tmx
@@ -150,7 +150,7 @@
-
+
diff --git a/AndorsTrail/res/xml/stoutford_tavern.tmx b/AndorsTrail/res/xml/stoutford_tavern.tmx
index 57faa81f4..4ff44fc5d 100644
--- a/AndorsTrail/res/xml/stoutford_tavern.tmx
+++ b/AndorsTrail/res/xml/stoutford_tavern.tmx
@@ -1,4 +1,5 @@
+