From a22f523b8eedb27dd0a5d0d85124079588ff9431 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 16 Feb 2020 12:21:35 -0300
Subject: Stoneheart - Deprecate @sk-command, merge with other magiscripts

---
 npc/functions/hub.txt | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

(limited to 'npc/functions')

diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 0d0c297ac..fbb024f10 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -211,18 +211,35 @@ function	script	HUB_SkillInvoke	{
         //case TMW2_SPEECH:
             UserCtrlPanel();
             break;
-        case TMW2_ZARKOR:
-            SK_zarkor();
-            break;
         case TMW2_PARUM:
             SK_parum();
             break;
+        // Highly complex summons
+        case TMW2_ZARKOR:
+            SK_zarkor();
+            break;
+        // Less complex summons
         case TMW2_KALMURK:
             SK_summon(Maggot, 2, any(1,2));
             break;
+        case TMW2_KALWULF:
+            SK_summon(Wolvern, 4, any(3,4));
+            break;
+        case TMW2_KALBOO:
+            SK_summon(Mouboo, 4, any(2,3));
+            break;
+        case TMW2_KALSPIKE:
+            SK_summon(PoisonSpikyMushroom, 4, any(2,3));
+            break;
+        // Slightly more complex summons
         case TMW2_LIMERIZER:
             SK_summon(any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, any(3,4));
             break;
+        case TMW2_FAIRYKINGDOM:
+            // TODO: Allow Pixie summoning
+            SK_summon(any(FireFairy, EarthFairy, WaterFairy, WindFairy, PoisonFairy), 4, any(3,4));
+            break;
+        // More complex summons
         case TMW2_HALHISS:
             .@mobId=Snake;
             if (abizit() > 3 &&
@@ -233,18 +250,14 @@ function	script	HUB_SkillInvoke	{
             }
             SK_summon(.@mobId, 4, any(3,4));
             break;
-        case TMW2_KALWULF:
-            SK_summon(Wolvern, 4, any(3,4));
-            break;
-        case TMW2_FAIRYKINGDOM:
-            // TODO: Allow Pixie summoning
-            SK_summon(any(FireFairy, EarthFairy, WaterFairy, WindFairy, PoisonFairy), 4, any(3,4));
-            break;
-        case TMW2_KALBOO:
-            SK_summon(Mouboo, 4, any(2,3));
-            break;
-        case TMW2_KALSPIKE:
-            SK_summon(PoisonSpikyMushroom, 4, any(2,3));
+        case TMW2_STONEHEART:
+            .@mobId=Terranite;
+            if (rand2(9,12) < (abizit()*2)+1 &&
+                BaseLevel > 80)
+            {
+                .@mobId=TerraniteProtector;
+            }
+            SK_summon(.@mobId, 4, any(4,5));
             break;
 
         // Special exception
-- 
cgit v1.2.3-60-g2f50