Fairy Kingdom now uses new magic system (but still can't summon Pixies)

3 files changed, 36 insertions, 43 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index bbb07a4e5..c6f4cdc98 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38905,6 +38905,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: 40
+			Lv2: 44
+			Lv3: 48
+			Lv4: 52
+			Lv5: 56
+			Lv6: 60
+			Lv7: 64
+			Lv8: 68
+			Lv9: 72
+			Lv10: 75
+		}
+		Items: {
+			FluoPowder: 1
+		}
+	}
 },
 {
 	Id: 20039
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 027c04887..54a26ab7e 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -218,6 +218,10 @@ function	script	HUB_SkillInvoke	{
         case TMW2_KALWURF:
             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;
     }
 
     // Debug
diff --git a/npc/magic/fairykingdom.txt b/npc/magic/fairykingdom.txt
index f8f177ccb..5181a5fcf 100644
--- a/npc/magic/fairykingdom.txt
+++ b/npc/magic/fairykingdom.txt
@@ -3,54 +3,14 @@
 //
 // Magic Script: TMW2_FAIRYKINGDOM
 //
-// Summons snakes (mountain snakes if GHQ was completed and enough skill)
+// Summons fairies (or pixies TBA)
 
 -	script	sk#fairykingdom	32767,{
     end;
 
 OnCall:
-    // Other requeriments: 1x Fluo Powder
-    if (countitem(FluoPowder) < 1) {
-        dispbottom l("You need 1x @@ to cast this skill.", getitemlink(FluoPowder));
-        end;
-    }
-
-    // Check cooldown
-    if (@fairykingdom_at > gettimetick(2)) {
-        dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@fairykingdom_at));
-        end;
-    }
-
-    // Setup
-    @sk=TMW2_FAIRYKINGDOM;
-    @mp=40;
-    @amp=4;
-
-    // Check if you have mana to cast
-    // MagicCheck(SkillID, Mana{, MP per level})
-    if (!MagicCheck(@sk, @mp, @amp))
-        end;
-
-    // Destroy reagents
-    delitem FluoPowder, 1;
-
-    // set cooldown
-    @fairykingdom_at=gettimetick(2);
-    @fairykingdom_at=@fairykingdom_at+47-abizit();
-
-    // As usual, magic profeciency affects success ratio
-    if (rand(1,6) < abizit()+1) {
-        .@mobId=any(FireFairy, EarthFairy, WaterFairy, WindFairy, PoisonFairy);
-        // 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: