summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-25 01:16:15 -0300
committerJesusaves <cpntb1@ymail.com>2020-04-25 01:16:15 -0300
commit5fba16f2af3dd8c215a484f4f00e2b991c4ae664 (patch)
tree250b824c3a7a84665c45b4c991ab32d31a76b811 /npc
parent7f5e0d3f0abccb14c785392f89f6e6de672f2a50 (diff)
downloadserverdata-5fba16f2af3dd8c215a484f4f00e2b991c4ae664.tar.gz
serverdata-5fba16f2af3dd8c215a484f4f00e2b991c4ae664.tar.bz2
serverdata-5fba16f2af3dd8c215a484f4f00e2b991c4ae664.tar.xz
serverdata-5fba16f2af3dd8c215a484f4f00e2b991c4ae664.zip
Bugfixes from testing.
NOTE: Quest is assigned, but cooldown isn't set. So any member walking on Kamelot Gate will reset quest.
Diffstat (limited to 'npc')
-rw-r--r--npc/014-4/kamelot.txt2
-rw-r--r--npc/042-0/arthur.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index 401d8532c..4c88c5206 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -57,7 +57,7 @@ OnTouch:
// Quest started but Cooldown expired
// Needs to cleanup - wipe all variables
if ($KAMELOT_COOLDOWN[.@g] < gettimeparam(GETTIME_WEEKDAY)) {
- KamelotCleanup();
+ KamelotCleanup(.@g);
} else {
dispbottom l("The gates are firmly shut by some weird magical power.");
end;
diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt
index a6a283e74..50567d270 100644
--- a/npc/042-0/arthur.txt
+++ b/npc/042-0/arthur.txt
@@ -94,7 +94,7 @@ L_Smash:
OnPreSmash:
specialeffect FX_CUPID, AREA, getcharid(3);
- addtimer(380, instance_npcname(.name$)+"::OnPreSmash");
+ addtimer(380, instance_npcname(.name$)+"::OnSmash");
end;
OnSmash: