diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-30 05:56:13 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-30 05:56:13 +0000 |
| commit | fc944616f69e347423c408a9d3e3efee9140a46d (patch) | |
| tree | 342a77d3a517969c7ac57c6d6bc0408dc07422c3 /crawl-ref/source/beam.h | |
| parent | cc20c6d673722c6dd4ca32290d9cc66e55597f3c (diff) | |
| download | crawl-ref-fc944616f69e347423c408a9d3e3efee9140a46d.tar.gz crawl-ref-fc944616f69e347423c408a9d3e3efee9140a46d.zip | |
This commit breaks save file compatability.
Lots of new things that amuse/stimulate Xom, and a few things which
don't amuse him as much anymore. Among the new things is a corpse
turning into a skeleton while butchering it; if this is too harsh to
do just for Xom's amusement (previously turning into a skeleton while
butchering was an ignored case and still produced chunks of flesh) it
can be changed back. Also, if a Xom worshiper draws the Blank card,
Xom makes it act like a Xom card, since a plain old Blank card is boring.
Keep track of which branch the Orb is in, if the player isn't carrying
it.
Keep track of how/why the player ended up in a particular level type
(Abyss, Pan, etc).
Changed most "a distortion effect" cause strings for distortion caused
tranlsocation miscast effects to something more specific.
Added new wizard commands 'C' to curse or uncruse an item, and 'Ctrl-A'
to re-generate the Abyss.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2256 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.h')
| -rw-r--r-- | crawl-ref/source/beam.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h index 11cd0c5f6e..ee8819748b 100644 --- a/crawl-ref/source/beam.h +++ b/crawl-ref/source/beam.h @@ -150,6 +150,8 @@ struct bolt bool effect_known; // did we _know_ this would happen? int fr_count, foe_count; // # of times a friend/foe is "hit" int fr_power, foe_power; // total levels/hit dice affected + int fr_hurt, foe_hurt; // # of friends/foes actually hurt + int fr_helped, foe_helped; // # of friends/foes actually helped // INTERNAL use - should not usually be set outside of beam.cc bool is_tracer; // is this a tracer? @@ -195,7 +197,7 @@ void fire_beam( struct bolt &pbolt, item_def *item = NULL ); * called from: beam * *********************************************************************** */ bool nasty_beam( struct monsters *mon, struct bolt &beam ); - +bool nice_beam( struct monsters *mon, struct bolt &beam ); // last updated 12may2000 {dlb} /* *********************************************************************** |