diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 18:49:10 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 18:49:10 +0000 |
| commit | 8a218b4239b5e4966f1821590d02818ef0556e77 (patch) | |
| tree | f3d896fac71ff56a76e69f2fe6b4fdb93a5e4d03 /crawl-ref/source/beam.cc | |
| parent | a5351e1ee6df760073f2cc8b0c517c2af5feea58 (diff) | |
| download | crawl-ref-8a218b4239b5e4966f1821590d02818ef0556e77.tar.gz crawl-ref-8a218b4239b5e4966f1821590d02818ef0556e77.zip | |
Consolidate a bit more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5241 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 48f993ba20..71c5e5f9a3 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4290,17 +4290,9 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) } if (beam.flavour != BEAM_CHARM) - { - if (mons_friendly(mon)) - conduct.set(DID_ATTACK_FRIEND, 5, true, mon); - else if (mons_neutral(mon)) - conduct.set(DID_ATTACK_NEUTRAL, 5, true, mon); - - if (is_unchivalric_attack(&you, mon, mon)) - conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, mon); - } - - if (mons_is_holy(mon)) + set_attack_conducts(mon, conduct); + // No charming holy beings! + else if (mons_is_holy(mon)) conduct.set(DID_ATTACK_HOLY, mon->hit_dice, true, mon); if (you.religion == GOD_BEOGH |