summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4a35a1f)
していて実際には殴れなかったりした場合でも [情], [誉] が下がっていた
バグを修正.
!(p_ptr->muta2 & (MUT2_HORNS | MUT2_BEAK | MUT2_SCOR_TAIL | MUT2_TRUNK | MUT2_TENTACLES)))
{
#ifdef JP
!(p_ptr->muta2 & (MUT2_HORNS | MUT2_BEAK | MUT2_SCOR_TAIL | MUT2_TRUNK | MUT2_TENTACLES)))
{
#ifdef JP
- msg_print("ξ¼ê¤¬¤Õ¤µ¤¬¤Ã¤Æ¹¶·â¤Ç¤¤Ê¤¤¡£");
+ msg_format("%s¹¶·â¤Ç¤¤Ê¤¤¡£", (empty_hands(FALSE) == EMPTY_HAND_NONE) ? "ξ¼ê¤¬¤Õ¤µ¤¬¤Ã¤Æ" : "");
#else
msg_print("You cannot do attacking.");
#endif
return FALSE;
}
#else
msg_print("You cannot do attacking.");
#endif
return FALSE;
}
- if (m_ptr->csleep) /* It is not honorable etc to attack helpless victims */
- {
- if (!(r_ptr->flags3 & RF3_EVIL) || one_in_(5)) chg_virtue(V_COMPASSION, -1);
- if (!(r_ptr->flags3 & RF3_EVIL) || one_in_(5)) chg_virtue(V_HONOUR, -1);
- }
-
/* Extract monster name (or "it") */
monster_desc(m_name, m_ptr, 0);
/* Extract monster name (or "it") */
monster_desc(m_name, m_ptr, 0);
+ if (m_ptr->csleep) /* It is not honorable etc to attack helpless victims */
+ {
+ if (!(r_ptr->flags3 & RF3_EVIL) || one_in_(5)) chg_virtue(V_COMPASSION, -1);
+ if (!(r_ptr->flags3 & RF3_EVIL) || one_in_(5)) chg_virtue(V_HONOUR, -1);
+ }
+
if (p_ptr->migite && p_ptr->hidarite)
{
if ((p_ptr->skill_exp[GINOU_NITOURYU] < s_info[p_ptr->pclass].s_max[GINOU_NITOURYU]) && ((p_ptr->skill_exp[GINOU_NITOURYU] - 1000) / 200 < r_ptr->level))
if (p_ptr->migite && p_ptr->hidarite)
{
if ((p_ptr->skill_exp[GINOU_NITOURYU] < s_info[p_ptr->pclass].s_max[GINOU_NITOURYU]) && ((p_ptr->skill_exp[GINOU_NITOURYU] - 1000) / 200 < r_ptr->level))