Attached Files |
patch.txt [^] (1,279 bytes) 2014-09-07 00:15 [Show Content] [Hide Content]diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc
index 4b771ba..7093cc4 100644
--- a/crawl-ref/source/ranged_attack.cc
+++ b/crawl-ref/source/ranged_attack.cc
@@ -661,6 +661,8 @@ bool ranged_attack::apply_missile_brand()
switch (brand)
{
default:
+ // Clear any damage possibly set by the launcher brand
+ special_damage = 0;
break;
case SPMSL_FLAME:
if (using_weapon()
@@ -672,7 +674,7 @@ bool ranged_attack::apply_missile_brand()
defender->is_icy() ? "melt" : "burn",
projectile->name(DESC_THE).c_str());
defender->expose_to_element(BEAM_FIRE);
- attacker->god_conduct(DID_FIRE, 2);
+ attacker->god_conduct(DID_FIRE, 1);
break;
case SPMSL_FROST:
if (using_weapon()
@@ -680,7 +682,7 @@ bool ranged_attack::apply_missile_brand()
{
break;
}
- calc_elemental_brand_damage(BEAM_COLD, defender->res_fire(), "freeze",
+ calc_elemental_brand_damage(BEAM_COLD, defender->res_cold(), "freeze",
projectile->name(DESC_THE).c_str());
defender->expose_to_element(BEAM_COLD, 2);
break;
|