diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-27 10:25:19 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-27 10:25:19 -0400 |
| commit | 7e837e586be8647c7da60b32d6144b700bec2f7c (patch) | |
| tree | c5537a7950b54d3af3c7933711f8a1a6e00d1515 /crawl-ref/source/beam.cc | |
| parent | a4838dc9d1016f0240b5fe2dd244f6cbbd5e8aa7 (diff) | |
| download | crawl-ref-7e837e586be8647c7da60b32d6144b700bec2f7c.tar.gz crawl-ref-7e837e586be8647c7da60b32d6144b700bec2f7c.zip | |
Only Dithmenos can prevent forest fires! (#8624)
There doesn't seem to be a simple way to prevent the penance from
coming around while still giving you XP for monsters killed, and also
giving penance when you start a forest fire on purpose. This seems to
be the simplest solution.
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 51d5c0e430..1ffacedc7b 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -861,8 +861,12 @@ void bolt::fire_wall_effect() did_god_conduct(DID_PLANT_KILLED_BY_SERVANT, 1, god_cares()); ASSERT(agent()); // Trees do not burn so readily in a wet environment - if (player_in_branch(BRANCH_SWAMP)) + if (player_in_branch(BRANCH_SWAMP) + // And you shouldn't get tons of penance from an unid'd wand of fire + || (you_worship(GOD_DITHMENOS) && !player_under_penance())) + { place_cloud(CLOUD_FIRE, pos(), random2(12)+5, agent()); + } else place_cloud(CLOUD_FOREST_FIRE, pos(), random2(30)+25, agent()); obvious_effect = true; |