diff options
| -rw-r--r-- | npc/042-1/door.txt | 2 | ||||
| -rw-r--r-- | npc/042-2/boss.txt | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/npc/042-1/door.txt b/npc/042-1/door.txt index d884b1e30..0bfec673c 100644 --- a/npc/042-1/door.txt +++ b/npc/042-1/door.txt @@ -17,7 +17,7 @@ OnTouch: if (!($KAMELOT_QUEST[.@g] & 4)) { .@label$=instance_npcname("#KDoor0422", $@KAMELOT_ID[.@g])+"::OnArrival"; deltimer .@label$; - addtimer 15000, .@label$; + addtimer 5000, .@label$; } } else { dispbottom l("This door is locked."); diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt index 75fcfe1b0..0f8367035 100644 --- a/npc/042-2/boss.txt +++ b/npc/042-2/boss.txt @@ -22,6 +22,7 @@ OnTouch: end; OnArrival: + debugmes "Arrival detected"; .@g=getcharid(2); if (.@g < 1) percentheal -100, -100; @@ -31,6 +32,7 @@ OnArrival: end; $@KAMELOT_WAVE[.@g]+=1; initnpctimer; + debugmes "Timer Started"; //if ($@KAMELOT_WAVE == 0) // goto OnKillMob; // TODO: Fire dialog @@ -38,6 +40,14 @@ OnArrival: // ... end; +OnEmergency: + initnpctimer; + end; + +OnEmergency2: + dispbottom instance_npcname("#KDoor0422", $@KAMELOT_ID[.@g]); + end; + OnTimer1000: .@m$=instance_mapname("042-2"); mapannounce .@m$, "??? : What's this? Why do I hear a commotion up there??", 0; |