X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspells2.c;h=801f2822f7864c3104c9ea5aabfb1727f7e567ba;hb=eb2f15d1cfc313fda1f0578f2685246f3b76af4d;hp=133f9c745a7431055a5b704a0d727d0b58f9a14c;hpb=27bc625c2a9f93ed2d2d520d74181f998a86890f;p=hengband%2Fhengband.git

diff --git a/src/spells2.c b/src/spells2.c
index 133f9c745..801f2822f 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -14,6 +14,8 @@
 #include "angband.h"
 #include "grid.h"
 #include "trap.h"
+#include "monsterrace-hook.h"
+#include "melee.h"
 
 
 /*!
@@ -25,8 +27,8 @@
  */
 static bool detect_feat_flag(POSITION range, int flag, bool known)
 {
-	int       x, y;
-	bool      detect = FALSE;
+	POSITION x, y;
+	bool detect = FALSE;
 	cave_type *c_ptr;
 
 	if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
@@ -38,8 +40,6 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
 		{
 			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 */
@@ -52,7 +52,6 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
 
 					c_ptr->info &= ~(CAVE_UNSAFE);
 
-					/* Redraw */
 					lite_spot(y, x);
 				}
 			}
@@ -66,16 +65,12 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
 				/* Hack -- Memorize */
 				c_ptr->info |= (CAVE_MARK);
 
-				/* Redraw */
 				lite_spot(y, x);
 
-				/* Obvious */
 				detect = TRUE;
 			}
 		}
 	}
-
-	/* Result */
 	return detect;
 }
 
@@ -93,14 +88,10 @@ bool detect_traps(POSITION range, bool known)
 	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!"));
 	}
-
-	/* Result */
 	return detect;
 }
 
@@ -115,14 +106,10 @@ bool detect_doors(POSITION range)
 	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!"));
 	}
-
-	/* Result */
 	return detect;
 }
 
@@ -137,14 +124,10 @@ bool detect_stairs(POSITION range)
 	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!"));
 	}
-
-	/* Result */
 	return detect;
 }
 
@@ -159,14 +142,10 @@ bool detect_treasure(POSITION range)
 	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!"));
 	}
-
-	/* Result */
 	return detect;
 }
 
@@ -178,7 +157,8 @@ bool detect_treasure(POSITION range)
  */
 bool detect_objects_gold(POSITION range)
 {
-	int i, y, x;
+	OBJECT_IDX i;
+	POSITION y, x;
 	POSITION range2 = range;
 
 	bool detect = FALSE;
@@ -196,7 +176,6 @@ bool detect_objects_gold(POSITION range)
 		/* Skip held objects */
 		if (o_ptr->held_m_idx) continue;
 
-		/* Location */
 		y = o_ptr->iy;
 		x = o_ptr->ix;
 
@@ -206,20 +185,13 @@ bool detect_objects_gold(POSITION range)
 		/* Detect "gold" objects */
 		if (o_ptr->tval == TV_GOLD)
 		{
-			/* Hack -- memorize it */
 			o_ptr->marked |= OM_FOUND;
-
-			/* Redraw */
 			lite_spot(y, x);
-
-			/* Detect */
 			detect = TRUE;
 		}
 	}
 
 	if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
-	/* Describe */
 	if (detect)
 	{
 		msg_print(_("財宝の存在を感じとった！", "You sense the presence of treasure!"));
@@ -229,8 +201,6 @@ bool detect_objects_gold(POSITION range)
 	{
 		detect = TRUE;
 	}
-
-	/* Result */
 	return (detect);
 }
 
@@ -242,7 +212,8 @@ bool detect_objects_gold(POSITION range)
  */
 bool detect_objects_normal(POSITION range)
 {
-	int i, y, x;
+	OBJECT_IDX i;
+	POSITION y, x;
 	POSITION range2 = range;
 
 	bool detect = FALSE;
@@ -260,7 +231,6 @@ bool detect_objects_normal(POSITION range)
 		/* Skip held objects */
 		if (o_ptr->held_m_idx) continue;
 
-		/* Location */
 		y = o_ptr->iy;
 		x = o_ptr->ix;
 
@@ -270,20 +240,13 @@ bool detect_objects_normal(POSITION range)
 		/* Detect "real" objects */
 		if (o_ptr->tval != TV_GOLD)
 		{
-			/* Hack -- memorize it */
 			o_ptr->marked |= OM_FOUND;
-
-			/* Redraw */
 			lite_spot(y, x);
-
-			/* Detect */
 			detect = TRUE;
 		}
 	}
 
 	if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
-	/* Describe */
 	if (detect)
 	{
 		msg_print(_("アイテムの存在を感じとった！", "You sense the presence of objects!"));
@@ -293,8 +256,6 @@ bool detect_objects_normal(POSITION range)
 	{
 		detect = TRUE;
 	}
-
-	/* Result */
 	return (detect);
 }
 
@@ -314,7 +275,9 @@ bool detect_objects_normal(POSITION range)
  */
 bool detect_objects_magic(POSITION range)
 {
-	int i, y, x, tv;
+	OBJECT_TYPE_VALUE tv;
+	OBJECT_IDX i;
+	POSITION y, x;
 
 	bool detect = FALSE;
 
@@ -331,7 +294,6 @@ bool detect_objects_magic(POSITION range)
 		/* Skip held objects */
 		if (o_ptr->held_m_idx) continue;
 
-		/* Location */
 		y = o_ptr->iy;
 		x = o_ptr->ix;
 
@@ -369,16 +331,10 @@ bool detect_objects_magic(POSITION range)
 		{
 			/* Memorize the item */
 			o_ptr->marked |= OM_FOUND;
-
-			/* Redraw */
 			lite_spot(y, x);
-
-			/* Detect */
 			detect = TRUE;
 		}
 	}
-
-	/* Describe */
 	if (detect)
 	{
 		msg_print(_("魔法のアイテムの存在を感じとった！", "You sense the presence of magic objects!"));
@@ -398,12 +354,10 @@ bool detect_monsters_normal(POSITION range)
 {
 	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];
@@ -412,7 +366,6 @@ bool detect_monsters_normal(POSITION range)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -425,27 +378,17 @@ bool detect_monsters_normal(POSITION range)
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			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!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -463,7 +406,6 @@ bool detect_monsters_invis(POSITION range)
 
 	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];
@@ -472,7 +414,6 @@ bool detect_monsters_invis(POSITION range)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -485,34 +426,23 @@ bool detect_monsters_invis(POSITION range)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			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!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -529,7 +459,6 @@ bool detect_monsters_evil(POSITION range)
 
 	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];
@@ -538,7 +467,6 @@ bool detect_monsters_evil(POSITION range)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -556,7 +484,6 @@ bool detect_monsters_evil(POSITION range)
 				/* Update monster recall window */
 				if (p_ptr->monster_race_idx == m_ptr->r_idx)
 				{
-					/* Window stuff */
 					p_ptr->window |= (PW_MONSTER);
 				}
 			}
@@ -564,25 +491,15 @@ bool detect_monsters_evil(POSITION range)
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			update_monster(i, FALSE);
 			flag = TRUE;
 		}
 	}
-
-	/* Describe */
 	if (flag)
 	{
-		/* Describe result */
 		msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -599,16 +516,13 @@ bool detect_monsters_nonliving(POSITION range)
 
 	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;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -616,37 +530,26 @@ bool detect_monsters_nonliving(POSITION range)
 		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)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			update_monster(i, FALSE);
 			flag = TRUE;
 		}
 	}
-
-	/* Describe */
 	if (flag)
 	{
-		/* Describe result */
 		msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -659,11 +562,10 @@ bool detect_monsters_mind(POSITION range)
 {
 	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];
@@ -672,7 +574,6 @@ bool detect_monsters_mind(POSITION range)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -685,32 +586,21 @@ bool detect_monsters_mind(POSITION range)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			update_monster(i, FALSE);
 			flag = TRUE;
 		}
 	}
-
-	/* Describe */
 	if (flag)
 	{
-		/* Describe result */
 		msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -729,7 +619,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 
 	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];
@@ -738,7 +627,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -751,34 +639,23 @@ bool detect_monsters_string(POSITION range, cptr Match)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			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!"));
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -797,7 +674,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_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];
@@ -806,7 +682,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -824,7 +699,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 				/* Update monster recall window */
 				if (p_ptr->monster_race_idx == m_ptr->r_idx)
 				{
-					/* Window stuff */
 					p_ptr->window |= (PW_MONSTER);
 				}
 			}
@@ -832,18 +706,11 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 			/* Repair visibility later */
 			repair_monsters = TRUE;
 
-			/* Hack -- Detect monster */
 			m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
-			/* Update the monster */
-			update_mon(i, FALSE);
-
-			/* Detect */
+			update_monster(i, FALSE);
 			flag = TRUE;
 		}
 	}
-
-	/* Describe */
 	if (flag)
 	{
 		switch (match_flag)
@@ -856,12 +723,9 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 				break;
 		}
 
-		/* Describe result */
 		msg_format(_("%sの存在を感じとった！", "You sense the presence of %s!"), desc_monsters);
 		msg_print(NULL);
 	}
-
-	/* Result */
 	return (flag);
 }
 
@@ -887,8 +751,6 @@ bool detect_all(POSITION range)
 	if (detect_objects_normal(range)) detect = TRUE;
 	if (detect_monsters_invis(range)) detect = TRUE;
 	if (detect_monsters_normal(range)) detect = TRUE;
-
-	/* Result */
 	return (detect);
 }
 
@@ -906,11 +768,12 @@ bool detect_all(POSITION range)
  * this is done in two passes. -- JDL
  * </pre>
  */
-bool project_hack(int typ, HIT_POINT dam)
+bool project_all_los(EFFECT_ID typ, HIT_POINT dam)
 {
-	int     i, x, y;
-	int     flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE;
-	bool    obvious = FALSE;
+	MONSTER_IDX i;
+	POSITION x, y;
+	BIT_FLAGS flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE;
+	bool obvious = FALSE;
 
 
 	/* Mark all (nearby) monsters */
@@ -921,7 +784,6 @@ bool project_hack(int typ, HIT_POINT dam)
 		/* Paranoia -- Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
@@ -943,15 +805,12 @@ bool project_hack(int typ, HIT_POINT dam)
 		/* Remove mark */
 		m_ptr->mflag &= ~(MFLAG_TEMP);
 
-		/* Location */
 		y = m_ptr->fy;
 		x = m_ptr->fx;
 
 		/* Jump directly to the target monster */
 		if (project(0, 0, y, x, dam, typ, flg, -1)) obvious = TRUE;
 	}
-
-	/* Result */
 	return (obvious);
 }
 
@@ -962,7 +821,7 @@ bool project_hack(int typ, HIT_POINT dam)
  */
 bool speed_monsters(void)
 {
-	return (project_hack(GF_OLD_SPEED, p_ptr->lev));
+	return (project_all_los(GF_OLD_SPEED, p_ptr->lev));
 }
 
 /*!
@@ -971,7 +830,7 @@ bool speed_monsters(void)
  */
 bool slow_monsters(int power)
 {
-	return (project_hack(GF_OLD_SLOW, power));
+	return (project_all_los(GF_OLD_SLOW, power));
 }
 
 /*!
@@ -980,7 +839,7 @@ bool slow_monsters(int power)
  */
 bool sleep_monsters(int power)
 {
-	return (project_hack(GF_OLD_SLEEP, power));
+	return (project_all_los(GF_OLD_SLEEP, power));
 }
 
 /*!
@@ -989,7 +848,7 @@ bool sleep_monsters(int power)
  */
 bool banish_evil(int dist)
 {
-	return (project_hack(GF_AWAY_EVIL, dist));
+	return (project_all_los(GF_AWAY_EVIL, dist));
 }
 
 /*!
@@ -998,7 +857,7 @@ bool banish_evil(int dist)
  */
 bool turn_undead(void)
 {
-	bool tester = (project_hack(GF_TURN_UNDEAD, p_ptr->lev));
+	bool tester = (project_all_los(GF_TURN_UNDEAD, p_ptr->lev));
 	if (tester)
 		chg_virtue(V_UNLIFE, -1);
 	return tester;
@@ -1010,7 +869,7 @@ bool turn_undead(void)
  */
 bool dispel_undead(HIT_POINT dam)
 {
-	bool tester = (project_hack(GF_DISP_UNDEAD, dam));
+	bool tester = (project_all_los(GF_DISP_UNDEAD, dam));
 	if (tester)
 		chg_virtue(V_UNLIFE, -2);
 	return tester;
@@ -1022,7 +881,7 @@ bool dispel_undead(HIT_POINT dam)
  */
 bool dispel_evil(HIT_POINT dam)
 {
-	return (project_hack(GF_DISP_EVIL, dam));
+	return (project_all_los(GF_DISP_EVIL, dam));
 }
 
 /*!
@@ -1031,7 +890,7 @@ bool dispel_evil(HIT_POINT dam)
  */
 bool dispel_good(HIT_POINT dam)
 {
-	return (project_hack(GF_DISP_GOOD, dam));
+	return (project_all_los(GF_DISP_GOOD, dam));
 }
 
 /*!
@@ -1040,7 +899,7 @@ bool dispel_good(HIT_POINT dam)
  */
 bool dispel_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_DISP_ALL, dam));
+	return (project_all_los(GF_DISP_ALL, dam));
 }
 
 /*!
@@ -1049,7 +908,7 @@ bool dispel_monsters(HIT_POINT dam)
  */
 bool dispel_living(HIT_POINT dam)
 {
-	return (project_hack(GF_DISP_LIVING, dam));
+	return (project_all_los(GF_DISP_LIVING, dam));
 }
 
 /*!
@@ -1058,7 +917,7 @@ bool dispel_living(HIT_POINT dam)
  */
 bool dispel_demons(HIT_POINT dam)
 {
-	return (project_hack(GF_DISP_DEMON, dam));
+	return (project_all_los(GF_DISP_DEMON, dam));
 }
 
 /*!
@@ -1067,7 +926,7 @@ bool dispel_demons(HIT_POINT dam)
  */
 bool crusade(void)
 {
-	return (project_hack(GF_CRUSADE, p_ptr->lev*4));
+	return (project_all_los(GF_CRUSADE, p_ptr->lev*4));
 }
 
 /*!
@@ -1081,12 +940,10 @@ void aggravate_monsters(MONSTER_IDX who)
 	bool    sleep = FALSE;
 	bool    speed = FALSE;
 
-
 	/* 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;
@@ -1117,14 +974,8 @@ void aggravate_monsters(MONSTER_IDX who)
 		}
 	}
 
-	/* Messages */
-#ifdef JP
-	if (speed) msg_print("付近で何かが突如興奮したような感じを受けた！");
-	else if (sleep) msg_print("何かが突如興奮したような騒々しい音が遠くに聞こえた！");
-#else
-	if (speed) msg_print("You feel a sudden stirring nearby!");
-	else if (sleep) msg_print("You hear a sudden stirring in the distance!");
-#endif
+	if (speed) msg_print(_("付近で何かが突如興奮したような感じを受けた！", "You feel a sudden stirring nearby!"));
+	else if (sleep) msg_print(_("何かが突如興奮したような騒々しい音が遠くに聞こえた！", "You hear a sudden stirring in the distance!"));
 	if (p_ptr->riding) p_ptr->update |= PU_BONUS;
 }
 
@@ -1149,18 +1000,13 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 
 	/* Hack -- Skip Unique Monsters or Quest Monsters */
 	if (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) resist = TRUE;
-
 	else if (r_ptr->flags7 & RF7_UNIQUE2) resist = TRUE;
-
 	else if (m_idx == p_ptr->riding) resist = TRUE;
-
 	else if ((p_ptr->inside_quest && !random_quest_number(dun_level)) || p_ptr->inside_arena || p_ptr->inside_battle) resist = TRUE;
-
 	else if (player_cast && (r_ptr->level > randint0(power))) resist = TRUE;
-
 	else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) resist = TRUE;
 
-	/* Delete the monster */
+
 	else
 	{
 		if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
@@ -1205,26 +1051,18 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 
 	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);
-
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 
-	/* Handle */
 	handle_stuff();
-
-	/* Fresh */
 	Term_fresh();
 
-	/* Delay */
 	Term_xtra(TERM_XTRA_DELAY, msec);
 
 	return !resist;
@@ -1264,7 +1102,6 @@ bool symbol_genocide(int power, bool player_cast)
 		/* Skip "wrong" monsters */
 		if (r_ptr->d_char != typ) continue;
 
-		/* Take note */
 		result |= genocide_aux(i, power, player_cast, 4, _("抹殺", "Genocide"));
 	}
 
@@ -1371,7 +1208,8 @@ bool mass_genocide_undead(int power, bool player_cast)
  */
 bool probing(void)
 {
-	int i, speed;
+	int i;
+	int speed; /* TODO */
 	bool_hack cu, cv;
 	bool probe = FALSE;
 	char buf[256];
@@ -1424,23 +1262,13 @@ bool probing(void)
 			if (ironman_nightmare) speed += 5;
 
 			/* Get the monster's alignment */
-#ifdef JP
-			if ((r_ptr->flags3 & (RF3_EVIL | RF3_GOOD)) == (RF3_EVIL | RF3_GOOD)) align = "善悪";
-			else if (r_ptr->flags3 & RF3_EVIL) align = "邪悪";
-			else if (r_ptr->flags3 & RF3_GOOD) align = "善良";
-			else if ((m_ptr->sub_align & (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) == (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) align = "中立(善悪)";
-			else if (m_ptr->sub_align & SUB_ALIGN_EVIL) align = "中立(邪悪)";
-			else if (m_ptr->sub_align & SUB_ALIGN_GOOD) align = "中立(善良)";
-			else align = "中立";
-#else
-			if ((r_ptr->flags3 & (RF3_EVIL | RF3_GOOD)) == (RF3_EVIL | RF3_GOOD)) align = "good&evil";
-			else if (r_ptr->flags3 & RF3_EVIL) align = "evil";
-			else if (r_ptr->flags3 & RF3_GOOD) align = "good";
-			else if ((m_ptr->sub_align & (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) == (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) align = "neutral(good&evil)";
-			else if (m_ptr->sub_align & SUB_ALIGN_EVIL) align = "neutral(evil)";
-			else if (m_ptr->sub_align & SUB_ALIGN_GOOD) align = "neutral(good)";
-			else align = "neutral";
-#endif
+			if ((r_ptr->flags3 & (RF3_EVIL | RF3_GOOD)) == (RF3_EVIL | RF3_GOOD)) align = _("善悪", "good&evil");
+			else if (r_ptr->flags3 & RF3_EVIL) align = _("邪悪", "evil");
+			else if (r_ptr->flags3 & RF3_GOOD) align = _("善良", "good");
+			else if ((m_ptr->sub_align & (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) == (SUB_ALIGN_EVIL | SUB_ALIGN_GOOD)) _(align = "中立(善悪)", "neutral(good&evil)");
+			else if (m_ptr->sub_align & SUB_ALIGN_EVIL) align = _("中立(邪悪)", "neutral(evil)");
+			else if (m_ptr->sub_align & SUB_ALIGN_GOOD) align = _("中立(善良)", "neutral(good)");
+			else align = _("中立", "neutral");
 
 			/* Describe the monster */
 			sprintf(buf,_("%s ... 属性:%s HP:%d/%d AC:%d 速度:%s%d 経験:", "%s ... align:%s HP:%d/%d AC:%d speed:%s%d exp:"),
@@ -1455,26 +1283,19 @@ bool probing(void)
 				strcat(buf, "xxx ");
 			}
 
-#ifdef JP
-			if (MON_CSLEEP(m_ptr)) strcat(buf,"睡眠 ");
-			if (MON_STUNNED(m_ptr)) strcat(buf,"朦朧 ");
-			if (MON_MONFEAR(m_ptr)) strcat(buf,"恐怖 ");
-			if (MON_CONFUSED(m_ptr)) strcat(buf,"æ··ä¹± ");
-			if (MON_INVULNER(m_ptr)) strcat(buf,"無敵 ");
-#else
-			if (MON_CSLEEP(m_ptr)) strcat(buf,"sleeping ");
-			if (MON_STUNNED(m_ptr)) strcat(buf,"stunned ");
-			if (MON_MONFEAR(m_ptr)) strcat(buf,"scared ");
-			if (MON_CONFUSED(m_ptr)) strcat(buf,"confused ");
-			if (MON_INVULNER(m_ptr)) strcat(buf,"invulnerable ");
-#endif
+			if (MON_CSLEEP(m_ptr)) strcat(buf,_("睡眠 ", "sleeping "));
+			if (MON_STUNNED(m_ptr)) strcat(buf, _("朦朧 ", "stunned "));
+			if (MON_MONFEAR(m_ptr)) strcat(buf, _("恐怖 ", "scared "));
+			if (MON_CONFUSED(m_ptr)) strcat(buf, _("æ··ä¹± ", "confused "));
+			if (MON_INVULNER(m_ptr)) strcat(buf, _("無敵 ", "invulnerable "));
 			buf[strlen(buf)-1] = '\0';
-			prt(buf,0,0);
+			prt(buf, 0, 0);
 
 			/* 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();
@@ -1510,14 +1331,11 @@ bool probing(void)
 	Term->scr->cv = cv;
 	Term_fresh();
 
-	/* Done */
 	if (probe)
 	{
 		chg_virtue(V_KNOWLEDGE, 1);
 		msg_print(_("これで全部です。", "That's all."));
 	}
-
-	/* Result */
 	return (probe);
 }
 
@@ -1538,11 +1356,12 @@ bool probing(void)
  * "earthquake" by using the "full" to select "destruction".
  * </pre>
  */
-bool destroy_area(int y1, int x1, int r, bool in_generate)
+bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 {
-	int       y, x, k, t;
+	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)
@@ -1566,8 +1385,6 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
 
 			/* Stay in the circle of death */
 			if (k > r) continue;
-
-			/* Access the grid */
 			c_ptr = &cave[y][x];
 
 			/* Lose room and vault */
@@ -1631,14 +1448,12 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
 			/* During generation, destroyed artifacts are "preserved" */
 			if (preserve_mode || in_generate)
 			{
-				s16b this_o_idx, next_o_idx = 0;
+				OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 				/* Scan all objects in the grid */
 				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 */
@@ -1742,8 +1557,6 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
 
 				/* 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;
@@ -1771,7 +1584,6 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
 		/* Hack -- Affect player */
 		if (flag)
 		{
-			/* Message */
 			msg_print(_("燃えるような閃光が発生した！", "There is a searing blast of light!"));
 
 			/* Blind the player */
@@ -1787,13 +1599,10 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
 		/* Mega-Hack -- Forget the view and lite */
 		p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
 
-		/* Update stuff */
 		p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
 
-		/* Redraw map */
 		p_ptr->redraw |= (PR_MAP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -1834,9 +1643,11 @@ bool destroy_area(int y1, int x1, int r, bool in_generate)
  * This has allowed massive simplification of the "monster" code.
  * </pre>
  */
-bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
+bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 {
-	int             i, t, y, x, yy, xx, dy, dx;
+	DIRECTION i;
+	int t;
+	POSITION y, x, yy, xx, dy, dx;
 	int             damage = 0;
 	int             sn = 0;
 	POSITION        sy = 0, sx = 0;
@@ -1877,8 +1688,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 
 			/* Skip distant grids */
 			if (distance(cy, cx, yy, xx) > r) continue;
-
-			/* Access the grid */
 			c_ptr = &cave[yy][xx];
 
 			/* Lose room and vault */
@@ -1992,7 +1801,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 		/* Important -- no wall on player */
 		map[16+p_ptr->y-cy][16+p_ptr->x-cx] = FALSE;
 
-		/* Take some damage */
 		if (damage)
 		{
 			cptr killer;
@@ -2027,8 +1835,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 
 			/* 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;
@@ -2063,7 +1869,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 						/* Look for safety */
 						for (i = 0; i < 8; i++)
 						{
-							/* Access the grid */
 							y = yy + ddy_ddd[i];
 							x = xx + ddx_ddd[i];
 
@@ -2112,7 +1917,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 					/* Delete (not kill) "dead" monsters */
 					if (m_ptr->hp < 0)
 					{
-						/* Message */
 						if (!ignore_unview || is_seen(m_ptr)) 
 							msg_format(_("%^sは岩石に埋もれてしまった！", "%^s is embedded in the rock!"), m_name);
 
@@ -2127,7 +1931,7 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 							}
 						}
 
-						/* Delete the monster */
+
 						delete_monster(yy, xx);
 
 						/* No longer safe */
@@ -2150,7 +1954,7 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 						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);
@@ -2239,8 +2043,6 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 
 			/* 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;
@@ -2269,16 +2071,13 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
 	/* Mega-Hack -- Forget the view and lite */
 	p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
 
-	/* Update stuff */
 	p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
 
 	/* Update the health bar */
 	p_ptr->redraw |= (PR_HEALTH | PR_UHEALTH);
 
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -2298,7 +2097,7 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx)
  * @param cx 中心X座標
  * @param r 効果半径
  */
-bool earthquake(int cy, int cx, int r)
+bool earthquake(POSITION cy, POSITION cx, POSITION r)
 {
 	return earthquake_aux(cy, cx, r, 0);
 }
@@ -2385,8 +2184,8 @@ static void cave_temp_room_lite(void)
 	/* Clear them all */
 	for (i = 0; i < temp_n; i++)
 	{
-		int y = temp_y[i];
-		int x = temp_x[i];
+		POSITION y = temp_y[i];
+		POSITION x = temp_x[i];
 
 		cave_type *c_ptr = &cave[y][x];
 
@@ -2407,9 +2206,7 @@ static void cave_temp_room_lite(void)
 			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;
@@ -2427,11 +2224,7 @@ static void cave_temp_room_lite(void)
 				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);
 				}
 			}
@@ -2440,7 +2233,6 @@ static void cave_temp_room_lite(void)
 		/* Note */
 		note_spot(y, x);
 
-		/* Redraw */
 		lite_spot(y, x);
 
 		update_local_illumination(y, x);
@@ -2471,8 +2263,8 @@ static void cave_temp_room_unlite(void)
 	/* Clear them all */
 	for (i = 0; i < temp_n; i++)
 	{
-		int y = temp_y[i];
-		int x = temp_x[i];
+		POSITION y = temp_y[i];
+		POSITION x = temp_x[i];
 		int j;
 
 		cave_type *c_ptr = &cave[y][x];
@@ -2514,18 +2306,15 @@ static void cave_temp_room_unlite(void)
 				/* Forget the grid */
 				if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
 
-				/* Notice */
 				note_spot(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);
@@ -2544,12 +2333,10 @@ static void cave_temp_room_unlite(void)
  * @param pass_bold 地形条件を返す関数ポインタ
  * @return 該当地形の数
  */
-static int next_to_open(int cy, int cx, bool (*pass_bold)(int, int))
+static int next_to_open(POSITION cy, POSITION cx, bool (*pass_bold)(POSITION, POSITION))
 {
 	int i;
-
-	int y, x;
-
+	POSITION y, x;
 	int len = 0;
 	int blen = 0;
 
@@ -2585,12 +2372,10 @@ static int next_to_open(int cy, int cx, bool (*pass_bold)(int, int))
  * @param pass_bold 地形条件を返す関数ポインタ
  * @return 該当地形の数
  */
-static int next_to_walls_adj(int cy, int cx, bool (*pass_bold)(int, int))
+static int next_to_walls_adj(POSITION cy, POSITION cx, bool (*pass_bold)(POSITION, POSITION))
 {
-	int i;
-
-	int y, x;
-
+	DIRECTION i;
+	POSITION y, x;
 	int c = 0;
 
 	for (i = 0; i < 8; i++)
@@ -2613,7 +2398,7 @@ static int next_to_walls_adj(int cy, int cx, bool (*pass_bold)(int, int))
  * @param pass_bold 地形条件を返す関数ポインタ
  * @return 該当地形の数
  */
-static void cave_temp_room_aux(int y, int x, bool only_room, bool (*pass_bold)(int, int))
+static void cave_temp_room_aux(POSITION y, POSITION x, bool only_room, bool (*pass_bold)(POSITION, POSITION))
 {
 	cave_type *c_ptr;
 
@@ -2665,7 +2450,7 @@ static void cave_temp_room_aux(int y, int x, bool only_room, bool (*pass_bold)(i
  * @param x 指定X座標
  * @return 光を通すならばtrueを返す。
  */
-static bool cave_pass_lite_bold(int y, int x)
+static bool cave_pass_lite_bold(POSITION y, POSITION x)
 {
 	return cave_los_bold(y, x);
 }
@@ -2676,7 +2461,7 @@ static bool cave_pass_lite_bold(int y, int x)
  * @param x 指定X座標
  * @return なし
  */
-static void cave_temp_lite_room_aux(int y, int x)
+static void cave_temp_lite_room_aux(POSITION y, POSITION x)
 {
 	cave_temp_room_aux(y, x, FALSE, cave_pass_lite_bold);
 }
@@ -2687,7 +2472,7 @@ static void cave_temp_lite_room_aux(int y, int x)
  * @param x 指定X座標
  * @return 射線を通すならばtrueを返す。
  */
-static bool cave_pass_dark_bold(int y, int x)
+static bool cave_pass_dark_bold(POSITION y, POSITION x)
 {
 	return cave_have_flag_bold(y, x, FF_PROJECT);
 }
@@ -2699,7 +2484,7 @@ static bool cave_pass_dark_bold(int y, int x)
  * @param x 指定X座標
  * @return なし
  */
-static void cave_temp_unlite_room_aux(int y, int x)
+static void cave_temp_unlite_room_aux(POSITION y, POSITION x)
 {
 	cave_temp_room_aux(y, x, TRUE, cave_pass_dark_bold);
 }
@@ -2711,9 +2496,10 @@ static void cave_temp_unlite_room_aux(int y, int x)
  * @param x1 指定X座標
  * @return なし
  */
-void lite_room(int y1, int x1)
+void lite_room(POSITION y1, POSITION x1)
 {
-	int i, x, y;
+	int i;
+	POSITION x, y;
 
 	/* Add the initial grid */
 	cave_temp_lite_room_aux(y1, x1);
@@ -2755,9 +2541,10 @@ void lite_room(int y1, int x1)
  * @param x1 指定X座標
  * @return なし
  */
-void unlite_room(int y1, int x1)
+void unlite_room(POSITION y1, POSITION x1)
 {
-	int i, x, y;
+	int i;
+	POSITION x, y;
 
 	/* Add the initial grid */
 	cave_temp_unlite_room_aux(y1, x1);
@@ -2795,7 +2582,7 @@ void unlite_room(int y1, int x1)
  * @param rad 効果半径
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool lite_area(HIT_POINT dam, int rad)
+bool lite_area(HIT_POINT dam, POSITION rad)
 {
 	BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
@@ -2828,7 +2615,7 @@ bool lite_area(HIT_POINT dam, int rad)
  * @param rad 効果半径
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool unlite_area(HIT_POINT dam, int rad)
+bool unlite_area(HIT_POINT dam, POSITION rad)
 {
 	BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
@@ -2864,9 +2651,9 @@ bool unlite_area(HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_ball(int typ, int dir, HIT_POINT dam, int rad)
+bool fire_ball(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
-	int tx, ty;
+	POSITION tx, ty;
 
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
@@ -2901,7 +2688,7 @@ bool fire_ball(int typ, int dir, HIT_POINT dam, int rad)
 * Affect grids, objects, and monsters
 * </pre>
 */
-bool fire_breath(int typ, int dir, HIT_POINT dam, int rad)
+bool fire_breath(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
 	return fire_ball(typ, dir, dam, -rad);
 }
@@ -2921,10 +2708,9 @@ bool fire_breath(int typ, int dir, HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad)
+bool fire_rocket(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
-	int tx, ty;
-
+	POSITION tx, ty;
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
 	/* Use the given direction */
@@ -2957,10 +2743,9 @@ bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad)
  * Affect grids, objects, and monsters
  * </pre>
  */
-bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad)
+bool fire_ball_hide(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad)
 {
-	int tx, ty;
-
+	POSITION tx, ty;
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_HIDE;
 
 	/* Use the given direction */
@@ -3017,10 +2802,11 @@ bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION y, POSITION x, HIT_POI
  * @param dev 回数分散
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev)
+bool fire_blast(EFFECT_ID typ, DIRECTION dir, int dd, int ds, int num, int dev)
 {
-	int ly, lx, ld;
-	int ty, tx, y, x;
+	POSITION ly, lx;
+	int ld;
+	POSITION ty, tx, y, x;
 	int i;
 
 	BIT_FLAGS flg = PROJECT_FAST | PROJECT_THRU | PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE | PROJECT_GRID;
@@ -3075,12 +2861,12 @@ bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev)
  * @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool teleport_swap(int dir)
+bool teleport_swap(DIRECTION dir)
 {
-	int tx, ty;
-	cave_type * c_ptr;
-	monster_type * m_ptr;
-	monster_race * r_ptr;
+	POSITION tx, ty;
+	cave_type* c_ptr;
+	monster_type* m_ptr;
+	monster_race* r_ptr;
 
 	if ((dir == 5) && target_okay())
 	{
@@ -3149,7 +2935,7 @@ bool teleport_swap(int dir)
  * @param flg フラグ
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool project_hook(int typ, int dir, HIT_POINT dam, BIT_FLAGS flg)
+bool project_hook(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg)
 {
 	int tx, ty;
 
@@ -3184,7 +2970,7 @@ bool project_hook(int typ, int dir, HIT_POINT dam, BIT_FLAGS flg)
  * Affect monsters and grids (not objects).
  * </pre>
  */
-bool fire_bolt(int typ, int dir, HIT_POINT dam)
+bool fire_bolt(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_GRID;
 	if (typ != GF_ARROW) flg |= PROJECT_REFLECTABLE;
@@ -3204,7 +2990,7 @@ bool fire_bolt(int typ, int dir, HIT_POINT dam)
  * Affect monsters, grids and objects.
  * </pre>
  */
-bool fire_beam(int typ, int dir, HIT_POINT dam)
+bool fire_beam(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_GRID | PROJECT_ITEM;
 	return (project_hook(typ, dir, dam, flg));
@@ -3224,7 +3010,7 @@ bool fire_beam(int typ, int dir, HIT_POINT dam)
  * Affect monsters, grids and objects.
  * </pre>
  */
-bool fire_bolt_or_beam(int prob, int typ, int dir, HIT_POINT dam)
+bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
 	if (randint0(100) < prob)
 	{
@@ -3242,7 +3028,7 @@ bool fire_bolt_or_beam(int prob, int typ, int dir, HIT_POINT dam)
  * @param dam 威力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool lite_line(int dir, HIT_POINT dam)
+bool lite_line(DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_KILL;
 	return (project_hook(GF_LITE_WEAK, dir, dam, flg));
@@ -3254,7 +3040,7 @@ bool lite_line(int dir, HIT_POINT dam)
  * @param dam 威力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool hypodynamic_bolt(int dir, HIT_POINT dam)
+bool hypodynamic_bolt(DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_HYPODYNAMIA, dir, dam, flg));
@@ -3266,7 +3052,7 @@ bool hypodynamic_bolt(int dir, HIT_POINT dam)
  * @param dam 威力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool wall_to_mud(int dir, HIT_POINT dam)
+bool wall_to_mud(DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 	return (project_hook(GF_KILL_WALL, dir, dam, flg));
@@ -3277,7 +3063,7 @@ bool wall_to_mud(int dir, HIT_POINT dam)
  * @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool wizard_lock(int dir)
+bool wizard_lock(DIRECTION dir)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 	return (project_hook(GF_JAM_DOOR, dir, 20 + randint1(30), flg));
@@ -3288,7 +3074,7 @@ bool wizard_lock(int dir)
  * @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool destroy_door(int dir)
+bool destroy_door(DIRECTION dir)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
 	return (project_hook(GF_KILL_DOOR, dir, 0, flg));
@@ -3299,7 +3085,7 @@ bool destroy_door(int dir)
  * @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool disarm_trap(int dir)
+bool disarm_trap(DIRECTION dir)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
 	return (project_hook(GF_KILL_TRAP, dir, 0, flg));
@@ -3311,7 +3097,7 @@ bool disarm_trap(int dir)
  * @param dam 威力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool heal_monster(int dir, HIT_POINT dam)
+bool heal_monster(DIRECTION dir, HIT_POINT dam)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_HEAL, dir, dam, flg));
@@ -3323,7 +3109,7 @@ bool heal_monster(int dir, HIT_POINT dam)
  * @param power 効力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool speed_monster(int dir, int power)
+bool speed_monster(DIRECTION dir, int power)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_SPEED, dir, power, flg));
@@ -3335,7 +3121,7 @@ bool speed_monster(int dir, int power)
  * @param power 効力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool slow_monster(int dir, int power)
+bool slow_monster(DIRECTION dir, int power)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_SLOW, dir, power, flg));
@@ -3347,7 +3133,7 @@ bool slow_monster(int dir, int power)
  * @param power 効力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool sleep_monster(int dir, int power)
+bool sleep_monster(DIRECTION dir, int power)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_SLEEP, dir, power, flg));
@@ -3359,7 +3145,7 @@ bool sleep_monster(int dir, int power)
  * @return 作用が実際にあった場合TRUEを返す
  * @details 威力はプレイヤーレベル*2に固定
  */
-bool stasis_monster(int dir)
+bool stasis_monster(DIRECTION dir)
 {
 	return (fire_ball_hide(GF_STASIS, dir, p_ptr->lev*2, 0));
 }
@@ -3370,7 +3156,7 @@ bool stasis_monster(int dir)
  * @return 作用が実際にあった場合TRUEを返す
  * @details 威力はプレイヤーレベル*2に固定
  */
-bool stasis_evil(int dir)
+bool stasis_evil(DIRECTION dir)
 {
 	return (fire_ball_hide(GF_STASIS_EVIL, dir, p_ptr->lev*2, 0));
 }
@@ -3381,7 +3167,7 @@ bool stasis_evil(int dir)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool confuse_monster(int dir, int plev)
+bool confuse_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_CONF, dir, plev, flg));
@@ -3393,7 +3179,7 @@ bool confuse_monster(int dir, int plev)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool stun_monster(int dir, int plev)
+bool stun_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_STUN, dir, plev, flg));
@@ -3405,7 +3191,7 @@ bool stun_monster(int dir, int plev)
  * @param power 効力
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool poly_monster(int dir, int power)
+bool poly_monster(DIRECTION dir, int power)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	bool tester = (project_hook(GF_OLD_POLY, dir, power, flg));
@@ -3419,7 +3205,7 @@ bool poly_monster(int dir, int power)
  * @param dir 方向(5ならばグローバル変数 target_col/target_row の座標を目標にする)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool clone_monster(int dir)
+bool clone_monster(DIRECTION dir)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_OLD_CLONE, dir, 0, flg));
@@ -3431,7 +3217,7 @@ bool clone_monster(int dir)
  * @param plev プレイヤーレベル(=効力)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool fear_monster(int dir, int plev)
+bool fear_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_TURN_ALL, dir, plev, flg));
@@ -3443,7 +3229,7 @@ bool fear_monster(int dir, int plev)
  * @param plev プレイヤーレベル(効力はplev*200)
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool death_ray(int dir, int plev)
+bool death_ray(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
 	return (project_hook(GF_DEATH_RAY, dir, plev * 200, flg));
@@ -3455,7 +3241,7 @@ bool death_ray(int dir, int plev)
  * @param distance 移動距離
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool teleport_monster(int dir, int distance)
+bool teleport_monster(DIRECTION dir, int distance)
 {
 	BIT_FLAGS flg = PROJECT_BEAM | PROJECT_KILL;
 	return (project_hook(GF_AWAY_ALL, dir, distance, flg));
@@ -3477,7 +3263,7 @@ bool door_creation(void)
  * @param x 起点X座標
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool trap_creation(int y, int x)
+bool trap_creation(POSITION y, POSITION x)
 {
 	BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
 	return (project(0, 1, y, x, 0, GF_MAKE_TRAP, flg, -1));
@@ -3513,10 +3299,8 @@ bool wall_stone(void)
 
 	bool dummy = (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_STONE_WALL, flg, -1));
 
-	/* Update stuff */
 	p_ptr->update |= (PU_FLOW);
 
-	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
 	return dummy;
@@ -3555,7 +3339,7 @@ bool sleep_monsters_touch(void)
 
 /*!
  * @brief 死者復活処理(起点より周囲5マス)
- * @param who 術者モンスターID(0ならばプレイやー)
+ * @param who 術者モンスターID(0ならばプレイヤー)
  * @param y 起点Y座標
  * @param x 起点X座標
  * @return 作用が実際にあった場合TRUEを返す
@@ -3573,7 +3357,7 @@ bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x)
 void call_chaos(void)
 {
 	int Chaos_type, dummy, dir;
-	int plev = p_ptr->lev;
+	PLAYER_LEVEL plev = p_ptr->lev;
 	bool line_chaos = FALSE;
 
 	int hurt_types[31] =
@@ -3911,7 +3695,7 @@ void wall_breaker(void)
  */
 bool confuse_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_OLD_CONF, dam));
+	return (project_all_los(GF_OLD_CONF, dam));
 }
 
 
@@ -3922,7 +3706,7 @@ bool confuse_monsters(HIT_POINT dam)
  */
 bool charm_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_CHARM, dam));
+	return (project_all_los(GF_CHARM, dam));
 }
 
 
@@ -3933,7 +3717,7 @@ bool charm_monsters(HIT_POINT dam)
  */
 bool charm_animals(HIT_POINT dam)
 {
-	return (project_hack(GF_CONTROL_ANIMAL, dam));
+	return (project_all_los(GF_CONTROL_ANIMAL, dam));
 }
 
 
@@ -3944,7 +3728,7 @@ bool charm_animals(HIT_POINT dam)
  */
 bool stun_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_STUN, dam));
+	return (project_all_los(GF_STUN, dam));
 }
 
 
@@ -3955,7 +3739,7 @@ bool stun_monsters(HIT_POINT dam)
  */
 bool stasis_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_STASIS, dam));
+	return (project_all_los(GF_STASIS, dam));
 }
 
 
@@ -3966,7 +3750,7 @@ bool stasis_monsters(HIT_POINT dam)
  */
 bool mindblast_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_PSI, dam));
+	return (project_all_los(GF_PSI, dam));
 }
 
 
@@ -3977,7 +3761,7 @@ bool mindblast_monsters(HIT_POINT dam)
  */
 bool banish_monsters(int dist)
 {
-	return (project_hack(GF_AWAY_ALL, dist));
+	return (project_all_los(GF_AWAY_ALL, dist));
 }
 
 
@@ -3988,7 +3772,7 @@ bool banish_monsters(int dist)
  */
 bool turn_evil(HIT_POINT dam)
 {
-	return (project_hack(GF_TURN_EVIL, dam));
+	return (project_all_los(GF_TURN_EVIL, dam));
 }
 
 
@@ -3999,7 +3783,7 @@ bool turn_evil(HIT_POINT dam)
  */
 bool turn_monsters(HIT_POINT dam)
 {
-	return (project_hack(GF_TURN_ALL, dam));
+	return (project_all_los(GF_TURN_ALL, dam));
 }
 
 
@@ -4009,7 +3793,7 @@ bool turn_monsters(HIT_POINT dam)
  */
 bool deathray_monsters(void)
 {
-	return (project_hack(GF_DEATH_RAY, p_ptr->lev * 200));
+	return (project_all_los(GF_DEATH_RAY, p_ptr->lev * 200));
 }
 
 /*!
@@ -4018,7 +3802,7 @@ bool deathray_monsters(void)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool charm_monster(int dir, int plev)
+bool charm_monster(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
 	return (project_hook(GF_CHARM, dir, plev, flg));
@@ -4030,7 +3814,7 @@ bool charm_monster(int dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool control_one_undead(int dir, int plev)
+bool control_one_undead(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
 	return (project_hook(GF_CONTROL_UNDEAD, dir, plev, flg));
@@ -4042,7 +3826,7 @@ bool control_one_undead(int dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool control_one_demon(int dir, int plev)
+bool control_one_demon(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
 	return (project_hook(GF_CONTROL_DEMON, dir, plev, flg));
@@ -4054,7 +3838,7 @@ bool control_one_demon(int dir, int plev)
  * @param plev パワー
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool charm_animal(int dir, int plev)
+bool charm_animal(DIRECTION dir, PLAYER_LEVEL plev)
 {
 	BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
 	return (project_hook(GF_CONTROL_ANIMAL, dir, plev, flg));
@@ -4070,7 +3854,7 @@ bool kawarimi(bool success)
 {
 	object_type forge;
 	object_type *q_ptr = &forge;
-	int y, x;
+	POSITION y, x;
 
 	if (p_ptr->is_dead) return FALSE;
 	if (p_ptr->confused || p_ptr->blind || p_ptr->paralyzed || p_ptr->image) return FALSE;
@@ -4121,7 +3905,7 @@ bool kawarimi(bool success)
  */
 bool rush_attack(bool *mdeath)
 {
-	int dir;
+	DIRECTION dir;
 	int tx, ty;
 	int tm_idx = 0;
 	u16b path_g[32];
@@ -4191,9 +3975,7 @@ bool rush_attack(bool *mdeath)
 
 		/* 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];
@@ -4238,7 +4020,7 @@ bool rush_attack(bool *mdeath)
  */
 void remove_all_mirrors(bool explode)
 {
-	int x, y;
+	POSITION x, y;
 
 	for (x = 0; x < cur_wid; x++)
 	{
@@ -4261,7 +4043,7 @@ void remove_all_mirrors(bool explode)
  * @param dir 発動の方向ID
  * @return なし
  */
-void ring_of_power(int dir)
+void ring_of_power(DIRECTION dir)
 {
 	/* Pick a random effect */
 	switch (randint1(10))
@@ -4269,7 +4051,6 @@ void ring_of_power(int dir)
 	case 1:
 	case 2:
 	{
-		/* Message */
 		msg_print(_("あなたは悪性のオーラに包み込まれた。", "You are surrounded by a malignant aura."));
 		sound(SOUND_EVIL);
 
@@ -4291,7 +4072,6 @@ void ring_of_power(int dir)
 
 	case 3:
 	{
-		/* Message */
 		msg_print(_("あなたは強力なオーラに包み込まれた。", "You are surrounded by a powerful aura."));
 
 		/* Dispel monsters */
@@ -4435,7 +4215,7 @@ void wild_magic(int spell)
 * @param rad 効力の半径
 * @return なし
 */
-void cast_meteor(HIT_POINT dam, int rad)
+void cast_meteor(HIT_POINT dam, POSITION rad)
 {
 	int i;
 	int b = 10 + randint1(10);
@@ -4480,11 +4260,12 @@ void cast_meteor(HIT_POINT dam, int rad)
 * @param rad 効力の半径
 * @return ターゲットを指定し、実行したならばTRUEを返す。
 */
-bool cast_wrath_of_the_god(HIT_POINT dam, int rad)
+bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad)
 {
-	int x, y, tx, ty;
-	int nx, ny;
-	int dir, i;
+	POSITION x, y, tx, ty;
+	POSITION nx, ny;
+	DIRECTION dir;
+	int i;
 	int b = 10 + randint1(10);
 
 	if (!get_aim_dir(&dir)) return FALSE;
@@ -4573,9 +4354,9 @@ bool cast_wrath_of_the_god(HIT_POINT dam, int rad)
 * while keeping the results quite random.  It also allows some potent\n
 * effects only at high level.
 */
-void cast_wonder(int dir)
+void cast_wonder(DIRECTION dir)
 {
-	int plev = p_ptr->lev;
+	PLAYER_LEVEL plev = p_ptr->lev;
 	int die = randint1(100) + plev / 5;
 	int vir = virtue_number(V_CHANCE);
 
@@ -4655,9 +4436,9 @@ void cast_wonder(int dir)
 * @param dir 方向ID
 * @return なし
 */
-void cast_invoke_spirits(int dir)
+void cast_invoke_spirits(DIRECTION dir)
 {
-	int plev = p_ptr->lev;
+	PLAYER_LEVEL plev = p_ptr->lev;
 	int die = randint1(100) + plev / 5;
 	int vir = virtue_number(V_CHANCE);
 
@@ -4805,8 +4586,8 @@ void cast_invoke_spirits(int dir)
 */
 void cast_shuffle(void)
 {
-	int plev = p_ptr->lev;
-	int dir;
+	PLAYER_LEVEL plev = p_ptr->lev;
+	DIRECTION dir;
 	int die;
 	int vir = virtue_number(V_CHANCE);
 	int i;
@@ -4993,14 +4774,9 @@ bool_hack life_stream(bool_hack message, bool_hack virtue)
 	(void)set_image(0);
 	(void)set_stun(0);
 	(void)set_cut(0);
-	(void)do_res_stat(A_STR);
-	(void)do_res_stat(A_CON);
-	(void)do_res_stat(A_DEX);
-	(void)do_res_stat(A_WIS);
-	(void)do_res_stat(A_INT);
-	(void)do_res_stat(A_CHR);
+	(void)restore_all_status();
 	(void)set_shero(0, TRUE);
-	update_stuff();
+	handle_stuff();
 	hp_player(5000);
 
 	return TRUE;
@@ -5015,7 +4791,16 @@ bool_hack heroism(int base)
 	return ident;
 }
 
-bool_hack cure_light_wounds(int dice, int sides)
+bool_hack berserk(int base)
+{
+	bool_hack ident = FALSE;
+	if (set_afraid(0)) ident = TRUE;
+	if (set_shero(p_ptr->hero + randint1(base) + base, FALSE)) ident = TRUE;
+	if (hp_player(30)) ident = TRUE;
+	return ident;
+}
+
+bool_hack cure_light_wounds(DICE_NUMBER dice, DICE_SID sides)
 {
 	bool_hack ident = FALSE;
 	if (hp_player(damroll(dice, sides))) ident = TRUE;
@@ -5025,7 +4810,7 @@ bool_hack cure_light_wounds(int dice, int sides)
 	return ident;
 }
 
-bool_hack cure_serious_wounds(int dice, int sides)
+bool_hack cure_serious_wounds(DICE_NUMBER dice, DICE_SID sides)
 {
 	bool_hack ident = FALSE;
 	if (hp_player(damroll(dice, sides))) ident = TRUE;
@@ -5036,14 +4821,283 @@ bool_hack cure_serious_wounds(int dice, int sides)
 	return ident;
 }
 
-bool_hack cure_critical_wounds(int dice, int sides)
+bool_hack cure_critical_wounds(HIT_POINT pow)
 {
 	bool_hack ident = FALSE;
-	if (hp_player(damroll(6, 8))) ident = TRUE;
+	if (hp_player(pow)) ident = TRUE;
 	if (set_blind(0)) ident = TRUE;
 	if (set_confused(0)) ident = TRUE;
 	if (set_poisoned(0)) ident = TRUE;
 	if (set_stun(0)) ident = TRUE;
 	if (set_cut(0)) ident = TRUE;
 	if (set_shero(0, TRUE)) ident = TRUE;
-}
\ No newline at end of file
+	return ident;
+}
+
+bool_hack true_healing(HIT_POINT pow)
+{
+	bool_hack ident = FALSE;
+	if (hp_player(pow)) ident = TRUE;
+	if (set_blind(0)) ident = TRUE;
+	if (set_confused(0)) ident = TRUE;
+	if (set_poisoned(0)) ident = TRUE;
+	if (set_stun(0)) ident = TRUE;
+	if (set_cut(0)) ident = TRUE;
+	if (set_image(0)) ident = TRUE;
+	return ident;
+}
+
+bool_hack restore_mana(bool_hack magic_eater)
+{
+	bool_hack ident = FALSE;
+
+	if (p_ptr->pclass == CLASS_MAGIC_EATER && magic_eater)
+	{
+		int i;
+		for (i = 0; i < EATER_EXT * 2; i++)
+		{
+			p_ptr->magic_num1[i] += (p_ptr->magic_num2[i] < 10) ? EATER_CHARGE * 3 : p_ptr->magic_num2[i] * EATER_CHARGE / 3;
+			if (p_ptr->magic_num1[i] > p_ptr->magic_num2[i] * EATER_CHARGE) p_ptr->magic_num1[i] = p_ptr->magic_num2[i] * EATER_CHARGE;
+		}
+		for (; i < EATER_EXT * 3; i++)
+		{
+			KIND_OBJECT_IDX k_idx = lookup_kind(TV_ROD, i - EATER_EXT * 2);
+			p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE * 3 : p_ptr->magic_num2[i] * EATER_ROD_CHARGE / 3)*k_info[k_idx].pval;
+			if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0;
+		}
+		msg_print(_("頭がハッキリとした。", "You feel your head clear."));
+		p_ptr->window |= (PW_PLAYER);
+		ident = TRUE;
+	}
+	else if (p_ptr->csp < p_ptr->msp)
+	{
+		p_ptr->csp = p_ptr->msp;
+		p_ptr->csp_frac = 0;
+		msg_print(_("頭がハッキリとした。", "You feel your head clear."));
+		p_ptr->redraw |= (PR_MANA);
+		p_ptr->window |= (PW_PLAYER);
+		p_ptr->window |= (PW_SPELL);
+		ident = TRUE;
+	}
+
+	return ident;
+}
+
+bool restore_all_status(void)
+{
+	bool ident = FALSE; 
+	if (do_res_stat(A_STR)) ident = TRUE;
+	if (do_res_stat(A_INT)) ident = TRUE;
+	if (do_res_stat(A_WIS)) ident = TRUE;
+	if (do_res_stat(A_DEX)) ident = TRUE;
+	if (do_res_stat(A_CON)) ident = TRUE;
+	if (do_res_stat(A_CHR)) ident = TRUE;
+	return ident;
+}
+
+/*!
+ * @brief 口を使う継続的な処理を中断する
+ * @return なし
+ */
+void stop_mouth(void)
+{
+	if (music_singing_any()) stop_singing();
+	if (hex_spelling_any()) stop_hex_spell_all();
+}
+
+
+bool_hack vampirism(void)
+{
+	DIRECTION dir;
+	POSITION x, y;
+	int dummy;
+	cave_type *c_ptr;
+
+	if (d_info[dungeon_type].flags1 & DF1_NO_MELEE)
+	{
+		msg_print(_("なぜか攻撃することができない。", "Something prevent you from attacking."));
+		return FALSE;
+	}
+
+	/* Only works on adjacent monsters */
+	if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
+	y = p_ptr->y + ddy[dir];
+	x = p_ptr->x + ddx[dir];
+	c_ptr = &cave[y][x];
+
+	stop_mouth();
+
+	if (!(c_ptr->m_idx))
+	{
+		msg_print(_("何もない場所に噛みついた！", "You bite into thin air!"));
+		return FALSE;
+	}
+
+	msg_print(_("あなたはニヤリとして牙をむいた...", "You grin and bare your fangs..."));
+
+	dummy = p_ptr->lev * 2;
+
+	if (hypodynamic_bolt(dir, dummy))
+	{
+		if (p_ptr->food < PY_FOOD_FULL)
+			/* No heal if we are "full" */
+			(void)hp_player(dummy);
+		else
+			msg_print(_("あなたは空腹ではありません。", "You were not hungry."));
+
+		/* Gain nutritional sustenance: 150/hp drained */
+		/* A Food ration gives 5000 food points (by contrast) */
+		/* Don't ever get more than "Full" this way */
+		/* But if we ARE Gorged,  it won't cure us */
+		dummy = p_ptr->food + MIN(5000, 100 * dummy);
+		if (p_ptr->food < PY_FOOD_MAX)   /* Not gorged already */
+			(void)set_food(dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy);
+	}
+	else
+		msg_print(_("げぇ！ひどい味だ。", "Yechh. That tastes foul."));
+	return TRUE;
+}
+
+bool panic_hit(void)
+{
+	DIRECTION dir;
+	POSITION x, y;
+
+	if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
+	y = p_ptr->y + ddy[dir];
+	x = p_ptr->x + ddx[dir];
+	if (cave[y][x].m_idx)
+	{
+		py_attack(y, x, 0);
+		if (randint0(p_ptr->skill_dis) < 7)
+			msg_print(_("うまく逃げられなかった。", "You failed to run away."));
+		else
+			teleport_player(30, 0L);
+		return TRUE;
+	}
+	else
+	{
+		msg_print(_("その方向にはモンスターはいません。", "You don't see any monster in this direction"));
+		msg_print(NULL);
+		return FALSE;
+	}
+
+}
+
+/*!
+* @brief 超能力者のサイコメトリー処理/ Forcibly pseudo-identify an object in the inventory (or on the floor)
+* @return なし
+* @note
+* currently this function allows pseudo-id of any object,
+* including silly ones like potions & scrolls, which always
+* get '{average}'. This should be changed, either to stop such
+* items from being pseudo-id'd, or to allow psychometry to
+* detect whether the unidentified potion/scroll/etc is
+* good (Cure Light Wounds, Restore Strength, etc) or
+* bad (Poison, Weakness etc) or 'useless' (Slime Mold Juice, etc).
+*/
+bool psychometry(void)
+{
+	OBJECT_IDX      item;
+	object_type     *o_ptr;
+	char            o_name[MAX_NLEN];
+	byte            feel;
+	cptr            q, s;
+	bool okay = FALSE;
+
+	q = _("どのアイテムを調べますか？", "Meditate on which item? ");
+	s = _("調べるアイテムがありません。", "You have nothing appropriate.");
+
+	if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT))) return (FALSE);
+
+	/* Get the item (in the pack) */
+	if (item >= 0)
+	{
+		o_ptr = &inventory[item];
+	}
+
+	/* Get the item (on the floor) */
+	else
+	{
+		o_ptr = &o_list[0 - item];
+	}
+
+	/* It is fully known, no information needed */
+	if (object_is_known(o_ptr))
+	{
+		msg_print(_("何も新しいことは判らなかった。", "You cannot find out anything more about that."));
+		return TRUE;
+	}
+
+	/* Check for a feeling */
+	feel = value_check_aux1(o_ptr);
+
+	/* Get an object description */
+	object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+
+	/* Skip non-feelings */
+	if (!feel)
+	{
+		msg_format(_("%sからは特に変わった事は感じとれなかった。", "You do not perceive anything unusual about the %s."), o_name);
+		return TRUE;
+	}
+
+#ifdef JP
+	msg_format("%sは%sという感じがする...",
+		o_name, game_inscriptions[feel]);
+#else
+	msg_format("You feel that the %s %s %s...",
+		o_name, ((o_ptr->number == 1) ? "is" : "are"),
+		game_inscriptions[feel]);
+#endif
+
+
+	/* We have "felt" it */
+	o_ptr->ident |= (IDENT_SENSE);
+
+	/* "Inscribe" it */
+	o_ptr->feeling = feel;
+
+	/* Player touches it */
+	o_ptr->marked |= OM_TOUCHED;
+
+	/* Combine / Reorder the pack (later) */
+	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+
+	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
+
+	/* Valid "tval" codes */
+	switch (o_ptr->tval)
+	{
+	case TV_SHOT:
+	case TV_ARROW:
+	case TV_BOLT:
+	case TV_BOW:
+	case TV_DIGGING:
+	case TV_HAFTED:
+	case TV_POLEARM:
+	case TV_SWORD:
+	case TV_BOOTS:
+	case TV_GLOVES:
+	case TV_HELM:
+	case TV_CROWN:
+	case TV_SHIELD:
+	case TV_CLOAK:
+	case TV_SOFT_ARMOR:
+	case TV_HARD_ARMOR:
+	case TV_DRAG_ARMOR:
+	case TV_CARD:
+	case TV_RING:
+	case TV_AMULET:
+	case TV_LITE:
+	case TV_FIGURINE:
+		okay = TRUE;
+		break;
+	}
+
+	/* Auto-inscription/destroy */
+	autopick_alter_item(item, (bool)(okay && destroy_feeling));
+
+	/* Something happened */
+	return (TRUE);
+}