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

変愚蛮怒
Fork
hengband
web

hengband: Commit

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

Merge remote-tracking branch 'remotes/origin/feature/Fix-Resist-Shard-HalfGiant' into develop

--- a/src/player/player-status-flags.c

+++ b/src/player/player-status-flags.c

		@@ -1352,7 +1352,7 @@ BIT_FLAGS has_resist_shard(player_type *creature_ptr)
1352	1352	{
1353	1353	BIT_FLAGS result = 0L;
1354	1354
1355		- if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_TITAN \|\| creature_ptr->prace == RACE_SKELETON))
	1355	+ if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_GIANT \|\| creature_ptr->prace == RACE_SKELETON))
1356	1356	result \|= 0x01 << FLAG_CAUSE_RACE;
1357	1357
1358	1358	if (creature_ptr->special_defense & KATA_MUSOU) {

		@@ -1729,4 +1729,3 @@ BIT_FLAGS player_aggravate_state(player_type *creature_ptr)
1729	1729	}
1730	1730
1731	1731	bool has_aggravate(player_type *creature_ptr) { return player_aggravate_state(creature_ptr) == AGGRAVATE_NORMAL; }
1732		-