* @date 2014/01/14
* @author
* 2014 Deskull rearranged comment for Doxygen.\n
- * @details
- * magic_num1\n
- * 0: Flag bits of spelling spells\n
- * 1: Flag bits of despelled spells\n
- * 2: Revange damage\n
- * magic_num2\n
- * 0: Number of spelling spells\n
- * 1: Type of revenge\n
- * 2: Turn count for revenge\n
*/
#include "realm/realm-hex.h"
#include "spell-kind/spells-sight.h"
#include "spell-kind/spells-teleport.h"
#include "spell-realm/spells-hex.h"
-#include "spell-realm/spells-song.h"
-#include "spell/spell-types.h"
+#include "effect/attribute-types.h"
#include "spell/spells-execution.h"
#include "spell/spells-status.h"
#include "spell/technic-info-table.h"
* @param o_ptr オブジェクト構造体の参照ポインタ
* @return 呪縛可能な武器ならばTRUEを返す
*/
-static bool item_tester_hook_weapon_except_bow(const object_type *o_ptr)
+static bool item_tester_hook_weapon_except_bow(const ObjectType *o_ptr)
{
switch (o_ptr->tval) {
- case TV_SWORD:
- case TV_HAFTED:
- case TV_POLEARM:
- case TV_DIGGING:
+ case ItemKindType::SWORD:
+ case ItemKindType::HAFTED:
+ case ItemKindType::POLEARM:
+ case ItemKindType::DIGGING:
return true;
default:
return false;
/*!
* @brief 呪術領域魔法の各処理を行う
* @param spell 魔法ID
- * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_CONT / SPELL_STOP)
- * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_CONT / SPELL_STOP 時はnullptr文字列を返す。
+ * @param mode 処理内容 (SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO / SpellProcessType::CAST / SPELL_CONT / SpellProcessType::STOP)
+ * @return SpellProcessType::NAME / SPELL_DESC / SpellProcessType::INFO 時には文字列ポインタを返す。SpellProcessType::CAST / SPELL_CONT / SpellProcessType::STOP 時はnullptr文字列を返す。
*/
-concptr do_hex_spell(player_type *player_ptr, spell_hex_type spell, spell_type mode)
+concptr do_hex_spell(PlayerType *player_ptr, spell_hex_type spell, SpellProcessType mode)
{
- auto name = mode == SPELL_NAME;
- auto description = mode == SPELL_DESCRIPTION;
- auto info = mode == SPELL_INFO;
- auto cast = mode == SPELL_CAST;
- auto continuation = mode == SPELL_CONTNUATION;
- auto stop = mode == SPELL_STOP;
+ auto name = mode == SpellProcessType::NAME;
+ auto description = mode == SpellProcessType::DESCRIPTION;
+ auto info = mode == SpellProcessType::INFO;
+ auto cast = mode == SpellProcessType::CAST;
+ auto continuation = mode == SpellProcessType::CONTNUATION;
+ auto stop = mode == SpellProcessType::STOP;
auto should_continue = true;
- HIT_POINT power;
+ int power;
switch (spell) {
/*** 1st book (0-7) ***/
case HEX_BLESS:
if (info)
return info_damage(1, power, 0);
if (cast || continuation) {
- project_all_los(player_ptr, GF_POIS, randint1(power));
+ project_all_los(player_ptr, AttributeType::POIS, randint1(power));
}
break;
OBJECT_IDX item;
concptr q, s;
GAME_TEXT o_name[MAX_NLEN];
- object_type *o_ptr;
+ ObjectType *o_ptr;
q = _("どれを呪いますか？", "Which weapon do you curse?");
s = _("武器を装備していない。", "You're not wielding a weapon.");
} else {
int curse_rank = 0;
msg_format(_("恐怖の暗黒オーラがあなたの%sを包み込んだ！", "A terrible black aura blasts your %s!"), o_name);
- o_ptr->curse_flags.set(TRC::CURSED);
+ o_ptr->curse_flags.set(CurseTraitType::CURSED);
if (o_ptr->is_artifact() || o_ptr->is_ego()) {
if (one_in_(3))
- o_ptr->curse_flags.set(TRC::HEAVY_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::HEAVY_CURSE);
if (one_in_(666)) {
- o_ptr->curse_flags.set(TRC::TY_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::TY_CURSE);
if (one_in_(666))
- o_ptr->curse_flags.set(TRC::PERMA_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::PERMA_CURSE);
o_ptr->art_flags.set(TR_AGGRAVATE);
o_ptr->art_flags.set(TR_VORPAL);
}
SpellHex spell_hex(player_ptr);
- power = MIN(200, spell_hex.get_revenge_power() * 2);
+ power = std::min(200, spell_hex.get_revenge_power() * 2);
if (info) {
return info_damage(0, 0, power);
}
if (cast) {
int a = 3 - (player_ptr->pspeed - 100) / 10;
- byte r = 3 + randint1(3) + MAX(0, MIN(3, a));
+ byte r = 3 + randint1(3) + std::max(0, std::min(3, a));
if (spell_hex.get_revenge_turn() > 0) {
msg_print(_("すでに我慢をしている。", "You are already biding your time for vengeance."));
if ((spell_hex.get_revenge_turn() == 0) || (power >= 200)) {
msg_print(_("我慢が解かれた！", "My patience is at an end!"));
if (power) {
- project(player_ptr, 0, rad, player_ptr->y, player_ptr->x, power, GF_HELL_FIRE, (PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL));
+ project(player_ptr, 0, rad, player_ptr->y, player_ptr->x, power, AttributeType::HELL_FIRE, (PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL));
}
- if (current_world_ptr->wizard) {
+ if (w_ptr->wizard) {
msg_format(_("%d点のダメージを返した。", "You return %d damage."), power);
}
if (info)
return info_damage(1, power, 0);
if (cast || continuation) {
- project_all_los(player_ptr, GF_HYPODYNAMIA, randint1(power));
+ project_all_los(player_ptr, AttributeType::HYPODYNAMIA, randint1(power));
}
break;
OBJECT_IDX item;
concptr q, s;
GAME_TEXT o_name[MAX_NLEN];
- object_type *o_ptr;
+ ObjectType *o_ptr;
q = _("どれを呪いますか？", "Which piece of armour do you curse?");
s = _("防具を装備していない。", "You're not wearing any armor.");
- o_ptr = choose_object(player_ptr, &item, q, s, (USE_EQUIP), FuncItemTester(&object_type::is_armour));
+ o_ptr = choose_object(player_ptr, &item, q, s, (USE_EQUIP), FuncItemTester(&ObjectType::is_armour));
if (!o_ptr)
return "";
} else {
int curse_rank = 0;
msg_format(_("恐怖の暗黒オーラがあなたの%sを包み込んだ！", "A terrible black aura blasts your %s!"), o_name);
- o_ptr->curse_flags.set(TRC::CURSED);
+ o_ptr->curse_flags.set(CurseTraitType::CURSED);
if (o_ptr->is_artifact() || o_ptr->is_ego()) {
if (one_in_(3))
- o_ptr->curse_flags.set(TRC::HEAVY_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::HEAVY_CURSE);
if (one_in_(666)) {
- o_ptr->curse_flags.set(TRC::TY_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::TY_CURSE);
if (one_in_(666))
- o_ptr->curse_flags.set(TRC::PERMA_CURSE);
+ o_ptr->curse_flags.set(CurseTraitType::PERMA_CURSE);
o_ptr->art_flags.set(TR_AGGRAVATE);
o_ptr->art_flags.set(TR_RES_POIS);
if (description)
return _("影のオーラを身にまとい、敵に影のダメージを与える。", "Gives aura of shadow.");
if (cast) {
- object_type *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
+ auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
if (!o_ptr->k_idx) {
msg_print(_("クロークを身につけていない！", "You are not wearing a cloak."));
}
}
if (continuation) {
- object_type *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
+ auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
if ((!o_ptr->k_idx) || (!o_ptr->is_cursed())) {
- exe_spell(player_ptr, REALM_HEX, spell, SPELL_STOP);
+ exe_spell(player_ptr, REALM_HEX, spell, SpellProcessType::STOP);
SpellHex spell_hex(player_ptr);
spell_hex.reset_casting_flag(spell);
- if (get_singing_song_id(player_ptr) == 0)
+ if (!spell_hex.is_spelling_any())
set_action(player_ptr, ACTION_NONE);
}
}
if (info)
return info_damage(1, power, 0);
if (cast || continuation) {
- project_all_los(player_ptr, GF_PSI_DRAIN, randint1(power));
+ project_all_los(player_ptr, AttributeType::PSI_DRAIN, randint1(power));
}
break;
}
if (!flag) {
- msg_format(_("%sの呪文の詠唱をやめた。", "Finish casting '%^s'."), exe_spell(player_ptr, REALM_HEX, HEX_RESTORE, SPELL_NAME));
+ msg_format(_("%sの呪文の詠唱をやめた。", "Finish casting '%^s'."), exe_spell(player_ptr, REALM_HEX, HEX_RESTORE, SpellProcessType::NAME));
SpellHex spell_hex(player_ptr);
spell_hex.reset_casting_flag(HEX_RESTORE);
- if (spell_hex.get_casting_num() > 0) {
- player_ptr->action = ACTION_NONE;
+ if (!spell_hex.is_spelling_any()) {
+ set_action(player_ptr, ACTION_NONE);
}
player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
if (cast) {
OBJECT_IDX item;
concptr s, q;
- object_type *o_ptr;
+ ObjectType *o_ptr;
q = _("どの装備品から吸収しますか？", "Which cursed equipment do you drain mana from?");
s = _("呪われたアイテムを装備していない。", "You have no cursed equipment.");
- o_ptr = choose_object(player_ptr, &item, q, s, (USE_EQUIP), FuncItemTester(&object_type::is_cursed));
+ o_ptr = choose_object(player_ptr, &item, q, s, (USE_EQUIP), FuncItemTester(&ObjectType::is_cursed));
if (!o_ptr)
return "";
auto f = object_flags(o_ptr);
player_ptr->csp += (player_ptr->lev / 5) + randint1(player_ptr->lev / 5);
- if (f.has(TR_TY_CURSE) || o_ptr->curse_flags.has(TRC::TY_CURSE))
+ if (f.has(TR_TY_CURSE) || o_ptr->curse_flags.has(CurseTraitType::TY_CURSE))
player_ptr->csp += randint1(5);
if (player_ptr->csp > player_ptr->msp)
player_ptr->csp = player_ptr->msp;
- if (o_ptr->curse_flags.has(TRC::PERMA_CURSE)) {
+ if (o_ptr->curse_flags.has(CurseTraitType::PERMA_CURSE)) {
/* Nothing */
- } else if (o_ptr->curse_flags.has(TRC::HEAVY_CURSE)) {
+ } else if (o_ptr->curse_flags.has(CurseTraitType::HEAVY_CURSE)) {
if (one_in_(7)) {
msg_print(_("呪いを全て吸い取った。", "A heavy curse vanished."));
o_ptr->curse_flags.clear();
}
- } else if (o_ptr->curse_flags.has(TRC::CURSED) && one_in_(3)) {
+ } else if (o_ptr->curse_flags.has(CurseTraitType::CURSED) && one_in_(3)) {
msg_print(_("呪いを全て吸い取った。", "A curse vanished."));
o_ptr->curse_flags.clear();
}
if (cast) {
byte r;
int a = 3 - (player_ptr->pspeed - 100) / 10;
- r = 1 + randint1(2) + MAX(0, MIN(3, a));
+ r = 1 + randint1(2) + std::max(0, std::min(3, a));
if (spell_hex.get_revenge_turn() > 0) {
msg_print(_("すでに復讐は宣告済みだ。", "You've already declared your revenge."));
msg_print(_("復讐の時だ！", "Time for revenge!"));
} while (!get_aim_dir(player_ptr, &dir));
- fire_ball(player_ptr, GF_HELL_FIRE, dir, power, 1);
+ fire_ball(player_ptr, AttributeType::HELL_FIRE, dir, power, 1);
- if (current_world_ptr->wizard) {
+ if (w_ptr->wizard) {
msg_format(_("%d点のダメージを返した。", "You return %d damage."), power);
}
} else {
break;
}
+ case HEX_MAX:
+ break;
}
if (cast && should_continue) {
OSDN Git Service
