OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into stoutford_tests

Browse Source 
Conflicts:
	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
This commit is contained in:
Zukero
2017-08-11 10:45:05 +02:00
parent f8fd6888d7 1751b9d765
commit 0c05167db6
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
AndorsTrail/res/raw/conversationlist_fallhaven_south.json
View File

@@ -3,6 +3,7 @@
"id":"fallhaven_lumberjack",
"replies":[
{
"text":"N",
"nextPhraseID":"fallhaven_lumberjack_15",
"requires":[
{
@@ -13,6 +14,24 @@
]
},
{
"text":"N",
"nextPhraseID":"fallhaven_lumberjack_16",
"requires":[
{
"requireType":"questProgress",
"requireID":"pathway_fallhaven",
"value":40
},
{
"requireType":"questProgress",
"requireID":"pathway_fallhaven",
"value":50,
"negate":true
}
]
},
{
"text":"N",
"nextPhraseID":"fallhaven_lumberjack_14",
"requires":[
{
@@ -23,6 +42,7 @@
]
},
{
"text":"N",
"nextPhraseID":"fallhaven_lumberjack_1"
}
]
@@ -284,5 +304,15 @@
"nextPhraseID":"X"
}
]
},
{
"id":"fallhaven_lumberjack_16",
"message":"Thank you for bringing me back my axe!",
"replies":[
{
"text":"So will you cut away those trees which block the old pathway?",
"nextPhraseID":"fallhaven_lumberjack_11"
}
]
}
]
]

14
AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
View File

@@ -33,14 +33,7 @@
"replies":[
{
"text":"Why not?",
"nextPhraseID":"guard_pathway_1",
"requires":[
{
"requireType":"questProgress",
"requireID":"pathway_fallhaven",
"value":10
}
]
"nextPhraseID":"guard_pathway_1"
},
{
"text":"Never mind. Shadow be with you.",
@@ -187,7 +180,8 @@
{
"requireType":"questLatestProgress",
"requireID":"pathway_fallhaven",
"value":30
"value":30,
"negate":true
}
]
},
@@ -224,4 +218,4 @@
}
]
}
]
]