Slimes skills

2 files changed, 138 insertions, 16 deletions

diff --git a/db/pre-re/mob_skill_db.conf b/db/pre-re/mob_skill_db.conf
index b8a4921c..489cd07d 100644
--- a/db/pre-re/mob_skill_db.conf
+++ b/db/pre-re/mob_skill_db.conf
@@ -171,6 +171,128 @@ SKILL_COND2 = {
 }
 
 **************************************************************************/
+	SlimeBlast: {
+		NPC_SELFDESTRUCTION: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 10000
+			CastTime: 100
+			Delay: 500
+			Cancelable: true
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+		}
+	}
+
+	/**********************************************************************/
+	BlueSlime: {
+        // TODO: use NPC_SUMMONMONSTER?
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 1
+			Rate: 8000
+			CastTime: 1200
+			Delay: 18000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELT"
+			ConditionData: 1
+			val0: 1090
+		}
+	}
+
+	/**********************************************************************/
+	WhiteSlime: {
+		NPC_SELFDESTRUCTION: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 10000
+			CastTime: 100
+			Delay: 500
+			Cancelable: true
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+		}
+	}
+
+	/**********************************************************************/
+	SantaSlime: {
+		NPC_EMOTION: {
+			SkillState: "MSS_LOOT"
+			SkillLevel: 1
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			val0: 101
+		}
+		NPC_EMOTION: {
+			SkillState: "MSS_WALK"
+			SkillLevel: 1
+			Rate: 5000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			val0: 5
+		}
+		NPC_EMOTION: {
+			SkillState: "MSS_IDLE"
+			SkillLevel: 1
+			Rate: 5000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			val0: 7
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 5
+			Rate: 10000
+			CastTime: 2000
+			Delay: 60000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 3
+			val0: 1016
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_IDLE"
+			SkillLevel: 5
+			Rate: 10000
+			CastTime: 2000
+			Delay: 60000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 3
+			val0: 1016
+		}
+	}
+
+	/**********************************************************************/
+	GreenSlimeMother: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 8000
+			CastTime: 700
+			Delay: 8000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELT"
+			ConditionData: 2
+			val0: 1110
+		}
+	}
+
+	/**********************************************************************/
+	SeaSlimeMother: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 8000
+			CastTime: 700
+			Delay: 8000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELT"
+			ConditionData: 2
+			val0: 1109
+		}
+	}
 
 }
 )
diff --git a/npc/013-2/wizard.txt b/npc/013-2/wizard.txt
index 45d1c2e8..85704b5e 100644
--- a/npc/013-2/wizard.txt
+++ b/npc/013-2/wizard.txt
@@ -12,13 +12,13 @@ L_Deliver:
         "I have a delivery for you", L_Delivery;
 
 L_Delivery:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Good now I can get to work on some stronger brew..\"";
     QL_KYLIAN = 14;
     goto L_close;
 
 L_Start:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Welcome, dear wanderer! Come into my humble home. Take a rest, eat and drink.\"";
     next;
     menu
@@ -27,17 +27,17 @@ L_Start:
         "Oh, shut up!", L_ShutUp;
 
 L_TeachRude:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"I certainly could, but I already have an apprentice.\"";
     goto L_close;
 
 L_ShutUp:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"That attitude isn't going to get you very far, my dear.\"";
     goto L_close;
 
 L_Thanks:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Behind this door, my apprentice will serve you.\"";
     next;
     if (@has_magic)
@@ -50,12 +50,12 @@ L_Thanks:
         "Your apprentice? ... No thanks.", L_Decline;
 
 L_Decline:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Goodbye, then!\"";
     goto L_close;
 
 L_NewStudent:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Studying is always an excellent use of one's mind! I fear that I can't offer too much assistance to you, however. But if you are interested, I could perhaps teach you a simple spell?\"";
     next;
 
@@ -70,26 +70,26 @@ L_NewStudent:
         "No, but thank you!", L_Decline;
 
 L_TeachSpell:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"This one may not seem too powerful, but it can be quite handy; it's the 'hide' spell. It will shield you from some forms of detection magic.\"";
     next;
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Put a piece of cotton cloth on your head, and speak out '" + get(.invocation$, "spell-hide") + "', loudly and clearly. The protection lasts quite long, but you may have to renew it on occasion.\"";
     next;
-    mes "[Old Wizard]";
+    mesn;
     mes "\"You can also cast it on others, of course. Just speak their name after you pronounce the invocation.\"";
     next;
-    mes "[Old Wizard]";
+    mesn;
     mes "\"You may find it useful for getting a little peace and quiet at times, but it can also get in the way of friends trying to find you, so use it with care.\"";
     next;
     if (getskilllv(SKILL_MAGIC_ASTRAL) >= 2)
         goto L_close;
-    mes "[Old Wizard]";
+    mesn;
     mes "\"I'm not sure if you are experienced enough to cast it yet, though. You may need to first learn astral magic.\"";
     goto L_close;
 
 L_AstralSoul:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Oh yes, there are lots of ways to improve your magic. Skills -some people say mental focus for that- are another way to improve your magic. Of course learning more and more spells is also a need for good mages.\"";
     next;
     mes "\"I can teach you the ability to focus on magical stuff.\"";
@@ -103,7 +103,7 @@ L_Next:
     if (countitem("Pearl") < 1 || countitem("Acorn") < 100) goto L_NotEnough;
     delitem "Pearl", 1;
     delitem "Acorn", 100;
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Okay, listen:\"";
     next;
     mes "\"Some parts of your brain is still unused. These parts will now get the ability to get focused to magic.\"";
@@ -123,14 +123,14 @@ L_Next:
     goto L_close;
 
 L_NotEnough:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Please learn to count.\"";
     next;
     mes "\"When you are done with that, come back again.\"";
     goto L_close;
 
 L_Agree:
-    mes "[Old Wizard]";
+    mesn;
     mes "\"Beware the flying notes though, some of them are really dangerous. I haven't been able to persuade them to get back into their book. And avoid the mirror, it's been acting strange lately.\"";
     next;
     mes "\"Oh, and please don't take my apprentice too seriously. He still has a lot to learn.\"";