diff options
| author | QwertyDragon <me@christophergoodwin.name> | 2015-11-09 22:24:19 -0500 |
|---|---|---|
| committer | QwertyDragon <me@christophergoodwin.name> | 2015-11-09 22:24:19 -0500 |
| commit | 0b448f9417623f4f5093f87ec33e33985197390b (patch) | |
| tree | c8ce6422276ccd3e12480e56b33e904419e63fc8 /db | |
| parent | 786bf2dd1d07a12eded1f668474b4fe72f8986cc (diff) | |
| parent | cfa5239a9561c584a8b3c8b7c8c361ea990631e1 (diff) | |
| download | serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.gz serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.bz2 serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.xz serverdata-0b448f9417623f4f5093f87ec33e33985197390b.zip | |
Merge branch 'master' of gitlab.com:evol/serverdata
Diffstat (limited to 'db')
| -rw-r--r-- | db/const.txt | 4 | ||||
| -rw-r--r-- | db/re/map_cache.dat | bin | 7488 -> 9422 bytes |
2 files changed, 3 insertions, 1 deletions
diff --git a/db/const.txt b/db/const.txt index 3d75cc13..76ebd3a1 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3395,8 +3395,10 @@ NPC_HUMAN_MALE_OLD 122 NPC_RAIJIN_GIRL 123 NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION 124 NPC_SALEM 125 +NPC_LLOYD 126 +NPC_IVAN 127 NPC_ALIGE_OUTSIDE_BARREL 128 -NPC_SALEM 125 +NPC_MERLIN 129 NPC_ALIGE 401 NPC_ORC_SAILOR 402 NPC_RATTO_SAILOR 403 diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat Binary files differindex 451539ab..e950fded 100644 --- a/db/re/map_cache.dat +++ b/db/re/map_cache.dat |