#include "cmd-quaff.h"
#include "object-hook.h"
#include "object-curse.h"
+#include "projection.h"
+#include "spells-status.h"
+#include "player-status.h"
#define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
*/
bool stop_hex_spell_all(void)
{
- int i;
+ SPELL_IDX i;
for (i = 0; i < 32; i++)
{
CASTING_HEX_FLAGS(p_ptr) = 0;
CASTING_HEX_NUM(p_ptr) = 0;
- /* Print message */
if (p_ptr->action == ACTION_SPELL) set_action(ACTION_NONE);
- /* Redraw status */
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
p_ptr->redraw |= (PR_EXTRA | PR_HP | PR_MANA);
CASTING_HEX_NUM(p_ptr)--;
}
- /* Redraw status */
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
p_ptr->redraw |= (PR_EXTRA | PR_HP | PR_MANA);
}
}
-
/* Culcurates final mana cost */
need_mana_frac = 0;
s64b_div(&need_mana, &need_mana_frac, 0, 3); /* Divide by 3 */
need_mana += (CASTING_HEX_NUM(p_ptr) - 1);
-
/* Not enough mana */
if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, need_mana, need_mana_frac) < 0)
{
p_ptr->redraw |= PR_MANA;
if (res)
{
- msg_print(_("詠唱を再開した。", "You restart spelling."));
+ msg_print(_("詠唱を再開した。", "You restart casting."));
p_ptr->action = ACTION_SPELL;
if (p_ptr->spell_exp[spell] < SPELL_EXP_BEGINNER)
p_ptr->spell_exp[spell] += 5;
else if(p_ptr->spell_exp[spell] < SPELL_EXP_SKILLED)
- { if (one_in_(2) && (dun_level > 4) && ((dun_level + 10) > p_ptr->lev)) p_ptr->spell_exp[spell] += 1; }
+ { if (one_in_(2) && (current_floor_ptr->dun_level > 4) && ((current_floor_ptr->dun_level + 10) > p_ptr->lev)) p_ptr->spell_exp[spell] += 1; }
else if(p_ptr->spell_exp[spell] < SPELL_EXP_EXPERT)
- { if (one_in_(5) && ((dun_level + 5) > p_ptr->lev) && ((dun_level + 5) > s_ptr->slevel)) p_ptr->spell_exp[spell] += 1; }
+ { if (one_in_(5) && ((current_floor_ptr->dun_level + 5) > p_ptr->lev) && ((current_floor_ptr->dun_level + 5) > s_ptr->slevel)) p_ptr->spell_exp[spell] += 1; }
else if(p_ptr->spell_exp[spell] < SPELL_EXP_MASTER)
- { if (one_in_(5) && ((dun_level + 5) > p_ptr->lev) && (dun_level > s_ptr->slevel)) p_ptr->spell_exp[spell] += 1; }
+ { if (one_in_(5) && ((current_floor_ptr->dun_level + 5) > p_ptr->lev) && (current_floor_ptr->dun_level > s_ptr->slevel)) p_ptr->spell_exp[spell] += 1; }
}
/* Do any effects of continual spells */
*/
bool teleport_barrier(MONSTER_IDX m_idx)
{
- monster_type *m_ptr = &m_list[m_idx];
+ monster_type *m_ptr = ¤t_floor_ptr->m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (!hex_spelling(HEX_ANTI_TELE)) return FALSE;
*/
bool magic_barrier(MONSTER_IDX m_idx)
{
- monster_type *m_ptr = &m_list[m_idx];
+ monster_type *m_ptr = ¤t_floor_ptr->m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (!hex_spelling(HEX_ANTI_MAGIC)) return FALSE;
*/
bool multiply_barrier(MONSTER_IDX m_idx)
{
- monster_type *m_ptr = &m_list[m_idx];
+ monster_type *m_ptr = ¤t_floor_ptr->m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (!hex_spelling(HEX_ANTI_MULTI)) return FALSE;
* @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_CONT / SPELL_STOP)
* @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_CONT / SPELL_STOP 時はNULL文字列を返す。
*/
-cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
{
bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
case 1:
if (name) return _("軽傷の治癒", "Cure light wounds");
- if (desc) return _("HPや傷を少し回復させる。", "Heals cut and HP a little.");
+ if (desc) return _("HPや傷を少し回復させる。", "Heals cuts and HP a little.");
if (info) return info_heal(1, 10, 0);
if (cast)
{
- msg_print(_("気分が良くなってくる。", "You feel better and better."));
+ msg_print(_("気分が良くなってくる。", "You feel a little better."));
}
if (cast || cont) (void)cure_light_wounds(1, 10);
break;
if (desc) return _("炎のオーラを身にまとい、回復速度が速くなる。", "Gives fire aura and regeneration.");
if (cast)
{
- msg_print(_("体が炎のオーラで覆われた。", "You have enveloped by fiery aura!"));
+ msg_print(_("体が炎のオーラで覆われた。", "You are enveloped by a fiery aura!"));
}
if (stop)
{
- msg_print(_("炎のオーラが消え去った。", "Fiery aura disappeared."));
+ msg_print(_("炎のオーラが消え去った。", "The fiery aura disappeared."));
}
break;
case 3:
if (name) return _("悪臭霧", "Stinking mist");
- if (desc) return _("視界内のモンスターに微弱量の毒のダメージを与える。", "Deals few damages of poison to all monsters in your sight.");
+ if (desc) return _("視界内のモンスターに微弱量の毒のダメージを与える。", "Deals a little poison damage to all monsters in your sight.");
power = plev / 2 + 5;
if (info) return info_damage(1, power, 0);
if (cast || cont)
{
- project_hack(GF_POIS, randint1(power));
+ project_all_los(GF_POIS, randint1(power));
}
break;
if (desc) return _("術者の腕力を上昇させる。", "Attempts to increase your strength.");
if (cast)
{
- msg_print(_("何だか力が湧いて来る。", "You feel you get stronger."));
+ msg_print(_("何だか力が湧いて来る。", "You feel stronger."));
}
break;
if (cast)
{
OBJECT_IDX item;
- cptr q, s;
- char o_name[MAX_NLEN];
+ concptr q, s;
+ GAME_TEXT o_name[MAX_NLEN];
object_type *o_ptr;
u32b f[TR_FLAG_SIZE];
item_tester_hook = item_tester_hook_weapon_except_bow;
q = _("どれを呪いますか？", "Which weapon do you curse?");
- s = _("武器を装備していない。", "You wield no weapons.");
+ s = _("武器を装備していない。", "You're not wielding a weapon.");
- if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+ o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+ if (!o_ptr) return FALSE;
- o_ptr = &inventory[item];
object_desc(o_name, o_ptr, OD_NAME_ONLY);
object_flags(o_ptr, f);
if (info) return info_range(MAX_SIGHT);
if (cast)
{
- msg_print(_("邪悪な生物の存在を感じ取ろうとした。", "You attend to the presence of evil creatures."));
+ msg_print(_("邪悪な生物の存在を感じ取ろうとした。", "You sense the presence of evil creatures."));
}
break;
case 7:
if (name) return _("我慢", "Patience");
if (desc) return _("数ターン攻撃を耐えた後、受けたダメージを地獄の業火として周囲に放出する。",
- "Bursts hell fire strongly after patients any damage while few turns.");
+ "Bursts hell fire strongly after enduring damage for a few turns.");
power = MIN(200, (HEX_REVENGE_POWER(p_ptr) * 2));
if (info) return info_damage(0, 0, power);
if (cast)
if (HEX_REVENGE_TURN(p_ptr) > 0)
{
- msg_print(_("すでに我慢をしている。", "You are already patienting."));
+ msg_print(_("すでに我慢をしている。", "You are already biding your time for vengeance."));
return NULL;
}
HEX_REVENGE_TYPE(p_ptr) = 1;
HEX_REVENGE_TURN(p_ptr) = r;
HEX_REVENGE_POWER(p_ptr) = 0;
- msg_print(_("じっと耐えることにした。", "You decide to patient all damages."));
+ msg_print(_("じっと耐えることにした。", "You decide to endure damage for future retribution."));
add = FALSE;
}
if (cont)
if ((HEX_REVENGE_TURN(p_ptr) <= 0) || (power >= 200))
{
- msg_print(_("我慢が解かれた！", "Time for end of patioence!"));
+ msg_print(_("我慢が解かれた！", "My patience is at an end!"));
if (power)
{
project(0, rad, p_ptr->y, p_ptr->x, power, GF_HELL_FIRE,
}
if (p_ptr->wizard)
{
- msg_format(_("%d点のダメージを返した。", "You return %d damages."), power);
+ msg_format(_("%d点のダメージを返した。", "You return %d damage."), power);
}
/* Reset */
/*** 2nd book (8-15) ***/
case 8:
- if (name) return _("氷の鎧", "Ice armor");
- if (desc) return _("氷のオーラを身にまとい、防御力が上昇する。", "Gives fire aura and bonus to AC.");
+ if (name) return _("氷の鎧", "Armor of ice");
+ if (desc) return _("氷のオーラを身にまとい、防御力が上昇する。", "Surrounds you with an icy aura and gives a bonus to AC.");
if (cast)
{
- msg_print(_("体が氷の鎧で覆われた。", "You have enveloped by ice armor!"));
+ msg_print(_("体が氷の鎧で覆われた。", "You are enveloped by icy armor!"));
}
if (stop)
{
- msg_print(_("氷の鎧が消え去った。", "Ice armor disappeared."));
+ msg_print(_("氷の鎧が消え去った。", "The icy armor disappeared."));
}
break;
case 9:
if (name) return _("重傷の治癒", "Cure serious wounds");
- if (desc) return _("体力や傷を多少回復させる。", "Heals cut and HP more.");
+ if (desc) return _("体力や傷を多少回復させる。", "Heals cuts and HP.");
if (info) return info_heal(2, 10, 0);
if (cast)
{
- msg_print(_("気分が良くなってくる。", "You feel better and better."));
+ msg_print(_("気分が良くなってくる。", "You feel better."));
}
if (cast || cont) (void)cure_serious_wounds(2, 10);
break;
case 10:
- if (name) return _("薬品吸入", "Inhail potion");
- if (desc) return _("呪文詠唱を中止することなく、薬の効果を得ることができる。", "Quaffs a potion without canceling of casting a spell.");
+ if (name) return _("薬品吸入", "Inhale potion");
+ if (desc) return _("呪文詠唱を中止することなく、薬の効果を得ることができる。", "Quaffs a potion without canceling spell casting.");
if (cast)
{
CASTING_HEX_FLAGS(p_ptr) |= (1L << HEX_INHAIL);
case 11:
if (name) return _("衰弱の霧", "Hypodynamic mist");
if (desc) return _("視界内のモンスターに微弱量の衰弱属性のダメージを与える。",
- "Deals few damages of hypodynamia to all monsters in your sight.");
+ "Deals a little life-draining damage to all monsters in your sight.");
power = (plev / 2) + 5;
if (info) return info_damage(1, power, 0);
if (cast || cont)
{
- project_hack(GF_HYPODYNAMIA, randint1(power));
+ project_all_los(GF_HYPODYNAMIA, randint1(power));
}
break;
case 12:
if (name) return _("魔剣化", "Swords to runeswords");
if (desc) return _("武器の攻撃力を上げる。切れ味を得、呪いに応じて与えるダメージが上昇し、善良なモンスターに対するダメージが2倍になる。",
- "Gives vorpal ability to your weapon. Increases damages by your weapon acccording to curse of your weapon.");
+ "Gives vorpal ability to your weapon. Increases damage from your weapon acccording to curse of your weapon.");
if (cast)
{
#ifdef JP
#ifdef JP
msg_print("武器の輝きが消え去った。");
#else
- msg_format("Brightness of weapon%s disappeared.", (empty_hands(FALSE)) ? "" : "s");
+ msg_format("Your weapon%s.", (empty_hands(FALSE)) ? " no longer glows" : "s no longer glow");
#endif
}
break;
}
if (stop)
{
- msg_print(_("手の輝きがなくなった。", "Brightness on your hands disappeard."));
+ msg_print(_("手の輝きがなくなった。", "Your hands no longer glow."));
}
break;
"Attempts to increases your strength, dexterity and constitusion.");
if (cast)
{
- msg_print(_("身体が強くなった気がした。", "You feel your body is developed more now."));
+ msg_print(_("身体が強くなった気がした。", "You feel your body is more developed now."));
}
break;
if (desc) return _("電気のオーラを身にまとい、動きが速くなる。", "Gives lightning aura and a bonus to speed.");
if (cast)
{
- msg_print(_("体が稲妻のオーラで覆われた。", "You have enveloped by electrical aura!"));
+ msg_print(_("体が稲妻のオーラで覆われた。", "You are enveloped by an electrical aura!"));
}
if (stop)
{
- msg_print(_("稲妻のオーラが消え去った。", "Electrical aura disappeared."));
+ msg_print(_("稲妻のオーラが消え去った。", "The electrical aura disappeared."));
}
break;
case 17:
if (name) return _("致命傷の治癒", "Cure critical wounds");
- if (desc) return _("体力や傷を回復させる。", "Heals cut and HP greatry.");
+ if (desc) return _("体力や傷を回復させる。", "Heals cuts and HP greatly.");
if (info) return info_heal(4, 10, 0);
if (cast)
{
- msg_print(_("気分が良くなってくる。", "You feel better and better."));
+ msg_print(_("気分が良くなってくる。", "You feel much better."));
}
if (cast || cont) (void)cure_critical_wounds(damroll(4, 10));
break;
if (desc) return _("死体を蘇らせてペットにする。", "Raises corpses and skeletons from dead.");
if (cast)
{
- msg_print(_("死者への呼びかけを始めた。", "You start to call deads.!"));
+ msg_print(_("死者への呼びかけを始めた。", "You start to call the dead.!"));
}
if (cast || cont)
{
if (cast)
{
OBJECT_IDX item;
- cptr q, s;
- char o_name[MAX_NLEN];
+ concptr q, s;
+ GAME_TEXT o_name[MAX_NLEN];
object_type *o_ptr;
u32b f[TR_FLAG_SIZE];
item_tester_hook = object_is_armour;
q = _("どれを呪いますか？", "Which piece of armour do you curse?");
- s = _("防具を装備していない。", "You wield no piece of armours.");
+ s = _("防具を装備していない。", "You're not wearing any armor.");
- if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+ o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+ if (!o_ptr) return FALSE;
o_ptr = &inventory[item];
object_desc(o_name, o_ptr, OD_NAME_ONLY);
if (!o_ptr->k_idx)
{
- msg_print(_("クロークを身につけていない！", "You don't ware any cloak."));
+ msg_print(_("クロークを身につけていない！", "You are not wearing a cloak."));
return NULL;
}
else if (!object_is_cursed(o_ptr))
}
else
{
- msg_print(_("影のオーラを身にまとった。", "You have enveloped by shadow aura!"));
+ msg_print(_("影のオーラを身にまとった。", "You are enveloped by a shadowy aura!"));
}
}
if (cont)
}
if (stop)
{
- msg_print(_("影のオーラが消え去った。", "Shadow aura disappeared."));
+ msg_print(_("影のオーラが消え去った。", "The shadowy aura disappeared."));
}
break;
case 22:
- if (name) return _("苦痛を魔力に", "Pains to mana");
- if (desc) return _("視界内のモンスターに精神ダメージ与え、魔力を吸い取る。", "Deals psychic damages to all monsters in sight, and drains some mana.");
+ if (name) return _("苦痛を魔力に", "Pain to mana");
+ if (desc) return _("視界内のモンスターに精神ダメージ与え、魔力を吸い取る。", "Deals psychic damage to all monsters in sight and drains some mana.");
power = plev * 3 / 2;
if (info) return info_damage(1, power, 0);
if (cast || cont)
{
- project_hack(GF_PSI_DRAIN, randint1(power));
+ project_all_los(GF_PSI_DRAIN, randint1(power));
}
break;
if (desc) return _("打撃や魔法で受けたダメージを、攻撃元のモンスターにも与える。", "Returns same damage which you got to the monster which damaged you.");
if (cast)
{
- msg_print(_("復讐したい欲望にかられた。", "You wish strongly you want to revenge anything."));
+ msg_print(_("復讐したい欲望にかられた。", "You feel very vengeful."));
}
break;
flag = TRUE;
}
- for (i = A_STR; i < 6; i++)
+ for (i = A_STR; i < A_MAX; i++)
{
if (p_ptr->stat_cur[i] < p_ptr->stat_max[i])
{
if (p_ptr->stat_cur[i] > p_ptr->stat_max[i])
p_ptr->stat_cur[i] = p_ptr->stat_max[i];
-
- /* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
flag = TRUE;
if (cont) CASTING_HEX_NUM(p_ptr)--;
if (CASTING_HEX_NUM(p_ptr)) p_ptr->action = ACTION_NONE;
- /* Redraw status */
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
p_ptr->redraw |= (PR_EXTRA);
if (cast)
{
OBJECT_IDX item;
- cptr s, q;
+ concptr s, q;
u32b f[TR_FLAG_SIZE];
object_type *o_ptr;
q = _("どの装備品から吸収しますか？", "Which cursed equipment do you drain mana from?");
s = _("呪われたアイテムを装備していない。", "You have no cursed equipment.");
- if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+ o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+ if (!o_ptr) return FALSE;
- o_ptr = &inventory[item];
object_flags(o_ptr, f);
p_ptr->csp += (p_ptr->lev / 5) + randint1(p_ptr->lev / 5);
{
if (one_in_(7))
{
- msg_print(_("呪いを全て吸い取った。", "Heavy curse vanished away."));
+ msg_print(_("呪いを全て吸い取った。", "A heavy curse vanished."));
o_ptr->curse_flags = 0L;
}
}
else if ((o_ptr->curse_flags & (TRC_CURSED)) && one_in_(3))
{
- msg_print(_("呪いを全て吸い取った。", "Curse vanished away."));
+ msg_print(_("呪いを全て吸い取った。", "A curse vanished."));
o_ptr->curse_flags = 0L;
}
#ifdef JP
msg_print("武器の渇望が消え去った。");
#else
- msg_format("Thirsty of weapon%s disappeared.", (empty_hands(FALSE)) ? "" : "s");
+ msg_format("Your weapon%s less thirsty now.", (empty_hands(FALSE)) ? " is" : "s are");
#endif
}
break;
int dy = y + ddy_ddd[dir];
int dx = x + ddx_ddd[dir];
if (dir == 5) continue;
- if (cave[dy][dx].m_idx) flag = TRUE;
+ if (current_floor_ptr->grid_array[dy][dx].m_idx) flag = TRUE;
}
- if (!cave_empty_bold(y, x) || (cave[y][x].info & CAVE_ICKY) ||
+ if (!cave_empty_bold(y, x) || (current_floor_ptr->grid_array[y][x].info & CAVE_ICKY) ||
(distance(y, x, p_ptr->y, p_ptr->x) > plev + 2))
{
msg_print(_("そこには移動できない。", "Can not teleport to there."));
case 30:
if (name) return _("反魔法結界", "Anti magic barrier");
- if (desc) return _("視界内のモンスターの魔法を阻害するバリアを張る。", "Obstructs all magic spell of monsters in your sight.");
+ if (desc) return _("視界内のモンスターの魔法を阻害するバリアを張る。", "Obstructs all magic spells of monsters in your sight.");
power = plev * 3 / 2;
if (info) return info_power(power);
if (cast)
case 31:
if (name) return _("復讐の宣告", "Revenge sentence");
if (desc) return _("数ターン後にそれまで受けたダメージに応じた威力の地獄の劫火の弾を放つ。",
- "Fires a ball of hell fire to try revenging after few turns.");
+ "Fires a ball of hell fire to try avenging damage from a few turns.");
power = HEX_REVENGE_POWER(p_ptr);
if (info) return info_damage(0, 0, power);
if (cast)
if (HEX_REVENGE_TURN(p_ptr) > 0)
{
- msg_print(_("すでに復讐は宣告済みだ。", "You already pronounced your revenge."));
+ msg_print(_("すでに復讐は宣告済みだ。", "You've already declared your revenge."));
return NULL;
}
HEX_REVENGE_TYPE(p_ptr) = 2;
HEX_REVENGE_TURN(p_ptr) = r;
- msg_format(_("あなたは復讐を宣告した。あと %d ターン。", "You pronounce your revenge. %d turns left."), r);
+ msg_format(_("あなたは復讐を宣告した。あと %d ターン。", "You declare your revenge. %d turns left."), r);
add = FALSE;
}
if (cont)
do
{
- msg_print(_("復讐の時だ！", "Time to revenge!"));
+ msg_print(_("復讐の時だ！", "Time for revenge!"));
} while (!get_aim_dir(&dir));
fire_ball(GF_HELL_FIRE, dir, power, 1);
if (p_ptr->wizard)
{
- msg_format(_("%d点のダメージを返した。", "You return %d damages."), power);
+ msg_format(_("%d点のダメージを返した。", "You return %d damage."), power);
}
}
else
{
- msg_print(_("復讐する気が失せた。", "You are not a mood to revenge."));
+ msg_print(_("復讐する気が失せた。", "You are not in the mood for revenge."));
}
HEX_REVENGE_POWER(p_ptr) = 0;
}
if (p_ptr->action != ACTION_SPELL) set_action(ACTION_SPELL);
}
- /* Redraw status */
if (!info)
{
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
OSDN Git Service
