diff options
author | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
---|---|---|
committer | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
commit | f6256f240c2fabe5d26efa7e88e69c2de19a6786 (patch) | |
tree | e832fa79f8fe9a78085e0b14b35f2bac5afe3006 /world/map/conf/tmwa-map.conf | |
parent | 9ad304f22b698d69e7d41cc4cdfe53bf16d5d552 (diff) | |
parent | c62e768cc51f9607b85642c78d32cbcbc519f880 (diff) | |
download | serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.gz serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.bz2 serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.xz serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.zip |
Merge branch 'master' into 'magic'magic
# Conflicts:
# world/map/db/const.txt
# world/map/npc/magic/event-summon-managuardian.txt
Diffstat (limited to 'world/map/conf/tmwa-map.conf')
-rw-r--r-- | world/map/conf/tmwa-map.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf index 53926ffb..8379b9b3 100644 --- a/world/map/conf/tmwa-map.conf +++ b/world/map/conf/tmwa-map.conf @@ -15,6 +15,7 @@ const_db: db/const-magic.txt const_db: db/const-quest.txt const_db: db/const-mapflags.txt const_db: db/const-debugflag.txt +const_db: db/const-aegis.txt const_db: conf/permissions.txt const_db: conf/permissions_local.txt @@ -36,6 +37,7 @@ mob_db: db/mob_db_40_59.txt mob_db: db/mob_db_60_79.txt mob_db: db/mob_db_80_99.txt mob_db: db/mob_db_over_100.txt +mob_db: db/mob_db_over_150.txt mob_skill_db: db/mob_skill_db.txt skill_db: db/skill_db.txt |