ダークエルフpitを追加. 出現開始階45階で, 鉄獄, 城, 暗闇の洞窟に出現.

diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index b8b2756..7da5248 100644 (file)
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -13,7 +13,7 @@
 
 # N:<index>:<name>
 # D:<long name>
-# W:<min depth>:<min depth>:<min player level>:<flags mode>:<min alloc>:<max alloc chance> <obj good> <obj great> <pit> <nest>
+# W:<min depth>:<min depth>:<min player level>:<flags mode>:<min alloc>:<max alloc chance>:<obj good>:<obj great>:<pit>:<nest>
 # L:<floor1>:<%1>:<floor2>:<%2>:<floor3>:<%3>
 # A:<wall1>:<%1>:<wall2>:<%2>:<wall3>:<%3>:<outer wall>:<inner wall>:<stream1>:<stream2>
 # F:<flags>
@@ -191,7 +191,7 @@ E:Castle
 D:$the entrance to the Castle
 D:¾ë
 P:34:88
-W:20:65:30:3:14:160:75:20:0x017f:0x033f
+W:20:65:30:3:14:160:75:20:0x037f:0x033f
 L:1:100:1:0:1:0:100
 A:56:100:56:0:56:0:57:58:0:0
 F:MONSTER_DIV_16 | ARENA | NO_CAVE | FINAL_GUARDIAN_882

diff --git a/src/defines.h b/src/defines.h
index 39f5949..9863dff 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -4623,16 +4623,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 +4657,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 +4693,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

diff --git a/src/rooms.c b/src/rooms.c
index 07bac04..db35007 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -1603,6 +1603,31 @@ static void vault_prep_dragon(void)
 }
 
 
+/*
+ * Helper function for "monster pit (dark elf)"
+ */
+static bool vault_aux_dark_elf(int r_idx)
+{
+       int i;
+       static int dark_elf_list[] =
+       {
+               MON_D_ELF, MON_D_ELF_MAGE, MON_D_ELF_WARRIOR, MON_D_ELF_PRIEST,
+               MON_D_ELF_LORD, MON_D_ELF_WARLOCK, MON_D_ELF_DRUID, MON_NIGHTBLADE,
+               MON_D_ELF_SORC, MON_D_ELF_SHADE, 0,
+       };
+
+       /* Validate the monster */
+       if (!vault_monster_okay(r_idx)) return FALSE;
+
+       /* Require dark elves */
+       for (i = 0; dark_elf_list[i]; i++)
+               if (r_idx == dark_elf_list[i]) return TRUE;
+
+       /* Assume not */
+       return FALSE;
+}
+
+
 typedef struct vault_aux_type vault_aux_type;
 
 
@@ -1669,56 +1694,58 @@ static void build_type5(int by0, int bx0, bool nest);
 static vault_aux_type nest_types[] =
 {
 #ifdef JP
-       {"¥¯¥í¡¼¥ó",    vault_aux_clone,        vault_prep_clone,       5,      3},
-       {"¥¼¥ê¡¼",      vault_aux_jelly,        NULL,                   5,      6},
-       {"¥·¥ó¥Ü¥ë(Á±)",vault_aux_symbol_g,     vault_prep_symbol,      25,     2},
-       {"¥·¥ó¥Ü¥ë(°­)",vault_aux_symbol_e,     vault_prep_symbol,      25,     2},
-       {"¥ß¥ß¥Ã¥¯",    vault_aux_mimic,        NULL,                   30,     4},
-       {"¶¸µ¤",        vault_aux_cthulhu,      NULL,                   70,     2},
-       {"¸¤¾®²°",      vault_aux_kennel,       NULL,                   45,     4},
-       {"ưʪ±à",      vault_aux_animal,       NULL,                   35,     5},
-       {"¶µ²ñ",        vault_aux_chapel_g,     NULL,                   75,     4},
-       {"¥¢¥ó¥Ç¥Ã¥É",  vault_aux_undead,       NULL,                   75,     5},
-       {NULL,          NULL,                   NULL,                   0,      0},
+       {"¥¯¥í¡¼¥ó",     vault_aux_clone,    vault_prep_clone,   5, 3},
+       {"¥¼¥ê¡¼",       vault_aux_jelly,    NULL,               5, 6},
+       {"¥·¥ó¥Ü¥ë(Á±)", vault_aux_symbol_g, vault_prep_symbol, 25, 2},
+       {"¥·¥ó¥Ü¥ë(°­)", vault_aux_symbol_e, vault_prep_symbol, 25, 2},
+       {"¥ß¥ß¥Ã¥¯",     vault_aux_mimic,    NULL,              30, 4},
+       {"¶¸µ¤",         vault_aux_cthulhu,  NULL,              70, 2},
+       {"¸¤¾®²°",       vault_aux_kennel,   NULL,              45, 4},
+       {"ưʪ±à",       vault_aux_animal,   NULL,              35, 5},
+       {"¶µ²ñ",         vault_aux_chapel_g, NULL,              75, 4},
+       {"¥¢¥ó¥Ç¥Ã¥É",   vault_aux_undead,   NULL,              75, 5},
+       {NULL,           NULL,               NULL,               0, 0},
 #else
-       {"clone",       vault_aux_clone,        vault_prep_clone,       5,      3},
-       {"jelly",       vault_aux_jelly,        NULL,                   5,      6},
-       {"symbol good",vault_aux_symbol_g,      vault_prep_symbol,      25,     2},
-       {"symbol evil",vault_aux_symbol_e,      vault_prep_symbol,      25,     2},
-       {"mimic",       vault_aux_mimic,        NULL,                   30,     4},
-       {"lovecraftian",vault_aux_cthulhu,      NULL,                   70,     2},
-       {"kennel",      vault_aux_kennel,       NULL,                   45,     4},
-       {"animal",      vault_aux_animal,       NULL,                   35,     5},
-       {"chapel",      vault_aux_chapel_g,     NULL,                   75,     4},
-       {"undead",      vault_aux_undead,       NULL,                   75,     5},
-       {NULL,          NULL,                   NULL,                   0,      0},
+       {"clone",        vault_aux_clone,    vault_prep_clone,   5, 3},
+       {"jelly",        vault_aux_jelly,    NULL,               5, 6},
+       {"symbol good",  vault_aux_symbol_g, vault_prep_symbol, 25, 2},
+       {"symbol evil",  vault_aux_symbol_e, vault_prep_symbol, 25, 2},
+       {"mimic",        vault_aux_mimic,    NULL,              30, 4},
+       {"lovecraftian", vault_aux_cthulhu,  NULL,              70, 2},
+       {"kennel",       vault_aux_kennel,   NULL,              45, 4},
+       {"animal",       vault_aux_animal,   NULL,              35, 5},
+       {"chapel",       vault_aux_chapel_g, NULL,              75, 4},
+       {"undead",       vault_aux_undead,   NULL,              75, 5},
+       {NULL,           NULL,               NULL,               0, 0},
 #endif
 };
 
 static vault_aux_type pit_types[] =
 {
 #ifdef JP
-       {"¥ª¡¼¥¯",      vault_aux_orc,          NULL,                   5,      6},
-       {"¥È¥í¥ë",      vault_aux_troll,        NULL,                   20,     6},
-       {"¥¸¥ã¥¤¥¢¥ó¥È",vault_aux_giant,        NULL,                   50,     6},
-       {"¶¸µ¤",        vault_aux_cthulhu,      NULL,                   80,     2},
-       {"¥·¥ó¥Ü¥ë(Á±)",vault_aux_symbol_g,     vault_prep_symbol,      70,     1},
-       {"¥·¥ó¥Ü¥ë(°­)",vault_aux_symbol_e,     vault_prep_symbol,      70,     1},
-       {"¶µ²ñ",        vault_aux_chapel_g,     NULL,                   65,     2},
-       {"¥É¥é¥´¥ó",    vault_aux_dragon,       vault_prep_dragon,      70,     6},
-       {"¥Ç¡¼¥â¥ó",    vault_aux_demon,        NULL,                   80,     6},
-       {NULL,          NULL,                   NULL,                   0,      0},
+       {"¥ª¡¼¥¯",       vault_aux_orc,      NULL,               5, 6},
+       {"¥È¥í¥ë",       vault_aux_troll,    NULL,              20, 6},
+       {"¥¸¥ã¥¤¥¢¥ó¥È", vault_aux_giant,    NULL,              50, 6},
+       {"¶¸µ¤",         vault_aux_cthulhu,  NULL,              80, 2},
+       {"¥·¥ó¥Ü¥ë(Á±)", vault_aux_symbol_g, vault_prep_symbol, 70, 1},
+       {"¥·¥ó¥Ü¥ë(°­)", vault_aux_symbol_e, vault_prep_symbol, 70, 1},
+       {"¶µ²ñ",         vault_aux_chapel_g, NULL,              65, 2},
+       {"¥É¥é¥´¥ó",     vault_aux_dragon,   vault_prep_dragon, 70, 6},
+       {"¥Ç¡¼¥â¥ó",     vault_aux_demon,    NULL,              80, 6},
+       {"¥À¡¼¥¯¥¨¥ë¥Õ", vault_aux_dark_elf, NULL,              45, 4},
+       {NULL,           NULL,               NULL,               0, 0},
 #else
-       {"orc",         vault_aux_orc,          NULL,                   5,      6},
-       {"troll",       vault_aux_troll,        NULL,                   20,     6},
-       {"giant",       vault_aux_giant,        NULL,                   50,     6},
-       {"lovecraftian",vault_aux_cthulhu,      NULL,                   80,     2},
-       {"symbol good",vault_aux_symbol_g,      vault_prep_symbol,      70,     1},
-       {"symbol evil",vault_aux_symbol_e,      vault_prep_symbol,      70,     1},
-       {"chapel",      vault_aux_chapel_g,     NULL,                   65,     2},
-       {"dragon",      vault_aux_dragon,       vault_prep_dragon,      70,     6},
-       {"demon",       vault_aux_demon,        NULL,                   80,     6},
-       {NULL,          NULL,                   NULL,                   0,      0},
+       {"orc",          vault_aux_orc,      NULL,               5, 6},
+       {"troll",        vault_aux_troll,    NULL,              20, 6},
+       {"giant",        vault_aux_giant,    NULL,              50, 6},
+       {"lovecraftian", vault_aux_cthulhu,  NULL,              80, 2},
+       {"symbol good",  vault_aux_symbol_g, vault_prep_symbol, 70, 1},
+       {"symbol evil",  vault_aux_symbol_e, vault_prep_symbol, 70, 1},
+       {"chapel",       vault_aux_chapel_g, NULL,              65, 2},
+       {"dragon",       vault_aux_dragon,   vault_prep_dragon, 70, 6},
+       {"demon",        vault_aux_demon,    NULL,              80, 6},
+       {"dark elf",     vault_aux_dark_elf, NULL,              45, 4},
+       {NULL,           NULL,               NULL,               0, 0},
 #endif
 };
 
@@ -1745,6 +1772,7 @@ static vault_aux_type pit_types[] =
 #define PIT_TYPE_CHAPEL        6
 #define PIT_TYPE_DRAGON        7
 #define PIT_TYPE_DEMON         8
+#define PIT_TYPE_DARK_ELF      9
 
 
 /*