summaryrefslogtreecommitdiff
path: root/world/map/npc/042-2/morgan.txt
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:18:36 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:24 -0600
commit78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f (patch)
treec60a8593f1372a2522689306d732e4cf37f1470d /world/map/npc/042-2/morgan.txt
parent657fa3576f1d7915b1e30264c213cfe5c7fec39d (diff)
downloadserverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.gz
serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.bz2
serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.xz
serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.zip
NPCs on 042-* fixed
Diffstat (limited to 'world/map/npc/042-2/morgan.txt')
-rw-r--r--world/map/npc/042-2/morgan.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/042-2/morgan.txt
index 20cc34c1..ed6367ff 100644
--- a/world/map/npc/042-2/morgan.txt
+++ b/world/map/npc/042-2/morgan.txt
@@ -3,19 +3,19 @@
// Gains Access to Magic School
// See 024-2 clean that shit up
// Morgan, liana
-function|script|MorganState|,
+function|script|MorganState
{
callfunc "ClearVariables";
set @morgan, ((STARTAREA & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
return;
}
-function|script|SetMorganMask|,
+function|script|SetMorganMask
{
set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (@morgan_tmp << NIBBLE_3_SHIFT));
set @morgan_tmp, 0;
return;
}
-042-2,105,57,0|script|MorganDebug|355,
+042-2,105,57,0|script|MorganDebug|355
{
mes "[Morgan Debug]";
mes "Reset?";
@@ -35,7 +35,7 @@ OnInit:
disablenpc "MorganDebug";
end;
}
-042-2,101,57,0|script|Morgan|355,
+042-2,101,57,0|script|Morgan|355
{
setarray @npc_loc, 101, 57, 4;
callfunc "PCtoNPCRange";