OSDN Git Service

賞金首に骨も許すように修正。
authormogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Mon, 7 Jul 2003 15:43:14 +0000 (15:43 +0000)
committermogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Mon, 7 Jul 2003 15:43:14 +0000 (15:43 +0000)
'~'+'6'の賞金首リストが金額表示のままだったので修正。

src/bldg.c
src/cmd4.c
src/dungeon.c

index 63255d5..0b7cbfa 100644 (file)
@@ -2371,7 +2371,7 @@ static bool kankin(void)
                for (i = INVEN_PACK-1; i >= 0; i--)
                {
                        o_ptr = &inventory[i];
-                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_CORPSE) && (o_ptr->pval == kubi_r_idx[j]))
+                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval == kubi_r_idx[j]))
                        {
                                char buf[MAX_NLEN+20];
                                int num, k;
index 57b9813..62ad5d8 100644 (file)
@@ -8436,6 +8436,8 @@ static void do_cmd_knowledge_kubi(void)
        
        if (fff)
        {
+               bool listed = FALSE;
+
 #ifdef JP
                fprintf(fff, "º£Æü¤Î¥¿¡¼¥²¥Ã¥È : %s\n", (p_ptr->today_mon ? r_name + r_info[p_ptr->today_mon].name : "ÉÔÌÀ"));
                fprintf(fff, "\n");
@@ -8445,17 +8447,25 @@ static void do_cmd_knowledge_kubi(void)
                fprintf(fff, "\n");
                fprintf(fff, "List of wanted monsters\n");
 #endif
+               fprintf(fff, "----------------------------------------------\n");
+
                for (i = 0; i < MAX_KUBI; i++)
                {
-                       fprintf(fff,"%-40s ---- ",r_name + r_info[(kubi_r_idx[i] > 10000 ? kubi_r_idx[i] - 10000 : kubi_r_idx[i])].name);
-                       if (kubi_r_idx[i] > 10000)
+                       if (kubi_r_idx[i] <= 10000)
+                       {
+                               fprintf(fff,"%s\n", r_name + r_info[kubi_r_idx[i]].name);
+
+                               listed = TRUE;
+                       }
+               }
+
+               if (!listed)
+               {
 #ifdef JP
-                               fprintf(fff, "ºÑ\n");
+                       fprintf(fff,"\n%s\n", "¾Þ¶â¼ó¤Ï¤â¤¦»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£");
 #else
-                               fprintf(fff, "done\n");
+                       fprintf(fff,"\n%s\n", "There is no more wanted monster.");
 #endif
-                       else
-                               fprintf(fff, "$%d\n", 300 * (r_info[kubi_r_idx[i]].level + 1));
                }
        }
        
index a9b6597..7a3b614 100644 (file)
@@ -6552,7 +6552,7 @@ void determine_bounty_uniques(void)
 
                        if (!(r_ptr->flags1 & RF1_UNIQUE)) continue;
 
-                       if (!(r_ptr->flags9 & RF9_DROP_CORPSE)) continue;
+                       if (!(r_ptr->flags9 & (RF9_DROP_CORPSE | RF9_DROP_SKELETON))) continue;
 
                        if (r_ptr->rarity > 100) continue;