}
else if (flag1 == TR_LITE_1)
{
- if (have_flag(flgs, TR_LITE_M1) || have_flag(flgs, TR_LITE_M2) || have_flag(flgs, TR_LITE_M3))
+ if (have_dark_flag(flgs))
{
c_put_str(TERM_L_DARK, "+", row, col);
header_color = TERM_WHITE;
}
- else if (have_flag(flgs, TR_LITE_1) || have_flag(flgs, TR_LITE_2) || have_flag(flgs, TR_LITE_3))
+ else if (have_lite_flag(flgs))
{
c_put_str(TERM_WHITE, "+", row, col);
header_color = TERM_WHITE;
{ "³è", "Rg", TR_REGEN, -1 },
{ "Éâ", "Lv", TR_LEVITATION, -1 },
{ "ÌÀ", "Lu", TR_LITE_1, -1 },
+ { "ÌÀ", "Lu", TR_LITE_2, -1 },
+ { "ÌÀ", "Lu", TR_LITE_3, -1 },
+ { "°Ç", "Dl", TR_LITE_M1, -1 },
+ { "°Ç", "Dl", TR_LITE_M2, -1 },
+ { "°Ç", "Dl", TR_LITE_M3, -1 },
{ "·Ù", "Wr", TR_WARNING, -1 },
{ "ÇÜ", "Xm", TR_XTRA_MIGHT, -1 },
{ "¼Í", "Xs", TR_XTRA_SHOTS, -1 },
{ "Rg", TR_REGEN, -1 },
{ "Lv", TR_LEVITATION, -1 },
{ "Lu", TR_LITE_1, -1 },
+ { "Lu", TR_LITE_2, -1 },
+ { "Lu", TR_LITE_3, -1 },
+ { "Dl", TR_LITE_M1, -1 },
+ { "Dl", TR_LITE_M2, -1 },
+ { "Dl", TR_LITE_M3, -1 },
{ "Wr", TR_WARNING, -1 },
{ "Xm", TR_XTRA_MIGHT, -1 },
{ "Xs", TR_XTRA_SHOTS, -1 },
/* Extract the flags */
object_flags(o_ptr, flgs);
-
/* Remove obvious flags */
if (!all)
{
}
}
+ /* Remove lite flags when this is a dark lite object */
+ if (have_dark_flag(flgs))
+ {
+ if (have_flag(flgs, TR_LITE_1)) remove_flag(flgs, TR_LITE_1);
+ if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2);
+ if (have_flag(flgs, TR_LITE_3)) remove_flag(flgs, TR_LITE_3);
+ }
+ else if (have_lite_flag(flgs))
+ {
+ add_flag(flgs, TR_LITE_1);
+ if (have_flag(flgs, TR_LITE_2)) remove_flag(flgs, TR_LITE_2);
+ if (have_flag(flgs, TR_LITE_3)) remove_flag(flgs, TR_LITE_3);
+ }
/* Plusses */
if (have_flag_of(flag_insc_plus, flgs))