From e013f7c45f9cde9a65909da9a4d9fabc514d0448 Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Thu, 12 Oct 2023 08:09:07 +0200 Subject: [PATCH] The Candle of Eternal Flame grants cold resistance (again). --- include/artilist.h | 2 +- src/worn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/artilist.h b/include/artilist.h index 195fd4a00..4be961794 100644 --- a/include/artilist.h +++ b/include/artilist.h @@ -651,7 +651,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = { A("The Candle of Eternal Flame", MAGIC_CANDLE, (SPFX_NOGEN | SPFX_RESTR | SPFX_INTEL), (SPFX_WARN | SPFX_TCTRL), 0, - NO_ATTK, NO_DFNS, CARY(AD_FIRE), SUMMON_FIRE_ELEMENTAL, + NO_ATTK, NO_DFNS, CARY(AD_COLD), SUMMON_FIRE_ELEMENTAL, A_LAWFUL, PM_FLAME_MAGE, NON_PM, 5000L, NO_COLOR, DEFAULT_MAT), A("The Staff of Aesculapius", QUARTERSTAFF, diff --git a/src/worn.c b/src/worn.c index 496d183d4..2c7e113a7 100644 --- a/src/worn.c +++ b/src/worn.c @@ -1477,7 +1477,6 @@ struct obj *obj; || wielding_artifact(ART_BALMUNG) || wielding_artifact(ART_HELLFIRE) || wearing_artifact(ART_MITRE_OF_HOLINESS) - || carrying_arti(ART_CANDLE_OF_ETERNAL_FLAME) || (u.twoweap && uswapwep->oprops & ITEM_FIRE) || (uwep && uwep->oprops & ITEM_FIRE)) ? 25 : 5; break; @@ -1487,6 +1486,7 @@ struct obj *obj; || wielding_artifact(ART_FROST_BRAND) || wielding_artifact(ART_DEEP_FREEZE) || carrying_arti(ART_HAND_OF_VECNA) + || carrying_arti(ART_CANDLE_OF_ETERNAL_FLAME) || (u.twoweap && uswapwep->oprops & ITEM_FROST) || (uwep && uwep->oprops & ITEM_FROST)) ? 25 : 5; break;