halhiss now makes use of the new magical system

3 files changed, 42 insertions, 49 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 3f6dade8b..c822c00de 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38816,13 +38816,42 @@ skill_db: (
 	Id: 20036
 	Name: "TMW2_HALHISS"
 	Description: "Halhiss"
-	MaxLevel: 12
+	MaxLevel: 10
 	SkillType: {
 		Self: true
 	}
 	SkillInfo: {
 		Quest: true
 	}
+	CoolDown: {
+		Lv1: 45000
+		Lv2: 44000
+		Lv3: 43000
+		Lv4: 42000
+		Lv5: 41000
+		Lv6: 40000
+		Lv7: 38000
+		Lv8: 37000
+		Lv9: 36000
+		Lv10: 35000
+	}
+	Requirements: {
+		SPCost: {
+			Lv1: 35
+			Lv2: 41
+			Lv3: 47
+			Lv4: 53
+			Lv5: 59
+			Lv6: 65
+			Lv7: 71
+			Lv8: 77
+			Lv9: 83
+			Lv10: 90
+		}
+		Items: {
+			SnakeEgg: 1
+		}
+	}
 },
 {
 	Id: 20037
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 50f22b33c..d6b597a42 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -205,6 +205,16 @@ function	script	HUB_SkillInvoke	{
         case TMW2_LIMERIZER:
             SK_summon(any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, any(3,4));
             break;
+        case TMW2_HALHISS:
+            .@mobId=Snake;
+            if (abizit() > 3 &&
+                GHMEMO[GHQ_GetQuestIDByMonsterID(MountainSnake)] >= 10000 &&
+                rand2(1,3) == 2)
+            {
+                .@mobId=MountainSnake;        
+            }
+            SK_summon(.@mobId, 2, 4, any(3,4));
+            break;
     }
 
     // Debug
diff --git a/npc/magic/halhiss.txt b/npc/magic/halhiss.txt
index e497d8826..96ac5292d 100644
--- a/npc/magic/halhiss.txt
+++ b/npc/magic/halhiss.txt
@@ -9,54 +9,8 @@
     end;
 
 OnCall:
-    // Other requeriments: 20x Maggot Slime
-    if (countitem(SnakeEgg) < 1) {
-        dispbottom l("You need 1x @@ to cast this skill.", getitemlink(SnakeEgg));
-        end;
-    }
-
-    // Check cooldown
-    if (@halhiss_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@halhiss_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_HALHISS;
-    @mp=35;
-    @amp=6;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Destroy reagents
-    delitem SnakeEgg, 1;
-
-    // set cooldown
-    @halhiss_at=gettimetick(2);
-    @halhiss_at=@halhiss_at+44;
-
-    // As usual, magic profeciency affects success ratio
-    if (rand(1,4) < abizit()+1) {
-        .@mobId=Snake;
-        if (abizit() > 3 &&
-            GHMEMO[GHQ_GetQuestIDByMonsterID(MountainSnake)] >= 10000 &&
-            rand(1,3) == 2)
-        {
-            .@mobId=MountainSnake;        
-        }
-        // Summon Magic
-        // SummonMagic(SkillID, MobID{, SkillLevelPerMob=2{, Level Override}})
-        SummonMagic(@sk, .@mobId, 4, MAGIC_LVL+getskilllv(@sk)-1);
-    } else {
-        dispbottom l("The spell fails!");
-    }
-
-    // Get 3~4 mana experience point (this is NOT used by Mana Stone)
-    GetManaExp(@sk, rand(3,4));
-
+    // Deprecated
+    dispbottom l("The usage of @sk-commands was deprecated");
     end;
 
 OnInit: