Pre-planned level 0 spells all available (except for 'make sulphur' and 'detect magic')

1 files changed, 30 insertions, 5 deletions

diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt
index 9e8dad92..ede2d474 100644
--- a/npc/functions/mob_points.txt
+++ b/npc/functions/mob_points.txt
@@ -5,13 +5,13 @@ function	script	MobPoints	{
 
 	setarray @points,
 		1, // Maggot
-		2, // Scorpion
-		20, // Red Scorpion
+		2, // Scorpion		[1003]
+		20, // Red Scorpion	[1004]
 		10, // Green Slime
 		30, // Giant Maggot
 		15, // Yellow Slime
 		25, // Red Slime
-		45, // Black Scorpion
+		45, // Black Scorpion	[1009]
 		50, // Snake
 		4, // Fire Goblin
 		55, // Spider
@@ -22,7 +22,7 @@ function	script	MobPoints	{
 		2, // Bat
 		16, // Pinkie
 		17, // Shroom
-		14, // Fluffy
+		14, // Fluffy		[1020]
 		25, // Cave Snake
 		100, // Jack-O
 		80, // Fire Skull
@@ -30,7 +30,7 @@ function	script	MobPoints	{
 		20, // Stumpy
 		70, // Mountain Snake
 		15, // Easter Fluffy
-		40, // Mouboo
+		40, // Mouboo		[1028]
 		0, // Mauve Plant
 		0, // Gamboge Plant
 		0, // Cobalt Plant
@@ -38,5 +38,30 @@ function	script	MobPoints	{
 		20, // Sea Slime
 		0; // Silk Worm
 
+
 	if (MPQUEST == 1) set Mobpt, Mobpt + @points[@mobID - 1002];
+
+	if ((@mobID == 1003) || (@mobID == 1004) || (@mobID == 1009))
+		goto L_good;
+
+
+	// Attitude adjustment for the witch (can we refactor this to another function?  Not sure about max. recursion depth)
+
+	set @value, 0;
+	if (@mobID == 1028)
+		set @value, 4;
+	if (@mobID == 1020)
+		set @value, 3;
+
+	if (@value == 0)
+		goto L_end;
+
+	callfunc "QuestSagathaAnnoy";
+	goto L_end;
+
+L_good:
+	set @value, 1;
+	callfunc "QuestSagathaHappy";
+L_end:
+        set @value, 0;
 }