From b0733f7b5606d7750516eddd10c956541ec1c4f9 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 1 Jun 2019 22:59:09 -0300
Subject: 1 - I don't care to verify if getmapxy() failed. 2 - Sagratha score
 change. 3 - Fix bug on Acorns.

---
 db/re/item_db.conf       | 12 +++++++-----
 npc/012-4/wyara.txt      |  1 +
 npc/014-5-1/sagratha.txt |  7 +++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ba5649b13..5b2637555 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -185,11 +185,13 @@ item_db: (
 	UseEffect: "EFFECT_HEAL"
 	Script: <"
 		if (@useType == 1) {
-			if (!getmapxy(.@map$, .@x, .@y, 0)) {
-				if (rand(1,10) != 3)
-					monster(.@map$, .@x, .@y, l("Oak"), 1017, 1);
-				else
-					monster(.@map$, .@x, .@y, l("Not An Oak"), SpringSquirrel, 1);
+			getmapxy(.@map$, .@x, .@y, 0);
+			if (rand(1,10) != 3) {
+				monster(.@map$, .@x, .@y, l("Oak"), 1017, 1);
+				$TREE_PLANTED=$TREE_PLANTED+1;
+				callfunc "SaggyScoreUpdate", 1;
+			} else {
+				monster(.@map$, .@x, .@y, l("Not An Oak"), SpringSquirrel, 1);
 			}
 		} else {
 			@type = 0;
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
index cf0c29cc2..87f75b8c9 100644
--- a/npc/012-4/wyara.txt
+++ b/npc/012-4/wyara.txt
@@ -30,6 +30,7 @@ L_Menu:
         rif(getq(HurnscaldQuest_InjuriedMouboo) == 2,l("Do you know how to break curses?")),
         rif(.@s == 1 && .@s3,l("Sagratha was not home.")),
         rif(.@s == 2,l("About Sagratha...")),
+        // rif(SAGRATHA_SCORE < 0, l("Sagratha hates my guts.")), // Plant trees
         rif(.@n >= 6,l("I am in dire need of Return Potions!")),
         lg("You are weird, I have to go sorry.");
 
diff --git a/npc/014-5-1/sagratha.txt b/npc/014-5-1/sagratha.txt
index d9cf0585b..12e984fa4 100644
--- a/npc/014-5-1/sagratha.txt
+++ b/npc/014-5-1/sagratha.txt
@@ -32,11 +32,14 @@ function	script	SaggyMobCount	{
             SaggyScoreUpdate(-2);
             break;
 
-        // She gets happy
+        // She may get happy. Who knows.
         case ViciousSquirrel:
         case WickedMushroom:
         case Bluepar:
-            SaggyScoreUpdate(1);
+        case BlackScorpion:
+        case AngryScorpion:
+        case AngryRedScorpion:
+            SaggyScoreUpdate(any(0,0,1));
             break;
     }
     return;
-- 
cgit v1.2.3-60-g2f50