ガンダルフの杖, 帯魔力ペンダントの発動の仕様変更.

[hengbandforosx/hengbandosx.git] / src / object1.c

diff --git a/src/object1.c b/src/object1.c
index 8b73771..2ab40a4 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1242,9 +1242,9 @@ return "
                case ART_GANDALF:
                {
 #ifdef JP
-return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè";
+return "Ä´ºº¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 100 ¥¿¡¼¥óËè";
 #else
-                       return "probing, detection and full id every 1000 turns";
+                       return "probing, detection and full id every 100 turns";
 #endif
 
                }
@@ -1856,6 +1856,7 @@ return "
 #endif
                }
                case ART_NIGHT:
+               case ART_HELL:
                {
 #ifdef JP
 return "°Å¹õ¤ÎÍò(250) : 150+d150 ¥¿¡¼¥óËè";
@@ -1864,6 +1865,24 @@ return "
 #endif
 
                }
+               case ART_SACRED_KNIGHTS:
+               {
+#ifdef JP
+return "*²ò¼ö*¤ÈÄ´ºº: ¤¤¤Ä¤Ç¤â";
+#else
+                       return "Dispel Curse and Probing every turn";
+#endif
+
+               }
+               case ART_CHARMED:
+               {
+#ifdef JP
+return "ËâÎÏÉü³è: 777 ¥¿¡¼¥óËè";
+#else
+                       return "Restore Mana every 777 turns";
+#endif
+
+               }
        }
 
 
@@ -4800,7 +4819,7 @@ static bool get_tag_floor(int *cp, char tag, int floor_list[], int floor_num)
  */
 static void prepare_label_string(char *label, int mode)
 {
-       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
        int  offset = (mode == USE_EQUIP) ? INVEN_RARM : 0;
        int  i;
 
@@ -4808,7 +4827,7 @@ static void prepare_label_string(char *label, int mode)
        strcpy(label, alphabet_chars);
 
        /* Move each label */
-       for (i = 0; i < 52 + 10; i++)
+       for (i = 0; i < 52; i++)
        {
                int index;
                char c = alphabet_chars[i];
@@ -4831,14 +4850,14 @@ static void prepare_label_string(char *label, int mode)
  */
 static void prepare_label_string_floor(char *label, int floor_list[], int floor_num)
 {
-       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
        int  i;
 
        /* Prepare normal labels */
        strcpy(label, alphabet_chars);
 
        /* Move each label */
-       for (i = 0; i < 52 + 10; i++)
+       for (i = 0; i < 52; i++)
        {
                int index;
                char c = alphabet_chars[i];
@@ -4873,7 +4892,7 @@ int show_inven(int target_item)
        char            out_desc[23][MAX_NLEN];
        int             target_item_label = 0;
        int             wid, hgt;
-       char            inven_label[52 + 10 + 1];
+       char            inven_label[52 + 1];
 
        /* Starting column */
        col = command_gap;
@@ -5050,7 +5069,7 @@ int show_equip(int target_item)
        char            out_desc[23][MAX_NLEN];
        int             target_item_label = 0;
        int             wid, hgt;
-       char            equip_label[52 + 10 + 1];
+       char            equip_label[52 + 1];
 
        /* Starting column */
        col = command_gap;
@@ -5506,13 +5525,17 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == INVEN_FORCE) { /* the_force */
-                   item_tester_tval = 0;
-                   item_tester_hook = NULL;
-                   return (TRUE);
-               } else
+               /* the_force */
+               if (*cp == INVEN_FORCE)
+               {
+                       item_tester_tval = 0;
+                       item_tester_hook = NULL;
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+                       return (TRUE);
+               }
+
                /* Floor item? */
-               if (*cp < 0)
+               else if (*cp < 0)
                {
                        object_type *o_ptr;
 
@@ -5531,6 +5554,8 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                                /* Forget the item_tester_hook restriction */
                                item_tester_hook = NULL;
 
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
                                /* Success */
                                return (TRUE);
                        }
@@ -5545,6 +5570,8 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                        /* Forget the item_tester_hook restriction */
                        item_tester_hook = NULL;
 
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
                        /* Success */
                        return (TRUE);
                }
@@ -6293,10 +6320,15 @@ if (ver && !verify("
        /* Warning if needed */
        if (oops && str) msg_print(str);
 
+       if (item)
+       {
 #ifdef ALLOW_REPEAT
-       if (item) repeat_push(*cp);
+               repeat_push(*cp);
 #endif /* ALLOW_REPEAT */
 
+               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+       }
+
        /* Result */
        return (item);
 }
@@ -6377,7 +6409,7 @@ int show_floor(int target_item, int y, int x, int *min_width)
 
        int floor_list[23], floor_num;
        int wid, hgt;
-       char floor_label[52 + 10 + 1];
+       char floor_label[52 + 1];
 
        /* Get size */
        Term_get_size(&wid, &hgt);
@@ -6525,13 +6557,17 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == INVEN_FORCE) { /* the_force */
-                   item_tester_tval = 0;
-                   item_tester_hook = NULL;
-                   return (TRUE);
-               } else
+               /* the_force */
+               if (*cp == INVEN_FORCE)
+               {
+                       item_tester_tval = 0;
+                       item_tester_hook = NULL;
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+                       return (TRUE);
+               }
+
                /* Floor item? */
-               if (*cp < 0)
+               else if (*cp < 0)
                {
                        object_type *o_ptr;
 
@@ -6550,6 +6586,8 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                                /* Forget the item_tester_hook restriction */
                                item_tester_hook = NULL;
 
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
                                /* Success */
                                return (TRUE);
                        }
@@ -6564,6 +6602,8 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                        /* Forget the item_tester_hook restriction */
                        item_tester_hook = NULL;
 
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
                        /* Success */
                        return (TRUE);
                }
@@ -7718,10 +7758,15 @@ if (ver && !verify("
        /* Warning if needed */
        if (oops && str) msg_print(str);
 
+       if (item)
+       {
 #ifdef ALLOW_REPEAT
-       if (item) repeat_push(*cp);
+               repeat_push(*cp);
 #endif /* ALLOW_REPEAT */
 
+               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+       }
+
        /* Result */
        return (item);
 }