From: deskull Date: Wed, 12 Aug 2020 07:46:19 +0000 (+0900) Subject: [Refactor] #40514 lite判定整理. / Clear lite judgment. X-Git-Tag: vmacos3.0.0-alpha52~688 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d2dbdc069a8b475f013a7758b948769d45f944d;p=hengbandforosx%2Fhengbandosx.git [Refactor] #40514 lite判定整理. / Clear lite judgment. --- diff --git a/src/player/player-personality.c b/src/player/player-personality.c index f68496ed4..e2fb27109 100644 --- a/src/player/player-personality.c +++ b/src/player/player-personality.c @@ -144,11 +144,6 @@ const player_personality *ap_ptr; void set_personality_flags(player_type *creature_ptr) { - if (creature_ptr->pseikaku == PERSONALITY_LUCKY) creature_ptr->muta3 |= MUT3_GOOD_LUCK; - if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) { - if (creature_ptr->pclass != CLASS_NINJA) - creature_ptr->lite = TRUE; - } } diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c index 927491fb3..23a6d2fc8 100644 --- a/src/player/player-status-flags.c +++ b/src/player/player-status-flags.c @@ -2116,7 +2116,11 @@ void have_lite(player_type *creature_ptr) if (creature_ptr->pclass == CLASS_NINJA) return; - if (creature_ptr->mimic_form == MIMIC_VAMPIRE) { + if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) { + creature_ptr->lite = TRUE; + } + + if (creature_ptr->mimic_form == MIMIC_VAMPIRE) { creature_ptr->lite = TRUE; } diff --git a/src/player/player-status.c b/src/player/player-status.c index 0a65c266b..7ebd00be0 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -710,7 +710,6 @@ void calc_bonuses(player_type *creature_ptr) calc_race_status(creature_ptr); - if (creature_ptr->special_defense & KAMAE_MASK) { if (!(empty_hands_status & EMPTY_HAND_RARM)) { set_action(creature_ptr, ACTION_NONE);