*/
#include "angband.h"
+#include "core.h"
#include "util.h"
+#include "cmd-spell.h"
#include "cmd-dump.h"
#include "selfinfo.h"
#include "realm-trump.h"
#include "mind.h"
#include "avatar.h"
+#include "player-damage.h"
#include "player-status.h"
#include "player-effects.h"
#include "player-skill.h"
#include "view-mainwindow.h"
#include "floor.h"
#include "autopick.h"
+#include "japanese.h"
/*!
* 魔法領域フラグ管理テーブル /
* @param mode 求める処理
* @return 各領域魔法に各種テキストを求めた場合は文字列参照ポインタ、そうでない場合はNULLポインタを返す。
*/
-concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode)
+concptr exe_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode)
{
switch (realm)
{
- case REALM_LIFE: return do_life_spell(spell, mode);
- case REALM_SORCERY: return do_sorcery_spell(spell, mode);
- case REALM_NATURE: return do_nature_spell(spell, mode);
- case REALM_CHAOS: return do_chaos_spell(spell, mode);
- case REALM_DEATH: return do_death_spell(spell, mode);
- case REALM_TRUMP: return do_trump_spell(spell, mode);
- case REALM_ARCANE: return do_arcane_spell(spell, mode);
- case REALM_CRAFT: return do_craft_spell(spell, mode);
- case REALM_DAEMON: return do_daemon_spell(spell, mode);
- case REALM_CRUSADE: return do_crusade_spell(spell, mode);
- case REALM_MUSIC: return do_music_spell(spell, mode);
- case REALM_HISSATSU: return do_hissatsu_spell(spell, mode);
- case REALM_HEX: return do_hex_spell(spell, mode);
+ case REALM_LIFE: return do_life_spell(p_ptr, spell, mode);
+ case REALM_SORCERY: return do_sorcery_spell(p_ptr, spell, mode);
+ case REALM_NATURE: return do_nature_spell(p_ptr, spell, mode);
+ case REALM_CHAOS: return do_chaos_spell(p_ptr, spell, mode);
+ case REALM_DEATH: return do_death_spell(p_ptr, spell, mode);
+ case REALM_TRUMP: return do_trump_spell(p_ptr, spell, mode);
+ case REALM_ARCANE: return do_arcane_spell(p_ptr, spell, mode);
+ case REALM_CRAFT: return do_craft_spell(p_ptr, spell, mode);
+ case REALM_DAEMON: return do_daemon_spell(p_ptr, spell, mode);
+ case REALM_CRUSADE: return do_crusade_spell(p_ptr, spell, mode);
+ case REALM_MUSIC: return do_music_spell(p_ptr, spell, mode);
+ case REALM_HISSATSU: return do_hissatsu_spell(p_ptr, spell, mode);
+ case REALM_HEX: return do_hex_spell(p_ptr, spell, mode);
}
return NULL;
jverb(prompt, jverb_buf, JVERB_AND);
/* 英日切り替え機能に対応 */
(void)strnfmt(tmp_val, 78, "%s(MP%d, 失敗率%d%%)を%sますか? ",
- do_spell(use_realm, spell, SPELL_NAME), need_mana,
+ exe_spell(use_realm, spell, SPELL_NAME), need_mana,
spell_chance(spell, use_realm), jverb_buf);
#else
(void)strnfmt(tmp_val, 78, "%^s %s (%d mana, %d%% fail)? ",
- prompt, do_spell(use_realm, spell, SPELL_NAME), need_mana,
+ prompt, exe_spell(use_realm, spell, SPELL_NAME), need_mana,
spell_chance(spell, use_realm));
#endif
if (p_ptr->special_defense & KATA_MUSOU)
{
- set_action(ACTION_NONE);
+ set_action(p_ptr, ACTION_NONE);
}
if (p_ptr->pclass == CLASS_FORCETRAINER)
{
- if (player_has_no_spellbooks())
+ if (player_has_no_spellbooks(p_ptr))
{
confirm_use_force(TRUE);
return;
q = _("どの本を読みますか? ", "Browse which book? ");
s = _("読める本がない。", "You have no books that you can read.");
- o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)));
+ o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)), item_tester_tval);
if (!o_ptr)
{
if (item == INVEN_FORCE) /* the_force */
Term_erase(14, 12, 255);
Term_erase(14, 11, 255);
- roff_to_buf(do_spell(use_realm, spell, SPELL_DESC), 62, temp, sizeof(temp));
+ roff_to_buf(exe_spell(use_realm, spell, SPELL_DESC), 62, temp, sizeof(temp));
for (j = 0, line = 11; temp[j]; j += 1 + strlen(&temp[j]))
{
p_ptr->spell_forgotten2 = 0L;
sprintf(tmp, _("魔法の領域を%sから%sに変更した。", "change magic realm from %s to %s."), realm_names[p_ptr->realm2], realm_names[next_realm]);
- do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp);
+ exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, tmp);
p_ptr->old_realm |= 1 << (p_ptr->realm2 - 1);
p_ptr->realm2 = next_realm;
/* Spells of realm2 will have an increment of +32 */
SPELL_IDX spell = -1;
-
concptr p = spell_category_name(mp_ptr->spell_book);
-
object_type *o_ptr;
-
concptr q, s;
if (!p_ptr->realm1)
return;
}
- if (p_ptr->blind || no_lite())
- {
- msg_print(_("目が見えない！", "You cannot see!"));
- return;
- }
-
+ if (cmd_limit_blind(p_ptr)) return;
if (cmd_limit_confused(p_ptr)) return;
if (!(p_ptr->new_spells))
if (p_ptr->special_defense & KATA_MUSOU)
{
- set_action(ACTION_NONE);
+ set_action(p_ptr, ACTION_NONE);
}
#ifdef JP
q = _("どの本から学びますか? ", "Study which book? ");
s = _("読める本がない。", "You have no books that you can read.");
- o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
+ o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), item_tester_tval);
if (!o_ptr) return;
/* Access the item's sval */
int max_exp = (spell < 32) ? SPELL_EXP_MASTER : SPELL_EXP_EXPERT;
int old_exp = p_ptr->spell_exp[spell];
int new_rank = EXP_LEVEL_UNSKILLED;
- concptr name = do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME);
+ concptr name = exe_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME);
if (old_exp >= max_exp)
{
if (mp_ptr->spell_book == TV_MUSIC_BOOK)
{
msg_format("%sを学んだ。",
- do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME));
+ exe_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME));
}
else
{
msg_format("%sの%sを学んだ。",
- do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME), p);
+ exe_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME), p);
}
#else
msg_format("You have learned the %s of %s.",
- p, do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME));
+ p, exe_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME));
#endif
}
switch (mp_ptr->spell_book)
{
case TV_LIFE_BOOK:
- chg_virtue(V_FAITH, 1);
+ chg_virtue(p_ptr, V_FAITH, 1);
break;
case TV_DEATH_BOOK:
- chg_virtue(V_UNLIFE, 1);
+ chg_virtue(p_ptr, V_UNLIFE, 1);
break;
case TV_NATURE_BOOK:
- chg_virtue(V_NATURE, 1);
+ chg_virtue(p_ptr, V_NATURE, 1);
break;
default:
- chg_virtue(V_KNOWLEDGE, 1);
+ chg_virtue(p_ptr, V_KNOWLEDGE, 1);
break;
}
return;
}
- /* Require lite */
if (p_ptr->blind || no_lite())
{
if (p_ptr->pclass == CLASS_FORCETRAINER) confirm_use_force(FALSE);
}
if (cmd_limit_confused(p_ptr)) return;
-
- /* Hex */
if (p_ptr->realm1 == REALM_HEX)
{
if (hex_spell_fully())
if (p_ptr->pclass == CLASS_FORCETRAINER)
{
- if (player_has_no_spellbooks())
+ if (player_has_no_spellbooks(p_ptr))
{
confirm_use_force(FALSE);
return;
prayer = spell_category_name(mp_ptr->spell_book);
- /* Restrict choices to spell books */
- item_tester_tval = mp_ptr->spell_book;
-
q = _("どの呪文書を使いますか? ", "Use which book? ");
s = _("呪文書がない！", "You have no spell books!");
- o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)));
+ o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)), mp_ptr->spell_book);
if (!o_ptr)
{
if (item == INVEN_FORCE) /* the_force */
}
#endif
-
use_realm = tval2realm(o_ptr->tval);
-
- /* Hex */
if (use_realm == REALM_HEX)
{
if (hex_spelling(spell))
switch (realm)
{
case REALM_LIFE:
- if (randint1(100) < chance) chg_virtue(V_VITALITY, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_VITALITY, -1);
break;
case REALM_DEATH:
- if (randint1(100) < chance) chg_virtue(V_UNLIFE, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_UNLIFE, -1);
break;
case REALM_NATURE:
- if (randint1(100) < chance) chg_virtue(V_NATURE, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_NATURE, -1);
break;
case REALM_DAEMON:
- if (randint1(100) < chance) chg_virtue(V_JUSTICE, 1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_JUSTICE, 1);
break;
case REALM_CRUSADE:
- if (randint1(100) < chance) chg_virtue(V_JUSTICE, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_JUSTICE, -1);
break;
case REALM_HEX:
- if (randint1(100) < chance) chg_virtue(V_COMPASSION, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_COMPASSION, -1);
break;
default:
- if (randint1(100) < chance) chg_virtue(V_KNOWLEDGE, -1);
+ if (randint1(100) < chance) chg_virtue(p_ptr, V_KNOWLEDGE, -1);
break;
}
/* Failure casting may activate some side effect */
- do_spell(realm, spell, SPELL_FAIL);
+ exe_spell(realm, spell, SPELL_FAIL);
if ((o_ptr->tval == TV_CHAOS_BOOK) && (randint1(100) < spell))
{
if ((sval == 3) && one_in_(2))
{
- sanity_blast(0, TRUE);
+ sanity_blast(p_ptr, 0, TRUE);
}
else
{
msg_print(_("痛い！", "It hurts!"));
- take_hit(DAMAGE_LOSELIFE, damroll(o_ptr->sval + 1, 6), _("暗黒魔法の逆流", "a miscast Death spell"), -1);
+ take_hit(p_ptr, DAMAGE_LOSELIFE, damroll(o_ptr->sval + 1, 6), _("暗黒魔法の逆流", "a miscast Death spell"), -1);
if ((spell > 15) && one_in_(6) && !p_ptr->hold_exp)
- lose_exp(spell * 250);
+ lose_exp(p_ptr, spell * 250);
}
}
else if ((o_ptr->tval == TV_MUSIC_BOOK) && (randint1(200) < spell))
aggravate_monsters(0);
}
if (randint1(100) >= chance)
- chg_virtue(V_CHANCE, -1);
+ chg_virtue(p_ptr, V_CHANCE, -1);
}
/* Process spell */
else
{
/* Canceled spells cost neither a current_world_ptr->game_turn nor mana */
- if (!do_spell(realm, spell, SPELL_CAST)) return;
+ if (!exe_spell(realm, spell, SPELL_CAST)) return;
if (randint1(100) < chance)
- chg_virtue(V_CHANCE, 1);
+ chg_virtue(p_ptr, V_CHANCE, 1);
/* A spell was cast */
if (!(increment ?
p_ptr->spell_worked2 |= (1L << spell);
}
- /* Gain experience */
- gain_exp(e * s_ptr->slevel);
-
- /* Redraw object recall */
+ gain_exp(p_ptr, e * s_ptr->slevel);
p_ptr->window |= (PW_OBJECT);
switch (realm)
{
case REALM_LIFE:
- chg_virtue(V_TEMPERANCE, 1);
- chg_virtue(V_COMPASSION, 1);
- chg_virtue(V_VITALITY, 1);
- chg_virtue(V_DILIGENCE, 1);
+ chg_virtue(p_ptr, V_TEMPERANCE, 1);
+ chg_virtue(p_ptr, V_COMPASSION, 1);
+ chg_virtue(p_ptr, V_VITALITY, 1);
+ chg_virtue(p_ptr, V_DILIGENCE, 1);
break;
case REALM_DEATH:
- chg_virtue(V_UNLIFE, 1);
- chg_virtue(V_JUSTICE, -1);
- chg_virtue(V_FAITH, -1);
- chg_virtue(V_VITALITY, -1);
+ chg_virtue(p_ptr, V_UNLIFE, 1);
+ chg_virtue(p_ptr, V_JUSTICE, -1);
+ chg_virtue(p_ptr, V_FAITH, -1);
+ chg_virtue(p_ptr, V_VITALITY, -1);
break;
case REALM_DAEMON:
- chg_virtue(V_JUSTICE, -1);
- chg_virtue(V_FAITH, -1);
- chg_virtue(V_HONOUR, -1);
- chg_virtue(V_TEMPERANCE, -1);
+ chg_virtue(p_ptr, V_JUSTICE, -1);
+ chg_virtue(p_ptr, V_FAITH, -1);
+ chg_virtue(p_ptr, V_HONOUR, -1);
+ chg_virtue(p_ptr, V_TEMPERANCE, -1);
break;
case REALM_CRUSADE:
- chg_virtue(V_FAITH, 1);
- chg_virtue(V_JUSTICE, 1);
- chg_virtue(V_SACRIFICE, 1);
- chg_virtue(V_HONOUR, 1);
+ chg_virtue(p_ptr, V_FAITH, 1);
+ chg_virtue(p_ptr, V_JUSTICE, 1);
+ chg_virtue(p_ptr, V_SACRIFICE, 1);
+ chg_virtue(p_ptr, V_HONOUR, 1);
break;
case REALM_NATURE:
- chg_virtue(V_NATURE, 1);
- chg_virtue(V_HARMONY, 1);
+ chg_virtue(p_ptr, V_NATURE, 1);
+ chg_virtue(p_ptr, V_HARMONY, 1);
break;
case REALM_HEX:
- chg_virtue(V_JUSTICE, -1);
- chg_virtue(V_FAITH, -1);
- chg_virtue(V_HONOUR, -1);
- chg_virtue(V_COMPASSION, -1);
+ chg_virtue(p_ptr, V_JUSTICE, -1);
+ chg_virtue(p_ptr, V_FAITH, -1);
+ chg_virtue(p_ptr, V_HONOUR, -1);
+ chg_virtue(p_ptr, V_COMPASSION, -1);
break;
default:
- chg_virtue(V_KNOWLEDGE, 1);
+ chg_virtue(p_ptr, V_KNOWLEDGE, 1);
break;
}
}
switch (realm)
{
case REALM_LIFE:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_TEMPERANCE, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_COMPASSION, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_VITALITY, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_DILIGENCE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_TEMPERANCE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_COMPASSION, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_VITALITY, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_DILIGENCE, 1);
break;
case REALM_DEATH:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_UNLIFE, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_JUSTICE, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_FAITH, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_VITALITY, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_UNLIFE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_JUSTICE, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_FAITH, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_VITALITY, -1);
break;
case REALM_DAEMON:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_JUSTICE, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_FAITH, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_HONOUR, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_TEMPERANCE, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_JUSTICE, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_FAITH, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_HONOUR, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_TEMPERANCE, -1);
break;
case REALM_CRUSADE:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_FAITH, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_JUSTICE, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_SACRIFICE, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_HONOUR, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_FAITH, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_JUSTICE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_SACRIFICE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_HONOUR, 1);
break;
case REALM_NATURE:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_NATURE, 1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_HARMONY, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_NATURE, 1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_HARMONY, 1);
break;
case REALM_HEX:
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_JUSTICE, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_FAITH, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_HONOUR, -1);
- if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(V_COMPASSION, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_JUSTICE, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_FAITH, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_HONOUR, -1);
+ if (randint1(100 + p_ptr->lev) < need_mana) chg_virtue(p_ptr, V_COMPASSION, -1);
break;
}
if (mp_ptr->spell_xtra & MAGIC_GAIN_EXP)
msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!"));
/* Hack -- Bypass free action */
- (void)set_paralyzed(p_ptr->paralyzed + randint1(5 * oops + 1));
+ (void)set_paralyzed(p_ptr, p_ptr->paralyzed + randint1(5 * oops + 1));
switch (realm)
{
case REALM_LIFE:
- chg_virtue(V_VITALITY, -10);
+ chg_virtue(p_ptr, V_VITALITY, -10);
break;
case REALM_DEATH:
- chg_virtue(V_UNLIFE, -10);
+ chg_virtue(p_ptr, V_UNLIFE, -10);
break;
case REALM_DAEMON:
- chg_virtue(V_JUSTICE, 10);
+ chg_virtue(p_ptr, V_JUSTICE, 10);
break;
case REALM_NATURE:
- chg_virtue(V_NATURE, -10);
+ chg_virtue(p_ptr, V_NATURE, -10);
break;
case REALM_CRUSADE:
- chg_virtue(V_JUSTICE, -10);
+ chg_virtue(p_ptr, V_JUSTICE, -10);
break;
case REALM_HEX:
- chg_virtue(V_COMPASSION, 10);
+ chg_virtue(p_ptr, V_COMPASSION, 10);
break;
default:
- chg_virtue(V_KNOWLEDGE, -10);
+ chg_virtue(p_ptr, V_KNOWLEDGE, -10);
break;
}
msg_print(_("体を悪くしてしまった！", "You have damaged your health!"));
/* Reduce constitution */
- (void)dec_stat(A_CON, 15 + randint1(10), perm);
+ (void)dec_stat(p_ptr, A_CON, 15 + randint1(10), perm);
}
}
OSDN Git Service
