#include "core/player-update-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
+#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
#include "mind/mind-force-trainer.h"
#include "monster/monster-describer.h"
#include "object/object-kind-hook.h"
-#include "object/object-kind.h"
#include "player-base/player-class.h"
#include "player-info/class-info.h"
#include "player-info/magic-eater-data-type.h"
#include "spell-kind/spells-launcher.h"
#include "spell-kind/spells-teleport.h"
#include "spell-kind/spells-world.h"
-#include "effect/attribute-types.h"
#include "status/action-setter.h"
#include "status/bad-status-setter.h"
#include "status/base-status.h"
#include "status/experience.h"
#include "status/shape-changer.h"
#include "status/sight-setter.h"
+#include "system/baseitem-info.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
+#include "system/monster-entity.h"
#include "system/player-type-definition.h"
#include "target/target-getter.h"
+#include "timed-effect/player-acceleration.h"
#include "timed-effect/player-cut.h"
#include "timed-effect/timed-effects.h"
#include "util/bit-flags-calculator.h"
* @param dam 威力
* @return 作用が実際にあった場合TRUEを返す
*/
-bool heal_monster(PlayerType *player_ptr, DIRECTION dir, HIT_POINT dam)
+bool heal_monster(PlayerType *player_ptr, DIRECTION dir, int dam)
{
BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
return project_hook(player_ptr, AttributeType::OLD_HEAL, dir, dam, flg);
{
BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
bool tester = (project_hook(player_ptr, AttributeType::OLD_POLY, dir, power, flg));
- if (tester)
+ if (tester) {
chg_virtue(player_ptr, V_CHANCE, 1);
+ }
return tester;
}
*/
void roll_hitdice(PlayerType *player_ptr, spell_operation options)
{
- HIT_POINT min_value = player_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (player_ptr->hitdie + 1)) * 3 / 8;
- HIT_POINT max_value = player_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (player_ptr->hitdie + 1)) * 5 / 8;
+ int min_value = player_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (player_ptr->hitdie + 1)) * 3 / 8;
+ int max_value = player_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (player_ptr->hitdie + 1)) * 5 / 8;
/* Rerate */
while (true) {
/* Pre-calculate level 1 hitdice */
- player_ptr->player_hp[0] = (HIT_POINT)player_ptr->hitdie;
+ player_ptr->player_hp[0] = (int)player_ptr->hitdie;
for (int i = 1; i < 4; i++) {
player_ptr->player_hp[0] += randint1(player_ptr->hitdie);
}
/* Require "valid" hitpoints at highest level */
- if ((player_ptr->player_hp[PY_MAX_LEVEL - 1] >= min_value) && (player_ptr->player_hp[PY_MAX_LEVEL - 1] <= max_value))
+ if ((player_ptr->player_hp[PY_MAX_LEVEL - 1] >= min_value) && (player_ptr->player_hp[PY_MAX_LEVEL - 1] <= max_value)) {
break;
+ }
}
player_ptr->knowledge &= ~(KNOW_HPRATE);
- PERCENTAGE percent
- = (int)(((long)player_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) / (2 * player_ptr->hitdie + ((PY_MAX_LEVEL - 1 + 3) * (player_ptr->hitdie + 1))));
+ PERCENTAGE percent = (int)(((long)player_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) / (2 * player_ptr->hitdie + ((PY_MAX_LEVEL - 1 + 3) * (player_ptr->hitdie + 1))));
/* Update and redraw hitpoints */
player_ptr->update |= (PU_HP);
player_ptr->redraw |= (PR_HP);
player_ptr->window_flags |= (PW_PLAYER);
- if (!(options & SPOP_NO_UPDATE))
+ if (!(options & SPOP_NO_UPDATE)) {
handle_stuff(player_ptr);
+ }
- if (!(options & SPOP_DISPLAY_MES))
+ if (!(options & SPOP_DISPLAY_MES)) {
return;
+ }
if (options & SPOP_DEBUG) {
msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
restore_level(player_ptr);
BadStatusSetter bss(player_ptr);
- (void)bss.poison(0);
- (void)bss.blindness(0);
- (void)bss.confusion(0);
+ (void)bss.set_poison(0);
+ (void)bss.set_blindness(0);
+ (void)bss.set_confusion(0);
(void)bss.hallucination(0);
- (void)bss.stun(0);
- (void)bss.cut(0);
- (void)bss.paralysis(0);
+ (void)bss.set_stun(0);
+ (void)bss.set_cut(0);
+ (void)bss.set_paralysis(0);
(void)restore_all_status(player_ptr);
(void)set_shero(player_ptr, 0, true);
handle_stuff(player_ptr);
bool heroism(PlayerType *player_ptr, int base)
{
auto ident = false;
- if (BadStatusSetter(player_ptr).afraidness(0)) {
+ if (BadStatusSetter(player_ptr).set_fear(0)) {
ident = true;
}
bool berserk(PlayerType *player_ptr, int base)
{
auto ident = false;
- if (BadStatusSetter(player_ptr).afraidness(0)) {
+ if (BadStatusSetter(player_ptr).set_fear(0)) {
ident = true;
}
}
BadStatusSetter bss(player_ptr);
- if (bss.blindness(0)) {
+ if (bss.set_blindness(0)) {
ident = true;
}
}
BadStatusSetter bss(player_ptr);
- if (bss.blindness(0)) {
+ if (bss.set_blindness(0)) {
ident = true;
}
- if (bss.confusion(0)) {
+ if (bss.set_confusion(0)) {
ident = true;
}
- if (bss.cut((player_ptr->effects()->cut()->current() / 2) - 50)) {
+ if (bss.set_cut((player_ptr->effects()->cut()->current() / 2) - 50)) {
ident = true;
}
return ident;
}
-bool cure_critical_wounds(PlayerType *player_ptr, HIT_POINT pow)
+bool cure_critical_wounds(PlayerType *player_ptr, int pow)
{
auto ident = false;
if (hp_player(player_ptr, pow)) {
}
BadStatusSetter bss(player_ptr);
- if (bss.blindness(0)) {
+ if (bss.set_blindness(0)) {
ident = true;
}
- if (bss.confusion(0)) {
+ if (bss.set_confusion(0)) {
ident = true;
}
- if (bss.poison(0)) {
+ if (bss.set_poison(0)) {
ident = true;
}
- if (bss.stun(0)) {
+ if (bss.set_stun(0)) {
ident = true;
}
- if (bss.cut(0)) {
+ if (bss.set_cut(0)) {
ident = true;
}
return ident;
}
-bool true_healing(PlayerType *player_ptr, HIT_POINT pow)
+bool true_healing(PlayerType *player_ptr, int pow)
{
auto ident = false;
if (hp_player(player_ptr, pow)) {
}
BadStatusSetter bss(player_ptr);
- if (bss.blindness(0)) {
+ if (bss.set_blindness(0)) {
ident = true;
}
- if (bss.confusion(0)) {
+ if (bss.set_confusion(0)) {
ident = true;
}
- if (bss.poison(0)) {
+ if (bss.set_poison(0)) {
ident = true;
}
- if (bss.stun(0)) {
+ if (bss.set_stun(0)) {
ident = true;
}
- if (bss.cut(0)) {
+ if (bss.set_cut(0)) {
ident = true;
}
auto sval = 0;
for (auto &item : magic_eater_data->get_item_group(ItemKindType::ROD)) {
- KIND_OBJECT_IDX k_idx = lookup_kind(ItemKindType::ROD, sval);
- item.charge -= ((item.count < 10) ? EATER_ROD_CHARGE * 3 : item.count * EATER_ROD_CHARGE / 3) * k_info[k_idx].pval;
+ const auto bi_id = lookup_baseitem_id({ ItemKindType::ROD, sval });
+ item.charge -= ((item.count < 10) ? EATER_ROD_CHARGE * 3 : item.count * EATER_ROD_CHARGE / 3) * baseitems_info[bi_id].pval;
item.charge = std::max(item.charge, 0);
++sval;
}
return true;
}
- if (player_ptr->csp >= player_ptr->msp)
+ if (player_ptr->csp >= player_ptr->msp) {
return false;
+ }
player_ptr->csp = player_ptr->msp;
player_ptr->csp_frac = 0;
bool restore_all_status(PlayerType *player_ptr)
{
bool ident = false;
- if (do_res_stat(player_ptr, A_STR))
+ if (do_res_stat(player_ptr, A_STR)) {
ident = true;
- if (do_res_stat(player_ptr, A_INT))
+ }
+ if (do_res_stat(player_ptr, A_INT)) {
ident = true;
- if (do_res_stat(player_ptr, A_WIS))
+ }
+ if (do_res_stat(player_ptr, A_WIS)) {
ident = true;
- if (do_res_stat(player_ptr, A_DEX))
+ }
+ if (do_res_stat(player_ptr, A_DEX)) {
ident = true;
- if (do_res_stat(player_ptr, A_CON))
+ }
+ if (do_res_stat(player_ptr, A_CON)) {
ident = true;
- if (do_res_stat(player_ptr, A_CHR))
+ }
+ if (do_res_stat(player_ptr, A_CHR)) {
ident = true;
+ }
return ident;
}
bool fishing(PlayerType *player_ptr)
{
DIRECTION dir;
- if (!get_direction(player_ptr, &dir, false, false))
+ if (!get_direction(player_ptr, &dir, false, false)) {
return false;
+ }
POSITION y = player_ptr->y + ddy[dir];
POSITION x = player_ptr->x + ddx[dir];
player_ptr->fishing_dir = dir;
- if (!cave_has_flag_bold(player_ptr->current_floor_ptr, y, x, FloorFeatureType::WATER)) {
+ if (!cave_has_flag_bold(player_ptr->current_floor_ptr, y, x, TerrainCharacteristics::WATER)) {
msg_print(_("そこは水辺ではない。", "You can't fish here."));
return false;
}
if (player_ptr->current_floor_ptr->grid_array[y][x].m_idx) {
- GAME_TEXT m_name[MAX_NLEN];
- monster_desc(player_ptr, m_name, &player_ptr->current_floor_ptr->m_list[player_ptr->current_floor_ptr->grid_array[y][x].m_idx], 0);
- msg_format(_("%sが邪魔だ！", "%^s is standing in your way."), m_name);
+ const auto m_name = monster_desc(player_ptr, &player_ptr->current_floor_ptr->m_list[player_ptr->current_floor_ptr->grid_array[y][x].m_idx], 0);
+ msg_format(_("%sが邪魔だ！", "%^s is standing in your way."), m_name.data());
PlayerEnergy(player_ptr).reset_player_turn();
return false;
}
* @details
* 脱いで落とした装備にtimeoutを設定するために装備品のアドレスを返す。
*/
-bool cosmic_cast_off(PlayerType *player_ptr, ObjectType **o_ptr_ptr)
+bool cosmic_cast_off(PlayerType *player_ptr, ItemEntity **o_ptr_ptr)
{
auto *o_ptr = (*o_ptr_ptr);
/* Cast off activated item */
INVENTORY_IDX slot;
for (slot = INVEN_MAIN_HAND; slot <= INVEN_FEET; slot++) {
- if (o_ptr == &player_ptr->inventory_list[slot])
+ if (o_ptr == &player_ptr->inventory_list[slot]) {
break;
+ }
}
- if (slot > INVEN_FEET)
+ if (slot > INVEN_FEET) {
return false;
+ }
- ObjectType forge;
+ ItemEntity forge;
(&forge)->copy_from(o_ptr);
inven_item_increase(player_ptr, slot, (0 - o_ptr->number));
inven_item_optimize(player_ptr, slot);
TIME_EFFECT t = 20 + randint1(20);
BadStatusSetter bss(player_ptr);
(void)bss.mod_blindness(t);
- (void)bss.afraidness(0);
+ (void)bss.set_fear(0);
(void)set_tim_esp(player_ptr, player_ptr->tim_esp + t, false);
(void)set_tim_regen(player_ptr, player_ptr->tim_regen + t, false);
(void)set_hero(player_ptr, player_ptr->hero + t, false);
(void)set_blessed(player_ptr, player_ptr->blessed + t, false);
- (void)set_fast(player_ptr, player_ptr->fast + t, false);
+ (void)mod_acceleration(player_ptr, t, false);
(void)set_shero(player_ptr, player_ptr->shero + t, false);
if (PlayerClass(player_ptr).equals(PlayerClassType::FORCETRAINER)) {
set_current_ki(player_ptr, true, player_ptr->lev * 5 + 190);
* @brief プレイヤーの因果混乱処理 / Apply Nexus
* @param m_ptr 因果混乱をプレイヤーに与えたモンスターの情報参照ポインタ
*/
-void apply_nexus(monster_type *m_ptr, PlayerType *player_ptr)
+void apply_nexus(MonsterEntity *m_ptr, PlayerType *player_ptr)
{
switch (randint1(7)) {
case 1:
int j;
//!< @todo ここのループは一体何をしている？
- for (j = i; j == i; j = randint0(A_MAX)) /* loop */
+ for (j = i; j == i; j = randint0(A_MAX)) { /* loop */
;
+ }
BASE_STATUS max1 = player_ptr->stat_max[i];
BASE_STATUS cur1 = player_ptr->stat_cur[i];
player_ptr->stat_cur[j] = cur1;
for (int k = 0; k < A_MAX; k++) {
- if (player_ptr->stat_max[k] > player_ptr->stat_max_max[k])
+ if (player_ptr->stat_max[k] > player_ptr->stat_max_max[k]) {
player_ptr->stat_max[k] = player_ptr->stat_max_max[k];
- if (player_ptr->stat_cur[k] > player_ptr->stat_max_max[k])
+ }
+ if (player_ptr->stat_cur[k] > player_ptr->stat_max_max[k]) {
player_ptr->stat_cur[k] = player_ptr->stat_max_max[k];
+ }
}
player_ptr->update |= PU_BONUS;
OSDN Git Service
