summaryrefslogtreecommitdiff
path: root/db/const.txt
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-30 20:03:41 +0000
committerFate <fate-tmw@googlemail.com>2009-05-30 20:03:41 +0000
commit8b70df06b9454fe76765dd3044b378d4b3002002 (patch)
tree8518b9c58642ae85d17bc62ae87d0501858b7bdd /db/const.txt
parent96c8a2957d499b4dd7c867455bdff51920eb31ea (diff)
parentf17c823d6f91ae535ebcadd8b5b369efea09b772 (diff)
downloadserverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip
Merge branch 'master' of the testing branch
Conflicts: conf/magic.conf db/item_db.txt npc/013-3_Cave/barrier.txt Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh; otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'db/const.txt')
-rw-r--r--db/const.txt35
1 files changed, 33 insertions, 2 deletions
diff --git a/db/const.txt b/db/const.txt
index 73e60c04..3bdcb3b4 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -151,6 +151,8 @@ cOrange 7
cPurple 8
cDarkGreen 9
+sc_poison 132
+
NIBBLE_0_SHIFT 0
NIBBLE_0_MASK 15
@@ -172,5 +174,34 @@ NIBBLE_5_MASK 15728640
NIBBLE_6_SHIFT 24
NIBBLE_6_MASK 251658240
-NIBBLE_7_SHIFT 28
-NIBBLE_7_MASK 4026531840
+NIBBLE_7_SHIFT 28 // Only three bits available in this one
+NIBBLE_7_MASK 1879048192 // should be 4026531840
+
+// 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
+
+MFLAG_MANASEED_RUMOUR 256 // Has heard rumour about mana seed
+MFLAG_KNOWS_CUTTREE 512 // Knows about the `cut the tree' quest
+MFLAG_DID_CUTTREE 1024 // Did cut off a branch from the druid tree
+MFLAG_KNOWS_DRUIDTREE 2048 // Knows about the druid tree quest
+
+MFLAG_KNOWS_IMP 4096 // Knows about the imprisoned forest spirit
+MFLAG_KNOWS_OLD_WIZARD 8192 // Knows Bjorn's old wizard
+MFLAG_MADE_CONC_POTION 16384 // Made a concentration potion with T15 and/or T16
+MFLAG_ELANORE_OMAR 32768 // Told Omar about Elanore's involvement