Update the learning references for betsanc and asorm

4 files changed, 55 insertions, 40 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index d8b1323a..b312ed22 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -38960,8 +38960,14 @@ skill_db: (
 	Name: "SKILL_BETSANC"
 	Description: "Betsanc"
 	MaxLevel: 9
+	Range: 9
 	SkillType: {
-		Self: true
+		Friend: true
+	}
+	Hit: "BDT_SKILL"
+	AttackType: "Magic"
+	DamageType: {
+		NoDamage: true
 	}
 	SkillInfo: {
 		Quest: true
@@ -38979,8 +38985,14 @@ skill_db: (
 	Name: "SKILL_ASORM"
 	Description: "Asorm"
 	MaxLevel: 9
+	Range: 9
 	SkillType: {
-		Self: true
+		Friend: true
+	}
+	Hit: "BDT_SKILL"
+	AttackType: "Magic"
+	DamageType: {
+		NoDamage: true
 	}
 	SkillInfo: {
 		Quest: true
diff --git a/npc/006-1/spirit.txt b/npc/006-1/spirit.txt
index 896033fc..1cb0aa74 100644
--- a/npc/006-1/spirit.txt
+++ b/npc/006-1/spirit.txt
@@ -45,14 +45,14 @@ L_Next:
         "Whatever it is, I'm not interested.", L_close;
 
 L_Next1:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"I'm an earth spirit; my name isn't important... all that matters is that I like you, and that I will help you become a powerful wizard if you help me. Just a fair deal, no more than that...\"";
     next;
     MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_KNOWS_IMP;
     goto L_Main;
 
 L_wb:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"It's excellent to see you again!\"";
     next;
     goto L_Main;
@@ -65,13 +65,13 @@ L_Main:
         "Goodbye!", L_close;
 
 L_Q_trapped:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Oh, a wicked witch grew jealous of my power and locked me up in this well.\"";
     next;
     goto L_Main;
 
 L_Q:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Stop bothering me with your questions, will you?  I'm trying to make you a powerful wizard, after all!\"";
     next;
     goto L_Main;
@@ -82,10 +82,10 @@ L_Q_magic:
     if (@Q_status == @Q_STATUS_STUDENT1) goto L_Q_magic_3;
     if (@Q_status == @Q_STATUS_STUDENT2) goto L_Q_magic_4;
 
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Good, good... that's the right attitude!  Yes, I can teach you magic, but first you must prove that you are worthy to be my student!\"";
     next;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"North-east of here sits and old, dead tree. Well, not completely dead, not yet, but almost. It's nothing special. Well, maybe a little, but not really. I want you to cut off one of its branches.\"";
     next;
     menu
@@ -94,7 +94,7 @@ L_Q_magic:
         "Why that particular tree?", L_Next2;
 
 L_Next2:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Oh, you and your questions!  Well, that tree was a druid once, so the branches contain a bit of its lifeforce. And that's useful.\"";
     next;
     menu
@@ -103,10 +103,10 @@ L_Next2:
         "Isn't that like cutting off someone's arm?", L_Next3;
 
 L_Next3:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Oooh... now come on!  Don't be so sentimental. He turned himself into a tree, he can hardly expect everyone to leave him alone.\"";
     next;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Who knows if he can even feel anything anymore?  I'm sure he can't, being wooden and all. Besides, it's only a measly tree. Not like I'm asking you to cut him down!.\"";
     next;
     menu
@@ -114,7 +114,7 @@ L_Next3:
         "Alright, that makes sense.", L_Q_tree_ok;
 
 L_Q_tree_ok:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Good, good, good!  Yes, that will be very good!  So, come back when you have the branch. Oh, and bring 100,000 GP, too, as an enrollment fee.\"";
     @Q_status = @Q_STATUS_ONQUEST;
     callsub S_Update_Var;
@@ -123,7 +123,7 @@ L_Q_tree_ok:
     goto L_Main;
 
 L_Q_magic_1:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Yes, yes, if you bring me the branch and the money, then I will!\"";
     next;
     menu
@@ -140,10 +140,10 @@ L_Next4:
 
     Zeny = Zeny - 100000;
     delitem "DruidTreeBranch", 1;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "Following the earth sprite's instructions, you throw branch and GP into the well.";
     next;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Well done, very well done!  Consider yourself my student now.\"";
     @SUP_xp = 5000;
     @SUP_lvl = 2;
@@ -162,7 +162,7 @@ L_Q_magic_finish:
     goto L_Main;
 
 L_Q_magic_2:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Yes, of course!  For just 20,000 GP I will teach you your first spell!\"";
     next;
     menu
@@ -173,15 +173,15 @@ L_Next5:
     if (Zeny < 20000) goto L_No20k;
 
     Zeny = Zeny - 20000;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Kekeke... excellent!  Yes, here goes your first spell, the flying backpack!  If you are overloaded, it will take the load off your shoulders.\"";
     next;
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Take a cocoon, living or dead, and suffuse it in magic. Whisper '" + get(.invocation$, "flying-backpack") + "', and feel it float!\"";
     goto L_Q_magic_finish;
 
 L_Q_magic_3:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"But yes, yes!  Only 20,000 GP, once again, and I will teach you a far more useful spell!\"";
     next;
     menu
@@ -191,70 +191,71 @@ L_Q_magic_3:
 L_Next6:
     if (Zeny < 20000) goto L_No20k;
     Zeny = Zeny - 20000;
-    mes "[Earth Spirit]";
-    mes "\"Yeees, good!  This one is a protection spell, making your skin harder. You need a hard spike for it, though. Hold that spike in your hands, and focus on it.\"";
+    mesn l("Earth Spirit");
+    mesq l("Yeees, good!  This one is a protection spell, making your skin harder. You need a hard spike for it, though. Hold that spike in your hands, and focus on it.");
     next;
-    mes "[Earth Spirit]";
-    mes "\"Next, say '" + get(.invocation$, "protect") + "', and feel your skin grow rigid!  Very useful against stings and stabs and pokes and pricks and that sort of stuff.\"";
+    mesn l("Earth Spirit");
+    mesq l("Next, say '%s', and feel your skin grow rigid! Very useful against stings and stabs and pokes and pricks and that sort of stuff. Lowers attack speed and only works on yourself, party, or guild allies, though.", b("betsanc"));
+    learnskill SKILL_BETSANC;
     goto L_Q_magic_finish;
 
 L_Q_magic_4:
-    mes "[Earth Spirit]";
-    mes "\"Naah, you're too weak now!  Come back later when you have grown!\"";
+    mesn l("Earth Spirit");
+    mesq l("Naah, you're too weak now!  Come back later when you have grown!");
     next;
     goto L_Main;
 
 L_No20k:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"You can't pay me 20,000 if you don't have that much!\"";
     next;
     goto L_Main;
 
 L_Q_tree_none:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Where is your branch?\"";
     next;
     goto L_Main;
 
 L_Q_tree_dry:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"That won't do. This branch is completely dead; you'll have to get another.\"";
     next;
     goto L_Main;
 
 L_Q_tree_nomoney:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"No, you don't have enough money!  Come back when you have 100,000.\"";
     next;
     goto L_Main;
 
 L_Q_tree_howmuch:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"It's only 100,000 GP to become my student.\"";
     next;
     goto L_Main;
 
 L_Q_tree_how:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Oh... right, the tree might be protected. Only a bone knife will cut that. No idea where you can find one, but I'm sure you will manage!\"";
     next;
     goto L_Main;
 
 L_Q_tree_where:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"North-east of here.\"";
     next;
     goto L_Main;
 
 L_Q_tree_what:
-    mes "[Earth Spirit]";
+    mesn l("Earth Spirit");
     mes "\"Just some silly druid who turned himself into a tree; nothing important.\"";
     next;
     goto L_Main;
 
 L_silly_close:
     if (MAGIC_FLAGS & MFLAG_KNOWS_IMP)
-        mes "[Earth Spirit]";
+        mesn l("Earth Spirit");
     if (!(MAGIC_FLAGS & MFLAG_KNOWS_IMP))
         mes "[Well]";
     mes "\"Fool.\"";
diff --git a/npc/013-1/sagatha.txt b/npc/013-1/sagatha.txt
index 460dcb7f..12251532 100644
--- a/npc/013-1/sagatha.txt
+++ b/npc/013-1/sagatha.txt
@@ -280,8 +280,8 @@ L_Teach_A10:
     mesq l("To protect against others' magic, take a small mushroom from a shady place. Mushrooms draw things out of the earth. Rub your mushroom into pieces between your hands.");
     next;
     mesn .@n$;
-    mesq l("Then say %s and let the mushroom's power take over.", b("betsanc"));
-    learnskill EVOL_PHYSICAL_SHIELD, 1;
+    mesq l("Then say %s and let the mushroom's power take over. It only works on yourself, party or guild allies.", b("asorm"));
+    learnskill SKILL_ASORM;
     goto L_practice;
 
 L_Teach_A11:
@@ -309,10 +309,10 @@ L_Teach_N11:
         goto L_Teach_noexp;
     mesn .@n$;
     mesq l("You can harden your skin with a hard spike. Hold it in your hands and speak '%s', then draw its hardness into your skin, or the skin of someone's else.", b("betsanc"));
-    learnskill EVOL_PHYSICAL_SHIELD;
+    learnskill SKILL_BETSANC;
     next;
     mesn .@n$;
-    mesq l("You can also remove this spell from yourself if you say '" + get(.invocation$, "antiprotect") + "'.");
+    mesq l("Keep in mind this spell only works on yourself or party/guild companions. It will reduce your attack speed so keep this in mind.");
     goto L_practice;
 
 L_Teach_noexp:
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index 9c8bcbb0..c9a4f37e 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -455,7 +455,6 @@ L_AddAll:
     updateskill SKILL_MAGIC_DARK, 5;
 
     // Real skills
-    learnskill EVOL_PHYSICAL_SHIELD, 1;
     learnskill SKILL_CONFRINGO, 1;
     learnskill SKILL_ABIZIT, 1;
     learnskill SKILL_MONSTERINFO, 1;
@@ -474,6 +473,8 @@ L_AddAll:
     learnskill SKILL_HALHISS, 1;
     learnskill SKILL_HELORP, 1;
     learnskill SKILL_KAFLOSH, 1;
+    learnskill SKILL_BETSANC, 1;
+    learnskill SKILL_ASORM, 1;
     resetstatus;
     BaseLevel = 99;
     mes "All skills added to their maximum level.";
@@ -501,9 +502,10 @@ L_ResetAll:
     updateskill SKILL_MAGIC_NATURE, 0;
     updateskill SKILL_MAGIC_ASTRAL, 0;
     updateskill SKILL_MAGIC_DARK, 0;
+    learnskill SKILL_BETSANC, 0;
+    learnskill SKILL_ASORM, 0;
 
     // Real skills
-    updateskill EVOL_PHYSICAL_SHIELD, 0;
     updateskill SKILL_CONFRINGO, 0;
     updateskill SKILL_ABIZIT, 0;
     updateskill SKILL_MONSTERINFO, 0;