#include "player/player-status-flags.h"
-#include "art-definition/art-sword-types.h"
+#include "artifact/fixed-art-types.h"
#include "grid/grid.h"
#include "inventory/inventory-slot-types.h"
#include "monster-race/monster-race.h"
#include "object-hook/hook-checker.h"
#include "object-hook/hook-weapon.h"
#include "object/object-flags.h"
+#include "player/mimic-info-table.h"
#include "player/player-class.h"
#include "player/player-race-types.h"
#include "player/player-race.h"
#include "player/player-skill.h"
#include "player/player-status.h"
+#include "player/race-info-table.h"
#include "player/special-defense-types.h"
#include "realm/realm-hex-numbers.h"
#include "realm/realm-song-numbers.h"
static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_flag);
+/*!
+ * @brief 装備による所定の特性フラグを得ているかを一括して取得する関数。
+ */
static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_flag)
{
object_type *o_ptr;
BIT_FLAGS flgs[TR_FLAG_SIZE];
BIT_FLAGS result = 0L;
- for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+ for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
o_ptr = &creature_ptr->inventory_list[i];
if (!o_ptr->k_idx)
continue;
object_flags(creature_ptr, o_ptr, flgs);
if (has_flag(flgs, tr_flag))
- result |= 0x01 << (i - INVEN_RARM);
+ result |= 0x01U << (i - INVEN_MAIN_HAND);
}
return result;
}
-bool is_kill_wall(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが壁破壊進行を持っているかを返す。
+ */
+bool has_kill_wall(player_type *creature_ptr)
{
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || music_singing(creature_ptr, MUSIC_WALL)) {
return TRUE;
return FALSE;
}
-bool is_pass_wall(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが壁通過を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたらTRUE
+ * @details
+ * * 時限で幽体化、壁抜けをもつか種族幽霊ならばひとまずTRUE。
+ * * 但し騎乗中は乗騎が壁抜けを持っていなければ不能になる。
+ */
+bool has_pass_wall(player_type *creature_ptr)
{
bool pow = FALSE;
return pow;
}
-BIT_FLAGS is_xtra_might(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが強力射を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_xtra_might(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
result |= check_equipment_flags(creature_ptr, TR_XTRA_MIGHT);
return result;
}
-BIT_FLAGS is_esp_evil(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが赤外線視力修正を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ * @details 種族修正は0より大きければTRUEとする。
+ */
+BIT_FLAGS has_infra_vision(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
- if (creature_ptr->realm1 == REALM_HEX) {
- if (hex_spelling(creature_ptr, HEX_DETECT_EVIL))
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
- }
- result |= check_equipment_flags(creature_ptr, TR_ESP_EVIL);
- return result;
-}
-
-BIT_FLAGS is_esp_animal(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_ANIMAL);
- return result;
-}
-
-BIT_FLAGS is_esp_undead(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_UNDEAD);
- return result;
-}
-
-BIT_FLAGS is_esp_demon(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_DEMON);
- return result;
-}
-
-BIT_FLAGS is_esp_orc(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_ORC);
- return result;
-}
-
-BIT_FLAGS is_esp_troll(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_TROLL);
- return result;
-}
+ const player_race *tmp_rp_ptr;
-BIT_FLAGS is_esp_giant(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_GIANT);
- return result;
-}
+ if (creature_ptr->mimic_form)
+ tmp_rp_ptr = &mimic_info[creature_ptr->mimic_form];
+ else
+ tmp_rp_ptr = &race_info[creature_ptr->prace];
-BIT_FLAGS is_esp_dragon(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_DRAGON);
- return result;
-}
+ if (tmp_rp_ptr->infra > 0)
+ result |= FLAG_CAUSE_RACE;
-BIT_FLAGS is_esp_human(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_HUMAN);
- return result;
-}
+ if (creature_ptr->muta3 & MUT3_INFRAVIS)
+ result |= FLAG_CAUSE_MUTATION;
-BIT_FLAGS is_esp_good(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD);
- return result;
-}
+ if (creature_ptr->tim_infra)
+ result |= FLAG_CAUSE_MAGIC_TIME_EFFECT;
-BIT_FLAGS is_esp_nonliving(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD);
+ result |= check_equipment_flags(creature_ptr, TR_INFRA);
return result;
}
-BIT_FLAGS is_esp_unique(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが邪悪感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_evil(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_ESP_UNIQUE);
+ if (creature_ptr->realm1 == REALM_HEX) {
+ if (hex_spelling(creature_ptr, HEX_DETECT_EVIL))
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ }
+ result |= check_equipment_flags(creature_ptr, TR_ESP_EVIL);
return result;
}
-BIT_FLAGS is_esp_telepathy(player_type *creature_ptr)
+/*!
+ * @brief クリーチャーが自然界の動物感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_animal(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_ANIMAL); }
+
+/*!
+ * @brief クリーチャーがアンデッド感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_undead(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_UNDEAD); }
+
+/*!
+ * @brief クリーチャーが悪魔感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_demon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_DEMON); }
+
+/*!
+ * @brief クリーチャーがオーク感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_orc(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_ORC); }
+
+/*!
+ * @brief クリーチャーがトロル感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_troll(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_TROLL); }
+
+/*!
+ * @brief クリーチャーが巨人感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_giant(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_GIANT); }
+
+/*!
+ * @brief クリーチャーがドラゴン感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_dragon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_DRAGON); }
+
+/*!
+ * @brief クリーチャーが人間感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_human(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_HUMAN); }
+
+/*!
+ * @brief クリーチャーが善良感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_good(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_GOOD); }
+
+/*!
+ * @brief クリーチャーが無生物感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_nonliving(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_NONLIVING); }
+
+/*!
+ * @brief クリーチャーがユニーク感知を持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_unique(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_UNIQUE); }
+
+/*!
+ * @brief クリーチャーがテレパシーを持っているかを返す。
+ * @param creature_ptr 判定対象のクリーチャー参照ポインタ
+ * @return 持っていたら所持前提ビットフラグを返す。
+ */
+BIT_FLAGS has_esp_telepathy(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (is_time_limit_esp(creature_ptr) || creature_ptr->ult_res || (creature_ptr->special_defense & KATA_MUSOU)) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->muta3 & MUT3_ESP) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER) && creature_ptr->lev > 29)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (is_specific_player_race(creature_ptr, RACE_SPECTRE) && creature_ptr->lev > 34)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 39)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
result |= check_equipment_flags(creature_ptr, TR_TELEPATHY);
return result;
}
-BIT_FLAGS has_bless_blade(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_BLESSED);
- return result;
-}
+BIT_FLAGS has_bless_blade(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_BLESSED); }
-BIT_FLAGS has_easy2_weapon(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_EASY2_WEAPON);
- return result;
-}
+BIT_FLAGS has_easy2_weapon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_EASY2_WEAPON); }
-BIT_FLAGS has_down_saving(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_DOWN_SAVING);
- return result;
-}
+BIT_FLAGS has_down_saving(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_DOWN_SAVING); }
-BIT_FLAGS has_no_ac(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_NO_AC);
- return result;
-}
+BIT_FLAGS has_no_ac(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_AC); }
BIT_FLAGS has_invuln_arrow(player_type *creature_ptr)
{
return result;
}
-void has_no_flowed(player_type *creature_ptr)
+void check_no_flowed(player_type *creature_ptr)
{
object_type *o_ptr;
bool has_sw = FALSE, has_kabe = FALSE;
creature_ptr->no_flowed = FALSE;
- if (creature_ptr->pass_wall && !creature_ptr->kill_wall)
+ if (has_pass_wall(creature_ptr) && !has_kill_wall(creature_ptr))
creature_ptr->no_flowed = TRUE;
for (int i = 0; i < INVEN_PACK; i++) {
}
}
-BIT_FLAGS has_mighty_throw(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_MIGHTY_THROW);
- return result;
-}
+BIT_FLAGS has_mighty_throw(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_MIGHTY_THROW); }
-BIT_FLAGS has_dec_mana(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_DEC_MANA);
- return result;
-}
+BIT_FLAGS has_dec_mana(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_DEC_MANA); }
BIT_FLAGS has_reflect(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_BERSERKER && creature_ptr->lev > 39)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->pclass == CLASS_MIRROR_MASTER && creature_ptr->lev > 39)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->special_defense & KAMAE_GENBU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res || creature_ptr->wraith_form || creature_ptr->magicdef || creature_ptr->tim_reflect) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_REFLECT);
object_type *o_ptr;
BIT_FLAGS flgs[TR_FLAG_SIZE];
- for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+ for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
o_ptr = &creature_ptr->inventory_list[i];
if (!o_ptr->k_idx)
continue;
if (has_flag(flgs, TR_WARNING)) {
if (!o_ptr->inscription || !(angband_strchr(quark_str(o_ptr->inscription), '$')))
- result |= 0x01 << (i - INVEN_RARM);
+ result |= 0x01U << (i - INVEN_MAIN_HAND);
}
}
return result;
}
-BIT_FLAGS has_anti_magic(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_NO_MAGIC);
- return result;
-}
+BIT_FLAGS has_anti_magic(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_MAGIC); }
-BIT_FLAGS has_anti_tele(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_NO_TELE);
- return result;
-}
+BIT_FLAGS has_anti_tele(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_TELE); }
BIT_FLAGS has_sh_fire(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_FIRE_BODY) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (hex_spelling(creature_ptr, HEX_DEMON_AURA) || creature_ptr->ult_res || creature_ptr->tim_sh_fire) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_SH_FIRE);
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_ELEC_TOUC)
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
if (hex_spelling(creature_ptr, HEX_SHOCK_CLOAK) || creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || (creature_ptr->special_defense & KATA_MUSOU)) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SH_ELEC);
BIT_FLAGS result = 0L;
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res || hex_spelling(creature_ptr, HEX_ICE_ARMOR)) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_SH_COLD);
return result;
}
-BIT_FLAGS has_easy_spell(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_EASY_SPELL);
- return result;
-}
+BIT_FLAGS has_easy_spell(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_EASY_SPELL); }
-BIT_FLAGS has_heavy_spell(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_HEAVY_SPELL);
- return result;
-}
+BIT_FLAGS has_heavy_spell(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_HEAVY_SPELL); }
BIT_FLAGS has_hold_exp(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
- result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+ result |= 0x01U << FLAG_CAUSE_PERSONALITY;
}
if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_HOBBIT) || is_specific_player_race(creature_ptr, RACE_SKELETON)
|| is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
|| is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_BALROG)
|| is_specific_player_race(creature_ptr, RACE_ANDROID)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_GOLEM)) {
if (creature_ptr->lev > 34)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_HOLD_EXP);
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 29)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_HIGH_ELF) || is_specific_player_race(creature_ptr, RACE_GOLEM)
|| is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_ZOMBIE)
|| is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_ARCHON)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_DARK_ELF) && creature_ptr->lev > 19) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER) && creature_ptr->lev > 14) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if ((is_specific_player_race(creature_ptr, RACE_IMP) || is_specific_player_race(creature_ptr, RACE_BALROG)) && creature_ptr->lev > 9) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res || creature_ptr->tim_invis) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_SEE_INVIS);
return result;
}
-BIT_FLAGS has_magic_mastery(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
-
- result |= check_equipment_flags(creature_ptr, TR_MAGIC_MASTERY);
- return result;
-}
+BIT_FLAGS has_magic_mastery(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_MAGIC_MASTERY); }
BIT_FLAGS has_free_act(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_MOTION)
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
if (is_specific_player_race(creature_ptr, RACE_GNOME) || is_specific_player_race(creature_ptr, RACE_GOLEM)
|| is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_ANDROID)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
- if (heavy_armor(creature_ptr) && (!creature_ptr->inventory_list[INVEN_RARM].k_idx || has_right_hand_weapon(creature_ptr))
- && (!creature_ptr->inventory_list[INVEN_LARM].k_idx || has_left_hand_weapon(creature_ptr))) {
+ if (creature_ptr->pclass == CLASS_NINJA && !heavy_armor(creature_ptr)
+ && (!creature_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(creature_ptr))
+ && (!creature_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(creature_ptr))) {
if (creature_ptr->lev > 24)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (creature_ptr->pclass == CLASS_MONK || creature_ptr->pclass == CLASS_FORCETRAINER) {
if (!(heavy_armor(creature_ptr))) {
if (creature_ptr->lev > 24)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
}
if (creature_ptr->pclass == CLASS_BERSERKER) {
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (creature_ptr->ult_res || creature_ptr->magicdef) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_FREE_ACT);
return result;
}
-BIT_FLAGS is_sustain_str(player_type *creature_ptr)
+BIT_FLAGS has_sustain_str(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_BERSERKER) {
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (is_specific_player_race(creature_ptr, RACE_HALF_TROLL) || is_specific_player_race(creature_ptr, RACE_HALF_OGRE)
|| is_specific_player_race(creature_ptr, RACE_HALF_GIANT)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_STR);
return result;
}
-BIT_FLAGS is_sustain_int(player_type *creature_ptr)
+BIT_FLAGS has_sustain_int(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_INT);
return result;
}
-BIT_FLAGS is_sustain_wis(player_type *creature_ptr)
+BIT_FLAGS has_sustain_wis(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
- result = FALSE;
if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 19)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_MIND_FLAYER)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_WIS);
return result;
}
-BIT_FLAGS is_sustain_dex(player_type *creature_ptr)
+BIT_FLAGS has_sustain_dex(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_BERSERKER) {
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 24)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_DEX);
return result;
}
-BIT_FLAGS is_sustain_con(player_type *creature_ptr)
+BIT_FLAGS has_sustain_con(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_BERSERKER) {
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_AMBERITE || creature_ptr->prace == RACE_DUNADAN)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_CON);
return result;
}
-BIT_FLAGS is_sustain_chr(player_type *creature_ptr)
+BIT_FLAGS has_sustain_chr(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_SUST_CHR);
{
BIT_FLAGS result = 0L;
- if (creature_ptr->muta3 & MUT3_WINGS)
- result = FLAG_CAUSE_MUTATION;
+ if (creature_ptr->muta3 & MUT3_WINGS) {
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
+ }
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result = FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) || is_specific_player_race(creature_ptr, RACE_SPECTRE)
|| is_specific_player_race(creature_ptr, RACE_SPRITE) || is_specific_player_race(creature_ptr, RACE_ARCHON)
|| is_specific_player_race(creature_ptr, RACE_S_FAIRY)) {
- result = FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KAMAE_SUZAKU || (creature_ptr->special_defense & KATA_MUSOU)) {
- result = FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
- if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ if (creature_ptr->ult_res || creature_ptr->magicdef) {
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->riding) {
}
if (creature_ptr->tim_levitation) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_LEVITATION);
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_NINJA) {
- result = FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (creature_ptr->lev > 14 && !creature_ptr->mimic_form && creature_ptr->prace == RACE_HALF_TROLL) {
if (creature_ptr->pclass == CLASS_WARRIOR || creature_ptr->pclass == CLASS_BERSERKER) {
- result = FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
/* Let's not make Regeneration
* a disadvantage for the poor warriors who can
* never learn a spell that satisfies hunger (actually
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result = FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (!creature_ptr->mimic_form
&& (creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_ZOMBIE || creature_ptr->prace == RACE_SPECTRE
|| creature_ptr->prace == RACE_ANDROID)) {
- result = FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
result |= check_equipment_flags(creature_ptr, TR_SLOW_DIGEST);
BIT_FLAGS result = 0L;
if (is_specific_player_race(creature_ptr, RACE_HALF_TROLL) && creature_ptr->lev > 14) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_AMBERITE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->pclass == CLASS_WARRIOR && creature_ptr->lev > 44) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->pclass == CLASS_BERSERKER) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->muta3 & MUT3_REGEN)
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (hex_spelling(creature_ptr, HEX_DEMON_AURA) || creature_ptr->ult_res || creature_ptr->tim_regen) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_REGEN);
if (creature_ptr->pseikaku == PERSONALITY_SEXY)
creature_ptr->cursed |= (TRC_AGGRAVATE);
- for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+ for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
o_ptr = &creature_ptr->inventory_list[i];
if (!o_ptr->k_idx)
continue;
if (creature_ptr->cursed & TRC_TELEPORT)
creature_ptr->cursed &= ~(TRC_TELEPORT_SELF);
-
- if ((is_specific_player_race(creature_ptr, RACE_S_FAIRY)) && (creature_ptr->pseikaku != PERSONALITY_SEXY) && (creature_ptr->cursed & TRC_AGGRAVATE)) {
- creature_ptr->cursed &= ~(TRC_AGGRAVATE);
- }
}
-BIT_FLAGS has_impact(player_type *creature_ptr)
-{
- BIT_FLAGS result = 0L;
- result |= check_equipment_flags(creature_ptr, TR_IMPACT);
- return result;
-}
+BIT_FLAGS has_impact(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_IMPACT); }
void has_extra_blow(player_type *creature_ptr)
{
BIT_FLAGS flgs[TR_FLAG_SIZE];
creature_ptr->extra_blows[0] = creature_ptr->extra_blows[1] = 0;
- for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+ for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
o_ptr = &creature_ptr->inventory_list[i];
if (!o_ptr->k_idx)
continue;
object_flags(creature_ptr, o_ptr, flgs);
if (has_flag(flgs, TR_BLOWS)) {
- if ((i == INVEN_RARM || i == INVEN_RIGHT) && !has_two_handed_weapons(creature_ptr))
+ if ((i == INVEN_MAIN_HAND || i == INVEN_MAIN_RING) && !has_two_handed_weapons(creature_ptr))
creature_ptr->extra_blows[0] += o_ptr->pval;
- else if ((i == INVEN_LARM || i == INVEN_LEFT) && !has_two_handed_weapons(creature_ptr))
+ else if ((i == INVEN_SUB_HAND || i == INVEN_SUB_RING) && !has_two_handed_weapons(creature_ptr))
creature_ptr->extra_blows[1] += o_ptr->pval;
else {
creature_ptr->extra_blows[0] += o_ptr->pval;
}
}
-BIT_FLAGS is_resist_acid(player_type *creature_ptr)
+BIT_FLAGS has_resist_acid(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_YEEK) || is_specific_player_race(creature_ptr, RACE_KLACKON)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 14) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
- result |= is_immune_acid(creature_ptr);
+ result |= has_immune_acid(creature_ptr);
result |= check_equipment_flags(creature_ptr, TR_RES_ACID);
return result;
}
-BIT_FLAGS is_vuln_acid(player_type *creature_ptr)
+BIT_FLAGS has_vuln_acid(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (creature_ptr->special_defense & KATA_KOUKIJIN) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
return result;
}
-BIT_FLAGS is_resist_elec(player_type *creature_ptr)
+BIT_FLAGS has_resist_elec(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
} else if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 19) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_ELEC);
- result |= is_immune_elec(creature_ptr);
+ result |= has_immune_elec(creature_ptr);
return result;
}
-BIT_FLAGS is_vuln_elec(player_type *creature_ptr)
+BIT_FLAGS has_vuln_elec(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (is_specific_player_race(creature_ptr, RACE_ANDROID)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_KOUKIJIN) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
return result;
}
-BIT_FLAGS is_resist_fire(player_type *creature_ptr)
+BIT_FLAGS has_resist_fire(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 4) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_IMP || creature_ptr->prace == RACE_BALROG)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_FIRE);
- result |= is_immune_fire(creature_ptr);
+ result |= has_immune_fire(creature_ptr);
return result;
}
-BIT_FLAGS is_vuln_fire(player_type *creature_ptr)
+BIT_FLAGS has_vuln_fire(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (is_specific_player_race(creature_ptr, RACE_ENT)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_KOUKIJIN) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
return result;
}
-BIT_FLAGS is_resist_cold(player_type *creature_ptr)
+BIT_FLAGS has_resist_cold(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_ZOMBIE) && creature_ptr->lev > 4) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if ((is_specific_player_race(creature_ptr, RACE_DRACONIAN) || is_specific_player_race(creature_ptr, RACE_SKELETON)) && creature_ptr->lev > 9) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_COLD);
- result |= is_immune_cold(creature_ptr);
+ result |= has_immune_cold(creature_ptr);
return result;
}
-BIT_FLAGS is_vuln_cold(player_type *creature_ptr)
+BIT_FLAGS has_vuln_cold(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
}
if (creature_ptr->special_defense & KATA_KOUKIJIN) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
return result;
}
-BIT_FLAGS is_resist_pois(player_type *creature_ptr)
+BIT_FLAGS has_resist_pois(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 19)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->mimic_form == MIMIC_VAMPIRE || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 34) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form
&& (creature_ptr->prace == RACE_KOBOLD || creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_SKELETON
|| creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE || creature_ptr->prace == RACE_ANDROID)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_POIS);
return result;
}
-BIT_FLAGS is_resist_conf(player_type *creature_ptr)
+BIT_FLAGS has_resist_conf(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 29)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->pseikaku == PERSONALITY_CHARGEMAN || creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
- result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+ result |= 0x01U << FLAG_CAUSE_PERSONALITY;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_KLACKON || creature_ptr->prace == RACE_BEASTMAN || creature_ptr->prace == RACE_KUTAR)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->ult_res || creature_ptr->magicdef) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= check_equipment_flags(creature_ptr, TR_RES_CONF);
return result;
}
-BIT_FLAGS is_resist_sound(player_type *creature_ptr)
+BIT_FLAGS has_resist_sound(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_BARD) {
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
}
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_CYCLOPS || creature_ptr->prace == RACE_BEASTMAN)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_SOUND);
return result;
}
-BIT_FLAGS is_resist_lite(player_type *creature_ptr)
+BIT_FLAGS has_resist_lite(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_ELF || creature_ptr->prace == RACE_HIGH_ELF || creature_ptr->prace == RACE_SPRITE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_LITE);
return result;
}
-BIT_FLAGS is_vuln_lite(player_type *creature_ptr)
+BIT_FLAGS has_vuln_lite(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (is_specific_player_race(creature_ptr, RACE_S_FAIRY) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
|| (creature_ptr->mimic_form == MIMIC_VAMPIRE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->wraith_form) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
return result;
}
-BIT_FLAGS is_resist_dark(player_type *creature_ptr)
+BIT_FLAGS has_resist_dark(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form
&& (creature_ptr->prace == RACE_HALF_ORC || creature_ptr->prace == RACE_HALF_OGRE || creature_ptr->prace == RACE_NIBELUNG
|| creature_ptr->prace == RACE_DARK_ELF || creature_ptr->prace == RACE_VAMPIRE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_DARK);
return result;
}
-BIT_FLAGS is_resist_chaos(player_type *creature_ptr)
+BIT_FLAGS has_resist_chaos(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pclass == CLASS_CHAOS_WARRIOR && creature_ptr->lev > 29)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_HALF_TITAN)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_CHAOS);
return result;
}
-BIT_FLAGS is_resist_disen(player_type *creature_ptr)
+BIT_FLAGS has_resist_disen(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_NIBELUNG)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_DISEN);
return result;
}
-BIT_FLAGS is_resist_shard(player_type *creature_ptr)
+BIT_FLAGS has_resist_shard(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
- if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_TITAN || creature_ptr->prace == RACE_SKELETON))
- result |= 0x01 << FLAG_CAUSE_RACE;
+ if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_GIANT || creature_ptr->prace == RACE_SKELETON))
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_SHARDS);
return result;
}
-BIT_FLAGS is_resist_nexus(player_type *creature_ptr)
+BIT_FLAGS has_resist_nexus(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_NEXUS);
return result;
}
-BIT_FLAGS is_resist_blind(player_type *creature_ptr)
+BIT_FLAGS has_resist_blind(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
- result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+ result |= 0x01U << FLAG_CAUSE_PERSONALITY;
}
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_DWARF)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res || creature_ptr->magicdef) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_BLIND);
return result;
}
-BIT_FLAGS is_resist_neth(player_type *creature_ptr)
+BIT_FLAGS has_resist_neth(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form
&& (creature_ptr->prace == RACE_ZOMBIE || creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE
|| creature_ptr->prace == RACE_BALROG))
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (creature_ptr->ult_res || creature_ptr->tim_res_nether) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_NETHER);
return result;
}
-BIT_FLAGS is_resist_time(player_type *creature_ptr)
+BIT_FLAGS has_resist_time(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->tim_res_time) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_TIME);
return result;
}
-BIT_FLAGS is_resist_water(player_type *creature_ptr)
+BIT_FLAGS has_resist_water(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_MERFOLK)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
result |= check_equipment_flags(creature_ptr, TR_RES_WATER);
return result;
}
-BIT_FLAGS is_resist_fear(player_type *creature_ptr)
+BIT_FLAGS has_resist_fear(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->muta3 & MUT3_FEARLESS)
- result |= 0x01 << FLAG_CAUSE_MUTATION;
+ result |= 0x01U << FLAG_CAUSE_MUTATION;
switch (creature_ptr->pclass) {
case CLASS_WARRIOR:
case CLASS_SAMURAI:
if (creature_ptr->lev > 29)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
break;
case CLASS_PALADIN:
case CLASS_CHAOS_WARRIOR:
if (creature_ptr->lev > 39)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
break;
case CLASS_MINDCRAFTER:
if (creature_ptr->lev > 9)
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
break;
case CLASS_NINJA:
- result |= 0x01 << FLAG_CAUSE_CLASS;
+ result |= 0x01U << FLAG_CAUSE_CLASS;
break;
}
if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_BARBARIAN)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if ((creature_ptr->special_defense & KATA_MUSOU)) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
if (is_hero(creature_ptr) || is_shero(creature_ptr) || creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_RES_FEAR);
return result;
}
-BIT_FLAGS is_immune_acid(player_type *creature_ptr)
+BIT_FLAGS has_immune_acid(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_YEEK && creature_ptr->lev > 19)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->ele_immune) {
if (creature_ptr->special_defense & DEFENSE_ACID)
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_IM_ACID);
return result;
}
-BIT_FLAGS is_immune_elec(player_type *creature_ptr)
+BIT_FLAGS has_immune_elec(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->ele_immune) {
if (creature_ptr->special_defense & DEFENSE_ELEC)
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_IM_ELEC);
return result;
}
-BIT_FLAGS is_immune_fire(player_type *creature_ptr)
+BIT_FLAGS has_immune_fire(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->ele_immune) {
if (creature_ptr->special_defense & DEFENSE_FIRE)
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_IM_FIRE);
return result;
}
-BIT_FLAGS is_immune_cold(player_type *creature_ptr)
+BIT_FLAGS has_immune_cold(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (creature_ptr->ele_immune) {
if (creature_ptr->special_defense & DEFENSE_COLD)
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
result |= check_equipment_flags(creature_ptr, TR_IM_COLD);
return result;
}
-BIT_FLAGS is_immune_dark(player_type *creature_ptr)
+BIT_FLAGS has_immune_dark(player_type *creature_ptr)
{
BIT_FLAGS result = 0L;
if (is_specific_player_race(creature_ptr, RACE_VAMPIRE) || (creature_ptr->mimic_form == MIMIC_VAMPIRE)) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (creature_ptr->wraith_form) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
return result;
}
-bool has_right_hand_weapon(player_type *creature_ptr)
+melee_type player_melee_type(player_type *creature_ptr)
{
- if (has_melee_weapon(creature_ptr, INVEN_RARM))
- return TRUE;
+ if (has_two_handed_weapons(creature_ptr))
+ return MELEE_TYPE_WEAPON_TWOHAND;
- if (can_two_hands_wielding(creature_ptr)) {
- switch (creature_ptr->pclass) {
- case CLASS_MONK:
- case CLASS_FORCETRAINER:
- case CLASS_BERSERKER:
- if (empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM)) {
- return TRUE;
- }
- break;
+ if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND)) {
+ if (has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) {
+ return MELEE_TYPE_WEAPON_DOUBLE;
}
+ return MELEE_TYPE_WEAPON_MAIN;
}
+ if (has_melee_weapon(creature_ptr, INVEN_SUB_HAND))
+ return MELEE_TYPE_WEAPON_SUB;
+
+ if (empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_MAIN | EMPTY_HAND_SUB))
+ return MELEE_TYPE_BAREHAND_TWO;
+
+ if (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_MAIN)
+ return MELEE_TYPE_BAREHAND_MAIN;
+
+ if (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_SUB)
+ return MELEE_TYPE_BAREHAND_SUB;
+
+ return MELEE_TYPE_SHIELD_DOUBLE;
+}
+
+/*
+ * @brief 利き手で攻撃可能かどうかを判定する
+ * 利き手で攻撃可能とは、利き手に武器を持っているか、
+ * 利き手が素手かつ左手も素手もしくは盾を装備している事を意味する。
+ * @detail Includes martial arts and hand combats as weapons.
+ */
+bool can_attack_with_main_hand(player_type *creature_ptr)
+{
+ if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND))
+ return TRUE;
+
+ if ((empty_hands(creature_ptr, TRUE) & EMPTY_HAND_MAIN) && !can_attack_with_sub_hand(creature_ptr))
+ return TRUE;
+
return FALSE;
}
-bool has_left_hand_weapon(player_type *creature_ptr) { return has_melee_weapon(creature_ptr, INVEN_LARM); }
+/*
+ * @brief 非利き手で攻撃可能かどうかを判定する
+ * 非利き手で攻撃可能とは、非利き手に武器を持っている事に等しい
+ * @detail Exclude martial arts and hand combats from weapons.
+ */
+bool can_attack_with_sub_hand(player_type *creature_ptr) { return has_melee_weapon(creature_ptr, INVEN_SUB_HAND); }
+/*
+ * @brief 両手持ち状態かどうかを判定する
+ */
bool has_two_handed_weapons(player_type *creature_ptr)
{
if (can_two_hands_wielding(creature_ptr)) {
- if (has_right_hand_weapon(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_LARM)
- && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_RARM])) {
+ if (can_attack_with_main_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_SUB)
+ && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_MAIN_HAND])) {
return TRUE;
- } else if (has_left_hand_weapon(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_RARM)
- && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_LARM])) {
+ } else if (can_attack_with_sub_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_MAIN)
+ && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_SUB_HAND])) {
return TRUE;
}
}
return 0L;
if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
- result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+ result |= 0x01U << FLAG_CAUSE_PERSONALITY;
}
if (creature_ptr->mimic_form == MIMIC_VAMPIRE) {
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
}
if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_VAMPIRE)
- result |= 0x01 << FLAG_CAUSE_RACE;
+ result |= 0x01U << FLAG_CAUSE_RACE;
if (creature_ptr->ult_res) {
- result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+ result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
}
if (creature_ptr->special_defense & KATA_MUSOU) {
- result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+ result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
}
result |= has_sh_fire(creature_ptr);
return result;
}
-bool is_disable_two_handed_bonus(player_type *creature_ptr, int i)
+/*
+ * @brief 両手持ちボーナスがもらえないかどうかを判定する。 / Does *not * get two hand wielding bonus.
+ * @detail
+ * Only can get hit bonuses when wieids an enough light weapon which is lighter than 5 times of weight limit.
+ * If its weight is 10 times heavier or more than weight limit, gets hit penalty in calc_to_hit().
+ */
+bool has_disable_two_handed_bonus(player_type *creature_ptr, int i)
{
- object_type *o_ptr;
- o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
- if (has_melee_weapon(creature_ptr, INVEN_RARM + i)) {
- if (calc_weapon_weight_limit(creature_ptr) * 2 >= o_ptr->weight / 10 && has_two_handed_weapons(creature_ptr)
- && (calc_weapon_weight_limit(creature_ptr) * 2 < o_ptr->weight / 5))
- return TRUE;
+ if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i) && has_two_handed_weapons(creature_ptr)) {
+ object_type *o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
+ int limit = calc_weapon_weight_limit(creature_ptr) * 2;
+
+ /* Enable when two hand wields an enough light weapon */
+ if (limit >= o_ptr->weight / 5)
+ return FALSE;
}
- return FALSE;
+
+ /* Disable when empty hands, one hand wieldings and heavy weapons */
+ return TRUE;
}
-bool is_icky_wield_weapon(player_type *creature_ptr, int i)
+/*
+ * todo 相応しい時にFALSEで相応しくない時にTRUEという負論理は良くない、後で修正する
+ */
+bool has_icky_wield_weapon(player_type *creature_ptr, int i)
{
- object_type *o_ptr;
BIT_FLAGS flgs[TR_FLAG_SIZE];
- o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
+ object_type *o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
object_flags(creature_ptr, o_ptr, flgs);
- if ((creature_ptr->pclass == CLASS_PRIEST) && (!(has_flag(flgs, TR_BLESSED))) && ((o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM))) {
- return TRUE;
- } else if (creature_ptr->pclass == CLASS_SORCERER) {
- if (!((o_ptr->tval == TV_HAFTED) && ((o_ptr->sval == SV_WIZSTAFF) || (o_ptr->sval == SV_NAMAKE_HAMMER)))) {
- return TRUE;
- }
+ bool has_no_weapon = (o_ptr->tval == TV_NONE) || (o_ptr->tval == TV_SHIELD);
+ if (creature_ptr->pclass == CLASS_PRIEST) {
+ bool is_suitable_weapon = has_flag(flgs, TR_BLESSED);
+ is_suitable_weapon |= (o_ptr->tval != TV_SWORD) && (o_ptr->tval != TV_POLEARM);
+ return !has_no_weapon && !is_suitable_weapon;
}
- if (is_not_monk_weapon(creature_ptr, i) || is_not_ninja_weapon(creature_ptr, i)) {
- return TRUE;
+
+ if (creature_ptr->pclass == CLASS_SORCERER) {
+ bool is_suitable_weapon = o_ptr->tval == TV_HAFTED;
+ is_suitable_weapon &= (o_ptr->sval == SV_WIZSTAFF) || (o_ptr->sval == SV_NAMAKE_HAMMER);
+ return !has_no_weapon && !is_suitable_weapon;
}
+
+ if (has_not_monk_weapon(creature_ptr, i) || has_not_ninja_weapon(creature_ptr, i))
+ return TRUE;
+
return FALSE;
}
-bool is_riding_wield_weapon(player_type *creature_ptr, int i)
+bool has_riding_wield_weapon(player_type *creature_ptr, int i)
{
object_type *o_ptr;
BIT_FLAGS flgs[TR_FLAG_SIZE];
- o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
+ o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
object_flags(creature_ptr, o_ptr, flgs);
if (creature_ptr->riding != 0 && !(o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE))
&& !has_flag(flgs, TR_RIDING)) {
return FALSE;
}
-bool is_not_ninja_weapon(player_type *creature_ptr, int i)
+bool has_not_ninja_weapon(player_type *creature_ptr, int i)
{
- tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
- OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
+ if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) {
+ return FALSE;
+ }
+ tval_type tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN;
+ OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval;
return creature_ptr->pclass == CLASS_NINJA
- && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_LARM - i].tval != TV_SHIELD));
+ && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_SUB_HAND - i].tval != TV_SHIELD));
}
-bool is_not_monk_weapon(player_type *creature_ptr, int i)
+bool has_not_monk_weapon(player_type *creature_ptr, int i)
{
- tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
- OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
- return (creature_ptr->pclass == CLASS_MONK) || (creature_ptr->pclass == CLASS_FORCETRAINER) && (!s_info[creature_ptr->pclass].w_max[tval][sval]);
+ if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) {
+ return FALSE;
+ }
+ tval_type tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN;
+ OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval;
+ return ((creature_ptr->pclass == CLASS_MONK) || (creature_ptr->pclass == CLASS_FORCETRAINER)) && !(s_info[creature_ptr->pclass].w_max[tval][sval]);
}
bool has_good_luck(player_type *creature_ptr) { return (creature_ptr->pseikaku == PERSONALITY_LUCKY) || (creature_ptr->muta3 & MUT3_GOOD_LUCK); }
+
+BIT_FLAGS player_aggravate_state(player_type *creature_ptr)
+{
+ if (creature_ptr->cursed & TRC_AGGRAVATE) {
+ if ((is_specific_player_race(creature_ptr, RACE_S_FAIRY)) && (creature_ptr->pseikaku != PERSONALITY_SEXY)) {
+ return AGGRAVATE_S_FAIRY;
+ }
+ return AGGRAVATE_NORMAL;
+ }
+
+ return AGGRAVATE_NONE;
+}
+
+bool has_aggravate(player_type *creature_ptr) { return player_aggravate_state(creature_ptr) == AGGRAVATE_NORMAL; }
OSDN Git Service
