X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspell-realm%2Fspells-crusade.c;h=c9d7c48cb2a9d59de3e835f89ae47be7b75a9e66;hb=9a467c0dbcb96f9dd576e77e4ec5e8c06c1410d8;hp=18ae2ccc6140b414bafb7bfb195223dc6da20549;hpb=d23fd847b3e3b5c77bd663f116d119ed21683662;p=hengband%2Fhengband.git

diff --git a/src/spell-realm/spells-crusade.c b/src/spell-realm/spells-crusade.c
index 18ae2ccc6..c9d7c48cb 100644
--- a/src/spell-realm/spells-crusade.c
+++ b/src/spell-realm/spells-crusade.c
@@ -5,85 +5,182 @@
  */
 
 #include "spell-realm/spells-crusade.h"
+#include "core/disturbance.h"
+#include "core/player-redraw-types.h"
+#include "core/player-update-types.h"
+#include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"
-#include "floor/floor.h"
-#include "grid/feature.h"
+#include "effect/effect-processor.h"
+#include "floor/cave.h"
+#include "game-option/disturbance-options.h"
+#include "grid/feature-flag-types.h"
 #include "grid/grid.h"
-#include "io/targeting.h"
+#include "spell-realm/spells-crusade.h"
 #include "spell/range-calc.h"
-#include "spell/process-effect.h"
 #include "spell/spell-types.h"
+#include "system/floor-type-definition.h"
+#include "target/projection-path-calculator.h"
+#include "target/target-checker.h"
+#include "target/target-getter.h"
 #include "util/bit-flags-calculator.h"
+#include "view/display-messages.h"
 
 /*!
-* @brief 破邪魔法「神の怒り」の処理としてターゲットを指定した後分解のボールを最大20回発生させる。
-* @param caster_ptr プレーヤーへの参照ポインタ
-* @param dam ダメージ
-* @param rad 効力の半径
-* @return ターゲットを指定し、実行したならばTRUEを返す。
-*/
+ * @brief 破邪魔法「神の怒り」の処理としてターゲットを指定した後分解のボールを最大20回発生させる。
+ * @param caster_ptr プレーヤーへの参照ポインタ
+ * @param dam ダメージ
+ * @param rad 効力の半径
+ * @return ターゲットを指定し、実行したならばTRUEを返す。
+ */
 bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad)
 {
-	DIRECTION dir;
-	if (!get_aim_dir(caster_ptr, &dir)) return FALSE;
-
-	POSITION tx = caster_ptr->x + 99 * ddx[dir];
-	POSITION ty = caster_ptr->y + 99 * ddy[dir];
-	if ((dir == 5) && target_okay(caster_ptr))
-	{
-		tx = target_col;
-		ty = target_row;
-	}
-
-	POSITION x = caster_ptr->x;
-	POSITION y = caster_ptr->y;
-	POSITION nx, ny;
-	while (TRUE)
-	{
-		if ((y == ty) && (x == tx)) break;
-
-		ny = y;
-		nx = x;
-		mmove2(&ny, &nx, caster_ptr->y, caster_ptr->x, ty, tx);
-		if (MAX_RANGE <= distance(caster_ptr->y, caster_ptr->x, ny, nx)) break;
-		if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT)) break;
-		if ((dir != 5) && caster_ptr->current_floor_ptr->grid_array[ny][nx].m_idx != 0) break;
-
-		x = nx;
-		y = ny;
-	}
-
-	tx = x;
-	ty = y;
-
-	int b = 10 + randint1(10);
-	for (int i = 0; i < b; i++)
-	{
-		int count = 20, d = 0;
-
-		while (count--)
-		{
-			int dx, dy;
-
-			x = tx - 5 + randint0(11);
-			y = ty - 5 + randint0(11);
-
-			dx = (tx > x) ? (tx - x) : (x - tx);
-			dy = (ty > y) ? (ty - y) : (y - ty);
-
-			d = (dy > dx) ? (dy + (dx >> 1)) : (dx + (dy >> 1));
-			if (d < 5) break;
-		}
-
-		if (count < 0) continue;
-
-		if (!in_bounds(caster_ptr->current_floor_ptr, y, x) ||
-			cave_stop_disintegration(caster_ptr->current_floor_ptr, y, x) ||
-			!in_disintegration_range(caster_ptr->current_floor_ptr, ty, tx, y, x))
-			continue;
-
-		project(caster_ptr, 0, rad, y, x, dam, GF_DISINTEGRATE, PROJECT_JUMP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL, -1);
-	}
-
-	return TRUE;
+    DIRECTION dir;
+    if (!get_aim_dir(caster_ptr, &dir))
+        return FALSE;
+
+    POSITION tx = caster_ptr->x + 99 * ddx[dir];
+    POSITION ty = caster_ptr->y + 99 * ddy[dir];
+    if ((dir == 5) && target_okay(caster_ptr)) {
+        tx = target_col;
+        ty = target_row;
+    }
+
+    POSITION x = caster_ptr->x;
+    POSITION y = caster_ptr->y;
+    POSITION nx, ny;
+    while (TRUE) {
+        if ((y == ty) && (x == tx))
+            break;
+
+        ny = y;
+        nx = x;
+        mmove2(&ny, &nx, caster_ptr->y, caster_ptr->x, ty, tx);
+        if (get_max_range(caster_ptr) <= distance(caster_ptr->y, caster_ptr->x, ny, nx))
+            break;
+        if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT))
+            break;
+        if ((dir != 5) && caster_ptr->current_floor_ptr->grid_array[ny][nx].m_idx != 0)
+            break;
+
+        x = nx;
+        y = ny;
+    }
+
+    tx = x;
+    ty = y;
+
+    int b = 10 + randint1(10);
+    for (int i = 0; i < b; i++) {
+        int count = 20, d = 0;
+
+        while (count--) {
+            int dx, dy;
+
+            x = tx - 5 + randint0(11);
+            y = ty - 5 + randint0(11);
+
+            dx = (tx > x) ? (tx - x) : (x - tx);
+            dy = (ty > y) ? (ty - y) : (y - ty);
+
+            d = (dy > dx) ? (dy + (dx >> 1)) : (dx + (dy >> 1));
+            if (d < 5)
+                break;
+        }
+
+        if (count < 0)
+            continue;
+
+        if (!in_bounds(caster_ptr->current_floor_ptr, y, x) || cave_stop_disintegration(caster_ptr->current_floor_ptr, y, x)
+            || !in_disintegration_range(caster_ptr->current_floor_ptr, ty, tx, y, x))
+            continue;
+
+        project(caster_ptr, 0, rad, y, x, dam, GF_DISINTEGRATE, PROJECT_JUMP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL, -1);
+    }
+
+    return TRUE;
+}
+
+/*!
+ * @brief 一時的聖なるのオーラの継続時間をセットする / Set "tim_sh_holy", notice observable changes
+ * @param v 継続時間
+ * @param do_dec 現在の継続時間より長い値のみ上書きする
+ * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
+ */
+bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
+{
+    bool notice = FALSE;
+    v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
+
+    if (creature_ptr->is_dead)
+        return FALSE;
+
+    if (v) {
+        if (creature_ptr->tim_sh_holy && !do_dec) {
+            if (creature_ptr->tim_sh_holy > v)
+                return FALSE;
+        } else if (!creature_ptr->tim_sh_holy) {
+            msg_print(_("体が聖なるオーラで覆われた。", "You are enveloped by a holy aura!"));
+            notice = TRUE;
+        }
+    } else {
+        if (creature_ptr->tim_sh_holy) {
+            msg_print(_("聖なるオーラが消えた。", "The holy aura disappeared."));
+            notice = TRUE;
+        }
+    }
+
+    creature_ptr->tim_sh_holy = v;
+    creature_ptr->redraw |= (PR_STATUS);
+
+    if (!notice)
+        return FALSE;
+
+    if (disturb_state)
+        disturb(creature_ptr, FALSE, FALSE);
+    creature_ptr->update |= (PU_BONUS);
+    handle_stuff(creature_ptr);
+    return TRUE;
+}
+
+/*!
+ * @brief 目には目をの残り時間をセットする / Set "tim_eyeeye", notice observable changes
+ * @param v 継続時間
+ * @param do_dec 現在の継続時間より長い値のみ上書きする
+ * @return ステータスに影響を及ぼす変化があった場合TRUEを返す
+ * @details 呪術領域でも使えるが、汎用性と行数の兼ね合いを考えて破邪側に入れた
+ */
+bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
+{
+    bool notice = FALSE;
+    v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
+
+    if (creature_ptr->is_dead)
+        return FALSE;
+
+    if (v) {
+        if (creature_ptr->tim_eyeeye && !do_dec) {
+            if (creature_ptr->tim_eyeeye > v)
+                return FALSE;
+        } else if (!creature_ptr->tim_eyeeye) {
+            msg_print(_("法の守り手になった気がした！", "You feel like a keeper of commandments!"));
+            notice = TRUE;
+        }
+    } else {
+        if (creature_ptr->tim_eyeeye) {
+            msg_print(_("懲罰を執行することができなくなった。", "You no longer feel like a keeper."));
+            notice = TRUE;
+        }
+    }
+
+    creature_ptr->tim_eyeeye = v;
+    creature_ptr->redraw |= (PR_STATUS);
+
+    if (!notice)
+        return FALSE;
+
+    if (disturb_state)
+        disturb(creature_ptr, FALSE, FALSE);
+    creature_ptr->update |= (PU_BONUS);
+    handle_stuff(creature_ptr);
+    return TRUE;
 }