diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven.json b/AndorsTrail/res/raw/conversationlist_fallhaven.json
index f38fa57a7..ececdacf1 100644
--- a/AndorsTrail/res/raw/conversationlist_fallhaven.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven.json
@@ -200,7 +200,12 @@
{
"text": "Let me see what potions you have available.",
"nextPhraseID": "S"
- }
+ },
+ {
+ "text": "I was told that I can get some Spotted Hornbeam fungus from you.",
+ "requires": { "progress": "lodar_pots:10" },
+ "nextPhraseID": "fallhaven_potions1"
+ }
]
}
]
diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_v070.json b/AndorsTrail/res/raw/conversationlist_fallhaven_v070.json
new file mode 100644
index 000000000..ba86e4e5c
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_v070.json
@@ -0,0 +1,51 @@
+[
+ {
+ "id": "fallhaven_potions1",
+ "replies": [
+ {
+ "requires": {
+ "progress": "lodar_pots:20"
+ },
+ "nextPhraseID": "fallhaven_potions4"
+ },
+ {
+ "nextPhraseID": "fallhaven_potions2"
+ }
+ ]
+ },
+ {
+ "id": "fallhaven_potions2",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "fallhaven_potions3"
+ }
+ ],
+ "message": "Oh yes. Really disgusting smell, they have. But good for making potions."
+ },
+ {
+ "id": "fallhaven_potions3",
+ "rewards": [
+ {
+ "rewardID": "lodar_pots",
+ "value": 20
+ },
+ {
+ "rewardType": 1,
+ "rewardID": "hornbeam",
+ "value": 1
+ }
+ ],
+ "replies": [
+ {
+ "text": "Thank you.",
+ "nextPhraseID": "X"
+ }
+ ],
+ "message": "Here, have some. I don't have that much, so don't lose it!"
+ },
+ {
+ "id": "fallhaven_potions4",
+ "message": "I already gave you some, before. Don't tell me you lost it?"
+ }
+]
diff --git a/AndorsTrail/res/raw/conversationlist_lethenlor.json b/AndorsTrail/res/raw/conversationlist_lethenlor.json
index d1b96a325..ea9a4e031 100644
--- a/AndorsTrail/res/raw/conversationlist_lethenlor.json
+++ b/AndorsTrail/res/raw/conversationlist_lethenlor.json
@@ -79,7 +79,7 @@
"nextPhraseID": "lethenlor6"
}
],
- "message": "Heh. Interesting. Let's just say our line of work is .. interesting."
+ "message": "He he. Interesting. Let's just say our line of work is .. interesting."
},
{
"id": "lethenlor6",
diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json
index 4ff27fff8..0207d1ec8 100644
--- a/AndorsTrail/res/raw/conversationlist_lodar.json
+++ b/AndorsTrail/res/raw/conversationlist_lodar.json
@@ -572,6 +572,12 @@
},
{
"id": "lodar_xul3",
+ "rewards": [
+ {
+ "rewardID": "xulviir",
+ "value": 10
+ }
+ ],
"replies": [
{
"text": "N",
diff --git a/AndorsTrail/res/raw/conversationlist_lodar0g.json b/AndorsTrail/res/raw/conversationlist_lodar0g.json
index f96433031..1aac78fe5 100644
--- a/AndorsTrail/res/raw/conversationlist_lodar0g.json
+++ b/AndorsTrail/res/raw/conversationlist_lodar0g.json
@@ -17,7 +17,7 @@
"nextPhraseID": "lodar0_g2"
}
],
- "message": "Heh, but funny not enough to let you pass."
+ "message": "He he, but funny not enough to let you pass."
},
{
"id": "lodar0_g2",
diff --git a/AndorsTrail/res/raw/conversationlist_lowyna.json b/AndorsTrail/res/raw/conversationlist_lowyna.json
index 968b5192b..3a83f24ae 100644
--- a/AndorsTrail/res/raw/conversationlist_lowyna.json
+++ b/AndorsTrail/res/raw/conversationlist_lowyna.json
@@ -46,7 +46,7 @@
"nextPhraseID": "lowyna_4"
}
],
- "message": "Heh, this and that."
+ "message": "He he, this and that."
},
{
"id": "lowyna_3",
diff --git a/AndorsTrail/res/raw/conversationlist_twoteeth.json b/AndorsTrail/res/raw/conversationlist_twoteeth.json
index b2a71dd2a..870e80300 100644
--- a/AndorsTrail/res/raw/conversationlist_twoteeth.json
+++ b/AndorsTrail/res/raw/conversationlist_twoteeth.json
@@ -139,7 +139,7 @@
"nextPhraseID": "twoteeth_cough"
}
],
- "message": "Heh. Yes. Yes you could. But that's the beauty of it all!"
+ "message": "He he. Yes. Yes you could. But that's the beauty of it all!"
},
{
"id": "twoteeth_11",
diff --git a/AndorsTrail/res/raw/conversationlist_vilegard_shops.json b/AndorsTrail/res/raw/conversationlist_vilegard_shops.json
index a5e5574e2..7b8b82fb6 100644
--- a/AndorsTrail/res/raw/conversationlist_vilegard_shops.json
+++ b/AndorsTrail/res/raw/conversationlist_vilegard_shops.json
@@ -68,6 +68,11 @@
"requireType": 0
}
}
+ },
+ {
+ "text": "On the body of something called the Hira'zinn, I found this peculiar sword. Do you know anything about it?.",
+ "requires": { "item": { "requireType": 1, "itemID": "xulviir0", "quantity": 1 } },
+ "nextPhraseID": "vilegard_smith_xul_1"
}
]
},
@@ -91,9 +96,14 @@
"item": {
"itemID": "fg_ironsword",
"quantity": 10,
- "requireType": 0
+ "requireType": 1
}
}
+ },
+ {
+ "text": "On the body of something called the Hira'zinn, I found this peculiar sword. Do you know anything about it?.",
+ "requires": { "item": { "requireType": 1, "itemID": "xulviir0", "quantity": 1 } },
+ "nextPhraseID": "vilegard_shop_notrust_2"
}
]
},
diff --git a/AndorsTrail/res/raw/conversationlist_vilegard_v070.json b/AndorsTrail/res/raw/conversationlist_vilegard_v070.json
new file mode 100644
index 000000000..bdd546bb6
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_vilegard_v070.json
@@ -0,0 +1,265 @@
+[
+ {
+ "id": "vilegard_smith_xul_1",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_2"
+ }
+ ],
+ "message": "[takes a step back] What.. is.. that? It can't be? No. Let me look at it."
+ },
+ {
+ "id": "vilegard_smith_xul_2",
+ "replies": [
+ {
+ "text": "What is it?",
+ "nextPhraseID": "vilegard_smith_xul_3"
+ }
+ ],
+ "message": "It has all the markings. But it can't be? I don't understand."
+ },
+ {
+ "id": "vilegard_smith_xul_3",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_4"
+ }
+ ],
+ "message": "This thing that you have stumbled upon, my friend. This is the Xul'viir. A most foul item indeed."
+ },
+ {
+ "id": "vilegard_smith_xul_4",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_5"
+ }
+ ],
+ "message": "It has been said that King Luthor destroyed the sword so that it would not fall into the wrong hands."
+ },
+ {
+ "id": "vilegard_smith_xul_5",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_6"
+ }
+ ],
+ "message": "It would seem that either he, or the stories have not been telling the truth."
+ },
+ {
+ "id": "vilegard_smith_xul_6",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_7"
+ }
+ ],
+ "message": "If restored, anyone wielding it would make their enemies tremble from only the sight of it."
+ },
+ {
+ "id": "vilegard_smith_xul_7",
+ "replies": [
+ {
+ "requires": {
+ "item": {
+ "itemID": "xulviir0",
+ "quantity": 1
+ }
+ },
+ "text": "Here it is. We had better get rid of it.",
+ "nextPhraseID": "vilegard_smith_xul_8"
+ },
+ {
+ "text": "I'd like to keep it.",
+ "nextPhraseID": "vilegard_smith_xul_9"
+ }
+ ],
+ "message": "You must destroy it, of course. Here, put it into my smelting pit and we'll be rid of it."
+ },
+ {
+ "id": "vilegard_smith_xul_8",
+ "rewards": [
+ {
+ "rewardID": "xulviir",
+ "value": 30
+ }
+ ],
+ "message": "Into the smelting pit with it. Good. See how it bubbles and flares? That's the lives of countless people thanking you for destroying it."
+ },
+ {
+ "id": "vilegard_smith_xul_9",
+ "replies": [
+ {
+ "requires": {
+ "item": {
+ "itemID": "xulviir0",
+ "quantity": 1
+ }
+ },
+ "text": "Here it is. We had better get rid of it.",
+ "nextPhraseID": "vilegard_smith_xul_8"
+ },
+ {
+ "text": "You mentioned restoring it before, what would that entail?",
+ "nextPhraseID": "vilegard_smith_xul_10"
+ }
+ ],
+ "message": "You can't be serious. It needs to be destroyed!"
+ },
+ {
+ "id": "vilegard_smith_xul_10",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_11"
+ }
+ ],
+ "message": "The original sword had ornaments of rare crystals, and a blade that was as sharp as nothing else."
+ },
+ {
+ "id": "vilegard_smith_xul_11",
+ "replies": [
+ {
+ "requires": {
+ "item": {
+ "itemID": "xulviir0",
+ "quantity": 1
+ }
+ },
+ "text": "Here it is. We had better get rid of it.",
+ "nextPhraseID": "vilegard_smith_xul_8"
+ },
+ {
+ "text": "How about you get to work on restoring it, and I won't kill you.",
+ "nextPhraseID": "vilegard_smith_xul_12"
+ }
+ ],
+ "message": "I can't believe I'm telling you this. Give. It. Here. Now! It needs to be destroyed!"
+ },
+ {
+ "id": "vilegard_smith_xul_12",
+ "replies": [
+ {
+ "text": "You won't believe what I had to go through to get it.",
+ "nextPhraseID": "vilegard_smith_xul_13"
+ }
+ ],
+ "message": "I.. what? Are you threatening me?"
+ },
+ {
+ "id": "vilegard_smith_xul_13",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_14"
+ }
+ ],
+ "message": "Sigh. You don't know what you are getting yourself into, kid."
+ },
+ {
+ "id": "vilegard_smith_xul_14",
+ "replies": [
+ {
+ "text": "N",
+ "nextPhraseID": "vilegard_smith_xul_15"
+ }
+ ],
+ "message": "Regardless, to restore the sword to its former shape, I'd need some of those crystals that it was adorned with, and those crystals are really hard to come by."
+ },
+ {
+ "id": "vilegard_smith_xul_15",
+ "replies": [
+ {
+ "text": "Never mind. Here is the sword. We had better destroy it.",
+ "nextPhraseID": "vilegard_smith_xul_8"
+ },
+ {
+ "text": "I'll go find some of those crystals.",
+ "nextPhraseID": "vilegard_smith_xul_16"
+ },
+ {
+ "requires": {
+ "item": {
+ "requireType": 1,
+ "itemID": "oegyth",
+ "quantity": 3
+ }
+ },
+ "text": "I have three of those crystals right here.",
+ "nextPhraseID": "vilegard_smith_xul_17"
+ }
+ ],
+ "message": "I think they are called Oegyth or something like that. The sword had three of them on its hilt."
+ },
+ {
+ "id": "vilegard_smith_xul_16",
+ "message": "Pfft. Run along now, and don't threaten anyone else, you hear?"
+ },
+ {
+ "id": "vilegard_smith_xul_17",
+ "replies": [
+ {
+ "requires": {
+ "item": {
+ "itemID": "oegyth",
+ "quantity": 3
+ }
+ },
+ "text": "I'm sure. Here is the sword and three of those crystals. Restore it to how it once was.",
+ "nextPhraseID": "vilegard_smith_xul_18"
+ },
+ {
+ "requires": {
+ "item": {
+ "itemID": "xulviir0",
+ "quantity": 1
+ }
+ },
+ "text": "Never mind. Here is the sword. We had better destroy it.",
+ "nextPhraseID": "vilegard_smith_xul_8"
+ }
+ ],
+ "message": "You continue to amaze me. Now, are you really sure that you want to do this? The lives of the people that it has slain will haunt you."
+ },
+ {
+ "id": "vilegard_smith_xul_18",
+ "replies": [
+ {
+ "requires": {
+ "item": {
+ "itemID": "xulviir0",
+ "quantity": 1
+ }
+ },
+ "nextPhraseID": "vilegard_smith_xul_19"
+ },
+ {
+ "nextPhraseID": "vilegard_smith_xul_19"
+ }
+ ]
+ },
+ {
+ "id": "vilegard_smith_xul_19",
+ "rewards": [
+ {
+ "rewardID": "xulviir",
+ "value": 20
+ },
+ {
+ "rewardType": 1,
+ "rewardID": "xulviir",
+ "value": 1
+ }
+ ],
+ "replies": [
+ {
+ "text": "Thanks.",
+ "nextPhraseID": "vilegard_smith_xul_16"
+ }
+ ],
+ "message": "Sigh. Ok, whatever you say. We just need to fit these into there, and sharpen up this bit here.\\nThere. It should be almost like it once was."
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/droplists_v070_quest.json b/AndorsTrail/res/raw/droplists_v070_quest.json
index 234dded81..e6348345d 100644
--- a/AndorsTrail/res/raw/droplists_v070_quest.json
+++ b/AndorsTrail/res/raw/droplists_v070_quest.json
@@ -49,6 +49,26 @@
}
]
},
+ {
+ "id": "hornbeam",
+ "items": [
+ {
+ "quantity": { "min": 1, "max": 1 },
+ "itemID": "hornbeam",
+ "chance": 100
+ }
+ ]
+ },
+ {
+ "id": "xulviir",
+ "items": [
+ {
+ "quantity": { "min": 1, "max": 1 },
+ "itemID": "xulviir",
+ "chance": 100
+ }
+ ]
+ },
{
"id": "charwood2g",
"items": [
diff --git a/AndorsTrail/res/raw/questlist_v070_charwood.json b/AndorsTrail/res/raw/questlist_v070_charwood.json
index f4f740215..a9688ba19 100644
--- a/AndorsTrail/res/raw/questlist_v070_charwood.json
+++ b/AndorsTrail/res/raw/questlist_v070_charwood.json
@@ -1,7 +1,7 @@
[
{
"id": "charwood1",
- "name": "TODO: create name",
+ "name": "Destined for great things",
"showInLog": 1,
"stages": [
{
@@ -130,7 +130,7 @@
},
{
"id": "charwood2",
- "name": "TODO: create name",
+ "name": "Trial by fire",
"showInLog": 1,
"stages": [
{
diff --git a/AndorsTrail/res/raw/questlist_v070_lodar.json b/AndorsTrail/res/raw/questlist_v070_lodar.json
index 0cb8a846f..949670d71 100644
--- a/AndorsTrail/res/raw/questlist_v070_lodar.json
+++ b/AndorsTrail/res/raw/questlist_v070_lodar.json
@@ -81,6 +81,29 @@
}
]
},
+ {
+ "id": "xulviir",
+ "name": "A creeping fear",
+ "showInLog": 1,
+ "stages": [
+ {
+ "logText": "I was told that the broken sword that I found on the body of the Hira'zinn should be taken to the smith in Vilegard.",
+ "progress": 10
+ },
+ {
+ "logText": "I have restored the Xul'viir. I had to threaten the smith in Vilegard to get it restored.",
+ "finishesQuest": 1,
+ "progress": 20,
+ "rewardExperience": 2000
+ },
+ {
+ "logText": "I have destroyed the Xul'viir.",
+ "finishesQuest": 1,
+ "progress": 30,
+ "rewardExperience": 2000
+ }
+ ]
+ },
{
"id": "lodar13_rest",
"name": "No rest for the guilty",
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 1468b9125..a65a1cc24 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -221,6 +221,8 @@
- @raw/conversationlist_woodcabin
- @raw/conversationlist_highwayman1
- @raw/conversationlist_lodarmobs
+ - @raw/conversationlist_fallhaven_v070
+ - @raw/conversationlist_vilegard_v070