summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/magic/kalmurk.txt26
-rw-r--r--npc/magic/parum.txt4
-rw-r--r--npc/magic/zarkor.txt12
3 files changed, 19 insertions, 23 deletions
diff --git a/npc/magic/kalmurk.txt b/npc/magic/kalmurk.txt
index 8bd9f7f45..1471180eb 100644
--- a/npc/magic/kalmurk.txt
+++ b/npc/magic/kalmurk.txt
@@ -23,36 +23,34 @@ OnCall:
}
// Check cooldown
- /* TODO */
- // This will only vanish upon logout =/
- if (@kalmurk_caveat) {
- dispbottom l("Skill is in cooldown.");
+ if (@kalmurk_at > gettimetick(2)) {
+ dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@kalmurk_at));
end;
}
// Setup
- .@sk=TMW2_KALMURK;
- .@mp=200;
- .@amp=50;
+ @sk=TMW2_KALMURK;
+ @mp=200;
+ @amp=50;
// Check if you have mana to cast
// MagicCheck(SkillID, Mana{, MP per level})
- if (!MagicCheck(.@sk, .@mp, .@amp))
+ if (!MagicCheck(@sk, @mp, @amp))
end;
// Summon Magic
- SummonMagic(.@sk, CaveMaggot, 2);
+ // SummonMagic(SkillID, MobID{, MobPerSkillLevel=2{, Level Override}})
+ SummonMagic(@sk, Maggot, 2);
delitem MaggotSlime, 2;
// Get a single mana experience point (this is NOT used by Soul Menhir)
- GetManaExp(TMW2_KALMURK, 1);
+ GetManaExp(@sk, 1);
+
- /*
// set cooldown
- @skkalmurkor_cooldown=gettimetick(2)+20;
- */
- @kalmurk_caveat=1;
+ @kalmurk_at=gettimetick(2);
+ @kalmurk_at=@kalmurk_at+16;
end;
OnInit:
diff --git a/npc/magic/parum.txt b/npc/magic/parum.txt
index 593d9e587..535ca3ef6 100644
--- a/npc/magic/parum.txt
+++ b/npc/magic/parum.txt
@@ -28,10 +28,8 @@ OnCall:
}
// Check cooldown
- /* TODO */
- // This will only vanish upon logout =/
if (@parum_at > gettimetick(2)) {
- dispbottom l("Skill is in cooldown.");
+ dispbottom l("Skill is in cooldown for @@.", FuzzyTime(@parum_at));
end;
}
diff --git a/npc/magic/zarkor.txt b/npc/magic/zarkor.txt
index 301e74565..6c4980c33 100644
--- a/npc/magic/zarkor.txt
+++ b/npc/magic/zarkor.txt
@@ -32,20 +32,20 @@ OnCall:
}
// Setup
- .@sk=TMW2_ZARKOR;
- .@mp=400;
- .@amp=75;
+ @sk=TMW2_ZARKOR;
+ @mp=400;
+ @amp=75;
// Check if you have mana to cast
// MagicCheck(SkillID, Mana{, MP per level})
- if (!MagicCheck(.@sk, .@mp, .@amp))
+ if (!MagicCheck(@sk, @mp, @amp))
end;
// Summon Magic
- SummonMagic(.@sk, CaveMaggot, 2);
+ SummonMagic(@sk, CaveMaggot, 2);
// Get a single mana experience point (this is NOT used by Mana Stone)
- GetManaExp(.@sk, 1);
+ GetManaExp(@sk, 1);
/*
// set cooldown