diff options
| -rw-r--r-- | npc/014-4/kamelot.txt | 8 | ||||
| -rw-r--r-- | npc/042-0/arthur.txt | 1 | ||||
| -rw-r--r-- | npc/042-2/boss.txt | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt index 4cd584b19..254c83bb2 100644 --- a/npc/014-4/kamelot.txt +++ b/npc/014-4/kamelot.txt @@ -44,6 +44,9 @@ function script KamelotCleanup { $KAMELOT_KEYMASK[.@g]=0; $KAMELOT_PASSCODE[.@g]=0; $KAMELOT_PASSMASK[.@g]=0; + // TODO: Instance Destroy? D: + // And it couldn't be ran from Arthur? D: + // Timers keep running and previous attempts leave artifacts D: return; } @@ -111,10 +114,15 @@ OnDebug: if (.@g < 1) end; mes "Kamelot Debug"; mesf "Guild: %d", .@g; + mes ""; mesf "Keys: %d", $KAMELOT_KEYMASK[.@g]; mesf "Quest: %d", $KAMELOT_QUEST[.@g]; + mes ""; mesf "Maze Password: %d", $KAMELOT_PASSCODE[.@g]; mesf "Maze Status: %d", $KAMELOT_PASSMASK[.@g]; + mes ""; + mesf "Guild Power: %d", $KAMELOT_MX[.@g]; + mesf "Guild Count: %d", $KAMELOT_PC[.@g]; select l("Abort"), l("Reset"), diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt index 8b509eee2..f8b1a8f91 100644 --- a/npc/042-0/arthur.txt +++ b/npc/042-0/arthur.txt @@ -71,6 +71,7 @@ L_Quest: mes l("Be careful! ")+col(l("AFTER THEM!!"), 9); next; // Be sure the quest only starts now, and destroy any eventual artifact + KamelotCleanup(.@g); getguildmember(.@g, 2); // 2 = count by account IDs $KAMELOT_QUEST[.@g]=1; $KAMELOT_MX[.@g]=getguildavg(.@g); diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt index 4ae8c40f0..84fca264e 100644 --- a/npc/042-2/boss.txt +++ b/npc/042-2/boss.txt @@ -339,8 +339,8 @@ function kdoor0422Spawn { .@y1=getarg(2); .@x2=getarg(3); .@y2=getarg(4); - .@avg=getd("$@GTEMP_MX_"+.@m$); .@m$=instance_mapname("042-2"); + .@avg=getd("$@GTEMP_MX_"+.@m$); //debugmes "Total %d, map %s (power %d)", .@gcount, .@m$, .@avg; freeloop(true); for (.@i=0; .@i < .@gcount; .@i++) { |