break;
}
- case SUMMON_BIZARRE1:
+ case SUMMON_MOLD:
{
okay = (r_ptr->d_char == 'm');
break;
}
- case SUMMON_BIZARRE2:
+ case SUMMON_BAT:
{
okay = (r_ptr->d_char == 'b');
break;
}
- case SUMMON_BIZARRE3:
+ case SUMMON_QUYLTHULG:
{
okay = (r_ptr->d_char == 'Q');
break;
}
- case SUMMON_BIZARRE4:
- {
- okay = (r_ptr->d_char == 'v');
- break;
- }
-
- case SUMMON_BIZARRE5:
+ case SUMMON_COIN_MIMIC:
{
okay = (r_ptr->d_char == '$');
break;
}
- case SUMMON_BIZARRE6:
+ case SUMMON_MIMIC:
{
okay = ((r_ptr->d_char == '!') ||
(r_ptr->d_char == '?') ||
!(r_ptr->flags3 & (RF3_UNDEAD)) &&
!(r_ptr->flags3 & (RF3_DEMON)) &&
!(r_ptr->flags2 & (RF2_MULTIPLY)) &&
- !(r_ptr->flags4 || r_ptr->flags5 || r_ptr->flags6));
+ !(r_ptr->flags4 || r_ptr->a_ability_flags1 || r_ptr->a_ability_flags2));
break;
}
if (r_idx != MON_CHAMELEON &&
r_ptr->freq_spell &&
!(r_ptr->flags4 & RF4_NOMAGIC_MASK) &&
- !(r_ptr->flags5 & RF5_NOMAGIC_MASK) &&
- !(r_ptr->flags6 & RF6_NOMAGIC_MASK))
+ !(r_ptr->a_ability_flags1 & RF5_NOMAGIC_MASK) &&
+ !(r_ptr->a_ability_flags2 & RF6_NOMAGIC_MASK))
return FALSE;
}
if (d_ptr->flags1 & DF1_NO_MELEE)
{
if (r_idx == MON_CHAMELEON) return TRUE;
if (!(r_ptr->flags4 & (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK)) &&
- !(r_ptr->flags5 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_CAUSE_1 | RF5_CAUSE_2 | RF5_CAUSE_3 | RF5_CAUSE_4 | RF5_MIND_BLAST | RF5_BRAIN_SMASH)) &&
- !(r_ptr->flags6 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK)))
+ !(r_ptr->a_ability_flags1 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_CAUSE_1 | RF5_CAUSE_2 | RF5_CAUSE_3 | RF5_CAUSE_4 | RF5_MIND_BLAST | RF5_BRAIN_SMASH)) &&
+ !(r_ptr->a_ability_flags2 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK)))
return FALSE;
}
if (d_ptr->flags1 & DF1_BEGINNER)
if ((d_ptr->mflags4 & r_ptr->flags4) != d_ptr->mflags4)
return FALSE;
}
- if (d_ptr->mflags5)
+ if (d_ptr->m_a_ability_flags1)
{
- if ((d_ptr->mflags5 & r_ptr->flags5) != d_ptr->mflags5)
+ if ((d_ptr->m_a_ability_flags1 & r_ptr->a_ability_flags1) != d_ptr->m_a_ability_flags1)
return FALSE;
}
- if (d_ptr->mflags6)
+ if (d_ptr->m_a_ability_flags2)
{
- if ((d_ptr->mflags6 & r_ptr->flags6) != d_ptr->mflags6)
+ if ((d_ptr->m_a_ability_flags2 & r_ptr->a_ability_flags2) != d_ptr->m_a_ability_flags2)
return FALSE;
}
if (d_ptr->mflags7)
if ((d_ptr->mflags4 & r_ptr->flags4) != d_ptr->mflags4)
return TRUE;
}
- if (d_ptr->mflags5)
+ if (d_ptr->m_a_ability_flags1)
{
- if ((d_ptr->mflags5 & r_ptr->flags5) != d_ptr->mflags5)
+ if ((d_ptr->m_a_ability_flags1 & r_ptr->a_ability_flags1) != d_ptr->m_a_ability_flags1)
return TRUE;
}
- if (d_ptr->mflags6)
+ if (d_ptr->m_a_ability_flags2)
{
- if ((d_ptr->mflags6 & r_ptr->flags6) != d_ptr->mflags6)
+ if ((d_ptr->m_a_ability_flags2 & r_ptr->a_ability_flags2) != d_ptr->m_a_ability_flags2)
return TRUE;
}
if (d_ptr->mflags7)
if (r_ptr->flags2 & d_ptr->mflags2) return TRUE;
if (r_ptr->flags3 & d_ptr->mflags3) return TRUE;
if (r_ptr->flags4 & d_ptr->mflags4) return TRUE;
- if (r_ptr->flags5 & d_ptr->mflags5) return TRUE;
- if (r_ptr->flags6 & d_ptr->mflags6) return TRUE;
+ if (r_ptr->a_ability_flags1 & d_ptr->m_a_ability_flags1) return TRUE;
+ if (r_ptr->a_ability_flags2 & d_ptr->m_a_ability_flags2) return TRUE;
if (r_ptr->flags7 & d_ptr->mflags7) return TRUE;
if (r_ptr->flags8 & d_ptr->mflags8) return TRUE;
if (r_ptr->flags9 & d_ptr->mflags9) return TRUE;
if (r_ptr->flags2 & d_ptr->mflags2) return FALSE;
if (r_ptr->flags3 & d_ptr->mflags3) return FALSE;
if (r_ptr->flags4 & d_ptr->mflags4) return FALSE;
- if (r_ptr->flags5 & d_ptr->mflags5) return FALSE;
- if (r_ptr->flags6 & d_ptr->mflags6) return FALSE;
+ if (r_ptr->a_ability_flags1 & d_ptr->m_a_ability_flags1) return FALSE;
+ if (r_ptr->a_ability_flags2 & d_ptr->m_a_ability_flags2) return FALSE;
if (r_ptr->flags7 & d_ptr->mflags7) return FALSE;
if (r_ptr->flags8 & d_ptr->mflags8) return FALSE;
if (r_ptr->flags9 & d_ptr->mflags9) return FALSE;
alloc_entry *table = alloc_race_table;
int pls_kakuritu, pls_level;
- int hoge = mysqrt(level*10000L);
+ int delay = mysqrt(level * 10000L) + 400L;
if (level > MAX_DEPTH - 1) level = MAX_DEPTH - 1;
- pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 2500L) - hoge / 10)));
- pls_level = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 20000L) - hoge / 40 + MIN(5, level / 10)) ;
+ pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 5000L) - delay / 10)));
+ pls_level = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 40000L) - delay / 40 + MIN(5, level / 10)) ;
if (d_info[dungeon_type].flags1 & DF1_MAZE)
{
if (!(r_ptr->r_flags4 & (1L << i)) &&
(r_ptr->flags4 & (1L << i))) n++;
if (!(r_ptr->r_flags5 & (1L << i)) &&
- (r_ptr->flags5 & (1L << i))) n++;
+ (r_ptr->a_ability_flags1 & (1L << i))) n++;
if (!(r_ptr->r_flags6 & (1L << i)) &&
- (r_ptr->flags6 & (1L << i))) n++;
+ (r_ptr->a_ability_flags2 & (1L << i))) n++;
if (!(r_ptr->r_flagsr & (1L << i)) &&
(r_ptr->flagsr & (1L << i))) n++;
r_ptr->r_flags2 = r_ptr->flags2;
r_ptr->r_flags3 = r_ptr->flags3;
r_ptr->r_flags4 = r_ptr->flags4;
- r_ptr->r_flags5 = r_ptr->flags5;
- r_ptr->r_flags6 = r_ptr->flags6;
+ r_ptr->r_flags5 = r_ptr->a_ability_flags1;
+ r_ptr->r_flags6 = r_ptr->a_ability_flags2;
r_ptr->r_flagsr = r_ptr->flagsr;
/* r_flags7 is actually unused */
if (p_ptr->inside_battle || !character_dungeon) return;
- if (!necro)
+ if (!necro && m_ptr)
{
- char m_name[80];
- monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
+ char m_name[80];
+ monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
power = r_ptr->level / 2;
if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
return; /* oops */
-
-
if (is_pet(m_ptr))
return; /* Pet eldritch horrors are safe most of the time */
funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
#endif
-
if (one_in_(3))
{
msg_print(funny_comments[randint0(MAX_SAN_COMMENT)]);
if (saving_throw(25 + p_ptr->lev)) return;
}
}
+ else if(!necro)
+ {
+ monster_race *r_ptr;
+ char m_name[80];
+ cptr desc;
+
+ get_mon_num_prep(get_nightmare, NULL);
+
+ r_ptr = &r_info[get_mon_num(MAX_DEPTH)];
+ power = r_ptr->level + 10;
+ desc = r_name + r_ptr->name;
+
+ get_mon_num_prep(NULL, NULL);
+
+ /* Describe it */
+#ifndef JP
+ if (!(r_ptr->flags1 & RF1_UNIQUE))
+ sprintf(m_name, "%s %s", (is_a_vowel(desc[0]) ? "an" : "a"), desc);
+ else
+#endif
+ sprintf(m_name, "%s", desc);
+
+ if (!(r_ptr->flags1 & RF1_UNIQUE))
+ {
+ if (r_ptr->flags1 & RF1_FRIENDS) power /= 2;
+ }
+ else power *= 2;
+
+ if (saving_throw(p_ptr->skill_sav * 100 / power))
+ {
+ msg_format(_("夢の中で%sに追いかけられた。", "%^s chases you through your dreams."), m_name);
+ /* Safe */
+ return;
+ }
+
+ if (p_ptr->image)
+ {
+ /* Something silly happens... */
+ msg_format(_("%s%sの顔を見てしまった！", "You behold the %s visage of %s!"),
+ funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
+
+ if (one_in_(3))
+ {
+ msg_print(funny_comments[randint0(MAX_SAN_COMMENT)]);
+ p_ptr->image = p_ptr->image + randint1(r_ptr->level);
+ }
+
+ /* Never mind; we can't see it clearly enough */
+ return;
+ }
+
+ /* Something frightening happens... */
+ msg_format(_("%s%sの顔を見てしまった！", "You behold the %s visage of %s!"),
+ horror_desc[randint0(MAX_SAN_HORROR)], desc);
+
+ r_ptr->r_flags2 |= RF2_ELDRITCH_HORROR;
+
+ if (!p_ptr->mimic_form)
+ {
+ switch (p_ptr->prace)
+ {
+ /* Demons may make a saving throw */
+ case RACE_IMP:
+ case RACE_DEMON:
+ if (saving_throw(20 + p_ptr->lev)) return;
+ break;
+ /* Undead may make a saving throw */
+ case RACE_SKELETON:
+ case RACE_ZOMBIE:
+ case RACE_SPECTRE:
+ case RACE_VAMPIRE:
+ if (saving_throw(10 + p_ptr->lev)) return;
+ break;
+ }
+ }
+ else
+ {
+ /* Demons may make a saving throw */
+ if (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)
+ {
+ if (saving_throw(20 + p_ptr->lev)) return;
+ }
+ /* Undead may make a saving throw */
+ else if (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_UNDEAD)
+ {
+ if (saving_throw(10 + p_ptr->lev)) return;
+ }
+ }
+ }
else
{
msg_print(_("ネクロノミコンを読んで正気を失った！", "Your sanity is shaken by reading the Necronomicon!"));
if (full)
{
/* Distance components */
- int dy = (py > fy) ? (py - fy) : (fy - py);
- int dx = (px > fx) ? (px - fx) : (fx - px);
+ int dy = (p_ptr->y > fy) ? (p_ptr->y - fy) : (fy - p_ptr->y);
+ int dx = (p_ptr->x > fx) ? (p_ptr->x - fx) : (fx - p_ptr->x);
/* Approximate distance */
d = (dy > dx) ? (dy + (dx>>1)) : (dx + (dy>>1));
}
/* Disturb on appearance */
- if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, py, px) && projectable(py, px, m_ptr->fy, m_ptr->fx)))
+ if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)))
{
if (disturb_pets || is_hostile(m_ptr))
disturb(1, 1);
{
/* Access the location */
cave_type *c_ptr = &cave[y][x];
-
monster_type *m_ptr;
-
monster_race *r_ptr = &r_info[r_idx];
-
cptr name = (r_name + r_ptr->name);
int cmi;
* @param r_idx チェックするモンスター種族のID
* @return 護衛にできるならばtrue
*/
-static bool place_monster_okay(int r_idx)
+static bool place_monster_can_escort(int r_idx)
{
monster_race *r_ptr = &r_info[place_monster_idx];
monster_type *m_ptr = &m_list[place_monster_m_idx];
if (!cave_empty_bold2(ny, nx)) continue;
/* Prepare allocation table */
- get_mon_num_prep(place_monster_okay, get_monster_hook2(ny, nx));
+ get_mon_num_prep(place_monster_can_escort, get_monster_hook2(ny, nx));
/* Pick a random race */
z = get_mon_num(r_ptr->level);
}
/* Accept far away grids */
- if (distance(y, x, py, px) > dis) break;
+ if (distance(y, x, p_ptr->y, p_ptr->x) > dis) break;
}
if (!attempts_left)
if (cave[y][x].m_idx != 0) return FALSE;
/* Save player location */
- py = y;
- px = x;
+ p_ptr->y = y;
+ p_ptr->x = x;
/* Success */
return TRUE;
OSDN Git Service
