Revert ""Fix" villagertalk function, barely."

This reverts commit d7555706564dbc1e184246b05aa9fa589d047f50.

1 files changed, 22 insertions, 13 deletions

diff --git a/npc/functions/villagertalk.txt b/npc/functions/villagertalk.txt
index 4bbdf6a2..1df55c97 100644
--- a/npc/functions/villagertalk.txt
+++ b/npc/functions/villagertalk.txt
@@ -5,22 +5,32 @@
 // Contributors:
 //    Akko Teru
 // Description:
-//    Tell a random sentence.
+//    Tell a random sentence. || There ought to be a law!
 // Variables:
 //    .@rand = Random number between the number of sentence choice.
+//    .@darn = Separatly chosen value for silly antics.
 
 function	script	villagertalk	{
 
     .@rand = rand(5);
+    .@darn = rand(42);
     if (.@rand == 0)
     {
-        emotion 6; // "Angel".
-        goodbye;
+        if (rand(2) == 1)
+        {
+            wait 1;
+            emote 6; // "Angel".
+            goodbye;
+        }
+        else
+        {
+            wait 1;
+            emote 13; // "Blah".
+            goodbye;
+        }
+        if (.@darn == 23) npctalk3 l("Stop it!");
     }
 
-    if (rand(42) == 23)
-        npctalk3 l("Stop it!"); // This could happen just before another talk function.
-
     if (.@rand == 1)
     {
         speech 4,
@@ -38,19 +48,18 @@ function	script	villagertalk	{
     if (.@rand == 4)
     {
         npctalk3 l("It's difficult to distinguish good villagers from bad ones; keep your guard up, and stay away from me.");
-        //wait 1;
-        emotion 6;
+        wait 1;
+        emote 6;
     }
 
-    if ((.@rand == 4) && (rand(42) == 0))
+    if ((.@rand == 4) && (.@darn == 2))
     {
         npctalk3 l("I just want to live my life in peace.");
     }
-
-    if (rand(42) == 0)
+    else if (((.@rand + .@darn) - 2) == 9)
     {
-        Zeny = Zeny + rand(10);
-        emotion rand(13);
+        zeny rand(10);
+        emote rand(13);
         goodbye;
     }