diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-17 19:21:53 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-27 17:02:33 -0600 |
| commit | 51a3c3daa54985a74a5024480c4b9819e9c41da9 (patch) | |
| tree | 97046b335838c43d593a58def219ca0e43fb6c22 /crawl-ref/source/art-func.h | |
| parent | fde016144d74dc363d43e65ef647e980391aeadc (diff) | |
| download | crawl-ref-51a3c3daa54985a74a5024480c4b9819e9c41da9.tar.gz crawl-ref-51a3c3daa54985a74a5024480c4b9819e9c41da9.zip | |
Ranged attack brands!
Launchers use the equivalent melee brand effects if the missile isn't an
elemental brand (or the attacker is Nessos).
Missiles have their own set of effects; flame, frost, and poison use
effects basically identical to weapon brands, and everything else has
its old effect back.
The lajatang of Order works again. Hooray!
Diffstat (limited to 'crawl-ref/source/art-func.h')
| -rw-r--r-- | crawl-ref/source/art-func.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index 2cd51b1861..97541c62df 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -20,6 +20,7 @@ #define ART_FUNC_H +#include "beam.h" // For Lajatang of Order's silver damage #include "cloud.h" // For storm bow's and robe of clouds' rain #include "effects.h" // For Sceptre of Torment tormenting #include "env.h" // For storm bow env.cgrid @@ -36,7 +37,6 @@ #include "spl-miscast.h" // For Staff of Wucad Mu and Scythe of Curses miscasts #include "spl-summoning.h" // For Zonguldrok animating dead #include "terrain.h" // For storm bow -#include "throw.h" // For silver damage /******************* * Helper functions. @@ -1039,22 +1039,17 @@ static void _SPELLBINDER_melee_effects(item_def* weapon, actor* attacker, static void _ORDER_melee_effects(item_def* item, actor* attacker, actor* defender, bool mondied, int dam) { - // FIXME for new ranged combat -/* if (!mondied) { - int tempdam = dam; - bolt tempbeam; string msg = ""; - silver_damages_victim(tempbeam, defender, tempdam, msg); - if (tempdam > dam) + int silver_dam = silver_damages_victim(defender, dam, msg); + if (silver_dam) { - tempdam -= dam; if (you.can_see(defender)) mpr(msg.c_str()); - defender->hurt(attacker, tempdam); + defender->hurt(attacker, silver_dam); } - } */ + } } /////////////////////////////////////////////////// |