improving the debug npc

1 files changed, 34 insertions, 25 deletions

diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt
index 7bb02d71..c6088ad3 100644
--- a/npc/031-1_NivalisPort/angelaOutside.txt
+++ b/npc/031-1_NivalisPort/angelaOutside.txt
@@ -1,9 +1,9 @@
 // author: Jenalya
-// reviewed by: 
+// reviewed by:
 // state0: Angela is to upset to tell you anything, needs a concentration potion
 // state1: got the mission to save Cindy
 // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
-// state greater than 3: Angela invites and asks you to bring present boxes 
+// state greater than 3: Angela invites and asks you to bring present boxes
 
 //TODO: picture
 031-1.gat,79,24,0	script	Angela	154, {
@@ -13,7 +13,7 @@
 
 	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
 
-    if (@rescue_Cindy > 3) goto L_Please_Visit_Again;  
+    if (@rescue_Cindy > 3) goto L_Please_Visit_Again;
 	if (@rescue_Cindy > 1) goto L_Please_Visit;
 	if (@rescue_Cindy == 1) goto L_Please_Help;
 
@@ -24,13 +24,13 @@
 	next;
 
 	if (countitem("ConcentrationPotion") > 0) goto L_Menu_Potion;
-	
+
 	menu
 		"\"Please calm down and tell me what happened.\"", L_Whining,
 		"Leave", -;
-	close; 
+	close;
 
-L_Whining:	
+L_Whining:
 	mes "[Angela]";
 //TODO: add more whining, enough to make it annoying to read it all
 	mes "\"My poor little daugther, please! Oh no, oh no...\"";
@@ -53,13 +53,13 @@ L_Whining:
 	next;
 	mes "\"It seems, she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...\"";
 	close;
-	
-L_Menu_Potion:	
+
+L_Menu_Potion:
 	menu
 		"\"Please calm down and tell me what happened.\"", L_Whining,
-		"Give her a concentration potion.", L_Calm_Down, 
+		"Give her a concentration potion.", L_Calm_Down,
 		"Leave", -;
-	close; 
+	close;
 
 L_Calm_Down:
 	if (countitem("ConcentrationPotion") == 0) goto L_No_Potion;
@@ -69,18 +69,18 @@ L_Calm_Down:
 	mes "\"Thank you, this was helpful.\"";
 	next;
 	mes "\"My daughter Cindy and me were on our way to Santa, to bring him some presents. Many people here in Nivalis are helping Santa with his business.\"";
-	next;	
+	next;
 	mes "\"When we passed the entrance of this cave, a pack of Yetis came out there. It's disturbing, usually, they are very shy.\"";
-	next;	
+	next;
 	mes "\"We tried to run away, but there were to many of them. They took my poor little Cindy and all the presents with them.\"";
-	next;	
+	next;
 	mes "\"Oh my poor little girl. I'm so worried - what might they do with her? Oh no!\"";
-	next;	
-	mes "\"You look like an adventurer! Please, can you go in that cave and rescue my little Cindy? I beg you for help!\"";	
+	next;
+	mes "\"You look like an adventurer! Please, can you go in that cave and rescue my little Cindy? I beg you for help!\"";
 	set @rescue_Cindy, 1;
 	callsub S_Update_Mask;
 	close;
-	
+
 L_No_Potion:
 	mes "You don't have a concentration potion.";
 	close;
@@ -89,21 +89,21 @@ L_Please_Help:
 	mes "[Angela]";
 	mes "\"Please rescue my daughter!\"";
 	close;
-	
-L_Please_Visit:	
+
+L_Please_Visit:
 	mes "[Angela]";
 	mes "\"Thank you so much for rescueing my beloved Cindy. Please come to visit us in our house at the beach.\"";
 	next;
 	mes "\"My husband is an adventurer like you, and I want to give you something he got on his travels to show my gratitude.\"";
 	close;
-	
+
 L_Please_Visit_Again:
 	mes "[Angela]";
 	mes "\"Hello! You are welcome to visit us in our house at the beach everytime. Cindy loves to see you!\"";
 	next;
 	mes "\"If you have found any present boxes, the Yetis took away, please bring them to our house. Usually, the Yetis are very shy... their behavior is a bit odd.\"";
 	close;
-	
+
 S_Update_Mask:
         set QUEST_Nivalis_state,
         	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
@@ -119,9 +119,9 @@ S_Update_Mask:
 	set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
 
 	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
-	
+
 	mes "This menu is for debugging and will be removed";
-	menu 
+	menu
 		"close", L_close,
 		"reset quest", -,
 		"magic", magic;
@@ -140,7 +140,7 @@ magic:
 		set @SUP_xp, 5000;
         set @SUP_lvl, 2;
         callfunc "SkillUp";
-        
+
         // Set up SkillUp function war magic
         set @SUP_id, SKILL_MAGIC_WAR;
         set @SUP_name$, "War Magic";
@@ -148,7 +148,7 @@ magic:
 		set @SUP_xp, 5000;
         set @SUP_lvl, 2;
         callfunc "SkillUp";
-        
+
         // Set up SkillUp function life magic
         set @SUP_id, SKILL_MAGIC_LIFE;
         set @SUP_name$, "Life Magic";
@@ -157,12 +157,21 @@ magic:
         set @SUP_lvl, 2;
         callfunc "SkillUp";
 
+        // Set up SkillUp function life magic
+        set @SUP_id, SKILL_MAGIC_NATURE;
+        set @SUP_name$, "Nature Magic";
+
+		set @SUP_xp, 5000;
+        set @SUP_lvl, 2;
+        callfunc "SkillUp";
+
 	mes "Lightning invocation: " + getspellinvocation("lightning-strike");
 	mes "Flare-dart invocation: " + getspellinvocation("flare-dart");
 	mes "Lesser-heal invocation: " + getspellinvocation("lesser-heal");
 	mes "Lay-on-hands invocation: " + getspellinvocation("lay-on-hands");
+	mes "protect: " + getspellinvocation("protect");
 	close;
-	
+
 S_Update_Mask:
         set QUEST_Nivalis_state,
         	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))