提交: 77e2c6684cd68bfea687737591be5ace8e66e35e - hengband (git)

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

Commit MetaInfo

• 修訂: 77e2c6684cd68bfea687737591be5ace8e66e35e (tree)
• 時間: 2020-03-15 12:45:28
• 作者: deskull <deskull@user...>
• Commiter: deskull

Log Message

[Refactor] #40256 get_mon_num()に 新しく optionを追加し GMN_ARENA を追加． / Add option argument to get_mon_num() and define GMN_ARENA.

Change Summary

• modified: src/birth.c
• modified: src/bldg.c
• modified: src/core.c
• modified: src/monster.h
• modified: src/monster2.c
• modified: src/monsterrace-hook.c
• modified: src/object2.c
• modified: src/player-status.c
• modified: src/quest.c
• modified: src/rooms-pitnest.c
• modified: src/rooms-special.c
• modified: src/spells3.c

差異

--- a/src/birth.c
+++ b/src/birth.c
@@ -2274,7 +2274,7 @@ void player_outfit(player_type *creature_ptr)
 		for (i = rand_range(3, 4); i > 0; i--)
 		{
 			object_prep(q_ptr, lookup_kind(TV_CORPSE, SV_CORPSE));
-			q_ptr->pval = get_mon_num(creature_ptr, 2);
+			q_ptr->pval = get_mon_num(creature_ptr, 2, 0);
 			if (q_ptr->pval)
 			{
 				q_ptr->number = 1;

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1542,7 +1542,6 @@ void update_gambling_monsters(player_type *player_ptr)
 	int mon_level;
 	int power[4];
 	bool tekitou;
-	bool old_inside_battle = player_ptr->phase_out;
 
 	for (i = 0; i < current_world_ptr->max_d_idx; i++)
 	{
@@ -1573,9 +1572,7 @@ void update_gambling_monsters(player_type *player_ptr)
 			while (TRUE)
 			{
 				get_mon_num_prep(player_ptr, monster_can_entry_arena, NULL);
-				player_ptr->phase_out = TRUE;
-				r_idx = get_mon_num(player_ptr, mon_level);
-				player_ptr->phase_out = old_inside_battle;
+				r_idx = get_mon_num(player_ptr, mon_level, GMN_ARENA);
 				if (!r_idx) continue;
 
 				if ((r_info[r_idx].flags1 & RF1_UNIQUE) || (r_info[r_idx].flags7 & RF7_UNIQUE2))
@@ -2253,14 +2250,14 @@ static void castle_quest(player_type *player_ptr)
 
 	if (q_ptr->r_idx == 0)
 	{
-		q_ptr->r_idx = get_mon_num(player_ptr, q_ptr->level + 4 + randint1(6));
+		q_ptr->r_idx = get_mon_num(player_ptr, q_ptr->level + 4 + randint1(6), 0);
 	}
 
 	monster_race *r_ptr;
 	r_ptr = &r_info[q_ptr->r_idx];
 	while ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->rarity != 1))
 	{
-		q_ptr->r_idx = get_mon_num(player_ptr, q_ptr->level) + 4 + randint1(6);
+		q_ptr->r_idx = get_mon_num(player_ptr, q_ptr->level + 4 + randint1(6), 0);
 		r_ptr = &r_info[q_ptr->r_idx];
 	}
 
@@ -4015,7 +4012,6 @@ void do_cmd_bldg(player_type *player_ptr)
  */
 void determine_daily_bounty(player_type *player_ptr, bool conv_old)
 {
-	bool old_inside_battle = player_ptr->phase_out;
 	int max_dl = 3, i;
 	if (!conv_old)
 	{
@@ -4030,12 +4026,11 @@ void determine_daily_bounty(player_type *player_ptr, bool conv_old)
 		max_dl = MAX(max_dlv[DUNGEON_ANGBAND], 3);
 	}
 
-	player_ptr->phase_out = TRUE;
 	get_mon_num_prep(player_ptr, NULL, NULL);
 
 	while (TRUE)
 	{
-		today_mon = get_mon_num(player_ptr, max_dl);
+		today_mon = get_mon_num(player_ptr, max_dl, GMN_ARENA);
 		monster_race *r_ptr;
 		r_ptr = &r_info[today_mon];
 
@@ -4047,9 +4042,6 @@ void determine_daily_bounty(player_type *player_ptr, bool conv_old)
 		if (r_ptr->rarity > 10) continue;
 		break;
 	}
-
-	player_ptr->today_mon = 0;
-	player_ptr->phase_out = old_inside_battle;
 }
 
 
@@ -4065,7 +4057,7 @@ void determine_bounty_uniques(player_type *player_ptr)
 	{
 		while (TRUE)
 		{
-			current_world_ptr->bounty_r_idx[i] = get_mon_num(player_ptr, MAX_DEPTH - 1);
+			current_world_ptr->bounty_r_idx[i] = get_mon_num(player_ptr, MAX_DEPTH - 1, GMN_ARENA);
 			monster_race *r_ptr;
 			r_ptr = &r_info[current_world_ptr->bounty_r_idx[i]];
 

--- a/src/core.c
+++ b/src/core.c
@@ -3611,7 +3611,7 @@ static void process_fishing(player_type *creature_ptr)
 		MONRACE_IDX r_idx;
 		bool success = FALSE;
 		get_mon_num_prep(creature_ptr, monster_is_fishing_target, NULL);
-		r_idx = get_mon_num(creature_ptr, creature_ptr->current_floor_ptr->dun_level ? creature_ptr->current_floor_ptr->dun_level : wilderness[creature_ptr->wilderness_y][creature_ptr->wilderness_x].level);
+		r_idx = get_mon_num(creature_ptr, creature_ptr->current_floor_ptr->dun_level ? creature_ptr->current_floor_ptr->dun_level : wilderness[creature_ptr->wilderness_y][creature_ptr->wilderness_x].level, 0);
 		msg_print(NULL);
 		if (r_idx && one_in_(2))
 		{

--- a/src/monster.h
+++ b/src/monster.h
@@ -345,7 +345,10 @@ extern void compact_monsters(player_type *player_ptr, int size);
 extern void wipe_monsters_list(player_type *player_ptr);
 extern MONSTER_IDX m_pop(player_type *player_ptr);
 extern errr get_mon_num_prep(player_type *player_ptr, monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2);
-extern MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level);
+
+#define GMN_ARENA 0x00000001 //!< 賭け闘技場向け生成 
+extern MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level, BIT_FLAGS option);
+
 extern int lore_do_probe(player_type *player_ptr, MONRACE_IDX r_idx);
 extern void lore_treasure(player_type *player_ptr, MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold);
 extern void update_monster(player_type *subject_ptr, MONSTER_IDX m_idx, bool full);

--- a/src/monster2.c
+++ b/src/monster2.c
@@ -989,7 +989,7 @@ errr get_mon_num_prep(player_type *player_ptr, monsterrace_hook_type monster_hoo
  * Note that if no monsters are "appropriate", then this function will
  * fail, and return zero, but this should *almost* never happen.
  */
-MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level)
+MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level, BIT_FLAGS option)
 {
 	int delay = mysqrt(level * 10000L) + 400L;
 	int reinforcement_possibility = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((current_world_ptr->dungeon_turn / (TURNS_PER_TICK * 5000L) - delay / 10)));
@@ -1003,7 +1003,7 @@ MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level)
 		level += 3;
 	}
 
-	if (!player_ptr->phase_out && !(d_info[player_ptr->dungeon_idx].flags1 & DF1_BEGINNER))
+	if (!(option & GMN_ARENA) && !(d_info[player_ptr->dungeon_idx].flags1 & DF1_BEGINNER))
 	{
 		if (ironman_nightmare && !randint0(reinforcement_possibility))
 		{
@@ -1032,7 +1032,7 @@ MONRACE_IDX get_mon_num(player_type *player_ptr, DEPTH level)
 		MONRACE_IDX r_idx = table[i].index;
 		monster_race *r_ptr;
 		r_ptr = &r_info[r_idx];
-		if (!player_ptr->phase_out && !chameleon_change_m_idx)
+		if (!(option & GMN_ARENA) && !chameleon_change_m_idx)
 		{
 			if (((r_ptr->flags1 & (RF1_UNIQUE)) ||
 				(r_ptr->flags7 & (RF7_NAZGUL))) &&
@@ -2007,7 +2007,7 @@ void choose_new_monster(player_type *player_ptr, MONSTER_IDX m_idx, bool born, M
 
 		if (d_info[player_ptr->dungeon_idx].flags1 & DF1_CHAMELEON) level += 2 + randint1(3);
 
-		r_idx = get_mon_num(player_ptr, level);
+		r_idx = get_mon_num(player_ptr, level, 0);
 		r_ptr = &r_info[r_idx];
 
 		chameleon_change_m_idx = 0;
@@ -2116,7 +2116,7 @@ static MONRACE_IDX initial_r_appearance(player_type *player_ptr, MONRACE_IDX r_i
 	DEPTH min = MIN(floor_ptr->base_level - 5, 50);
 	while (--attempts)
 	{
-		MONRACE_IDX ap_r_idx = get_mon_num(player_ptr, floor_ptr->base_level + 10);
+		MONRACE_IDX ap_r_idx = get_mon_num(player_ptr, floor_ptr->base_level + 10, 0);
 		if (r_info[ap_r_idx].level >= min) return ap_r_idx;
 	}
 
@@ -2711,7 +2711,7 @@ bool place_monster_aux(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS
 		if (!is_cave_empty_bold2(player_ptr, ny, nx)) continue;
 
 		get_mon_num_prep(player_ptr, place_monster_can_escort, get_monster_hook2(player_ptr, ny, nx));
-		z = get_mon_num(player_ptr, r_ptr->level);
+		z = get_mon_num(player_ptr, r_ptr->level, 0);
 		if (!z) break;
 
 		(void)place_monster_one(player_ptr, place_monster_m_idx, ny, nx, z, mode);
@@ -2738,7 +2738,7 @@ bool place_monster(player_type *player_ptr, POSITION y, POSITION x, BIT_FLAGS mo
 {
 	MONRACE_IDX r_idx;
 	get_mon_num_prep(player_ptr, get_monster_hook(player_ptr), get_monster_hook2(player_ptr, y, x));
-	r_idx = get_mon_num(player_ptr, player_ptr->current_floor_ptr->monster_level);
+	r_idx = get_mon_num(player_ptr, player_ptr->current_floor_ptr->monster_level, 0);
 	if (!r_idx) return FALSE;
 
 	if ((one_in_(5) || (player_ptr->current_floor_ptr->base_level == 0)) &&
@@ -2770,7 +2770,7 @@ bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x)
 	monster_race *r_ptr = NULL;
 	while (--attempts)
 	{
-		r_idx = get_mon_num(player_ptr, floor_ptr->monster_level);
+		r_idx = get_mon_num(player_ptr, floor_ptr->monster_level, 0);
 		if (!r_idx) return FALSE;
 
 		r_ptr = &r_info[r_idx];
@@ -2996,7 +2996,7 @@ bool summon_specific(player_type *player_ptr, MONSTER_IDX who, POSITION y1, POSI
 	summon_unique_okay = (mode & PM_ALLOW_UNIQUE) ? TRUE : FALSE;
 	get_mon_num_prep(player_ptr, summon_specific_okay, get_monster_hook2(player_ptr, y, x));
 
-	MONRACE_IDX r_idx = get_mon_num(player_ptr, (floor_ptr->dun_level + lev) / 2 + 5);
+	MONRACE_IDX r_idx = get_mon_num(player_ptr, (floor_ptr->dun_level + lev) / 2 + 5, 0);
 	if (!r_idx)
 	{
 		summon_specific_type = 0;

--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -30,7 +30,7 @@ void vault_prep_clone(player_type *player_ptr)
 	get_mon_num_prep(player_ptr, vault_aux_simple, NULL);
 
 	/* Pick a race to clone */
-	vault_aux_race = get_mon_num(player_ptr, player_ptr->current_floor_ptr->dun_level + 10);
+	vault_aux_race = get_mon_num(player_ptr, player_ptr->current_floor_ptr->dun_level + 10, 0);
 
 	/* Remove the monster restriction */
 	get_mon_num_prep(player_ptr, NULL, NULL);
@@ -50,7 +50,7 @@ void vault_prep_symbol(player_type *player_ptr)
 	get_mon_num_prep(player_ptr, vault_aux_simple, NULL);
 
 	/* Pick a race to clone */
-	r_idx = get_mon_num(player_ptr, player_ptr->current_floor_ptr->dun_level + 10);
+	r_idx = get_mon_num(player_ptr, player_ptr->current_floor_ptr->dun_level + 10, 0);
 
 	/* Remove the monster restriction */
 	get_mon_num_prep(player_ptr, NULL, NULL);

--- a/src/object2.c
+++ b/src/object2.c
@@ -2899,7 +2899,7 @@ static void a_m_aux_4(player_type *owner_ptr, object_type *o_ptr, int power)
 		get_mon_num_prep(owner_ptr, item_monster_okay, NULL);
 		while (TRUE)
 		{
-			i = get_mon_num(owner_ptr, floor_ptr->dun_level);
+			i = get_mon_num(owner_ptr, floor_ptr->dun_level, 0);
 			r_ptr = &r_info[i];
 			check = (floor_ptr->dun_level < r_ptr->level) ? (r_ptr->level - floor_ptr->dun_level) : 0;
 			if (!r_ptr->rarity) continue;

--- a/src/player-status.c
+++ b/src/player-status.c
@@ -4645,7 +4645,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
 		GAME_TEXT m_name[MAX_NLEN];
 		concptr desc;
 		get_mon_num_prep(creature_ptr, get_nightmare, NULL);
-		r_ptr = &r_info[get_mon_num(creature_ptr, MAX_DEPTH)];
+		r_ptr = &r_info[get_mon_num(creature_ptr, MAX_DEPTH, 0)];
 		power = r_ptr->level + 10;
 		desc = r_name + r_ptr->name;
 		get_mon_num_prep(creature_ptr, NULL, NULL);

--- a/src/quest.c
+++ b/src/quest.c
@@ -55,7 +55,7 @@ void determine_random_questor(player_type *player_ptr, quest_type *q_ptr)
 		 * Random monster 5 - 10 levels out of depth
 		 * (depending on level)
 		 */
-		r_idx = get_mon_num(player_ptr, q_ptr->level + 5 + randint1(q_ptr->level / 10));
+		r_idx = get_mon_num(player_ptr, q_ptr->level + 5 + randint1(q_ptr->level / 10), GMN_ARENA);
 		monster_race *r_ptr;
 		r_ptr = &r_info[r_idx];
 

--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -319,7 +319,7 @@ bool build_type5(player_type *player_ptr)
 		while (attempts--)
 		{
 			/* Get a (hard) monster type */
-			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 11);
+			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 11, 0);
 			r_ptr = &r_info[r_idx];
 
 			/* Decline incorrect alignment */
@@ -529,7 +529,7 @@ bool build_type6(player_type *player_ptr)
 		while (attempts--)
 		{
 			/* Get a (hard) monster type */
-			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 11);
+			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 11, 0);
 			r_ptr = &r_info[r_idx];
 
 			/* Decline incorrect alignment */
@@ -839,7 +839,7 @@ bool build_type13(player_type *player_ptr)
 		while (attempts--)
 		{
 			/* Get a (hard) monster type */
-			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 0);
+			r_idx = get_mon_num(player_ptr, floor_ptr->dun_level + 0, 0);
 			r_ptr = &r_info[r_idx];
 
 			/* Decline incorrect alignment */

--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -86,7 +86,7 @@ bool build_type15(player_type *player_ptr)
 		/* Place fixed lite berathers */
 		for (dir1 = 4; dir1 < 8; dir1++)
 		{
-			MONRACE_IDX r_idx = get_mon_num(player_ptr, floor_ptr->dun_level);
+			MONRACE_IDX r_idx = get_mon_num(player_ptr, floor_ptr->dun_level, 0);
 
 			y = yval + 2 * ddy_ddd[dir1];
 			x = xval + 2 * ddx_ddd[dir1];
@@ -150,7 +150,7 @@ bool build_type15(player_type *player_ptr)
 		g_ptr->feat = feat_glass_wall;
 		get_mon_num_prep(player_ptr, vault_aux_lite, NULL);
 
-		r_idx = get_mon_num(player_ptr, floor_ptr->dun_level);
+		r_idx = get_mon_num(player_ptr, floor_ptr->dun_level, 0);
 		if (r_idx) place_monster_aux(player_ptr, 0, yval, xval, r_idx, 0L);
 
 		/* Walls around the breather */
@@ -217,7 +217,7 @@ bool build_type15(player_type *player_ptr)
 		/* Place shard berathers */
 		for (dir1 = 4; dir1 < 8; dir1++)
 		{
-			MONRACE_IDX r_idx = get_mon_num(player_ptr, floor_ptr->dun_level);
+			MONRACE_IDX r_idx = get_mon_num(player_ptr, floor_ptr->dun_level, 0);
 
 			y = yval + ddy_ddd[dir1];
 			x = xval + ddx_ddd[dir1];

--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2395,7 +2395,7 @@ static MONRACE_IDX poly_r_idx(player_type *caster_ptr, MONRACE_IDX r_idx)
 	MONRACE_IDX r;
 	for (int i = 0; i < 1000; i++)
 	{
-		r = get_mon_num(caster_ptr, (caster_ptr->current_floor_ptr->dun_level + r_ptr->level) / 2 + 5);
+		r = get_mon_num(caster_ptr, (caster_ptr->current_floor_ptr->dun_level + r_ptr->level) / 2 + 5, 0);
 		if (!r) break;
 
 		r_ptr = &r_info[r];