summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-06-22 02:36:06 -0500
committerWushin <pasekei@gmail.com>2015-06-22 02:36:06 -0500
commitf652beac0ace227d4ea1ba6d9adbc98ea6225532 (patch)
tree137457f19c1ad9eb91e9bf997425aee2e67289ea
parent5b31008cc4d11be57ade8ae9885a511fc4b37ec8 (diff)
parenta66a32b24ea8d7cc983f07543f7fa554543dd579 (diff)
downloadserverdata-f652beac0ace227d4ea1ba6d9adbc98ea6225532.tar.gz
serverdata-f652beac0ace227d4ea1ba6d9adbc98ea6225532.tar.bz2
serverdata-f652beac0ace227d4ea1ba6d9adbc98ea6225532.tar.xz
serverdata-f652beac0ace227d4ea1ba6d9adbc98ea6225532.zip
Merge pull request #394 from mekolat/numa
use npc actions and set title in Numa
-rw-r--r--world/map/npc/017-9/npcs.txt1
-rw-r--r--world/map/npc/functions/superdebug.txt4
2 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/017-9/npcs.txt b/world/map/npc/017-9/npcs.txt
index c9f9aedb..b14428c5 100644
--- a/world/map/npc/017-9/npcs.txt
+++ b/world/map/npc/017-9/npcs.txt
@@ -40,6 +40,7 @@
017-9,30,28,0|script|Numa|393
{
+ set @from_npc, 1;
callfunc "SuperDebug";
end;
}
diff --git a/world/map/npc/functions/superdebug.txt b/world/map/npc/functions/superdebug.txt
index b9f067de..5654dd4c 100644
--- a/world/map/npc/functions/superdebug.txt
+++ b/world/map/npc/functions/superdebug.txt
@@ -3,9 +3,13 @@
function|script|SuperDebug
{
+ if(@from_npc) goto L_Main;
+ npcaction 6, 12;
+ title "Numa";
goto L_Main;
L_Main:
+ set @from_npc, 0;
mes "[Numa]";
mes "How may I help you?";
next;