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/db/const-magic.txt | |
| 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/db/const-magic.txt')
| -rw-r--r-- | world/map/db/const-magic.txt | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/world/map/db/const-magic.txt b/world/map/db/const-magic.txt index 9bf8e063..2ef39b60 100644 --- a/world/map/db/const-magic.txt +++ b/world/map/db/const-magic.txt @@ -10,17 +10,31 @@ SKILL_MAGIC_NATURE 344 SKILL_MAGIC_ASTRAL 345 SKILL_MAGIC_DARK 346 -// Elements +// Elements (Legacy) ELT_NEUTRAL 0 ELT_WATER 1 ELT_EARTH 2 ELT_FIRE 3 -ELT_WIND 4 -ELT_POISON 5 +ELT_WIND 4 // Deprecated +ELT_POISON 5 // Deprecated ELT_SHADOW 6 ELT_HOLY 7 -ELT_GHOST 8 -ELT_UNDEAD 9 +ELT_GHOST 8 // Deprecated +ELT_UNDEAD 9 // Deprecated + +// Elements +Ele_Neutral 0 +Ele_Water 1 +Ele_Nature 2 +Ele_Fire 3 +Ele_Holy 6 +Ele_Dark 7 +Ele_Earth 2 +Ele_Wind 2 // 4 +Ele_Poison 2 // 5 +Ele_Ghost 7 // 8 +Ele_Undead 7 // 9 +Ele_All 255 // Status effects SC_SHEARED 194 |