summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-05 00:18:52 -0700
committerFate <fate-tmw@googlemail.com>2008-12-05 00:18:52 -0700
commit2ed0a05a7d356fcf9990aec22072062aaa224d52 (patch)
treeaf9556bcc9d6e32e76b885606e79048b36d3f05f /db
parentf694a2b3d37c562d88dfed245f266859d00e1f08 (diff)
downloadserverdata-2ed0a05a7d356fcf9990aec22072062aaa224d52.tar.gz
serverdata-2ed0a05a7d356fcf9990aec22072062aaa224d52.tar.bz2
serverdata-2ed0a05a7d356fcf9990aec22072062aaa224d52.tar.xz
serverdata-2ed0a05a7d356fcf9990aec22072062aaa224d52.zip
Moved magic quests constants to const.txt (import didn't work for some reason)
Diffstat (limited to 'db')
-rw-r--r--db/const.txt20
-rw-r--r--db/magic_const.txt17
2 files changed, 19 insertions, 18 deletions
diff --git a/db/const.txt b/db/const.txt
index 080efbad..f372ff14 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -175,4 +175,22 @@ NIBBLE_6_MASK 251658240
NIBBLE_7_SHIFT 28
NIBBLE_7_MASK 4026531840
-import: db/magic_const.txt
+// Magic skills
+SKILL_MAGIC 340
+SKILL_MAGIC_LIFE 341
+SKILL_MAGIC_WAR 342
+SKILL_MAGIC_TRANSMUTE 343
+SKILL_MAGIC_NATURE 344
+SKILL_MAGIC_ASTRAL 345
+
+// Flags for the magic quests
+MFLAG_DRANK_POTION 1 // Character drank at least one magic potion as prerequisite for the mana seed quest
+MFLAG_KNOWS_MANASEED 2 // Character has found the Mana Seed
+MFLAG_TOUCHED_MANASEED 4 // Character has touched the Mana Seed
+MFLAG_MANASEED_MAXEDOUT 8 // Character has touched the Mana Seed while maxed out on magic
+
+MFLAG_KNOWS_AULDSBEL 16 // Character has met Auldsbel
+MFLAG_KNOWS_WYARA 32 // Character has met Wyara
+MFLAG_KNOWS_SAGATHA 64 // Character has met Sagatha
+MFLAG_KNOWS_MANAPOTION 128 // Has heard about the mana potion
+
diff --git a/db/magic_const.txt b/db/magic_const.txt
deleted file mode 100644
index 791c446e..00000000
--- a/db/magic_const.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-SKILL_MAGIC 340
-SKILL_MAGIC_LIFE 341
-SKILL_MAGIC_WAR 342
-SKILL_MAGIC_TRANSMUTE 343
-SKILL_MAGIC_NATURE 344
-SKILL_MAGIC_ASTRAL 345
-
-// Flags for the magic quests
-MFLAG_DRANK_POTION 1 // Character drank at least one magic potion as prerequisite for the mana seed quest
-MFLAG_KNOWS_MANASEED 2 // Character has found the Mana Seed
-MFLAG_TOUCHED_MANASEED 4 // Character has touched the Mana Seed
-MFLAG_MANASEED_MAXEDOUT 8 // Character has touched the Mana Seed while maxed out on magic
-
-MFLAG_KNOWS_AULDSBEL 16 // Character has met Auldsbel
-MFLAG_KNOWS_WYARA 32 // Character has met Wyara
-MFLAG_KNOWS_SAGATHA 64 // Character has met Sagatha
-MFLAG_KNOWS_MANAPOTION 128 // Has heard about the mana potion