diff options
| -rw-r--r-- | db/re/skill_db.conf | 29 | ||||
| -rw-r--r-- | npc/functions/hub.txt | 43 | ||||
| -rw-r--r-- | npc/magic/stoneheart.txt | 48 |
3 files changed, 59 insertions, 61 deletions
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index dbd4fd9ad..33f6d6e20 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -38971,6 +38971,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: 47 + Lv2: 52 + Lv3: 57 + Lv4: 62 + Lv5: 67 + Lv6: 72 + Lv7: 77 + Lv8: 82 + Lv9: 87 + Lv10: 92 + } + Items: { + TerraniteOre: 1 + } + } }, { Id: 20041 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 diff --git a/npc/magic/stoneheart.txt b/npc/magic/stoneheart.txt index 192067c19..5273f0327 100644 --- a/npc/magic/stoneheart.txt +++ b/npc/magic/stoneheart.txt @@ -9,52 +9,8 @@ end; OnCall: - // Other requeriments: 1x Terranite Ore - if (countitem(TerraniteOre) < 1) { - dispbottom l("You need 1x @@ to cast this skill.", getitemlink(TerraniteOre)); - end; - } - - // Check cooldown - if (@stoneheart_at > gettimetick(2)) { - dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@stoneheart_at)); - end; - } - - // Setup - @sk=TMW2_STONEHEART; - @mp=47; - @amp=5; - - // Check if you have mana to cast - // MagicCheck(SkillID, Mana{, MP per level}) - if (!MagicCheck(@sk, @mp, @amp)) - end; - - // Destroy reagents - delitem TerraniteOre, 1; - - // set cooldown - @stoneheart_at=gettimetick(2); - @stoneheart_at=@stoneheart_at+44; - - // As usual, magic profeciency affects success ratio - if (rand(1,6) < abizit()+1) { - .@mobId=Terranite; - if (rand(9,12) < (abizit()*2)+1 && BaseLevel > 80) - { - .@mobId=TerraniteProtector; - } - // 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)); - + // Deprecated + dispbottom l("The usage of @sk-commands was deprecated"); end; OnInit: |