OSDN > Find Software > Games/Entertainment > Role-Playing > 変愚蛮怒 > SCM > git > hengband > Commit

変愚蛮怒
Fork
hengband
web

hengband: Commit

変愚蛮怒のメインリポジトリです

指輪や薬のミミックの色がその時々の個別のm_idxで変わるコードをフラグ
ATTR_SEMIRANDとして整理. フラグの場所としては, 既に使われていない
RF2_BRAIN_6を用いた.

--- a/lib/edit/r_info.txt

+++ b/lib/edit/r_info.txt

--- a/src/cave.c

+++ b/src/cave.c

		@@ -1441,14 +1441,10 @@ void map_info(int y, int x, byte ap, char cp)
1441	1441	*ap = a;
1442	1442	*cp = c;
1443	1443
1444		- /* Mimics' colors vary */
1445		- if ((c == '\"') \|\| (c == '!') \|\| (c == '='))
	1444	+ /* Use semi-random attr (usually mimics' colors vary) */
	1445	+ if ((r_ptr->flags2 & RF2_ATTR_SEMIRAND) && !use_graphics)
1446	1446	{
1447		- if (!(r_ptr->flags1 & RF1_UNIQUE) && !use_graphics)
1448		- {
1449		- /* Use semi-random attr */
1450		- *ap = c_ptr->m_idx % 15 + 1;
1451		- }
	1447	+ *ap = c_ptr->m_idx % 15 + 1;
1452	1448	}
1453	1449	}
1454	1450

		@@ -1489,14 +1485,10 @@ void map_info(int y, int x, byte ap, char cp)
1489	1485	/* Normal case */
1490	1486	*ap = a;
1491	1487
1492		- /* Mimics' colors vary */
1493		- if ((c == '\"') \|\| (c == '!') \|\| (c == '='))
	1488	+ /* Use semi-random attr (usually mimics' colors vary) */
	1489	+ if ((r_ptr->flags2 & RF2_ATTR_SEMIRAND) && !use_graphics)
1494	1490	{
1495		- if (!(r_ptr->flags1 & RF1_UNIQUE) && !use_graphics)
1496		- {
1497		- /* Use semi-random attr */
1498		- *ap = c_ptr->m_idx % 15 + 1;
1499		- }
	1491	+ *ap = c_ptr->m_idx % 15 + 1;
1500	1492	}
1501	1493	}
1502	1494

--- a/src/defines.h

+++ b/src/defines.h

		@@ -3328,8 +3328,8 @@
3328	3328	#define RF2_BRAIN_3 0x04000000
3329	3329	#define RF2_BRAIN_4 0x08000000
3330	3330	#define RF2_BRAIN_5 0x10000000
3331		-#define RF2_BRAIN_6 0x20000000
3332		-#define RF2_HUMAN 0x40000000
	3331	+#define RF2_ATTR_SEMIRAND 0x20000000 /* Color is determined semi-randomly */
	3332	+#define RF2_HUMAN 0x40000000 /* Human */
3333	3333	#define RF2_QUANTUM 0x80000000 /* Monster has quantum behavior */
3334	3334
3335	3335	/*

--- a/src/init1.c

+++ b/src/init1.c