値段が店の上限価格以上のアイテムを売るとき交渉が不要で上限金額にいきなり

決定するが、それに対応いて値切りオプションがオフのときも消費税が掛から
なくなっていた。それを廃止して常に消費税が掛かるようにした。
同時に値切りオプションを初期オプションにしてゲーム中に変更できなくした。

diff --git a/lib/help/joption.txt b/lib/help/joption.txt
index c6b5640..581492d 100644 (file)
--- a/lib/help/joption.txt
+++ b/lib/help/joption.txt
@@ -264,12 +264,6 @@ MP
 ***** <GamePlay>
 === ¥ª¥×¥·¥ç¥ó3 -- ¥²¡¼¥à¥×¥ì¥¤ ===
 
-Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë  [manual_haggle]
-    Ä̾ï¤Î¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Ìµ¸ú¤Î¾õÂ֤Ǥϡ¢Å¹¤Ç¤Î¸ò¾Ä¤Ï¼«Æ°²½¤µ¤ì¤Æ¤¤
-    ¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢10%¤Î¾ÃÈñÀǤ¬¼«Æ°Åª¤Ë²Ê¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò
-    Í­¸ú¤Ë¤¹¤ë¤È¤¢¤Ê¤¿¤¬¼ÂºÝ¤ËÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë»ö¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì¤Ë¤è¤Ã
-    ¤Æ¥¢¥¤¥Æ¥à¤ò¤è¤ê¹â¤¯Çä¤ê¡¢°Â¤¯Ç㤦¥Á¥ã¥ó¥¹¤¬Í¿¤¨¤é¤ì¤Þ¤¹¡£
-
 ³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß  [auto_scum]
     ¤³¤ì¤Ï¥À¥ó¥¸¥ç¥ó¤Ç¡Ö¤è¤¤¡×³¬¤òÀ¸À®¤¹¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç
     ¥ó¤Ï¥Þ¥·¥ó¤Ë¤è¤Ã¤Æ¤ÏÆä˿¼¤¤³¬¤Ç¶Ëü¤ËÃÙ¤¯¤Ê¤ê¤Þ¤¹¡¢¤½¤Î³¬¤ÎºÇ¾®¤Î
@@ -665,8 +659,13 @@ cheating
 ¥ó¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
 
 
-½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)  [easy_band]
+Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë  [manual_haggle]
+    Ä̾ï¤Î¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Ìµ¸ú¤Î¾õÂ֤Ǥϡ¢Å¹¤Ç¤Î¸ò¾Ä¤Ï¼«Æ°²½¤µ¤ì¤Æ¤¤
+    ¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢10%¤Î¾ÃÈñÀǤ¬¼«Æ°Åª¤Ë²Ê¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò
+    Í­¸ú¤Ë¤¹¤ë¤È¤¢¤Ê¤¿¤¬¼ÂºÝ¤ËÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë»ö¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì¤Ë¤è¤Ã
+    ¤Æ¥¢¥¤¥Æ¥à¤ò¤è¤ê¹â¤¯Çä¤ê¡¢°Â¤¯Ç㤦¥Á¥ã¥ó¥¹¤¬Í¿¤¨¤é¤ì¤Þ¤¹¡£
 
+½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)  [easy_band]
     ¤³¤ì¤Ï½é¿´¼Ô¤ÎÎý½¬ÍѤΥ⡼¥É¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤È¥×¥ì
     ¥¤¥ä¡¼¤¬¼õ¤±¤ëÁ´¤Æ¤Î¥À¥á¡¼¥¸¤ÏȾʬ¤Ë¤Ê¤ê¡¢¥â¥ó¥¹¥¿¡¼¤Î¾¤´­ËâË¡¤Î¸ú
     ²Ì¤¬¼å¤¯¤Ê¤ê¡¢¾õÂְ۾郎®¤¯Ä¾¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤·¤«¤·¡¢ºÇ½ª¥¹¥³¥¢

diff --git a/lib/help/option.txt b/lib/help/option.txt
index 5a6638b..eb6e4c3 100644 (file)
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -231,12 +231,6 @@ Always show list at first when select items    [always_show_list]
 ***** <GamePlay>
 === Option set 3 -- Game playing ===
 
-Manually haggle in stores    [manual_haggle]
-    Usually, auto-haggle is used in stores, resulting in a ten
-    percent sales tax on items which you would have otherwise been
-    forced to haggle for.  If this option is set, auto-haggle is
-    disabled.
-
 Auto-scum for good levels    [auto_scum]
     This is a hack but allows you to force the generation of "good"
     levels in the dungeon. This option may be extremely slow on some
@@ -712,6 +706,12 @@ There is no way to turn them off after the creation is finished!
 Indicators "(*)" after the name of options means that options effect
 estimation of your score.
 
+Manually haggle in stores    [manual_haggle]
+    Usually, auto-haggle is used in stores, resulting in a ten
+    percent sales tax on items which you would have otherwise been
+    forced to haggle for.  If this option is set, auto-haggle is
+    disabled.
+
 Easy Mode (*)    [easy_band]
     This option enables easy game mode for beginners. If this option is
     set, you takes only half damage from any enemy's attack compared

diff --git a/src/store.c b/src/store.c
index 783af36..b2f85f7 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -2936,6 +2936,12 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
        /* No need to haggle */
        if (noneed || !manual_haggle || (final_ask >= purse))
        {
+               /* Apply Sales Tax (if needed) */
+               if (!manual_haggle && !noneed)
+               {
+                       final_ask -= final_ask / 10;
+               }
+
                /* No reason to haggle */
                if (final_ask >= purse)
                {
@@ -2976,9 +2982,6 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
 #endif
 
                        msg_print(NULL);
-
-                       /* Apply Sales Tax */
-                       final_ask -= final_ask / 10;
                }
 
                /* Final price */

diff --git a/src/tables.c b/src/tables.c
index 22843db..232bbb2 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -6735,15 +6735,6 @@ option_type option_info[] =
        /*** Game-Play ***/
 
 #ifdef JP
-       { &manual_haggle,               FALSE, 3, 1, 0,
-        "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
-#else
-       { &manual_haggle,               FALSE, 3, 1, 0,
-       "manual_haggle",                "Manually haggle in stores" },
-#endif
-
-
-#ifdef JP
        { &auto_scum,                   FALSE, 3, 1, 1,
         "auto_scum",                    "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
 #else
@@ -7102,6 +7093,15 @@ option_type option_info[] =
        /*** Birth Options ***/
 
 #ifdef JP
+       { &manual_haggle,               FALSE, 6, 1, 0,
+        "manual_haggle",                "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
+#else
+       { &manual_haggle,               FALSE, 6, 1, 0,
+       "manual_haggle",                "Manually haggle in stores" },
+#endif
+
+
+#ifdef JP
        { &easy_band,                   FALSE, 6, 6, 31,
         "easy_band",                    "½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)" },
 #else