#include "mind/mind-mindcrafter.h"
#include "autopick/autopick.h"
-#include "core/hp-mp-processor.h"
+#include "avatar/avatar.h"
#include "core/player-update-types.h"
#include "core/window-redrawer.h"
#include "effect/effect-characteristics.h"
#include "flavor/object-flavor-types.h"
#include "floor/floor-object.h"
#include "game-option/auto-destruction-options.h"
+#include "hpmp/hp-mp-processor.h"
#include "mind/mind-mindcrafter.h"
#include "mind/mind-numbers.h"
#include "object-enchant/item-feeling.h"
#include "object/object-mark-types.h"
#include "perception/object-perception.h"
#include "perception/simple-perception.h"
-#include "player-info/avatar.h"
+#include "player/player-status.h"
#include "spell-kind/spells-detection.h"
#include "spell-kind/spells-fetcher.h"
#include "spell-kind/spells-floor.h"
#include "status/element-resistance.h"
#include "status/sight-setter.h"
#include "system/object-type-definition.h"
+#include "system/player-type-definition.h"
#include "target/target-getter.h"
#include "util/bit-flags-calculator.h"
#include "view/display-messages.h"
/*!
* @brief 超能力者のサイコメトリー処理/ Forcibly pseudo-identify an object in the inventory (or on the floor)
- * @param caster_ptr プレーヤーへの参照ポインタ
- * @return なし
+ * @param player_ptr プレイヤーへの参照ポインタ
* @note
* currently this function allows pseudo-id of any object,
* including silly ones like potions & scrolls, which always
* good (Cure Light Wounds, Restore Strength, etc) or
* bad (Poison, Weakness etc) or 'useless' (Slime Mold Juice, etc).
*/
-bool psychometry(player_type *caster_ptr)
+bool psychometry(player_type *player_ptr)
{
concptr q = _("どのアイテムを調べますか？", "Meditate on which item? ");
concptr s = _("調べるアイテムがありません。", "You have nothing appropriate.");
object_type *o_ptr;
OBJECT_IDX item;
- o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE);
+ o_ptr = choose_object(player_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT));
if (!o_ptr)
- return FALSE;
+ return false;
- if (object_is_known(o_ptr)) {
+ if (o_ptr->is_known()) {
msg_print(_("何も新しいことは判らなかった。", "You cannot find out anything more about that."));
- return TRUE;
+ return true;
}
item_feel_type feel = pseudo_value_check_heavy(o_ptr);
GAME_TEXT o_name[MAX_NLEN];
- describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
if (!feel) {
msg_format(_("%sからは特に変わった事は感じとれなかった。", "You do not perceive anything unusual about the %s."), o_name);
- return TRUE;
+ return true;
}
#ifdef JP
o_ptr->feeling = feel;
set_bits(o_ptr->marked, OM_TOUCHED);
- set_bits(caster_ptr->update, PU_COMBINE | PU_REORDER);
- set_bits(caster_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST);
+ set_bits(player_ptr->update, PU_COMBINE | PU_REORDER);
+ set_bits(player_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST);
- bool okay = FALSE;
+ bool okay = false;
switch (o_ptr->tval) {
case TV_SHOT:
case TV_ARROW:
case TV_AMULET:
case TV_LITE:
case TV_FIGURINE:
- okay = TRUE;
+ okay = true;
+ break;
+
+ default:
break;
}
- autopick_alter_item(caster_ptr, item, (bool)(okay && destroy_feeling));
- return TRUE;
+ autopick_alter_item(player_ptr, item, (bool)(okay && destroy_feeling));
+ return true;
}
/*!
* @param spell 発動する特殊技能のID
* @return 処理を実行したらTRUE、キャンセルした場合FALSEを返す。
*/
-bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell)
+bool cast_mindcrafter_spell(player_type *player_ptr, mind_mindcrafter_type spell)
{
- bool b = FALSE;
+ bool b = false;
int dam = 0;
DIRECTION dir;
TIME_EFFECT t;
- PLAYER_LEVEL plev = caster_ptr->lev;
+ PLAYER_LEVEL plev = player_ptr->lev;
switch (spell) {
case PRECOGNITION:
if (plev > 44) {
- chg_virtue(caster_ptr, V_KNOWLEDGE, 1);
- chg_virtue(caster_ptr, V_ENLIGHTEN, 1);
- wiz_lite(caster_ptr, FALSE);
+ chg_virtue(player_ptr, V_KNOWLEDGE, 1);
+ chg_virtue(player_ptr, V_ENLIGHTEN, 1);
+ wiz_lite(player_ptr, false);
} else if (plev > 19)
- map_area(caster_ptr, DETECT_RAD_MAP);
+ map_area(player_ptr, DETECT_RAD_MAP);
if (plev < 30) {
- b = detect_monsters_normal(caster_ptr, DETECT_RAD_DEFAULT);
+ b = detect_monsters_normal(player_ptr, DETECT_RAD_DEFAULT);
if (plev > 14)
- b |= detect_monsters_invis(caster_ptr, DETECT_RAD_DEFAULT);
+ b |= detect_monsters_invis(player_ptr, DETECT_RAD_DEFAULT);
if (plev > 4) {
- b |= detect_traps(caster_ptr, DETECT_RAD_DEFAULT, TRUE);
- b |= detect_doors(caster_ptr, DETECT_RAD_DEFAULT);
+ b |= detect_traps(player_ptr, DETECT_RAD_DEFAULT, true);
+ b |= detect_doors(player_ptr, DETECT_RAD_DEFAULT);
}
} else {
- b = detect_all(caster_ptr, DETECT_RAD_DEFAULT);
+ b = detect_all(player_ptr, DETECT_RAD_DEFAULT);
}
if ((plev > 24) && (plev < 40))
- set_tim_esp(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_tim_esp(player_ptr, (TIME_EFFECT)plev, false);
if (!b)
msg_print(_("安全な気がする。", "You feel safe."));
break;
case NEURAL_BLAST:
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
if (randint1(100) < plev * 2)
- fire_beam(caster_ptr, GF_PSI, dir, damroll(3 + ((plev - 1) / 4), (3 + plev / 15)));
+ fire_beam(player_ptr, GF_PSI, dir, damroll(3 + ((plev - 1) / 4), (3 + plev / 15)));
else
- fire_ball(caster_ptr, GF_PSI, dir, damroll(3 + ((plev - 1) / 4), (3 + plev / 15)), 0);
+ fire_ball(player_ptr, GF_PSI, dir, damroll(3 + ((plev - 1) / 4), (3 + plev / 15)), 0);
break;
case MINOR_DISPLACEMENT:
- teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
+ teleport_player(player_ptr, 10, TELEPORT_SPONTANEOUS);
break;
case MAJOR_DISPLACEMENT:
- teleport_player(caster_ptr, plev * 5, TELEPORT_SPONTANEOUS);
+ teleport_player(player_ptr, plev * 5, TELEPORT_SPONTANEOUS);
break;
case DOMINATION:
if (plev < 30) {
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
- fire_ball(caster_ptr, GF_DOMINATION, dir, plev, 0);
+ fire_ball(player_ptr, GF_DOMINATION, dir, plev, 0);
} else {
- charm_monsters(caster_ptr, plev * 2);
+ charm_monsters(player_ptr, plev * 2);
}
break;
case PLUVERISE:
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
- fire_ball(caster_ptr, GF_TELEKINESIS, dir, damroll(8 + ((plev - 5) / 4), 8), (plev > 20 ? (plev - 20) / 8 + 1 : 0));
+ fire_ball(player_ptr, GF_TELEKINESIS, dir, damroll(8 + ((plev - 5) / 4), 8), (plev > 20 ? (plev - 20) / 8 + 1 : 0));
break;
case CHARACTER_ARMOR:
- set_shield(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_shield(player_ptr, (TIME_EFFECT)plev, false);
if (plev > 14)
- set_oppose_acid(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_oppose_acid(player_ptr, (TIME_EFFECT)plev, false);
if (plev > 19)
- set_oppose_fire(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_oppose_fire(player_ptr, (TIME_EFFECT)plev, false);
if (plev > 24)
- set_oppose_cold(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_oppose_cold(player_ptr, (TIME_EFFECT)plev, false);
if (plev > 29)
- set_oppose_elec(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_oppose_elec(player_ptr, (TIME_EFFECT)plev, false);
if (plev > 34)
- set_oppose_pois(caster_ptr, (TIME_EFFECT)plev, FALSE);
+ set_oppose_pois(player_ptr, (TIME_EFFECT)plev, false);
break;
case PSYCHOMETRY:
if (plev < 25)
- return psychometry(caster_ptr);
+ return psychometry(player_ptr);
else
- return ident_spell(caster_ptr, FALSE, TV_NONE);
+ return ident_spell(player_ptr, false);
case MIND_WAVE:
msg_print(_("精神を捻じ曲げる波動を発生させた！", "Mind-warping forces emanate from your brain!"));
if (plev < 25)
- project(caster_ptr, 0, 2 + plev / 10, caster_ptr->y, caster_ptr->x, (plev * 3), GF_PSI, PROJECT_KILL, -1);
+ project(player_ptr, 0, 2 + plev / 10, player_ptr->y, player_ptr->x, (plev * 3), GF_PSI, PROJECT_KILL);
else
- (void)mindblast_monsters(caster_ptr, randint1(plev * ((plev - 5) / 10 + 1)));
+ (void)mindblast_monsters(player_ptr, randint1(plev * ((plev - 5) / 10 + 1)));
break;
case ADRENALINE_CHANNELING:
- set_afraid(caster_ptr, 0);
- set_stun(caster_ptr, 0);
- if (!is_fast(caster_ptr) || !is_hero(caster_ptr))
- hp_player(caster_ptr, plev);
+ set_afraid(player_ptr, 0);
+ set_stun(player_ptr, 0);
+ if (!is_fast(player_ptr) || !is_hero(player_ptr))
+ hp_player(player_ptr, plev);
t = 10 + randint1((plev * 3) / 2);
- set_hero(caster_ptr, t, FALSE);
- (void)set_fast(caster_ptr, t, FALSE);
+ set_hero(player_ptr, t, false);
+ (void)set_fast(player_ptr, t, false);
break;
case TELEKINESIS:
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
- fetch_item(caster_ptr, dir, plev * 15, FALSE);
+ fetch_item(player_ptr, dir, plev * 15, false);
break;
case PSYCHIC_DRAIN:
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
dam = damroll(plev / 2, 6);
- if (fire_ball(caster_ptr, GF_PSI_DRAIN, dir, dam, 0))
- caster_ptr->energy_need += randint1(150);
+ if (fire_ball(player_ptr, GF_PSI_DRAIN, dir, dam, 0))
+ player_ptr->energy_need += randint1(150);
break;
case PSYCHO_SPEAR:
- if (!get_aim_dir(caster_ptr, &dir))
- return FALSE;
+ if (!get_aim_dir(player_ptr, &dir))
+ return false;
- fire_beam(caster_ptr, GF_PSY_SPEAR, dir, randint1(plev * 3) + plev * 3);
+ fire_beam(player_ptr, GF_PSY_SPEAR, dir, randint1(plev * 3) + plev * 3);
break;
case THE_WORLD:
- time_walk(caster_ptr);
+ time_walk(player_ptr);
break;
default:
msg_print(_("なに？", "Zap?"));
}
- return TRUE;
+ return true;
}
OSDN Git Service
