summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/hub.txt7
-rw-r--r--npc/magic/zarkor.txt11
2 files changed, 4 insertions, 14 deletions
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index e621246ce..2ff91352a 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -306,11 +306,12 @@ function script HUB_SkillInvoke {
case TMW2_PARUM:
SK_parum();
break;
- // Highly complex summons
+ // Summons which never fail
case TMW2_ZARKOR:
- SK_zarkor();
+ SummonMagic(@skillId, CaveMaggot, 2, @skillLv);
+ GetManaExp(@skillId, 1);
break;
- // Less complex summons
+ // Summons which may fail
case TMW2_KALMURK:
SK_summon(Maggot, 2, any(1,2));
break;
diff --git a/npc/magic/zarkor.txt b/npc/magic/zarkor.txt
index aefc83abe..2e0c3b116 100644
--- a/npc/magic/zarkor.txt
+++ b/npc/magic/zarkor.txt
@@ -6,17 +6,6 @@
// Spawns a Cave Maggot.
// This is to test stuff, more than to create anything really.
-function script SK_zarkor {
- // Set skill
- @sk=TMW2_ZARKOR;
-
- // Summon Magic
- SummonMagic(@sk, CaveMaggot, 2, @skillLv);
-
- // Get a single mana experience point (this is NOT used by Mana Stone)
- GetManaExp(@sk, 1);
- return;
-}
- script sk#zarkor 32767,{
end;