From 7c9f31a5156d56638592844b33d5f9360758af6a Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 25 Jul 2019 23:25:48 -0300
Subject: Transfer ALL_INCCARRY to Trickmaster. Updater: Remove Merchant Police

---
 npc/003-0/trickmaster.txt       |  5 +++++
 npc/functions/clientversion.txt | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt
index 19c590955..f8b3a8110 100644
--- a/npc/003-0/trickmaster.txt
+++ b/npc/003-0/trickmaster.txt
@@ -19,6 +19,7 @@
         "freecast", SA_FREECAST,
         "backslide", TF_BACKSLIDING,
         "firewall", MG_FIREWALL,
+        "inccarry", ALL_INCCARRY,
         "fullthrottle", ALL_FULL_THROTTLE,
         "darkillusion", GC_DARKILLUSION,
         "trickdead", NV_TRICKDEAD,
@@ -40,6 +41,10 @@
             if (!mlearn(MG_FIREWALL, 10, 1, Lockpicks, 1))
                 mesc l("You do not meet all requisites for this skill."), 1;
             break;
+        case ALL_INCCARRY:
+            if (!mlearn(ALL_INCCARRY, 2, 1, Lockpicks, 1))
+                mesc l("You do not meet all requisites for this skill."), 1;
+            break;
         case ALL_FULL_THROTTLE:
             if (!mlearn(ALL_FULL_THROTTLE, 1, 1, Lockpicks, 1))
                 mesc l("You do not meet all requisites for this skill."), 1;
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 98dc820c1..fdc6b7bc3 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -288,6 +288,17 @@ function	script	clientupdater	{
             RECIPES_EQUIPMENT[CraftDagger]=true;
             dispbottom l("Dagger Crafting recipe learnt.");
         }
+        // Mercenary Rank removed
+        if (MERC_RANK) {
+            THIEF_RANK=MERC_RANK;
+            MERC_RANK=0;
+            dispbottom l("Your class has been changed from %s to %s.", b(l("Merchant Police")), b(l("Thief")));
+        }
+        if (getskilllv(ALL_INCCARRY)) {
+            skill TF_STEAL, getskilllv(ALL_INCCARRY);
+            setskill ALL_INCCARRY, 0;
+            dispbottom l("Increase Weight skill replaced with Stealing.");
+        }
         // Cleanup
         deletearray RNGTREASURE_DATE;
     }
-- 
cgit v1.2.3-70-g09d2