summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/hub.txt8
-rw-r--r--npc/magic/kalboo.txt44
-rw-r--r--npc/magic/kalspike.txt44
3 files changed, 11 insertions, 85 deletions
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index f67d35f53..61e80e442 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -200,7 +200,7 @@ function script HUB_SkillInvoke {
SK_parum();
break;
case TMW2_KALMURK:
- SK_summon(Maggot, 2, abizit()+1);
+ SK_summon(Maggot, 2, any(1,2));
break;
case TMW2_LIMERIZER:
SK_summon(any(GreenSlime,AzulSlime,RedSlime,AngryYellowSlime), 2, any(3,4));
@@ -222,6 +222,12 @@ function script HUB_SkillInvoke {
// 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));
+ break;
}
// Debug
diff --git a/npc/magic/kalboo.txt b/npc/magic/kalboo.txt
index 17e2d64e6..264432d64 100644
--- a/npc/magic/kalboo.txt
+++ b/npc/magic/kalboo.txt
@@ -9,48 +9,8 @@
end;
OnCall:
- // Other requeriments: 1x MoubooFigurine
- if (countitem(MoubooFigurine) < 1) {
- dispbottom l("You need 1x @@ to cast this skill.", getitemlink(MoubooFigurine));
- end;
- }
-
- // Check cooldown
- if (@kalboo_at > gettimetick(2)) {
- dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@kalboo_at));
- end;
- }
-
- // Setup
- @sk=TMW2_KALBOO;
- @mp=25;
- @amp=5;
-
- // Check if you have mana to cast
- // MagicCheck(SkillID, Mana{, MP per level})
- if (!MagicCheck(@sk, @mp, @amp))
- end;
-
- // Destroy reagents
- delitem MoubooFigurine, 1;
-
- // set cooldown
- @kalboo_at=gettimetick(2);
- @kalboo_at=@kalboo_at+44;
-
- // As usual, magic profeciency affects success ratio
- if (rand(1,6) < abizit()+1) {
- .@mobId=Mouboo;
- // 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:
diff --git a/npc/magic/kalspike.txt b/npc/magic/kalspike.txt
index 14203821b..4c3dfc310 100644
--- a/npc/magic/kalspike.txt
+++ b/npc/magic/kalspike.txt
@@ -9,48 +9,8 @@
end;
OnCall:
- // Other requeriments: 1x MushroomSpores
- if (countitem(MushroomSpores) < 1) {
- dispbottom l("You need 1x @@ to cast this skill.", getitemlink(MushroomSpores));
- end;
- }
-
- // Check cooldown
- if (@kalspike_at > gettimetick(2)) {
- dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@kalspike_at));
- end;
- }
-
- // Setup
- @sk=TMW2_KALSPIKE;
- @mp=25;
- @amp=5;
-
- // Check if you have mana to cast
- // MagicCheck(SkillID, Mana{, MP per level})
- if (!MagicCheck(@sk, @mp, @amp))
- end;
-
- // Destroy reagents
- delitem MushroomSpores, 1;
-
- // set cooldown
- @kalspike_at=gettimetick(2);
- @kalspike_at=@kalspike_at+44;
-
- // As usual, magic profeciency affects success ratio
- if (rand(1,6) < abizit()+1) {
- .@mobId=PoisonSpikyMushroom;
- // 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: