OSDN Git Service

[Refactor] #37353 プレイヤーの魔法棒使用処理を cmd-zapwand.c/h に分離。 / Separate player's 'zap wand...
[hengband/hengband.git] / src / cmd6.c
index 68a2272..7b76699 100644 (file)
@@ -1,19 +1,17 @@
-/* File: cmd6.c */
-
-/*
+/*!
+ * @file cmd6.c
+ * @brief プレイヤーのアイテムに関するコマンドの実装2 / Spell/Prayer commands
+ * @date 2014/01/27
+ * @author
+ * <pre>
  * Copyright (c) 1997 Ben Harrison, 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.  Other copyrights may also apply.
- */
-
-/* Purpose: Object commands */
-
-#include "angband.h"
-
-
-/*
+ * 2014 Deskull rearranged comment for Doxygen.\n
+ * </pre>
+ * @details
+ * <pre>
  * This file includes code for eating food, drinking potions,
  * reading scrolls, aiming wands, using staffs, zapping rods,
  * and activating artifacts.
  *
  * Note that food/potions/scrolls no longer use bit-flags for effects,
  * but instead use the "sval" (which is also used to sort the objects).
+ * </pre>
  */
 
-
-static void do_cmd_eat_food_aux(int item)
+#include "angband.h"
+#include "selfinfo.h"
+#include "cmd-activate.h"
+#include "cmd-eat.h"
+#include "cmd-quaff.h"
+#include "cmd-read.h"
+#include "cmd-usestaff.h"
+#include "cmd-zapwand.h"
+
+
+
+/*!
+ * @brief ロッドの効果を発動する
+ * @param sval オブジェクトのsval
+ * @param dir 発動目標の方向ID
+ * @param use_charge チャージを消費したかどうかを返す参照ポインタ
+ * @param powerful 強力発動上の処理ならばTRUE
+ * @param magic 魔道具術上の処理ならばTRUE
+ * @return 発動により効果内容が確定したならばTRUEを返す
+ */
+static int rod_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool *use_charge, bool powerful, bool magic)
 {
-       int ident, lev;
-       object_type *o_ptr;
-
-       if (music_singing_any()) stop_singing();
-       if (hex_spelling_any()) stop_hex_spell_all();
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-       /* Sound */
-       sound(SOUND_EAT);
-
-       /* Take a turn */
-       energy_use = 100;
-
-       /* Identity not known yet */
-       ident = FALSE;
+       int ident = FALSE;
+       int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
+       int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;
+       int rad = powerful ? 3 : 2;
 
-       /* Object level */
-       lev = k_info[o_ptr->k_idx].level;
+       /* Unused */
+       (void)magic;
 
-       if (o_ptr->tval == TV_FOOD)
+       /* Analyze the rod */
+       switch (sval)
        {
-               /* Analyze the food */
-               switch (o_ptr->sval)
+               case SV_ROD_DETECT_TRAP:
                {
-                       case SV_FOOD_POISON:
-                       {
-                               if (!(p_ptr->resist_pois || IS_OPPOSE_POIS()))
-                               {
-                                       if (set_poisoned(p_ptr->poisoned + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_BLINDNESS:
-                       {
-                               if (!p_ptr->resist_blind)
-                               {
-                                       if (set_blind(p_ptr->blind + randint0(200) + 200))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_PARANOIA:
-                       {
-                               if (!p_ptr->resist_fear)
-                               {
-                                       if (set_afraid(p_ptr->afraid + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_CONFUSION:
-                       {
-                               if (!p_ptr->resist_conf)
-                               {
-                                       if (set_confused(p_ptr->confused + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_HALLUCINATION:
-                       {
-                               if (!p_ptr->resist_chaos)
-                               {
-                                       if (set_image(p_ptr->image + randint0(250) + 250))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_PARALYSIS:
-                       {
-                               if (!p_ptr->free_act)
-                               {
-                                       if (set_paralyzed(p_ptr->paralyzed + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_WEAKNESS:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_STR);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_SICKNESS:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_CON);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_STUPIDITY:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_INT);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_NAIVETY:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_WIS);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_UNHEALTH:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_CON);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_DISEASE:
-                       {
-#ifdef JP
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "ÆÇÆþ¤ê¿©ÎÁ", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "poisonous food", -1);
-#endif
-
-                               (void)do_dec_stat(A_STR);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_POISON:
-                       {
-                               if (set_poisoned(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_BLINDNESS:
-                       {
-                               if (set_blind(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_PARANOIA:
-                       {
-                               if (set_afraid(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_CONFUSION:
-                       {
-                               if (set_confused(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_SERIOUS:
-                       {
-                               if (hp_player(damroll(4, 8))) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORE_STR:
-                       {
-                               if (do_res_stat(A_STR)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORE_CON:
-                       {
-                               if (do_res_stat(A_CON)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORING:
-                       {
-                               if (do_res_stat(A_STR)) ident = TRUE;
-                               if (do_res_stat(A_INT)) ident = TRUE;
-                               if (do_res_stat(A_WIS)) ident = TRUE;
-                               if (do_res_stat(A_DEX)) ident = TRUE;
-                               if (do_res_stat(A_CON)) ident = TRUE;
-                               if (do_res_stat(A_CHR)) ident = TRUE;
-                               break;
-                       }
-
-
-#ifdef JP
-                       /* ¤½¤ì¤¾¤ì¤Î¿©¤Ùʪ¤Î´¶ÁÛ¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¸½ */
-                       case SV_FOOD_BISCUIT:
-                       {
-                               msg_print("´Å¤¯¤Æ¥µ¥¯¥µ¥¯¤·¤Æ¤È¤Æ¤â¤ª¤¤¤·¤¤¡£");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_JERKY:
-                       {
-                               msg_print("»õ¤´¤¿¤¨¤¬¤¢¤Ã¤Æ¤ª¤¤¤·¤¤¡£");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_SLIME_MOLD:
-                       {
-                               msg_print("¤³¤ì¤Ï¤Ê¤ó¤È¤â·ÁÍƤ·¤¬¤¿¤¤Ì£¤À¡£");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RATION:
-                       {
-                               msg_print("¤³¤ì¤Ï¤ª¤¤¤·¤¤¡£");
-                               ident = TRUE;
-                               break;
-                       }
-#else
-                       case SV_FOOD_RATION:
-                       case SV_FOOD_BISCUIT:
-                       case SV_FOOD_JERKY:
-                       case SV_FOOD_SLIME_MOLD:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
-                       }
-#endif
-
-
-                       case SV_FOOD_WAYBREAD:
-                       {
-#ifdef JP
-                               msg_print("¤³¤ì¤Ï¤Ò¤¸¤ç¤¦¤ËÈþÌ£¤À¡£");
-#else
-                               msg_print("That tastes good.");
-#endif
-
-                               (void)set_poisoned(0);
-                               (void)hp_player(damroll(4, 8));
-                               ident = TRUE;
-                               break;
-                       }
+                       if (detect_traps(detect_rad, (bool)(dir ? FALSE : TRUE))) ident = TRUE;
+                       break;
+               }
 
-#ifdef JP
-                       case SV_FOOD_PINT_OF_ALE:
-                       {
-                               msg_print("¤Î¤É¤´¤·Á֤䤫¤À¡£");
-                               ident = TRUE;
-                               break;
-                       }
+               case SV_ROD_DETECT_DOOR:
+               {
+                       if (detect_doors(detect_rad)) ident = TRUE;
+                       if (detect_stairs(detect_rad)) ident = TRUE;
+                       break;
+               }
 
-                       case SV_FOOD_PINT_OF_WINE:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
-                       }
-#else
-                       case SV_FOOD_PINT_OF_ALE:
-                       case SV_FOOD_PINT_OF_WINE:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
+               case SV_ROD_IDENTIFY:
+               {
+                       if (powerful) {
+                               if (!identify_fully(FALSE)) *use_charge = FALSE;
+                       } else {
+                               if (!ident_spell(FALSE)) *use_charge = FALSE;
                        }
-#endif
-
+                       ident = TRUE;
+                       break;
                }
-       }
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_KNOWLEDGE, -1);
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-       }
 
-       /* We have tried it */
-       if (o_ptr->tval == TV_FOOD) object_tried(o_ptr);
+               case SV_ROD_RECALL:
+               {
+                       if (!word_of_recall()) *use_charge = FALSE;
+                       ident = TRUE;
+                       break;
+               }
 
-       /* The player is now aware of the object */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
+               case SV_ROD_ILLUMINATION:
+               {
+                       if (lite_area(damroll(2, 8), (powerful ? 4 : 2))) ident = TRUE;
+                       break;
+               }
 
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
+               case SV_ROD_MAPPING:
+               {
+                       map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP);
+                       ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_DETECTION:
+               {
+                       detect_all(detect_rad);
+                       ident = TRUE;
+                       break;
+               }
 
-       /* Food can feed the player */
-       if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
-       {
-               /* Reduced nutritional benefit */
-               (void)set_food(p_ptr->food + (o_ptr->pval / 10));
-#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Î¤è¤¦¤Ê¼Ô¤Ë¤È¤Ã¤Æ¿©ÎȤʤɶϤ«¤Ê±ÉÍܤˤ·¤«¤Ê¤é¤Ê¤¤¡£");
-#else
-               msg_print("Mere victuals hold scant sustenance for a being such as yourself.");
-#endif
-
-               if (p_ptr->food < PY_FOOD_ALERT)   /* Hungry */
-#ifdef JP
-msg_print("¤¢¤Ê¤¿¤Îµ²¤¨¤Ï¿·Á¯¤Ê·ì¤Ë¤è¤Ã¤Æ¤Î¤ßËþ¤¿¤µ¤ì¤ë¡ª");
-#else
-                       msg_print("Your hunger can only be satisfied with fresh blood!");
-#endif
-
-       }
-       else if ((prace_is_(RACE_SKELETON) ||
-                 prace_is_(RACE_GOLEM) ||
-                 prace_is_(RACE_ZOMBIE) ||
-                 prace_is_(RACE_SPECTRE)) &&
-                (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND))
-       {
-               cptr staff;
-
-               if (o_ptr->tval == TV_STAFF &&
-                   (item < 0) && (o_ptr->number > 1))
-               {
-#ifdef JP
-                       msg_print("¤Þ¤º¤Ï¾ó¤ò½¦¤ï¤Ê¤±¤ì¤Ð¡£");
-#else
-                       msg_print("You must first pick up the staffs.");
-#endif
-                       return;
-               }
-
-#ifdef JP
-               staff = (o_ptr->tval == TV_STAFF) ? "¾ó" : "ËâË¡ËÀ";
-#else
-               staff = (o_ptr->tval == TV_STAFF) ? "staff" : "wand";
-#endif
-
-               /* "Eat" charges */
-               if (o_ptr->pval == 0)
-               {
-#ifdef JP
-                       msg_format("¤³¤Î%s¤Ë¤Ï¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£", staff);
-#else
-                       msg_format("The %s has no charges left.", staff);
-#endif
-
-                       o_ptr->ident |= (IDENT_EMPTY);
-
-                       /* Combine / Reorder the pack (later) */
-                       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-                       p_ptr->window |= (PW_INVEN);
-
-                       return;
-               }
-
-#ifdef JP
-               msg_format("¤¢¤Ê¤¿¤Ï%s¤ÎËâÎϤò¥¨¥Í¥ë¥®¡¼¸»¤È¤·¤ÆµÛ¼ý¤·¤¿¡£", staff);
-#else
-               msg_format("You absorb mana of the %s as your energy.", staff);
-#endif
-
-               /* Use a single charge */
-               o_ptr->pval--;
-
-               /* Eat a charge */
-               set_food(p_ptr->food + 5000);
-
-               /* XXX Hack -- unstack if necessary */
-               if (o_ptr->tval == TV_STAFF &&
-                   (item >= 0) && (o_ptr->number > 1))
-               {
-                       object_type forge;
-                       object_type *q_ptr;
-
-                       /* Get local object */
-                       q_ptr = &forge;
-
-                       /* Obtain a local object */
-                       object_copy(q_ptr, o_ptr);
-
-                       /* Modify quantity */
-                       q_ptr->number = 1;
-
-                       /* Restore the charges */
-                       o_ptr->pval++;
-
-                       /* Unstack the used item */
-                       o_ptr->number--;
-                       p_ptr->total_weight -= q_ptr->weight;
-                       item = inven_carry(q_ptr);
-
-                       /* Message */
-#ifdef JP
-                       msg_format("¾ó¤ò¤Þ¤È¤á¤Ê¤ª¤·¤¿¡£");
-#else
-                       msg_print("You unstack your staff.");
-#endif
-               }
-
-               /* Describe charges in the pack */
-               if (item >= 0)
-               {
-                       inven_item_charges(item);
-               }
-
-               /* Describe charges on the floor */
-               else
-               {
-                       floor_item_charges(0 - item);
-               }
-
-               /* Window stuff */
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
-               /* Don't eat a staff/wand itself */
-               return;
-       }
-       else if ((prace_is_(RACE_DEMON) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)) &&
-                (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE &&
-                 my_strchr("pht", r_info[o_ptr->pval].d_char)))
-       {
-               /* Drain vitality of humanoids */
-               char o_name[MAX_NLEN];
-
-               object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-
-#ifdef JP
-               msg_format("%s¤Ïdz¤¨¾å¤ê³¥¤Ë¤Ê¤Ã¤¿¡£ÀºÎϤòµÛ¼ý¤·¤¿µ¤¤¬¤¹¤ë¡£", o_name);
-#else
-               msg_format("%^s is burnt to ashes.  You absorb its vitality!", o_name);
-#endif
-               (void)set_food(PY_FOOD_MAX - 1);
-       }
-       else if (prace_is_(RACE_SKELETON))
-       {
-#if 0
-               if (o_ptr->tval == TV_SKELETON ||
-                   (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
-               {
-#ifdef JP
-                       msg_print("¤¢¤Ê¤¿¤Ï¹ü¤Ç¼«Ê¬¤ÎÂΤòÊä¤Ã¤¿¡£");
-#else
-                       msg_print("Your body absorbs the bone.");
-#endif
-                       set_food(p_ptr->food + 5000);
-               }
-               else 
-#endif
-
-               if (!((o_ptr->sval == SV_FOOD_WAYBREAD) ||
-                     (o_ptr->sval < SV_FOOD_BISCUIT)))
-               {
-                       object_type forge;
-                       object_type *q_ptr = &forge;
-
-#ifdef JP
-msg_print("¿©¤Ùʪ¤¬¥¢¥´¤òÁÇÄ̤ꤷ¤ÆÍî¤Á¤¿¡ª");
-#else
-                       msg_print("The food falls through your jaws!");
-#endif
-
-
-                       /* Create the item */
-                       object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));
-
-                       /* Drop the object from heaven */
-                       (void)drop_near(q_ptr, -1, py, px);
-               }
-               else
-               {
-#ifdef JP
-msg_print("¿©¤Ùʪ¤¬¥¢¥´¤òÁÇÄ̤ꤷ¤ÆÍî¤Á¡¢¾Ã¤¨¤¿¡ª");
-#else
-                       msg_print("The food falls through your jaws and vanishes!");
-#endif
-
-               }
-       }
-       else if (prace_is_(RACE_GOLEM) ||
-                prace_is_(RACE_ZOMBIE) ||
-                prace_is_(RACE_ENT) ||
-                prace_is_(RACE_DEMON) ||
-                prace_is_(RACE_ANDROID) ||
-                prace_is_(RACE_SPECTRE) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
-       {
-#ifdef JP
-msg_print("À¸¼Ô¤Î¿©Êª¤Ï¤¢¤Ê¤¿¤Ë¤È¤Ã¤Æ¤Û¤È¤ó¤É±ÉÍܤˤʤé¤Ê¤¤¡£");
-#else
-               msg_print("The food of mortals is poor sustenance for you.");
-#endif
-
-               set_food(p_ptr->food + ((o_ptr->pval) / 20));
-       }
-       else if (o_ptr->tval == TV_FOOD && o_ptr->sval == SV_FOOD_WAYBREAD)
-       {
-               /* Waybread is always fully satisfying. */
-               set_food(MAX(p_ptr->food, PY_FOOD_MAX - 1));
-       }
-       else
-       {
-               /* Food can feed the player */
-               (void)set_food(p_ptr->food + o_ptr->pval);
-       }
-
-       /* Destroy a food in the pack */
-       if (item >= 0)
-       {
-               inven_item_increase(item, -1);
-               inven_item_describe(item);
-               inven_item_optimize(item);
-       }
-
-       /* Destroy a food on the floor */
-       else
-       {
-               floor_item_increase(0 - item, -1);
-               floor_item_describe(0 - item);
-               floor_item_optimize(0 - item);
-       }
-}
-
-
-/*
- * Hook to determine if an object is eatable
- */
-static bool item_tester_hook_eatable(object_type *o_ptr)
-{
-       if (o_ptr->tval==TV_FOOD) return TRUE;
-
-#if 0
-       if (prace_is_(RACE_SKELETON))
-       {
-               if (o_ptr->tval == TV_SKELETON ||
-                   (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
-                       return TRUE;
-       }
-       else 
-#endif
-
-       if (prace_is_(RACE_SKELETON) ||
-           prace_is_(RACE_GOLEM) ||
-           prace_is_(RACE_ZOMBIE) ||
-           prace_is_(RACE_SPECTRE))
-       {
-               if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)
-                       return TRUE;
-       }
-       else if (prace_is_(RACE_DEMON) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
-       {
-               if (o_ptr->tval == TV_CORPSE &&
-                   o_ptr->sval == SV_CORPSE &&
-                   my_strchr("pht", r_info[o_ptr->pval].d_char))
-                       return TRUE;
-       }
-
-       /* Assume not */
-       return (FALSE);
-}
-
-
-/*
- * Eat some food (from the pack or floor)
- */
-void do_cmd_eat_food(void)
-{
-       int         item;
-       cptr        q, s;
-
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Restrict choices to food */
-       item_tester_hook = item_tester_hook_eatable;
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤ì¤ò¿©¤Ù¤Þ¤¹¤«? ";
-       s = "¿©¤Ùʪ¤¬¤Ê¤¤¡£";
-#else
-       q = "Eat which item? ";
-       s = "You have nothing to eat.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Eat the object */
-       do_cmd_eat_food_aux(item);
-}
-
-
-/*
- * Quaff a potion (from the pack or the floor)
- */
-static void do_cmd_quaff_potion_aux(int item)
-{
-       int         ident, lev;
-       object_type *o_ptr;
-       object_type forge;
-       object_type *q_ptr;
-
-
-       /* Take a turn */
-       energy_use = 100;
-
-       if (world_player)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("ÉÓ¤«¤é¿å¤¬Î®¤ì½Ð¤Æ¤³¤Ê¤¤¡ª");
-#else
-               msg_print("The potion doesn't flow out from a bottle.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       if (music_singing_any()) stop_singing();
-       if (hex_spelling_any())
-       {
-               if (!hex_spelling(HEX_INHAIL)) stop_hex_spell_all();
-       }
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-       /* Get local object */
-       q_ptr = &forge;
-
-       /* Obtain a local object */
-       object_copy(q_ptr, o_ptr);
-
-       /* Single object */
-       q_ptr->number = 1;
-
-       /* Reduce and describe inventory */
-       if (item >= 0)
-       {
-               inven_item_increase(item, -1);
-               inven_item_describe(item);
-               inven_item_optimize(item);
-       }
-
-       /* Reduce and describe floor item */
-       else
-       {
-               floor_item_increase(0 - item, -1);
-               floor_item_describe(0 - item);
-               floor_item_optimize(0 - item);
-       }
-
-       /* Sound */
-       sound(SOUND_QUAFF);
-
-
-       /* Not identified yet */
-       ident = FALSE;
-
-       /* Object level */
-       lev = k_info[q_ptr->k_idx].level;
-
-       /* Analyze the potion */
-       if (q_ptr->tval == TV_POTION)
-       {
-               switch (q_ptr->sval)
-               {
-#ifdef JP
-                       /* °û¤ß¤´¤¿¤¨¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¸½ */
-               case SV_POTION_WATER:
-                       msg_print("¸ý¤ÎÃ椬¤µ¤Ã¤Ñ¤ê¤·¤¿¡£");
-                       msg_print("¤Î¤É¤Î³é¤­¤¬¾¯¤·¤ª¤µ¤Þ¤Ã¤¿¡£");
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_APPLE_JUICE:
-                       msg_print("´Å¤¯¤Æ¥µ¥Ã¥Ñ¥ê¤È¤·¤Æ¤¤¤Æ¡¢¤È¤Æ¤â¤ª¤¤¤·¤¤¡£");
-                       msg_print("¤Î¤É¤Î³é¤­¤¬¾¯¤·¤ª¤µ¤Þ¤Ã¤¿¡£");
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_SLIME_MOLD:
-                       msg_print("¤Ê¤ó¤È¤âÉÔµ¤Ì£¤ÊÌ£¤À¡£");
-                       msg_print("¤Î¤É¤Î³é¤­¤¬¾¯¤·¤ª¤µ¤Þ¤Ã¤¿¡£");
-                       ident = TRUE;
-                       break;
-
-#else
-               case SV_POTION_WATER:
-               case SV_POTION_APPLE_JUICE:
-               case SV_POTION_SLIME_MOLD:
-                       msg_print("You feel less thirsty.");
-                       ident = TRUE;
-                       break;
-#endif
-
-               case SV_POTION_SLOWNESS:
-                       if (set_slow(randint1(25) + 15, FALSE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_SALT_WATER:
-#ifdef JP
-                       msg_print("¤¦¤§¡ª»×¤ï¤ºÅǤ¤¤Æ¤·¤Þ¤Ã¤¿¡£");
-#else
-                       msg_print("The potion makes you vomit!");
-#endif
-
-                       if (!(prace_is_(RACE_GOLEM) ||
-                             prace_is_(RACE_ZOMBIE) ||
-                             prace_is_(RACE_DEMON) ||
-                             prace_is_(RACE_ANDROID) ||
-                             prace_is_(RACE_SPECTRE) ||
-                             (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)))
-                       {
-                               /* Only living creatures get thirsty */
-                               (void)set_food(PY_FOOD_STARVE - 1);
-                       }
-
-                       (void)set_poisoned(0);
-                       (void)set_paralyzed(p_ptr->paralyzed + 4);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_POISON:
-                       if (!(p_ptr->resist_pois || IS_OPPOSE_POIS()))
-                       {
-                               if (set_poisoned(p_ptr->poisoned + randint0(15) + 10))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-
-               case SV_POTION_BLINDNESS:
-                       if (!p_ptr->resist_blind)
-                       {
-                               if (set_blind(p_ptr->blind + randint0(100) + 100))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-
-               case SV_POTION_CONFUSION: /* Booze */
-                       if (p_ptr->pclass != CLASS_MONK) chg_virtue(V_HARMONY, -1);
-                       else if (!p_ptr->resist_conf) p_ptr->special_attack |= ATTACK_SUIKEN;
-                       if (!p_ptr->resist_conf)
-                       {
-                               if (set_confused(randint0(20) + 15))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-
-                       if (!p_ptr->resist_chaos)
-                       {
-                               if (one_in_(2))
-                               {
-                                       if (set_image(p_ptr->image + randint0(150) + 150))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               if (one_in_(13) && (p_ptr->pclass != CLASS_MONK))
-                               {
-                                       ident = TRUE;
-                                       if (one_in_(3)) lose_all_info();
-                                       else wiz_dark();
-                                       (void)teleport_player_aux(100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
-                                       wiz_dark();
-#ifdef JP
-                                       msg_print("ÃΤé¤Ê¤¤¾ì½ê¤ÇÌܤ¬Àä᤿¡£Æ¬Äˤ¬¤¹¤ë¡£");
-                                       msg_print("²¿¤â»×¤¤½Ð¤»¤Ê¤¤¡£¤É¤¦¤ä¤Ã¤Æ¤³¤³¤ØÍ褿¤Î¤«¤âʬ¤«¤é¤Ê¤¤¡ª");
-#else
-                                       msg_print("You wake up somewhere with a sore head...");
-                                       msg_print("You can't remember a thing, or how you got here!");
-#endif
-
-                               }
-                       }
-                       break;
-
-               case SV_POTION_SLEEP:
-                       if (!p_ptr->free_act)
-                       {
-#ifdef JP
-               msg_print("¤¢¤Ê¤¿¤Ï̲¤Ã¤Æ¤·¤Þ¤Ã¤¿¡£");
-#else
-               msg_print("You fall asleep.");
-#endif
-
-
-                               if (ironman_nightmare)
-                               {
-#ifdef JP
-msg_print("¶²¤í¤·¤¤¸÷·Ê¤¬Æ¬¤ËÉ⤫¤ó¤Ç¤­¤¿¡£");
-#else
-                                       msg_print("A horrible vision enters your mind.");
-#endif
-
-
-                                       /* Pick a nightmare */
-                                       get_mon_num_prep(get_nightmare, NULL);
-
-                                       /* Have some nightmares */
-                                       have_nightmare(get_mon_num(MAX_DEPTH));
-
-                                       /* Remove the monster restriction */
-                                       get_mon_num_prep(NULL, NULL);
-                               }
-                               if (set_paralyzed(p_ptr->paralyzed + randint0(4) + 4))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-
-               case SV_POTION_LOSE_MEMORIES:
-                       if (!p_ptr->hold_life && (p_ptr->exp > 0))
-                       {
-#ifdef JP
-                               msg_print("²áµî¤Îµ­²±¤¬Çö¤ì¤Æ¤¤¤¯µ¤¤¬¤¹¤ë¡£");
-#else
-                               msg_print("You feel your memories fade.");
-#endif
-                               chg_virtue(V_KNOWLEDGE, -5);
-
-                               lose_exp(p_ptr->exp / 4);
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_RUINATION:
-#ifdef JP
-                       msg_print("¿È¤â¿´¤â¼å¤Ã¤Æ¤­¤Æ¡¢Àºµ¤¤¬È´¤±¤Æ¤¤¤¯¤è¤¦¤À¡£");
-                       take_hit(DAMAGE_LOSELIFE, damroll(10, 10), "ÇËÌǤÎÌô", -1);
-#else
-                       msg_print("Your nerves and muscles feel weak and lifeless!");
-                       take_hit(DAMAGE_LOSELIFE, damroll(10, 10), "a potion of Ruination", -1);
-#endif
-
-                       (void)dec_stat(A_DEX, 25, TRUE);
-                       (void)dec_stat(A_WIS, 25, TRUE);
-                       (void)dec_stat(A_CON, 25, TRUE);
-                       (void)dec_stat(A_STR, 25, TRUE);
-                       (void)dec_stat(A_CHR, 25, TRUE);
-                       (void)dec_stat(A_INT, 25, TRUE);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_STR:
-                       if (do_dec_stat(A_STR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_INT:
-                       if (do_dec_stat(A_INT)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_WIS:
-                       if (do_dec_stat(A_WIS)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_DEX:
-                       if (do_dec_stat(A_DEX)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_CON:
-                       if (do_dec_stat(A_CON)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DEC_CHR:
-                       if (do_dec_stat(A_CHR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_DETONATIONS:
-#ifdef JP
-                       msg_print("ÂΤÎÃæ¤Ç·ã¤·¤¤Çúȯ¤¬µ¯¤­¤¿¡ª");
-                       take_hit(DAMAGE_NOESCAPE, damroll(50, 20), "Çúȯ¤ÎÌô", -1);
-#else
-                       msg_print("Massive explosions rupture your body!");
-                       take_hit(DAMAGE_NOESCAPE, damroll(50, 20), "a potion of Detonation", -1);
-#endif
-
-                       (void)set_stun(p_ptr->stun + 75);
-                       (void)set_cut(p_ptr->cut + 5000);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_DEATH:
-                       chg_virtue(V_VITALITY, -1);
-                       chg_virtue(V_UNLIFE, 5);
-#ifdef JP
-                       msg_print("»à¤Îͽ´¶¤¬ÂÎÃæ¤ò¶î¤±¤á¤°¤Ã¤¿¡£");
-                       take_hit(DAMAGE_LOSELIFE, 5000, "»à¤ÎÌô", -1);
-#else
-                       msg_print("A feeling of Death flows through your body.");
-                       take_hit(DAMAGE_LOSELIFE, 5000, "a potion of Death", -1);
-#endif
-
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_INFRAVISION:
-                       if (set_tim_infra(p_ptr->tim_infra + 100 + randint1(100), FALSE))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_DETECT_INVIS:
-                       if (set_tim_invis(p_ptr->tim_invis + 12 + randint1(12), FALSE))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_SLOW_POISON:
-                       if (set_poisoned(p_ptr->poisoned / 2)) ident = TRUE;
-                       break;
-
-               case SV_POTION_CURE_POISON:
-                       if (set_poisoned(0)) ident = TRUE;
-                       break;
-
-               case SV_POTION_BOLDNESS:
-                       if (set_afraid(0)) ident = TRUE;
-                       break;
-
-               case SV_POTION_SPEED:
-                       if (!p_ptr->fast)
-                       {
-                               if (set_fast(randint1(25) + 15, FALSE)) ident = TRUE;
-                       }
-                       else
-                       {
-                               (void)set_fast(p_ptr->fast + 5, FALSE);
-                       }
-                       break;
-
-               case SV_POTION_RESIST_HEAT:
-                       if (set_oppose_fire(p_ptr->oppose_fire + randint1(10) + 10, FALSE))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_RESIST_COLD:
-                       if (set_oppose_cold(p_ptr->oppose_cold + randint1(10) + 10, FALSE))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_HEROISM:
-                       if (set_afraid(0)) ident = TRUE;
-                       if (set_hero(p_ptr->hero + randint1(25) + 25, FALSE)) ident = TRUE;
-                       if (hp_player(10)) ident = TRUE;
-                       break;
-
-               case SV_POTION_BESERK_STRENGTH:
-                       if (set_afraid(0)) ident = TRUE;
-                       if (set_shero(p_ptr->shero + randint1(25) + 25, FALSE)) ident = TRUE;
-                       if (hp_player(30)) ident = TRUE;
-                       break;
-
-               case SV_POTION_CURE_LIGHT:
-                       if (hp_player(damroll(2, 8))) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_cut(p_ptr->cut - 10)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_CURE_SERIOUS:
-                       if (hp_player(damroll(4, 8))) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_cut((p_ptr->cut / 2) - 50)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_CURE_CRITICAL:
-                       if (hp_player(damroll(6, 8))) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_HEALING:
-                       if (hp_player(300)) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_STAR_HEALING:
-                       if (hp_player(1200)) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_LIFE:
-                       chg_virtue(V_VITALITY, 1);
-                       chg_virtue(V_UNLIFE, -5);
-#ifdef JP
-                       msg_print("ÂÎÃæ¤ËÀ¸Ì¿ÎϤ¬Ëþ¤Á¤¢¤Õ¤ì¤Æ¤­¤¿¡ª");
-#else
-                       msg_print("You feel life flow through your body!");
-#endif
-
-                       restore_level();
-                       (void)set_poisoned(0);
-                       (void)set_blind(0);
-                       (void)set_confused(0);
-                       (void)set_image(0);
-                       (void)set_stun(0);
-                       (void)set_cut(0);
-                       (void)do_res_stat(A_STR);
-                       (void)do_res_stat(A_CON);
-                       (void)do_res_stat(A_DEX);
-                       (void)do_res_stat(A_WIS);
-                       (void)do_res_stat(A_INT);
-                       (void)do_res_stat(A_CHR);
-                       (void)set_shero(0,TRUE);
-                       update_stuff();
-                       hp_player(5000);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_RESTORE_MANA:
-                       if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                       {
-                               int i;
-                               for (i = 0; i < EATER_EXT*2; i++)
-                               {
-                                       p_ptr->magic_num1[i] += (p_ptr->magic_num2[i] < 10) ? EATER_CHARGE * 3 : p_ptr->magic_num2[i]*EATER_CHARGE/3;
-                                       if (p_ptr->magic_num1[i] > p_ptr->magic_num2[i]*EATER_CHARGE) p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE;
-                               }
-                               for (; i < EATER_EXT*3; i++)
-                               {
-                                       int k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2);
-                                       p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval;
-                                       if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0;
-                               }
-#ifdef JP
-                               msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£");
-#else
-                               msg_print("You feel your head clear.");
-#endif
-                               p_ptr->window |= (PW_PLAYER);
-                               ident = TRUE;
-                       }
-                       else if (p_ptr->csp < p_ptr->msp)
-                       {
-                               p_ptr->csp = p_ptr->msp;
-                               p_ptr->csp_frac = 0;
-#ifdef JP
-                               msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£");
-#else
-                               msg_print("You feel your head clear.");
-#endif
-
-                               p_ptr->redraw |= (PR_MANA);
-                               p_ptr->window |= (PW_PLAYER);
-                               p_ptr->window |= (PW_SPELL);
-                               ident = TRUE;
-                       }
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RESTORE_EXP:
-                       if (restore_level()) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_STR:
-                       if (do_res_stat(A_STR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_INT:
-                       if (do_res_stat(A_INT)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_WIS:
-                       if (do_res_stat(A_WIS)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_DEX:
-                       if (do_res_stat(A_DEX)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_CON:
-                       if (do_res_stat(A_CON)) ident = TRUE;
-                       break;
-
-               case SV_POTION_RES_CHR:
-                       if (do_res_stat(A_CHR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_STR:
-                       if (do_inc_stat(A_STR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_INT:
-                       if (do_inc_stat(A_INT)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_WIS:
-                       if (do_inc_stat(A_WIS)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_DEX:
-                       if (do_inc_stat(A_DEX)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_CON:
-                       if (do_inc_stat(A_CON)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INC_CHR:
-                       if (do_inc_stat(A_CHR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_AUGMENTATION:
-                       if (do_inc_stat(A_STR)) ident = TRUE;
-                       if (do_inc_stat(A_INT)) ident = TRUE;
-                       if (do_inc_stat(A_WIS)) ident = TRUE;
-                       if (do_inc_stat(A_DEX)) ident = TRUE;
-                       if (do_inc_stat(A_CON)) ident = TRUE;
-                       if (do_inc_stat(A_CHR)) ident = TRUE;
-                       break;
-
-               case SV_POTION_ENLIGHTENMENT:
-#ifdef JP
-                       msg_print("¼«Ê¬¤ÎÃÖ¤«¤ì¤Æ¤¤¤ë¾õ¶·¤¬Ç¾Î¢¤ËÉ⤫¤ó¤Ç¤­¤¿...");
-#else
-                       msg_print("An image of your surroundings forms in your mind...");
-#endif
-
-                       chg_virtue(V_KNOWLEDGE, 1);
-                       chg_virtue(V_ENLIGHTEN, 1);
-                       wiz_lite(FALSE);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_STAR_ENLIGHTENMENT:
-#ifdef JP
-                       msg_print("¹¹¤Ê¤ë·¼Ìؤò´¶¤¸¤¿...");
-#else
-                       msg_print("You begin to feel more enlightened...");
-#endif
-
-                       chg_virtue(V_KNOWLEDGE, 1);
-                       chg_virtue(V_ENLIGHTEN, 2);
-                       msg_print(NULL);
-                       wiz_lite(FALSE);
-                       (void)do_inc_stat(A_INT);
-                       (void)do_inc_stat(A_WIS);
-                       (void)detect_traps(DETECT_RAD_DEFAULT, TRUE);
-                       (void)detect_doors(DETECT_RAD_DEFAULT);
-                       (void)detect_stairs(DETECT_RAD_DEFAULT);
-                       (void)detect_treasure(DETECT_RAD_DEFAULT);
-                       (void)detect_objects_gold(DETECT_RAD_DEFAULT);
-                       (void)detect_objects_normal(DETECT_RAD_DEFAULT);
-                       identify_pack();
-                       self_knowledge();
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_SELF_KNOWLEDGE:
-#ifdef JP
-                       msg_print("¼«Ê¬¼«¿È¤Î¤³¤È¤¬¾¯¤·¤Ïʬ¤«¤Ã¤¿µ¤¤¬¤¹¤ë...");
-#else
-                       msg_print("You begin to know yourself a little better...");
-#endif
-
-                       msg_print(NULL);
-                       self_knowledge();
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_EXPERIENCE:
-                       if (p_ptr->prace == RACE_ANDROID) break;
-                       chg_virtue(V_ENLIGHTEN, 1);
-                       if (p_ptr->exp < PY_MAX_EXP)
-                       {
-                               s32b ee = (p_ptr->exp / 2) + 10;
-                               if (ee > 100000L) ee = 100000L;
-#ifdef JP
-                               msg_print("¹¹¤Ë·Ð¸³¤òÀѤó¤À¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
-#else
-                               msg_print("You feel more experienced.");
-#endif
-
-                               gain_exp(ee);
-                               ident = TRUE;
-                       }
-                       break;
-
-               case SV_POTION_RESISTANCE:
-                       (void)set_oppose_acid(p_ptr->oppose_acid + randint1(20) + 20, FALSE);
-                       (void)set_oppose_elec(p_ptr->oppose_elec + randint1(20) + 20, FALSE);
-                       (void)set_oppose_fire(p_ptr->oppose_fire + randint1(20) + 20, FALSE);
-                       (void)set_oppose_cold(p_ptr->oppose_cold + randint1(20) + 20, FALSE);
-                       (void)set_oppose_pois(p_ptr->oppose_pois + randint1(20) + 20, FALSE);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_CURING:
-                       if (hp_player(50)) ident = TRUE;
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_image(0)) ident = TRUE;
-                       break;
-
-               case SV_POTION_INVULNERABILITY:
-                       (void)set_invuln(p_ptr->invuln + randint1(4) + 4, FALSE);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_NEW_LIFE:
-                       do_cmd_rerate(FALSE);
-                       get_max_stats();
-                       p_ptr->update |= PU_BONUS;
-                       if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3)
-                       {
-                               chg_virtue(V_CHANCE, -5);
-#ifdef JP
-msg_print("Á´¤Æ¤ÎÆÍÁ³ÊÑ°Û¤¬¼£¤Ã¤¿¡£");
-#else
-                               msg_print("You are cured of all mutations.");
-#endif
-
-                               p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-                               p_ptr->update |= PU_BONUS;
-                               handle_stuff();
-                               mutant_regenerate_mod = calc_mutant_regenerate_mod();
-                       }
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_NEO_TSUYOSHI:
-                       (void)set_image(0);
-                       (void)set_tsuyoshi(p_ptr->tsuyoshi + randint1(100) + 100, FALSE);
-                       ident = TRUE;
-                       break;
-
-               case SV_POTION_TSUYOSHI:
-#ifdef JP
-msg_print("¡Ö¥ª¥¯¥ì·»¤µ¤ó¡ª¡×");
-#else
-                       msg_print("Brother OKURE!");
-#endif
-                       msg_print(NULL);
-                       p_ptr->tsuyoshi = 1;
-                       (void)set_tsuyoshi(0, TRUE);
-                       if (!p_ptr->resist_chaos)
-                       {
-                               (void)set_image(50 + randint1(50));
-                       }
-                       ident = TRUE;
-                       break;
-               
-               case SV_POTION_POLYMORPH:
-                       if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && one_in_(23))
-                       {
-                               chg_virtue(V_CHANCE, -5);
-#ifdef JP
-msg_print("Á´¤Æ¤ÎÆÍÁ³ÊÑ°Û¤¬¼£¤Ã¤¿¡£");
-#else
-                               msg_print("You are cured of all mutations.");
-#endif
-
-                               p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-                               p_ptr->update |= PU_BONUS;
-                               handle_stuff();
-                       }
-                       else
-                       {
-                               do
-                               {
-                                       if (one_in_(2))
-                                       {
-                                               if(gain_random_mutation(0)) ident = TRUE;
-                                       }
-                                       else if (lose_mutation(0)) ident = TRUE;
-                               } while(!ident || one_in_(2));
-                       }
-                       break;
-               }
-       }
-
-       if (prace_is_(RACE_SKELETON))
-       {
-#ifdef JP
-msg_print("±ÕÂΤΰìÉô¤Ï¤¢¤Ê¤¿¤Î¥¢¥´¤òÁÇÄ̤ꤷ¤ÆÍî¤Á¤¿¡ª");
-#else
-               msg_print("Some of the fluid falls through your jaws!");
-#endif
-
-               (void)potion_smash_effect(0, py, px, q_ptr->k_idx);
-       }
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(q_ptr)))
-       {
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-               chg_virtue(V_KNOWLEDGE, -1);
-       }
-
-       /* The item has been tried */
-       object_tried(q_ptr);
-
-       /* An identification was made */
-       if (ident && !object_is_aware(q_ptr))
-       {
-               object_aware(q_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-       /* Potions can feed the player */
-       switch (p_ptr->mimic_form)
-       {
-       case MIMIC_NONE:
-               switch (p_ptr->prace)
-               {
-                       case RACE_VAMPIRE:
-                               (void)set_food(p_ptr->food + (q_ptr->pval / 10));
-                               break;
-                       case RACE_SKELETON:
-                               /* Do nothing */
-                               break;
-                       case RACE_GOLEM:
-                       case RACE_ZOMBIE:
-                       case RACE_DEMON:
-                       case RACE_SPECTRE:
-                               set_food(p_ptr->food + ((q_ptr->pval) / 20));
-                               break;
-                       case RACE_ANDROID:
-                               if (q_ptr->tval == TV_FLASK)
-                               {
-#ifdef JP
-                                       msg_print("¥ª¥¤¥ë¤òÊäµë¤·¤¿¡£");
-#else
-                                       msg_print("You replenish yourself with the oil.");
-#endif
-                                       set_food(p_ptr->food + 5000);
-                               }
-                               else
-                               {
-                                       set_food(p_ptr->food + ((q_ptr->pval) / 20));
-                               }
-                               break;
-                       case RACE_ENT:
-#ifdef JP
-                               msg_print("¿åʬ¤ò¼è¤ê¹þ¤ó¤À¡£");
-#else
-                               msg_print("You are moistened.");
-#endif
-                               set_food(MIN(p_ptr->food + q_ptr->pval + MAX(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
-                               break;
-                       default:
-                               (void)set_food(p_ptr->food + q_ptr->pval);
-                               break;
-               }
-               break;
-       case MIMIC_DEMON:
-       case MIMIC_DEMON_LORD:
-               set_food(p_ptr->food + ((q_ptr->pval) / 20));
-               break;
-       case MIMIC_VAMPIRE:
-               (void)set_food(p_ptr->food + (q_ptr->pval / 10));
-               break;
-       default:
-               (void)set_food(p_ptr->food + q_ptr->pval);
-               break;
-       }
-}
-
-
-/*
- * Hook to determine if an object can be quaffed
- */
-static bool item_tester_hook_quaff(object_type *o_ptr)
-{
-       if (o_ptr->tval == TV_POTION) return TRUE;
-
-       if (prace_is_(RACE_ANDROID))
-       {
-               if (o_ptr->tval == TV_FLASK && o_ptr->sval == SV_FLASK_OIL)
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
-
-/*
- * Quaff some potion (from the pack or floor)
- */
-void do_cmd_quaff_potion(void)
-{
-       int  item;
-       cptr q, s;
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Restrict choices to potions */
-       item_tester_hook = item_tester_hook_quaff;
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤ÎÌô¤ò°û¤ß¤Þ¤¹¤«? ";
-       s = "°û¤á¤ëÌô¤¬¤Ê¤¤¡£";
-#else
-       q = "Quaff which potion? ";
-       s = "You have no potions to quaff.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Quaff the potion */
-       do_cmd_quaff_potion_aux(item);
-}
-
-
-/*
- * Read a scroll (from the pack or floor).
- *
- * Certain scrolls can be "aborted" without losing the scroll.  These
- * include scrolls with no effects but recharge or identify, which are
- * cancelled before use.  XXX Reading them still takes a turn, though.
- */
-static void do_cmd_read_scroll_aux(int item, bool known)
-{
-       int         k, used_up, ident, lev;
-       object_type *o_ptr;
-       char        Rumor[1024];
-
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-
-       /* Take a turn */
-       energy_use = 100;
-
-       if (world_player)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("»ß¤Þ¤Ã¤¿»þ¤ÎÃæ¤Ç¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤è¤¦¤À¡£");
-#else
-               msg_print("Nothing happen.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       if (p_ptr->pclass == CLASS_BERSERKER)
-       {
-#ifdef JP
-               msg_print("´¬Êª¤Ê¤ó¤ÆÆɤá¤Ê¤¤¡£");
-#else
-               msg_print("You cannot read.");
-#endif
-               return;
-       }
-
-       if (music_singing_any()) stop_singing();
-
-       /* Hex */
-       if (hex_spelling_any() && ((p_ptr->lev < 35) || hex_spell_fully())) stop_hex_spell_all();
-
-       /* Not identified yet */
-       ident = FALSE;
-
-       /* Object level */
-       lev = k_info[o_ptr->k_idx].level;
-
-       /* Assume the scroll will get used up */
-       used_up = TRUE;
-
-       if (o_ptr->tval == TV_SCROLL)
-       {
-       /* Analyze the scroll */
-       switch (o_ptr->sval)
-       {
-               case SV_SCROLL_DARKNESS:
-               {
-                       if (!(p_ptr->resist_blind) && !(p_ptr->resist_dark))
-                       {
-                               (void)set_blind(p_ptr->blind + 3 + randint1(5));
-                       }
-                       if (unlite_area(10, 3)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_AGGRAVATE_MONSTER:
-               {
-#ifdef JP
-                       msg_print("¥«¥ó¹â¤¯¤¦¤Ê¤ëÍͤʲ»¤¬ÊÕ¤ê¤òʤ¤Ã¤¿¡£");
-#else
-                       msg_print("There is a high pitched humming noise.");
-#endif
-
-                       aggravate_monsters(0);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_CURSE_ARMOR:
-               {
-                       if (curse_armor()) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_CURSE_WEAPON:
-               {
-                       k = 0;
-                       if (buki_motteruka(INVEN_RARM))
-                       {
-                               k = INVEN_RARM;
-                               if (buki_motteruka(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;
-                       }
-                       else if (buki_motteruka(INVEN_LARM)) k = INVEN_LARM;
-                       if (k && curse_weapon(FALSE, k)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_SUMMON_MONSTER:
-               {
-                       for (k = 0; k < randint1(3); k++)
-                       {
-                               if (summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_SUMMON_UNDEAD:
-               {
-                       for (k = 0; k < randint1(3); k++)
-                       {
-                               if (summon_specific(0, py, px, dun_level, SUMMON_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_SUMMON_PET:
-               {
-                       if (summon_specific(-1, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_FORCE_PET)))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_SUMMON_KIN:
-               {
-                       if (summon_kin_player(p_ptr->lev, py, px, (PM_FORCE_PET | PM_ALLOW_GROUP)))
-                       {
-                               ident = TRUE;
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_TRAP_CREATION:
-               {
-                       if (trap_creation(py, px)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_PHASE_DOOR:
-               {
-                       teleport_player(10, 0L);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_TELEPORT:
-               {
-                       teleport_player(100, 0L);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_TELEPORT_LEVEL:
-               {
-                       (void)teleport_level(0);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_WORD_OF_RECALL:
-               {
-                       if (!word_of_recall()) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_IDENTIFY:
-               {
-                       if (!ident_spell(FALSE)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_STAR_IDENTIFY:
-               {
-                       if (!identify_fully(FALSE)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_REMOVE_CURSE:
-               {
-                       if (remove_curse())
-                       {
-#ifdef JP
-                               msg_print("狼¤Ë¸«¼é¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
-#else
-                               msg_print("You feel as if someone is watching over you.");
-#endif
-
-                               ident = TRUE;
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_STAR_REMOVE_CURSE:
-               {
-                       if (remove_all_curse())
-                       {
-#ifdef JP
-                               msg_print("狼¤Ë¸«¼é¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
-#else
-                               msg_print("You feel as if someone is watching over you.");
-#endif
-                       }
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_ENCHANT_ARMOR:
-               {
-                       ident = TRUE;
-                       if (!enchant_spell(0, 0, 1)) used_up = FALSE;
-                       break;
-               }
-
-               case SV_SCROLL_ENCHANT_WEAPON_TO_HIT:
-               {
-                       if (!enchant_spell(1, 0, 0)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_ENCHANT_WEAPON_TO_DAM:
-               {
-                       if (!enchant_spell(0, 1, 0)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_STAR_ENCHANT_ARMOR:
-               {
-                       if (!enchant_spell(0, 0, randint1(3) + 2)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_STAR_ENCHANT_WEAPON:
-               {
-                       if (!enchant_spell(randint1(3), randint1(3), 0)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_RECHARGING:
-               {
-                       if (!recharge(130)) used_up = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_MUNDANITY:
-               {
-                       ident = TRUE;
-                       if (!mundane_spell(FALSE)) used_up = FALSE;
-                       break;
-               }
-
-               case SV_SCROLL_LIGHT:
-               {
-                       if (lite_area(damroll(2, 8), 2)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_MAPPING:
-               {
-                       map_area(DETECT_RAD_MAP);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_DETECT_GOLD:
-               {
-                       if (detect_treasure(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_objects_gold(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_DETECT_ITEM:
-               {
-                       if (detect_objects_normal(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_DETECT_TRAP:
-               {
-                       if (detect_traps(DETECT_RAD_DEFAULT, known)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_DETECT_DOOR:
-               {
-                       if (detect_doors(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_stairs(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_DETECT_INVIS:
-               {
-                       if (detect_monsters_invis(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_SATISFY_HUNGER:
-               {
-                       if (set_food(PY_FOOD_MAX - 1)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_BLESSING:
-               {
-                       if (set_blessed(p_ptr->blessed + randint1(12) + 6, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_HOLY_CHANT:
-               {
-                       if (set_blessed(p_ptr->blessed + randint1(24) + 12, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_HOLY_PRAYER:
-               {
-                       if (set_blessed(p_ptr->blessed + randint1(48) + 24, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_MONSTER_CONFUSION:
-               {
-                       if (!(p_ptr->special_attack & ATTACK_CONFUSE))
-                       {
-#ifdef JP
-                               msg_print("¼ê¤¬µ±¤­»Ï¤á¤¿¡£");
-#else
-                               msg_print("Your hands begin to glow.");
-#endif
-
-                               p_ptr->special_attack |= ATTACK_CONFUSE;
-                               p_ptr->redraw |= (PR_STATUS);
-                               ident = TRUE;
-                       }
-                       break;
-               }
-
-               case SV_SCROLL_PROTECTION_FROM_EVIL:
-               {
-                       k = 3 * p_ptr->lev;
-                       if (set_protevil(p_ptr->protevil + randint1(25) + k, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_RUNE_OF_PROTECTION:
-               {
-                       warding_glyph();
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_TRAP_DOOR_DESTRUCTION:
-               {
-                       if (destroy_doors_touch()) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_STAR_DESTRUCTION:
-               {
-                       if (destroy_area(py, px, 13 + randint0(5), FALSE))
-                               ident = TRUE;
-                       else
-#ifdef JP
-msg_print("¥À¥ó¥¸¥ç¥ó¤¬Íɤ줿...");
-#else
-                               msg_print("The dungeon trembles...");
-#endif
-
-
-                       break;
-               }
-
-               case SV_SCROLL_DISPEL_UNDEAD:
-               {
-                       if (dispel_undead(80)) ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_SPELL:
-               {
-                       if ((p_ptr->pclass == CLASS_WARRIOR) ||
-                               (p_ptr->pclass == CLASS_IMITATOR) ||
-                               (p_ptr->pclass == CLASS_MINDCRAFTER) ||
-                               (p_ptr->pclass == CLASS_SORCERER) ||
-                               (p_ptr->pclass == CLASS_ARCHER) ||
-                               (p_ptr->pclass == CLASS_MAGIC_EATER) ||
-                               (p_ptr->pclass == CLASS_RED_MAGE) ||
-                               (p_ptr->pclass == CLASS_SAMURAI) ||
-                               (p_ptr->pclass == CLASS_BLUE_MAGE) ||
-                               (p_ptr->pclass == CLASS_CAVALRY) ||
-                               (p_ptr->pclass == CLASS_BERSERKER) ||
-                               (p_ptr->pclass == CLASS_SMITH) ||
-                               (p_ptr->pclass == CLASS_MIRROR_MASTER) ||
-                               (p_ptr->pclass == CLASS_NINJA) ||
-                               (p_ptr->pclass == CLASS_SNIPER)) break;
-                       p_ptr->add_spells++;
-                       p_ptr->update |= (PU_SPELLS);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_GENOCIDE:
-               {
-                       (void)symbol_genocide(300, TRUE);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_MASS_GENOCIDE:
-               {
-                       (void)mass_genocide(300, TRUE);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_ACQUIREMENT:
-               {
-                       acquirement(py, px, 1, TRUE, FALSE);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_STAR_ACQUIREMENT:
-               {
-                       acquirement(py, px, randint1(2) + 1, TRUE, FALSE);
-                       ident = TRUE;
-                       break;
-               }
-
-               /* New Hengband scrolls */
-               case SV_SCROLL_FIRE:
-               {
-                       fire_ball(GF_FIRE, 0, 666, 4);
-                       /* Note: "Double" damage since it is centered on the player ... */
-                       if (!(IS_OPPOSE_FIRE() || p_ptr->resist_fire || p_ptr->immune_fire))
-#ifdef JP
-take_hit(DAMAGE_NOESCAPE, 50+randint1(50), "±ê¤Î´¬Êª", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, 50 + randint1(50), "a Scroll of Fire", -1);
-#endif
-
-                       ident = TRUE;
-                       break;
-               }
-
-
-               case SV_SCROLL_ICE:
-               {
-                       fire_ball(GF_ICE, 0, 777, 4);
-                       if (!(IS_OPPOSE_COLD() || p_ptr->resist_cold || p_ptr->immune_cold))
-#ifdef JP
-take_hit(DAMAGE_NOESCAPE, 100+randint1(100), "ɹ¤Î´¬Êª", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, 100 + randint1(100), "a Scroll of Ice", -1);
-#endif
-
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_CHAOS:
-               {
-                       fire_ball(GF_CHAOS, 0, 1000, 4);
-                       if (!p_ptr->resist_chaos)
-#ifdef JP
-take_hit(DAMAGE_NOESCAPE, 111+randint1(111), "¥í¥°¥ë¥¹¤Î´¬Êª", -1);
-#else
-                               take_hit(DAMAGE_NOESCAPE, 111 + randint1(111), "a Scroll of Logrus", -1);
-#endif
-
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_RUMOR:
-               {
-#ifdef JP
-                       msg_print("´¬Êª¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬½ñ¤«¤ì¤Æ¤¤¤ë:");
-#else
-                       msg_print("There is message on the scroll. It says:");
-#endif
-
-                       msg_print(NULL);
-                       display_rumor(TRUE);
-                       msg_print(NULL);
-#ifdef JP
-                       msg_print("´¬Êª¤Ï±ì¤òΩ¤Æ¤Æ¾Ã¤¨µî¤Ã¤¿¡ª");
-#else
-                       msg_print("The scroll disappears in a puff of smoke!");
-#endif
-
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_SCROLL_ARTIFACT:
-               {
-                       ident = TRUE;
-                       if (!artifact_scroll()) used_up = FALSE;
-                       break;
-               }
-
-               case SV_SCROLL_RESET_RECALL:
-               {
-                       ident = TRUE;
-                       if (!reset_recall()) used_up = FALSE;
-                       break;
-               }
-       }
-       }
-       else if (o_ptr->name1 == ART_GHB)
-       {
-#ifdef JP
-               msg_print("»ä¤Ï¶ìÏ«¤·¤Æ¡Ø¥°¥ì¡¼¥¿¡¼¡¦¥Ø¥ë=¥Ó¡¼¥¹¥È¡Ù¤òÅݤ·¤¿¡£");
-               msg_print("¤·¤«¤·¼ê¤ËÆþ¤Ã¤¿¤Î¤Ï¤³¤Î¤­¤¿¤Ê¤¤£Ô¥·¥ã¥Ä¤À¤±¤À¤Ã¤¿¡£");
-#else
-               msg_print("I had a very hard time to kill the Greater hell-beast, ");
-               msg_print("but all I got was this lousy t-shirt!");
-#endif
-               used_up = FALSE;
-       }
-       else if (o_ptr->name1 == ART_POWER)
-       {
-#ifdef JP
-               msg_print("¡Ö°ì¤Ä¤Î»ØÎؤÏÁ´¤Æ¤òÅý¤Ù¡¢");
-               msg_print(NULL);
-               msg_print("°ì¤Ä¤Î»ØÎؤÏÁ´¤Æ¤ò¸«¤Ä¤±¡¢");
-               msg_print(NULL);
-               msg_print("°ì¤Ä¤Î»ØÎؤÏÁ´¤Æ¤òÊá¤é¤¨¤Æ");
-               msg_print(NULL);
-               msg_print("°Å°Ç¤ÎÃæ¤Ë·Ò¤®¤È¤á¤ë¡£¡×");
-#else
-               msg_print("'One Ring to rule them all, ");
-               msg_print(NULL);
-               msg_print("One Ring to find them, ");
-               msg_print(NULL);
-               msg_print("One Ring to bring them all ");
-               msg_print(NULL);
-               msg_print("and in the darkness bind them.'");
-#endif
-               used_up = FALSE;
-       }
-       else if (o_ptr->tval==TV_PARCHMENT)
-       {
-               cptr q;
-               char o_name[MAX_NLEN];
-               char buf[1024];
-
-               /* Save screen */
-               screen_save();
-
-               q=format("book-%d_jp.txt",o_ptr->sval);
-
-               /* Display object description */
-               object_desc(o_name, o_ptr, OD_NAME_ONLY);
-
-               /* Build the filename */
-               path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q);
-
-               /* Peruse the help file */
-               (void)show_file(TRUE, buf, o_name, 0, 0);
-
-               /* Load screen */
-               screen_load();
-
-               used_up=FALSE;
-       }
-
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-               chg_virtue(V_KNOWLEDGE, -1);
-       }
-
-       /* The item was tried */
-       object_tried(o_ptr);
-
-       /* An identification was made */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-
-       /* Hack -- allow certain scrolls to be "preserved" */
-       if (!used_up)
-       {
-               return;
-       }
-
-       sound(SOUND_SCROLL);
-
-       /* Destroy a scroll in the pack */
-       if (item >= 0)
-       {
-               inven_item_increase(item, -1);
-               inven_item_describe(item);
-               inven_item_optimize(item);
-       }
-
-       /* Destroy a scroll on the floor */
-       else
-       {
-               floor_item_increase(0 - item, -1);
-               floor_item_describe(0 - item);
-               floor_item_optimize(0 - item);
-       }
-}
-
-
-/*
- * Hook to determine if an object is readable
- */
-static bool item_tester_hook_readable(object_type *o_ptr)
-{
-       if ((o_ptr->tval==TV_SCROLL) || (o_ptr->tval==TV_PARCHMENT) || (o_ptr->name1 == ART_GHB) || (o_ptr->name1 == ART_POWER)) return (TRUE);
-
-       /* Assume not */
-       return (FALSE);
-}
-
-
-void do_cmd_read_scroll(void)
-{
-       object_type *o_ptr;
-       int  item;
-       cptr q, s;
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Check some conditions */
-       if (p_ptr->blind)
-       {
-#ifdef JP
-               msg_print("Ìܤ¬¸«¤¨¤Ê¤¤¡£");
-#else
-               msg_print("You can't see anything.");
-#endif
-
-               return;
-       }
-       if (no_lite())
-       {
-#ifdef JP
-               msg_print("ÌÀ¤«¤ê¤¬¤Ê¤¤¤Î¤Ç¡¢°Å¤¯¤ÆÆɤá¤Ê¤¤¡£");
-#else
-               msg_print("You have no light to read by.");
-#endif
-
-               return;
-       }
-       if (p_ptr->confused)
-       {
-#ifdef JP
-               msg_print("º®Í𤷤Ƥ¤¤ÆÆɤá¤Ê¤¤¡£");
-#else
-               msg_print("You are too confused!");
-#endif
-
-               return;
-       }
-
-
-       /* Restrict choices to scrolls */
-       item_tester_hook = item_tester_hook_readable;
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤Î´¬Êª¤òÆɤߤޤ¹¤«? ";
-       s = "Æɤá¤ë´¬Êª¤¬¤Ê¤¤¡£";
-#else
-       q = "Read which scroll? ";
-       s = "You have no scrolls to read.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-       /* Read the scroll */
-       do_cmd_read_scroll_aux(item, object_is_aware(o_ptr));
-}
-
-
-static int staff_effect(int sval, bool *use_charge, bool magic, bool known)
-{
-       int k;
-       int ident = FALSE;
-
-       /* Analyze the staff */
-       switch (sval)
-       {
-               case SV_STAFF_DARKNESS:
-               {
-                       if (!(p_ptr->resist_blind) && !(p_ptr->resist_dark))
-                       {
-                               if (set_blind(p_ptr->blind + 3 + randint1(5))) ident = TRUE;
-                       }
-                       if (unlite_area(10, 3)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_SLOWNESS:
-               {
-                       if (set_slow(p_ptr->slow + randint1(30) + 15, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_HASTE_MONSTERS:
-               {
-                       if (speed_monsters()) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_SUMMONING:
-               {
-                       for (k = 0; k < randint1(4); k++)
-                       {
-                               if (summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
-                               {
-                                       ident = TRUE;
-                               }
-                       }
-                       break;
-               }
-
-               case SV_STAFF_TELEPORTATION:
-               {
-                       teleport_player(100, 0L);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_IDENTIFY:
-               {
-                       if (!ident_spell(FALSE)) *use_charge = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_REMOVE_CURSE:
-               {
-                       if (remove_curse())
-                       {
-                               if (magic)
-                               {
-#ifdef JP
-                                       msg_print("狼¤Ë¸«¼é¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
-#else
-                                       msg_print("You feel as if someone is watching over you.");
-#endif
-                               }
-                               else if (!p_ptr->blind)
-                               {
-#ifdef JP
-                                       msg_print("¾ó¤Ï°ì½Ö¥Ö¥ë¡¼¤Ëµ±¤¤¤¿...");
-#else
-                                       msg_print("The staff glows blue for a moment...");
-#endif
-
-                               }
-                               ident = TRUE;
-                       }
-                       break;
-               }
-
-               case SV_STAFF_STARLITE:
-               {
-                       int num = damroll(5, 3);
-                       int y, x;
-                       int attempts;
-
-                       if (!p_ptr->blind && !magic)
-                       {
-#ifdef JP
-                               msg_print("¾ó¤ÎÀ褬ÌÀ¤ë¤¯µ±¤¤¤¿...");
-#else
-                               msg_print("The end of the staff glows brightly...");
-#endif
-
-                       }
-                       for (k = 0; k < num; k++)
-                       {
-                               attempts = 1000;
-
-                               while (attempts--)
-                               {
-                                       scatter(&y, &x, py, px, 4, 0);
-
-                                       if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
-
-                                       if (!player_bold(y, x)) break;
-                               }
-
-                               project(0, 0, y, x, damroll(6 + p_ptr->lev / 8, 10), GF_LITE_WEAK,
-                                                 (PROJECT_BEAM | PROJECT_THRU | PROJECT_GRID | PROJECT_KILL), -1);
-                       }
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_LITE:
-               {
-                       if (lite_area(damroll(2, 8), 2)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_MAPPING:
-               {
-                       map_area(DETECT_RAD_MAP);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_GOLD:
-               {
-                       if (detect_treasure(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_objects_gold(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_ITEM:
-               {
-                       if (detect_objects_normal(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_TRAP:
-               {
-                       if (detect_traps(DETECT_RAD_DEFAULT, known)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_DOOR:
-               {
-                       if (detect_doors(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_stairs(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_INVIS:
-               {
-                       if (detect_monsters_invis(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DETECT_EVIL:
-               {
-                       if (detect_monsters_evil(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_CURE_LIGHT:
-               {
-                       if (hp_player(damroll(2, 8))) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_CURING:
-               {
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_image(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_HEALING:
-               {
-                       if (hp_player(300)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_THE_MAGI:
-               {
-                       if (do_res_stat(A_INT)) ident = TRUE;
-                       if (p_ptr->csp < p_ptr->msp)
-                       {
-                               p_ptr->csp = p_ptr->msp;
-                               p_ptr->csp_frac = 0;
-                               ident = TRUE;
-#ifdef JP
-                               msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£");
-#else
-                               msg_print("You feel your head clear.");
-#endif
-
-                               p_ptr->redraw |= (PR_MANA);
-                               p_ptr->window |= (PW_PLAYER);
-                               p_ptr->window |= (PW_SPELL);
-                       }
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_SLEEP_MONSTERS:
-               {
-                       if (sleep_monsters()) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_SLOW_MONSTERS:
-               {
-                       if (slow_monsters()) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_SPEED:
-               {
-                       if (set_fast(randint1(30) + 15, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_PROBING:
-               {
-                       probing();
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_DISPEL_EVIL:
-               {
-                       if (dispel_evil(80)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_POWER:
-               {
-                       if (dispel_monsters(150)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_HOLINESS:
-               {
-                       if (dispel_evil(150)) ident = TRUE;
-                       k = 3 * p_ptr->lev;
-                       if (set_protevil((magic ? 0 : p_ptr->protevil) + randint1(25) + k, FALSE)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_afraid(0)) ident = TRUE;
-                       if (hp_player(50)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_GENOCIDE:
-               {
-                       (void)symbol_genocide((magic ? p_ptr->lev + 50 : 200), TRUE);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_STAFF_EARTHQUAKES:
-               {
-                       if (earthquake(py, px, 10))
-                               ident = TRUE;
-                       else
-#ifdef JP
-msg_print("¥À¥ó¥¸¥ç¥ó¤¬Íɤ줿¡£");
-#else
-                               msg_print("The dungeon trembles.");
-#endif
-
-
-                       break;
-               }
-
-               case SV_STAFF_DESTRUCTION:
-               {
-                       if (destroy_area(py, px, 13 + randint0(5), FALSE))
-                               ident = TRUE;
-
-                       break;
-               }
-
-               case SV_STAFF_ANIMATE_DEAD:
-               {
-                       if (animate_dead(0, py, px))
-                               ident = TRUE;
-
-                       break;
-               }
-
-               case SV_STAFF_MSTORM:
-               {
-#ifdef JP
-                       msg_print("¶¯ÎϤÊËâÎϤ¬Å¨¤ò°ú¤­Îö¤¤¤¿¡ª");
-#else
-                       msg_print("Mighty magics rend your enemies!");
-#endif
-                       project(0, 5, py, px,
-                               (randint1(200) + 300) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1);
-                       if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE))
-                       {
-#ifdef JP
-                               (void)take_hit(DAMAGE_NOESCAPE, 50, "¥³¥ó¥È¥í¡¼¥ë¤·Æñ¤¤¶¯ÎϤÊËâÎϤβòÊü", -1);
-#else
-                               (void)take_hit(DAMAGE_NOESCAPE, 50, "unleashing magics too mighty to control", -1);
-#endif
-                       }
-                       ident = TRUE;
-
-                       break;
-               }
-
-               case SV_STAFF_NOTHING:
-               {
-#ifdef JP
-                       msg_print("²¿¤âµ¯¤é¤Ê¤«¤Ã¤¿¡£");
-#else
-                       msg_print("Nothing happen.");
-#endif
-                       if (prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) ||
-                               prace_is_(RACE_ZOMBIE) || prace_is_(RACE_SPECTRE))
-#ifdef JP
-                               msg_print("¤â¤Ã¤¿¤¤¤Ê¤¤»ö¤ò¤·¤¿¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£¿©¤Ùʪ¤ÏÂçÀڤˤ·¤Ê¤¯¤Æ¤Ï¡£");
-#else
-                               msg_print("What a waste.  It's your food!");
-#endif
-                       break;
-               }
-       }
-       return ident;
-}
-
-/*
- * Use a staff.                        -RAK-
- *
- * One charge of one staff disappears.
- *
- * Hack -- staffs of identify can be "cancelled".
- */
-static void do_cmd_use_staff_aux(int item)
-{
-       int         ident, chance, lev;
-       object_type *o_ptr;
-
-
-       /* Hack -- let staffs of identify get aborted */
-       bool use_charge = TRUE;
-
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-
-       /* Mega-Hack -- refuse to use a pile from the ground */
-       if ((item < 0) && (o_ptr->number > 1))
-       {
-#ifdef JP
-               msg_print("¤Þ¤º¤Ï¾ó¤ò½¦¤ï¤Ê¤±¤ì¤Ð¡£");
-#else
-               msg_print("You must first pick up the staffs.");
-#endif
-
-               return;
-       }
-
-
-       /* Take a turn */
-       energy_use = 100;
-
-       /* Extract the item level */
-       lev = k_info[o_ptr->k_idx].level;
-       if (lev > 50) lev = 50 + (lev - 50)/2;
-
-       /* Base chance of success */
-       chance = p_ptr->skill_dev;
-
-       /* Confusion hurts skill */
-       if (p_ptr->confused) chance = chance / 2;
-
-       /* Hight level objects are harder */
-       chance = chance - lev;
-
-       /* Give everyone a (slight) chance */
-       if ((chance < USE_DEVICE) && one_in_(USE_DEVICE - chance + 1))
-       {
-               chance = USE_DEVICE;
-       }
-
-       if (world_player)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("»ß¤Þ¤Ã¤¿»þ¤ÎÃæ¤Ç¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤è¤¦¤À¡£");
-#else
-               msg_print("Nothing happen. Maybe this staff is freezing too.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       /* Roll for usage */
-       if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¾ó¤ò¤¦¤Þ¤¯»È¤¨¤Ê¤«¤Ã¤¿¡£");
-#else
-               msg_print("You failed to use the staff properly.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       /* Notice empty staffs */
-       if (o_ptr->pval <= 0)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¤³¤Î¾ó¤Ë¤Ï¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
-#else
-               msg_print("The staff has no charges left.");
-#endif
-
-               o_ptr->ident |= (IDENT_EMPTY);
-
-               /* Combine / Reorder the pack (later) */
-               p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-               p_ptr->window |= (PW_INVEN);
-
-               return;
-       }
-
-
-       /* Sound */
-       sound(SOUND_ZAP);
-
-       ident = staff_effect(o_ptr->sval, &use_charge, FALSE, object_is_aware(o_ptr));
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-               chg_virtue(V_KNOWLEDGE, -1);
-       }
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       /* Tried the item */
-       object_tried(o_ptr);
-
-       /* An identification was made */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-
-       /* Hack -- some uses are "free" */
-       if (!use_charge) return;
-
-
-       /* Use a single charge */
-       o_ptr->pval--;
-
-       /* XXX Hack -- unstack if necessary */
-       if ((item >= 0) && (o_ptr->number > 1))
-       {
-               object_type forge;
-               object_type *q_ptr;
-
-               /* Get local object */
-               q_ptr = &forge;
-
-               /* Obtain a local object */
-               object_copy(q_ptr, o_ptr);
-
-               /* Modify quantity */
-               q_ptr->number = 1;
-
-               /* Restore the charges */
-               o_ptr->pval++;
-
-               /* Unstack the used item */
-               o_ptr->number--;
-               p_ptr->total_weight -= q_ptr->weight;
-               item = inven_carry(q_ptr);
-
-               /* Message */
-#ifdef JP
-               msg_print("¾ó¤ò¤Þ¤È¤á¤Ê¤ª¤·¤¿¡£");
-#else
-               msg_print("You unstack your staff.");
-#endif
-
-       }
-
-       /* Describe charges in the pack */
-       if (item >= 0)
-       {
-               inven_item_charges(item);
-       }
-
-       /* Describe charges on the floor */
-       else
-       {
-               floor_item_charges(0 - item);
-       }
-}
-
-
-void do_cmd_use_staff(void)
-{
-       int  item;
-       cptr q, s;
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Restrict choices to wands */
-       item_tester_tval = TV_STAFF;
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤Î¾ó¤ò»È¤¤¤Þ¤¹¤«? ";
-       s = "»È¤¨¤ë¾ó¤¬¤Ê¤¤¡£";
-#else
-       q = "Use which staff? ";
-       s = "You have no staff to use.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       do_cmd_use_staff_aux(item);
-}
-
-
-static int wand_effect(int sval, int dir, bool magic)
-{
-       int ident = FALSE;
-
-       /* XXX Hack -- Wand of wonder can do anything before it */
-       if (sval == SV_WAND_WONDER)
-       {
-               int vir = virtue_number(V_CHANCE);
-               sval = randint0(SV_WAND_WONDER);
-
-               if (vir)
-               {
-                       if (p_ptr->virtues[vir - 1] > 0)
-                       {
-                               while (randint1(300) < p_ptr->virtues[vir - 1]) sval++;
-                               if (sval > SV_WAND_COLD_BALL) sval = randint0(4) + SV_WAND_ACID_BALL;
-                       }
-                       else
-                       {
-                               while (randint1(300) < (0-p_ptr->virtues[vir - 1])) sval--;
-                               if (sval < SV_WAND_HEAL_MONSTER) sval = randint0(3) + SV_WAND_HEAL_MONSTER;
-                       }
-               }
-               if (sval < SV_WAND_TELEPORT_AWAY)
-                       chg_virtue(V_CHANCE, 1);
-       }
-
-       /* Analyze the wand */
-       switch (sval)
-       {
-               case SV_WAND_HEAL_MONSTER:
-               {
-                       if (heal_monster(dir, damroll(10, 10))) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_HASTE_MONSTER:
-               {
-                       if (speed_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_CLONE_MONSTER:
-               {
-                       if (clone_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_TELEPORT_AWAY:
-               {
-                       if (teleport_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_DISARMING:
-               {
-                       if (disarm_trap(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_TRAP_DOOR_DEST:
-               {
-                       if (destroy_door(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_STONE_TO_MUD:
-               {
-                       if (wall_to_mud(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_LITE:
-               {
-#ifdef JP
-                       msg_print("ÀĤ¯µ±¤¯¸÷Àþ¤¬Êü¤¿¤ì¤¿¡£");
-#else
-                       msg_print("A line of blue shimmering light appears.");
-#endif
-
-                       (void)lite_line(dir);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_SLEEP_MONSTER:
-               {
-                       if (sleep_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_SLOW_MONSTER:
-               {
-                       if (slow_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_CONFUSE_MONSTER:
-               {
-                       if (confuse_monster(dir, p_ptr->lev)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_FEAR_MONSTER:
-               {
-                       if (fear_monster(dir, p_ptr->lev)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_DRAIN_LIFE:
-               {
-                       if (drain_life(dir, 80 + p_ptr->lev)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_POLYMORPH:
-               {
-                       if (poly_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_STINKING_CLOUD:
-               {
-                       fire_ball(GF_POIS, dir, 12 + p_ptr->lev / 4, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_MAGIC_MISSILE:
-               {
-                       fire_bolt_or_beam(20, GF_MISSILE, dir, damroll(2 + p_ptr->lev / 10, 6));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_ACID_BOLT:
-               {
-                       fire_bolt_or_beam(20, GF_ACID, dir, damroll(6 + p_ptr->lev / 7, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_CHARM_MONSTER:
-               {
-                       if (charm_monster(dir, MAX(20, p_ptr->lev)))
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_FIRE_BOLT:
-               {
-                       fire_bolt_or_beam(20, GF_FIRE, dir, damroll(7 + p_ptr->lev / 6, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_COLD_BOLT:
-               {
-                       fire_bolt_or_beam(20, GF_COLD, dir, damroll(5 + p_ptr->lev / 8, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_ACID_BALL:
-               {
-                       fire_ball(GF_ACID, dir, 60 + 3 * p_ptr->lev / 4, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_ELEC_BALL:
-               {
-                       fire_ball(GF_ELEC, dir, 40 + 3 * p_ptr->lev / 4, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_FIRE_BALL:
-               {
-                       fire_ball(GF_FIRE, dir, 70 + 3 * p_ptr->lev / 4, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_COLD_BALL:
-               {
-                       fire_ball(GF_COLD, dir, 50 + 3 * p_ptr->lev / 4, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_WONDER:
-               {
-#ifdef JP
-                       msg_print("¤ª¤Ã¤È¡¢Ææ¤ÎËâË¡ËÀ¤ò»ÏÆ°¤µ¤»¤¿¡£");
-#else
-                       msg_print("Oops.  Wand of wonder activated.");
-#endif
-
-                       break;
-               }
-
-               case SV_WAND_DRAGON_FIRE:
-               {
-                       fire_ball(GF_FIRE, dir, 200, -3);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_DRAGON_COLD:
-               {
-                       fire_ball(GF_COLD, dir, 180, -3);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_DRAGON_BREATH:
-               {
-                       switch (randint1(5))
-                       {
-                               case 1:
-                               {
-                                       fire_ball(GF_ACID, dir, 240, -3);
-                                       break;
-                               }
-
-                               case 2:
-                               {
-                                       fire_ball(GF_ELEC, dir, 210, -3);
-                                       break;
-                               }
-
-                               case 3:
-                               {
-                                       fire_ball(GF_FIRE, dir, 240, -3);
-                                       break;
-                               }
-
-                               case 4:
-                               {
-                                       fire_ball(GF_COLD, dir, 210, -3);
-                                       break;
-                               }
-
-                               default:
-                               {
-                                       fire_ball(GF_POIS, dir, 180, -3);
-                                       break;
-                               }
-                       }
-
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_DISINTEGRATE:
-               {
-                       fire_ball(GF_DISINTEGRATE, dir, 200 + randint1(p_ptr->lev * 2), 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_ROCKETS:
-               {
-#ifdef JP
-msg_print("¥í¥±¥Ã¥È¤òȯ¼Í¤·¤¿¡ª");
-#else
-                       msg_print("You launch a rocket!");
-#endif
-
-                       fire_rocket(GF_ROCKET, dir, 250 + p_ptr->lev * 3, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_STRIKING:
-               {
-                       fire_bolt(GF_METEOR, dir, damroll(15 + p_ptr->lev / 3, 13));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_WAND_GENOCIDE:
-               {
-                       fire_ball_hide(GF_GENOCIDE, dir, magic ? p_ptr->lev + 50 : 250, 0);
-                       ident = TRUE;
-                       break;
-               }
-       }
-       return ident;
-}
-
-
-/*
- * Aim a wand (from the pack or floor).
- *
- * Use a single charge from a single item.
- * Handle "unstacking" in a logical manner.
- *
- * For simplicity, you cannot use a stack of items from the
- * ground.  This would require too much nasty code.
- *
- * There are no wands which can "destroy" themselves, in the inventory
- * or on the ground, so we can ignore this possibility.  Note that this
- * required giving "wand of wonder" the ability to ignore destruction
- * by electric balls.
- *
- * All wands can be "cancelled" at the "Direction?" prompt for free.
- *
- * Note that the basic "bolt" wands do slightly less damage than the
- * basic "bolt" rods, but the basic "ball" wands do the same damage
- * as the basic "ball" rods.
- */
-static void do_cmd_aim_wand_aux(int item)
-{
-       int         lev, ident, chance, dir;
-       object_type *o_ptr;
-       bool old_target_pet = target_pet;
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-       /* Mega-Hack -- refuse to aim a pile from the ground */
-       if ((item < 0) && (o_ptr->number > 1))
-       {
-#ifdef JP
-               msg_print("¤Þ¤º¤ÏËâË¡ËÀ¤ò½¦¤ï¤Ê¤±¤ì¤Ð¡£");
-#else
-               msg_print("You must first pick up the wands.");
-#endif
-
-               return;
-       }
-
-
-       /* Allow direction to be cancelled for free */
-       if (object_is_aware(o_ptr) && (o_ptr->sval == SV_WAND_HEAL_MONSTER
-                                     || o_ptr->sval == SV_WAND_HASTE_MONSTER))
-                       target_pet = TRUE;
-       if (!get_aim_dir(&dir))
-       {
-               target_pet = old_target_pet;
-               return;
-       }
-       target_pet = old_target_pet;
-
-       /* Take a turn */
-       energy_use = 100;
-
-       /* Get the level */
-       lev = k_info[o_ptr->k_idx].level;
-       if (lev > 50) lev = 50 + (lev - 50)/2;
-
-       /* Base chance of success */
-       chance = p_ptr->skill_dev;
-
-       /* Confusion hurts skill */
-       if (p_ptr->confused) chance = chance / 2;
-
-       /* Hight level objects are harder */
-       chance = chance - lev;
-
-       /* Give everyone a (slight) chance */
-       if ((chance < USE_DEVICE) && one_in_(USE_DEVICE - chance + 1))
-       {
-               chance = USE_DEVICE;
-       }
-
-       if (world_player)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("»ß¤Þ¤Ã¤¿»þ¤ÎÃæ¤Ç¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤è¤¦¤À¡£");
-#else
-               msg_print("Nothing happen. Maybe this wand is freezing too.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       /* Roll for usage */
-       if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("ËâË¡ËÀ¤ò¤¦¤Þ¤¯»È¤¨¤Ê¤«¤Ã¤¿¡£");
-#else
-               msg_print("You failed to use the wand properly.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       /* The wand is already empty! */
-       if (o_ptr->pval <= 0)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¤³¤ÎËâË¡ËÀ¤Ë¤Ï¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
-#else
-               msg_print("The wand has no charges left.");
-#endif
-
-               o_ptr->ident |= (IDENT_EMPTY);
-
-               /* Combine / Reorder the pack (later) */
-               p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-               p_ptr->window |= (PW_INVEN);
-
-               return;
-       }
-
-       /* Sound */
-       sound(SOUND_ZAP);
-
-       ident = wand_effect(o_ptr->sval, dir, FALSE);
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-               chg_virtue(V_KNOWLEDGE, -1);
-       }
-
-       /* Mark it as tried */
-       object_tried(o_ptr);
-
-       /* Apply identification */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-
-       /* Use a single charge */
-       o_ptr->pval--;
-
-       /* Describe the charges in the pack */
-       if (item >= 0)
-       {
-               inven_item_charges(item);
-       }
-
-       /* Describe the charges on the floor */
-       else
-       {
-               floor_item_charges(0 - item);
-       }
-}
-
-
-void do_cmd_aim_wand(void)
-{
-       int     item;
-       cptr    q, s;
-
-       /* Restrict choices to wands */
-       item_tester_tval = TV_WAND;
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤ÎËâË¡ËÀ¤ÇÁÀ¤¤¤Þ¤¹¤«? ";
-       s = "»È¤¨¤ëËâË¡ËÀ¤¬¤Ê¤¤¡£";
-#else
-       q = "Aim which wand? ";
-       s = "You have no wand to aim.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Aim the wand */
-       do_cmd_aim_wand_aux(item);
-}
-
-
-static int rod_effect(int sval, int dir, bool *use_charge, bool magic)
-{
-       int ident = FALSE;
-
-       /* Unused */
-       (void)magic;
-
-       /* Analyze the rod */
-       switch (sval)
-       {
-               case SV_ROD_DETECT_TRAP:
-               {
-                       if (detect_traps(DETECT_RAD_DEFAULT, (bool)(dir ? FALSE : TRUE))) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_DETECT_DOOR:
-               {
-                       if (detect_doors(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       if (detect_stairs(DETECT_RAD_DEFAULT)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_IDENTIFY:
-               {
-                       if (!ident_spell(FALSE)) *use_charge = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_RECALL:
-               {
-                       if (!word_of_recall()) *use_charge = FALSE;
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_ILLUMINATION:
-               {
-                       if (lite_area(damroll(2, 8), 2)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_MAPPING:
-               {
-                       map_area(DETECT_RAD_MAP);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_DETECTION:
-               {
-                       detect_all(DETECT_RAD_DEFAULT);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_PROBING:
-               {
-                       probing();
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_CURING:
-               {
-                       if (set_blind(0)) ident = TRUE;
-                       if (set_poisoned(0)) ident = TRUE;
-                       if (set_confused(0)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_image(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_HEALING:
-               {
-                       if (hp_player(500)) ident = TRUE;
-                       if (set_stun(0)) ident = TRUE;
-                       if (set_cut(0)) ident = TRUE;
-                       if (set_shero(0,TRUE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_RESTORATION:
-               {
-                       if (restore_level()) ident = TRUE;
-                       if (do_res_stat(A_STR)) ident = TRUE;
-                       if (do_res_stat(A_INT)) ident = TRUE;
-                       if (do_res_stat(A_WIS)) ident = TRUE;
-                       if (do_res_stat(A_DEX)) ident = TRUE;
-                       if (do_res_stat(A_CON)) ident = TRUE;
-                       if (do_res_stat(A_CHR)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_SPEED:
-               {
-                       if (set_fast(randint1(30) + 15, FALSE)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_PESTICIDE:
-               {
-                       if (dispel_monsters(4)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_TELEPORT_AWAY:
-               {
-                       if (teleport_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_DISARMING:
-               {
-                       if (disarm_trap(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_LITE:
-               {
-#ifdef JP
-                       msg_print("ÀĤ¯µ±¤¯¸÷Àþ¤¬Êü¤¿¤ì¤¿¡£");
-#else
-                       msg_print("A line of blue shimmering light appears.");
-#endif
-
-                       (void)lite_line(dir);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_SLEEP_MONSTER:
-               {
-                       if (sleep_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_SLOW_MONSTER:
-               {
-                       if (slow_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_DRAIN_LIFE:
-               {
-                       if (drain_life(dir, 70 + 3 * p_ptr->lev / 2)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_POLYMORPH:
-               {
-                       if (poly_monster(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_ACID_BOLT:
-               {
-                       fire_bolt_or_beam(10, GF_ACID, dir, damroll(6 + p_ptr->lev / 7, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_ELEC_BOLT:
-               {
-                       fire_bolt_or_beam(10, GF_ELEC, dir, damroll(4 + p_ptr->lev / 9, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_FIRE_BOLT:
-               {
-                       fire_bolt_or_beam(10, GF_FIRE, dir, damroll(7 + p_ptr->lev / 6, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_COLD_BOLT:
-               {
-                       fire_bolt_or_beam(10, GF_COLD, dir, damroll(5 + p_ptr->lev / 8, 8));
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_ACID_BALL:
-               {
-                       fire_ball(GF_ACID, dir, 60 + p_ptr->lev, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_ELEC_BALL:
-               {
-                       fire_ball(GF_ELEC, dir, 40 + p_ptr->lev, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_FIRE_BALL:
-               {
-                       fire_ball(GF_FIRE, dir, 70 + p_ptr->lev, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_COLD_BALL:
-               {
-                       fire_ball(GF_COLD, dir, 50 + p_ptr->lev, 2);
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_HAVOC:
-               {
-                       call_chaos();
-                       ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_STONE_TO_MUD:
-               {
-                       if (wall_to_mud(dir)) ident = TRUE;
-                       break;
-               }
-
-               case SV_ROD_AGGRAVATE:
+               case SV_ROD_PROBING:
                {
-                       aggravate_monsters(0);
+                       probing();
                        ident = TRUE;
-                       break;
-               }
-       }
-       return ident;
-}
-
-/*
- * Activate (zap) a Rod
- *
- * Unstack fully charged rods as needed.
- *
- * Hack -- rods of perception/genocide can be "cancelled"
- * All rods can be cancelled at the "Direction?" prompt
- *
- * pvals are defined for each rod in k_info. -LM-
- */
-static void do_cmd_zap_rod_aux(int item)
-{
-       int ident, chance, lev, fail;
-       int dir = 0;
-       object_type *o_ptr;
-       bool success;
-
-       /* Hack -- let perception get aborted */
-       bool use_charge = TRUE;
-
-       object_kind *k_ptr;
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-
-       /* Mega-Hack -- refuse to zap a pile from the ground */
-       if ((item < 0) && (o_ptr->number > 1))
-       {
-#ifdef JP
-               msg_print("¤Þ¤º¤Ï¥í¥Ã¥É¤ò½¦¤ï¤Ê¤±¤ì¤Ð¡£");
-#else
-               msg_print("You must first pick up the rods.");
-#endif
-
-               return;
-       }
-
-
-       /* Get a direction (unless KNOWN not to need it) */
-       if (((o_ptr->sval >= SV_ROD_MIN_DIRECTION) && (o_ptr->sval != SV_ROD_HAVOC) && (o_ptr->sval != SV_ROD_AGGRAVATE) && (o_ptr->sval != SV_ROD_PESTICIDE)) ||
-            !object_is_aware(o_ptr))
-       {
-               /* Get a direction, allow cancel */
-               if (!get_aim_dir(&dir)) return;
-       }
-
-
-       /* Take a turn */
-       energy_use = 100;
-
-       /* Extract the item level */
-       lev = k_info[o_ptr->k_idx].level;
-
-       /* Base chance of success */
-       chance = p_ptr->skill_dev;
-
-       /* Confusion hurts skill */
-       if (p_ptr->confused) chance = chance / 2;
-
-       fail = lev+5;
-       if (chance > fail) fail -= (chance - fail)*2;
-       else chance -= (fail - chance)*2;
-       if (fail < USE_DEVICE) fail = USE_DEVICE;
-       if (chance < USE_DEVICE) chance = USE_DEVICE;
-
-       if (world_player)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("»ß¤Þ¤Ã¤¿»þ¤ÎÃæ¤Ç¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤è¤¦¤À¡£");
-#else
-               msg_print("Nothing happen. Maybe this rod is freezing too.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
-       else if (chance > fail)
-       {
-               if (randint0(chance*2) < fail) success = FALSE;
-               else success = TRUE;
-       }
-       else
-       {
-               if (randint0(fail*2) < chance) success = TRUE;
-               else success = FALSE;
-       }
-
-       /* Roll for usage */
-       if (!success)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¤¦¤Þ¤¯¥í¥Ã¥É¤ò»È¤¨¤Ê¤«¤Ã¤¿¡£");
-#else
-               msg_print("You failed to use the rod properly.");
-#endif
-
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       k_ptr = &k_info[o_ptr->k_idx];
-
-       /* A single rod is still charging */
-       if ((o_ptr->number == 1) && (o_ptr->timeout))
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¤³¤Î¥í¥Ã¥É¤Ï¤Þ¤ÀËâÎϤò½¼Å¶¤·¤Æ¤¤¤ëºÇÃæ¤À¡£");
-#else
-               msg_print("The rod is still charging.");
-#endif
-
-               return;
-       }
-       /* A stack of rods lacks enough energy. */
-       else if ((o_ptr->number > 1) && (o_ptr->timeout > k_ptr->pval * (o_ptr->number - 1)))
-       {
-               if (flush_failure) flush();
-#ifdef JP
-msg_print("¤½¤Î¥í¥Ã¥É¤Ï¤Þ¤À½¼Å¶Ãæ¤Ç¤¹¡£");
-#else
-               msg_print("The rods are all still charging.");
-#endif
-
-               return;
-       }
-
-       /* Sound */
-       sound(SOUND_ZAP);
-
-       ident = rod_effect(o_ptr->sval, dir, &use_charge, FALSE);
-
-       /* Increase the timeout by the rod kind's pval. -LM- */
-       if (use_charge) o_ptr->timeout += k_ptr->pval;
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-               chg_virtue(V_KNOWLEDGE, -1);
-       }
-
-       /* Tried the object */
-       object_tried(o_ptr);
-
-       /* Successfully determined the object function */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-}
-
-
-void do_cmd_zap_rod(void)
-{
-       int item;
-       cptr q, s;
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Restrict choices to rods */
-       item_tester_tval = TV_ROD;
-
-       /* Get an item */
-#ifdef JP
-       q = "¤É¤Î¥í¥Ã¥É¤ò¿¶¤ê¤Þ¤¹¤«? ";
-       s = "»È¤¨¤ë¥í¥Ã¥É¤¬¤Ê¤¤¡£";
-#else
-       q = "Zap which rod? ";
-       s = "You have no rod to zap.";
-#endif
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Zap the rod */
-       do_cmd_zap_rod_aux(item);
-}
-
-
-/*
- * Hook to determine if an object is activatable
- */
-static bool item_tester_hook_activate(object_type *o_ptr)
-{
-       u32b flgs[TR_FLAG_SIZE];
-
-       /* Not known */
-       if (!object_is_known(o_ptr)) return (FALSE);
-
-       /* Extract the flags */
-       object_flags(o_ptr, flgs);
-
-       /* Check activation flag */
-       if (have_flag(flgs, TR_ACTIVATE)) return (TRUE);
-
-       /* Assume not */
-       return (FALSE);
-}
+                       break;
+               }
 
+               case SV_ROD_CURING:
+               {
+                       if (set_blind(0)) ident = TRUE;
+                       if (set_poisoned(0)) ident = TRUE;
+                       if (set_confused(0)) ident = TRUE;
+                       if (set_stun(0)) ident = TRUE;
+                       if (set_cut(0)) ident = TRUE;
+                       if (set_image(0)) ident = TRUE;
+                       if (set_shero(0,TRUE)) ident = TRUE;
+                       break;
+               }
 
-/*
- * Hack -- activate the ring of power
- */
-void ring_of_power(int dir)
-{
-       /* Pick a random effect */
-       switch (randint1(10))
-       {
-               case 1:
-               case 2:
+               case SV_ROD_HEALING:
                {
-                       /* Message */
-#ifdef JP
-                       msg_print("¤¢¤Ê¤¿¤Ï°­À­¤Î¥ª¡¼¥é¤ËÊñ¤ß¹þ¤Þ¤ì¤¿¡£");
-#else
-                       msg_print("You are surrounded by a malignant aura.");
-#endif
+                       if (hp_player(powerful ? 750 : 500)) ident = TRUE;
+                       if (set_stun(0)) ident = TRUE;
+                       if (set_cut(0)) ident = TRUE;
+                       if (set_shero(0,TRUE)) ident = TRUE;
+                       break;
+               }
 
-                       sound(SOUND_EVIL);
+               case SV_ROD_RESTORATION:
+               {
+                       if (restore_level()) ident = TRUE;
+                       if (do_res_stat(A_STR)) ident = TRUE;
+                       if (do_res_stat(A_INT)) ident = TRUE;
+                       if (do_res_stat(A_WIS)) ident = TRUE;
+                       if (do_res_stat(A_DEX)) ident = TRUE;
+                       if (do_res_stat(A_CON)) ident = TRUE;
+                       if (do_res_stat(A_CHR)) ident = TRUE;
+                       break;
+               }
 
-                       /* Decrease all stats (permanently) */
-                       (void)dec_stat(A_STR, 50, TRUE);
-                       (void)dec_stat(A_INT, 50, TRUE);
-                       (void)dec_stat(A_WIS, 50, TRUE);
-                       (void)dec_stat(A_DEX, 50, TRUE);
-                       (void)dec_stat(A_CON, 50, TRUE);
-                       (void)dec_stat(A_CHR, 50, TRUE);
+               case SV_ROD_SPEED:
+               {
+                       if (set_fast(randint1(30) + (powerful ? 30 : 15), FALSE)) ident = TRUE;
+                       break;
+               }
 
-                       /* Lose some experience (permanently) */
-                       p_ptr->exp -= (p_ptr->exp / 4);
-                       p_ptr->max_exp -= (p_ptr->exp / 4);
-                       check_experience();
+               case SV_ROD_PESTICIDE:
+               {
+                       if (dispel_monsters(powerful ? 8 : 4)) ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_TELEPORT_AWAY:
+               {
+                       int distance = MAX_SIGHT * (powerful ? 8 : 5);
+                       if (teleport_monster(dir, distance)) ident = TRUE;
                        break;
                }
 
-               case 3:
+               case SV_ROD_DISARMING:
                {
-                       /* Message */
-#ifdef JP
-                       msg_print("¤¢¤Ê¤¿¤Ï¶¯ÎϤʥª¡¼¥é¤ËÊñ¤ß¹þ¤Þ¤ì¤¿¡£");
-#else
-                       msg_print("You are surrounded by a powerful aura.");
-#endif
+                       if (disarm_trap(dir)) ident = TRUE;
+                       if (powerful && disarm_traps_touch()) ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_LITE:
+               {
+                       HIT_POINT dam = damroll((powerful ? 12 : 6), 8);
+                       msg_print(_("青く輝く光線が放たれた。", "A line of blue shimmering light appears."));
+                       (void)lite_line(dir, dam);
+                       ident = TRUE;
+                       break;
+               }
 
-                       /* Dispel monsters */
-                       dispel_monsters(1000);
+               case SV_ROD_SLEEP_MONSTER:
+               {
+                       if (sleep_monster(dir, lev)) ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_SLOW_MONSTER:
+               {
+                       if (slow_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
-               case 4:
-               case 5:
-               case 6:
+               case SV_ROD_HYPODYNAMIA:
                {
-                       /* Mana Ball */
-                       fire_ball(GF_MANA, dir, 600, 3);
+                       if (hypodynamic_bolt(dir, 70 + 3 * lev / 2)) ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_POLYMORPH:
+               {
+                       if (poly_monster(dir, lev)) ident = TRUE;
                        break;
                }
 
-               case 7:
-               case 8:
-               case 9:
-               case 10:
+               case SV_ROD_ACID_BOLT:
                {
-                       /* Mana Bolt */
-                       fire_bolt(GF_MANA, dir, 500);
+                       fire_bolt_or_beam(10, GF_ACID, dir, damroll(6 + lev / 7, 8));
+                       ident = TRUE;
+                       break;
+               }
 
+               case SV_ROD_ELEC_BOLT:
+               {
+                       fire_bolt_or_beam(10, GF_ELEC, dir, damroll(4 + lev / 9, 8));
+                       ident = TRUE;
                        break;
                }
-       }
-}
 
+               case SV_ROD_FIRE_BOLT:
+               {
+                       fire_bolt_or_beam(10, GF_FIRE, dir, damroll(7 + lev / 6, 8));
+                       ident = TRUE;
+                       break;
+               }
 
-static bool ang_sort_comp_pet(vptr u, vptr v, int a, int b)
-{
-       u16b *who = (u16b*)(u);
+               case SV_ROD_COLD_BOLT:
+               {
+                       fire_bolt_or_beam(10, GF_COLD, dir, damroll(5 + lev / 8, 8));
+                       ident = TRUE;
+                       break;
+               }
 
-       int w1 = who[a];
-       int w2 = who[b];
+               case SV_ROD_ACID_BALL:
+               {
+                       fire_ball(GF_ACID, dir, 60 + lev, rad);
+                       ident = TRUE;
+                       break;
+               }
 
-       monster_type *m_ptr1 = &m_list[w1];
-       monster_type *m_ptr2 = &m_list[w2];
-       monster_race *r_ptr1 = &r_info[m_ptr1->r_idx];
-       monster_race *r_ptr2 = &r_info[m_ptr2->r_idx];
+               case SV_ROD_ELEC_BALL:
+               {
+                       fire_ball(GF_ELEC, dir, 40 + lev, rad);
+                       ident = TRUE;
+                       break;
+               }
 
-       /* Unused */
-       (void)v;
+               case SV_ROD_FIRE_BALL:
+               {
+                       fire_ball(GF_FIRE, dir, 70 + lev, rad);
+                       ident = TRUE;
+                       break;
+               }
 
-       if (m_ptr1->nickname && !m_ptr2->nickname) return TRUE;
-       if (m_ptr2->nickname && !m_ptr1->nickname) return FALSE;
+               case SV_ROD_COLD_BALL:
+               {
+                       fire_ball(GF_COLD, dir, 50 + lev, rad);
+                       ident = TRUE;
+                       break;
+               }
 
-       if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) return TRUE;
-       if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) return FALSE;
+               case SV_ROD_HAVOC:
+               {
+                       call_chaos();
+                       ident = TRUE;
+                       break;
+               }
 
-       if (r_ptr1->level > r_ptr2->level) return TRUE;
-       if (r_ptr2->level > r_ptr1->level) return FALSE;
+               case SV_ROD_STONE_TO_MUD:
+               {
+                       HIT_POINT dam = powerful ? 40 + randint1(60) : 20 + randint1(30);
+                       if (wall_to_mud(dir, dam)) ident = TRUE;
+                       break;
+               }
 
-       if (m_ptr1->hp > m_ptr2->hp) return TRUE;
-       if (m_ptr2->hp > m_ptr1->hp) return FALSE;
-       
-       return w1 <= w2;
+               case SV_ROD_AGGRAVATE:
+               {
+                       aggravate_monsters(0);
+                       ident = TRUE;
+                       break;
+               }
+       }
+       return ident;
 }
 
-
-/*
- * Activate a wielded object.  Wielded objects never stack.
- * And even if they did, activatable objects never stack.
- *
- * Currently, only (some) artifacts, and Dragon Scale Mail, can be activated.
- * But one could, for example, easily make an activatable "Ring of Plasma".
- *
- * Note that it always takes a turn to activate an artifact, even if
- * the user hits "escape" at the "direction" prompt.
+/*!
+ * @brief 魔法棒を使うコマンドのサブルーチン / 
+ * Activate (zap) a Rod
+ * @param item 使うオブジェクトの所持品ID
+ * @return なし
+ * @details
+ * <pre>
+ * Unstack fully charged rods as needed.
+ * Hack -- rods of perception/genocide can be "cancelled"
+ * All rods can be cancelled at the "Direction?" prompt
+ * pvals are defined for each rod in k_info. -LM-
+ * </pre>
  */
-static void do_cmd_activate_aux(int item)
+static void do_cmd_zap_rod_aux(int item)
 {
-       int         k, dir, lev, chance, fail;
+       int ident, chance, lev, fail;
+       int dir = 0;
        object_type *o_ptr;
        bool success;
 
+       /* Hack -- let perception get aborted */
+       bool use_charge = TRUE;
+
+       object_kind *k_ptr;
 
        /* Get the item (in the pack) */
        if (item >= 0)
@@ -3971,27 +352,29 @@ static void do_cmd_activate_aux(int item)
                o_ptr = &o_list[0 - item];
        }
 
-       /* Take a turn */
-       energy_use = 100;
 
-       /* Extract the item level */
-       lev = k_info[o_ptr->k_idx].level;
+       /* Mega-Hack -- refuse to zap a pile from the ground */
+       if ((item < 0) && (o_ptr->number > 1))
+       {
+               msg_print(_("まずはロッドを拾わなければ。", "You must first pick up the rods."));
+               return;
+       }
+
 
-       /* Hack -- use artifact level instead */
-       if (object_is_fixed_artifact(o_ptr)) lev = a_info[o_ptr->name1].level;
-       else if (o_ptr->art_name)
+       /* Get a direction (unless KNOWN not to need it) */
+       if (((o_ptr->sval >= SV_ROD_MIN_DIRECTION) && (o_ptr->sval != SV_ROD_HAVOC) && (o_ptr->sval != SV_ROD_AGGRAVATE) && (o_ptr->sval != SV_ROD_PESTICIDE)) ||
+            !object_is_aware(o_ptr))
        {
-               int i;
-               for (i = 0; activation_info[i].flag != NULL; i++)
-               {
-                       if (activation_info[i].index == o_ptr->xtra2)
-                       {
-                               lev = activation_info[i].level;
-                               break;
-                       }
-               }
+               /* Get a direction, allow cancel */
+               if (!get_aim_dir(&dir)) return;
        }
-       else if (((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET)) && o_ptr->name2) lev = e_info[o_ptr->name2].level;
+
+
+       /* Take a turn */
+       p_ptr->energy_use = 100;
+
+       /* Extract the item level */
+       lev = k_info[o_ptr->k_idx].level;
 
        /* Base chance of success */
        chance = p_ptr->skill_dev;
@@ -4008,376 +391,181 @@ static void do_cmd_activate_aux(int item)
        if (world_player)
        {
                if (flush_failure) flush();
-#ifdef JP
-               msg_print("»ß¤Þ¤Ã¤¿»þ¤ÎÃæ¤Ç¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤è¤¦¤À¡£");
-#else
-               msg_print("It shows no reaction.");
-#endif
-               sound(SOUND_FAIL);
-               return;
-       }
-
-       if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
-       else if (chance > fail)
-       {
-               if (randint0(chance*2) < fail) success = FALSE;
-               else success = TRUE;
-       }
-       else
-       {
-               if (randint0(fail*2) < chance) success = TRUE;
-               else success = FALSE;
-       }
-
-       /* Roll for usage */
-       if (!success)
-       {
-               if (flush_failure) flush();
-#ifdef JP
-               msg_print("¤¦¤Þ¤¯»ÏÆ°¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Ê¤«¤Ã¤¿¡£");
-#else
-               msg_print("You failed to activate it properly.");
-#endif
+               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this rod is freezing too."));
                sound(SOUND_FAIL);
-               return;
-       }
-
-       /* Check the recharge */
-       if (o_ptr->timeout)
-       {
-#ifdef JP
-               msg_print("¤½¤ì¤ÏÈù¤«¤Ë²»¤òΩ¤Æ¡¢µ±¤­¡¢¾Ã¤¨¤¿...");
-#else
-               msg_print("It whines, glows and fades...");
-#endif
-               return;
-       }
-
-       /* Some lights need enough fuel for activation */
-       if (!o_ptr->xtra4 && (o_ptr->tval == TV_FLASK) &&
-               ((o_ptr->sval == SV_LITE_TORCH) || (o_ptr->sval == SV_LITE_LANTERN)))
-       {
-#ifdef JP
-               msg_print("dzÎÁ¤¬¤Ê¤¤¡£");
-#else
-               msg_print("It has no fuel.");
-#endif
-               energy_use = 0;
-               return;
-       }
-
-       /* Activate the artifact */
-#ifdef JP
-       msg_print("»ÏÆ°¤µ¤»¤¿...");
-#else
-       msg_print("You activate it...");
-#endif
-
-
-       /* Sound */
-       sound(SOUND_ZAP);
-
-       /* Give priority to weaponsmith's essential activations */
-       if (object_is_smith(o_ptr))
-       {
-               switch (o_ptr->xtra3-1)
-               {
-               case ESSENCE_TMP_RES_ACID:
-                       (void)set_oppose_acid(randint1(20) + 20, FALSE);
-                       o_ptr->timeout = randint0(50) + 50;
-                       return;
-
-               case ESSENCE_TMP_RES_ELEC:
-                       (void)set_oppose_elec(randint1(20) + 20, FALSE);
-                       o_ptr->timeout = randint0(50) + 50;
-                       return;
-
-               case ESSENCE_TMP_RES_FIRE:
-                       (void)set_oppose_fire(randint1(20) + 20, FALSE);
-                       o_ptr->timeout = randint0(50) + 50;
-                       return;
-
-               case ESSENCE_TMP_RES_COLD:
-                       (void)set_oppose_cold(randint1(20) + 20, FALSE);
-                       o_ptr->timeout = randint0(50) + 50;
-                       return;
-
-               case TR_IMPACT:
-                       earthquake(py, px, 5);
-                       o_ptr->timeout = 100 + randint1(100);
-                       
-                       /* Window stuff */
-                       p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
-                       /* Done */
-                       return;
-               }
+               return;
        }
 
-       /* Paranoia - Set activation index for older save data */
-       if (object_is_fixed_artifact(o_ptr))
-       {
-               if (!o_ptr->xtra2) o_ptr->xtra2 = a_info[o_ptr->name1].act_idx;
-       }
-       else if (object_is_ego(o_ptr))
+       if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
+       else if (chance > fail)
        {
-               if (!o_ptr->xtra2) o_ptr->xtra2 = e_info[o_ptr->name2].act_idx;
+               if (randint0(chance*2) < fail) success = FALSE;
+               else success = TRUE;
        }
        else
        {
-               if (!o_ptr->xtra2) o_ptr->xtra2 = k_info[o_ptr->k_idx].act_idx;
+               if (randint0(fail*2) < chance) success = TRUE;
+               else success = FALSE;
        }
 
-       /* Activate object */
-       /* if (o_ptr->xtra2 && (object_is_artifact(o_ptr) || object_is_ego(o_ptr))) */
-       if (o_ptr->xtra2)
+       /* Roll for usage */
+       if (!success)
        {
-               (void)activate_random_artifact(o_ptr);
+               if (flush_failure) flush();
+               msg_print(_("うまくロッドを使えなかった。", "You failed to use the rod properly."));
+               sound(SOUND_FAIL);
+               return;
+       }
 
-               /* Window stuff */
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
+       k_ptr = &k_info[o_ptr->k_idx];
 
-               /* Success */
+       /* A single rod is still charging */
+       if ((o_ptr->number == 1) && (o_ptr->timeout))
+       {
+               if (flush_failure) flush();
+               msg_print(_("このロッドはまだ魔力を充填している最中だ。", "The rod is still charging."));
                return;
        }
-
-       /* Special items */
-       else if (o_ptr->tval == TV_WHISTLE)
+       /* A stack of rods lacks enough energy. */
+       else if ((o_ptr->number > 1) && (o_ptr->timeout > k_ptr->pval * (o_ptr->number - 1)))
        {
-               if (music_singing_any()) stop_singing();
-               if (hex_spelling_any()) stop_hex_spell_all();
-
-#if 0
-               if (object_is_cursed(o_ptr))
-               {
-#ifdef JP
-                       msg_print("¥«¥ó¹â¤¤²»¤¬¶Á¤­ÅϤä¿¡£");
-#else
-                       msg_print("You produce a shrill whistling sound.");
-#endif
-                       aggravate_monsters(0);
-               }
-               else
-#endif
-               {
-                       int pet_ctr, i;
-                       u16b *who;
-                       int max_pet = 0;
-                       u16b dummy_why;
-
-                       /* Allocate the "who" array */
-                       C_MAKE(who, max_m_idx, u16b);
+               if (flush_failure) flush();
+               msg_print(_("そのロッドはまだ充填中です。", "The rods are all still charging."));
+               return;
+       }
 
-                       /* Process the monsters (backwards) */
-                       for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)
-                       {
-                               if (is_pet(&m_list[pet_ctr]) && (p_ptr->riding != pet_ctr))
-                                 who[max_pet++] = pet_ctr;
-                       }
+       /* Sound */
+       sound(SOUND_ZAP);
 
-                       /* Select the sort method */
-                       ang_sort_comp = ang_sort_comp_pet;
-                       ang_sort_swap = ang_sort_swap_hook;
+       ident = rod_effect(o_ptr->sval, dir, &use_charge, FALSE, FALSE);
 
-                       ang_sort(who, &dummy_why, max_pet);
+       /* Increase the timeout by the rod kind's pval. -LM- */
+       if (use_charge) o_ptr->timeout += k_ptr->pval;
 
-                       /* Process the monsters (backwards) */
-                       for (i = 0; i < max_pet; i++)
-                       {
-                               pet_ctr = who[i];
-                               teleport_monster_to(pet_ctr, py, px, 100, TELEPORT_PASSIVE);
-                       }
+       /* Combine / Reorder the pack (later) */
+       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-                       /* Free the "who" array */
-                       C_KILL(who, max_m_idx, u16b);
-               }
-               o_ptr->timeout = 100+randint1(100);
-               return;
-       }
-       else if (o_ptr->tval == TV_CAPTURE)
+       if (!(object_is_aware(o_ptr)))
        {
-               if(!o_ptr->pval)
-               {
-                       bool old_target_pet = target_pet;
-                       target_pet = TRUE;
-                       if (!get_aim_dir(&dir))
-                       {
-                               target_pet = old_target_pet;
-                               return;
-                       }
-                       target_pet = old_target_pet;
+               chg_virtue(V_PATIENCE, -1);
+               chg_virtue(V_CHANCE, 1);
+               chg_virtue(V_KNOWLEDGE, -1);
+       }
 
-                       if(fire_ball(GF_CAPTURE, dir, 0, 0))
-                       {
-                               o_ptr->pval = cap_mon;
-                               o_ptr->xtra3 = cap_mspeed;
-                               o_ptr->xtra4 = cap_hp;
-                               o_ptr->xtra5 = cap_maxhp;
-                               if (cap_nickname)
-                               {
-                                       cptr t;
-                                       char *s;
-                                       char buf[80] = "";
-
-                                       if (o_ptr->inscription)
-                                               strcpy(buf, quark_str(o_ptr->inscription));
-                                       s = buf;
-                                       for (s = buf;*s && (*s != '#'); s++)
-                                       {
-#ifdef JP
-                                               if (iskanji(*s)) s++;
-#endif
-                                       }
-                                       *s = '#';
-                                       s++;
-#ifdef JP
- /*nothing*/
-#else
-                                       *s++ = '\'';
-#endif
-                                       t = quark_str(cap_nickname);
-                                       while (*t)
-                                       {
-                                               *s = *t;
-                                               s++;
-                                               t++;
-                                       }
-#ifdef JP
- /*nothing*/
-#else
-                                       *s++ = '\'';
-#endif
-                                       *s = '\0';
-                                       o_ptr->inscription = quark_add(buf);
-                               }
-                       }
-               }
-               else
-               {
-                       bool success = FALSE;
-                       if (!get_rep_dir2(&dir)) return;
-                       if (monster_can_enter(py + ddy[dir], px + ddx[dir], &r_info[o_ptr->pval], 0))
-                       {
-                               if (place_monster_aux(0, py + ddy[dir], px + ddx[dir], o_ptr->pval, (PM_FORCE_PET | PM_NO_KAGE)))
-                               {
-                                       if (o_ptr->xtra3) m_list[hack_m_idx_ii].mspeed = o_ptr->xtra3;
-                                       if (o_ptr->xtra5) m_list[hack_m_idx_ii].max_maxhp = o_ptr->xtra5;
-                                       if (o_ptr->xtra4) m_list[hack_m_idx_ii].hp = o_ptr->xtra4;
-                                       m_list[hack_m_idx_ii].maxhp = m_list[hack_m_idx_ii].max_maxhp;
-                                       if (o_ptr->inscription)
-                                       {
-                                               char buf[80];
-                                               cptr t;
-#ifndef JP
-                                               bool quote = FALSE;
-#endif
+       /* Tried the object */
+       object_tried(o_ptr);
 
-                                               t = quark_str(o_ptr->inscription);
-                                               for (t = quark_str(o_ptr->inscription);*t && (*t != '#'); t++)
-                                               {
-#ifdef JP
-                                                       if (iskanji(*t)) t++;
-#endif
-                                               }
-                                               if (*t)
-                                               {
-                                                       char *s = buf;
-                                                       t++;
-#ifdef JP
-                                                       /* nothing */
-#else
-                                                       if (*t =='\'')
-                                                       {
-                                                               t++;
-                                                               quote = TRUE;
-                                                       }
-#endif
-                                                       while(*t)
-                                                       {
-                                                               *s = *t;
-                                                               t++;
-                                                               s++;
-                                                       }
-#ifdef JP
-                                                       /* nothing */
-#else
-                                                       if (quote && *(s-1) =='\'')
-                                                               s--;
-#endif
-                                                       *s = '\0';
-                                                       m_list[hack_m_idx_ii].nickname = quark_add(buf);
-                                                       t = quark_str(o_ptr->inscription);
-                                                       s = buf;
-                                                       while(*t && (*t != '#'))
-                                                       {
-                                                               *s = *t;
-                                                               t++;
-                                                               s++;
-                                                       }
-                                                       *s = '\0';
-                                                       o_ptr->inscription = quark_add(buf);
-                                               }
-                                       }
-                                       o_ptr->pval = 0;
-                                       o_ptr->xtra3 = 0;
-                                       o_ptr->xtra4 = 0;
-                                       o_ptr->xtra5 = 0;
-                                       success = TRUE;
-                               }
-                       }
-                       if (!success)
-#ifdef JP
-                               msg_print("¤ª¤Ã¤È¡¢²òÊü¤Ë¼ºÇÔ¤·¤¿¡£");
-#else
-                               msg_print("Oops.  You failed to release your pet.");
-#endif
-               }
-               return;
+       /* Successfully determined the object function */
+       if (ident && !object_is_aware(o_ptr))
+       {
+               object_aware(o_ptr);
+               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
        }
 
-       /* Mistake */
-#ifdef JP
-       msg_print("¤ª¤Ã¤È¡¢¤³¤Î¥¢¥¤¥Æ¥à¤Ï»ÏÆ°¤Ç¤­¤Ê¤¤¡£");
-#else
-       msg_print("Oops.  That object cannot be activated.");
-#endif
-
+       /* Window stuff */
+       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 }
 
-
-void do_cmd_activate(void)
+/*!
+ * @brief ロッドを使うコマンドのメインルーチン /
+ * @return なし
+ */
+void do_cmd_zap_rod(void)
 {
-       int     item;
-       cptr    q, s;
-
+       OBJECT_IDX item;
+       cptr q, s;
 
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
                set_action(ACTION_NONE);
        }
 
-       item_tester_no_ryoute = TRUE;
-       /* Prepare the hook */
-       item_tester_hook = item_tester_hook_activate;
+       /* Restrict choices to rods */
+       item_tester_tval = TV_ROD;
 
        /* Get an item */
-#ifdef JP
-       q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò»ÏÆ°¤µ¤»¤Þ¤¹¤«? ";
-       s = "»ÏÆ°¤Ç¤­¤ë¥¢¥¤¥Æ¥à¤òÁõÈ÷¤·¤Æ¤¤¤Ê¤¤¡£";
-#else
-       q = "Activate which item? ";
-       s = "You have nothing to activate.";
-#endif
+       q = _("どのロッドを振りますか? ", "Zap which rod? ");
+       s = _("使えるロッドがない。", "You have no rod to zap.");
 
-       if (!get_item(&item, q, s, (USE_EQUIP))) return;
+       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
 
-       /* Activate the item */
-       do_cmd_activate_aux(item);
+       /* Zap the rod */
+       do_cmd_zap_rod_aux(item);
 }
 
+/*!
+ * @brief 『一つの指輪』の効果処理 /
+ * Hack -- activate the ring of power
+ * @param dir 発動の方向ID
+ * @return なし
+ */
+void ring_of_power(int dir)
+{
+       /* Pick a random effect */
+       switch (randint1(10))
+       {
+               case 1:
+               case 2:
+               {
+                       /* Message */
+                       msg_print(_("あなたは悪性のオーラに包み込まれた。", "You are surrounded by a malignant aura."));
+                       sound(SOUND_EVIL);
+
+                       /* Decrease all stats (permanently) */
+                       (void)dec_stat(A_STR, 50, TRUE);
+                       (void)dec_stat(A_INT, 50, TRUE);
+                       (void)dec_stat(A_WIS, 50, TRUE);
+                       (void)dec_stat(A_DEX, 50, TRUE);
+                       (void)dec_stat(A_CON, 50, TRUE);
+                       (void)dec_stat(A_CHR, 50, TRUE);
+
+                       /* Lose some experience (permanently) */
+                       p_ptr->exp -= (p_ptr->exp / 4);
+                       p_ptr->max_exp -= (p_ptr->exp / 4);
+                       check_experience();
+
+                       break;
+               }
+
+               case 3:
+               {
+                       /* Message */
+                       msg_print(_("あなたは強力なオーラに包み込まれた。", "You are surrounded by a powerful aura."));
+
+                       /* Dispel monsters */
+                       dispel_monsters(1000);
+
+                       break;
+               }
+
+               case 4:
+               case 5:
+               case 6:
+               {
+                       /* Mana Ball */
+                       fire_ball(GF_MANA, dir, 600, 3);
+
+                       break;
+               }
+
+               case 7:
+               case 8:
+               case 9:
+               case 10:
+               {
+                       /* Mana Bolt */
+                       fire_bolt(GF_MANA, dir, 500);
+
+                       break;
+               }
+       }
+}
 
-/*
+/*!
+ * @brief オブジェクトをプレイヤーが簡易使用コマンドで利用できるかを判定する /
  * Hook to determine if an object is useable
+ * @param o_ptr 判定したいオブジェクトの構造体参照ポインタ
+ * @return 利用可能ならばTRUEを返す
  */
 static bool item_tester_hook_use(object_type *o_ptr)
 {
@@ -4428,13 +616,16 @@ static bool item_tester_hook_use(object_type *o_ptr)
 }
 
 
-/*
+/*!
+ * @brief アイテムを汎用的に「使う」コマンドのメインルーチン /
  * Use an item
+ * @return なし
+ * @details
  * XXX - Add actions for other item types
  */
 void do_cmd_use(void)
 {
-       int         item;
+       OBJECT_IDX item;
        object_type *o_ptr;
        cptr        q, s;
 
@@ -4448,13 +639,8 @@ void do_cmd_use(void)
        item_tester_hook = item_tester_hook_use;
 
        /* Get an item */
-#ifdef JP
-q = "¤É¤ì¤ò»È¤¤¤Þ¤¹¤«¡©";
-s = "»È¤¨¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó¡£";
-#else
-       q = "Use which item? ";
-       s = "You have nothing to use.";
-#endif
+       q = _("どれを使いますか?", "Use which item? ");
+       s = _("使えるものがありません。", "You have nothing to use.");
 
        if (!get_item(&item, q, s, (USE_INVEN | USE_EQUIP | USE_FLOOR))) return;
 
@@ -4519,32 +705,17 @@ s = "
                        /* Check some conditions */
                        if (p_ptr->blind)
                        {
-#ifdef JP
-msg_print("Ìܤ¬¸«¤¨¤Ê¤¤¡£");
-#else
-                               msg_print("You can't see anything.");
-#endif
-
+                               msg_print(_("目が見えない。", "You can't see anything."));
                                return;
                        }
                        if (no_lite())
                        {
-#ifdef JP
-msg_print("ÌÀ¤«¤ê¤¬¤Ê¤¤¤Î¤Ç¡¢°Å¤¯¤ÆÆɤá¤Ê¤¤¡£");
-#else
-                               msg_print("You have no light to read by.");
-#endif
-
+                               msg_print(_("明かりがないので、暗くて読めない。", "You have no light to read by."));
                                return;
                        }
                        if (p_ptr->confused)
                        {
-#ifdef JP
-msg_print("º®Í𤷤Ƥ¤¤ÆÆɤá¤Ê¤¤¡ª");
-#else
-                               msg_print("You are too confused!");
-#endif
-
+                               msg_print(_("混乱していて読めない!", "You are too confused!"));
                                return;
                        }
 
@@ -4570,19 +741,25 @@ msg_print("
        }
 }
 
-static int select_magic_eater(bool only_browse)
+/*!
+ * @brief 魔道具術師の取り込んだ魔力一覧から選択/閲覧する /
+ * @param only_browse 閲覧するだけならばTRUE
+ * @return 選択した魔力のID、キャンセルならば-1を返す
+ */
+static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
 {
-       int ext=0;
+       OBJECT_SUBTYPE_VALUE ext = 0;
        char choice;
        bool flag, request_list;
-       int tval = 0;
-       int             ask = TRUE, i = 0;
+       OBJECT_TYPE_VALUE tval = 0;
+       int             ask = TRUE;
+       OBJECT_SUBTYPE_VALUE i = 0;
        char            out_val[160];
 
        int menu_line = (use_menu ? 1 : 0);
 
 #ifdef ALLOW_REPEAT
-       int sn;
+       COMMAND_CODE sn;
        if (repeat_pull(&sn))
        {
                /* Verify the spell */
@@ -4600,11 +777,7 @@ static int select_magic_eater(bool only_browse)
        }
        if (i == 108)
        {
-#ifdef JP
-               msg_print("ËâË¡¤ò³Ð¤¨¤Æ¤¤¤Ê¤¤¡ª");
-#else
-               msg_print("You don't have any magic!");
-#endif
+               msg_print(_("魔法を覚えていない!", "You don't have any magic!"));
                return -1;
        }
 
@@ -4615,16 +788,18 @@ static int select_magic_eater(bool only_browse)
                while(!tval)
                {
 #ifdef JP
-                       prt(format(" %s ¾ó", (menu_line == 1) ? "¡Õ" : "  "), 2, 14);
-                       prt(format(" %s ËâË¡ËÀ", (menu_line == 2) ? "¡Õ" : "  "), 3, 14);
-                       prt(format(" %s ¥í¥Ã¥É", (menu_line == 3) ? "¡Õ" : "  "), 4, 14);
-                       prt("¤É¤Î¼ïÎà¤ÎËâË¡¤ò»È¤¤¤Þ¤¹¤«¡©", 0, 0);
+                       prt(format(" %s 杖", (menu_line == 1) ? "》" : "  "), 2, 14);
+                       prt(format(" %s 魔法棒", (menu_line == 2) ? "》" : "  "), 3, 14);
+                       prt(format(" %s ロッド", (menu_line == 3) ? "》" : "  "), 4, 14);
 #else
                        prt(format(" %s staff", (menu_line == 1) ? "> " : "  "), 2, 14);
                        prt(format(" %s wand", (menu_line == 2) ? "> " : "  "), 3, 14);
                        prt(format(" %s rod", (menu_line == 3) ? "> " : "  "), 4, 14);
-                       prt("Which type of magic do you use?", 0, 0);
 #endif
+
+                       if (only_browse) prt(_("どの種類の魔法を見ますか?", "Which type of magic do you browse?"), 0, 0);
+                       else prt(_("どの種類の魔法を使いますか?", "Which type of magic do you use?"), 0, 0);
+
                        choice = inkey();
                        switch(choice)
                        {
@@ -4660,11 +835,7 @@ static int select_magic_eater(bool only_browse)
        {
        while (TRUE)
        {
-#ifdef JP
-               if (!get_com("[A] ¾ó, [B] ËâË¡ËÀ, [C] ¥í¥Ã¥É:", &choice, TRUE))
-#else
-               if (!get_com("[A] staff, [B] wand, [C] rod:", &choice, TRUE))
-#endif
+               if (!get_com(_("[A] 杖, [B] 魔法棒, [C] ロッド:", "[A] staff, [B] wand, [C] rod:"), &choice, TRUE))
                {
                        return -1;
                }
@@ -4698,11 +869,7 @@ static int select_magic_eater(bool only_browse)
        }
        if (i == ext+EATER_EXT)
        {
-#ifdef JP
-               msg_print("¤½¤Î¼ïÎà¤ÎËâË¡¤Ï³Ð¤¨¤Æ¤¤¤Ê¤¤¡ª");
-#else
-               msg_print("You don't have that type of magic!");
-#endif
+               msg_print(_("その種類の魔法は覚えていない!", "You don't have that type of magic!"));
                return -1;
        }
 
@@ -4710,11 +877,10 @@ static int select_magic_eater(bool only_browse)
        flag = FALSE;
 
        /* Build a prompt */
-#ifdef JP
-(void) strnfmt(out_val, 78, "('*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤ÎËâÎϤò»È¤¤¤Þ¤¹¤«¡©");
-#else
-       (void)strnfmt(out_val, 78, "(*=List, ESC=exit) Use which power? ");
-#endif
+       if (only_browse) strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの魔力を見ますか?",
+                                                                                       "(*=List, ESC=exit) Browse which power? "));
+       else strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの魔力を使いますか?",
+                                                               "(*=List, ESC=exit) Use which power? "));
        
        /* Save the screen */
        screen_save();
@@ -4728,10 +894,12 @@ static int select_magic_eater(bool only_browse)
                if (request_list || use_menu)
                {
                        byte y, x = 0;
-                       int ctr, chance;
-                       int k_idx;
+                       OBJECT_SUBTYPE_VALUE ctr;
+                       PERCENTAGE chance;
+                       IDX k_idx;
                        char dummy[80];
-                       int x1, y1, level;
+                       POSITION x1, y1;
+                       int level;
                        byte col;
 
                        strcpy(dummy, "");
@@ -4743,7 +911,7 @@ static int select_magic_eater(bool only_browse)
 
                        /* Print header(s) */
 #ifdef JP
-                       prt(format("                           %s ¼ºÎ¨                           %s ¼ºÎ¨", (tval == TV_ROD ? "  ¾õÂÖ  " : "»ÈÍѲó¿ô"), (tval == TV_ROD ? "  ¾õÂÖ  " : "»ÈÍѲó¿ô")), y++, x);
+                       prt(format("                           %s 失率                           %s 失率", (tval == TV_ROD ? "  状態  " : "使用回数"), (tval == TV_ROD ? "  状態  " : "使用回数")), y++, x);
 #else
                        prt(format("                           %s Fail                           %s Fail", (tval == TV_ROD ? "  Stat  " : " Charges"), (tval == TV_ROD ? "  Stat  " : " Charges")), y++, x);
 #endif
@@ -4758,13 +926,9 @@ static int select_magic_eater(bool only_browse)
                                if (use_menu)
                                {
                                        if (ctr == (menu_line-1))
-#ifdef JP
-                                               strcpy(dummy, "¡Õ");
-#else
-                                       strcpy(dummy, "> ");
-#endif
-                                       else strcpy(dummy, "  ");
-                                               
+                                               strcpy(dummy, _("》", "> "));
+                                       else
+                                               strcpy(dummy, "  ");
                                }
                                /* letter/number for power selection */
                                else
@@ -4803,11 +967,7 @@ static int select_magic_eater(bool only_browse)
                                        if (tval == TV_ROD)
                                        {
                                                strcat(dummy, format(
-#ifdef JP
-                                                              " %-22.22s ½¼Å¶:%2d/%2d%3d%%",
-#else
-                                                              " %-22.22s   (%2d/%2d) %3d%%",
-#endif
+                                                              _(" %-22.22s 充填:%2d/%2d%3d%%", " %-22.22s   (%2d/%2d) %3d%%"),
                                                               k_name + k_info[k_idx].name, 
                                                               p_ptr->magic_num1[ctr+ext] ? 
                                                               (p_ptr->magic_num1[ctr+ext] - 1) / (EATER_ROD_CHARGE * k_info[k_idx].pval) +1 : 0, 
@@ -4935,7 +1095,7 @@ static int select_magic_eater(bool only_browse)
                                ask = (isupper(choice));
 
                                /* Lowercase */
-                               if (ask) choice = tolower(choice);
+                               if (ask) choice = (char)tolower(choice);
 
                                /* Extract request */
                                i = (islower(choice) ? A2I(choice) : -1);
@@ -4963,11 +1123,7 @@ static int select_magic_eater(bool only_browse)
                                char tmp_val[160];
 
                                /* Prompt */
-#ifdef JP
-                               (void) strnfmt(tmp_val, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡© ", k_name + k_info[lookup_kind(tval ,i)].name);
-#else
-                               (void) strnfmt(tmp_val, 78, "Use %s?", k_name + k_info[lookup_kind(tval ,i)].name);
-#endif
+                               (void) strnfmt(tmp_val, 78, _("%sを使いますか? ", "Use %s?"), k_name + k_info[lookup_kind(tval ,i)].name);
 
                                /* Belay that order */
                                if (!get_check(tmp_val)) continue;
@@ -4976,11 +1132,7 @@ static int select_magic_eater(bool only_browse)
                        {
                                if (p_ptr->magic_num1[ext+i]  > k_info[lookup_kind(tval, i)].pval * (p_ptr->magic_num2[ext+i] - 1) * EATER_ROD_CHARGE)
                                {
-#ifdef JP
-                                       msg_print("¤½¤ÎËâË¡¤Ï¤Þ¤À½¼Å¶¤·¤Æ¤¤¤ëºÇÃæ¤À¡£");
-#else
-                                       msg_print("The magic are still charging.");
-#endif
+                                       msg_print(_("その魔法はまだ充填している最中だ。", "The magic are still charging."));
                                        msg_print(NULL);
                                        if (use_menu) ask = TRUE;
                                        continue;
@@ -4990,11 +1142,7 @@ static int select_magic_eater(bool only_browse)
                        {
                                if (p_ptr->magic_num1[ext+i] < EATER_CHARGE)
                                {
-#ifdef JP
-                                       msg_print("¤½¤ÎËâË¡¤Ï»ÈÍѲó¿ô¤¬ÀÚ¤ì¤Æ¤¤¤ë¡£");
-#else
-                                       msg_print("The magic has no charges left.");
-#endif
+                                       msg_print(_("その魔法は使用回数が切れている。", "The magic has no charges left."));
                                        msg_print(NULL);
                                        if (use_menu) ask = TRUE;
                                        continue;
@@ -5020,13 +1168,7 @@ static int select_magic_eater(bool only_browse)
                                prt(&temp[j], line, 10);
                                line++;
                        }
-       
-#ifdef JP
-                       prt("²¿¤«¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£",0,0);
-#else
-                       prt("Hit any key.",0,0);
-#endif
-                       (void)inkey();
+
                        continue;
                }
 
@@ -5046,35 +1188,39 @@ static int select_magic_eater(bool only_browse)
 }
 
 
-/*
- *  Use eaten rod, wand or staff
+/*!
+ * @brief 取り込んだ魔力を利用するコマンドのメインルーチン /
+ * Use eaten rod, wand or staff
+ * @param only_browse 閲覧するだけならばTRUE
+ * @param powerful 強力発動中の処理ならばTRUE
+ * @return 実際にコマンドを実行したならばTRUEを返す。
  */
-void do_cmd_magic_eater(bool only_browse)
+bool do_cmd_magic_eater(bool only_browse, bool powerful)
 {
-       int item, chance, level, k_idx, tval, sval;
+       OBJECT_SUBTYPE_VALUE item;
+       PERCENTAGE chance;
+       DEPTH level;
+       IDX k_idx;
+       OBJECT_TYPE_VALUE tval;
+       OBJECT_SUBTYPE_VALUE sval;
        bool use_charge = TRUE;
 
        /* Not when confused */
        if (!only_browse && p_ptr->confused)
        {
-#ifdef JP
-msg_print("º®Í𤷤Ƥ¤¤Æ¾§¤¨¤é¤ì¤Ê¤¤¡ª");
-#else
-               msg_print("You are too confused!");
-#endif
-
-               return;
+               msg_print(_("混乱していて唱えられない!", "You are too confused!"));
+               return FALSE;
        }
 
        item = select_magic_eater(only_browse);
        if (item == -1)
        {
-               energy_use = 0;
-               return;
+               p_ptr->energy_use = 0;
+               return FALSE;
        }
        if (item >= EATER_EXT*2) {tval = TV_ROD;sval = item - EATER_EXT*2;}
        else if (item >= EATER_EXT) {tval = TV_WAND;sval = item - EATER_EXT;}
-       else {tval = TV_STAFF;sval = item;}
+       else {tval = TV_STAFF; sval = item;}
        k_idx = lookup_kind(tval, sval);
 
        level = (tval == TV_ROD ? k_info[k_idx].level * 5 / 6 - 5 : k_info[k_idx].level);
@@ -5098,19 +1244,14 @@ msg_print("
        if (randint0(100) < chance)
        {
                if (flush_failure) flush();
-
-#ifdef JP
-msg_print("¼öʸ¤ò¤¦¤Þ¤¯¾§¤¨¤é¤ì¤Ê¤«¤Ã¤¿¡ª");
-#else
-               msg_format("You failed to get the magic off!");
-#endif
-
+               
+               msg_print(_("呪文をうまく唱えられなかった!", "You failed to get the magic off!"));
                sound(SOUND_FAIL);
                if (randint1(100) >= chance)
                        chg_virtue(V_CHANCE,-1);
-               energy_use = 100;
+               p_ptr->energy_use = 100;
 
-               return;
+               return TRUE;
        }
        else
        {
@@ -5119,24 +1260,26 @@ msg_print("
                if (tval == TV_ROD)
                {
                        if ((sval >= SV_ROD_MIN_DIRECTION) && (sval != SV_ROD_HAVOC) && (sval != SV_ROD_AGGRAVATE) && (sval != SV_ROD_PESTICIDE))
-                               if (!get_aim_dir(&dir)) return;
-                       rod_effect(sval, dir, &use_charge, TRUE);
-                       if (!use_charge) return;
+                               if (!get_aim_dir(&dir)) return FALSE;
+                       rod_effect(sval, dir, &use_charge, powerful, TRUE);
+                       if (!use_charge) return FALSE;
                }
                else if (tval == TV_WAND)
                {
-                       if (!get_aim_dir(&dir)) return;
-                       wand_effect(sval, dir, TRUE);
+                       if (!get_aim_dir(&dir)) return FALSE;
+                       wand_effect(sval, dir, powerful, TRUE);
                }
                else
                {
-                       staff_effect(sval, &use_charge, TRUE, TRUE);
-                       if (!use_charge) return;
+                       staff_effect(sval, &use_charge, powerful, TRUE, TRUE);
+                       if (!use_charge) return FALSE;
                }
                if (randint1(100) < chance)
                        chg_virtue(V_CHANCE,1);
        }
-       energy_use = 100;
+       p_ptr->energy_use = 100;
        if (tval == TV_ROD) p_ptr->magic_num1[item] += k_info[k_idx].pval * EATER_ROD_CHARGE;
        else p_ptr->magic_num1[item] -= EATER_CHARGE;
+
+        return TRUE;
 }