vanilla_townでは賞金首を換金できないため, 賞金首の概念が存在しないか

のように扱い, 賞金首一覧を表示せず, 自動拾いのキーワードにもヒットし
ないように変更.

diff --git a/src/cmd4.c b/src/cmd4.c
index ae30002..8607709 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -9375,7 +9375,7 @@ void do_cmd_knowledge(void)
                        prt("(3) ´ûÃΤÎÀ¸¤­¤Æ¤¤¤ë¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼ ¤Î°ìÍ÷", 8, 5);
                        prt("(4) ´ûÃΤΥâ¥ó¥¹¥¿¡¼                     ¤Î°ìÍ÷", 9, 5);
                        prt("(5) Åݤ·¤¿Å¨¤Î¿ô                         ¤Î°ìÍ÷", 10, 5);
-                       prt("(6) ¾Þ¶â¼ó                               ¤Î°ìÍ÷", 11, 5);
+                       if (!vanilla_town) prt("(6) ¾Þ¶â¼ó                               ¤Î°ìÍ÷", 11, 5);
                        prt("(7) ¸½ºß¤Î¥Ú¥Ã¥È                         ¤Î°ìÍ÷", 12, 5);
                        prt("(8) ²æ¤¬²È¤Î¥¢¥¤¥Æ¥à                     ¤Î°ìÍ÷", 13, 5);
                        prt("(9) *´ÕÄê*ºÑ¤ßÁõÈ÷¤ÎÂÑÀ­                 ¤Î°ìÍ÷", 14, 5);
@@ -9398,7 +9398,7 @@ void do_cmd_knowledge(void)
                        prt("(3) Display remaining uniques", 8, 5);
                        prt("(4) Display known monster", 9, 5);
                        prt("(5) Display kill count", 10, 5);
-                       prt("(6) Display wanted monsters", 11, 5);
+                       if (!vanilla_town) prt("(6) Display wanted monsters", 11, 5);
                        prt("(7) Display current pets", 12, 5);
                        prt("(8) Display home inventory", 13, 5);
                        prt("(9) Display *identified* equip.", 14, 5);
@@ -9456,7 +9456,7 @@ void do_cmd_knowledge(void)
                        do_cmd_knowledge_kill_count();
                        break;
                case '6': /* wanted */
-                       do_cmd_knowledge_kubi();
+                       if (!vanilla_town) do_cmd_knowledge_kubi();
                        break;
                case '7': /* Pets */
                        do_cmd_knowledge_pets();

diff --git a/src/obj_kind.c b/src/obj_kind.c
index d2360f6..5bdb653 100644 (file)
--- a/src/obj_kind.c
+++ b/src/obj_kind.c
@@ -274,6 +274,7 @@ bool object_is_potion(object_type *o_ptr)
 bool object_is_shoukinkubi(object_type *o_ptr)
 {
        int i;
+       if (vanilla_town) return FALSE;
        if (p_ptr->today_mon > 0 && o_ptr->pval == p_ptr->today_mon) return TRUE;
        if (o_ptr->pval == MON_TSUCHINOKO) return TRUE;
        for (i = 0; i < MAX_KUBI; i++)

diff --git a/src/xtra2.c b/src/xtra2.c
index 898534d..ece0158 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2044,7 +2044,7 @@ msg_format("%s
 #endif
 
                }
-               if ((r_ptr->flags1 & RF1_UNIQUE) && !(m_ptr->smart & SM_CLONED))
+               if ((r_ptr->flags1 & RF1_UNIQUE) && !(m_ptr->smart & SM_CLONED) && !vanilla_town)
                {
                        for (i = 0; i < MAX_KUBI; i++)
                        {