From 0f110e34fa5f868b7935aa59b622cdc90fb450d3 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 28 Jun 2020 21:21:11 +0900 Subject: [PATCH] [Refactor] #40466 Separated buff-setter.c/h from player-effects.c/h --- Hengband/Hengband/Hengband.vcxproj | 2 + Hengband/Hengband/Hengband.vcxproj.filters | 6 + src/Makefile.am | 1 + src/cmd-action/cmd-mane.c | 1 + src/cmd-item/cmd-activate.c | 1 + src/cmd-item/cmd-quaff.c | 1 + src/cmd-item/cmd-read.c | 1 + src/cmd-item/cmd-usestaff.c | 1 + src/cmd-item/cmd-zaprod.c | 1 + src/core/magic-effects-timeout-reducer.c | 1 + src/effect/effect-player-oldies.c | 1 + src/mind/mind.c | 1 + src/mind/racial.c | 1 + src/mspell/mspells3.c | 1 + src/mutation/mutation-processor.c | 1 + src/player/buff-setter.c | 218 +++++++++++++++++++++++++++++ src/player/buff-setter.h | 9 ++ src/player/player-effects.c | 212 +--------------------------- src/player/player-effects.h | 5 - src/realm/realm-craft.c | 1 + src/realm/realm-crusade.c | 1 + src/realm/realm-death.c | 1 + src/realm/realm-demon.c | 1 + src/realm/realm-life.c | 1 + src/realm/realm-nature.c | 1 + src/realm/realm-sorcery.c | 1 + src/spell-realm/spells-trump.c | 1 + src/spell/spells-status.c | 1 + 28 files changed, 258 insertions(+), 216 deletions(-) create mode 100644 src/player/buff-setter.c create mode 100644 src/player/buff-setter.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index e1c318f68..ca1032b20 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -227,6 +227,7 @@ + @@ -652,6 +653,7 @@ + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 8f0f29b50..098d3e05a 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -1505,6 +1505,9 @@ player + + player + @@ -3301,6 +3304,9 @@ player + + player + diff --git a/src/Makefile.am b/src/Makefile.am index cd5ca398a..ece0fbebc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -452,6 +452,7 @@ hengband_SOURCES = \ \ player/avatar.h player/avatar.c \ player/bad-status-setter.c player/bad-status-setter.h \ + player/buff-setter.c player/buff-setter.h \ player/eldritch-horror.c player/eldritch-horror.h \ player/mimic-info-table.c player/mimic-info-table.h \ player/patron.c player/patron.h \ diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c index 5cf0f78ed..f3599a0ae 100644 --- a/src/cmd-action/cmd-mane.c +++ b/src/cmd-action/cmd-mane.c @@ -33,6 +33,7 @@ #include "mspell/monster-power-table.h" #include "mspell/mspell-type.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "spell-kind/spells-launcher.h" diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c index d3b770986..869e72c3e 100644 --- a/src/cmd-item/cmd-activate.c +++ b/src/cmd-item/cmd-activate.c @@ -47,6 +47,7 @@ #include "monster/smart-learn-types.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c index 63414a9ac..f50edc5a0 100644 --- a/src/cmd-item/cmd-quaff.c +++ b/src/cmd-item/cmd-quaff.c @@ -27,6 +27,7 @@ #include "player/bad-status-setter.h" #include "player/eldritch-horror.h" #include "player/mimic-info-table.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c index 6ad770e56..d4eb51c0f 100644 --- a/src/cmd-item/cmd-read.c +++ b/src/cmd-item/cmd-read.c @@ -26,6 +26,7 @@ #include "perception/object-perception.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c index 038176bab..a735b0cf4 100644 --- a/src/cmd-item/cmd-usestaff.c +++ b/src/cmd-item/cmd-usestaff.c @@ -17,6 +17,7 @@ #include "perception/object-perception.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c index e60b00054..efc05b538 100644 --- a/src/cmd-item/cmd-zaprod.c +++ b/src/cmd-item/cmd-zaprod.c @@ -12,6 +12,7 @@ #include "object/object-info.h" #include "perception/object-perception.h" #include "player/avatar.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-status.h" diff --git a/src/core/magic-effects-timeout-reducer.c b/src/core/magic-effects-timeout-reducer.c index c951ff811..a30dee715 100644 --- a/src/core/magic-effects-timeout-reducer.c +++ b/src/core/magic-effects-timeout-reducer.c @@ -2,6 +2,7 @@ #include "game-option/birth-options.h" #include "mind/racial-kutar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-effects.h" /*! diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c index 66c3aced7..7a5c0070b 100644 --- a/src/effect/effect-player-oldies.c +++ b/src/effect/effect-player-oldies.c @@ -2,6 +2,7 @@ #include "game-option/birth-options.h" #include "monster-race/race-indice-types.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/eldritch-horror.h" #include "player/player-effects.h" #include "view/display-messages.h" diff --git a/src/mind/mind.c b/src/mind/mind.c index d1c2c6856..30659be5c 100644 --- a/src/mind/mind.c +++ b/src/mind/mind.c @@ -43,6 +43,7 @@ #include "monster-floor/place-monster-types.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/mind/racial.c b/src/mind/racial.c index 5117fb80c..72452ac3f 100644 --- a/src/mind/racial.c +++ b/src/mind/racial.c @@ -44,6 +44,7 @@ #include "mutation/mutation.h" #include "object/item-tester-hooker.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c index 8ce4a4dcf..02e1b9f5f 100644 --- a/src/mspell/mspells3.c +++ b/src/mspell/mspells3.c @@ -44,6 +44,7 @@ #include "mspell/mspell-type.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "realm/realm-types.h" diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c index 34e3b1e22..db8f0116e 100644 --- a/src/mutation/mutation-processor.c +++ b/src/mutation/mutation-processor.c @@ -9,6 +9,7 @@ #include "object-hook/hook-enchant.h" #include "object/lite-processor.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" diff --git a/src/player/buff-setter.c b/src/player/buff-setter.c new file mode 100644 index 000000000..50cf679b9 --- /dev/null +++ b/src/player/buff-setter.c @@ -0,0 +1,218 @@ +#include "player/buff-setter.h" +#include "core/stuff-handler.h" +#include "game-option/disturbance-options.h" +#include "player/avatar.h" +#include "player/player-move.h" +#include "realm/realm-song-numbers.h" +#include "view/display-messages.h" + +/*! + * @brief 加速の継続時間をセットする / Set "fast", notice observable changes + * @param v 継続時間 + * @param do_dec 現在の継続時間より長い値のみ上書きする + * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 + */ +bool set_fast(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->fast && !do_dec) { + if (creature_ptr->fast > v) + return FALSE; + } else if (!is_fast(creature_ptr) && !creature_ptr->lightspeed) { + msg_print(_("素早く動けるようになった！", "You feel yourself moving much faster!")); + notice = TRUE; + chg_virtue(creature_ptr, V_PATIENCE, -1); + chg_virtue(creature_ptr, V_DILIGENCE, 1); + } + } else { + if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(creature_ptr, MUSIC_SPEED) && !music_singing(creature_ptr, MUSIC_SHERO)) { + msg_print(_("動きの素早さがなくなったようだ。", "You feel yourself slow down.")); + notice = TRUE; + } + } + + creature_ptr->fast = v; + 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 "shield", notice observable changes + * @param v 継続時間 + * @param do_dec 現在の継続時間より長い値のみ上書きする + * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 + */ +bool set_shield(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->shield && !do_dec) { + if (creature_ptr->shield > v) + return FALSE; + } else if (!creature_ptr->shield) { + msg_print(_("肌が石になった。", "Your skin turns to stone.")); + notice = TRUE; + } + } else { + if (creature_ptr->shield) { + msg_print(_("肌が元に戻った。", "Your skin returns to normal.")); + notice = TRUE; + } + } + + creature_ptr->shield = 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 "magicdef", notice observable changes + * @param v 継続時間 + * @param do_dec 現在の継続時間より長い値のみ上書きする + * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 + */ +bool set_magicdef(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->magicdef && !do_dec) { + if (creature_ptr->magicdef > v) + return FALSE; + } else if (!creature_ptr->magicdef) { + msg_print(_("魔法の防御力が増したような気がする。", "You feel more resistant to magic.")); + notice = TRUE; + } + } else { + if (creature_ptr->magicdef) { + msg_print(_("魔法の防御力が元に戻った。", "You feel less resistant to magic.")); + notice = TRUE; + } + } + + creature_ptr->magicdef = 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 "blessed", notice observable changes + * @param v 継続時間 + * @param do_dec 現在の継続時間より長い値のみ上書きする + * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 + */ +bool set_blessed(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->blessed && !do_dec) { + if (creature_ptr->blessed > v) + return FALSE; + } else if (!is_blessed(creature_ptr)) { + msg_print(_("高潔な気分になった！", "You feel righteous!")); + notice = TRUE; + } + } else { + if (creature_ptr->blessed && !music_singing(creature_ptr, MUSIC_BLESS)) { + msg_print(_("高潔な気分が消え失せた。", "The prayer has expired.")); + notice = TRUE; + } + } + + creature_ptr->blessed = 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 "hero", notice observable changes + * @param v 継続時間 + * @param do_dec 現在の継続時間より長い値のみ上書きする + * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 + */ +bool set_hero(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->hero && !do_dec) { + if (creature_ptr->hero > v) + return FALSE; + } else if (!is_hero(creature_ptr)) { + msg_print(_("ヒーローになった気がする！", "You feel like a hero!")); + notice = TRUE; + } + } else { + if (creature_ptr->hero && !music_singing(creature_ptr, MUSIC_HERO) && !music_singing(creature_ptr, MUSIC_SHERO)) { + msg_print(_("ヒーローの気分が消え失せた。", "The heroism wears off.")); + notice = TRUE; + } + } + + creature_ptr->hero = v; + creature_ptr->redraw |= (PR_STATUS); + + if (!notice) + return FALSE; + + if (disturb_state) + disturb(creature_ptr, FALSE, FALSE); + creature_ptr->update |= (PU_BONUS); + creature_ptr->update |= (PU_HP); + handle_stuff(creature_ptr); + return TRUE; +} diff --git a/src/player/buff-setter.h b/src/player/buff-setter.h new file mode 100644 index 000000000..d30239e9b --- /dev/null +++ b/src/player/buff-setter.h @@ -0,0 +1,9 @@ +#pragma once + +#include "system/angband.h" + +bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); +bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); +bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); +bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); +bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 7161c403d..65ec1825d 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -51,6 +51,7 @@ #include "perception/object-perception.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-move.h" @@ -280,217 +281,6 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool } /*! - * @brief 加速の継続時間をセットする / Set "fast", notice observable changes - * @param v 継続時間 - * @param do_dec 現在の継続時間より長い値のみ上書きする - * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 - */ -bool set_fast(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->fast && !do_dec) { - if (creature_ptr->fast > v) - return FALSE; - } else if (!is_fast(creature_ptr) && !creature_ptr->lightspeed) { - msg_print(_("素早く動けるようになった！", "You feel yourself moving much faster!")); - notice = TRUE; - chg_virtue(creature_ptr, V_PATIENCE, -1); - chg_virtue(creature_ptr, V_DILIGENCE, 1); - } - } else { - if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(creature_ptr, MUSIC_SPEED) && !music_singing(creature_ptr, MUSIC_SHERO)) { - msg_print(_("動きの素早さがなくなったようだ。", "You feel yourself slow down.")); - notice = TRUE; - } - } - - creature_ptr->fast = v; - 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 "shield", notice observable changes - * @param v 継続時間 - * @param do_dec 現在の継続時間より長い値のみ上書きする - * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 - */ -bool set_shield(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->shield && !do_dec) { - if (creature_ptr->shield > v) - return FALSE; - } else if (!creature_ptr->shield) { - msg_print(_("肌が石になった。", "Your skin turns to stone.")); - notice = TRUE; - } - } else { - if (creature_ptr->shield) { - msg_print(_("肌が元に戻った。", "Your skin returns to normal.")); - notice = TRUE; - } - } - - creature_ptr->shield = 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 "magicdef", notice observable changes - * @param v 継続時間 - * @param do_dec 現在の継続時間より長い値のみ上書きする - * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 - */ -bool set_magicdef(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->magicdef && !do_dec) { - if (creature_ptr->magicdef > v) - return FALSE; - } else if (!creature_ptr->magicdef) { - msg_print(_("魔法の防御力が増したような気がする。", "You feel more resistant to magic.")); - notice = TRUE; - } - } else { - if (creature_ptr->magicdef) { - msg_print(_("魔法の防御力が元に戻った。", "You feel less resistant to magic.")); - notice = TRUE; - } - } - - creature_ptr->magicdef = 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 "blessed", notice observable changes - * @param v 継続時間 - * @param do_dec 現在の継続時間より長い値のみ上書きする - * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 - */ -bool set_blessed(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->blessed && !do_dec) { - if (creature_ptr->blessed > v) - return FALSE; - } else if (!is_blessed(creature_ptr)) { - msg_print(_("高潔な気分になった！", "You feel righteous!")); - notice = TRUE; - } - } else { - if (creature_ptr->blessed && !music_singing(creature_ptr, MUSIC_BLESS)) { - msg_print(_("高潔な気分が消え失せた。", "The prayer has expired.")); - notice = TRUE; - } - } - - creature_ptr->blessed = 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 "hero", notice observable changes - * @param v 継続時間 - * @param do_dec 現在の継続時間より長い値のみ上書きする - * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。 - */ -bool set_hero(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->hero && !do_dec) { - if (creature_ptr->hero > v) - return FALSE; - } else if (!is_hero(creature_ptr)) { - msg_print(_("ヒーローになった気がする！", "You feel like a hero!")); - notice = TRUE; - } - } else { - if (creature_ptr->hero && !music_singing(creature_ptr, MUSIC_HERO) && !music_singing(creature_ptr, MUSIC_SHERO)) { - msg_print(_("ヒーローの気分が消え失せた。", "The heroism wears off.")); - notice = TRUE; - } - } - - creature_ptr->hero = v; - creature_ptr->redraw |= (PR_STATUS); - - if (!notice) - return FALSE; - - if (disturb_state) - disturb(creature_ptr, FALSE, FALSE); - creature_ptr->update |= (PU_BONUS); - creature_ptr->update |= (PU_HP); - handle_stuff(creature_ptr); - return TRUE; -} - -/*! * @brief 狂戦士化の継続時間をセットする / Set "shero", notice observable changes * @param v 継続時間/ 0ならば無条件にリセット * @param do_dec FALSEの場合現在の継続時間より長い値のみ上書きする diff --git a/src/player/player-effects.h b/src/player/player-effects.h index 12f0196a3..822e5a8a9 100644 --- a/src/player/player-effects.h +++ b/src/player/player-effects.h @@ -5,11 +5,6 @@ void set_action(player_type *creature_ptr, ACTION_IDX typ); void dispel_player(player_type *creature_ptr); bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool do_dec); -bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); -bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); -bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); -bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); -bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c index a8809e4d2..812b40da8 100644 --- a/src/realm/realm-craft.c +++ b/src/realm/realm-craft.c @@ -3,6 +3,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "mutation/mutation.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "player/selfinfo.h" diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c index a3eddcf31..0806ba907 100644 --- a/src/realm/realm-crusade.c +++ b/src/realm/realm-crusade.c @@ -6,6 +6,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "spell-kind/spells-beam.h" diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c index 1459af571..c745b79c4 100644 --- a/src/realm/realm-death.c +++ b/src/realm/realm-death.c @@ -3,6 +3,7 @@ #include "effect/effect-characteristics.h" #include "io/targeting.h" #include "player/avatar.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/realm/realm-demon.c b/src/realm/realm-demon.c index 5559b2ec5..2d362aac8 100644 --- a/src/realm/realm-demon.c +++ b/src/realm/realm-demon.c @@ -4,6 +4,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c index c5b794f9a..7a13b03ad 100644 --- a/src/realm/realm-life.c +++ b/src/realm/realm-life.c @@ -3,6 +3,7 @@ #include "floor/floor.h" #include "io/targeting.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "spell-kind/spells-curse-removal.h" diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c index 15d202de8..678a9aef0 100644 --- a/src/realm/realm-nature.c +++ b/src/realm/realm-nature.c @@ -10,6 +10,7 @@ #include "object/object-kind-hook.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c index 1077421cc..ae1f80447 100644 --- a/src/realm/realm-sorcery.c +++ b/src/realm/realm-sorcery.c @@ -3,6 +3,7 @@ #include "core/asking-player.h" #include "io/targeting.h" #include "player/avatar.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "player/selfinfo.h" #include "spell-kind/spells-charm.h" diff --git a/src/spell-realm/spells-trump.c b/src/spell-realm/spells-trump.c index ffe211a13..c569d5f63 100644 --- a/src/spell-realm/spells-trump.c +++ b/src/spell-realm/spells-trump.c @@ -5,6 +5,7 @@ #include "monster-floor/place-monster-types.h" #include "mutation/mutation.h" #include "player/avatar.h" +#include "player/buff-setter.h" #include "player/player-effects.h" #include "spell-kind/earthquake.h" #include "spell-kind/spells-charm.h" diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c index 9ada258ab..78fe80b54 100644 --- a/src/spell/spells-status.c +++ b/src/spell/spells-status.c @@ -22,6 +22,7 @@ #include "object/object-kind.h" #include "player/avatar.h" #include "player/bad-status-setter.h" +#include "player/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-status.h" -- 2.11.0