#include "angband.h"
#include "grid.h"
#include "trap.h"
+#include "monsterrace-hook.h"
+#include "melee.h"
/*!
*/
static bool detect_feat_flag(POSITION range, int flag, bool known)
{
- int x, y;
+ POSITION x, y;
bool detect = FALSE;
cave_type *c_ptr;
{
int dist = distance(p_ptr->y, p_ptr->x, y, x);
if (dist > range) continue;
-
- /* Access the grid */
c_ptr = &cave[y][x];
/* Hack -- Safe */
c_ptr->info &= ~(CAVE_UNSAFE);
- /* Redraw */
lite_spot(y, x);
}
}
/* Hack -- Memorize */
c_ptr->info |= (CAVE_MARK);
- /* Redraw */
lite_spot(y, x);
- /* Obvious */
detect = TRUE;
}
}
if (known) p_ptr->dtrap = TRUE;
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!"));
bool detect = detect_feat_flag(range, FF_DOOR, TRUE);
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!"));
bool detect = detect_feat_flag(range, FF_STAIRS, TRUE);
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!"));
bool detect = detect_feat_flag(range, FF_HAS_GOLD, TRUE);
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!"));
*/
bool detect_objects_gold(POSITION range)
{
- int i, y, x;
+ OBJECT_IDX i;
+ POSITION y, x;
POSITION range2 = range;
bool detect = FALSE;
}
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("財宝の存在を感じとった！", "You sense the presence of treasure!"));
*/
bool detect_objects_normal(POSITION range)
{
- int i, y, x;
+ OBJECT_IDX i;
+ POSITION y, x;
POSITION range2 = range;
bool detect = FALSE;
}
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
- /* Describe */
if (detect)
{
msg_print(_("アイテムの存在を感じとった！", "You sense the presence of objects!"));
*/
bool detect_objects_magic(POSITION range)
{
- int i, y, x, tv;
+ OBJECT_TYPE_VALUE tv;
+ OBJECT_IDX i;
+ POSITION y, x;
bool detect = FALSE;
detect = TRUE;
}
}
-
- /* Describe */
if (detect)
{
msg_print(_("魔法のアイテムの存在を感じとった！", "You sense the presence of magic objects!"));
{
MONSTER_IDX i;
POSITION y, x;
-
bool flag = FALSE;
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
}
return (flag);
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!"));
}
return (flag);
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!"));
}
return (flag);
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
- monster_race *r_ptr = &r_info[m_ptr->r_idx];
/* Skip dead monsters */
if (!m_ptr->r_idx) continue;
if (distance(p_ptr->y, p_ptr->x, y, x) > range) continue;
/* Detect non-living monsters */
- if (!monster_living(r_ptr))
+ if (!monster_living(m_ptr->r_idx))
{
/* Update monster recall window */
if (p_ptr->monster_race_idx == m_ptr->r_idx)
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!"));
}
return (flag);
{
MONSTER_IDX i;
POSITION y, x;
- bool flag = FALSE;
+ bool flag = FALSE;
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!"));
}
return (flag);
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
- /* Describe */
if (flag)
{
- /* Describe result */
msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!"));
}
return (flag);
if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
- /* Scan monsters */
for (i = 1; i < m_max; i++)
{
monster_type *m_ptr = &m_list[i];
/* Repair visibility later */
repair_monsters = TRUE;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
flag = TRUE;
}
}
-
- /* Describe */
if (flag)
{
switch (match_flag)
break;
}
- /* Describe result */
msg_format(_("%sの存在を感じとった！", "You sense the presence of %s!"), desc_monsters);
msg_print(NULL);
}
/* Aggravate everyone nearby */
for (i = 1; i < m_max; i++)
{
- monster_type *m_ptr = &m_list[i];
-/* monster_race *r_ptr = &r_info[m_ptr->r_idx]; */
+ monster_type *m_ptr = &m_list[i];
/* Paranoia -- Skip dead monsters */
if (!m_ptr->r_idx) continue;
if (player_cast)
{
- /* Take damage */
take_hit(DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name), -1);
}
/* Visual feedback */
move_cursor_relative(p_ptr->y, p_ptr->x);
- /* Redraw */
p_ptr->redraw |= (PR_HP);
p_ptr->window |= (PW_PLAYER);
- /* Handle */
handle_stuff();
Term_fresh();
- /* Delay */
Term_xtra(TERM_XTRA_DELAY, msec);
return !resist;
*/
bool probing(void)
{
- int i, speed;
+ int i;
+ int speed; /* TODO */
bool_hack cu, cv;
bool probe = FALSE;
char buf[256];
/* HACK : Add the line to message buffer */
message_add(buf);
+
p_ptr->window |= (PW_MESSAGE);
- window_stuff();
+ handle_stuff();
if (m_ptr->ml) move_cursor_relative(m_ptr->fy, m_ptr->fx);
inkey();
POSITION y, x;
int k, t;
cave_type *c_ptr;
- bool flag = FALSE;
+ bool flag = FALSE;
/* Prevent destruction of quest levels and town */
if ((p_ptr->inside_quest && is_fixed_quest_idx(p_ptr->inside_quest)) || !dun_level)
/* Stay in the circle of death */
if (k > r) continue;
-
- /* Access the grid */
c_ptr = &cave[y][x];
/* Lose room and vault */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
/* Stay in the circle of death */
if (k > r) continue;
-
- /* Access the grid */
c_ptr = &cave[y][x];
if (is_mirror_grid(c_ptr)) c_ptr->info |= CAVE_GLOW;
p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
/* Skip distant grids */
if (distance(cy, cx, yy, xx) > r) continue;
-
- /* Access the grid */
c_ptr = &cave[yy][xx];
/* Lose room and vault */
/* Important -- no wall on player */
map[16+p_ptr->y-cy][16+p_ptr->x-cx] = FALSE;
- /* Take some damage */
if (damage)
{
cptr killer;
/* Skip unaffected grids */
if (!map[16+yy-cy][16+xx-cx]) continue;
-
- /* Access the grid */
c_ptr = &cave[yy][xx];
if (c_ptr->m_idx == p_ptr->riding) continue;
/* Look for safety */
for (i = 0; i < 8; i++)
{
- /* Access the grid */
y = yy + ddy_ddd[i];
x = xx + ddx_ddd[i];
m_ptr->fx = sx;
/* Update the monster (new location) */
- update_mon(m_idx, TRUE);
+ update_monster(m_idx, TRUE);
/* Redraw the old grid */
lite_spot(yy, xx);
/* Skip distant grids */
if (distance(cy, cx, yy, xx) > r) continue;
-
- /* Access the grid */
c_ptr = &cave[yy][xx];
if (is_mirror_grid(c_ptr)) c_ptr->info |= CAVE_GLOW;
/* Update the health bar */
p_ptr->redraw |= (PR_HEALTH | PR_UHEALTH);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
monster_type *m_ptr = &m_list[c_ptr->m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
- /* Update the monster */
- update_mon(c_ptr->m_idx, FALSE);
+ update_monster(c_ptr->m_idx, FALSE);
/* Stupid monsters rarely wake up */
if (r_ptr->flags2 & (RF2_STUPID)) chance = 10;
if (m_ptr->ml)
{
char m_name[80];
-
- /* Acquire the monster name */
monster_desc(m_name, m_ptr, 0);
-
- /* Dump a message */
msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
}
}
/* Note */
note_spot(y, x);
- /* Redraw */
lite_spot(y, x);
update_local_illumination(y, x);
/* Process affected monsters */
if (c_ptr->m_idx)
{
- /* Update the monster */
- update_mon(c_ptr->m_idx, FALSE);
+ update_monster(c_ptr->m_idx, FALSE);
}
- /* Redraw */
lite_spot(y, x);
update_local_illumination(y, x);
p_ptr->update |= (PU_FLOW);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
return dummy;
/* Move player before updating the monster */
if (!player_bold(ty, tx)) teleport_player_to(ty, tx, TELEPORT_NONMAGICAL);
-
- /* Update the monster */
- update_mon(cave[ny][nx].m_idx, TRUE);
+ update_monster(cave[ny][nx].m_idx, TRUE);
/* Found a monster */
m_ptr = &m_list[cave[ny][nx].m_idx];
(void)set_cut(0);
(void)restore_all_status();
(void)set_shero(0, TRUE);
- update_stuff();
+ handle_stuff();
hp_player(5000);
return TRUE;
OSDN Git Service
