diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/042-2/sorfina.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/042-2/sorfina.txt')
| -rw-r--r-- | world/map/npc/042-2/sorfina.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index 7d767e3f..dd63b753 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -1,8 +1,8 @@ // This file is part of the Tutorial // Author: Jenalya -042-2.gat,28,26,0|script|Sorfina|154,4,4{ - +042-2.gat,28,26,0|script|Sorfina|154,4,4 +{ if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again; if (sorfina == 4) goto L_Heal; if (sorfina == 3) goto L_Clothes; @@ -247,7 +247,8 @@ OnTouch: goto L_Start; } -042-2.gat,33,27,0|script|#Carpet|32767,1,1{ +042-2.gat,33,27,0|script|#Carpet|32767,1,1 +{ end; OnTouch: @@ -269,8 +270,8 @@ OnTouch: close; } -042-2.gat,27,23,0|script|Chest|111,{ - +042-2.gat,27,23,0|script|Chest|111, +{ if (sorfina > 2) goto L_Empty; if (sorfina == 2) goto L_Shirt; @@ -296,7 +297,8 @@ L_Empty: close; } -042-2.gat,44,31,0|script|#DoorOut|45,0,0{ +042-2.gat,44,31,0|script|#DoorOut|45,0,0 +{ end; OnTouch: |