OSDN > Find Software > Games/Entertainment > hengbandforosx > SCM > git > hengbandosx > Commit

hengbandforosx
Fork
hengbandosx
web

hengbandosx: Commit

The master and develop branches track hengband.

OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.

Merge pull request #519 from sikabane-works/release/3.0.0Alpha12

Release/3.0.0 alpha12

--- a/.github/workflows/publish-spoiler-page.yml

+++ b/.github/workflows/publish-spoiler-page.yml

--- a/src/effect/effect-monster.cpp

+++ b/src/effect/effect-monster.cpp

		@@ -58,15 +58,30 @@ static process_result is_affective(player_type *caster_ptr, effect_monster_type
58	58	return PROCESS_FALSE;
59	59	if (em_ptr->who && (em_ptr->g_ptr->m_idx == em_ptr->who))
60	60	return PROCESS_FALSE;
61		- if ((em_ptr->g_ptr->m_idx == caster_ptr->riding) && !em_ptr->who && !(em_ptr->effect_type == GF_OLD_HEAL) && !(em_ptr->effect_type == GF_OLD_SPEED)
62		- && !(em_ptr->effect_type == GF_STAR_HEAL))
63		- return PROCESS_CONTINUE;
64	61	if (sukekaku && ((em_ptr->m_ptr->r_idx == MON_SUKE) \|\| (em_ptr->m_ptr->r_idx == MON_KAKU)))
65	62	return PROCESS_FALSE;
66	63	if (em_ptr->m_ptr->hp < 0)
67	64	return PROCESS_FALSE;
	65	+ if (em_ptr->who \|\| em_ptr->g_ptr->m_idx != caster_ptr->riding)
	66	+ return PROCESS_TRUE;
	67	+
	68	+ switch (em_ptr->effect_type) {
	69	+ case GF_OLD_HEAL:
	70	+ case GF_OLD_SPEED:
	71	+ case GF_STAR_HEAL:
	72	+ return PROCESS_TRUE;
	73	+ case GF_OLD_SLOW:
	74	+ case GF_OLD_SLEEP:
	75	+ case GF_OLD_CLONE:
	76	+ case GF_OLD_CONF:
	77	+ case GF_OLD_POLY:
	78	+ case GF_GENOCIDE:
	79	+ return PROCESS_CONTINUE;
	80	+ default:
	81	+ break;
	82	+ }
68	83
69		- return PROCESS_TRUE;
	84	+ return PROCESS_FALSE;
70	85	}
71	86
72	87	/*!

--- a/src/player-status/player-stealth.cpp

+++ b/src/player-status/player-stealth.cpp

		@@ -47,7 +47,7 @@ s16b PlayerStealth::personality_value()
47	47	* @details
48	48	* * 職業による加算
49	49	*/
50		-s16b PlayerStealth::base_class_value()
	50	+s16b PlayerStealth::class_base_value()
51	51	{
52	52	const player_class *c_ptr = &class_info[this->owner_ptr->pclass];
53	53	return c_ptr->c_stl + (c_ptr->x_stl * this->owner_ptr->lev / 10);

--- a/src/player-status/player-stealth.h

+++ b/src/player-status/player-stealth.h

		@@ -12,7 +12,7 @@ protected:
12	12	void set_locals() override;
13	13	s16b race_value() override;
14	14	s16b class_value() override;
15		- s16b base_class_value();
	15	+ s16b class_base_value() override;
16	16	s16b personality_value() override;
17	17	s16b time_effect_value() override;
18	18	s16b mutation_value() override;

--- a/src/system/angband-version.h

+++ b/src/system/angband-version.h

		@@ -19,7 +19,7 @@
19	19	#define FAKE_VER_MAJOR 13 /!< ゲームのバージョン番号定義(メジャー番号 + 10) /
20	20	#define FAKE_VER_MINOR 0 /!< ゲームのバージョン番号定義(マイナー番号) /
21	21	#define FAKE_VER_PATCH 0 /!< ゲームのバージョン番号定義(パッチ番号) /
22		-#define FAKE_VER_EXTRA 11 /!< ゲームのバージョン番号定義(エクストラ番号) /
	22	+#define FAKE_VER_EXTRA 12 /!< ゲームのバージョン番号定義(エクストラ番号) /
23	23
24	24	/*!
25	25	* @brief バージョンが開発版が安定版かを返す

--- a/src/window/display-sub-windows.cpp

+++ b/src/window/display-sub-windows.cpp

		@@ -526,10 +526,10 @@ static void display_floor_item_list(player_type *player_ptr, const int y, const
526	526	object_type *const o_ptr = &floor_ptr->o_list[o_idx];
527	527
528	528	// 未発見アイテムおよび金は対象外。
529		- if (!(o_ptr->marked & OM_FOUND))
530		- continue;
531		- if (o_ptr->tval == TV_GOLD)
	529	+ if (none_bits(o_ptr->marked, OM_FOUND) \|\| o_ptr->tval == TV_GOLD) {
	530	+ o_idx = o_ptr->next_o_idx;
532	531	continue;
	532	+ }
533	533
534	534	// 途中で行数が足りなくなったら最終行にその旨追記して終了。
535	535	if (term_y >= term_h) {