From 735dfa0ba42aeb618781242b6676f98f35002723 Mon Sep 17 00:00:00 2001 From: Nut Date: Sun, 13 Jan 2019 00:57:30 +0100 Subject: [PATCH 1/3] lookout bed --- .../raw/conversationlist_bugfix_0_7_4.json | 78 +++++++++++++++++++ AndorsTrail/res/xml/lookout_lower.tmx | 8 +- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json index 534de28b7..9c5c13cf0 100644 --- a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json +++ b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json @@ -344,5 +344,83 @@ { "id":"lookout_sign", "message":"The sign is old and worn, but you can make out the words \"Lake Laeroth watchtower\"." + }, + { + "id":"lookout_bed_0", + "rewards": [ + { + "rewardType": "alignmentSet", + "rewardID": "lookout_bed", + "value": 1 + } + ] + }, + { + "id":"lookout_bed", + "rewards": [ + { + "rewardType": "alignmentChange", + "rewardID": "lookout_bed", + "value": 1 + } + ], + "replies":[ + { + "nextPhraseID":"X", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 16 + } + ] + }, + { + "nextPhraseID":"lookout_bed_20", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 15 + } + + ] + }, + { + "nextPhraseID":"X", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 6 + } + ] + }, + { + "nextPhraseID":"lookout_bed_10", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 5 + } + ] + } + ] + }, + { + "id":"lookout_bed_10", + "message":"You toss and turn, but sleep won't come." + }, + { + "id":"lookout_bed_20", + "rewards":[ + { + "rewardType":"actorCondition", + "rewardID":"stunned", + "value":7 + } + ], + "message":"Now you have got a headache. You really should give up trying to sleep." } ] \ No newline at end of file diff --git a/AndorsTrail/res/xml/lookout_lower.tmx b/AndorsTrail/res/xml/lookout_lower.tmx index eec1d4df3..655088aa8 100644 --- a/AndorsTrail/res/xml/lookout_lower.tmx +++ b/AndorsTrail/res/xml/lookout_lower.tmx @@ -201,7 +201,7 @@ - eJzbKMbAsJEEDAKkyCEDXOKkyGGzBwDGfxs2 + eJzbKMbAsJEEDAKkyCEDXOLIctgAIXsAnikabw== @@ -217,6 +217,12 @@ + + + + + + From 275159a785706fb77ae1d647857b422fa42ed088 Mon Sep 17 00:00:00 2001 From: Nut Date: Sun, 13 Jan 2019 00:58:07 +0100 Subject: [PATCH 2/3] Revert "lookout bed" This reverts commit 735dfa0ba42aeb618781242b6676f98f35002723. --- .../raw/conversationlist_bugfix_0_7_4.json | 78 ------------------- AndorsTrail/res/xml/lookout_lower.tmx | 8 +- 2 files changed, 1 insertion(+), 85 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json index 9c5c13cf0..534de28b7 100644 --- a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json +++ b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json @@ -344,83 +344,5 @@ { "id":"lookout_sign", "message":"The sign is old and worn, but you can make out the words \"Lake Laeroth watchtower\"." - }, - { - "id":"lookout_bed_0", - "rewards": [ - { - "rewardType": "alignmentSet", - "rewardID": "lookout_bed", - "value": 1 - } - ] - }, - { - "id":"lookout_bed", - "rewards": [ - { - "rewardType": "alignmentChange", - "rewardID": "lookout_bed", - "value": 1 - } - ], - "replies":[ - { - "nextPhraseID":"X", - "requires":[ - { - "requireType": "factionScore", - "requireID": "lookout_bed", - "value": 16 - } - ] - }, - { - "nextPhraseID":"lookout_bed_20", - "requires":[ - { - "requireType": "factionScore", - "requireID": "lookout_bed", - "value": 15 - } - - ] - }, - { - "nextPhraseID":"X", - "requires":[ - { - "requireType": "factionScore", - "requireID": "lookout_bed", - "value": 6 - } - ] - }, - { - "nextPhraseID":"lookout_bed_10", - "requires":[ - { - "requireType": "factionScore", - "requireID": "lookout_bed", - "value": 5 - } - ] - } - ] - }, - { - "id":"lookout_bed_10", - "message":"You toss and turn, but sleep won't come." - }, - { - "id":"lookout_bed_20", - "rewards":[ - { - "rewardType":"actorCondition", - "rewardID":"stunned", - "value":7 - } - ], - "message":"Now you have got a headache. You really should give up trying to sleep." } ] \ No newline at end of file diff --git a/AndorsTrail/res/xml/lookout_lower.tmx b/AndorsTrail/res/xml/lookout_lower.tmx index 655088aa8..eec1d4df3 100644 --- a/AndorsTrail/res/xml/lookout_lower.tmx +++ b/AndorsTrail/res/xml/lookout_lower.tmx @@ -201,7 +201,7 @@ - eJzbKMbAsJEEDAKkyCEDXOLIctgAIXsAnikabw== + eJzbKMbAsJEEDAKkyCEDXOKkyGGzBwDGfxs2 @@ -217,12 +217,6 @@ - - - - - - From 07af87e484bd1d4bbb5efedaf34290632cb6eec2 Mon Sep 17 00:00:00 2001 From: Nut Date: Sun, 13 Jan 2019 01:17:46 +0100 Subject: [PATCH 3/3] lookout bed + change translators order in authors --- .../raw/conversationlist_bugfix_0_7_4.json | 78 +++++++++++++++++++ AndorsTrail/res/values/authors.xml | 2 +- AndorsTrail/res/xml/lookout_lower.tmx | 8 +- 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json index 534de28b7..9c5c13cf0 100644 --- a/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json +++ b/AndorsTrail/res/raw/conversationlist_bugfix_0_7_4.json @@ -344,5 +344,83 @@ { "id":"lookout_sign", "message":"The sign is old and worn, but you can make out the words \"Lake Laeroth watchtower\"." + }, + { + "id":"lookout_bed_0", + "rewards": [ + { + "rewardType": "alignmentSet", + "rewardID": "lookout_bed", + "value": 1 + } + ] + }, + { + "id":"lookout_bed", + "rewards": [ + { + "rewardType": "alignmentChange", + "rewardID": "lookout_bed", + "value": 1 + } + ], + "replies":[ + { + "nextPhraseID":"X", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 16 + } + ] + }, + { + "nextPhraseID":"lookout_bed_20", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 15 + } + + ] + }, + { + "nextPhraseID":"X", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 6 + } + ] + }, + { + "nextPhraseID":"lookout_bed_10", + "requires":[ + { + "requireType": "factionScore", + "requireID": "lookout_bed", + "value": 5 + } + ] + } + ] + }, + { + "id":"lookout_bed_10", + "message":"You toss and turn, but sleep won't come." + }, + { + "id":"lookout_bed_20", + "rewards":[ + { + "rewardType":"actorCondition", + "rewardID":"stunned", + "value":7 + } + ], + "message":"Now you have got a headache. You really should give up trying to sleep." } ] \ No newline at end of file diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml index 22e382fa5..660e2d808 100644 --- a/AndorsTrail/res/values/authors.xml +++ b/AndorsTrail/res/values/authors.xml @@ -26,7 +26,7 @@ Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br /> Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br /> French translation by LeSanglier, Misty Soul, zorun.42, Marwane K. and olivier<br /> - German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor, Tutar, Mütze, Moerit, Christian Berlage, Mayweed and Firefly84<br /> + German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor, Tutar, Mütze, Moerit, Mayweed, Christian Berlage and Firefly84<br /> English proofreading by taws34 and Elyon<br /> English proofreading and testing by Stephen Stalnaker and <a href="https://urbalazs.hu">Balázs Úr</a><br /> Hungarian translation by <a href="https://urbalazs.hu">Balázs Úr</a><br /> diff --git a/AndorsTrail/res/xml/lookout_lower.tmx b/AndorsTrail/res/xml/lookout_lower.tmx index eec1d4df3..655088aa8 100644 --- a/AndorsTrail/res/xml/lookout_lower.tmx +++ b/AndorsTrail/res/xml/lookout_lower.tmx @@ -201,7 +201,7 @@ - eJzbKMbAsJEEDAKkyCEDXOKkyGGzBwDGfxs2 + eJzbKMbAsJEEDAKkyCEDXOLIctgAIXsAnikabw== @@ -217,6 +217,12 @@ + + + + + +