From 8c28166c1102b363f92caebbd1fbe9393f5099f6 Mon Sep 17 00:00:00 2001 From: Zukero Date: Fri, 17 Nov 2017 12:01:38 +0100 Subject: [PATCH 1/3] Fixed issue in Vilegard where you could talk about the Xulviir and the Feygard swords to all merchants instead of only the smith while Vilegard people distrusts you. --- .../res/raw/conversationlist_vilegard_shops.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/res/raw/conversationlist_vilegard_shops.json b/AndorsTrail/res/raw/conversationlist_vilegard_shops.json index a1c3fd008..1181b1114 100644 --- a/AndorsTrail/res/raw/conversationlist_vilegard_shops.json +++ b/AndorsTrail/res/raw/conversationlist_vilegard_shops.json @@ -61,7 +61,7 @@ ] }, { - "nextPhraseID":"vilegard_shop_notrust" + "nextPhraseID":"vilegard_shop_notrust_smith" } ] }, @@ -105,6 +105,20 @@ { "id":"vilegard_shop_notrust", "message":"You are an outsider. We don't like outsiders here in Vilegard. Please leave.", + "replies":[ + { + "text":"Why is everyone in Vilegard so suspicious of outsiders?", + "nextPhraseID":"vilegard_shop_notrust_2" + }, + { + "text":"Can I see what items you have for sale?", + "nextPhraseID":"vilegard_shop_notrust_2" + } + ] + }, + { + "id":"vilegard_shop_notrust_smith", + "message":"You are an outsider. We don't like outsiders here in Vilegard. Please leave.", "replies":[ { "text":"Why is everyone in Vilegard so suspicious of outsiders?", From 0a04b516ddaf6e28cf200fec7c43f03dfa2cbf52 Mon Sep 17 00:00:00 2001 From: Zukero Date: Tue, 12 Dec 2017 23:35:27 +0100 Subject: [PATCH 2/3] Fixed another (hopefully the last one) issue introduced during the Great Reordering of content (loss of requirements negation in Dialogues' replies). --- .../res/raw/conversationlist_lodar.json | 18 ++++++++++++------ .../conversationlist_pathway_fallhaven.json | 3 ++- .../raw/conversationlist_shortcut_lodar.json | 9 ++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json index b3cab1312..229316c03 100644 --- a/AndorsTrail/res/raw/conversationlist_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_lodar.json @@ -533,12 +533,14 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":10 + "value":10, + "negate":true }, { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":30 + "value":30, + "negate":true } ] }, @@ -559,7 +561,8 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":30 + "value":30, + "negate":true } ] }, @@ -575,12 +578,14 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":10 + "value":10, + "negate":true }, { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":30 + "value":30, + "negate":true } ] }, @@ -596,7 +601,8 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":50 + "value":50, + "negate":true } ] }, diff --git a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json index ef42fea4e..2597aacc7 100644 --- a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json +++ b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json @@ -143,7 +143,8 @@ { "requireType":"questProgress", "requireID":"pathway_fallhaven", - "value":40 + "value":40, + "negate":true } ] } diff --git a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json index bfb29b25a..11b931be6 100644 --- a/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_shortcut_lodar.json @@ -12,7 +12,8 @@ { "requireType":"questProgress", "requireID":"lodar2", - "value":50 + "value":50, + "negate":true } ] }, @@ -22,7 +23,8 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":22 + "value":22, + "negate":true } ] }, @@ -56,7 +58,8 @@ { "requireType":"questProgress", "requireID":"shortcut_lodar", - "value":40 + "value":40, + "negate":true } ] }, From 421a03980ad3d7f6940549fc831e992a716784c1 Mon Sep 17 00:00:00 2001 From: Zukero Date: Mon, 15 Jan 2018 11:34:25 +0100 Subject: [PATCH 3/3] Bug fix for factionScore requirements --- .../gpl/rpg/AndorsTrail/controller/ConversationController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java index f9a8aec25..99e63c88d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java @@ -293,6 +293,7 @@ public final class ConversationController { break; case factionScore: result = player.getAlignment(requirement.requireID) >= requirement.value; + break; default: result = true; }