青魔法分類の [その他] のマスクを整理. RF4_XXX_MASKを削除.

[hengband/hengband.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index 39f5949..e3e3b5a 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -49,7 +49,7 @@
 #define H_VER_MAJOR 1
 #define H_VER_MINOR 5
 #define H_VER_PATCH 0
-#define H_VER_EXTRA 0
+#define H_VER_EXTRA 1
 
 /* Added for ZAngband */
 #define FAKE_VERSION   0
@@ -118,6 +118,9 @@
 #define MIN_RANDOM_QUEST    40
 #define MAX_RANDOM_QUEST    49
 
+/* Check is the quest index is "fixed" */
+#define is_fixed_quest_idx(Q_IDX) (((Q_IDX) < MIN_RANDOM_QUEST) || ((Q_IDX) > MAX_RANDOM_QUEST))
+
 #define QUEST_OBERON         8
 #define QUEST_SERPENT        9
 
@@ -125,6 +128,7 @@
  * Arena constants
  */
 #define MAX_ARENA_MONS         38      /* -KMW- */
+#define ARENA_DEFEATED_OLD_VER (-(MAX_SHORT))
 
 
 /*
@@ -3669,8 +3673,7 @@
  * Including "bolt", "beam" and "ball" spells
  */
 #define RF4_ATTACK_MASK \
-       (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | \
-        RF4_SHRIEK | RF4_DISPEL)
+       (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_DISPEL)
 
 #define RF5_ATTACK_MASK \
        (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | \
@@ -3680,7 +3683,7 @@
 
 #define RF6_ATTACK_MASK \
        (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | \
-        RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | \
+        RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | RF6_TELE_LEVEL | \
         RF6_DARKNESS | RF6_TRAPS | RF6_FORGET)
 
 /*
@@ -4498,6 +4501,11 @@ extern int PlayerUID;
 
 #define MAX_MANE 16
 #define MAX_MONSPELLS 96
+#define MONSPELL_TYPE_BOLT 1
+#define MONSPELL_TYPE_BALL 2
+#define MONSPELL_TYPE_BREATH 3
+#define MONSPELL_TYPE_SUMMON 4
+#define MONSPELL_TYPE_OTHER 5
 
 #define EATER_EXT 36
 #define EATER_CHARGE 0x10000L
@@ -4623,16 +4631,20 @@ extern int PlayerUID;
 #define MON_GREEN_G       100
 #define MON_NOV_PRIEST_G  109
 #define MON_SILVER_COINS  117
+#define MON_D_ELF         122
 #define MON_MANES         128
 #define MON_LOST_SOUL     133
 #define MON_ROBIN_HOOD    138
 #define MON_NOV_PALADIN_G 147
 #define MON_PHANTOM_W     152
 #define MON_WOUNDED_BEAR  159
+#define MON_D_ELF_MAGE    178
+#define MON_D_ELF_WARRIOR 182
 #define MON_BLUE_HORROR   189
 #define MON_GOLD_COINS    195
 #define MON_VORPAL_BUNNY  205
 #define MON_PRIEST        225
+#define MON_D_ELF_PRIEST  226
 #define MON_TIGER         230
 #define MON_MITHRIL_COINS 239
 #define MON_DRUID         241
@@ -4653,11 +4665,13 @@ extern int PlayerUID;
 #define MON_ENERGY_VOR    359
 #define MON_IRON_GOLEM    367
 #define MON_JADE_MONK     370
+#define MON_D_ELF_WARLOCK 375
 #define MON_HAGEN         383
 #define MON_MENELDOR      384
 #define MON_PHANTOM_B     385
 #define MON_C_CRAWLER     395
 #define MON_XICLOTLAN     396
+#define MON_D_ELF_DRUID   400
 #define MON_TROLL_PRIEST  403
 #define MON_GWAIHIR       410
 #define MON_ANGEL         417
@@ -4687,6 +4701,7 @@ extern int PlayerUID;
 #define MON_REVENANT      555
 #define MON_RAAL          557
 #define MON_COLOSSUS      558
+#define MON_NIGHTBLADE    564
 #define MON_ELDER_THING   569
 #define MON_CRYPT_THING   577
 #define MON_NEXUS_VOR     587