-/* File: racial.c */
-
-/* Purpose: Racial powers (and mutations) */
-
-/*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
- *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+/*!
+ * @file racial.c
+ * @brief ¥ì¥¤¥·¥ã¥ë¤ÈÆÍÁ³ÊѰۤε»Ç½½èÍý / Racial powers (and mutations)
+ * @date 2014/01/08
+ * @author
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke\n
+ * This software may be copied and distributed for educational, research,\n
+ * and not for profit purposes provided that this copyright and statement\n
+ * are included in all such copies. Other copyrights may also apply.\n
+ * 2014 Deskull rearranged comment for Doxygen. \n
*/
#include "angband.h"
-/*
+/*!
+ * @brief ÂоݤΥ¢¥¤¥Æ¥à¤¬Ìð¤ä¥¯¥í¥¹¥Ü¥¦¤ÎÌð¤ÎºàÎÁ¤Ë¤Ê¤ë¤«¤òÊÖ¤¹¡£/
* Hook to determine if an object is contertible in an arrow/bolt
+ * @param o_ptr ¥ª¥Ö¥¸¥§¥¯¥È¤Î¹½Â¤ÂΤλ²¾È¥Ý¥¤¥ó¥¿¡£
+ * @return ºàÎÁ¤Ë¤Ç¤¤ë¤Ê¤éTRUE¤òÊÖ¤¹
*/
static bool item_tester_hook_convertible(object_type *o_ptr)
{
return (FALSE);
}
-
-/*
- * do_cmd_cast calls this function if the player's class
- * is 'archer'.
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡ÖÃÆ/Ìð¤ÎÀ½Â¤¡×½èÍý / do_cmd_cast calls this function if the player's class is 'archer'.
+ * Hook to determine if an object is contertible in an arrow/bolt
+ * @return À½Â¤¤ò¼ÂºÝ¤Ë¹Ô¤Ã¤¿¤éTRUE¡¢¥¥ã¥ó¥»¥ë¤·¤¿¤éFALSE¤òÊÖ¤¹
*/
static bool do_cmd_archer(void)
{
y = py + ddy[dir];
x = px + ddx[dir];
c_ptr = &cave[y][x];
- if (c_ptr->feat == FEAT_RUBBLE)
+
+ if (!have_flag(f_info[get_feat_mimic(c_ptr)].flags, FF_CAN_DIG))
+ {
+#ifdef JP
+ msg_print("¤½¤³¤Ë¤Ï´äÀФ¬¤Ê¤¤¡£");
+#else
+ msg_print("You need pile of rubble.");
+#endif
+ return FALSE;
+ }
+ else if (!cave_have_flag_grid(c_ptr, FF_CAN_DIG) || !cave_have_flag_grid(c_ptr, FF_HURT_ROCK))
{
+#ifdef JP
+ msg_print("¹Å¤¹¤®¤ÆÊø¤»¤Ê¤«¤Ã¤¿¡£");
+#else
+ msg_print("You failed to make ammo.");
+#endif
+ }
+ else
+ {
+ s16b slot;
+
/* Get local object */
q_ptr = &forge;
q_ptr->number = (byte)rand_range(15,30);
object_aware(q_ptr);
object_known(q_ptr);
- apply_magic(q_ptr, p_ptr->lev, FALSE, FALSE, FALSE, FALSE);
+ apply_magic(q_ptr, p_ptr->lev, AM_NO_FIXED_ART);
q_ptr->discount = 99;
- (void)inven_carry(q_ptr);
+ slot = inven_carry(q_ptr);
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
- msg_format("´äÀФòºï¤Ã¤Æ%s¤òºî¤Ã¤¿¡£",o_name);
+ msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
#else
msg_print("You make some ammo.");
#endif
- (void)wall_to_mud(dir);
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW);
- p_ptr->window |= (PW_OVERHEAD);
- }
- else
- {
-#ifdef JP
- msg_print("¤½¤³¤Ë¤Ï´äÀФ¬¤Ê¤¤¡£");
-#else
- msg_print("You need pile of rubble.");
-#endif
+ /* Auto-inscription */
+ if (slot >= 0) autopick_alter_item(slot, FALSE);
+
+ /* Destroy the wall */
+ cave_alter_feat(y, x, FF_HURT_ROCK);
+
+ p_ptr->update |= (PU_FLOW);
}
}
/**********Create arrows*********/
else if (ext == 2)
{
int item;
-
cptr q, s;
+ s16b slot;
item_tester_hook = item_tester_hook_convertible;
else
{
q_ptr = &o_list[0 - item];
- }
+ }
/* Get local object */
q_ptr = &forge;
/* Hack -- Give the player some small firestones */
object_prep(q_ptr, lookup_kind(TV_ARROW, m_bonus(1, p_ptr->lev)+ 1));
- q_ptr->number = (byte)rand_range(5,10);
+ q_ptr->number = (byte)rand_range(5, 10);
object_aware(q_ptr);
object_known(q_ptr);
- apply_magic(q_ptr, p_ptr->lev, FALSE, FALSE, FALSE, FALSE);
+ apply_magic(q_ptr, p_ptr->lev, AM_NO_FIXED_ART);
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
#else
floor_item_describe(0 - item);
floor_item_optimize(0 - item);
}
- (void)inven_carry(q_ptr);
+
+ slot = inven_carry(q_ptr);
+
+ /* Auto-inscription */
+ if (slot >= 0) autopick_alter_item(slot, FALSE);
}
/**********Create bolts*********/
else if (ext == 3)
{
int item;
-
cptr q, s;
+ s16b slot;
item_tester_hook = item_tester_hook_convertible;
else
{
q_ptr = &o_list[0 - item];
- }
+ }
/* Get local object */
q_ptr = &forge;
/* Hack -- Give the player some small firestones */
object_prep(q_ptr, lookup_kind(TV_BOLT, m_bonus(1, p_ptr->lev)+1));
- q_ptr->number = (byte)rand_range(4,8);
+ q_ptr->number = (byte)rand_range(4, 8);
object_aware(q_ptr);
object_known(q_ptr);
- apply_magic(q_ptr, p_ptr->lev, FALSE, FALSE, FALSE, FALSE);
+ apply_magic(q_ptr, p_ptr->lev, AM_NO_FIXED_ART);
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
#else
floor_item_optimize(0 - item);
}
- (void)inven_carry(q_ptr);
+ slot = inven_carry(q_ptr);
+
+ /* Auto-inscription */
+ if (slot >= 0) autopick_alter_item(slot, FALSE);
}
return TRUE;
}
+/*!
+ * @brief ËâÆ»¶ñ½Ñ»Õ¤ÎËâÎϼè¤ê¹þ¤ß½èÍý
+ * @return ¼è¤ê¹þ¤ß¤ò¼Â¹Ô¤·¤¿¤éTRUE¡¢¥¥ã¥ó¥»¥ë¤·¤¿¤éFALSE¤òÊÖ¤¹
+ */
bool gain_magic(void)
{
int item;
o_ptr = &o_list[0 - item];
}
- if (!object_known_p(o_ptr))
+ if (o_ptr->tval == TV_STAFF && o_ptr->sval == SV_STAFF_NOTHING)
+ {
+#ifdef JP
+ msg_print("¤³¤Î¾ó¤Ë¤Ïȯư¤Î°Ù¤ÎǽÎϤϲ¿¤âÈ÷¤ï¤Ã¤Æ¤¤¤Ê¤¤¤è¤¦¤À¡£");
+#else
+ msg_print("This staff doesn't have any magical ability.");
+#endif
+ return FALSE;
+ }
+
+
+ if (!object_is_known(o_ptr))
{
#ifdef JP
msg_print("´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¼è¤ê¹þ¤á¤Ê¤¤¡£");
if (p_ptr->magic_num2[o_ptr->sval + ext])
{
gain_num *= 256;
- gain_num = (gain_num/3 + rand_int(gain_num/3)) / 256;
+ gain_num = (gain_num/3 + randint0(gain_num/3)) / 256;
if (gain_num < 1) gain_num = 1;
}
p_ptr->magic_num2[o_ptr->sval + ext] += gain_num;
}
}
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
msg_format("%s¤ÎËâÎϤò¼è¤ê¹þ¤ó¤À¡£", o_name);
return TRUE;
}
+/*!
+ * @brief ËâË¡·Ï¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤¤ë¤«¤ÎȽÄê¤òÊÖ¤¹
+ * @return ËâË¡·Ï¥³¥Þ¥ó¥É¤ò»ÈÍѲÄǽ¤Ê¤éTRUE¡¢ÉÔ²Äǽ¤Ê¤é¤ÐÍýͳ¤ò¥á¥Ã¥»¡¼¥¸É½¼¨¤·¤ÆFALSE¤òÊÖ¤¹¡£
+ */
+static bool can_do_cmd_cast(void)
+{
+ if (dun_level && (d_info[dungeon_type].flags1 & DF1_NO_MAGIC))
+ {
+#ifdef JP
+ msg_print("¥À¥ó¥¸¥ç¥ó¤¬ËâË¡¤òµÛ¼ý¤·¤¿¡ª");
+#else
+ msg_print("The dungeon absorbs all attempted magic!");
+#endif
+ msg_print(NULL);
+ return FALSE;
+ }
+ else if (p_ptr->anti_magic)
+ {
+#ifdef JP
+ msg_print("È¿ËâË¡¥Ð¥ê¥¢¤¬ËâË¡¤ò¼ÙË⤷¤¿¡ª");
+#else
+ msg_print("An anti-magic shell disrupts your magic!");
+#endif
+ return FALSE;
+ }
+ else if (p_ptr->shero)
+ {
+#ifdef JP
+ msg_format("¶¸Àï»Î²½¤·¤Æ¤¤¤ÆƬ¤¬²ó¤é¤Ê¤¤¡ª");
+#else
+ msg_format("You cannot think directly!");
+#endif
+ return FALSE;
+ }
+ else
+ return TRUE;
+}
+/*!
+ * @brief ½¤¹ÔÁΤ齤¨ÀßÄê½èÍý
+ * @return ¹½¤¨¤òÊѲ½¤µ¤»¤¿¤éTRUE¡¢¹½¤¨ÉÔǽ¤«¥¥ã¥ó¥»¥ë¤·¤¿¤éFALSE¤òÊÖ¤¹¡£
+ */
static bool choose_kamae(void)
{
char choice;
screen_load();
return FALSE;
}
- else if ((choice == 'a') || (choice == 'A') || (choice == ESCAPE))
+ else if ((choice == 'a') || (choice == 'A'))
{
if (p_ptr->action == ACTION_KAMAE)
{
#ifdef JP
msg_print("¤â¤È¤â¤È¹½¤¨¤Æ¤¤¤Ê¤¤¡£");
#else
- msg_print("You are not assuming a posture.");
+ msg_print("You are not assuming a posture.");
#endif
screen_load();
return TRUE;
return TRUE;
}
+/*!
+ * @brief ·õ½Ñ²È¤Î·¿ÀßÄê½èÍý
+ * @return ·¿¤òÊѲ½¤µ¤»¤¿¤éTRUE¡¢·¿¤Î¹½¤¨ÉÔǽ¤«¥¥ã¥ó¥»¥ë¤·¤¿¤éFALSE¤òÊÖ¤¹¡£
+ */
static bool choose_kata(void)
{
char choice;
screen_load();
return FALSE;
}
- else if ((choice == 'a') || (choice == 'A') || (choice == ESCAPE))
+ else if ((choice == 'a') || (choice == 'A'))
{
if (p_ptr->action == ACTION_KATA)
{
}
-/*
- * Returns the chance to activate a racial power/mutation
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¾ðÊó¤Îtypedef
+ */
+typedef struct power_desc_type power_desc_type;
+
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¾ðÊó¤Î¹½Â¤ÂÎÄêµÁ
*/
-static int racial_chance(s16b min_level, int use_stat, int difficulty)
+struct power_desc_type
{
+ char name[40];
+ int level;
+ int cost;
+ int stat;
+ int fail;
+ int number;
+};
+
+
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¤ÎȯưÀ®¸ùΨ¤ò·×»»¤¹¤ë / Returns the chance to activate a racial power/mutation
+ * @param pd_ptr ȯư¤·¤¿¤¤¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¾ðÊó¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @return À®¸ùΨ(%)¤òÊÖ¤¹
+ */
+static int racial_chance(power_desc_type *pd_ptr)
+{
+ s16b min_level = pd_ptr->level;
+ int difficulty = pd_ptr->fail;
+
int i;
int val;
int sum = 0;
- int stat = p_ptr->stat_cur[use_stat];
+ int stat = p_ptr->stat_cur[pd_ptr->stat];
/* No chance for success */
if ((p_ptr->lev < min_level) || p_ptr->confused)
}
-/* Note: return value indicates that we have succesfully used the power */
+static int racial_cost;
-bool racial_aux(s16b min_level, int cost, int use_stat, int difficulty)
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¤Îȯư¤ÎȽÄê½èÍý
+ * @param pd_ptr ȯư¤·¤¿¤¤¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¾ðÊó¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @return
+ * ȯưÀ®¸ù¤Ê¤é¤Ð1¡¢È¯Æ°¼ºÇԤʤé¤Ð-1¡¢¥¥ã¥ó¥»¥ë¤Ê¤é¤Ð0¤òÊÖ¤¹¡£
+ * return value indicates that we have succesfully used the power 1: Succeeded, 0: Cancelled, -1: Failed
+ */
+static int racial_aux(power_desc_type *pd_ptr)
{
- bool use_hp = FALSE;
+ s16b min_level = pd_ptr->level;
+ int use_stat = pd_ptr->stat;
+ int difficulty = pd_ptr->fail;
+ int use_hp = 0;
+
+ racial_cost = pd_ptr->cost;
/* Not enough mana - use hp */
- if (p_ptr->csp < cost) use_hp = TRUE;
+ if (p_ptr->csp < racial_cost) use_hp = racial_cost - p_ptr->csp;
/* Power is not available yet */
if (p_ptr->lev < min_level)
{
#ifdef JP
-msg_format("¤³¤ÎǽÎϤò»ÈÍѤ¹¤ë¤Ë¤Ï¥ì¥Ù¥ë %d ¤Ë㤷¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£", min_level);
+ msg_format("¤³¤ÎǽÎϤò»ÈÍѤ¹¤ë¤Ë¤Ï¥ì¥Ù¥ë %d ¤Ë㤷¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£", min_level);
#else
msg_format("You need to attain level %d to use this power.", min_level);
#endif
energy_use = 0;
- return FALSE;
+ return 0;
}
/* Too confused */
else if (p_ptr->confused)
{
#ifdef JP
-msg_print("º®Í𤷤Ƥ¤¤Æ¤½¤ÎǽÎϤϻȤ¨¤Ê¤¤¡£");
+ msg_print("º®Í𤷤Ƥ¤¤Æ¤½¤ÎǽÎϤϻȤ¨¤Ê¤¤¡£");
#else
msg_print("You are too confused to use this power.");
#endif
energy_use = 0;
- return FALSE;
+ return 0;
}
/* Risk death? */
- else if (use_hp && (p_ptr->chp < cost))
+ else if (p_ptr->chp < use_hp)
{
#ifdef JP
-if (!get_check("ËÜÅö¤Ëº£¤Î¿ê¼å¤·¤¿¾õÂ֤Ǥ³¤ÎǽÎϤò»È¤¤¤Þ¤¹¤«¡©"))
+ if (!get_check("ËÜÅö¤Ëº£¤Î¿ê¼å¤·¤¿¾õÂ֤Ǥ³¤ÎǽÎϤò»È¤¤¤Þ¤¹¤«¡©"))
#else
if (!get_check("Really use the power in your weakened state? "))
#endif
-
{
energy_use = 0;
- return FALSE;
+ return 0;
}
}
/* take time and pay the price */
energy_use = 100;
- if (cost)
- {
- if (use_hp)
- {
-#ifdef JP
- take_hit(DAMAGE_USELIFE, (cost / 2) + randint(cost / 2),
- "²áÅ٤ν¸Ãæ", -1);
-#else
- take_hit(DAMAGE_USELIFE, (cost / 2) + randint(cost / 2),
- "concentrating too hard", -1);
-#endif
-
- }
- else
- {
- p_ptr->csp -= (cost / 2) + randint(cost / 2);
- }
- }
-
-
- /* Redraw mana and hp */
- p_ptr->redraw |= (PR_HP | PR_MANA);
-
- /* Window stuff */
- p_ptr->window |= (PW_PLAYER | PW_SPELL);
-
/* Success? */
- if (randint(p_ptr->stat_cur[use_stat]) >=
- ((difficulty / 2) + randint(difficulty / 2)))
+ if (randint1(p_ptr->stat_cur[use_stat]) >=
+ ((difficulty / 2) + randint1(difficulty / 2)))
{
- return TRUE;
+ return 1;
}
+ if (flush_failure) flush();
#ifdef JP
-msg_print("½¼Ê¬¤Ë½¸Ãæ¤Ç¤¤Ê¤«¤Ã¤¿¡£");
+ msg_print("½¼Ê¬¤Ë½¸Ãæ¤Ç¤¤Ê¤«¤Ã¤¿¡£");
#else
msg_print("You've failed to concentrate hard enough.");
#endif
- if (flush_failure) flush();
- return FALSE;
+ return -1;
}
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼È¯Æ°»þ¤Ë¸ý¤ò»È¤¦·Ñ³Ū¤Ê±Ó¾§½èÍý¤òÃæÃǤ¹¤ë
+ * @return ¤Ê¤·
+ */
+void ratial_stop_mouth()
+{
+ if (music_singing_any()) stop_singing();
+ if (hex_spelling_any()) stop_hex_spell_all();
+}
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼È¯Æ°½èÍý
+ * @param command ȯư¤¹¤ë¥ì¥¤¥·¥ã¥ë¤ÎID
+ * @return ½èÍý¤ò¼ÂºÝ¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤ÏTRUE¡¢¥¥ã¥ó¥»¥ë¤·¤¿¾ì¹çFALSE¤òÊÖ¤¹¡£
+ */
static bool cmd_racial_power_aux(s32b command)
{
s16b plev = p_ptr->lev;
{
case CLASS_WARRIOR:
{
- if (racial_aux(40, 75, A_DEX, 35))
+ int y = 0, x = 0, i;
+ cave_type *c_ptr;
+
+ for (i = 0; i < 6; i++)
{
- int y = 0, x = 0, i;
- cave_type *c_ptr;
- monster_type *m_ptr;
+ dir = randint0(8);
+ y = py + ddy_ddd[dir];
+ x = px + ddx_ddd[dir];
+ c_ptr = &cave[y][x];
- for (i = 0; i < 6; i++)
+ /* Hack -- attack monsters */
+ if (c_ptr->m_idx)
+ py_attack(y, x, 0);
+ else
{
- dir = rand_int(8);
- y = py + ddy_ddd[dir];
- x = px + ddx_ddd[dir];
- c_ptr = &cave[y][x];
-
- /* Get the monster */
- m_ptr = &m_list[c_ptr->m_idx];
-
- /* Hack -- attack monsters */
- if (c_ptr->m_idx)
- py_attack(y, x, 0);
- else
- {
#ifdef JP
-msg_print("¹¶·â¤¬¶õ¤ò¤¤Ã¤¿¡£");
+ msg_print("¹¶·â¤¬¶õ¤ò¤¤Ã¤¿¡£");
#else
- msg_print("You attack the empty air.");
+ msg_print("You attack the empty air.");
#endif
- }
}
}
break;
}
- case CLASS_MAGE:
case CLASS_HIGH_MAGE:
+ if (p_ptr->realm1 == REALM_HEX)
+ {
+ bool retval = stop_hex_spell();
+ if (retval) energy_use = 10;
+ return (retval);
+ }
+ case CLASS_MAGE:
+ /* case CLASS_HIGH_MAGE: */
case CLASS_SORCERER:
{
- if (racial_aux(25, 1, A_INT, 25))
- {
- if (!eat_magic(p_ptr->lev * 2)) return FALSE;
- }
+ if (!eat_magic(p_ptr->lev * 2)) return FALSE;
break;
}
case CLASS_PRIEST:
{
- if (p_ptr->realm1 == REALM_LIFE)
+ if (is_good_realm(p_ptr->realm1))
{
- if (racial_aux(35, 70, A_WIS, 50))
- {
- if (!bless_weapon()) return FALSE;
- }
+ if (!bless_weapon()) return FALSE;
}
else
{
- if (racial_aux(42, 40, A_WIS, 30))
- {
- (void)dispel_monsters(plev * 4);
- turn_monsters(plev * 4);
- banish_monsters(plev * 4);
- }
+ (void)dispel_monsters(plev * 4);
+ turn_monsters(plev * 4);
+ banish_monsters(plev * 4);
}
break;
}
case CLASS_ROGUE:
{
- if (racial_aux(8, 12, A_DEX, 14))
- {
- int x, y;
+ int x, y;
- if (!get_rep_dir(&dir, FALSE)) return FALSE;
- y = py + ddy[dir];
- x = px + ddx[dir];
- if (cave[y][x].m_idx)
- {
- py_attack(y, x, 0);
- if (rand_int(p_ptr->skill_dis) < 7)
+ if (!get_rep_dir(&dir, FALSE)) return FALSE;
+ y = py + ddy[dir];
+ x = px + ddx[dir];
+ if (cave[y][x].m_idx)
+ {
+ py_attack(y, x, 0);
+ if (randint0(p_ptr->skill_dis) < 7)
#ifdef JP
-msg_print("¤¦¤Þ¤¯Æ¨¤²¤é¤ì¤Ê¤«¤Ã¤¿¡£");
+ msg_print("¤¦¤Þ¤¯Æ¨¤²¤é¤ì¤Ê¤«¤Ã¤¿¡£");
#else
- msg_print("You are failed to run away.");
+ msg_print("You are failed to run away.");
#endif
- else teleport_player(30);
- }
- else
- {
+ else teleport_player(30, 0L);
+ }
+ else
+ {
#ifdef JP
-msg_print("¤½¤ÎÊý¸þ¤Ë¤Ï¥â¥ó¥¹¥¿¡¼¤Ï¤¤¤Þ¤»¤ó¡£");
+ msg_print("¤½¤ÎÊý¸þ¤Ë¤Ï¥â¥ó¥¹¥¿¡¼¤Ï¤¤¤Þ¤»¤ó¡£");
#else
- msg_print("You don't see any monster in this direction");
+ msg_print("You don't see any monster in this direction");
#endif
- msg_print(NULL);
- }
+ msg_print(NULL);
}
break;
}
case CLASS_RANGER:
+ case CLASS_SNIPER:
{
- if (racial_aux(15, 20, A_INT, 12))
- {
#ifdef JP
-msg_print("Ũ¤òÄ´ºº¤·¤¿...");
+ msg_print("Ũ¤òÄ´ºº¤·¤¿...");
#else
- msg_print("You examine your foes...");
+ msg_print("You examine your foes...");
#endif
- probing();
- }
+ probing();
break;
}
case CLASS_PALADIN:
{
- if (p_ptr->realm1 == REALM_LIFE)
- {
- if (racial_aux(30, 30, A_WIS, 20))
- {
- if (!get_aim_dir(&dir)) return FALSE;
- fire_beam(GF_HOLY_FIRE, dir, plev * 3);
- }
- }
- else
- {
- if (racial_aux(30, 30, A_WIS, 20))
- {
- if (!get_aim_dir(&dir)) return FALSE;
- fire_beam(GF_HELL_FIRE, dir, plev * 3);
- }
- }
+ if (!get_aim_dir(&dir)) return FALSE;
+ fire_beam(is_good_realm(p_ptr->realm1) ? GF_HOLY_FIRE : GF_HELL_FIRE,
+ dir, plev * 3);
break;
}
case CLASS_WARRIOR_MAGE:
{
if (command == -3)
{
- if (racial_aux(25, 0, A_INT, 10))
- {
- if (take_hit(DAMAGE_USELIFE, p_ptr->lev,
#ifdef JP
-"£È£Ð¤«¤é£Í£Ð¤Ø¤Î̵ËŤÊÊÑ´¹", -1))
+ int gain_sp = take_hit(DAMAGE_USELIFE, p_ptr->lev, "£È£Ð¤«¤é£Í£Ð¤Ø¤Î̵ËŤÊÊÑ´¹", -1) / 5;
#else
-"thoughtless convertion from HP to SP", -1))
+ int gain_sp = take_hit(DAMAGE_USELIFE, p_ptr->lev, "thoughtless convertion from HP to SP", -1) / 5;
#endif
+ if (gain_sp)
+ {
+ p_ptr->csp += gain_sp;
+ if (p_ptr->csp > p_ptr->msp)
{
- p_ptr->csp += p_ptr->lev / 5;
- if (p_ptr->csp > p_ptr->msp)
- {
- p_ptr->csp = p_ptr->msp;
- p_ptr->csp_frac = 0;
- }
+ p_ptr->csp = p_ptr->msp;
+ p_ptr->csp_frac = 0;
}
- else
+ }
+ else
#ifdef JP
-msg_print("ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¡£");
+ msg_print("ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¡£");
#else
- msg_print("You failed to convert.");
+ msg_print("You failed to convert.");
#endif
- }
}
else if (command == -4)
{
- if (racial_aux(25, 0, A_INT, 10))
+ if (p_ptr->csp >= p_ptr->lev / 5)
{
- if (p_ptr->csp >= p_ptr->lev/5)
- {
- p_ptr->csp -= p_ptr->lev / 5;
- hp_player(p_ptr->lev);
- }
- else
+ p_ptr->csp -= p_ptr->lev / 5;
+ hp_player(p_ptr->lev);
+ }
+ else
#ifdef JP
-msg_print("ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¡£");
+ msg_print("ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¡£");
#else
- msg_print("You failed to convert.");
+ msg_print("You failed to convert.");
#endif
- }
}
+
+ /* Redraw mana and hp */
+ p_ptr->redraw |= (PR_HP | PR_MANA);
+
break;
}
case CLASS_CHAOS_WARRIOR:
{
- if (racial_aux(40, 50, A_INT, 25))
- {
#ifdef JP
-msg_print("ÊÕ¤ê¤òâˤó¤À...");
+ msg_print("ÊÕ¤ê¤òâˤó¤À...");
#else
- msg_print("You glare nearby monsters...");
+ msg_print("You glare nearby monsters...");
#endif
- slow_monsters();
- stun_monsters(p_ptr->lev * 4);
- confuse_monsters(p_ptr->lev * 4);
- turn_monsters(p_ptr->lev * 4);
- stasis_monsters(p_ptr->lev * 4);
- }
+ slow_monsters(p_ptr->lev);
+ stun_monsters(p_ptr->lev * 4);
+ confuse_monsters(p_ptr->lev * 4);
+ turn_monsters(p_ptr->lev * 4);
+ stasis_monsters(p_ptr->lev * 4);
break;
}
case CLASS_MONK:
{
- if (command == -3)
+ if (!(empty_hands(TRUE) & EMPTY_HAND_RARM))
{
- if (empty_hands(TRUE) < 2)
- {
#ifdef JP
-msg_print("ÁǼꤸ¤ã¤Ê¤¤¤È¤Ç¤¤Þ¤»¤ó¡£");
+ msg_print("ÁǼꤸ¤ã¤Ê¤¤¤È¤Ç¤¤Þ¤»¤ó¡£");
#else
- msg_print("You need to be bare hands.");
+ msg_print("You need to be bare hand.");
#endif
- return FALSE;
- }
- if (racial_aux(25, 0, A_DEX, 0))
- {
- if (choose_kamae()) energy_use = 100;
- else energy_use = 0;
- p_ptr->update |= (PU_BONUS);
- p_ptr->redraw |= (PR_ARMOR);
- }
+ return FALSE;
}
- if (command == -4)
+ if (p_ptr->riding)
{
- if (empty_hands(TRUE) < 2)
- {
#ifdef JP
-msg_print("ÁǼꤸ¤ã¤Ê¤¤¤È¤Ç¤¤Þ¤»¤ó¡£");
+ msg_print("¾èÇÏÃæ¤Ï¤Ç¤¤Þ¤»¤ó¡£");
#else
- msg_print("You need to be bare hand.");
+ msg_print("You need to get off a pet.");
#endif
- return FALSE;
- }
- if (racial_aux(30, 30, A_STR, 20))
- {
- int x, y;
+ return FALSE;
+ }
- if (!get_rep_dir(&dir, FALSE)) return FALSE;
- y = py + ddy[dir];
- x = px + ddx[dir];
- if (cave[y][x].m_idx)
- {
- if (one_in_(2))
-#ifdef JP
-msg_print("¤¢¡¼¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¡ª¡ª¡ª");
-#else
-msg_print("Ahhhtatatatatatatatatatatatatatataatatatatattaaaaa!!!!");
-#endif
- else
+ if (command == -3)
+ {
+ if (!choose_kamae()) return FALSE;
+ p_ptr->update |= (PU_BONUS);
+ }
+ else if (command == -4)
+ {
+ int x, y;
+
+ if (!get_rep_dir(&dir, FALSE)) return FALSE;
+ y = py + ddy[dir];
+ x = px + ddx[dir];
+ if (cave[y][x].m_idx)
+ {
#ifdef JP
-msg_print("¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¡ª¡ª¡ª");
+ if (one_in_(2)) msg_print("¤¢¡¼¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¤¿¡ª¡ª¡ª");
+ else msg_print("¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¥ª¥é¡ª¡ª¡ª");
#else
-msg_print("Oraoraoraoraoraoraoraoraoraoraoraoraoraoraoraoraora!!!!");
+ if (one_in_(2)) msg_print("Ahhhtatatatatatatatatatatatatatataatatatatattaaaaa!!!!");
+ else msg_print("Oraoraoraoraoraoraoraoraoraoraoraoraoraoraoraoraora!!!!");
#endif
+
+ py_attack(y, x, 0);
+ if (cave[y][x].m_idx)
+ {
+ handle_stuff();
py_attack(y, x, 0);
- if (cave[y][x].m_idx)
- {
- handle_stuff();
- py_attack(y, x, 0);
- }
- p_ptr->energy -= 100;
}
- else
- {
+ p_ptr->energy_need += ENERGY_NEED();
+ }
+ else
+ {
#ifdef JP
-msg_print("¤½¤ÎÊý¸þ¤Ë¤Ï¥â¥ó¥¹¥¿¡¼¤Ï¤¤¤Þ¤»¤ó¡£");
+ msg_print("¤½¤ÎÊý¸þ¤Ë¤Ï¥â¥ó¥¹¥¿¡¼¤Ï¤¤¤Þ¤»¤ó¡£");
#else
- msg_print("You don't see any monster in this direction");
+ msg_print("You don't see any monster in this direction");
#endif
- msg_print(NULL);
- }
+ msg_print(NULL);
}
}
break;
if (total_friends)
{
#ifdef JP
-msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
+ msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
#else
msg_print("You need concentration on the pets now.");
#endif
return FALSE;
}
- if (racial_aux(15, 0, A_WIS, 10))
- {
#ifdef JP
-msg_print("¾¯¤·Æ¬¤¬¥Ï¥Ã¥¥ê¤·¤¿¡£");
+ msg_print("¾¯¤·Æ¬¤¬¥Ï¥Ã¥¥ê¤·¤¿¡£");
#else
- msg_print("You feel your head clear a little.");
+ msg_print("You feel your head clear a little.");
#endif
- p_ptr->csp += (3 + p_ptr->lev/20);
- if (p_ptr->csp >= p_ptr->msp)
- {
- p_ptr->csp = p_ptr->msp;
- p_ptr->csp_frac = 0;
- }
+ p_ptr->csp += (3 + p_ptr->lev/20);
+ if (p_ptr->csp >= p_ptr->msp)
+ {
+ p_ptr->csp = p_ptr->msp;
+ p_ptr->csp_frac = 0;
}
+
+ /* Redraw mana */
+ p_ptr->redraw |= (PR_MANA);
break;
}
case CLASS_TOURIST:
{
if (command == -3)
{
- if (racial_aux(1, 0, A_DEX, 0))
- {
- if (!get_aim_dir(&dir)) return FALSE;
- project_length = 1;
- fire_beam(GF_PHOTO, dir, 1);
- }
+ if (!get_aim_dir(&dir)) return FALSE;
+ project_length = 1;
+ fire_beam(GF_PHOTO, dir, 1);
}
else if (command == -4)
{
- if (racial_aux(25, 20, A_INT, 20))
- {
- if (!identify_fully(FALSE)) return FALSE;
- }
+ if (!identify_fully(FALSE)) return FALSE;
}
break;
}
case CLASS_IMITATOR:
{
- if (racial_aux(30, 100, A_DEX, 30))
- {
- handle_stuff();
- if (!do_cmd_mane(TRUE)) return FALSE;
- }
+ handle_stuff();
+ if (!do_cmd_mane(TRUE)) return FALSE;
break;
}
case CLASS_BEASTMASTER:
{
if (command == -3)
{
- if (racial_aux(1, (p_ptr->lev+3) / 4, A_CHR, 10))
- {
- if (!get_aim_dir(&dir)) return FALSE;
- (void)fire_ball_hide(GF_CONTROL_LIVING, dir, p_ptr->lev, 0);
- }
- break;
+ if (!get_aim_dir(&dir)) return FALSE;
+ (void)fire_ball_hide(GF_CONTROL_LIVING, dir, p_ptr->lev, 0);
}
else if (command == -4)
{
- if (racial_aux(30, (p_ptr->lev+20) / 2, A_CHR, 10))
- {
- project_hack(GF_CONTROL_LIVING, p_ptr->lev);
- }
- break;
+ project_hack(GF_CONTROL_LIVING, p_ptr->lev);
}
+ break;
}
case CLASS_ARCHER:
{
- if (racial_aux(1, 0, A_DEX, 0))
- {
- if (!do_cmd_archer()) return FALSE;
- }
+ if (!do_cmd_archer()) return FALSE;
break;
}
case CLASS_MAGIC_EATER:
{
- if (racial_aux(1, 0, A_INT, 0))
- {
+ if (command == -3) {
if (!gain_magic()) return FALSE;
+ } else if (command == -4) {
+ if (!can_do_cmd_cast()) return FALSE;
+ if (!do_cmd_magic_eater(FALSE, TRUE)) return FALSE;
}
break;
}
case CLASS_BARD:
{
- if (racial_aux(1, 0, A_CHR, 0))
- {
- stop_singing();
- energy_use = 10;
- return FALSE;
- }
+ /* Singing is already stopped */
+ if (!p_ptr->magic_num1[0] && !p_ptr->magic_num1[1]) return FALSE;
+
+ stop_singing();
+ energy_use = 10;
break;
}
case CLASS_RED_MAGE:
{
- if (racial_aux(48, 60, A_INT, 25))
- {
- handle_stuff();
+ if (!can_do_cmd_cast()) return FALSE;
+ handle_stuff();
+ do_cmd_cast();
+ handle_stuff();
+ if (!p_ptr->paralyzed && can_do_cmd_cast())
do_cmd_cast();
- handle_stuff();
- if (!p_ptr->paralyzed)
- do_cmd_cast();
- }
break;
}
case CLASS_SAMURAI:
{
- if (total_friends)
+ if (command == -3)
{
+ int max_csp = MAX(p_ptr->msp*4, p_ptr->lev*5+5);
+
+ if (total_friends)
+ {
#ifdef JP
-msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
+ msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
#else
-msg_print("You need concentration on the pets now.");
+ msg_print("You need concentration on the pets now.");
#endif
- return FALSE;
- }
- if (command == -3)
- {
+ return FALSE;
+ }
if (p_ptr->special_defense & KATA_MASK)
{
#ifdef JP
-msg_print("º£¤Ï¹½¤¨¤Ë½¸Ã椷¤Æ¤¤¤ë¡£");
+ msg_print("º£¤Ï¹½¤¨¤Ë½¸Ã椷¤Æ¤¤¤ë¡£");
#else
msg_print("You need concentration on your form.");
#endif
return FALSE;
}
- if (racial_aux(1, 0, A_WIS, 0))
- {
- int max_csp = MAX(p_ptr->msp*4, p_ptr->lev*5+5);
#ifdef JP
-msg_print("Àº¿À¤ò½¸Ã椷¤Æµ¤¹ç¤¤¤òί¤á¤¿¡£");
+ msg_print("Àº¿À¤ò½¸Ã椷¤Æµ¤¹ç¤¤¤òί¤á¤¿¡£");
#else
- msg_print("You concentrate to charge your power.");
+ msg_print("You concentrate to charge your power.");
#endif
- p_ptr->csp += p_ptr->msp / 2;
- if (p_ptr->csp >= max_csp)
- {
- p_ptr->csp = max_csp;
- p_ptr->csp_frac = 0;
- }
+ p_ptr->csp += p_ptr->msp / 2;
+ if (p_ptr->csp >= max_csp)
+ {
+ p_ptr->csp = max_csp;
+ p_ptr->csp_frac = 0;
}
+
+ /* Redraw mana */
+ p_ptr->redraw |= (PR_MANA);
}
- if (command == -4)
+ else if (command == -4)
{
- if (!buki_motteruka(INVEN_RARM))
+ if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
{
#ifdef JP
-msg_print("Éð´ï¤ò»ý¤¿¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¡£");
+ msg_print("Éð´ï¤ò»ý¤¿¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¡£");
#else
msg_print("You need to wield a weapon.");
#endif
return FALSE;
}
- if (racial_aux(25, 0, A_DEX, 0))
- {
- if (choose_kata()) energy_use = 100;
- else energy_use = 0;
- p_ptr->update |= (PU_BONUS);
- p_ptr->redraw |= (PR_ARMOR);
- }
+ if (!choose_kata()) return FALSE;
+ p_ptr->update |= (PU_BONUS);
}
break;
}
case CLASS_BLUE_MAGE:
{
- if (racial_aux(1, 0, A_INT, 0))
+ if (p_ptr->action == ACTION_LEARN)
+ {
+ set_action(ACTION_NONE);
+ }
+ else
{
- if (p_ptr->action == ACTION_LEARN)
- {
- set_action(ACTION_NONE);
- }
- else
- {
- set_action(ACTION_LEARN);
- }
- energy_use = 0;
+ set_action(ACTION_LEARN);
}
+ energy_use = 0;
break;
}
case CLASS_CAVALRY:
{
- if (racial_aux(10, 0, A_STR, 10))
- {
- char m_name[80];
- monster_type *m_ptr;
- monster_race *r_ptr;
- int rlev;
+ char m_name[80];
+ monster_type *m_ptr;
+ monster_race *r_ptr;
+ int rlev;
- if (p_ptr->riding)
- {
+ if (p_ptr->riding)
+ {
#ifdef JP
- msg_print("º£¤Ï¾èÇÏÃæ¤À¡£");
+ msg_print("º£¤Ï¾èÇÏÃæ¤À¡£");
#else
- msg_print("You ARE riding.");
+ msg_print("You ARE riding.");
#endif
- return FALSE;
- }
- if (!do_riding(TRUE)) return TRUE;
- m_ptr = &m_list[p_ptr->riding];
- r_ptr = &r_info[m_ptr->r_idx];
- monster_desc(m_name, m_ptr, 0);
+ return FALSE;
+ }
+ if (!do_riding(TRUE)) return TRUE;
+ m_ptr = &m_list[p_ptr->riding];
+ r_ptr = &r_info[m_ptr->r_idx];
+ monster_desc(m_name, m_ptr, 0);
#ifdef JP
- msg_format("%s¤Ë¾è¤Ã¤¿¡£",m_name);
+ msg_format("%s¤Ë¾è¤Ã¤¿¡£",m_name);
#else
- msg_format("You ride on %s.",m_name);
+ msg_format("You ride on %s.",m_name);
#endif
- if (is_pet(m_ptr)) break;
- rlev = r_ptr->level;
- if (r_ptr->flags1 & RF1_UNIQUE) rlev = rlev * 3 / 2;
- if (rlev > 60) rlev = 60+(rlev-60)/2;
- if ((randint(skill_exp[GINOU_RIDING]/120+p_ptr->lev*2/3) > rlev) && one_in_(2) && !p_ptr->inside_arena && !p_ptr->inside_battle && !(r_ptr->flags7 & (RF7_GUARDIAN)) && !(r_ptr->flags1 & (RF1_QUESTOR)) && (rlev < p_ptr->lev*3/2+rand_int(p_ptr->lev/5)))
- {
+ if (is_pet(m_ptr)) break;
+ rlev = r_ptr->level;
+ if (r_ptr->flags1 & RF1_UNIQUE) rlev = rlev * 3 / 2;
+ if (rlev > 60) rlev = 60+(rlev-60)/2;
+ if ((randint1(p_ptr->skill_exp[GINOU_RIDING] / 120 + p_ptr->lev * 2 / 3) > rlev)
+ && one_in_(2) && !p_ptr->inside_arena && !p_ptr->inside_battle
+ && !(r_ptr->flags7 & (RF7_GUARDIAN)) && !(r_ptr->flags1 & (RF1_QUESTOR))
+ && (rlev < p_ptr->lev * 3 / 2 + randint0(p_ptr->lev / 5)))
+ {
#ifdef JP
- msg_format("%s¤ò¼ê¤Ê¤º¤±¤¿¡£",m_name);
+ msg_format("%s¤ò¼ê¤Ê¤º¤±¤¿¡£",m_name);
#else
- msg_format("You tame %s.",m_name);
+ msg_format("You tame %s.",m_name);
#endif
- set_pet(m_ptr);
- }
- else
- {
+ set_pet(m_ptr);
+ }
+ else
+ {
#ifdef JP
- msg_format("%s¤Ë¿¶¤êÍî¤È¤µ¤ì¤¿¡ª",m_name);
+ msg_format("%s¤Ë¿¶¤êÍî¤È¤µ¤ì¤¿¡ª",m_name);
#else
- msg_format("You have thrown off by %s.",m_name);
+ msg_format("You have thrown off by %s.",m_name);
#endif
- rakuba(1,TRUE);
- }
+ rakuba(1,TRUE);
+
+ /* Paranoia */
+ /* ÍîÇϽèÍý¤Ë¼ºÇÔ¤·¤Æ¤â¤È¤Ë¤«¤¯¾èÇϲò½ü */
+ p_ptr->riding = 0;
}
break;
}
case CLASS_BERSERKER:
{
- if (command == -3)
- {
- if (racial_aux(5, 5, A_DEX, 10))
- {
- (void)set_food(PY_FOOD_MAX - 1);
- }
- }
- else if (command == -4)
- {
- if (racial_aux(10, 10, A_DEX, 20))
- {
- if (!word_of_recall()) return FALSE;
- }
- }
+ if (!word_of_recall()) return FALSE;
break;
}
case CLASS_SMITH:
{
- if (racial_aux(5, 15, A_INT, 20))
+ if (p_ptr->lev > 29)
{
- if (p_ptr->lev > 29)
- {
- if (!identify_fully(TRUE)) return FALSE;
- }
- else
- {
- if (!ident_spell(TRUE)) return FALSE;
- }
+ if (!identify_fully(TRUE)) return FALSE;
+ }
+ else
+ {
+ if (!ident_spell(TRUE)) return FALSE;
}
break;
}
{
if (command == -3)
{
- if (racial_aux(1, 0, A_INT, 0)){
- int x,y;
- for( x=0 ; x < cur_wid ;x++){
- for( y=0 ; y < cur_hgt ;y++){
- if( cave[y][x].feat == FEAT_MIRROR){
- cave_set_feat( y , x , FEAT_FLOOR );
- project(0,2,y,x, p_ptr->lev /2 +5 ,GF_SHARDS,(PROJECT_GRID|PROJECT_ITEM|PROJECT_KILL|PROJECT_JUMP|PROJECT_NO_REF|PROJECT_NO_HANGEKI),-1);
- }
- }
- }
- }
+ /* Explode all mirrors */
+ remove_all_mirrors(TRUE);
}
else if (command == -4)
{
- if (total_friends)
- {
+ if (total_friends)
+ {
#ifdef JP
-msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
+ msg_print("º£¤Ï¥Ú¥Ã¥È¤òÁà¤ë¤³¤È¤Ë½¸Ã椷¤Æ¤¤¤Ê¤¤¤È¡£");
#else
- msg_print("You need concentration on the pets now.");
+ msg_print("You need concentration on the pets now.");
#endif
- return FALSE;
- }
- if (racial_aux(30, 0, A_INT, 20)){
- if( cave[py][px].feat == FEAT_MIRROR)
+ return FALSE;
+ }
+ if (is_mirror_grid(&cave[py][px]))
{
#ifdef JP
-msg_print("¾¯¤·Æ¬¤¬¥Ï¥Ã¥¥ê¤·¤¿¡£");
+ msg_print("¾¯¤·Æ¬¤¬¥Ï¥Ã¥¥ê¤·¤¿¡£");
#else
msg_print("You feel your head clear a little.");
#endif
- p_ptr->csp += ( 5 + (p_ptr->lev)*(p_ptr->lev)/100);
+ p_ptr->csp += (5 + p_ptr->lev * p_ptr->lev / 100);
if (p_ptr->csp >= p_ptr->msp)
{
p_ptr->csp = p_ptr->msp;
p_ptr->csp_frac = 0;
}
+
+ /* Redraw mana */
+ p_ptr->redraw |= (PR_MANA);
}
- else {
+ else
+ {
#ifdef JP
-msg_print("¶À¤Î¾å¤Ç¤Ê¤¤¤È½¸Ãæ¤Ç¤¤Ê¤¤¡ª");
+ msg_print("¶À¤Î¾å¤Ç¤Ê¤¤¤È½¸Ãæ¤Ç¤¤Ê¤¤¡ª");
#else
msg_print("Here are not any mirrors!");
#endif
-
}
- }
}
break;
}
case CLASS_NINJA:
{
- if (command == -3)
+ if (p_ptr->action == ACTION_HAYAGAKE)
+ {
+ set_action(ACTION_NONE);
+ }
+ else
{
- if (racial_aux(20, 0, A_DEX, 0))
+ cave_type *c_ptr = &cave[py][px];
+ feature_type *f_ptr = &f_info[c_ptr->feat];
+
+ if (!have_flag(f_ptr->flags, FF_PROJECT) ||
+ (!p_ptr->levitation && have_flag(f_ptr->flags, FF_DEEP)))
{
- if (p_ptr->action == ACTION_HAYAGAKE) set_action(ACTION_NONE);
- else set_action(ACTION_HAYAGAKE);
- energy_use = 0;
+#ifdef JP
+ msg_print("¤³¤³¤Ç¤ÏÁÇÁ᤯ư¤±¤Ê¤¤¡£");
+#else
+ msg_print("You cannot run in here.");
+#endif
+ }
+ else
+ {
+ set_action(ACTION_HAYAGAKE);
}
}
+
+
+ energy_use = 0;
break;
}
+
}
}
else if (p_ptr->mimic_form)
{
case MIMIC_DEMON:
case MIMIC_DEMON_LORD:
- if (racial_aux(15, 10+p_ptr->lev/3, A_CON, 20))
- {
- int type = (one_in_(2) ? GF_NETHER : GF_FIRE);
- if (!get_aim_dir(&dir)) break;
+ {
+ int type = (one_in_(2) ? GF_NETHER : GF_FIRE);
+ if (!get_aim_dir(&dir)) return FALSE;
+ ratial_stop_mouth();
#ifdef JP
-msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
+ msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
#else
- msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
+ msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
- fire_ball(type, dir, plev * 3,
- -(plev / 15) - 1);
- }
+ fire_ball(type, dir, plev * 3, -(plev / 15) - 1);
break;
+ }
case MIMIC_VAMPIRE:
- if (racial_aux(2, (1 + (plev / 3)), A_CON, 9))
+ if (d_info[dungeon_type].flags1 & DF1_NO_MELEE)
+ {
+#ifdef JP
+ msg_print("¤Ê¤¼¤«¹¶·â¤¹¤ë¤³¤È¤¬¤Ç¤¤Ê¤¤¡£");
+#else
+ msg_print("Something prevent you from attacking.");
+#endif
+ return FALSE;
+ }
+ else
{
int y, x, dummy = 0;
cave_type *c_ptr;
/* Only works on adjacent monsters */
- if (!get_rep_dir(&dir,FALSE)) break; /* was get_aim_dir */
+ if (!get_rep_dir(&dir, FALSE)) return FALSE; /* was get_aim_dir */
y = py + ddy[dir];
x = px + ddx[dir];
c_ptr = &cave[y][x];
+ ratial_stop_mouth();
+
if (!c_ptr->m_idx)
{
#ifdef JP
-msg_print("²¿¤â¤Ê¤¤¾ì½ê¤Ë³ú¤ß¤Ä¤¤¤¿¡ª");
+ msg_print("²¿¤â¤Ê¤¤¾ì½ê¤Ë³ú¤ß¤Ä¤¤¤¿¡ª");
#else
msg_print("You bite into thin air!");
#endif
}
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¥Ë¥ä¥ê¤È¤·¤Æ²ç¤ò¤à¤¤¤¿...");
+ msg_print("¤¢¤Ê¤¿¤Ï¥Ë¥ä¥ê¤È¤·¤Æ²ç¤ò¤à¤¤¤¿...");
#else
msg_print("You grin and bare your fangs...");
#endif
- dummy = plev + randint(plev) * MAX(1, plev / 10); /* Dmg */
+ dummy = plev + randint1(plev) * MAX(1, plev / 10); /* Dmg */
if (drain_life(dir, dummy))
{
if (p_ptr->food < PY_FOOD_FULL)
(void)hp_player(dummy);
else
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¶õÊ¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï¶õÊ¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£");
#else
msg_print("You were not hungry.");
#endif
- /* Gain nutritional sustenance: 150/hp drained */
- /* A Food ration gives 5000 food points (by contrast) */
- /* Don't ever get more than "Full" this way */
- /* But if we ARE Gorged, it won't cure us */
- dummy = p_ptr->food + MIN(5000, 100 * dummy);
+ /* Gain nutritional sustenance: 150/hp drained */
+ /* A Food ration gives 5000 food points (by contrast) */
+ /* Don't ever get more than "Full" this way */
+ /* But if we ARE Gorged, it won't cure us */
+ dummy = p_ptr->food + MIN(5000, 100 * dummy);
if (p_ptr->food < PY_FOOD_MAX) /* Not gorged already */
(void)set_food(dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy);
}
else
#ifdef JP
-msg_print("¤²¤§¡£¤Ò¤É¤¤Ì£¤À¡£");
+ msg_print("¤²¤§¡£¤Ò¤É¤¤Ì£¤À¡£");
#else
msg_print("Yechh. That tastes foul.");
#endif
}
break;
}
-
}
else
switch (p_ptr->prace)
{
case RACE_DWARF:
- if (racial_aux(5, 5, A_WIS, 12))
- {
#ifdef JP
-msg_print("¼þ°Ï¤òÄ´¤Ù¤¿¡£");
+ msg_print("¼þ°Ï¤òÄ´¤Ù¤¿¡£");
#else
- msg_print("You examine your surroundings.");
+ msg_print("You examine your surroundings.");
#endif
- (void)detect_traps(DETECT_RAD_DEFAULT);
- (void)detect_doors(DETECT_RAD_DEFAULT);
- (void)detect_stairs(DETECT_RAD_DEFAULT);
- }
+ (void)detect_traps(DETECT_RAD_DEFAULT, TRUE);
+ (void)detect_doors(DETECT_RAD_DEFAULT);
+ (void)detect_stairs(DETECT_RAD_DEFAULT);
break;
case RACE_HOBBIT:
- if (racial_aux(15, 10, A_INT, 10))
{
object_type *q_ptr;
object_type forge;
q_ptr = &forge;
/* Create the food ration */
- object_prep(q_ptr, 21);
-
-#ifdef USE_SCRIPT
- q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
+ object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
/* Drop the object from heaven */
(void)drop_near(q_ptr, -1, py, px);
#ifdef JP
-msg_print("¿©»ö¤òÎÁÍý¤·¤Æºî¤Ã¤¿¡£");
+ msg_print("¿©»ö¤òÎÁÍý¤·¤Æºî¤Ã¤¿¡£");
#else
msg_print("You cook some food.");
#endif
break;
case RACE_GNOME:
- if (racial_aux(5, 5, A_INT, 12))
- {
#ifdef JP
-msg_print("¥Ñ¥Ã¡ª");
+ msg_print("¥Ñ¥Ã¡ª");
#else
- msg_print("Blink!");
+ msg_print("Blink!");
#endif
- teleport_player(10);
- }
+ teleport_player(10, 0L);
break;
case RACE_HALF_ORC:
- if (racial_aux(3, 5, A_WIS,
- ((p_ptr->pclass == CLASS_WARRIOR || p_ptr->pclass == CLASS_BERSERKER) ? 5 : 10)))
- {
#ifdef JP
-msg_print("ͦµ¤¤ò½Ð¤·¤¿¡£");
+ msg_print("ͦµ¤¤ò½Ð¤·¤¿¡£");
#else
- msg_print("You play tough.");
+ msg_print("You play tough.");
#endif
- (void)set_afraid(0);
- }
+ (void)set_afraid(0);
break;
case RACE_HALF_TROLL:
- if (racial_aux(10, 12, A_STR,
- ((p_ptr->pclass == CLASS_WARRIOR || p_ptr->pclass == CLASS_BERSERKER) ? 6 : 12)))
- {
#ifdef JP
-msg_print("¤¦¤¬¤¡¤¡¡ª");
+ msg_print("¤¦¤¬¤¡¤¡¡ª");
#else
- msg_print("RAAAGH!");
+ msg_print("RAAAGH!");
#endif
- (void)set_afraid(0);
-
- (void)set_shero(10 + randint(plev), FALSE);
- (void)hp_player(30);
- }
+ (void)set_afraid(0);
+ (void)set_shero(10 + randint1(plev), FALSE);
+ (void)hp_player(30);
break;
case RACE_AMBERITE:
- if (command == -2)
+ if (command == -1)
{
- if (racial_aux(40, 75, A_WIS, 50))
- {
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¡Ö¥Ñ¥¿¡¼¥ó¡×¤ò¿´¤ËÉÁ¤¤¤Æ¤½¤Î¾å¤òÊ⤤¤¿...");
+ msg_print("¤¢¤Ê¤¿¤ÏÊ⤼þ¤ê»Ï¤á¤¿¡£");
#else
- msg_print("You picture the Pattern in your mind and walk it...");
+ msg_print("You start walking around. ");
#endif
-
- (void)set_poisoned(0);
- (void)set_image(0);
- (void)set_stun(0);
- (void)set_cut(0);
- (void)set_blind(0);
- (void)set_afraid(0);
- (void)do_res_stat(A_STR);
- (void)do_res_stat(A_INT);
- (void)do_res_stat(A_WIS);
- (void)do_res_stat(A_DEX);
- (void)do_res_stat(A_CON);
- (void)do_res_stat(A_CHR);
- (void)restore_level();
- }
+ alter_reality();
}
-
- else if (command == -1)
+ else if (command == -2)
{
- if (racial_aux(30, 50, A_INT, 50))
- {
- /* No effect in arena or quest */
- if (p_ptr->inside_arena || p_ptr->inside_quest)
- {
-#ifdef JP
-msg_print("¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£");
-#else
- msg_print("There is no effect.");
-#endif
-
- }
- else
- {
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤ÏÊ⤼þ¤ê»Ï¤á¤¿¡£¼þ°Ï¤¬ÊѲ½¤·¤Æ¤¤¤ë¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï¡Ö¥Ñ¥¿¡¼¥ó¡×¤ò¿´¤ËÉÁ¤¤¤Æ¤½¤Î¾å¤òÊ⤤¤¿...");
#else
- msg_print("You start walking around. Your surroundings change.");
+ msg_print("You picture the Pattern in your mind and walk it...");
#endif
-
- if (autosave_l) do_cmd_save_game(TRUE);
-
- /* Leaving */
- p_ptr->leaving = TRUE;
- }
- }
+ (void)set_poisoned(0);
+ (void)set_image(0);
+ (void)set_stun(0);
+ (void)set_cut(0);
+ (void)set_blind(0);
+ (void)set_afraid(0);
+ (void)do_res_stat(A_STR);
+ (void)do_res_stat(A_INT);
+ (void)do_res_stat(A_WIS);
+ (void)do_res_stat(A_DEX);
+ (void)do_res_stat(A_CON);
+ (void)do_res_stat(A_CHR);
+ (void)restore_level();
}
break;
case RACE_BARBARIAN:
- if (racial_aux(8, 10, A_STR, ((p_ptr->pclass == CLASS_WARRIOR || p_ptr->pclass == CLASS_BERSERKER) ? 6 : 12)))
- {
#ifdef JP
-msg_print("¤¦¤©¤©¤ª¤ª¡ª");
+ msg_print("¤¦¤©¤©¤ª¤ª¡ª");
#else
- msg_print("Raaagh!");
+ msg_print("Raaagh!");
#endif
- (void)set_afraid(0);
-
- (void)set_shero(10 + randint(plev), FALSE);
- (void)hp_player(30);
- }
+ (void)set_afraid(0);
+ (void)set_shero(10 + randint1(plev), FALSE);
+ (void)hp_player(30);
break;
case RACE_HALF_OGRE:
- if (racial_aux(25, 35, A_INT, 15))
- {
#ifdef JP
-msg_print("Çúȯ¤Î¥ë¡¼¥ó¤ò¿µ½Å¤Ë»Å³Ý¤±¤¿...");
+ msg_print("Çúȯ¤Î¥ë¡¼¥ó¤ò¿µ½Å¤Ë»Å³Ý¤±¤¿...");
#else
- msg_print("You carefully set an explosive rune...");
+ msg_print("You carefully set an explosive rune...");
#endif
- explosive_rune();
- }
+ explosive_rune();
break;
case RACE_HALF_GIANT:
- if (racial_aux(20, 10, A_STR, 12))
- {
- if (!get_aim_dir(&dir)) break;
-#ifdef JP
-msg_print("ÀФÎÊɤòᤤĤ±¤¿¡£");
-#else
- msg_print("You bash at a stone wall.");
-#endif
-
- (void)wall_to_mud(dir);
- }
+ if (!get_aim_dir(&dir)) return FALSE;
+ (void)wall_to_mud(dir, 20 + randint1(30));
break;
case RACE_HALF_TITAN:
- if (racial_aux(15, 10, A_INT, 12))
- {
#ifdef JP
-msg_print("Ũ¤òÄ´ºº¤·¤¿...");
+ msg_print("Ũ¤òÄ´ºº¤·¤¿...");
#else
- msg_print("You examine your foes...");
+ msg_print("You examine your foes...");
#endif
- probing();
- }
+ probing();
break;
case RACE_CYCLOPS:
- if (racial_aux(20, 15, A_STR, 12))
- {
- if (!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
-msg_print("µðÂç¤Ê´ä¤òÅꤲ¤¿¡£");
+ msg_print("µðÂç¤Ê´ä¤òÅꤲ¤¿¡£");
#else
- msg_print("You throw a huge boulder.");
+ msg_print("You throw a huge boulder.");
#endif
- fire_bolt(GF_MISSILE, dir, (3 * plev) / 2);
- }
+ fire_bolt(GF_MISSILE, dir, (3 * plev) / 2);
break;
case RACE_YEEK:
- if (racial_aux(15, 15, A_WIS, 10))
- {
- if (!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
+ ratial_stop_mouth();
#ifdef JP
-msg_print("¿È¤ÎÌÓ¤â¤è¤À¤Ä¶«¤ÓÀ¼¤ò¾å¤²¤¿¡ª");
+ msg_print("¿È¤ÎÌÓ¤â¤è¤À¤Ä¶«¤ÓÀ¼¤ò¾å¤²¤¿¡ª");
#else
- msg_print("You make a horrible scream!");
+ msg_print("You make a horrible scream!");
#endif
- (void)fear_monster(dir, plev);
- }
+ (void)fear_monster(dir, plev);
break;
case RACE_KLACKON:
- if (racial_aux(9, 9, A_DEX, 14))
- {
- if (!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
+ ratial_stop_mouth();
#ifdef JP
-msg_print("»À¤òÅǤ¤¤¿¡£");
+ msg_print("»À¤òÅǤ¤¤¿¡£");
#else
- msg_print("You spit acid.");
+ msg_print("You spit acid.");
#endif
- if (plev < 25)
- fire_bolt(GF_ACID, dir, plev);
- else
- fire_ball(GF_ACID, dir, plev, 2);
- }
+ if (plev < 25) fire_bolt(GF_ACID, dir, plev);
+ else fire_ball(GF_ACID, dir, plev, 2);
break;
case RACE_KOBOLD:
- if (racial_aux(12, 8, A_DEX, 14))
- {
- if(!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
-msg_print("ÆǤΥÀ¡¼¥Ä¤òÅꤲ¤¿¡£");
+ msg_print("ÆǤΥÀ¡¼¥Ä¤òÅꤲ¤¿¡£");
#else
- msg_print("You throw a dart of poison.");
+ msg_print("You throw a dart of poison.");
#endif
- fire_bolt(GF_POIS, dir, plev);
- }
+ fire_bolt(GF_POIS, dir, plev);
break;
case RACE_NIBELUNG:
- if (racial_aux(10, 5, A_WIS, 10))
- {
#ifdef JP
-msg_print("¼þ°Ï¤òÄ´ºº¤·¤¿¡£");
+ msg_print("¼þ°Ï¤òÄ´ºº¤·¤¿¡£");
#else
- msg_print("You examine your surroundings.");
+ msg_print("You examine your surroundings.");
#endif
- (void)detect_traps(DETECT_RAD_DEFAULT);
- (void)detect_doors(DETECT_RAD_DEFAULT);
- (void)detect_stairs(DETECT_RAD_DEFAULT);
- }
+ (void)detect_traps(DETECT_RAD_DEFAULT, TRUE);
+ (void)detect_doors(DETECT_RAD_DEFAULT);
+ (void)detect_stairs(DETECT_RAD_DEFAULT);
break;
case RACE_DARK_ELF:
- if (racial_aux(2, 2, A_INT, 9))
- {
- if (!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
-msg_print("¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤òÊü¤Ã¤¿¡£");
+ msg_print("¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë¤òÊü¤Ã¤¿¡£");
#else
- msg_print("You cast a magic missile.");
+ msg_print("You cast a magic missile.");
#endif
- fire_bolt_or_beam(10, GF_MISSILE, dir,
- damroll(3 + ((plev - 1) / 5), 4));
- }
+ fire_bolt_or_beam(10, GF_MISSILE, dir,
+ damroll(3 + ((plev - 1) / 5), 4));
break;
case RACE_DRACONIAN:
- if (racial_aux(1, plev, A_CON, 12))
{
- int Type = ((randint(3) == 1) ? GF_COLD : GF_FIRE);
+ int Type = (one_in_(3) ? GF_COLD : GF_FIRE);
#ifdef JP
-cptr Type_desc = ((Type == GF_COLD) ? "Î䵤" : "±ê");
+ cptr Type_desc = ((Type == GF_COLD) ? "Î䵤" : "±ê");
#else
cptr Type_desc = ((Type == GF_COLD) ? "cold" : "fire");
#endif
+ if (!get_aim_dir(&dir)) return FALSE;
- if (randint(100) < plev)
+ if (randint1(100) < plev)
{
switch (p_ptr->pclass)
{
case CLASS_IMITATOR:
case CLASS_ARCHER:
case CLASS_SMITH:
- if (randint(3) == 1)
+ if (one_in_(3))
{
Type = GF_MISSILE;
#ifdef JP
-Type_desc = "¥¨¥ì¥á¥ó¥È";
+ Type_desc = "¥¨¥ì¥á¥ó¥È";
#else
Type_desc = "the elements";
#endif
-
}
else
{
Type = GF_SHARDS;
#ifdef JP
-Type_desc = "ÇËÊÒ";
+ Type_desc = "ÇËÊÒ";
#else
Type_desc = "shards";
#endif
-
}
break;
case CLASS_MAGE:
case CLASS_RED_MAGE:
case CLASS_BLUE_MAGE:
case CLASS_MIRROR_MASTER:
- if (randint(3) == 1)
+ if (one_in_(3))
{
Type = GF_MANA;
#ifdef JP
-Type_desc = "ËâÎÏ";
+ Type_desc = "ËâÎÏ";
#else
Type_desc = "mana";
#endif
-
}
else
{
Type = GF_DISENCHANT;
#ifdef JP
-Type_desc = "Îô²½";
+ Type_desc = "Îô²½";
#else
Type_desc = "disenchantment";
#endif
-
}
break;
case CLASS_CHAOS_WARRIOR:
- if (randint(3) != 1)
+ if (!one_in_(3))
{
Type = GF_CONFUSION;
#ifdef JP
-Type_desc = "º®Íð";
+ Type_desc = "º®Íð";
#else
Type_desc = "confusion";
#endif
-
}
else
{
Type = GF_CHAOS;
#ifdef JP
-Type_desc = "¥«¥ª¥¹";
+ Type_desc = "¥«¥ª¥¹";
#else
Type_desc = "chaos";
#endif
-
}
break;
case CLASS_MONK:
case CLASS_SAMURAI:
case CLASS_FORCETRAINER:
- if (randint(3) != 1)
+ if (!one_in_(3))
{
Type = GF_CONFUSION;
#ifdef JP
-Type_desc = "º®Íð";
+ Type_desc = "º®Íð";
#else
Type_desc = "confusion";
#endif
-
}
else
{
Type = GF_SOUND;
#ifdef JP
-Type_desc = "¹ì²»";
+ Type_desc = "¹ì²»";
#else
Type_desc = "sound";
#endif
-
}
break;
case CLASS_MINDCRAFTER:
- if (randint(3) != 1)
+ if (!one_in_(3))
{
Type = GF_CONFUSION;
#ifdef JP
-Type_desc = "º®Íð";
+ Type_desc = "º®Íð";
#else
Type_desc = "confusion";
#endif
-
}
else
{
Type = GF_PSI;
#ifdef JP
-Type_desc = "Àº¿À¥¨¥Í¥ë¥®¡¼";
+ Type_desc = "Àº¿À¥¨¥Í¥ë¥®¡¼";
#else
Type_desc = "mental energy";
#endif
-
}
break;
case CLASS_PRIEST:
case CLASS_PALADIN:
- if (randint(3) == 1)
+ if (one_in_(3))
{
Type = GF_HELL_FIRE;
#ifdef JP
-Type_desc = "ÃϹö¤Î¹å²Ð";
+ Type_desc = "ÃϹö¤Î¹å²Ð";
#else
Type_desc = "hellfire";
#endif
-
}
else
{
Type = GF_HOLY_FIRE;
#ifdef JP
-Type_desc = "À»¤Ê¤ë±ê";
+ Type_desc = "À»¤Ê¤ë±ê";
#else
Type_desc = "holy fire";
#endif
-
}
break;
case CLASS_ROGUE:
case CLASS_NINJA:
- if (randint(3) == 1)
+ if (one_in_(3))
{
Type = GF_DARK;
#ifdef JP
-Type_desc = "°Å¹õ";
+ Type_desc = "°Å¹õ";
#else
Type_desc = "darkness";
#endif
-
}
else
{
Type = GF_POIS;
#ifdef JP
-Type_desc = "ÆÇ";
+ Type_desc = "ÆÇ";
#else
Type_desc = "poison";
#endif
-
}
break;
case CLASS_BARD:
- if (randint(3) != 1)
+ if (!one_in_(3))
{
Type = GF_SOUND;
#ifdef JP
-Type_desc = "¹ì²»";
+ Type_desc = "¹ì²»";
#else
Type_desc = "sound";
#endif
-
}
else
{
Type = GF_CONFUSION;
#ifdef JP
-Type_desc = "º®Íð";
+ Type_desc = "º®Íð";
#else
Type_desc = "confusion";
#endif
-
}
break;
}
}
- if (!get_aim_dir(&dir)) break;
+ ratial_stop_mouth();
+
#ifdef JP
-msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", Type_desc);
+ msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", Type_desc);
#else
msg_format("You breathe %s.", Type_desc);
#endif
break;
case RACE_MIND_FLAYER:
- if (racial_aux(15, 12, A_INT, 14))
- {
- if (!get_aim_dir(&dir)) break;
- else
- {
+ if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï½¸Ã椷¡¢Ìܤ¬ÀÖ¤¯µ±¤¤¤¿...");
+ msg_print("¤¢¤Ê¤¿¤Ï½¸Ã椷¡¢Ìܤ¬ÀÖ¤¯µ±¤¤¤¿...");
#else
- msg_print("You concentrate and your eyes glow red...");
+ msg_print("You concentrate and your eyes glow red...");
#endif
- fire_bolt(GF_PSI, dir, plev);
- }
- }
+ fire_bolt(GF_PSI, dir, plev);
break;
case RACE_IMP:
- if (racial_aux(9, 15, A_WIS, 15))
+ if (!get_aim_dir(&dir)) return FALSE;
+ if (plev >= 30)
{
- if (!get_aim_dir(&dir)) break;
- if (plev >= 30)
- {
#ifdef JP
-msg_print("¥Õ¥¡¥¤¥¢¡¼¥Ü¡¼¥ë¤òÊü¤Ã¤¿¡£");
+ msg_print("¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤òÊü¤Ã¤¿¡£");
#else
- msg_print("You cast a ball of fire.");
+ msg_print("You cast a ball of fire.");
#endif
- fire_ball(GF_FIRE, dir, plev, 2);
- }
- else
- {
+ fire_ball(GF_FIRE, dir, plev, 2);
+ }
+ else
+ {
#ifdef JP
-msg_print("¥Õ¥¡¥¤¥¢¡¼¥Ü¥ë¥È¤òÊü¤Ã¤¿¡£");
+ msg_print("¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È¤òÊü¤Ã¤¿¡£");
#else
- msg_print("You cast a bolt of fire.");
+ msg_print("You cast a bolt of fire.");
#endif
- fire_bolt(GF_FIRE, dir, plev);
- }
+ fire_bolt(GF_FIRE, dir, plev);
}
break;
case RACE_GOLEM:
- if (racial_aux(20, 15, A_CON, 8))
- {
- (void)set_shield(randint(20) + 30, FALSE);
- }
+ (void)set_shield(randint1(20) + 30, FALSE);
break;
case RACE_SKELETON:
case RACE_ZOMBIE:
- if (racial_aux(30, 30, A_WIS, 18))
- {
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¼º¤Ã¤¿¥¨¥Í¥ë¥®¡¼¤ò¼è¤êÌ᤽¤¦¤È»î¤ß¤¿¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï¼º¤Ã¤¿¥¨¥Í¥ë¥®¡¼¤ò¼è¤êÌ᤽¤¦¤È»î¤ß¤¿¡£");
#else
- msg_print("You attempt to restore your lost energies.");
+ msg_print("You attempt to restore your lost energies.");
#endif
- (void)restore_level();
- }
+ (void)restore_level();
break;
case RACE_VAMPIRE:
- if (racial_aux(2, (1 + (plev / 3)), A_CON, 9))
+ if (d_info[dungeon_type].flags1 & DF1_NO_MELEE)
+ {
+#ifdef JP
+ msg_print("¤Ê¤¼¤«¹¶·â¤¹¤ë¤³¤È¤¬¤Ç¤¤Ê¤¤¡£");
+#else
+ msg_print("Something prevent you from attacking.");
+#endif
+ return FALSE;
+ }
+ else
{
int y, x, dummy = 0;
cave_type *c_ptr;
/* Only works on adjacent monsters */
- if (!get_rep_dir(&dir,FALSE)) break; /* was get_aim_dir */
+ if (!get_rep_dir(&dir,FALSE)) return FALSE; /* was get_aim_dir */
y = py + ddy[dir];
x = px + ddx[dir];
c_ptr = &cave[y][x];
+ ratial_stop_mouth();
+
if (!c_ptr->m_idx)
{
#ifdef JP
-msg_print("²¿¤â¤Ê¤¤¾ì½ê¤Ë³ú¤ß¤Ä¤¤¤¿¡ª");
+ msg_print("²¿¤â¤Ê¤¤¾ì½ê¤Ë³ú¤ß¤Ä¤¤¤¿¡ª");
#else
msg_print("You bite into thin air!");
#endif
}
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¥Ë¥ä¥ê¤È¤·¤Æ²ç¤ò¤à¤¤¤¿...");
+ msg_print("¤¢¤Ê¤¿¤Ï¥Ë¥ä¥ê¤È¤·¤Æ²ç¤ò¤à¤¤¤¿...");
#else
msg_print("You grin and bare your fangs...");
#endif
- dummy = plev + randint(plev) * MAX(1, plev / 10); /* Dmg */
+ dummy = plev + randint1(plev) * MAX(1, plev / 10); /* Dmg */
if (drain_life(dir, dummy))
{
if (p_ptr->food < PY_FOOD_FULL)
(void)hp_player(dummy);
else
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¶õÊ¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï¶õÊ¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£");
#else
msg_print("You were not hungry.");
#endif
- /* Gain nutritional sustenance: 150/hp drained */
- /* A Food ration gives 5000 food points (by contrast) */
- /* Don't ever get more than "Full" this way */
- /* But if we ARE Gorged, it won't cure us */
- dummy = p_ptr->food + MIN(5000, 100 * dummy);
+ /* Gain nutritional sustenance: 150/hp drained */
+ /* A Food ration gives 5000 food points (by contrast) */
+ /* Don't ever get more than "Full" this way */
+ /* But if we ARE Gorged, it won't cure us */
+ dummy = p_ptr->food + MIN(5000, 100 * dummy);
if (p_ptr->food < PY_FOOD_MAX) /* Not gorged already */
(void)set_food(dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy);
}
else
#ifdef JP
-msg_print("¤²¤§¡£¤Ò¤É¤¤Ì£¤À¡£");
+ msg_print("¤²¤§¡£¤Ò¤É¤¤Ì£¤À¡£");
#else
msg_print("Yechh. That tastes foul.");
#endif
break;
case RACE_SPECTRE:
- if (racial_aux(4, 6, A_INT, 3))
- {
+ if (!get_aim_dir(&dir)) return FALSE;
+ ratial_stop_mouth();
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Ï¤ª¤É¤í¤ª¤É¤í¤·¤¤¶«¤ÓÀ¼¤ò¤¢¤²¤¿¡ª");
+ msg_print("¤¢¤Ê¤¿¤Ï¤ª¤É¤í¤ª¤É¤í¤·¤¤¶«¤ÓÀ¼¤ò¤¢¤²¤¿¡ª");
#else
- msg_print("You emit an eldritch howl!");
+ msg_print("You emit an eldritch howl!");
#endif
- if (!get_aim_dir(&dir)) break;
- (void)fear_monster(dir, plev);
- }
+ (void)fear_monster(dir, plev);
break;
case RACE_SPRITE:
- if (racial_aux(12, 12, A_INT, 15))
- {
#ifdef JP
-msg_print("¤¢¤Ê¤¿¤ÏËâË¡¤ÎÊ´¤òÅꤲ¤Ä¤±¤¿...");
+ msg_print("¤¢¤Ê¤¿¤ÏËâË¡¤ÎÊ´¤òÅꤲ¤Ä¤±¤¿...");
#else
- msg_print("You throw some magic dust...");
+ msg_print("You throw some magic dust...");
#endif
- if (plev < 25)
- sleep_monsters_touch();
- else
- (void)sleep_monsters();
- }
+ if (plev < 25) sleep_monsters_touch();
+ else (void)sleep_monsters(plev);
break;
case RACE_DEMON:
- if (racial_aux(15, 10+p_ptr->lev/3, A_CON, 20))
{
int type = (one_in_(2) ? GF_NETHER : GF_FIRE);
- if (!get_aim_dir(&dir)) break;
+ if (!get_aim_dir(&dir)) return FALSE;
+ ratial_stop_mouth();
#ifdef JP
-msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
+ msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
#else
msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
- fire_ball(type, dir, plev * 3,
- -(plev / 15) - 1);
+ fire_ball(type, dir, plev * 3, -(plev / 15) - 1);
}
break;
- case RACE_KUTA:
- if (racial_aux(20, 15, A_CHR, 8))
- {
- (void)set_tsubureru(randint(20) + 30, FALSE);
- }
+ case RACE_KUTAR:
+ (void)set_tsubureru(randint1(20) + 30, FALSE);
break;
case RACE_ANDROID:
+ if (!get_aim_dir(&dir)) return FALSE;
if (plev < 10)
{
- if (racial_aux(1, 7, A_STR, 8))
- {
- if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
- msg_print("¥ì¥¤¥¬¥ó¤òȯ¼Í¤·¤¿¡£");
+ msg_print("¥ì¥¤¥¬¥ó¤òȯ¼Í¤·¤¿¡£");
#else
- msg_print("You fire your ray gun.");
+ msg_print("You fire your ray gun.");
#endif
- fire_bolt(GF_MISSILE, dir, (plev+1) / 2);
- }
+ fire_bolt(GF_MISSILE, dir, (plev+1) / 2);
}
else if (plev < 25)
{
- if (racial_aux(10, 13, A_STR, 10))
- {
- if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
- msg_print("¥Ö¥é¥¹¥¿¡¼¤òȯ¼Í¤·¤¿¡£");
+ msg_print("¥Ö¥é¥¹¥¿¡¼¤òȯ¼Í¤·¤¿¡£");
#else
- msg_print("You fire your blaster.");
+ msg_print("You fire your blaster.");
#endif
- fire_bolt(GF_MISSILE, dir, plev);
- }
+ fire_bolt(GF_MISSILE, dir, plev);
}
else if (plev < 35)
{
- if (racial_aux(25, 26, A_STR, 12))
- {
- if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
- msg_print("¥Ð¥º¡¼¥«¤òȯ¼Í¤·¤¿¡£");
+ msg_print("¥Ð¥º¡¼¥«¤òȯ¼Í¤·¤¿¡£");
#else
- msg_print("You fire your bazooka.");
+ msg_print("You fire your bazooka.");
#endif
- fire_ball(GF_MISSILE, dir, plev * 2, 2);
- }
+ fire_ball(GF_MISSILE, dir, plev * 2, 2);
}
else if (plev < 45)
{
- if (racial_aux(35, 40, A_STR, 15))
- {
- if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
- msg_print("¥Ó¡¼¥à¥¥ã¥Î¥ó¤òȯ¼Í¤·¤¿¡£");
+ msg_print("¥Ó¡¼¥à¥¥ã¥Î¥ó¤òȯ¼Í¤·¤¿¡£");
#else
- msg_print("You fire a beam cannon.");
+ msg_print("You fire a beam cannon.");
#endif
- fire_beam(GF_MISSILE, dir, plev * 2);
- }
+ fire_beam(GF_MISSILE, dir, plev * 2);
}
else
{
- if (racial_aux(45, 60, A_STR, 18))
- {
- if (!get_aim_dir(&dir)) return FALSE;
#ifdef JP
- msg_print("¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£");
+ msg_print("¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡£");
#else
- msg_print("You fire a rocket.");
+ msg_print("You fire a rocket.");
#endif
- fire_ball(GF_ROCKET, dir, plev * 5, 2);
- }
+ fire_rocket(GF_ROCKET, dir, plev * 5, 2);
}
break;
default:
#ifdef JP
-msg_print("¤³¤Î¼ï²¤ÏÆüì¤ÊǽÎϤò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£");
+ msg_print("¤³¤Î¼ï²¤ÏÆüì¤ÊǽÎϤò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£");
#else
msg_print("This race has no bonus power.");
#endif
return TRUE;
}
-
-typedef struct power_desc_type power_desc_type;
-
-struct power_desc_type
-{
- char name[40];
- int level;
- int cost;
- int fail;
- int number;
-};
-
-
-/*
- * Allow user to choose a power (racial / mutation) to activate
+/*!
+ * @brief ¥ì¥¤¥·¥ã¥ë¡¦¥Ñ¥ï¡¼¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / Allow user to choose a power (racial / mutation) to activate
+ * @return ¤Ê¤·
*/
void do_cmd_racial_power(void)
{
int num, i = 0;
int ask = TRUE;
int lvl = p_ptr->lev;
- bool flag, redraw;
+ bool flag, redraw, cast = FALSE;
bool warrior = ((p_ptr->pclass == CLASS_WARRIOR || p_ptr->pclass == CLASS_BERSERKER) ? TRUE : FALSE);
char choice;
char out_val[160];
#ifdef JP
strcpy(power_desc[num].name, "·õ¤ÎÉñ¤¤");
#else
- strcpy(power_desc[num].name, "Whirl Strike");
+ strcpy(power_desc[num].name, "Sword Dancing");
#endif
power_desc[num].level = 40;
power_desc[num].cost = 75;
- power_desc[num].fail = 100 - racial_chance(40, A_DEX, 35);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 35;
power_desc[num++].number = -3;
break;
}
- case CLASS_MAGE:
case CLASS_HIGH_MAGE:
+ if (p_ptr->realm1 == REALM_HEX)
+ {
+#ifdef JP
+ strcpy(power_desc[num].name, "±Ó¾§¤ò¤ä¤á¤ë");
+#else
+ strcpy(power_desc[num].name, "Stop spelling");
+#endif
+ power_desc[num].level = 1;
+ power_desc[num].cost = 0;
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
+ power_desc[num++].number = -3;
+ break;
+ }
+ case CLASS_MAGE:
+ /* case CLASS_HIGH_MAGE: */
case CLASS_SORCERER:
{
#ifdef JP
strcpy(power_desc[num].name, "ËâÎÏ¿©¤¤");
#else
- strcpy(power_desc[num].name, "eat magic");
+ strcpy(power_desc[num].name, "Eat Magic");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 1;
- power_desc[num].fail = 100 - racial_chance(25, A_INT, 25);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 25;
power_desc[num++].number = -3;
break;
}
case CLASS_PRIEST:
{
- if (p_ptr->realm1 == REALM_LIFE)
+ if (is_good_realm(p_ptr->realm1))
{
#ifdef JP
strcpy(power_desc[num].name, "Éð´ï½ËÊ¡");
#else
- strcpy(power_desc[num].name, "bless weapon");
+ strcpy(power_desc[num].name, "Bless Weapon");
#endif
power_desc[num].level = 35;
power_desc[num].cost = 70;
- power_desc[num].fail = 100 - racial_chance(35, A_WIS, 50);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 50;
power_desc[num++].number = -3;
}
else
power_desc[num].level = 42;
power_desc[num].cost = 40;
- power_desc[num].fail = 100 - racial_chance(42, A_WIS, 35);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 35;
power_desc[num++].number = -3;
}
break;
#ifdef JP
strcpy(power_desc[num].name, "¥Ò¥Ã¥È¡õ¥¢¥¦¥§¥¤");
#else
- strcpy(power_desc[num].name, "hit and away");
+ strcpy(power_desc[num].name, "Hit and Away");
#endif
power_desc[num].level = 8;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(8, A_DEX, 14);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 14;
power_desc[num++].number = -3;
break;
}
case CLASS_RANGER:
+ case CLASS_SNIPER:
{
#ifdef JP
strcpy(power_desc[num].name, "¥â¥ó¥¹¥¿¡¼Ä´ºº");
#else
- strcpy(power_desc[num].name, "probe monster");
+ strcpy(power_desc[num].name, "Probe Monster");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 20;
- power_desc[num].fail = 100 - racial_chance(15, A_INT, 12);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 12;
power_desc[num++].number = -3;
break;
}
case CLASS_PALADIN:
{
- if (p_ptr->realm1 == REALM_LIFE)
+ if (is_good_realm(p_ptr->realm1))
{
#ifdef JP
strcpy(power_desc[num].name, "¥Û¡¼¥ê¡¼¡¦¥é¥ó¥¹");
#else
- strcpy(power_desc[num].name, "holy lance");
+ strcpy(power_desc[num].name, "Holy Lance");
#endif
power_desc[num].level = 30;
power_desc[num].cost = 30;
- power_desc[num].fail = 100 - racial_chance(30, A_WIS, 30);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 30;
power_desc[num++].number = -3;
}
else
#ifdef JP
strcpy(power_desc[num].name, "¥Ø¥ë¡¦¥é¥ó¥¹");
#else
- strcpy(power_desc[num].name, "hell lance");
+ strcpy(power_desc[num].name, "Hell Lance");
#endif
power_desc[num].level = 30;
power_desc[num].cost = 30;
- power_desc[num].fail = 100 - racial_chance(30, A_WIS, 30);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 30;
power_desc[num++].number = -3;
}
break;
#ifdef JP
strcpy(power_desc[num].name, "ÊÑ´¹: £È£Ð¢ª£Í£Ð");
#else
- strcpy(power_desc[num].name, "convert HP to SP");
+ strcpy(power_desc[num].name, "Convert HP to SP");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(25, A_INT, 10);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 10;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "ÊÑ´¹: £Í£Ð¢ª£È£Ð");
#else
- strcpy(power_desc[num].name, "convert SP to HP");
+ strcpy(power_desc[num].name, "Convert SP to HP");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(25, A_INT, 10);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 10;
power_desc[num++].number = -4;
break;
}
power_desc[num].level = 40;
power_desc[num].cost = 50;
- power_desc[num].fail = 100 - racial_chance(40, A_INT, 25);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 25;
power_desc[num++].number = -3;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "¹½¤¨¤ë");
#else
- strcpy(power_desc[num].name, "asuume a posture");
+ strcpy(power_desc[num].name, "Assume a Posture");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(20, A_DEX, 0);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "É´Îö·ý");
power_desc[num].level = 30;
power_desc[num].cost = 30;
- power_desc[num].fail = 100 - racial_chance(20, A_STR, 20);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 20;
power_desc[num++].number = -4;
break;
}
power_desc[num].level = 15;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(15, A_WIS, 10);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 10;
power_desc[num++].number = -3;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "¼Ì¿¿»£±Æ");
#else
- strcpy(power_desc[num].name, "take a photograph");
+ strcpy(power_desc[num].name, "Take a Photograph");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(1, A_DEX, 0);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "¿¿¡¦´ÕÄê");
power_desc[num].level = 25;
power_desc[num].cost = 20;
- power_desc[num].fail = 100 - racial_chance(25, A_INT, 20);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 20;
power_desc[num++].number = -4;
break;
}
power_desc[num].level = 30;
power_desc[num].cost = 100;
- power_desc[num].fail = 100 - racial_chance(30, A_DEX, 30);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 30;
power_desc[num++].number = -3;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "À¸Êª»ÙÇÛ");
#else
- strcpy(power_desc[num].name, "dominate a living thing");
+ strcpy(power_desc[num].name, "Dominate a Living Thing");
#endif
power_desc[num].level = 1;
power_desc[num].cost = (p_ptr->lev+3)/4;
- power_desc[num].fail = 100 - racial_chance(1, A_CHR, 10);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 10;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "¿¿¡¦À¸Êª»ÙÇÛ");
#else
- strcpy(power_desc[num].name, "dominate living things");
+ strcpy(power_desc[num].name, "Dominate Living Things");
#endif
power_desc[num].level = 30;
power_desc[num].cost = (p_ptr->lev+20)/2;
- power_desc[num].fail = 100 - racial_chance(30, A_CHR, 10);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 10;
power_desc[num++].number = -4;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "ÃÆ/Ìð¤ÎÀ½Â¤");
#else
- strcpy(power_desc[num].name, "create ammo");
+ strcpy(power_desc[num].name, "Create Ammo");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(0, A_DEX, 0);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "ËâÎϤμè¤ê¹þ¤ß");
#else
- strcpy(power_desc[num].name, "absorb magic");
+ strcpy(power_desc[num].name, "Absorb Magic");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(0, A_INT, 0);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
+
+ strcpy(power_desc[num].name, _("¶¯ÎÏȯư", "Powerful Activation"));
+ power_desc[num].level = 10;
+ power_desc[num].cost = 10 + (lvl - 10) / 2;
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
+ power_desc[num++].number = -4;
break;
}
case CLASS_BARD:
#ifdef JP
strcpy(power_desc[num].name, "²Î¤ò»ß¤á¤ë");
#else
- strcpy(power_desc[num].name, "stop singing");
+ strcpy(power_desc[num].name, "Stop Singing");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(0, A_CHR, 0);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
break;
}
#endif
power_desc[num].level = 48;
- power_desc[num].cost = 60;
- power_desc[num].fail = 100 - racial_chance(48, A_INT, 25);
+ power_desc[num].cost = 20;
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
break;
}
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(1, A_WIS, 0);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "·¿");
#else
- strcpy(power_desc[num].name, "assume a posture");
+ strcpy(power_desc[num].name, "Assume a Posture");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(25, A_DEX, 0);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 0;
power_desc[num++].number = -4;
break;
}
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(1, A_INT, 0);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
break;
}
power_desc[num].level = 10;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(10, A_STR, 10);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 10;
power_desc[num++].number = -3;
break;
}
case CLASS_BERSERKER:
{
#ifdef JP
-strcpy(power_desc[num].name, "¶õÊ¢½¼Â");
-#else
- strcpy(power_desc[num].name, "satisfy hunger");
-#endif
-
- power_desc[num].level = 5;
- power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(5, A_DEX, 10);
- power_desc[num++].number = -3;
-#ifdef JP
strcpy(power_desc[num].name, "µ¢´Ô");
#else
strcpy(power_desc[num].name, "Recall");
power_desc[num].level = 10;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(10, A_DEX, 20);
- power_desc[num++].number = -4;
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 20;
+ power_desc[num++].number = -3;
break;
}
case CLASS_MIRROR_MASTER:
#ifdef JP
strcpy(power_desc[num].name, "¶À³ä¤ê");
#else
- strcpy(power_desc[num].name, "break mirrors");
+ strcpy(power_desc[num].name, "Break Mirrors");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(1, A_INT, 0);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
#ifdef JP
strcpy(power_desc[num].name, "ÀÅ¿å");
#else
- strcpy(power_desc[num].name, "Clear mind");
+ strcpy(power_desc[num].name, "Mirror Concentration");
#endif
power_desc[num].level = 30;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(30, A_INT, 20);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 20;
power_desc[num++].number = -4;
break;
}
power_desc[num].level = 5;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(5, A_INT, 20);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 20;
power_desc[num++].number = -3;
break;
}
power_desc[num].level = 20;
power_desc[num].cost = 0;
- power_desc[num].fail = 100 - racial_chance(20, A_DEX, 0);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 0;
power_desc[num++].number = -3;
break;
}
#ifdef JP
sprintf(power_desc[num].name, "ÃϹö/²Ð±ê¤Î¥Ö¥ì¥¹ (¥À¥á¡¼¥¸ %d)", lvl * 3);
#else
- sprintf(power_desc[num].name, "nether or fire breath (dam %d)", lvl * 3);
+ sprintf(power_desc[num].name, "Nether or Fire Breath (dam %d)", lvl * 3);
#endif
power_desc[num].level = 15;
power_desc[num].cost = 10+lvl/3;
- power_desc[num].fail = 100 - racial_chance(15, A_CON, 20);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 20;
power_desc[num++].number = -1;
break;
case MIMIC_VAMPIRE:
#ifdef JP
strcpy(power_desc[num].name, "À¸Ì¿Îϵۼý");
#else
- strcpy(power_desc[num].name, "drain life");
+ strcpy(power_desc[num].name, "Drain Life");
#endif
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
- power_desc[num].fail = 100 - racial_chance(2, A_CON, 9);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 9;
power_desc[num++].number = -1;
break;
}
#ifdef JP
strcpy(power_desc[num].name, "¥É¥¢¤Èæ« ´¶ÃÎ");
#else
- strcpy(power_desc[num].name, "detect doors+traps");
+ strcpy(power_desc[num].name, "Detect Doors+Traps");
#endif
power_desc[num].level = 5;
power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(5, A_WIS, 12);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_NIBELUNG:
#ifdef JP
strcpy(power_desc[num].name, "¥É¥¢¤Èæ« ´¶ÃÎ");
#else
- strcpy(power_desc[num].name, "detect doors+traps");
+ strcpy(power_desc[num].name, "Detect Doors+Traps");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(10, A_WIS, 10);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 10;
power_desc[num++].number = -1;
break;
case RACE_HOBBIT:
#ifdef JP
strcpy(power_desc[num].name, "¿©ÎÈÀ¸À®");
#else
- strcpy(power_desc[num].name, "create food");
+ strcpy(power_desc[num].name, "Create Food");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(15, A_INT, 10);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 10;
power_desc[num++].number = -1;
break;
case RACE_GNOME:
power_desc[num].level = 5;
power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(5, A_INT, 12);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_HALF_ORC:
#ifdef JP
strcpy(power_desc[num].name, "¶²Éݽüµî");
#else
- strcpy(power_desc[num].name, "remove fear");
+ strcpy(power_desc[num].name, "Remove Fear");
#endif
power_desc[num].level = 3;
power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(3, A_WIS, (warrior ? 5 : 10));
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = warrior ? 5 : 10;
power_desc[num++].number = -1;
break;
case RACE_HALF_TROLL:
#ifdef JP
strcpy(power_desc[num].name, "¶¸Àï»Î²½");
#else
- strcpy(power_desc[num].name, "berserk");
+ strcpy(power_desc[num].name, "Berserk");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(10, A_STR, (warrior ? 6 : 12));
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = warrior ? 6 : 12;
power_desc[num++].number = -1;
break;
case RACE_BARBARIAN:
#ifdef JP
strcpy(power_desc[num].name, "¶¸Àï»Î²½");
#else
- strcpy(power_desc[num].name, "berserk");
+ strcpy(power_desc[num].name, "Berserk");
#endif
power_desc[num].level = 8;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(8, A_STR, (warrior ? 6 : 12));
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = warrior ? 6 : 12;
power_desc[num++].number = -1;
break;
case RACE_AMBERITE:
power_desc[num].level = 30;
power_desc[num].cost = 50;
- power_desc[num].fail = 100 - racial_chance(30, A_INT, 50);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 50;
power_desc[num++].number = -1;
#ifdef JP
strcpy(power_desc[num].name, "¥Ñ¥¿¡¼¥ó¡¦¥¦¥©¡¼¥¯");
power_desc[num].level = 40;
power_desc[num].cost = 75;
- power_desc[num].fail = 100 - racial_chance(40, A_WIS, 50);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 50;
power_desc[num++].number = -2;
break;
case RACE_HALF_OGRE:
#ifdef JP
strcpy(power_desc[num].name, "Çúȯ¤Î¥ë¡¼¥ó");
#else
- strcpy(power_desc[num].name, "explosive rune");
+ strcpy(power_desc[num].name, "Explosive Rune");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 35;
- power_desc[num].fail = 100 - racial_chance(25, A_INT, 15);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 15;
power_desc[num++].number = -1;
break;
case RACE_HALF_GIANT:
#ifdef JP
strcpy(power_desc[num].name, "´äÀÐÍϲò");
#else
- strcpy(power_desc[num].name, "stone to mud");
+ strcpy(power_desc[num].name, "Stone to Mud");
#endif
power_desc[num].level = 20;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(20, A_STR, 12);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_HALF_TITAN:
#ifdef JP
strcpy(power_desc[num].name, "¥¹¥¥ã¥ó¡¦¥â¥ó¥¹¥¿¡¼");
#else
- strcpy(power_desc[num].name, "probing");
+ strcpy(power_desc[num].name, "Probing");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(15, A_INT, 12);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_CYCLOPS:
#ifdef JP
sprintf(power_desc[num].name, "´äÀÐÅꤲ¡Ê¥À¥á¡¼¥¸ %d¡Ë", (3 * lvl) / 2);
#else
- sprintf(power_desc[num].name, "throw boulder (dam %d)", (3 * lvl) / 2);
+ sprintf(power_desc[num].name, "Throw Boulder (dam %d)", (3 * lvl) / 2);
#endif
power_desc[num].level = 20;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(20, A_STR, 12);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_YEEK:
#ifdef JP
strcpy(power_desc[num].name, "¥â¥ó¥¹¥¿¡¼¶²¹²");
#else
- strcpy(power_desc[num].name, "scare monster");
+ strcpy(power_desc[num].name, "Scare Monster");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(15, A_WIS, 10);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 10;
power_desc[num++].number = -1;
break;
case RACE_SPECTRE:
#ifdef JP
strcpy(power_desc[num].name, "¥â¥ó¥¹¥¿¡¼¶²¹²");
#else
- strcpy(power_desc[num].name, "scare monster");
+ strcpy(power_desc[num].name, "Scare Monster");
#endif
power_desc[num].level = 4;
power_desc[num].cost = 6;
- power_desc[num].fail = 100 - racial_chance(4, A_INT, 3);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 3;
power_desc[num++].number = -1;
break;
case RACE_KLACKON:
#ifdef JP
sprintf(power_desc[num].name, "»À¤ÎÂà (¥À¥á¡¼¥¸ %d)", lvl);
#else
- sprintf(power_desc[num].name, "spit acid (dam %d)", lvl);
+ sprintf(power_desc[num].name, "Spit Acid (dam %d)", lvl);
#endif
power_desc[num].level = 9;
power_desc[num].cost = 9;
- power_desc[num].fail = 100 - racial_chance(9, A_DEX, 14);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 14;
power_desc[num++].number = -1;
break;
case RACE_KOBOLD:
#ifdef JP
sprintf(power_desc[num].name, "ÆǤΥÀ¡¼¥Ä (¥À¥á¡¼¥¸ %d)", lvl);
#else
- sprintf(power_desc[num].name, "poison dart (dam %d)", lvl);
+ sprintf(power_desc[num].name, "Poison Dart (dam %d)", lvl);
#endif
power_desc[num].level = 12;
power_desc[num].cost = 8;
- power_desc[num].fail = 100 - racial_chance(12, A_DEX, 14);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 14;
power_desc[num++].number = -1;
break;
case RACE_DARK_ELF:
#ifdef JP
sprintf(power_desc[num].name, "¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë (¥À¥á¡¼¥¸ %dd%d)", 3 + ((lvl - 1) / 5), 4);
#else
- sprintf(power_desc[num].name, "magic missile (dm %dd%d)", 3 + ((lvl - 1) / 5), 4);
+ sprintf(power_desc[num].name, "Magic Missile (dm %dd%d)", 3 + ((lvl - 1) / 5), 4);
#endif
power_desc[num].level = 2;
power_desc[num].cost = 2;
- power_desc[num].fail = 100 - racial_chance(2, A_INT, 9);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 9;
power_desc[num++].number = -1;
break;
case RACE_DRACONIAN:
#ifdef JP
sprintf(power_desc[num].name, "¥Ö¥ì¥¹ (¥À¥á¡¼¥¸ %d)", lvl * 2);
#else
- sprintf(power_desc[num].name, "breath weapon (dam %d)", lvl * 2);
+ sprintf(power_desc[num].name, "Breath Weapon (dam %d)", lvl * 2);
#endif
power_desc[num].level = 1;
power_desc[num].cost = lvl;
- power_desc[num].fail = 100 - racial_chance(1, A_CON, 12);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 12;
power_desc[num++].number = -1;
break;
case RACE_MIND_FLAYER:
#ifdef JP
sprintf(power_desc[num].name, "Àº¿À¹¶·â (¥À¥á¡¼¥¸ %d)", lvl);
#else
- sprintf(power_desc[num].name, "mind blast (dam %d)", lvl);
+ sprintf(power_desc[num].name, "Mind Blast (dam %d)", lvl);
#endif
power_desc[num].level = 15;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(15, A_INT, 14);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 14;
power_desc[num++].number = -1;
break;
case RACE_IMP:
#ifdef JP
sprintf(power_desc[num].name, "¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È/¥Ü¡¼¥ë (¥À¥á¡¼¥¸ %d)", lvl);
#else
- sprintf(power_desc[num].name, "fire bolt/ball (dam %d)", lvl);
+ sprintf(power_desc[num].name, "Fire Bolt/Ball (dam %d)", lvl);
#endif
power_desc[num].level = 9;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(9, A_WIS, 15);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 15;
power_desc[num++].number = -1;
break;
case RACE_GOLEM:
#ifdef JP
strcpy(power_desc[num].name, "È©Àв½ (´ü´Ö 1d20+30)");
#else
- strcpy(power_desc[num].name, "stone skin (dur 1d20+30)");
+ strcpy(power_desc[num].name, "Stone Skin (dur 1d20+30)");
#endif
power_desc[num].level = 20;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(20, A_CON, 8);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 8;
power_desc[num++].number = -1;
break;
case RACE_SKELETON:
#ifdef JP
strcpy(power_desc[num].name, "·Ð¸³ÃÍÉü³è");
#else
- strcpy(power_desc[num].name, "restore life");
+ strcpy(power_desc[num].name, "Restore Life");
#endif
power_desc[num].level = 30;
power_desc[num].cost = 30;
- power_desc[num].fail = 100 - racial_chance(30, A_WIS, 18);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 18;
power_desc[num++].number = -1;
break;
case RACE_VAMPIRE:
#ifdef JP
strcpy(power_desc[num].name, "À¸Ì¿Îϵۼý");
#else
- strcpy(power_desc[num].name, "drain life");
+ strcpy(power_desc[num].name, "Drain Life");
#endif
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
- power_desc[num].fail = 100 - racial_chance(2, A_CON, 9);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 9;
power_desc[num++].number = -1;
break;
case RACE_SPRITE:
#ifdef JP
strcpy(power_desc[num].name, "̲¤êÊ´");
#else
- strcpy(power_desc[num].name, "sleeping dust");
+ strcpy(power_desc[num].name, "Sleeping Dust");
#endif
power_desc[num].level = 12;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(12, A_INT, 15);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 15;
power_desc[num++].number = -1;
break;
case RACE_DEMON:
#ifdef JP
sprintf(power_desc[num].name, "ÃϹö/²Ð±ê¤Î¥Ö¥ì¥¹ (¥À¥á¡¼¥¸ %d)", lvl * 3);
#else
- sprintf(power_desc[num].name, "nether or fire breath (dam %d)", lvl * 3);
+ sprintf(power_desc[num].name, "Nether or Fire Breath (dam %d)", lvl * 3);
#endif
power_desc[num].level = 15;
power_desc[num].cost = 10+lvl/3;
- power_desc[num].fail = 100 - racial_chance(15, A_CON, 20);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 20;
power_desc[num++].number = -1;
break;
- case RACE_KUTA:
+ case RACE_KUTAR:
#ifdef JP
strcpy(power_desc[num].name, "²£¤Ë¿¤Ó¤ë");
#else
- strcpy(power_desc[num].name, "expand horizontally (dur 30+1d20)");
+ strcpy(power_desc[num].name, "Expand Horizontally (dur 30+1d20)");
#endif
power_desc[num].level = 20;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(15, A_CHR, 8);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 8;
power_desc[num++].number = -1;
break;
case RACE_ANDROID:
#ifdef JP
strcpy(power_desc[num].name, "¥ì¥¤¥¬¥ó");
#else
- strcpy(power_desc[num].name, "ray gun");
+ strcpy(power_desc[num].name, "Ray Gun");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 7;
- power_desc[num].fail = 100 - racial_chance(1, A_STR, 8);
+ power_desc[num].fail = 8;
}
else if (p_ptr->lev < 25)
{
#ifdef JP
strcpy(power_desc[num].name, "¥Ö¥é¥¹¥¿¡¼");
#else
- strcpy(power_desc[num].name, "blaster");
+ strcpy(power_desc[num].name, "Blaster");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 13;
- power_desc[num].fail = 100 - racial_chance(10, A_STR, 10);
+ power_desc[num].fail = 10;
}
else if (p_ptr->lev < 35)
{
#ifdef JP
strcpy(power_desc[num].name, "¥Ð¥º¡¼¥«");
#else
- strcpy(power_desc[num].name, "bazooka");
+ strcpy(power_desc[num].name, "Bazooka");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 26;
- power_desc[num].fail = 100 - racial_chance(25, A_STR, 12);
+ power_desc[num].fail = 12;
}
else if (p_ptr->lev < 45)
{
#ifdef JP
strcpy(power_desc[num].name, "¥Ó¡¼¥à¥¥ã¥Î¥ó");
#else
- strcpy(power_desc[num].name, "beam cannon");
+ strcpy(power_desc[num].name, "Beam Cannon");
#endif
power_desc[num].level = 35;
power_desc[num].cost = 40;
- power_desc[num].fail = 100 - racial_chance(35, A_STR, 15);
+ power_desc[num].fail = 15;
}
else
{
#ifdef JP
strcpy(power_desc[num].name, "¥í¥±¥Ã¥È");
#else
- strcpy(power_desc[num].name, "rocket");
+ strcpy(power_desc[num].name, "Rocket");
#endif
power_desc[num].level = 45;
power_desc[num].cost = 60;
- power_desc[num].fail = 100 - racial_chance(45, A_STR, 18);
+ power_desc[num].fail = 18;
}
+ power_desc[num].stat = A_STR;
power_desc[num++].number = -1;
break;
default:
#ifdef JP
strcpy(power_desc[num].name, "»À¤ÎÂÃ");
#else
- strcpy(power_desc[num].name, "spit acid");
+ strcpy(power_desc[num].name, "Spit Acid");
#endif
power_desc[num].level = 9;
power_desc[num].cost = 9;
- power_desc[num].fail = 100 - racial_chance(9, A_DEX, 15);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_SPIT_ACID;
}
#ifdef JP
strcpy(power_desc[num].name, "±ê¤Î¥Ö¥ì¥¹");
#else
- strcpy(power_desc[num].name, "fire breath");
+ strcpy(power_desc[num].name, "Fire Breath");
#endif
power_desc[num].level = 20;
power_desc[num].cost = lvl;
- power_desc[num].fail = 100 - racial_chance(20, A_CON, 18);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 18;
power_desc[num++].number = MUT1_BR_FIRE;
}
#ifdef JP
strcpy(power_desc[num].name, "ºÅ̲âˤß");
#else
- strcpy(power_desc[num].name, "hypnotic gaze");
+ strcpy(power_desc[num].name, "Hypnotic Gaze");
#endif
power_desc[num].level = 12;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(12, A_CHR, 18);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 18;
power_desc[num++].number = MUT1_HYPN_GAZE;
}
#ifdef JP
strcpy(power_desc[num].name, "Ç°Æ°ÎÏ");
#else
- strcpy(power_desc[num].name, "telekinesis");
+ strcpy(power_desc[num].name, "Telekinesis");
#endif
power_desc[num].level = 9;
power_desc[num].cost = 9;
- power_desc[num].fail = 100 - racial_chance(9, A_WIS, 14);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_TELEKINES;
}
#ifdef JP
strcpy(power_desc[num].name, "¥Æ¥ì¥Ý¡¼¥È");
#else
- strcpy(power_desc[num].name, "teleport");
+ strcpy(power_desc[num].name, "Teleport");
#endif
power_desc[num].level = 7;
power_desc[num].cost = 7;
- power_desc[num].fail = 100 - racial_chance(7, A_WIS, 15);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_VTELEPORT;
}
#ifdef JP
strcpy(power_desc[num].name, "Àº¿À¹¶·â");
#else
- strcpy(power_desc[num].name, "mind blast");
+ strcpy(power_desc[num].name, "Mind Blast");
#endif
power_desc[num].level = 5;
power_desc[num].cost = 3;
- power_desc[num].fail = 100 - racial_chance(5, A_WIS, 15);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_MIND_BLST;
}
#ifdef JP
strcpy(power_desc[num].name, "Êü¼Íǽ");
#else
- strcpy(power_desc[num].name, "emit radiation");
+ strcpy(power_desc[num].name, "Emit Radiation");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(15, A_CON, 14);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_RADIATION;
}
#ifdef JP
strcpy(power_desc[num].name, "µÛ·ì¥É¥ì¥¤¥ó");
#else
- strcpy(power_desc[num].name, "vampiric drain");
+ strcpy(power_desc[num].name, "Vampiric Drain");
#endif
power_desc[num].level = 2;
power_desc[num].cost = (1 + (lvl / 3));
- power_desc[num].fail = 100 - racial_chance(2, A_CON, 9);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 9;
power_desc[num++].number = MUT1_VAMPIRISM;
}
#ifdef JP
strcpy(power_desc[num].name, "¶â°Ó̳Ð");
#else
- strcpy(power_desc[num].name, "smell metal");
+ strcpy(power_desc[num].name, "Smell Metal");
#endif
power_desc[num].level = 3;
power_desc[num].cost = 2;
- power_desc[num].fail = 100 - racial_chance(3, A_INT, 12);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 12;
power_desc[num++].number = MUT1_SMELL_MET;
}
#ifdef JP
strcpy(power_desc[num].name, "Ũ½Ó̳Ð");
#else
- strcpy(power_desc[num].name, "smell monsters");
+ strcpy(power_desc[num].name, "Smell Monsters");
#endif
power_desc[num].level = 5;
power_desc[num].cost = 4;
- power_desc[num].fail = 100 - racial_chance(5, A_INT, 15);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_SMELL_MON;
}
#ifdef JP
strcpy(power_desc[num].name, "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È");
#else
- strcpy(power_desc[num].name, "blink");
+ strcpy(power_desc[num].name, "Blink");
#endif
power_desc[num].level = 3;
power_desc[num].cost = 3;
- power_desc[num].fail = 100 - racial_chance(3, A_WIS, 12);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 12;
power_desc[num++].number = MUT1_BLINK;
}
#ifdef JP
strcpy(power_desc[num].name, "´ä¿©¤¤");
#else
- strcpy(power_desc[num].name, "eat rock");
+ strcpy(power_desc[num].name, "Eat Rock");
#endif
power_desc[num].level = 8;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(8, A_CON, 18);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 18;
power_desc[num++].number = MUT1_EAT_ROCK;
}
#ifdef JP
strcpy(power_desc[num].name, "°ÌÃÖ¸ò´¹");
#else
- strcpy(power_desc[num].name, "swap position");
+ strcpy(power_desc[num].name, "Swap Position");
#endif
power_desc[num].level = 15;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(15, A_DEX, 16);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 16;
power_desc[num++].number = MUT1_SWAP_POS;
}
#ifdef JP
strcpy(power_desc[num].name, "¶«¤Ó");
#else
- strcpy(power_desc[num].name, "shriek");
+ strcpy(power_desc[num].name, "Shriek");
#endif
power_desc[num].level = 20;
power_desc[num].cost = 14;
- power_desc[num].fail = 100 - racial_chance(20, A_CON, 16);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 16;
power_desc[num++].number = MUT1_SHRIEK;
}
#ifdef JP
strcpy(power_desc[num].name, "¾ÈÌÀ");
#else
- strcpy(power_desc[num].name, "illuminate");
+ strcpy(power_desc[num].name, "Illuminate");
#endif
power_desc[num].level = 3;
power_desc[num].cost = 2;
- power_desc[num].fail = 100 - racial_chance(3, A_INT, 10);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 10;
power_desc[num++].number = MUT1_ILLUMINE;
}
#ifdef JP
strcpy(power_desc[num].name, "¼ö¤¤´¶ÃÎ");
#else
- strcpy(power_desc[num].name, "detect curses");
+ strcpy(power_desc[num].name, "Detect Curses");
#endif
power_desc[num].level = 7;
power_desc[num].cost = 14;
- power_desc[num].fail = 100 - racial_chance(7, A_WIS, 14);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_DET_CURSE;
}
#ifdef JP
strcpy(power_desc[num].name, "¶¸Àï»Î²½");
#else
- strcpy(power_desc[num].name, "berserk");
+ strcpy(power_desc[num].name, "Berserk");
#endif
power_desc[num].level = 8;
power_desc[num].cost = 8;
- power_desc[num].fail = 100 - racial_chance(8, A_STR, 14);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_BERSERK;
}
#ifdef JP
strcpy(power_desc[num].name, "ÊÑ¿È");
#else
- strcpy(power_desc[num].name, "polymorph");
+ strcpy(power_desc[num].name, "Polymorph");
#endif
power_desc[num].level = 18;
power_desc[num].cost = 20;
- power_desc[num].fail = 100 - racial_chance(18, A_CON, 18);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 18;
power_desc[num++].number = MUT1_POLYMORPH;
}
#ifdef JP
strcpy(power_desc[num].name, "¥ß¥À¥¹¤Î¼ê");
#else
- strcpy(power_desc[num].name, "midas touch");
+ strcpy(power_desc[num].name, "Midas Touch");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 5;
- power_desc[num].fail = 100 - racial_chance(10, A_INT, 12);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 12;
power_desc[num++].number = MUT1_MIDAS_TCH;
}
#ifdef JP
strcpy(power_desc[num].name, "¥«¥ÓȯÀ¸");
#else
- strcpy(power_desc[num].name, "grow mold");
+ strcpy(power_desc[num].name, "Grow Mold");
#endif
power_desc[num].level = 1;
power_desc[num].cost = 6;
- power_desc[num].fail = 100 - racial_chance(1, A_CON, 14);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_GROW_MOLD;
}
#ifdef JP
strcpy(power_desc[num].name, "¥¨¥ì¥á¥ó¥ÈÂÑÀ");
#else
- strcpy(power_desc[num].name, "resist elements");
+ strcpy(power_desc[num].name, "Resist Elements");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(10, A_CON, 12);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 12;
power_desc[num++].number = MUT1_RESIST;
}
#ifdef JP
strcpy(power_desc[num].name, "ÃÏ¿Ì");
#else
- strcpy(power_desc[num].name, "earthquake");
+ strcpy(power_desc[num].name, "Earthquake");
#endif
power_desc[num].level = 12;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(12, A_STR, 16);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 16;
power_desc[num++].number = MUT1_EARTHQUAKE;
}
#ifdef JP
strcpy(power_desc[num].name, "ËâÎÏ¿©¤¤");
#else
- strcpy(power_desc[num].name, "eat magic");
+ strcpy(power_desc[num].name, "Eat Magic");
#endif
power_desc[num].level = 17;
power_desc[num].cost = 1;
- power_desc[num].fail = 100 - racial_chance(17, A_WIS, 15);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_EAT_MAGIC;
}
#ifdef JP
strcpy(power_desc[num].name, "ËâÎÏ´¶ÃÎ");
#else
- strcpy(power_desc[num].name, "weigh magic");
+ strcpy(power_desc[num].name, "Weigh Magic");
#endif
power_desc[num].level = 6;
power_desc[num].cost = 6;
- power_desc[num].fail = 100 - racial_chance(6, A_INT, 10);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 10;
power_desc[num++].number = MUT1_WEIGH_MAG;
}
#ifdef JP
strcpy(power_desc[num].name, "Áý¿£ÁË»ß");
#else
- strcpy(power_desc[num].name, "sterilize");
+ strcpy(power_desc[num].name, "Sterilize");
#endif
power_desc[num].level = 12;
power_desc[num].cost = 23;
- power_desc[num].fail = 100 - racial_chance(12, A_CHR, 15);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 15;
power_desc[num++].number = MUT1_STERILITY;
}
#ifdef JP
strcpy(power_desc[num].name, "¥Ò¥Ã¥È¡õ¥¢¥¦¥§¥¤");
#else
- strcpy(power_desc[num].name, "panic hit");
+ strcpy(power_desc[num].name, "Panic Hit");
#endif
power_desc[num].level = 10;
power_desc[num].cost = 12;
- power_desc[num].fail = 100 - racial_chance(10, A_DEX, 14);
+ power_desc[num].stat = A_DEX;
+ power_desc[num].fail = 14;
power_desc[num++].number = MUT1_PANIC_HIT;
}
#ifdef JP
strcpy(power_desc[num].name, "âÁÏÇ");
#else
- strcpy(power_desc[num].name, "dazzle");
+ strcpy(power_desc[num].name, "Dazzle");
#endif
power_desc[num].level = 7;
power_desc[num].cost = 15;
- power_desc[num].fail = 100 - racial_chance(7, A_CHR, 8);
+ power_desc[num].stat = A_CHR;
+ power_desc[num].fail = 8;
power_desc[num++].number = MUT1_DAZZLE;
}
#ifdef JP
strcpy(power_desc[num].name, "¥ì¡¼¥¶¡¼¡¦¥¢¥¤");
#else
- strcpy(power_desc[num].name, "laser eye");
+ strcpy(power_desc[num].name, "Laser Eye");
#endif
power_desc[num].level = 7;
power_desc[num].cost = 10;
- power_desc[num].fail = 100 - racial_chance(7, A_WIS, 9);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 9;
power_desc[num++].number = MUT1_LASER_EYE;
}
#ifdef JP
strcpy(power_desc[num].name, "µ¢´Ô");
#else
- strcpy(power_desc[num].name, "recall");
+ strcpy(power_desc[num].name, "Recall");
#endif
power_desc[num].level = 17;
power_desc[num].cost = 50;
- power_desc[num].fail = 100 - racial_chance(17, A_INT, 16);
+ power_desc[num].stat = A_INT;
+ power_desc[num].fail = 16;
power_desc[num++].number = MUT1_RECALL;
}
#ifdef JP
strcpy(power_desc[num].name, "¼Ù°¾ÃÌÇ");
#else
- strcpy(power_desc[num].name, "banish evil");
+ strcpy(power_desc[num].name, "Banish Evil");
#endif
power_desc[num].level = 25;
power_desc[num].cost = 25;
- power_desc[num].fail = 100 - racial_chance(25, A_WIS, 18);
+ power_desc[num].stat = A_WIS;
+ power_desc[num].fail = 18;
power_desc[num++].number = MUT1_BANISH;
}
#ifdef JP
strcpy(power_desc[num].name, "Åà·ë¤Î¼ê");
#else
- strcpy(power_desc[num].name, "cold touch");
+ strcpy(power_desc[num].name, "Cold Touch");
#endif
power_desc[num].level = 2;
power_desc[num].cost = 2;
- power_desc[num].fail = 100 - racial_chance(2, A_CON, 11);
+ power_desc[num].stat = A_CON;
+ power_desc[num].fail = 11;
power_desc[num++].number = MUT1_COLD_TOUCH;
}
#ifdef JP
strcpy(power_desc[num].name, "¥¢¥¤¥Æ¥àÅꤲ");
#else
- strcpy(power_desc[num].name, "throw object");
+ strcpy(power_desc[num].name, "Throw Object");
#endif
power_desc[num].level = 1;
power_desc[num].cost = lvl;
- power_desc[num].fail = 100 - racial_chance(1, A_STR, 6);
+ power_desc[num].stat = A_STR;
+ power_desc[num].fail = 6;
/* XXX_XXX_XXX Hack! MUT1_LAUNCHER counts as negative... */
power_desc[num++].number = 3;
}
if (use_menu) screen_save();
/* Get a spell from the user */
- choice = (always_show_list || use_menu) ? ESCAPE:1;
- while (!flag)
- {
+ choice = (always_show_list || use_menu) ? ESCAPE:1;
+ while (!flag)
+ {
if( choice==ESCAPE ) choice = ' ';
else if( !get_com(out_val, &choice, FALSE) )break;
screen_load();
energy_use = 0;
return;
- break;
}
case '8':
letter = '0' + ctr - 26;
sprintf(dummy, " %c) ",letter);
}
- strcat(dummy, format("%-23.23s %2d %4d %3d%%", power_desc[ctr].name, power_desc[ctr].level, power_desc[ctr].cost, power_desc[ctr].fail));
+ strcat(dummy, format("%-23.23s %2d %4d %3d%%",
+ power_desc[ctr].name, power_desc[ctr].level, power_desc[ctr].cost,
+ 100 - racial_chance(&power_desc[ctr])));
prt(dummy, y1, x1);
ctr++;
}
repeat_push(i);
} /*if (!repeat_pull(&i) || ...)*/
#endif /* ALLOW_REPEAT */
- if (power_desc[i].number < 0)
+ switch (racial_aux(&power_desc[i]))
{
- if (!cmd_racial_power_aux(power_desc[i].number)) energy_use = 0;
+ case 1:
+ if (power_desc[i].number < 0)
+ cast = cmd_racial_power_aux(power_desc[i].number);
+ else
+ cast = mutation_power_aux(power_desc[i].number);
+ break;
+ case 0:
+ cast = FALSE;
+ break;
+ case -1:
+ cast = TRUE;
+ break;
}
- else
+
+ if (cast)
{
- mutation_power_aux(power_desc[i].number);
- }
+ if (racial_cost)
+ {
+ int actual_racial_cost = racial_cost / 2 + randint1(racial_cost / 2);
- /* Redraw mana and hp */
- p_ptr->redraw |= (PR_HP | PR_MANA);
+ /* If mana is not enough, player consumes hit point! */
+ if (p_ptr->csp < actual_racial_cost)
+ {
+ actual_racial_cost -= p_ptr->csp;
+ p_ptr->csp = 0;
+#ifdef JP
+ take_hit(DAMAGE_USELIFE, actual_racial_cost, "²áÅ٤ν¸Ãæ", -1);
+#else
+ take_hit(DAMAGE_USELIFE, actual_racial_cost, "concentrating too hard", -1);
+#endif
+ }
+ else p_ptr->csp -= actual_racial_cost;
+
+ /* Redraw mana and hp */
+ p_ptr->redraw |= (PR_HP | PR_MANA);
- /* Window stuff */
- p_ptr->window |= (PW_PLAYER | PW_SPELL);
+ /* Window stuff */
+ p_ptr->window |= (PW_PLAYER | PW_SPELL);
+ }
+ }
+ else energy_use = 0;
/* Success */
return;