diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-09-14 00:01:37 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-09-14 00:01:37 -0300 |
| commit | 6ec6b99fd3ecbeaaa40d3340bc4bb72b4024dcf5 (patch) | |
| tree | acd391f7b5aa28175a92b8e833574f18f26f14fe | |
| parent | 29cd00e081f01c71263f1cf96d877b2063e2e43e (diff) | |
| download | serverdata-6ec6b99fd3ecbeaaa40d3340bc4bb72b4024dcf5.tar.gz serverdata-6ec6b99fd3ecbeaaa40d3340bc4bb72b4024dcf5.tar.bz2 serverdata-6ec6b99fd3ecbeaaa40d3340bc4bb72b4024dcf5.tar.xz serverdata-6ec6b99fd3ecbeaaa40d3340bc4bb72b4024dcf5.zip | |
Well, it was pretty obvious this was broken, and cleanup is needed
| -rw-r--r-- | npc/001-7/homunculus.txt | 1 | ||||
| -rw-r--r-- | npc/functions/hub.txt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/npc/001-7/homunculus.txt b/npc/001-7/homunculus.txt index 179ff7832..8935e80cc 100644 --- a/npc/001-7/homunculus.txt +++ b/npc/001-7/homunculus.txt @@ -74,6 +74,7 @@ OnTouch: } setq1 FrostiaQuest_Homunculus, 2; warp .@mapn$, any(45,46), 79; + @instid=.@inst; end; } diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index b5191fc6d..1d77f224e 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -70,7 +70,10 @@ function script HUB_Logout { } // Died or logged out on Player Story 5 - Forgotten Throne Room if (compare(.@mapa$, "hmc")) { - .@n$=instance_npcname("#Core02331"); + if (@instid > 0) + .@n$=instance_npcname("#Core02331", @instid); + else + .@n$=instance_npcname("#Core02331"); deltimer(.@n$+"::OnW01"); deltimer(.@n$+"::OnW02"); deltimer(.@n$+"::OnE07"); @@ -79,6 +82,7 @@ function script HUB_Logout { deltimer(.@n$+"::OnE10"); deltimer(.@n$+"::OnE11"); deltimer(.@n$+"::OnE12"); + killmonsterall(getmap()); } // Died or logged out on Player Story 6 - Forgotten Shrine if (compare(.@mapa$, "brb3")) { |