Refactor transmigration logic (not perfect)

1 files changed, 24 insertions, 6 deletions

diff --git a/npc/magic/transmigration.txt b/npc/magic/transmigration.txt
index f16f85469..7f7cd8dc9 100644
--- a/npc/magic/transmigration.txt
+++ b/npc/magic/transmigration.txt
@@ -39,21 +39,24 @@ OnCall:
             l("Downgrade Ore"), IronOre;
 
         mes "";
+        @menuret = (@menuret == WoodenLog ? 9901 : @menuret);
         .@itemid=(@menuret == 9901 ? Coal : @menuret);
         mesc l("Transmutating @@ will require:", getitemlink(@menuret));
 
         // Requeriments listing
         switch (@menuret) {
         case CrazyRum:
-            mesc l("* @@/@@ @@", countitem(Plushroom), 10, getitemlink(Plushroom));
-            mesc l("* @@/@@ @@", countitem(Milk), 3, getitemlink(Milk));
+            mesc l("* @@/@@ @@", countitem(Plushroom), 18, getitemlink(Plushroom));
+            mesc l("* @@/@@ @@", countitem(Milk), 5, getitemlink(Milk));
             break;
         case 9901: // This is coal
-            mesc l("* @@/@@ @@", countitem(WoodenLog), 5, getitemlink(WoodenLog));
+            mesc l("* @@/@@ @@", countitem(WoodenLog), 6, getitemlink(WoodenLog));
             break;
         case MoubooFigurine:
             mesc l("* @@/@@ @@", countitem(WoodenLog), 1, getitemlink(WoodenLog));
             break;
+        case MountainSnakeSkin:
+        case CaveSnakeSkin:
         case SnakeSkin:
             menuint
             l("Black Mamba Skin -> Mountain Snake Skin"), MountainSnakeSkin,
@@ -61,6 +64,8 @@ OnCall:
             l("Snake Skin -> Cave Snake Skin"), CaveSnakeSkin,
             l("Cancel");
             break;
+        case MountainSnakeEgg:
+        case CaveSnakeEgg:
         case SnakeEgg:
             menuint
             l("Black Mamba Egg -> Mountain Snake Egg"), MountainSnakeEgg,
@@ -68,6 +73,8 @@ OnCall:
             l("Snake Egg -> Cave Snake Egg"), CaveSnakeEgg,
             l("Cancel");
             break;
+        case MountainSnakeTongue:
+        case CaveSnakeTongue:
         case SnakeTongue:
             menuint
             l("Black Mamba Tongue -> Mountain Snake Tongue"), MountainSnakeTongue,
@@ -75,12 +82,15 @@ OnCall:
             l("Snake Tongue -> Cave Snake Tongue"), CaveSnakeTongue,
             l("Cancel");
             break;
+        case RedScorpionStinger:
         case ScorpionStinger:
             menuint
             l("Black Scorpion Stinger -> Red Scorpion Stinger"), RedScorpionStinger,
             l("Red Scorpion Stinger -> Scorpion Stinger"), ScorpionStinger,
             l("Cancel");
             break;
+        case BlackScorpionClaw:
+        case RedScorpionClaw:
         case ScorpionClaw:
             menuint
             l("Golden Scorpion Claw -> Black Scorpion Claw"), BlackScorpionClaw,
@@ -88,6 +98,14 @@ OnCall:
             l("Red Scorpion Claw -> Scorpion Claw"), ScorpionClaw,
             l("Cancel");
             break;
+        case IridiumOre:
+        case TitaniumOre:
+        case LeadOre:
+        case TinOre:
+        case GoldOre:
+        case SilverOre:
+        case CopperOre:
+        case Coal:
         case IronOre:
             menuint
             l("Platinum Ore -> Iridium Ore"), IridiumOre,
@@ -122,7 +140,7 @@ OnCall:
     // Check and Consume the reagents
     switch (@menuret) {
         case CrazyRum:
-            if (!transcheck(Plushroom, 10, Milk, 3)) {
+            if (!transcheck(Plushroom, 18, Milk, 5)) {
                 dispbottom l("Not enough items!");
                 end;
             }
@@ -134,7 +152,7 @@ OnCall:
             }
             break;
         case 9901: // Coal cheat code
-            if (!transcheck(WoodenLog, 5)) {
+            if (!transcheck(WoodenLog, 6)) {
                 dispbottom l("Not enough items!");
                 end;
             }
@@ -310,7 +328,7 @@ OnCall:
     // You were successful
     } else {
         dispbottom l("*plim*");
-        getitem @menuret, 1;
+        getitem @menuret, (@menuitem == MoubooFigurine ? 1 : 2);
     }
 
     // Store to memory