Merge branch 'master' into kfahrkfahr

2 files changed, 18 insertions, 4 deletions

diff --git a/npc/012-2-1/jessie.txt b/npc/012-2-1/jessie.txt
index c00e868d..9af3dd09 100644
--- a/npc/012-2-1/jessie.txt
+++ b/npc/012-2-1/jessie.txt
@@ -8,11 +8,24 @@
 012-2-1,38,30,0	script	Jessie	NPC_JESSIE,{
     speech
         l("Welcome."),
-        l("Someone was too lazy to even write a placeholder text, so please come back later");
+        l("I am \"uncle\" Jessie and I teach the kids in Candor.");
+    next;
+    mesn;
+    mesq l("Actually... Do you know why the Piou crossed the road?");
+    next;
+    if (askyesno() == ASK_NO) {
+        mesn;
+        mesq l("Dang! I don't know either, but I'm too shy to ask.");
+    } else {
+        mesc l("Why the Piou crossed the road?");
+        input .@jessanswer$;
+        mesn;
+        mesq l("Pfft, you obviously don't know either!");
+    }
     close;
 
 OnInit:
     .sex = G_MALE;
-    .distance = 2;
+    .distance = 4;
     end;
 }
diff --git a/npc/012-2-1/tanisha.txt b/npc/012-2-1/tanisha.txt
index 94848971..01c92662 100644
--- a/npc/012-2-1/tanisha.txt
+++ b/npc/012-2-1/tanisha.txt
@@ -8,11 +8,12 @@
 012-2-1,48,34,0	script	Tanisha	NPC_TANISHA,{
     speech
         l("Welcome."),
-        l("Someone was too lazy to even write a placeholder text, so please come back later");
+        l("Kaan asked me to kill maggots, which I hate! But I'm not seeing any..."),
+        l("I wonder if things were supposed to be this way?");
     close;
 
 OnInit:
     .sex = G_FEMALE;
-    .distance = 2;
+    .distance = 4;
     end;
 }