Skip to content

Commit

Permalink
Merge pull request #8 from Zukero/master
Browse files Browse the repository at this point in the history
merge fromzukero master
  • Loading branch information
NutAndor authored Oct 28, 2018
2 parents 4b1bcab + 9e0960e commit 00ac1b2
Show file tree
Hide file tree
Showing 31 changed files with 11,586 additions and 11,582 deletions.
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/actorconditions_trader_teksin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id":"poison_irdegh_weak",
"iconID":"actorconditions_japozero:2",
"name":"Weak Irdegh poison",
"name":"Weak irdegh poison",
"category":"blood",
"isStacking":1,
"fullRoundEffect":{
Expand Down
12 changes: 6 additions & 6 deletions AndorsTrail/res/raw/conversationlist_blackwater_harlenn.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
},
{
"id":"harlenn_9",
"message":"Those damn beasts outside our very settlement. The white wyrms and the Aulaeth, and their trainers are even deadlier.",
"message":"Those damn beasts outside our very settlement. The white wyrms and the aulaeth, and their trainers are even deadlier.",
"replies":[
{
"text":"Those? They were no match for me.",
Expand All @@ -224,7 +224,7 @@
"nextPhraseID":"harlenn_10"
},
{
"text":"At least they aren't anything like those Gornaud beasts at the bottom of the mountain.",
"text":"At least they aren't anything like those gornaud beasts at the bottom of the mountain.",
"nextPhraseID":"harlenn_12"
}
]
Expand Down Expand Up @@ -295,7 +295,7 @@
"nextPhraseID":"harlenn_16"
},
{
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the Gornaud attacks on Prim.",
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the gornaud attacks on Prim.",
"nextPhraseID":"harlenn_prim_1",
"requires":[
{
Expand Down Expand Up @@ -326,7 +326,7 @@
"message":"We are almost certain they are the ones behind these monsters also.",
"replies":[
{
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the Gornaud attacks on Prim.",
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the gornaud attacks on Prim.",
"nextPhraseID":"harlenn_prim_1",
"requires":[
{
Expand Down Expand Up @@ -554,7 +554,7 @@
"message":"Welcome back, traveller. What's on your mind?",
"replies":[
{
"text":"I talked to Guthbered in Prim. They say you are attacking Prim, and that you are behind the Gornaud attacks on Prim.",
"text":"I talked to Guthbered in Prim. They say you are attacking Prim, and that you are behind the gornaud attacks on Prim.",
"nextPhraseID":"harlenn_prim_1",
"requires":[
{
Expand Down Expand Up @@ -594,7 +594,7 @@
]
},
{
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the Gornaud attacks on Prim.",
"text":"I talked to Guthbered in Prim. They say you are the ones doing the attacks, and that you are behind the gornaud attacks on Prim.",
"nextPhraseID":"harlenn_prim_1",
"requires":[
{
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_bwm_agent_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"id":"bwm_agent_2_2",
"message":"The Gornauds? I have no idea where they come from, one day they just showed up here around the mountain.",
"message":"The gornauds? I have no idea where they come from, one day they just showed up here around the mountain.",
"replies":[
{
"text":"N",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_bwm_agent_4.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
{
"id":"bwm_agent_4_1",
"message":"Hello again. Well done defeating the Gornaud beasts.",
"message":"Hello again. Well done defeating the gornaud beasts.",
"replies":[
{
"text":"Their attacks really hurt. What are these things?",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_crossroads_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"id":"fanamor_1",
"message":"I was just strolling through these woods ... eh ... killing Anklebiters.",
"message":"I was just strolling through these woods ... eh ... killing anklebiters.",
"replies":[
{
"text":"N",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
},
{
"id":"chaotic_rewarder_0",
"message":"What do you want ?",
"message":"What do you want?",
"replies":[
{
"text":"Apply condition",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_foamingflask.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
{
"id":"ff_cook_2",
"message":"Oh this? This is supposed to be a stew of Anklebiter. Needs more seasoning I guess.",
"message":"Oh this? This is supposed to be a stew of anklebiter. Needs more seasoning I guess.",
"replies":[
{
"text":"I look forward to trying it when it is done. Good luck cooking.",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_guynmart_npc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4558,7 +4558,7 @@
},
{
"id":"guynmart_drunkard5_180",
"message":"The ground was soaked with red blood. But - it came from the Gornauds! The child just wiped the weapon clean of blood, gave us a quick glance, and disappeared up the path.",
"message":"The ground was soaked with red blood. But - it came from the gornauds! The child just wiped the weapon clean of blood, gave us a quick glance, and disappeared up the path.",
"replies":[
{
"text":"N",
Expand Down
4 changes: 2 additions & 2 deletions AndorsTrail/res/raw/conversationlist_halvor_surprise.json
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@
},
{
"id":"halvor_chwood_6",
"message":"Now, I just need one last thing. I heard about some nasty snakes, called the venomscales.",
"message":"Now, I just need one last thing. I heard about some nasty snakes, called the venomscale.",
"replies":[
{
"text":"Snakes? I hate snakes...",
Expand Down Expand Up @@ -1610,7 +1610,7 @@
},
{
"id":"halvor_chwood_9",
"message":"Have you found the venomscales scales?",
"message":"Have you found the venomscale scales?",
"replies":[
{
"text":"Not yet.",
Expand Down
4 changes: 2 additions & 2 deletions AndorsTrail/res/raw/conversationlist_lodar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@
},
{
"id":"lodar_spo2_0",
"message":"I have discovered that if you mix some ground up claws from a beast called the White Wyrm, together with a slight sprinkle of the center of a ruby gem, it can have a most interesting effect on you. Two of those claws and one gem would do.",
"message":"I have discovered that if you mix some ground up claws from a beast called the white wyrm, together with a slight sprinkle of the center of a ruby gem, it can have a most interesting effect on you. Two of those claws and one gem would do.",
"replies":[
{
"text":"I'll go find some of that. Let's talk about the other potions.",
Expand Down Expand Up @@ -1232,7 +1232,7 @@
},
{
"id":"lodar_spo3_0",
"message":"Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven.",
"message":"Up in the north, I have heard tales of beast called the arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven.",
"replies":[
{
"text":"I'll go find some of that. Let's talk about the other potions.",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_lodarmobs.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id":"zortakb",
"message":"The Zortak will defeat you!",
"message":"The zortak will defeat you!",
"replies":[
{
"text":"Fight!",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_prim_guthbered.json
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
},
{
"id":"guthbered_17",
"message":"According to lore, the monsters are called the 'Gornauds'.",
"message":"According to lore, the monsters are called the 'gornauds'.",
"replies":[
{
"text":"Any ideas where they might be coming from?",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_prim_inn.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
},
{
"id":"laecca_9",
"message":"Pfft, 'What beasts?'. The Gornaud beasts of course.",
"message":"Pfft, 'What beasts?'. The gornaud beasts of course.",
"replies":[
{
"text":"N",
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_prim_outside.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
},
{
"id":"moyra_2",
"message":"Claws, beasts, Gornauds. They cannot reach me here.",
"message":"Claws, beasts, gornauds. They cannot reach me here.",
"replies":[
{
"text":"'Gornauds', is that what those monsters outside the village are called?",
Expand Down
4 changes: 2 additions & 2 deletions AndorsTrail/res/raw/conversationlist_pwcave.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"nextPhraseID":"gauward_1"
},
{
"text":"I have some Izthiel claws to sell you.",
"text":"I have some izthiel claws to sell you.",
"nextPhraseID":"gauward_sell_1",
"requires":[
{
Expand Down Expand Up @@ -198,7 +198,7 @@
]
},
{
"text":"Never mind. I will be back with more Izthiel claws to sell you.",
"text":"Never mind. I will be back with more izthiel claws to sell you.",
"nextPhraseID":"gauward_7"
}
]
Expand Down
4 changes: 2 additions & 2 deletions AndorsTrail/res/raw/conversationlist_remgard_villagers1.json
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
"message":"Oh, hello. I can't talk right now, must finish planting these crops.",
"replies":[
{
"text":"Do you know where I can find some Damerilias ?",
"text":"Do you know where I can find some damerilias?",
"nextPhraseID":"remgard_farmer1_root10_0",
"requires":[
{
Expand All @@ -442,7 +442,7 @@
"message":"I hope the lands will be good to us this season.",
"replies":[
{
"text":"Do you know where I can find some Damerilias ?",
"text":"Do you know where I can find some damerilias?",
"nextPhraseID":"remgard_farmer2_roots10_0",
"requires":[
{
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/res/raw/conversationlist_stoutford.json
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,7 @@
},
{
"id":"kayla_halvor_5",
"message":"I'm really proud of the result. \nThey are light, but sturdy, thanks to the bones and insect wings. \nThey are comfortable but tough thanks to the animal hair and venomscale scales. \nThey are stiff when adjusted, thanks to the rat tails.",
"message":"I'm really proud of the result.\nThey are light, but sturdy, thanks to the bones and insect wings.\nThey are comfortable but tough thanks to the animal hair and venomscale scales.\nThey are stiff when adjusted, thanks to the rat tails.",
"replies":[
{
"text":"N",
Expand Down
Loading

0 comments on commit 00ac1b2

Please sign in to comment.