summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorjohnny shelley <jwshelley@shell-22005.(none)>2009-11-19 05:44:39 +0000
committerMatthew Cline <zelgadis@sourceforge.net>2009-11-20 02:34:28 -0800
commitcd397dc4d76ee1ca808b7a19780b7f0a573331f1 (patch)
tree2da4843a0e279a8a2ddb79326812249d70d7e6c2 /crawl-ref/source/item_use.cc
parent1dcce9fd9868509eca825cf264c95dcb0b5e511a (diff)
downloadcrawl-ref-cd397dc4d76ee1ca808b7a19780b7f0a573331f1.tar.gz
crawl-ref-cd397dc4d76ee1ca808b7a19780b7f0a573331f1.zip
ammo mulch changes
fire / frost / electric / reaping are not auto mulch flame has chance to save reduced by 2 frost has chance to save reduced by 1 reaping has chance to save reduced by 3 electric has standard chance as it only procs 1 in 3 added was_missile to beam properties in order to not auto mulch other beam types than BEAM_MISSILE Signed-off-by: Matthew Cline <zelgadis@sourceforge.net>
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 99d98abaae..13be59da12 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1975,6 +1975,7 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item,
}
beam.type = dchar_glyph(zapsym);
+ beam.was_missile = true;
returning = get_weapon_brand(item) == SPWPN_RETURNING
|| get_ammo_brand(item) == SPMSL_RETURNING;
@@ -3206,6 +3207,8 @@ bool thrown_object_destroyed(item_def *item, const coord_def& where,
if (item->base_type == OBJ_MISSILES)
{
int brand = get_ammo_brand(*item);
+ if (brand == SPMSL_CHAOS || brand == SPMSL_DISPERSAL)
+ return(true);
// [dshaligram] Removed influence of Throwing on ammo preservation.
// The effect is nigh impossible to perceive.
switch (item->sub_type)
@@ -3228,6 +3231,12 @@ bool thrown_object_destroyed(item_def *item, const coord_def& where,
}
if (brand == SPMSL_STEEL)
chance *= 10;
+ if (brand == SPMSL_FLAME)
+ chance -= 2;
+ if (brand == SPMSL_FROST) // ice seems less destructive to the missile, right?
+ chance -= 1;
+ if (brand == SPMSL_REAPING)
+ chance -= 3;
}
// Enchanted projectiles get an extra shot at avoiding