Replace makepot with Transmigration/Transmutation general spell (TODO/WIP)

6 files changed, 17 insertions, 25 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 48a778a59..9f27d3aa4 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38532,8 +38532,8 @@ skill_db: (
 },
 {
 	Id: 20027
-	Name: "TMW2_MKPOT"
-	Description: "Make Potion"
+	Name: "TMW2_TRANSMIGRATION"
+	Description: "Transmutation"
 	MaxLevel: 20
 	SkillType: {
 		Self: true
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 4bd4d4793..bf1308ae2 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -47,7 +47,7 @@ Human: {
 		TMW2_ZARKOR: 3
 		TMW2_PARUM: 0
 		TMW2_KALMURK: 4
-		TMW2_MKPOT: 20
+		TMW2_TRANSMIGRATION: 20
 		TMW2_DEMURE: 15
 		TMW2_DRAGOKIN: 5
 		TMW2_LIMERIZER: 5
diff --git a/npc/003-0-1/audsbel.txt b/npc/003-0-1/audsbel.txt
index 8964202ad..b5ad4e4a0 100644
--- a/npc/003-0-1/audsbel.txt
+++ b/npc/003-0-1/audsbel.txt
@@ -250,13 +250,13 @@ L_Magic:
         mesn;
         mesq l("Hmm, I think I can teach you a basic Mana Skill now. This one is more advanced, though.");
         next;
-        skill(TMW2_MKPOT,1,0);
+        skill(TMW2_TRANSMIGRATION,1,0);
         setq General_Auldsbel, 5;
         mesn;
-        mesq l("This is the @@ skill. It transmutes @@ @@ and a single @@ in @@.", "##B@sk-mkpot##b", 10, getitemlink(Plushroom), getitemlink(Milk), getitemlink(HastePotion));
+        mesq l("This is the @@ skill. It transmutes stuff into other stuff. I'll teach you some more recipes as class drag on.", "##B@sk-trans##b");
         next;
         mesn;
-        mesq l("It may fail, and you might end up with something entirely unexpected!");
+        mesq l("It may fail, and you might end up with something entirely unexpected, or nothing at all!");
         next;
         mesn;
         mesq l("Unlike Parum, you can use the skill points you get every time your job level rises. That will lower the mana cost and increase success chances.");
diff --git a/npc/items/books.txt b/npc/items/books.txt
index bafb5be07..918a87ccd 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -207,8 +207,8 @@ OnInit:
                         mesc l("Summon Maggot - @sk-kalmurk");
                     if (getskilllv(TMW2_PARUM))
                         mesc l("Wood Manipulation - @sk-parum");
-                    if (getskilllv(TMW2_MKPOT))
-                        mesc l("Make Potion - @sk-mkpot");
+                    if (getskilllv(TMW2_TRANSMIGRATION))
+                        mesc l("Transmutation - @sk-trans");
                     if (getskilllv(TMW2_DEMURE))
                         mesc l("Divine Rage - @sk-demure");
                     if (getskilllv(TMW2_DRAGOKIN))
diff --git a/npc/magic/mkpot.txt b/npc/magic/transmigration.txt
index 576de7ebc..4e45d8510 100644
--- a/npc/magic/mkpot.txt
+++ b/npc/magic/transmigration.txt
@@ -1,22 +1,14 @@
 // TMW2 script
 // Author: Jesusalva <admin@tmw2.org>
 //
-// Magic Script: TMW2_MKPOT
+// Magic Script: TMW2_TRANSMIGRATION
 //
-// Attempts to make a haste potion from Mouboo Milk and Plushroom.
-// May make sewer water on failure.
-// TODO: Using too much transmutation magic may have dire consequences! Like, uh, transmutating your head!
-// Nah, it is probably just propaganda... I hope. ¬.¬
+// Attempts to make stuff from other stuff
+// This is actually referred as transmutation in human-readable forms, and
+// transmigration in scripts.
 
 -	script	sk#mkpot	32767,{
     end;
-
-/*
-OnFriendlyDeath:
-    emote 4;
-    end;
-*/
-
 OnCall:
     // Other requeriments
     if (countitem(Plushroom) < 10 || !countitem(Milk)) {
@@ -31,7 +23,7 @@ OnCall:
     }
 
     // Check requisites
-    if (!MagicCheck(TMW2_MKPOT, 185, -5))
+    if (!MagicCheck(TMW2_TRANSMIGRATION, 185, -5))
         end;
 
     // Consume items
@@ -42,7 +34,7 @@ OnCall:
     // The closer to zero, best;
     // Each 3 mexp reduces chance to get a fail
     // Each skill level reduces chances to get a fail
-    .@r=rand(141,181)-(MAGIC_EXP/3)-getskilllv(TMW2_MKPOT);
+    .@r=rand(141,181)-(MAGIC_EXP/3)-getskilllv(TMW2_TRANSMIGRATION);
     if (.@r < 21) {
             // Get up to 6 Haste Potions depending on your skill.
             getitem HastePotion, abizit()+1;
@@ -61,10 +53,10 @@ OnCall:
     @mkpot_at=@mkpot_at+6;
 
     // Get a few mana experience points (this is NOT used by Mana Stone)
-    GetManaExp(TMW2_MKPOT, rand(4,11));
+    GetManaExp(TMW2_TRANSMIGRATION, rand2(4,11));
     end;
 
 OnInit:
-    bindatcmd "sk-mkpot", "sk#mkpot::OnCall", 0, 100, 0;
+    bindatcmd "sk-trans", "sk#mkpot::OnCall", 0, 100, 0;
     end;
 }
diff --git a/npc/scripts.conf b/npc/scripts.conf
index a4ab72b4a..ab3194008 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -120,7 +120,7 @@
 "npc/magic/kalspike.txt",
 "npc/magic/kalwulf.txt",
 "npc/magic/limerizer.txt",
-"npc/magic/mkpot.txt",
+"npc/magic/transmigration.txt",
 "npc/magic/parum.txt",
 "npc/magic/plantkingdom.txt",
 "npc/magic/stoneheart.txt",