diff options
author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/042-2/sorfina.txt | |
parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/042-2/sorfina.txt')
-rw-r--r-- | world/map/npc/042-2/sorfina.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index dd63b753..b01a83c7 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -270,7 +270,7 @@ OnTouch: close; } -042-2.gat,27,23,0|script|Chest|111, +042-2.gat,27,23,0|script|Chest#sorfina|111, { if (sorfina > 2) goto L_Empty; if (sorfina == 2) goto L_Shirt; @@ -297,7 +297,7 @@ L_Empty: close; } -042-2.gat,44,31,0|script|#DoorOut|45,0,0 +042-2.gat,44,31,0|script|#DoorOut-sorfina|45,0,0 { end; |