Remove old class skills, add new skill 20010 TMW2_SKILLPERMIT (unused)

3 files changed, 18 insertions, 26 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 5b349c0ce..682cb9675 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38424,17 +38424,8 @@ skill_db: (
 },
 {
 	Id: 20010
-	Name: "MAGIC_WARRIOR"
-	Description: "Magic Warrior"
-	MaxLevel: 5
-	SkillType: {
-		Passive: true
-	}
-},
-{
-	Id: 20011
-	Name: "WIZARD_MAGE"
-	Description: "Wizard Mage"
+	Name: "TMW2_SKILLPERMIT"
+	Description: "Skill Permit"
 	MaxLevel: 5
 	SkillType: {
 		Passive: true
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 47d863694..4bd4d4793 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -31,6 +31,7 @@ Human: {
 		NV_BASIC: 0
 		TMW2_FAKESKILL: 0
 		TMW2_FAKESKILL2: 0
+		TMW2_SKILLPERMIT: 0
 		TMW2_CRAFT: 0
 		TMW2_ANCIENTLANGUAGES: 0
 		TMW2_SPEECH: 0
diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt
index 882ffeead..3c0fd60db 100644
--- a/npc/003-0/luca.txt
+++ b/npc/003-0/luca.txt
@@ -10,13 +10,13 @@
     mesq l("I am the @@ master.", l("Magic Warriors"));
     if (!MAGIC_LVL) goto L_NoMagic;
     if (getskilllv(WIZARD_MAGE) && !is_admin()) close;
-    if (getskilllv(MAGIC_WARRIOR) == 0) goto L_SignUp;
+    if (getskilllv(TMW2_SKILLPERMIT) == 0) goto L_SignUp;
 
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER >= 1) goto L_T2_S0;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER >= 1) goto L_T2_S0;
 
     // Sanity check
-    if (getskilllv(MAGIC_WARRIOR) >= 1) {
+    if (getskilllv(TMW2_SKILLPERMIT) >= 1) {
         mesn;
         mesq l("The Warriors have three other subclasses:");
         mesn lg("Paladin");
@@ -81,7 +81,7 @@ L_JoinReq:
 L_Tier1Ok:
     // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
     skill(SM_BASH,1,0);
-    skill(MAGIC_WARRIOR,1,0);
+    skill(TMW2_SKILLPERMIT,1,0);
     mes "";
     mesn;
     mesq l("Here, learn this awesome skill. It is on the skills tab. You can drag it to the shortcut list. Use it to protect people!");
@@ -199,21 +199,21 @@ L_T2_Fail:
     close;
 
 L_T2_S0:
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) goto L_T2_S1;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) goto L_T2_S1;
     if (gettimetick(2) > QUEST_ELEVARTEMPO) goto L_T2_Fail;
 
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 2) goto L_T2_S2;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 3) goto L_T2_S3;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 4) goto L_T2_S4;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 5) goto L_T2_S5;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 6) goto L_T2_S6;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER <= 9) goto L_T2_S7;
-    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 10) goto L_T2_Final;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 2) goto L_T2_S2;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 3) goto L_T2_S3;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 4) goto L_T2_S4;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 5) goto L_T2_S5;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 6) goto L_T2_S6;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER <= 9) goto L_T2_S7;
+    if (getskilllv(TMW2_SKILLPERMIT) == 1 && MAGIC_LVL >= 2 && ST_TIER == 10) goto L_T2_Final;
     mesc l("Error, error, L_T2_S0 General Error, REPORT ME");
     close;
 
 L_T2_S1:
-    //MAGIC_WARRIOR l("Magic Warriors") WIZARD_MAGE
+    //TMW2_SKILLPERMIT l("Magic Warriors") WIZARD_MAGE
     mes "";
     mesn;
     mesq l("So, young disciple! I wish I could just chant some gibberish words and that automatically granted you more skills, but alas, that won't work.");
@@ -344,7 +344,7 @@ L_T2_S7:
 L_T2_Final:
     skill(NV_TRICKDEAD,1,0);
     skill(SM_PROVOKE, 1, 0);
-    addtoskill(MAGIC_WARRIOR,2,0);
+    addtoskill(TMW2_SKILLPERMIT,2,0);
     getexp 40000, 0; // Yes, 40k experience points. Waw.
     mesc l(".:: Congratulations! ::."), 2;
     mesc l("You advanced your tier!"), 2;