Cuteheart: Adapt to the HUB System

3 files changed, 32 insertions, 43 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 825419e3d..989432b31 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -39296,6 +39296,35 @@ skill_db: (
 	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: 25
+			Lv2: 29
+			Lv3: 33
+			Lv4: 37
+			Lv5: 41
+			Lv6: 45
+			Lv7: 49
+			Lv8: 53
+			Lv9: 57
+			Lv10: 61
+		}
+		Items: {
+			WhiteFur: 1
+		}
+	}
 },
 {
 	Id: 20044
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index a37160e6f..14cd6d86e 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -331,6 +331,9 @@ function	script	HUB_SkillInvoke	{
         case TMW2_KALSPIKE:
             SK_summon(PoisonSpikyMushroom, 4, any(2,3));
             break;
+        case TMW2_CUTEHEART:
+            SK_summon(Fluffy, 4, any(2,3));
+            break;
         // Slightly more complex summons
         case TMW2_LIMERIZER:
             SK_summon(any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, any(3,4));
diff --git a/npc/magic/cuteheart.txt b/npc/magic/cuteheart.txt
index 2030b03ff..4bef762eb 100644
--- a/npc/magic/cuteheart.txt
+++ b/npc/magic/cuteheart.txt
@@ -9,51 +9,8 @@
     end;
 
 OnCall:
-    // Other requeriments: 1x WhiteFur
-    if (countitem(WhiteFur) < 1) {
-        dispbottom l("You need 1x @@ to cast this skill.", getitemlink(WhiteFur));
-        end;
-    }
-
-    // Check cooldown
-    if (@cuteheart_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@cuteheart_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_CUTEHEART;
-    @mp=25;
-    @amp=4;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Destroy reagents
-    delitem WhiteFur, 1;
-
-    // set cooldown
-    @cuteheart_at=gettimetick(2);
-    @cuteheart_at=@cuteheart_at+44;
-
-    // As usual, magic profeciency affects success ratio
-    if (rand(1,6) < abizit()+1) {
-        .@mobId=Fluffy;
-        // 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 4~5 mana experience point (this is NOT used by Mana Stone)
-    GetManaExp(@sk, rand(4,5));
-
     end;
 
 OnInit:
-    bindatcmd "sk-cuteheart", "sk#cuteheart::OnCall", 0, 100, 0;
     end;
 }