From 195b8eb5f97d092e14427185d8c5fd2c5babc492 Mon Sep 17 00:00:00 2001
From: Carceris Magister <carceris.magister@gmail.com>
Date: Wed, 16 Aug 2017 21:00:20 -0400
Subject: [PATCH 2/3] Improved Mikhail's initial dialog with more context and
 to avoid repeating opening monologue (info still available when character
 asks.)

---
 .../res/raw/conversationlist_mikhail.json     | 106 +++++++++++++++++-
 1 file changed, 104 insertions(+), 2 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
index 1359ac8fe..c9597772f 100644
--- a/AndorsTrail/res/raw/conversationlist_mikhail.json
+++ b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -59,7 +59,7 @@
         "id":"mikhail_start_select_default",
         "replies":[
             {
-                "nextPhraseID":"mikhail_visited",
+                "nextPhraseID":"mikhail_default",
                 "requires":[
                     {
                         "requireType":"questProgress",
@@ -114,9 +114,73 @@
         "id":"mikhail_default",
         "message":"Anything else I can help you with?",
         "replies":[
+            {
+                "text":"Do you have any more tasks for me?",
+                "nextPhraseID":"mikhail_all_tasks_done",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_bread",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_rats",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "text":"Do you have any more tasks for me?",
+                "nextPhraseID":"mikhail_bread_done",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_bread",
+                        "value":100
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_rats",
+                        "value":100,
+                        "negate":"true"
+                    }
+                ]
+            },
+            {
+                "text":"Do you have any more tasks for me?",
+                "nextPhraseID":"mikhail_rats_done",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_bread",
+                        "value":100,
+                        "negate":"true"
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_rats",
+                        "value":100
+                    }
+                ]
+            },
             {
                 "text":"Do you have any tasks for me?",
-                "nextPhraseID":"mikhail_tasks"
+                "nextPhraseID":"mikhail_tasks",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_bread",
+                        "value":100,
+                        "negate":"true"
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mikhail_rats",
+                        "value":100,
+                        "negate":"true"
+                    }
+                ]
             },
             {
                 "text":"Is there anything else you can tell me about Andor?",
@@ -142,6 +206,44 @@
             }
         ]
     },
+    {
+        "id":"mikhail_bread_done",
+        "message":"Thanks for getting me the bread. There are still the rats.",
+        "replies":[
+            {
+                "text":"What about the rats?",
+                "nextPhraseID":"mikhail_rats_select"
+            },
+            {
+                "text":"Never mind, let's talk about the other things.",
+                "nextPhraseID":"mikhail_default"
+            }
+        ]
+    },
+    {
+        "id":"mikhail_rats_done",
+        "message":"Thanks for taking care of the rats. I'd still love some bread.",
+        "replies":[
+            {
+                "text":"What about the bread?",
+                "nextPhraseID":"mikhail_bread_select"
+            },
+            {
+                "text":"Never mind, let's talk about the other things.",
+                "nextPhraseID":"mikhail_default"
+            }
+        ]
+    },
+    {
+        "id":"mikhail_all_tasks_done",
+        "message":"Not for now. Thanks for taking care of the bread and rats.",
+        "replies":[
+            {
+                "text":"Never mind, let's talk about the other things.",
+                "nextPhraseID":"mikhail_default"
+            }
+        ]
+    },
     {
         "id":"mikhail_andor1",
         "message":"As I said, Andor went out yesterday and hasn't been back since. I'm starting to worry about him. Please go look for your brother, he said he would only be out a short while.",

From 8f8bcf8a6c097c073e7cc180b64948febce5067f Mon Sep 17 00:00:00 2001
From: Carceris Magister <carceris.magister@gmail.com>
Date: Fri, 18 Aug 2017 22:47:49 -0400
Subject: [PATCH 3/3] Use proper JSON boolean for negate statements

---
 AndorsTrail/res/raw/conversationlist_mikhail.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
index c9597772f..37e7471c6 100644
--- a/AndorsTrail/res/raw/conversationlist_mikhail.json
+++ b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -143,7 +143,7 @@
                         "requireType":"questProgress",
                         "requireID":"mikhail_rats",
                         "value":100,
-                        "negate":"true"
+                        "negate":true
                     }
                 ]
             },
@@ -155,7 +155,7 @@
                         "requireType":"questProgress",
                         "requireID":"mikhail_bread",
                         "value":100,
-                        "negate":"true"
+                        "negate":true
                     },
                     {
                         "requireType":"questProgress",
@@ -172,13 +172,13 @@
                         "requireType":"questProgress",
                         "requireID":"mikhail_bread",
                         "value":100,
-                        "negate":"true"
+                        "negate":true
                     },
                     {
                         "requireType":"questProgress",
                         "requireID":"mikhail_rats",
                         "value":100,
-                        "negate":"true"
+                        "negate":true
                     }
                 ]
             },