Update Sagratha notes. Sunday 18:00 is the server happy hour!

(Yes, I used GvG times to make this happy hour. Saturday/Sunday 21h are on sight.)

3 files changed, 36 insertions, 3 deletions

diff --git a/npc/00000SAVE/misc/sagratha.txt b/npc/00000SAVE/misc/sagratha.txt
index b774af006..d754e64b3 100644
--- a/npc/00000SAVE/misc/sagratha.txt
+++ b/npc/00000SAVE/misc/sagratha.txt
@@ -4,6 +4,32 @@
 //
 // Will be extensively modified and (almost) entirely rewriten for TMW2:ML.
 // Serves merely as a reference.
+// Monster Reputation Table
+// Good				Bad
+// Squirrel (2)			Vicious Squirrel
+// Fluffy (3)			Scorpion
+// Easter Fluffy (3)	Angry Scorpion
+// Reinboo (3)			Red Scorpion
+// Santaboo (3)			Black Scorpion
+// Pollett (3)			Wicked Mushroom
+// Mouboo (4)			Evil Mouboo
+// Pinkie (3)			Bluepar
+//
+// Sagatha also has a specific list of good animals she cares about. You need to kill however the bad ones she doesn't like. The number (#) indicates how much it affects Sagatha. The "unhappiness" of Sagatha is limited to 15 so you don't have to kill a lot of bad monsters to make her happy.
+// For this we can just cause unhappiness for killing Holy/Nature, and recover happiness for all else. Shadow/Undead kills give double happiness.
+// 
+// When talking to Pauline, if you have learned Astral Magic Skill, she will tell you about some painting she found in a cave. She will tell you the invocations to both the summon pinkie and the summon mouboo spells she found, but she doesn't know the right ingredients for the spells. Your task is to find those ingredients. She will give you a hint. The ingredients are somewhat similar to other Astral Spells.
+// 
+// When you come back she will ask for this ingredients. Starting with the Mouboo spell you will have to type in the ingredients. The right ingredients for the Mouboo spell are one Root and a Mouboo Figurine. You have to type "Root" and "MoubooFigurine". The input is case sensitive and will not accept spaces. You also have to give her these items to complete the quest.
+// 
+// Caution: You can type in any ingredient you want, if you have that with you she will take it and the item is gone. So do not give her any rare items just to play around. Items you give her trying to complete the Quest will be lost, and cannot be restored.
+// 
+// Once you typed in and gave her the correct ingredients she will spawn a mouboo and give you 10.000EXP as a reward.
+
+
+
+
+
 
 function	script	QuestSagrathaHappy	{
     @unhappiness = (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
diff --git a/npc/003-1/aahna.txt b/npc/003-1/aahna.txt
index fa35bfa57..b08d175ce 100644
--- a/npc/003-1/aahna.txt
+++ b/npc/003-1/aahna.txt
@@ -22,6 +22,14 @@ OnInit:
     .distance = 5;
     end;
 
+// Server Happy Hour
+OnSun1800:
+    $@EXP_EVENT=rand(110, 115);
+    if ($@EXP_EVENT > 111 && $@EXP_EVENT != 115)
+        $@EXP_EVENT=rand(110, 115);
+    donpcevent "@exprate::OnPlayerCall";
+    end;
+
 OnSun0000:
     disablenpc .name$;
     end;
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt
index fc0af91fe..07e0eaf19 100644
--- a/npc/commands/rate-management.txt
+++ b/npc/commands/rate-management.txt
@@ -79,9 +79,8 @@ OnPlayerCall:
     if (.max_hours > 0 || .hours > 0)
         end;
     // $@EXP_EVENT will determine the boost and shall NEVER be above 20%
-    if ($@EXP_EVENT <= 0 || $@EXP_EVENT > 120) {
-        announce "##1##BSEVERE ERROR: Misformatted command, $@EXP_EVENT cannot be over 20% bonus and must be valid.", bc_all;
-    }
+    $@EXP_EVENT=max(0, min(120, $@EXP_EVENT));
+
     .hours = 0;
     .max_hours = 1; // Always one hour - never more than that
     .current_rate = $@EXP_EVENT;