#include "artifact/fixed-art-types.h"
#include "grid/feature-flag-types.h"
#include "grid/feature.h"
-#include "grid/grid.h"
#include "inventory/inventory-slot-types.h"
#include "monster-race/monster-race.h"
#include "monster/monster-status.h"
#include "mutation/mutation-flag-types.h"
#include "object-enchant/tr-types.h"
#include "object/object-flags.h"
+#include "player-info/equipment-info.h"
#include "player/attack-defense-types.h"
+#include "player/digestion-processor.h"
#include "player/player-race.h"
#include "player/player-skill.h"
#include "player/player-status-flags.h"
#include "realm/realm-types.h"
#include "spell-realm/spells-hex.h"
#include "system/floor-type-definition.h"
+#include "system/grid-type-definition.h"
+#include "system/monster-race-definition.h"
+#include "system/monster-type-definition.h"
+#include "system/object-type-definition.h"
+#include "system/player-type-definition.h"
#include "util/bit-flags-calculator.h"
-/*
+/*!
* @brief 速度 - 初期値、下限、上限
* @details
* * 初期値110 - 加速+0に相当
this->tr_bad_flag = TR_SPEED;
}
-/*
+/*!
* @brief 速度計算 - 種族
* @return 速度値の増減分
* @details
* ** マーフォークがFF_WATER地形にいれば加算(+2+レベル/10)
* ** そうでなく浮遊を持っていないなら減算(-2)
*/
-s16b PlayerSpeed::race_value()
+int16_t PlayerSpeed::race_value()
{
- s16b result = 0;
+ int16_t result = 0;
- if (is_specific_player_race(this->owner_ptr, RACE_KLACKON) || is_specific_player_race(this->owner_ptr, RACE_SPRITE))
+ if (is_specific_player_race(this->owner_ptr, player_race_type::KLACKON) || is_specific_player_race(this->owner_ptr, player_race_type::SPRITE))
result += (this->owner_ptr->lev) / 10;
- if (is_specific_player_race(this->owner_ptr, RACE_MERFOLK)) {
+ if (is_specific_player_race(this->owner_ptr, player_race_type::MERFOLK)) {
floor_type *floor_ptr = this->owner_ptr->current_floor_ptr;
feature_type *f_ptr = &f_info[floor_ptr->grid_array[this->owner_ptr->y][this->owner_ptr->x].feat];
- if (has_flag(f_ptr->flags, FF_WATER)) {
+ if (f_ptr->flags.has(FF::WATER)) {
result += (2 + this->owner_ptr->lev / 10);
} else if (!this->owner_ptr->levitation) {
result -= 2;
return result;
}
-/*
+/*!
* @brief 速度計算 - 職業
* @return 速度値の増減分
* @details
* ** 錬気術師で装備が重くなくクラッコン、妖精、いかさま以外なら加算(+レベル/10)
* ** 狂戦士なら加算(+3),レベル20/30/40/50ごとに+1
*/
-s16b PlayerSpeed::class_value()
+int16_t PlayerSpeed::class_value()
{
SPEED result = 0;
} else if ((!this->owner_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(this->owner_ptr))
&& (!this->owner_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(this->owner_ptr))) {
result += 3;
- if (!(is_specific_player_race(this->owner_ptr, RACE_KLACKON) || is_specific_player_race(this->owner_ptr, RACE_SPRITE)
+ if (!(is_specific_player_race(this->owner_ptr, player_race_type::KLACKON) || is_specific_player_race(this->owner_ptr, player_race_type::SPRITE)
|| (this->owner_ptr->pseikaku == PERSONALITY_MUNCHKIN)))
result += (this->owner_ptr->lev) / 10;
}
}
if ((this->owner_ptr->pclass == CLASS_MONK || this->owner_ptr->pclass == CLASS_FORCETRAINER) && !(heavy_armor(this->owner_ptr))) {
- if (!(is_specific_player_race(this->owner_ptr, RACE_KLACKON) || is_specific_player_race(this->owner_ptr, RACE_SPRITE)
+ if (!(is_specific_player_race(this->owner_ptr, player_race_type::KLACKON) || is_specific_player_race(this->owner_ptr, player_race_type::SPRITE)
|| (this->owner_ptr->pseikaku == PERSONALITY_MUNCHKIN)))
result += (this->owner_ptr->lev) / 10;
}
return result;
}
-/*
+/*!
* @brief 速度計算 - 性格
* @return 速度値の増減分
* @details
* ** いかさまでクラッコン/妖精以外なら加算(+5+レベル/10)
*/
-s16b PlayerSpeed::personality_value()
+int16_t PlayerSpeed::personality_value()
{
- s16b result = 0;
- if (this->owner_ptr->pseikaku == PERSONALITY_MUNCHKIN && this->owner_ptr->prace != RACE_KLACKON && this->owner_ptr->prace != RACE_SPRITE) {
+ int16_t result = 0;
+ if (this->owner_ptr->pseikaku == PERSONALITY_MUNCHKIN && this->owner_ptr->prace != player_race_type::KLACKON && this->owner_ptr->prace != player_race_type::SPRITE) {
result += (this->owner_ptr->lev) / 10 + 5;
}
return result;
}
-/*
+/*!
* @brief 速度計算 - 装備品特殊セット
* @return 速度値の増減分
* @details
* ** 棘セット装備中ならば加算(+7)
* ** アイシングデス-トゥインクル装備中ならば加算(+7)
*/
-s16b PlayerSpeed::special_weapon_set_value()
+int16_t PlayerSpeed::special_weapon_set_value()
{
- s16b result = 0;
+ int16_t result = 0;
if (has_melee_weapon(this->owner_ptr, INVEN_MAIN_HAND) && has_melee_weapon(this->owner_ptr, INVEN_SUB_HAND)) {
if ((this->owner_ptr->inventory_list[INVEN_MAIN_HAND].name1 == ART_QUICKTHORN)
&& (this->owner_ptr->inventory_list[INVEN_SUB_HAND].name1 == ART_TINYTHORN)) {
return result;
}
-/*
+/*!
* @brief 速度計算 - 装備品
* @return 速度値の増減分
* @details
* ** 装備品にTR_SPEEDがあれば加算(+pval+1
* ** セットで加速増減があるものを計算
*/
-s16b PlayerSpeed::equipments_value()
+int16_t PlayerSpeed::equipments_value()
{
- s16b result = PlayerStatusBase::equipments_value();
+ int16_t result = PlayerStatusBase::equipments_value();
result += this->special_weapon_set_value();
return result;
}
-/*
+/*!
* @brief 速度計算 - 一時的効果
* @return 速度値の増減分
* @details
* ** 食い過ぎなら減算(-10)
* ** 光速移動中は+999(最終的に+99になる)
*/
-s16b PlayerSpeed::time_effect_value()
+int16_t PlayerSpeed::time_effect_value()
{
- s16b result = 0;
+ int16_t result = 0;
if (is_fast(this->owner_ptr)) {
result += 10;
return result;
}
-/*
+/*!
* @brief 速度計算 - 型
* @return 速度値の増減分
* @details
* ** 朱雀の構えなら加算(+10)
*/
-s16b PlayerSpeed::battleform_value()
+int16_t PlayerSpeed::battleform_value()
{
- s16b result = 0;
+ int16_t result = 0;
if (any_bits(this->owner_ptr->special_defense, KAMAE_SUZAKU))
result += 10;
return result;
}
-/*
+/*!
* @brief 速度計算 - 変異
* @return 速度値の増減分
* @details
* ** 変異MUT3_XTRA_LEGなら加算(+3)
* ** 変異MUT3_SHORT_LEGなら減算(-3)
*/
-s16b PlayerSpeed::mutation_value()
+int16_t PlayerSpeed::mutation_value()
{
SPEED result = 0;
- if (this->owner_ptr->muta3) {
- if (any_bits(this->owner_ptr->muta3, MUT3_XTRA_FAT)) {
- result -= 2;
- }
- if (any_bits(this->owner_ptr->muta3, MUT3_XTRA_LEGS)) {
- result += 3;
- }
+ const auto &muta = this->owner_ptr->muta;
+ if (muta.has(MUTA::XTRA_FAT)) {
+ result -= 2;
+ }
- if (any_bits(this->owner_ptr->muta3, MUT3_SHORT_LEG)) {
- result -= 3;
- }
+ if (muta.has(MUTA::XTRA_LEGS)) {
+ result += 3;
}
+
+ if (muta.has(MUTA::SHORT_LEG)) {
+ result -= 3;
+ }
+
return result;
}
-/*
+/*!
* @brief 速度計算 - 乗馬
* @return 速度値の増減分
* @details
* * 騎乗中ならばモンスターの加速に準拠、ただし騎乗技能値とモンスターレベルによるキャップ処理あり
*/
-s16b PlayerSpeed::riding_value()
+int16_t PlayerSpeed::riding_value()
{
monster_type *riding_m_ptr = &(this->owner_ptr)->current_floor_ptr->m_list[this->owner_ptr->riding];
SPEED speed = riding_m_ptr->mspeed;
}
if (riding_m_ptr->mspeed > 110) {
- result = (s16b)((speed - 110) * (this->owner_ptr->skill_exp[GINOU_RIDING] * 3 + this->owner_ptr->lev * 160L - 10000L) / (22000L));
+ result = (int16_t)((speed - 110) * (this->owner_ptr->skill_exp[SKILL_RIDING] * 3 + this->owner_ptr->lev * 160L - 10000L) / (22000L));
if (result < 0)
result = 0;
} else {
result = speed - 110;
}
- result += (this->owner_ptr->skill_exp[GINOU_RIDING] + this->owner_ptr->lev * 160L) / 3200;
+ result += (this->owner_ptr->skill_exp[SKILL_RIDING] + this->owner_ptr->lev * 160L) / 3200;
if (monster_fast_remaining(riding_m_ptr))
result += 10;
return result;
}
-/*
+/*!
* @brief 速度計算 - 重量
* @return 速度値の増減分
* @details
* * 所持品の重量による減速処理。乗馬時は別計算。
*/
-s16b PlayerSpeed::inventory_weight_value()
+int16_t PlayerSpeed::inventory_weight_value()
{
SPEED result = 0;
monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx];
count = 1500 + riding_r_ptr->level * 25;
- if (this->owner_ptr->skill_exp[GINOU_RIDING] < RIDING_EXP_SKILLED) {
- weight += (this->owner_ptr->wt * 3 * (RIDING_EXP_SKILLED - this->owner_ptr->skill_exp[GINOU_RIDING])) / RIDING_EXP_SKILLED;
+ if (this->owner_ptr->skill_exp[SKILL_RIDING] < RIDING_EXP_SKILLED) {
+ weight += (this->owner_ptr->wt * 3 * (RIDING_EXP_SKILLED - this->owner_ptr->skill_exp[SKILL_RIDING])) / RIDING_EXP_SKILLED;
}
if (weight > count) {
return result;
}
-/*
+/*!
* @brief 速度計算 - ACTION
* @return 速度値の増減分
* @details
* * 探索中なら減算(-10)
*/
-s16b PlayerSpeed::action_value()
+int16_t PlayerSpeed::action_value()
{
SPEED result = 0;
if (this->owner_ptr->action == ACTION_SEARCH)
return result;
}
-/*
+/*!
* @brief 速度フラグ - 装備
* @return 加速修正が0でない装備に対応したBIT_FLAG
* @details
* * セット二刀流は両手のフラグをONにする
*/
-BIT_FLAGS PlayerSpeed::equipments_flags()
+BIT_FLAGS PlayerSpeed::equipments_flags(tr_type check_flag)
{
- BIT_FLAGS result = PlayerStatusBase::equipments_flags();
+ BIT_FLAGS result = PlayerStatusBase::equipments_flags(check_flag);
if (this->special_weapon_set_value() != 0)
set_bits(result, FLAG_CAUSE_INVEN_MAIN_HAND | FLAG_CAUSE_INVEN_SUB_HAND);
return result;
}
-/*
- * @brief 速度計算 - 合計値
- * @return 計算済の速度値 11 - 209
+/*!
+ * @brief 速度計算 - 乗馬時の例外処理
+ * @return 計算済の速度値
* @details
- * * 非乗馬時 - 乗馬以外の全要素の単純加算
+ * * 非乗馬時 - ここまでの修正値合算をそのまま使用
* * 乗馬時 - 乗馬の速度と重量減衰のみを計算
*/
-s16b PlayerSpeed::getValue()
+int16_t PlayerSpeed::set_exception_value(int16_t value)
{
- s16b pow = PlayerStatusBase::getValue();
-
if (this->owner_ptr->riding) {
- pow = this->default_value;
- pow += this->riding_value();
- pow += this->inventory_weight_value();
-
- if ((pow > this->max_value)) {
- pow = this->max_value;
- }
-
- if (pow < this->min_value)
- pow = this->min_value;
+ value = this->default_value;
+ value += this->riding_value();
+ value += this->inventory_weight_value();
+ value += this->action_value();
}
- return pow;
+ return value;
}
OSDN Git Service
