-#include "spell/spell-info.h"
+#include "spell/spell-info.h"
#include "io/input-key-requester.h"
#include "monster-race/monster-race.h"
+#include "player-base/player-class.h"
#include "player-info/class-info.h"
#include "player/player-skill.h"
#include "player/player-status-table.h"
#include "realm/realm-types.h"
#include "spell/spells-execution.h"
#include "system/floor-type-definition.h"
-#include "system/monster-race-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
+#include "system/monster-race-info.h"
#include "system/player-type-definition.h"
#include "term/screen-processor.h"
#include "term/term-color-types.h"
+#include "term/z-form.h"
#include "timed-effect/player-stun.h"
#include "timed-effect/timed-effects.h"
#include "util/bit-flags-calculator.h"
need_mana = need_mana * (MANA_CONST + PlayerSkill::spell_exp_at(PlayerSkillRank::EXPERT) - PlayerSkill(player_ptr).exp_of_spell(realm, spell)) + (MANA_CONST - 1);
need_mana *= player_ptr->dec_mana ? DEC_MANA_DIV : MANA_DIV;
need_mana /= MANA_CONST * MANA_DIV;
- if (need_mana < 1)
+ if (need_mana < 1) {
need_mana = 1;
+ }
} else {
- if (player_ptr->dec_mana)
+ if (player_ptr->dec_mana) {
need_mana = (need_mana + 1) * DEC_MANA_DIV / MANA_DIV;
+ }
}
#undef DEC_MANA_DIV
{
chance += player_ptr->to_m_chance;
- if (player_ptr->heavy_spell)
+ if (player_ptr->hard_spell) {
chance += 20;
+ }
- if (player_ptr->dec_mana && player_ptr->easy_spell)
+ if (player_ptr->dec_mana && player_ptr->easy_spell) {
chance -= 4;
- else if (player_ptr->easy_spell)
+ } else if (player_ptr->easy_spell) {
chance -= 3;
- else if (player_ptr->dec_mana)
+ } else if (player_ptr->dec_mana) {
chance -= 2;
+ }
return chance;
}
*/
PERCENTAGE mod_spell_chance_2(PlayerType *player_ptr, PERCENTAGE chance)
{
- if (player_ptr->dec_mana)
+ if (player_ptr->dec_mana) {
chance--;
- if (player_ptr->heavy_spell)
+ }
+ if (player_ptr->hard_spell) {
chance += 5;
+ }
return std::max(chance, 0);
}
*/
PERCENTAGE spell_chance(PlayerType *player_ptr, SPELL_IDX spell, int16_t use_realm)
{
- if (mp_ptr->spell_book == ItemKindType::NONE)
+ if (mp_ptr->spell_book == ItemKindType::NONE) {
return 100;
- if (use_realm == REALM_HISSATSU)
+ }
+ if (use_realm == REALM_HISSATSU) {
return 0;
+ }
const magic_type *s_ptr;
if (!is_magic(use_realm)) {
PERCENTAGE chance = s_ptr->sfail;
chance -= 3 * (player_ptr->lev - s_ptr->slevel);
chance -= 3 * (adj_mag_stat[player_ptr->stat_index[mp_ptr->spell_stat]] - 1);
- if (player_ptr->riding)
- chance += (std::max(r_info[player_ptr->current_floor_ptr->m_list[player_ptr->riding].r_idx].level - player_ptr->skill_exp[PlayerSkillKindType::RIDING] / 100 - 10, 0));
+ if (player_ptr->riding) {
+ chance += (std::max(monraces_info[player_ptr->current_floor_ptr->m_list[player_ptr->riding].r_idx].level - player_ptr->skill_exp[PlayerSkillKindType::RIDING] / 100 - 10, 0));
+ }
MANA_POINT need_mana = mod_need_mana(player_ptr, s_ptr->smana, spell, use_realm);
if (need_mana > player_ptr->csp) {
chance += 5 * (need_mana - player_ptr->csp);
}
- if ((use_realm != player_ptr->realm1) && ((player_ptr->pclass == PlayerClassType::MAGE) || (player_ptr->pclass == PlayerClassType::PRIEST)))
+ PlayerClass pc(player_ptr);
+ if ((use_realm != player_ptr->realm1) && (pc.equals(PlayerClassType::MAGE) || pc.equals(PlayerClassType::PRIEST))) {
chance += 5;
+ }
PERCENTAGE minfail = adj_mag_fail[player_ptr->stat_index[mp_ptr->spell_stat]];
if (any_bits(mp_ptr->spell_xtra, extra_min_magic_fail_rate)) {
- if (minfail < 5)
+ if (minfail < 5) {
minfail = 5;
+ }
}
- if (((player_ptr->pclass == PlayerClassType::PRIEST) || (player_ptr->pclass == PlayerClassType::SORCERER)) && player_ptr->is_icky_wield[0])
- chance += 25;
- if (((player_ptr->pclass == PlayerClassType::PRIEST) || (player_ptr->pclass == PlayerClassType::SORCERER)) && player_ptr->is_icky_wield[1])
- chance += 25;
+ if ((pc.equals(PlayerClassType::PRIEST) || pc.equals(PlayerClassType::SORCERER))) {
+ if (player_ptr->is_icky_wield[0]) {
+ chance += 25;
+ }
+
+ if (player_ptr->is_icky_wield[1]) {
+ chance += 25;
+ }
+ }
chance = mod_spell_chance_1(player_ptr, chance);
PERCENTAGE penalty = (mp_ptr->spell_stat == A_WIS) ? 10 : 4;
switch (use_realm) {
case REALM_NATURE:
- if ((player_ptr->alignment > 50) || (player_ptr->alignment < -50))
+ if ((player_ptr->alignment > 50) || (player_ptr->alignment < -50)) {
chance += penalty;
+ }
break;
case REALM_LIFE:
case REALM_CRUSADE:
- if (player_ptr->alignment < -20)
+ if (player_ptr->alignment < -20) {
chance += penalty;
+ }
break;
case REALM_DEATH:
case REALM_DAEMON:
case REALM_HEX:
- if (player_ptr->alignment > 20)
+ if (player_ptr->alignment > 20) {
chance += penalty;
+ }
break;
}
- if (chance < minfail)
+ if (chance < minfail) {
chance = minfail;
+ }
auto player_stun = player_ptr->effects()->stun();
chance += player_stun->get_magic_chance_penalty();
chance = 95;
}
- if ((use_realm == player_ptr->realm1) || (use_realm == player_ptr->realm2) || (player_ptr->pclass == PlayerClassType::SORCERER)
- || (player_ptr->pclass == PlayerClassType::RED_MAGE)) {
+ if ((use_realm == player_ptr->realm1) || (use_realm == player_ptr->realm2) || pc.is_every_magic()) {
auto exp = PlayerSkill(player_ptr).exp_of_spell(use_realm, spell);
- if (exp >= PlayerSkill::spell_exp_at(PlayerSkillRank::EXPERT))
+ if (exp >= PlayerSkill::spell_exp_at(PlayerSkillRank::EXPERT)) {
chance--;
- if (exp >= PlayerSkill::spell_exp_at(PlayerSkillRank::MASTER))
+ }
+ if (exp >= PlayerSkill::spell_exp_at(PlayerSkillRank::MASTER)) {
chance--;
+ }
}
return mod_spell_chance_2(player_ptr, chance);
*/
void print_spells(PlayerType *player_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, int16_t use_realm)
{
- if (((use_realm <= REALM_NONE) || (use_realm > MAX_REALM)) && w_ptr->wizard)
+ if (((use_realm <= REALM_NONE) || (use_realm > MAX_REALM)) && w_ptr->wizard) {
msg_print(_("警告！ print_spell が領域なしに呼ばれた", "Warning! print_spells called with null realm"));
+ }
prt("", y, x);
char buf[256];
- if (use_realm == REALM_HISSATSU)
+ if (use_realm == REALM_HISSATSU) {
strcpy(buf, _(" Lv MP", " Lv SP"));
- else
+ } else {
strcpy(buf, _("熟練度 Lv MP 失率 効果", "Profic Lv SP Fail Effect"));
+ }
put_str(_("名前", "Name"), y, x + 5);
put_str(buf, y, x + 29);
int increment = 64;
- if ((player_ptr->pclass == PlayerClassType::SORCERER) || (player_ptr->pclass == PlayerClassType::RED_MAGE))
+ PlayerClass pc(player_ptr);
+ if (pc.is_every_magic()) {
increment = 0;
- else if (use_realm == player_ptr->realm1)
+ } else if (use_realm == player_ptr->realm1) {
increment = 0;
- else if (use_realm == player_ptr->realm2)
+ } else if (use_realm == player_ptr->realm2) {
increment = 32;
+ }
int i;
const magic_type *s_ptr;
- char info[80];
- char out_val[160];
char ryakuji[5];
bool max = false;
for (i = 0; i < num; i++) {
}
MANA_POINT need_mana;
- if (use_realm == REALM_HISSATSU)
+ if (use_realm == REALM_HISSATSU) {
need_mana = s_ptr->smana;
- else {
+ } else {
auto exp = PlayerSkill(player_ptr).exp_of_spell(use_realm, spell);
need_mana = mod_need_mana(player_ptr, s_ptr->smana, spell, use_realm);
PlayerSkillRank skill_rank;
- if ((increment == 64) || (s_ptr->slevel >= 99))
+ if ((increment == 64) || (s_ptr->slevel >= 99)) {
skill_rank = PlayerSkillRank::UNSKILLED;
- else
+ } else {
skill_rank = PlayerSkill::spell_skill_rank(exp);
+ }
max = false;
- if (!increment && (skill_rank == PlayerSkillRank::MASTER))
+ if (!increment && (skill_rank == PlayerSkillRank::MASTER)) {
max = true;
- else if ((increment == 32) && (skill_rank >= PlayerSkillRank::EXPERT))
+ } else if ((increment == 32) && (skill_rank >= PlayerSkillRank::EXPERT)) {
max = true;
- else if (s_ptr->slevel >= 99)
+ } else if (s_ptr->slevel >= 99) {
max = true;
- else if ((player_ptr->pclass == PlayerClassType::RED_MAGE) && (skill_rank >= PlayerSkillRank::SKILLED))
+ } else if (pc.equals(PlayerClassType::RED_MAGE) && (skill_rank >= PlayerSkillRank::SKILLED)) {
max = true;
+ }
strncpy(ryakuji, PlayerSkill::skill_rank_str(skill_rank), 4);
ryakuji[3] = ']';
ryakuji[4] = '\0';
}
+ std::string out_val;
if (use_menu && target_spell) {
- if (i == (target_spell - 1))
- strcpy(out_val, _(" 》 ", " > "));
- else
- strcpy(out_val, " ");
- } else
- sprintf(out_val, " %c) ", I2A(i));
+ if (i == (target_spell - 1)) {
+ out_val = _(" 》 ", " > ");
+ } else {
+ out_val = " ";
+ }
+ } else {
+ out_val = format(" %c) ", I2A(i));
+ }
if (s_ptr->slevel >= 99) {
- strcat(out_val, format("%-30s", _("(判読不能)", "(illegible)")));
+ out_val.append(format("%-30s", _("(判読不能)", "(illegible)")));
c_prt(TERM_L_DARK, out_val, y + i + 1, x);
continue;
}
- strcpy(info, exe_spell(player_ptr, use_realm, spell, SpellProcessType::INFO));
- concptr comment = info;
+ const auto info = exe_spell(player_ptr, use_realm, spell, SpellProcessType::INFO);
+ concptr comment = info->data();
byte line_attr = TERM_WHITE;
- if ((player_ptr->pclass == PlayerClassType::SORCERER) || (player_ptr->pclass == PlayerClassType::RED_MAGE)) {
+ if (pc.is_every_magic()) {
if (s_ptr->slevel > player_ptr->max_plv) {
comment = _("未知", "unknown");
line_attr = TERM_L_BLUE;
line_attr = TERM_L_GREEN;
}
+ const auto spell_name = exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME);
if (use_realm == REALM_HISSATSU) {
- strcat(out_val, format("%-25s %2d %4d", exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), s_ptr->slevel, need_mana));
+ out_val.append(format("%-25s %2d %4d", spell_name->data(), s_ptr->slevel, need_mana));
} else {
- strcat(out_val,
- format("%-25s%c%-4s %2d %4d %3d%% %s", exe_spell(player_ptr, use_realm, spell, SpellProcessType::NAME), (max ? '!' : ' '), ryakuji, s_ptr->slevel,
- need_mana, spell_chance(player_ptr, spell, use_realm), comment));
+ out_val.append(format("%-25s%c%-4s %2d %4d %3d%% %s", spell_name->data(), (max ? '!' : ' '), ryakuji, s_ptr->slevel,
+ need_mana, spell_chance(player_ptr, spell, use_realm), comment));
}
c_prt(line_attr, out_val, y + i + 1, x);
OSDN Git Service
