summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-29 19:25:47 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-29 19:25:47 +0000
commit4dc30336a62ec7e8261253fc0b9c0674efda1555 (patch)
tree0e9a7c350fbd1725327f6c0a8bae934524d3e1f1 /crawl-ref/source/beam.cc
parent5060b8b617ae6987eb81ba9fde12ff65e9b2beb2 (diff)
downloadcrawl-ref-4dc30336a62ec7e8261253fc0b9c0674efda1555.tar.gz
crawl-ref-4dc30336a62ec7e8261253fc0b9c0674efda1555.zip
Add Eino's totally awesome Grum tile, as well as my own significantly less
awesome tile for Kirke. Thanks, Eino, you rock! Some modifications for Kirke: * reduce the size of Kirke's hog band * replace Summon Ice Beasts with another instance of the "porkalator" * give the porkalator a 33% chance of upgrading a nearby hostile monster to hog Also, open a new category in dc-mon.txt for transformations, so specific tiles are easier to add. The player's pig form now looks subtly different from the other hogs, some greater difference would be better, though. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10076 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 4067b00a24..4411d80d27 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4700,10 +4700,8 @@ bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon)
break;
case BEAM_PORKALATOR:
- rc = (mons_holiness(mon) == MH_NATURAL
- && mon->type != MONS_HOG) ||
- (mons_holiness(mon) == MH_DEMONIC
- && mon->type != MONS_HELL_HOG);
+ rc = (mons_holiness(mon) == MH_DEMONIC && mon->type != MONS_HELL_HOG)
+ || (mons_holiness(mon) == MH_NATURAL && mon->type != MONS_HOG);
break;
default:
@@ -5023,9 +5021,11 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon)
return (MON_AFFECTED);
case BEAM_PORKALATOR:
- if (monster_polymorph(mon, (mons_holiness(mon)==MH_DEMONIC)?
- MONS_HELL_HOG : MONS_HOG))
+ if (monster_polymorph(mon, (mons_holiness(mon) == MH_DEMONIC?
+ MONS_HELL_HOG : MONS_HOG)))
+ {
obvious_effect = true;
+ }
return (MON_AFFECTED);
default: