Merge branch 'master' into testserver

1 files changed, 78 insertions, 1 deletions

diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 32041adfe..59098ee15 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -286,6 +286,7 @@ function	script	clientupdater	{
     // seg jul 15 16:41:35 -03 2019
     if (UPDATE < 1563219695) {
         UPDATE=1563219695;
+        .@dg=true;
         // You got recipe book by BSS Quest - mark as complete and get Blueprint
         if (getq(NivalisQuest_BlueSageSlimes) == 2) {
             getitem any(AncientBlueprint, AlchemyBlueprintA, EquipmentBlueprintA), 1;
@@ -298,7 +299,83 @@ function	script	clientupdater	{
         // If you have TMW2_CRAFT skill, you need the bonus recipe
         if (getskilllv(TMW2_CRAFT)) {
             RECIPES_EQUIPMENT[CraftDagger]=true;
-            dispbottom l("Dagger Crafting recipe learnt.");
+            mesc l("Dagger Crafting recipe learnt.");
+        }
+        // Mercenary Rank removed
+        if (MERC_RANK) {
+            THIEF_RANK=MERC_RANK;
+            MERC_RANK=0;
+            mesc 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);
+            skill ALL_INCCARRY, 0, 0;
+            mesc l("Increase Weight skill replaced with Stealing.");
+        }
+        // NEW MAGIC SYSTEM
+        if (getskilllv(SN_SHARPSHOOTING)) {
+            skill AC_CHARGEARROW, getskilllv(SN_SHARPSHOOTING);
+            skill AC_CHARGEARROW, 0, 0;
+            getexp 2000, 150;
+            mesc l("Sharpshooting skill replaced with Charged Arrow.");
+            mesc l("You've got 2000 xp and 150 job xp in apology tokens.");
+        }
+        getskilllist();
+        for (.@i=0; .@i < @skilllist_count; .@i++) {
+            // skip temporary skills
+            if (@skilllist_flag[.@i] != 0)
+                continue;
+            // Only “paid” skills will result in a Scholarship Badge
+            switch (@skilllist_id[.@i]) {
+                case SM_BASH:
+                case SM_ENDURE:
+                case KN_AUTOCOUNTER:
+                case KN_TWOHANDQUICKEN:
+                case TMW2_DEMURE:
+                case AL_ANGELUS:
+                case CR_TRUST:
+                case CR_DEFENDER:
+                case AL_HOLYLIGHT:
+                case TF_DETOXIFY:
+                case ALL_RESURRECTION:
+                case MG_SRECOVERY:
+                case SM_RECOVERY:
+                case PR_ASPERSIO:
+                case AB_HIGHNESSHEAL:
+                case SA_FREECAST:
+                case SA_DRAGONOLOGY:
+                case TMW2_SAGE:
+                case SA_FLAMELAUNCHER:
+                case SA_FROSTWEAPON:
+                case SA_LIGHTNINGLOADER:
+                case SA_SEISMICWEAPON:
+                case MG_FIREBALL:
+                case MG_ENERGYCOAT:
+                case MG_NAPALMBEAT:
+                case MG_FIREBOLT:
+                case MG_COLDBOLT:
+                case MG_LIGHTNINGBOLT:
+                case WZ_EARTHSPIKE:
+                    mesc l("A skill has been replaced with an @@.", getitemlink(ScholarshipBadge));
+                    getitem ScholarshipBadge, 1;
+                    skill @skilllist_id[.@i], 0, 0;
+                    getexp 5, (@skilllist_lv[.@i]-1)*1000;
+                    break;
+                // Free skills (AL_HEAL and mass provoke) will result in XP
+                // Only Jakod's skills with level 3+ will result in a badge
+                case AL_HEAL:
+                case EVOL_MASS_PROVOKE:
+                    if (@skilllist_lv[.@i] >= 3)
+                        getitem ScholarshipBadge, 1;
+                case SM_PROVOKE:
+                case NV_TRICKDEAD:
+                    .@delval=@skilllist_lv[.@i];
+                    mesc l("A skill has been removed, you got @@ job exp and @@ Strange Coin as an apology token.", .@delval*100, .@delval);
+                    skill @skilllist_id[.@i], 0, 0;
+                    getexp .@delval, .@delval*100;
+                    getitem StrangeCoin, .@delval;
+                    break;
+            }
         }
         // Cleanup
         deletearray RNGTREASURE_DATE;