From 725d0ed632dbec1e25d4f3a1666d46c7134b0146 Mon Sep 17 00:00:00 2001 From: Rijackson Date: Sat, 21 Jan 2017 17:24:11 -0500 Subject: [PATCH 1/3] More sprites added in items_rijackson_1.png. Clean up punctuation, typos etc. in dialogues, Change dialogue so that it is Andor's companion, not Andor himself, that persuades Glasforn to imprison the hero with the lich. --- .../res/drawable/items_rijackson_1.png | Bin 0 -> 13977 bytes .../raw/conversationlist_fallhaven_south.json | 20 ++- .../conversationlist_fallhaven_warden.json | 10 +- .../raw/conversationlist_glasforn_fixes.json | 42 +++++ .../raw/conversationlist_halvor_surprise.json | 141 +++++++-------- .../res/raw/conversationlist_lodar.json | 10 +- .../conversationlist_pathway_fallhaven.json | 20 ++- .../raw/conversationlist_shortcut_lodar.json | 11 +- .../res/raw/conversationlist_stoutford.json | 169 +++++++++--------- AndorsTrail/res/raw/itemlist_stoutford.json | 4 +- .../res/raw/questlist_halvor_surprise.json | 34 ++-- .../res/raw/questlist_pathway_fallhaven.json | 12 +- .../res/raw/questlist_shortcut_lodar.json | 2 +- AndorsTrail/res/raw/questlist_stoutford.json | 12 +- 14 files changed, 270 insertions(+), 217 deletions(-) create mode 100644 AndorsTrail/res/drawable/items_rijackson_1.png create mode 100644 AndorsTrail/res/raw/conversationlist_glasforn_fixes.json diff --git a/AndorsTrail/res/drawable/items_rijackson_1.png b/AndorsTrail/res/drawable/items_rijackson_1.png new file mode 100644 index 0000000000000000000000000000000000000000..84215ca966046bedbd9905b408905cbeb679090f GIT binary patch literal 13977 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 xEpMRV<)2 Date: Sun, 22 Jan 2017 11:24:52 -0500 Subject: [PATCH 2/3] Clean up a few mistakes and the strange negated requirments --- .../res/raw/conversationlist_halvor_surprise.json | 7 +++---- AndorsTrail/res/raw/conversationlist_lodar.json | 8 ++++---- .../res/raw/conversationlist_pathway_fallhaven.json | 6 ++---- AndorsTrail/res/raw/conversationlist_shortcut_lodar.json | 9 +++------ AndorsTrail/res/raw/conversationlist_stoutford.json | 7 +++---- AndorsTrail/res/raw/questlist_stoutford.json | 2 +- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_halvor_surprise.json b/AndorsTrail/res/raw/conversationlist_halvor_surprise.json index 58ae0cb20..355c1a9ba 100644 --- a/AndorsTrail/res/raw/conversationlist_halvor_surprise.json +++ b/AndorsTrail/res/raw/conversationlist_halvor_surprise.json @@ -240,8 +240,7 @@ { "requireType":"questProgress", "requireID":"halvor_surprise", - "value":20, - "negate":false + "value":20 } ] }, @@ -675,7 +674,7 @@ }, { "id":"halvor_bwmine_5", - "message":"Next on my list is some animal hair. It has ro be soft hair though. I think 4 handfuls should do. Would you find them for me?", + "message":"Next on my list is some animal hair. It has to be soft hair though. I think 4 handfuls should do. Would you find them for me?", "replies":[ { "text":"No problem. I'll do it.", @@ -1087,7 +1086,7 @@ }, { "id":"halvor_mlake_3", - "message":"That's too bad. I will rest here until someone can heal me If I can wait that long..." + "message":"That's too bad. I will rest here until someone can heal me. If I can wait that long..." }, { "id":"halvor_mlake_4_weak", diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json index 074ff26f3..a1612793c 100644 --- a/AndorsTrail/res/raw/conversationlist_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_lodar.json @@ -543,7 +543,7 @@ ] }, { - "text":"I found the cave you mentioned but unfortunately the path doesn't go anywhere. I noticed a weird torch burning in a purple glow though. Do you know anything about this?", + "text":"I found the cave you mentioned but unfortunately the path doesn't go anywhere. I noticed a weird torch burning with a purple glow though. Do you know anything about this?", "nextPhraseID":"shortcut_lodar_1", "requires":[ { @@ -564,7 +564,7 @@ ] }, { - "text":"I found a cave beneath the Hira'zinn tomb but unfortunately the path doesn't go anywhere. I noticed a weird torch burning in a purple glow though. Do you know anything about this?", + "text":"I found a cave beneath the Hira'zinn tomb but unfortunately the path doesn't go anywhere. I noticed a weird torch burning with a purple glow though. Do you know anything about this?", "nextPhraseID":"shortcut_lodar_1", "requires":[ { @@ -585,7 +585,7 @@ ] }, { - "text":"It worked and I didn't get injured at all! There's now a path from the Duleian road to here that let's me avoid the maze.", + "text":"It worked and I didn't get injured at all! There's now a path from the Duleian road to here that lets me avoid the maze.", "nextPhraseID":"shortcut_lodar_2", "requires":[ { @@ -2103,7 +2103,7 @@ }, { "id":"shortcut_lodar_2", - "message":"Well, that's great to hear. But don't tell this anybody else because I don't want to have some Feygard soldiers in front of my house one day.", + "message":"Well, that's great to hear. But don't tell this to anybody else because I don't want to have some Feygard soldiers in front of my house one day.", "replies":[ { "text":"Sure, this will be a secret between us.", diff --git a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json index a54b1bfb3..acf83d3fc 100644 --- a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json +++ b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json @@ -150,8 +150,7 @@ { "requireType":"questProgress", "requireID":"pathway_fallhaven", - "value":40, - "negate":true + "value":40 } ] } @@ -188,8 +187,7 @@ { "requireType":"questLatestProgress", "requireID":"pathway_fallhaven", - "value":30, - "negate":true + "value":30 } ] }, diff --git a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json index 119f88af8..fad41ab19 100644 --- a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json @@ -12,8 +12,7 @@ { "requireType":"questProgress", "requireID":"lodar2", - "value":50, - "negate":true + "value":50 } ] }, @@ -23,8 +22,7 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":22, - "negate":true + "value":22 } ] }, @@ -58,8 +56,7 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":40, - "negate":true + "value":40 } ] }, diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json index 69ed5d348..4c7aa9059 100644 --- a/AndorsTrail/res/raw/conversationlist_stoutford.json +++ b/AndorsTrail/res/raw/conversationlist_stoutford.json @@ -630,7 +630,7 @@ }, { "id":"stoutford_cellar_locked_key", - "message":"An unknown force prevents you to go further." + "message":"An unknown force prevents you from going further." }, { "id":"glasforn_0", @@ -885,8 +885,7 @@ { "requireType":"questProgress", "requireID":"rumblings", - "value":50, - "negate":true + "value":50 } ] } @@ -1017,7 +1016,7 @@ }, { "id":"glasforn_rumblings60_6", - "message":"I\u2019m sorry! How was I to know you could actually kill it? You\u2019re just a kid! Anyway, now I can remove the necklace. Please take it. I never want to see it again.", + "message":"I'm sorry! How was I to know you could actually kill it? You're just a kid! Anyway, now I can remove the necklace. Please take it. I never want to see it again.", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/questlist_stoutford.json b/AndorsTrail/res/raw/questlist_stoutford.json index c41ad45b7..0d194eaa8 100644 --- a/AndorsTrail/res/raw/questlist_stoutford.json +++ b/AndorsTrail/res/raw/questlist_stoutford.json @@ -18,7 +18,7 @@ }, { "progress":30, - "logText":"Glasforn, the owner of the tavern of Stoutford, admits to knowing Andor, but evades all my questions by boasting about his bed's quality." + "logText":"Glasforn, the owner of the tavern of Stoutford, admits to knowing Andor, but evades all my questions by boasting about his beds' quality." }, { "progress":50, From 6eeff751349afc9b2264b596de7020b1d8f97914 Mon Sep 17 00:00:00 2001 From: Rijackson Date: Sun, 22 Jan 2017 12:02:02 -0500 Subject: [PATCH 3/3] Clean up the strange unicode stuff. --- .../raw/conversationlist_glasforn_fixes.json | 24 +++++++++---------- .../res/raw/conversationlist_stoutford.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_glasforn_fixes.json b/AndorsTrail/res/raw/conversationlist_glasforn_fixes.json index df176ffa2..4380dba9b 100644 --- a/AndorsTrail/res/raw/conversationlist_glasforn_fixes.json +++ b/AndorsTrail/res/raw/conversationlist_glasforn_fixes.json @@ -1,42 +1,42 @@ [ { + "id":"glasforn_rumblings60_5_2", + "message":"I couldn't. When I tried, and failed, he laughed. He told me it was bound to that thing in the basement, which needed me to be its servant. ", "replies":[ { "text":"N", "nextPhraseID":"glasforn_rumblings60_5_3" } - ], - "id":"glasforn_rumblings60_5_2", - "message":"I couldn\u2019t. When I tried, and failed, he laughed. He told me it was bound to that thing in the basement, which needed me to be its servant. " + ] }, { + "id":"glasforn_rumblings60_5_4", + "message":"I didn't dare. The evening after Andor left his companion returned briefly. He warned me you might come here, and that if you found out what I had done you would kill me. He told me that my only hope was to make you the next victim.", "replies":[ { "text":"N", "nextPhraseID":"glasforn_rumblings60_6" } - ], - "id":"glasforn_rumblings60_5_4", - "message":"I didn\u2019t dare. The evening after Andor left his companion returned briefly. He warned me you might come here, and that if you found out what I had done you would kill me. He told me that my only hope was to make you the next victim." + ] }, { + "id":"glasforn_rumblings60_5_3", + "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would able to remove the necklace. I'm no fighter though. I was too scared to even go near it.", "replies":[ { "text":"I guess you are lucky I visited, although just asking me to kill it would have been easier. And nicer.", "nextPhraseID":"glasforn_rumblings60_5_4" } - ], - "id":"glasforn_rumblings60_5_3", - "message":"Then he laughed some more, and told me that all I had to do was kill that thing, and I would able to remove the necklace. I\u2019m no fighter though. I was too scared to even go near it." + ] }, { + "id":"glasforn_rumblings60_5_1", + "message":"It was terrible! I could feel the necklace draining the life out of me, and the only thing that made me feel better was giving it another victim.", "replies":[ { "text":"Why didn't you just take it off?", "nextPhraseID":"glasforn_rumblings60_5_2" } - ], - "id":"glasforn_rumblings60_5_1", - "message":"It was terrible! I could feel the necklace draining the life out of me, and the only thing that made me feel better was giving it another victim." + ] } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json index 4c7aa9059..9b602af99 100644 --- a/AndorsTrail/res/raw/conversationlist_stoutford.json +++ b/AndorsTrail/res/raw/conversationlist_stoutford.json @@ -893,7 +893,7 @@ }, { "id":"stoutford_lich_killed_1", - "message":"You hear a loud rumble, then nothing. Silence. What was that monster ?", + "message":"You hear a loud rumble, then nothing. Silence. What was that monster?", "rewards":[ { "rewardType":"questProgress",