diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-06-17 13:29:58 +0200 |
| commit | db53017bd8172d7679b2ce3e7cc6c67927031f2c (patch) | |
| tree | 6777db7b72f0329937f17153ddfa3567695d45ea /db | |
| parent | c0fa45992b123f08e91e86dac11aca765ea73cd2 (diff) | |
| parent | 246072120a1edcba61a350bad56049f110457489 (diff) | |
| download | serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.gz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.bz2 serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.xz serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.zip | |
Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata
Conflicts:
db/const.txt
npc/022-1_Tulimshar/_import.txt
npc/_import.txt
Diffstat (limited to 'db')
| -rw-r--r-- | db/const.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt index d694e2c7..f7b12451 100644 --- a/db/const.txt +++ b/db/const.txt @@ -259,6 +259,7 @@ FLAG_TOWEL_HELPED 16 // gave the towel npc the stuff he wants FLAG_TOWEL_COMPLETED 32 // got the towel from the towel npc FLAG_ANDRA_HELPED 64 // Knows Andra and agreed to help her FLAG_ROSSI_COMPLETED 128 // Completed the Rossi Quest +FLAG_TUTORIAL_DONE 256 // player completed tutorial (or entered the tutorial area from outside after it was added) DOCK_tulimshar 1 DOCK_hurnscald 2 |