From 92e06a94edd853266d555c9ced8da0b563f0cd6f Mon Sep 17 00:00:00 2001
From: iks <iks@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sun, 8 Mar 2009 00:50:39 +0000
Subject: [PATCH] =?utf8?q?'~'=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=AE?=
 =?utf8?q?=E6=97=A2=E7=9F=A5=E3=81=AE=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF?=
 =?utf8?q?=E3=83=BC=E3=83=AA=E3=82=B9=E3=83=88=E3=81=A7=E3=80=81=E8=B3=9E?=
 =?utf8?q?=E9=87=91=E9=A6=96=E3=81=A8=E3=82=A2=E3=83=B3=E3=83=90=E3=83=BC?=
 =?utf8?q?=E3=81=AE=E7=8E=8B=E6=97=8F=E3=82=92=E9=81=B8=E6=8A=9E=E8=A1=A8?=
 =?utf8?q?=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E3=81=97=E3=81=9F=E3=80=82(=E6=94=B9=E9=80=A0=E7=89=88=E3=81=AE?=
 =?utf8?q?=E8=B3=9E=E9=87=91=E9=A6=96=E8=A1=A8=E7=A4=BA=E5=A4=89=E6=9B=B4?=
 =?utf8?q?=E3=83=91=E3=83=83=E3=83=81(=E5=A4=89=E6=84=9A=E8=9B=AE=E6=80=92?=
 =?utf8?q?=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89=E3=81=9D=E3=81=AE8=20911?=
 =?utf8?q?=E3=81=95=E3=82=93)=E3=82=92=E3=81=84=E3=81=9F=E3=81=A0=E3=81=8D?=
 =?utf8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd4.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/cmd4.c b/src/cmd4.c
index 7ba6e8a8b..e77dffabf 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5060,6 +5060,8 @@ static cptr monster_group_text[] =
 #ifdef JP
 	"¥æ¥Ë¡¼¥¯",	/* "Uniques" */
 	"¾èÇϲÄǽ¤Ê¥â¥ó¥¹¥¿¡¼",	/* "Riding" */
+	"¾Þ¶â¼ó", /* "Wanted */
+	"¥¢¥ó¥Ð¡¼¤Î²¦Â²", /* "Ambertite" */
 	"¥¢¥ê",
 	"¥³¥¦¥â¥ê",
 	"¥à¥«¥Ç",
@@ -5119,6 +5121,8 @@ static cptr monster_group_text[] =
 #else
 	"Uniques",
 	"Ridable monsters",
+	"Wanted monsters",
+	"Ambertite",
 	"Ant",
 	"Bat",
 	"Centipede",
@@ -5188,6 +5192,8 @@ static cptr monster_group_char[] =
 {
 	(char *) -1L,
 	(char *) -2L,
+	(char *) -3L,
+	(char *) -4L,
 	"a",
 	"b",
 	"c",
@@ -5293,6 +5299,13 @@ static int collect_monsters(int grp_cur, s16b mon_idx[], byte mode)
 	/* XXX Hack -- Check if this is the "Riding" group */
 	bool grp_riding = (monster_group_char[grp_cur] == (char *) -2L);
 
+	/* XXX Hack -- Check if this is the "Wanted" group */
+	bool grp_wanted = (monster_group_char[grp_cur] == (char *) -3L);
+
+	/* XXX Hack -- Check if this is the "Amberite" group */
+	bool grp_amberite = (monster_group_char[grp_cur] == (char *) -4L);
+
+
 	/* Check every race */
 	for (i = 0; i < max_r_idx; i++)
 	{
@@ -5315,6 +5328,27 @@ static int collect_monsters(int grp_cur, s16b mon_idx[], byte mode)
 			if (!(r_ptr->flags7 & RF7_RIDING)) continue;
 		}
 
+		else if (grp_wanted)
+		{
+			bool wanted = FALSE;
+			int j;
+			for (j = 0; j < MAX_KUBI; j++)
+			{
+				if (kubi_r_idx[j] == i || kubi_r_idx[j] - 10000 == i ||
+					(p_ptr->today_mon && p_ptr->today_mon == i))
+				{
+					wanted = TRUE;
+					break;
+				}
+			}
+			if (!wanted) continue;
+		}
+
+		else if (grp_amberite)
+		{
+			if (!(r_ptr->flags3 & RF3_AMBERITE)) continue;
+		}
+
 		else
 		{
 			/* Check for race in the group */
-- 
2.11.0