ASSERT(!actor_at(newpos)) in 'spl-tornado.cc' at line 418 failed.

Version: Dungeon Crawl Stone Soup 0.12-a0-1130-g49e873a
Platform: Windows
Bits: 32
Game mode: normal
Tiles: yes

Command line: M:\Crawl\crawl.exe

RC options:
restart_after_game = true


Unable to get stack trace on this platform.
Unable to get stack trace on this platform.

Compilation info:
<<<<<<<<<<<
Compiled with GCC 4.4.0 on Nov 19 2012 at 20:10:56
Build platform: mingw32
Platform: mingw32
CFLAGS: -O2 -pipe -Wall -Wformat-security -DWINMM_PLAY_SOUNDS -DUSE_TILE -DUSE_TILE_LOCAL -DUSE_SDL -DUSE_GL -DUSE_FT -Wundef -Wno-array-bounds -Wno-parentheses -Wno-unused-parameter -Wwrite-strings -Wshadow -Wuninitialized -Icontrib/install/mingw32/include -Iutil -I. -Irltiles -Icontrib/install/mingw32/include/SDL -Icontrib/install/mingw32/include/freetype2 -DWIZARD -DASSERTS -DPROPORTIONAL_FONT="contrib/fonts/DejaVuSans.ttf" -DMONOSPACED_FONT="contrib/fonts/DejaVuSansMono.ttf" -DREGEX_PCRE -DCLUA_BINDINGS
LDFLAGS: -O2 
>>>>>>>>>>>

Place info:
branch = 8, depth = 5

Level id: Snake:5
Level build method = random_map_for_place, level layout type  = misc, absdepth0 = 19
Level vaults:
    snake_pit: (0,36) (40,34) orient: 7 lev: 19
    layout_loops_corners: (0,0) (80,70) orient: 9 lev: 19
    serial_shops (extra): (19,20) (0,0) orient: 10 lev: 19
    shop (extra): (57,61) (1,1) orient: 10 lev: 19
    shop_statue (extra): (27,24) (9,1) orient: 10 lev: 19
    shop_coins (extra): (37,5) (3,3) orient: 10 lev: 19

Markers:
<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>

Messages:
<<<<<<<<<<<<<<<<<<<<<<
Aiming: Airstrike
Aim: a vampiric trident (severely damaged)
The air twists around and strikes the vampiric trident!
The vampiric trident falls from the air.
A glowing scimitar comes into view.
Ashenzari warns you: It is a scimitar of holy wrath.
A glowing dwarven short sword comes into view.
Ashenzari warns you: It is a dwarven short sword of venom.
Aiming: Airstrike
Aim: a scimitar of holy wrath (hasn't noticed you)
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath is severely damaged.
Aiming: Airstrike
Aim: a scimitar of holy wrath (severely damaged)
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath is severely damaged.
Aiming: Airstrike
Aim: a scimitar of holy wrath (severely damaged)
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath falls from the air.
Aiming: Airstrike
Aim: a dwarven short sword of venom
The air twists around and strikes the dwarven short sword of venom!
The dwarven short sword of venom falls from the air.
You draw magical energy from your own body!
You start resting.
HP restored.
You draw magical energy from your own body!
You draw magical energy from your own body!
Your skin crawls.
A runed battleaxe comes into view.
Ashenzari warns you: It is a battleaxe of freezing.
You found a bolt trap!
You start to feel a little slower.
Aiming: Airstrike
Aim: a battleaxe of freezing (resting)
The air twists around and strikes the battleaxe of freezing!
Aiming: Airstrike
Aim: a battleaxe of freezing
The air twists around and strikes the battleaxe of freezing!
Aiming: Airstrike
Aim: a battleaxe of freezing
The air twists around and strikes the battleaxe of freezing!
Aiming: Airstrike
Aim: a battleaxe of freezing
The air twists around and strikes the battleaxe of freezing!
The battleaxe of freezing is heavily damaged.
Aiming: Airstrike
Aim: a battleaxe of freezing (heavily damaged)
Okay, then.
You blink.
2 dancing weapons come into view.
Ashenzari warns you: There is a scimitar of holy wrath. There is a trident of dragon slaying.
You feel sluggish.
Aiming: Airstrike
Aim: a battleaxe of freezing (heavily damaged)
The air twists around and strikes the battleaxe of freezing!
The battleaxe of freezing is severely damaged.
Aiming: Airstrike
Aim: a battleaxe of freezing (severely damaged)
The air twists around and strikes the battleaxe of freezing!
The battleaxe of freezing is severely damaged.
Aiming: Airstrike
Aim: a battleaxe of freezing (severely damaged)
The air twists around and strikes the battleaxe of freezing!
The battleaxe of freezing is almost destroyed.
Aiming: Airstrike
Aim: a battleaxe of freezing (almost destroyed)
The air twists around and strikes the battleaxe of freezing!
The battleaxe of freezing falls from the air.
Aiming: Haste
You feel yourself speed up.
You are very lightly contaminated with residual magic.
You feel quick.
You draw magical energy from your own body!
Aiming: Airstrike
Aim: a trident of dragon slaying
The air twists around and strikes the trident of dragon slaying!
The trident of dragon slaying is heavily damaged.
Aiming: Airstrike
Aim: a trident of dragon slaying (heavily damaged)
The air twists around and strikes the trident of dragon slaying!
The trident of dragon slaying is severely damaged.
Aiming: Airstrike
Aim: a trident of dragon slaying (severely damaged)
The air twists around and strikes the trident of dragon slaying!
The trident of dragon slaying falls from the air.
Aiming: Airstrike
Aim: a scimitar of holy wrath
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath is severely damaged.
Aiming: Airstrike
Aim: a scimitar of holy wrath (severely damaged)
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath is almost destroyed.
The scimitar of holy wrath hits you!
Aiming: Airstrike
Aim: a scimitar of holy wrath (almost destroyed)
The air twists around and strikes the scimitar of holy wrath!
The scimitar of holy wrath falls from the air.
You see here an uncursed scimitar of holy wrath.
You see here an uncursed trident of dragon slaying.
You see here an uncursed trident of dragon slaying.
K - a +1,+0 trident of dragon slaying
You drop a +2,+4 glaive of dragon slaying.
You draw magical energy from your own body!
You draw magical energy from your own body!
Your extra speed is starting to run out.
You draw magical energy from your own body!
You draw magical energy from your own body!
You draw magical energy from your own body!
Your skin crawls.
You feel yourself slow down.
You feel quick.
You see here an uncursed battleaxe of chopping.
You found a dart trap!
A runed halberd comes into view.
Aiming: Airstrike
Aim: a runed halberd (resting)
The air twists around and strikes the runed halberd!
The runed halberd is lightly damaged.
Aiming: Airstrike
Aim: a runed halberd (lightly damaged)
The air twists around and strikes the runed halberd!
The runed halberd is lightly damaged.
Aiming: Airstrike
Aim: a runed halberd (lightly damaged)
The air twists around and strikes the runed halberd!
The runed halberd is severely damaged.
Aiming: Airstrike
Aim: a runed halberd (severely damaged)
The air twists around and strikes the runed halberd!
The runed halberd falls from the air.
A glowing morningstar comes into view.
Ashenzari warns you: It is a morningstar of protection.
Aiming: Airstrike
Aim: a morningstar of protection
The air twists around and strikes the morningstar of protection!
The morningstar of protection is severely damaged.
Aiming: Airstrike
Aim: a morningstar of protection (severely damaged)
The air twists around and strikes the morningstar of protection!
The morningstar of protection falls from the air.
You start resting. HP restored.
You start resting.
You start to feel a little slower.
You draw magical energy from your own body!
Your skin crawls.
You feel quick.
Your magical contamination has completely faded away.
A glowing halberd comes into view.
Ashenzari warns you: It is a halberd of pain.
Aiming: Airstrike
Aim: a halberd of pain (resting)
The air twists around and strikes the halberd of pain!
The halberd of pain is moderately damaged.
Aiming: Airstrike
Aim: a halberd of pain (moderately damaged)
The air twists around and strikes the halberd of pain!
The halberd of pain falls from the air.
Your Air Magic skill increases to level 14!
You found a spear trap!
You sense a monster nearby.
A runed dwarven flail comes into view.
Ashenzari warns you: It is a dwarven flail of protection.
Aiming: Airstrike
Aim: a dwarven flail of protection (resting)
The air twists around and strikes the dwarven flail of protection!
The dwarven flail of protection falls from the air.
2 dancing weapons come into view.
Ashenzari warns you: There is a lajatang of freezing.
Aiming: Airstrike
Aim: a lajatang of freezing (hasn't noticed you)
Okay, then.
A glowing flail comes into view.
Ashenzari warns you: It is a flail of holy wrath.
Aiming: Airstrike
Aim: a flail of holy wrath (hasn't noticed you)
The air twists around and strikes the flail of holy wrath!
The flail of holy wrath is moderately damaged.
The flail of holy wrath moves out of view.
Aiming: Airstrike
Aim: a flail of holy wrath (moderately damaged)
The air twists around and strikes the flail of holy wrath!
The flail of holy wrath is severely damaged.
The lajatang of freezing flies safely over a trap.
Aiming: Airstrike
Aim: a flail of holy wrath (severely damaged)
The air twists around and strikes the flail of holy wrath!
The flail of holy wrath falls from the air.
Aiming: Airstrike
Aim: a lajatang of freezing
The air twists around and strikes the lajatang of freezing!
The lajatang of freezing is heavily damaged.
Aiming: Airstrike
Aim: a lajatang of freezing (heavily damaged)
The air twists around and strikes the lajatang of freezing!
The lajatang of freezing is heavily damaged.
The lajatang of freezing barely misses you.
Aiming: Airstrike
Aim: a lajatang of freezing (heavily damaged)
The air twists around and strikes the lajatang of freezing!
The lajatang of freezing is severely damaged.
You block the lajatang of freezing's attack.
Aiming: Airstrike
Aim: a lajatang of freezing (severely damaged)
The air twists around and strikes the lajatang of freezing!
The lajatang of freezing falls from the air.
Aiming: Airstrike
Aim: a runed glaive
The air twists around and strikes the runed glaive!
The runed glaive is moderately damaged.
You start to feel a little slower.
You draw magical energy from your own body!
You block the runed glaive's attack.
You draw magical energy from your own body!
The runed glaive barely misses you.
You draw magical energy from your own body!
The runed glaive hits you from afar.
Aiming: Airstrike
Aim: a runed glaive (moderately damaged)
The air twists around and strikes the runed glaive!
The runed glaive falls from the air.
You feel sluggish.
You draw magical energy from your own body!
You draw magical energy from your own body!
Your skin crawls.
You feel quick.
You start resting.
Your skin is crawling a little less now.
You found a Zot trap!
Your skin stops crawling.
You see here an uncursed dwarven flail of protection.
Magic restored.
You sense a monster nearby.
A glowing halberd comes into view.
Aiming: Airstrike
Aim: a glowing halberd (resting)
The air twists around and strikes the glowing halberd!
The glowing halberd is severely damaged.
Aiming: Airstrike
Aim: a glowing halberd (severely damaged)
The air twists around and strikes the glowing halberd!
The glowing halberd falls from the air.
A runed great mace comes into view.
Ashenzari warns you: It is a great mace of crushing.
Aiming: Airstrike
Aim: a great mace of crushing (hasn't noticed you)
The air twists around and strikes the great mace of crushing!
Aiming: Airstrike
Aim: a great mace of crushing
The air twists around and strikes the great mace of crushing!
Aiming: Airstrike
Aim: a great mace of crushing
The air twists around and strikes the great mace of crushing!
The great mace of crushing is severely damaged.
You start to feel a little slower.
Aiming: Airstrike
Aim: a great mace of crushing (severely damaged)
The air twists around and strikes the great mace of crushing!
The great mace of crushing falls from the air.
You feel quick.
Your skin crawls.
You draw magical energy from your own body!
You see here an uncursed halberd of venom.
Done exploring.
Done exploring.
Done exploring.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Blade @ (x,y), ? - help) 
Your skin is crawling a little less now.
HP restored.
Your skin stops crawling.
Magic restored.
You see here an uncursed trident of flaming.
You see here an uncursed short sword of venom.
There is a staircase back to the Vaults here.
You climb upwards. Welcome back to the Vaults!
There is a staircase to the Hall of Blades here.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Vaults:4, ? - help) 
You see here 25 arrows.
Things that are here:
an uncursed orcish dagger
an uncursed leather armour of cold resistance
an uncursed hand axe of flaming
There is a large open door here.
You see here a troll skeleton.
Things that are here:
an uncursed orcish splint mail; an uncursed orcish glaive; an orc skeleton
Things that are here:
an uncursed orcish chain mail; an uncursed crossbow; an uncursed orcish dire flail
Things that are here:
an uncursed great sword of flaming; an uncursed orcish plate armour; an uncursed spear; a bolt
There is an open door here.
There is an open door here.
There is a stone staircase leading up here.
You climb upwards.
Level annotation: exclusion: statue
There is a stone staircase leading down here.
You start to feel a little slower.
There is an open gate here.
You feel sluggish.
There is an open gate here.
There is a stone staircase leading up, spattered with blood here.
You climb upwards.
There is a stone staircase leading down here.
There is a large open door here.
You see here an uncursed dire flail.
There is an open door here.
There is an open door here.
There is a stone staircase leading up here.
You climb upwards.
Level annotation: 1 exclusion, Nikola
There is a stone staircase leading down here.
There is an open door here.
You see here a stone.
There is an open door, spattered with blood here.
There is a staircase back to the Dungeon here.
You climb upwards. Welcome back to the Dungeon!
Level annotation: Wiglaf
There is a staircase to the Vaults here.
Items here: !! = ????
an uncursed ring of protection from cold
a murky brown potion; a potion of cure mutation; a scroll of enchant weapon I; a scroll of curse armour; a scroll of enchant weapon III
4 scrolls of remove curse
Things that are here:
16 arrows; a cursed bow
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
There is an open door here.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
You are feeling hungry.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Lair:1 @ (x,y), ? - help) 
There is an open door here.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
Things that are here:
an uncursed blowgun; an uncursed club
Things that are here:
an uncursed dwarven short sword; an uncursed blowgun; an uncursed short sword; an uncursed blowgun
You see here 2 silver bolts.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
There is a staircase to the Lair here.
You climb downwards. Welcome to the Lair of Beasts!
There is a staircase back to the Dungeon here.
Items here: !! """ %%%%%% ) ///////// == ????????? [ ||| } ∞∞∞∞∞∞∞∞∞∞∞∞∞
Unknown command.
You drop a book of Spatial Translocations.
You drop a +4,+2 demon trident.
You drop a +1,+0 trident of dragon slaying.
You finish eating. That choko was very bland.
You drop a wand of teleportation.
Okay, then.
V - an uncursed staff of wizardry {!a}
V - an uncursed staff of wizardry (weapon) {!a}
Okay, then.
Unknown command.
K - 4 scrolls of amnesia
Forget which spell ([?*] list [ESC] exit)? 
As you read the scroll of amnesia, it crumbles to dust.
Your memory of Airstrike unravels.
The spell releases its latent energy back to you as it unravels.
This spell is very dangerous to cast!
Memorise Tornado, consuming 9 spell levels and leaving 0? 
You finish memorising. Spell assigned to 'y'.
You drop 3 scrolls of amnesia.
You are a level 23 Octopode Wizard. You are 63% of the way to level 24.
Play time: 09:41:54 (79088 turns)
You feel clever.
It wiggles slightly.
N - the +6,+6 Lehudib's crystal spear (weapon) {return, Int+3}
You drop a scroll of blinking.
Saving game... please wait.
Welcome back, Wrigglystuff the Octopode Wizard.
Ashenzari says: Partake of my vision. Partake of my curse.
You feel stupid.
V - an uncursed staff of wizardry (weapon) {!a}
You feel clever.
It wiggles slightly.
N - the +6,+6 Lehudib's crystal spear (weapon) {return, Int+3}
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, ? - help) 
What level of the Snake Pit? (default 1, ? - help) 
What level of the Snake Pit? (default 4, ? - help) 
You see here a leatherbound book {highlevel}.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
There is a stone staircase leading down here.
You climb downwards.
Level annotation: exclusion: downstairs
There is a stone staircase leading up, spattered with blood here.
There is a staircase to the Snake Pit here.
You climb downwards. Welcome to the Snake Pit!
There is a staircase back to the Lair here.
You see here 17 bolts.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
You see here 20 stones.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
You are feeling hungry.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Snake:4, ? - help) 
There is an open door here.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
You feel protected from missiles.
You feel quick.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Snake:4, ? - help) 
Magic restored.
You start to feel a little slower.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
You feel quick.
Found a scroll of remove curse.
Magic restored.
w - a scroll of remove curse
You start to feel a little slower.
You feel sluggish.
A black mamba comes into view.
You feel quick.
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (resting)
The orb of energy hits the black mamba.
The black mamba is severely wounded.
The black mamba hisses angrily.
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (severely wounded)
The orb of energy hits the black mamba.
You kill the black mamba!
The orb of energy explodes!
You see here a black mamba corpse.
You finish chopping the black mamba corpse into pieces.
E - a chunk of black mamba flesh {@*1}
You see here a black mamba skeleton.
Eating a chunk of black mamba flesh {@*1}.
Found a meat ration.
Found Nexiusma's Antique Weapon Shop.
There is an entrance to Nexiusma's Antique Weapon Shop here.
c - 4 meat rations (gained 1)
A black mamba comes into view.
Aiming: Magic Dart
Aim: a black mamba (resting)
The magic dart hits the black mamba.
The black mamba is lightly wounded.
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (lightly wounded)
The orb of energy hits the black mamba.
The black mamba is heavily wounded.
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (heavily wounded)
The orb of energy hits the black mamba.
The black mamba is almost dead.
Your repel missiles spell is about to expire...
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (almost dead)
The orb of energy hits the black mamba.
You kill the black mamba!
The orb of energy explodes!
A water moccasin comes into view.
An adder comes into view.
Attack whom?
Aim: a water moccasin (hasn't noticed you)
You reach to attack! You puncture the water moccasin!
The water moccasin is almost dead.
Attack whom?
Aim: a water moccasin (almost dead)
You reach to attack! You hit the water moccasin.
You kill the water moccasin!
You feel less protected from missiles.
Attack whom?
Aim: an adder
You reach to attack! You barely miss the adder.
You barely miss the adder.
You closely miss the adder. You grab the adder. You constrict the adder. You block the adder's attack.
You puncture the adder!
You kill the adder!
You see here an adder corpse.
You finish chopping the adder corpse into pieces.
E - a chunk of adder flesh {@*1}
You see here an adder skeleton.
You see here a water moccasin corpse.
You finish chopping the water moccasin corpse into pieces.
F - 2 chunks of water moccasin flesh {@*1}
You open the door.
A naga comes into view. It is wielding a long sword.
Found a stone staircase leading up.
Aiming: Iskenderun's Mystic Blast
Aim: a naga, wielding a long sword and wearing a robe (resting)
The orb of energy hits the naga.
The naga is almost dead.
The naga shouts!
The orb of energy explodes!
There is an open door here.
You found a bolt trap!
The naga spits poison at you.
The splash of poison hits you! You resist.
Attack whom?
Aim: a naga, wielding a long sword and wearing a robe (almost dead)
You reach to attack! You puncture the naga!
You kill the naga!
No target in view!
HP restored.
Things that are here:
an uncursed long sword; an uncursed robe
You open the door.
Found an uncursed pair of gauntlets.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Snake:5, ? - help) 
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
You climb downwards.
There is a stone staircase leading up here.
There is an open door here.
You start to feel a little slower.
You feel sluggish.
Magic restored.
A water moccasin comes into view.
You puncture the water moccasin! You grab the water moccasin.
The water moccasin is heavily wounded.
You constrict the water moccasin. The water moccasin barely misses you.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
Found an uncursed scimitar.
You found a bolt trap!
You feel quick.
You feel protected from missiles.
You see here an uncursed scimitar.
A naga comes into view. It is wielding a flail.
Found an uncursed animal skin.
Move the cursor to view the level map, or type ? for a list of commands.
Returning to the game...
Move the cursor to view the level map, or type ? for a list of commands.
Returning to the game...
Unknown command.
There is an entrance to Nexiusma's Antique Weapon Shop here.
An adder comes into view.
Attack whom?
Aim: an adder (resting)
You reach to attack!
The helpless adder fails to defend itself.
You puncture the adder!
You kill the adder!
No target in view!
You open the door.
4 nagas and a naga warrior come into view.
Aiming: Iskenderun's Mystic Blast
Aim: a naga, wielding a morningstar (resting)
The orb of energy misses the naga. The orb of energy hits the naga.
The naga is almost dead.
The naga shouts!
Aiming: Iskenderun's Mystic Blast
Aim: a naga, wielding a morningstar (hasn't noticed you)
The orb of energy misses the naga. The orb of energy hits the naga.
You kill the naga!
The naga spits poison at you.
The splash of poison misses you.
Aiming: Iskenderun's Mystic Blast
Aim: a naga, wielding a morningstar
The orb of energy hits the naga.
You kill the naga!
The orb of energy explodes! The mystic blast hits the naga.
The naga is moderately wounded.
The mystic blast hits the naga.
The naga is severely wounded.
The naga unwields an uncursed short sword.
The naga drops an uncursed short sword. The naga picks up an uncursed glaive. The naga wields an uncursed glaive.
Attack whom?
Aim: a naga, wielding a runed scimitar and wearing a robe (severely wounded)
You reach to attack! You puncture the naga!
The naga is almost dead.
Aiming: Iskenderun's Mystic Blast
Aim: a naga warrior, wielding a halberd
The orb of energy hits the naga warrior.
The naga warrior is lightly wounded.
The naga spits poison at you.
The splash of poison is repelled.
Aiming: Iskenderun's Mystic Blast
Aim: a naga warrior, wielding a halberd (lightly wounded)
The orb of energy hits the naga warrior.
The naga warrior is severely wounded.
You block the naga warrior's attack.
You hit the naga.
You kill the naga!
The naga warrior completely misses you.
The naga spits poison at you.
You block the splash of poison.
A black mamba comes into view.
Aiming: Iskenderun's Mystic Blast
Aim: a naga warrior, wielding a halberd (severely wounded)
The orb of energy hits the naga warrior.
The naga warrior is severely wounded.
The naga spits poison at you.
You block the splash of poison.
Aiming: Iskenderun's Mystic Blast
Aim: a naga warrior, wielding a halberd (severely wounded)
The orb of energy hits the naga warrior.
You kill the naga warrior!
Attack whom?
Aim: a naga, wielding a glaive (moderately wounded)
You reach to attack! You barely miss the naga.
The naga is moderately wounded.
You start to feel a little slower.
Attack whom?
Aim: a naga, wielding a glaive (moderately wounded)
You reach to attack! You puncture the naga!
The naga is severely wounded.
Attack whom?
Aim: a naga, wielding a glaive (severely wounded)
You reach to attack! You closely miss the naga.
The naga is severely wounded.
The naga misses you.
Aiming: Iskenderun's Mystic Blast
Aim: a naga, wielding a glaive (severely wounded)
The orb of energy hits the black mamba.
The black mamba is heavily wounded.
The orb of energy explodes! The mystic blast hits the naga.
You kill the naga!
You block the black mamba's attack.
You barely miss the black mamba. You squeeze the black mamba!
The black mamba is severely wounded.
The black mamba bites you!
You hit the black mamba.
The black mamba is severely wounded.
The black mamba barely misses you.
You hit the black mamba but do no damage.
You grab the black mamba.
The black mamba is severely wounded.
You constrict the black mamba, but do no damage.
The black mamba closely misses you.
You hit the black mamba.
The black mamba is severely wounded.
You constrict the black mamba. The black mamba bites you!
You completely miss the black mamba.
The black mamba is severely wounded.
You constrict the black mamba. You block the black mamba's attack.
You barely miss the black mamba.
The black mamba is almost dead.
You feel sluggish.
You constrict the black mamba. You block the black mamba's attack.
You hit the black mamba. You squeeze the black mamba.
You kill the black mamba!
There is an open door, spattered with blood here.
Things that are here:
a black mamba corpse; an uncursed scimitar of electrocution; an uncursed robe; a naga corpse
Your skin crawls.
You finish chopping the black mamba corpse into pieces.
J - 2 chunks of black mamba flesh {@*1}
There is an open door, spattered with blood here.
Things that are here:
an uncursed scimitar of electrocution; an uncursed robe; a naga corpse
You finish chopping the naga corpse into pieces.
K - 4 chunks of naga flesh {@*1}
There is an open door, spattered with blood here.
Things that are here:
an uncursed scimitar of electrocution; an uncursed robe
You are feeling hungry.
Eating a chunk of adder flesh {@*1}.
You found a blade trap!
Things that are here:
an uncursed glaive; a naga corpse
Things that are here:
an uncursed halberd; a naga corpse
You see here an uncursed morningstar.
Things that are here:
an uncursed short sword; an uncursed robe; a naga corpse
HP restored.
A black mamba comes into view.
Your skin is crawling a little less now.
Found a scroll of enchant armour.
Aiming: Agony
Aim: a black mamba (hasn't noticed you)
The black mamba convulses in agony! You block the black mamba's attack.
The black mamba bites you but does no damage.
You puncture the black mamba!
The black mamba is severely wounded.
You closely miss the black mamba. You squeeze the black mamba!
You kill the black mamba!
No target in view!
Your repel missiles spell is about to expire...
You see here a black mamba corpse.
Your skin stops crawling.
You finish chopping the black mamba corpse into pieces.
E - 3 chunks of black mamba flesh {@*1}
You feel protected from missiles.
You feel quick.
You feel stupid.
E - 3 chunks of black mamba flesh (in tentacle) {@*1}
The chunk of flesh you are holding crumbles to dust.
A flood of magical energy pours into your mind!
The chunk of flesh you are holding crumbles to dust.
A flood of magical energy pours into your mind!
The chunk of flesh you are holding crumbles to dust.
A flood of magical energy pours into your mind!
You are now empty-tentacled.
You feel clever.
It wiggles slightly.
N - the +6,+6 Lehudib's crystal spear (weapon) {return, Int+3}
E - a scroll of enchant armour
You smell something rotten. (slot F)
Found a potion of curing.
A water moccasin comes into view.
The water moccasin hisses angrily.
A water moccasin is nearby!
You puncture the water moccasin!
The water moccasin is almost dead.
You block the water moccasin's attack.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
I - 5 potions of curing (gained 1)
Magic restored.
Found an uncursed leather armour.
A water moccasin comes into view.
You start to feel a little slower.
You feel quick.
Attack whom?
Aim: a water moccasin (resting)
You reach to attack!
The helpless water moccasin fails to defend itself.
You puncture the water moccasin!
The water moccasin is moderately wounded.
You puncture the water moccasin! You grab the water moccasin.
The water moccasin is severely wounded.
You constrict the water moccasin.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
Magic restored.
A water moccasin comes into view.
Attack whom?
Aim: a water moccasin (resting)
You reach to attack!
The helpless water moccasin fails to defend itself.
You puncture the water moccasin!
The water moccasin is moderately wounded.
You hit the water moccasin.
The water moccasin is heavily wounded.
You block the water moccasin's attack.
You miss the water moccasin.
The water moccasin is heavily wounded.
You puncture the water moccasin!
The water moccasin is almost dead.
The water moccasin completely misses you.
You closely miss the water moccasin.
The water moccasin is almost dead.
You block the water moccasin's attack.
You hit the water moccasin but do no damage.
You squeeze the water moccasin.
The water moccasin is almost dead.
You puncture the water moccasin!
You kill the water moccasin!
A water moccasin comes into view.
A water moccasin is nearby!
The water moccasin hisses angrily.
You block the water moccasin's attack.
You hit the water moccasin. You grab the water moccasin. You squeeze the water moccasin!
The water moccasin is heavily wounded.
You constrict the water moccasin.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
You start to feel a little slower.
Found an uncursed square peridot amulet.
You feel quick.
Magic restored.
M - an uncursed square peridot amulet
You found a spear trap!
Your repel missiles spell is about to expire...
Found a scroll of identify.
An adder comes into view.
Found an uncursed spear.
You hit the adder.
The adder is lightly wounded.
You block the adder's attack.
You puncture the adder! You squeeze the adder.
You kill the adder!
You feel less protected from missiles.
No target in view!
You see here an adder corpse.
You finish chopping the adder corpse into pieces.
S - a chunk of adder flesh {@*1}
A black mamba comes into view.
Aiming: Iskenderun's Mystic Blast
Aim: a black mamba (resting)
The orb of energy hits the black mamba.
The black mamba is almost dead.
The black mamba hisses angrily.
You don't know that spell.
Attack whom?
Aim: a black mamba (almost dead)
You reach to attack! You hit the black mamba.
The black mamba is almost dead.
You impale the black mamba!!
You kill the black mamba!
l - 4 scrolls of identify (gained 1)
You see here an uncursed spear.
Found a stone staircase leading up.
(D) Dungeon        (T) Temple         (O) Orcish Mines   (E) Elven Halls    
(L) Lair           (A) Shoals         (P) Snake Pit      (M) Slime Pits     
(V) Vaults         (B) Hall of Blades (C) Crypt          (W) Tomb           
Where to? (* - list waypoints, Enter - Snake:4, ? - help) 
Magic restored.
There is a stone staircase leading up here.
You climb upwards.
There is a stone staircase leading down here.
You climb downwards.
Level annotation: 1 exclusion
There is a stone staircase leading up here.
A water moccasin comes into view.
Found an apple.
You closely miss the water moccasin. The water moccasin misses you.
You barely miss the water moccasin. You grab the water moccasin. You constrict the water moccasin.
The water moccasin completely misses you.
You hit the water moccasin.
The water moccasin is moderately wounded.
You constrict the water moccasin. The water moccasin closely misses you.
You puncture the water moccasin! You squeeze the water moccasin.
You kill the water moccasin!
No target in view!
W - an apple
You open the door.
A black mamba comes into view.
The black mamba hisses angrily.
There is an open door here.
Attack whom?
Aim: a black mamba
You reach to attack! You puncture the black mamba!
The black mamba is moderately wounded.
You barely miss the black mamba. You grab the black mamba.
The black mamba is moderately wounded.
You constrict the black mamba. The black mamba completely misses you.
You puncture the black mamba! You squeeze the black mamba.
The black mamba is severely wounded.
You constrict the black mamba.
You barely miss the black mamba.
The black mamba is severely wounded.
You constrict the black mamba. The black mamba misses you.
You completely miss the black mamba.
The black mamba is severely wounded.
You constrict the black mamba. The black mamba misses you.
You hit the black mamba but do no damage.
The black mamba is severely wounded.
You constrict the black mamba. The black mamba misses you.
You impale the black mamba!!
You kill the black mamba!
No target in view!
You see here a black mamba corpse.
You finish chopping the black mamba corpse into pieces.
X - a chunk of black mamba flesh {@*1}
You start to feel a little slower.
You feel quick.
You feel protected from missiles.
You smell something rotten. (slot K)
Magic restored.
A water moccasin comes into view.
Found Warih's Assorted Antiques.
The water moccasin hisses angrily.
Attack whom?
Aim: a water moccasin
You reach to attack! You puncture the water moccasin!
The water moccasin is heavily wounded.
You closely miss the water moccasin. You grab the water moccasin.
The water moccasin is heavily wounded.
You constrict the water moccasin.
You barely miss the water moccasin.
The water moccasin is heavily wounded.
You constrict the water moccasin. You block the water moccasin's attack.
You completely miss the water moccasin.
The water moccasin is heavily wounded.
You constrict the water moccasin. The water moccasin bites you.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
You see here a water moccasin corpse.
You finish chopping the water moccasin corpse into pieces.
You drop 2 rotting chunks of water moccasin flesh {@*1}.
F - 2 chunks of water moccasin flesh {@*1}
You see here 2 rotting chunks of water moccasin flesh {@*1}.
The smell of rotting flesh makes you sick. (slot J)
There is an entrance to Warih's Assorted Antiques here.
HP restored.
Found a potion of confusion.
You see here a potion of confusion {!q}.
You see here an uncursed spear.
You open the door.
There is an open door here.
You see here an uncursed morningstar.
Eating a chunk of adder flesh {@*1}.
You start to feel a little slower.
Your repel missiles spell is about to expire...
Found 23 gold pieces.
You feel quick.
You feel protected from missiles.
Found 21 gold pieces. Found Schefim's Armour Shoppe.
Found 121 gold pieces.
You now have 3391 gold pieces (gained 23).
You now have 3402 gold pieces (gained 11).
You now have 3437 gold pieces (gained 35).
Magic restored.
There is an entrance to Schefim's Armour Shoppe here.
You now have 3449 gold pieces (gained 12).
You now have 3470 gold pieces (gained 21).
You now have 3484 gold pieces (gained 14).
You now have 3508 gold pieces (gained 24).
You now have 3533 gold pieces (gained 25).
There is an entrance to Schefim's Armour Shoppe here.
Partly explored, can't reach some places.
Partly explored, can't reach some places.
A water moccasin comes into view.
The water moccasin moves out of view.
What do you say?
 t - Shout!
Orders for allies: a - Attack new target.
                   s - Stop attacking.
                   w - Wait here.           f - Follow me.
 Anything else - Stay silent.
You shout for attention!
You closely miss the water moccasin. You grab the water moccasin.
The water moccasin is moderately wounded.
You constrict the water moccasin. You block the water moccasin's attack.
You hit the water moccasin.
The water moccasin is severely wounded.
You constrict the water moccasin.
You puncture the water moccasin!
You kill the water moccasin!
No target in view!
You see here a water moccasin corpse.
You finish chopping the water moccasin corpse into pieces.
S - 2 chunks of water moccasin flesh {@*1}
You see here a water moccasin skeleton.
There is an open door here.
You open the door.
There is an open door here.
Move the cursor to view the level map, or type ? for a list of commands.
Returning to the game...
You feel quick.
You feel protected from missiles.
Okay, then.
A naga warrior comes into view.
You feel stupid.
V - an uncursed staff of wizardry (weapon) {!a}
2 naga magi come into view.
A naga mage comes into view. It is wielding a scimitar.
A greater naga comes into view.
Ashenzari warns you: It is wearing a robe of positive energy.
Aiming: Haste
You feel yourself speed up.
You are very lightly contaminated with residual magic.
The naga warrior shouts! You hear a shout! You hear a shout!
The naga mage casts a spell.
The naga mage seems to speed up.
The greater naga shouts! You hear a shout! You hear a shout! You hear a shout!
A naga warrior comes into view.
A great vortex of raging winds appears and lifts you up.
The naga mage moves out of view.
A naga comes into view. It is wielding a runed glaive.
Aiming: Orb of Destruction
Aim: a greater naga wearing a robe of positive energy
The naga warrior moves out of view.
A water moccasin and a greater naga come into view.

>>>>>>>>>>>>>>>>>>>>>>

Game state:

mouse_enabled: 0, waiting_for_command: 0, terminal_resized: 0
io_inited: 1, need_save: 1, saving_game: 0, updating_scores: 0:
seen_hups: 0, map_stat_gen: 0, type: 1, arena_suspended: 0

prev_cmd = CMD_WAIT
repeat_cmd = CMD_NO_CMD

Player:
{{{{{{{{{{{
Name:       [Wrigglystuff]
Species:    Octopode
Job:        Wizard

class_name: Wizard

HP: 142/142; mods: 0/6
MP: 22/44; mods: 0/4
Stats: 11 (11) 37 (37) 16 (16)
Position: (20, 41), god:Ashenzari (18), turn_is_over: 1, banished: 0
Standing on/in/over feature: floor

Skills (mode: manual)
Name            | can_train | train | training | level | points | progress
Fighting        |     X     |   0   |     0    |    9  |   2330 | 80/550
Short Blades    |           |   0   |     0    |    0  |      0 | 0/50
Long Blades     |           |   0   |     0    |    0  |      0 | 0/50
Axes            |     X     |   0   |     0    |    0  |      0 | 0/50
Maces & Flails  |           |   0   |     0    |    0  |      0 | 0/50
Polearms        |     X     |   0   |     0    |   12  |   4290 | 90/850
Staves          |     X     |   0   |     0    |    0  |      0 | 0/50
Slings          |           |   0   |     0    |    0  |      0 | 0/50
Bows            |           |   0   |     0    |    0  |      0 | 0/50
Crossbows       |           |   0   |     0    |    0  |      0 | 0/50
Throwing        |     X     |   0   |     0    |    0  |      0 | 0/50
Armour          |           |   0   |     0    |    0  |      0 | 0/1410790100
Dodging         |     X     |   0   |     0    |   13  |   5361 | 311/950
Stealth         |     X     |   0   |     0    |    6  |    527 | 2/175
Stabbing        |     X     |   0   |     0    |    0  |      0 | 0/50
Shields         |     X     |   0   |     0    |   12  |   4590 | 390/850
Traps           |     X     |   0   |     0    |    9  |   1900 | 8/462
Unarmed Combat  |     X     |   0   |     0    |    0  |      0 | 0/50
Spellcasting    |     X     |   0   |     0    |   19  |  15677 | 1050/1962
Conjurations    |     X     |   0   |     0    |   13  |   5431 | 381/950
Hexes           |           |   0   |     0    |    0  |      0 | 0/50
Charms          |     X     |   0   |     0    |   11  |   3750 | 300/750
Summonings      |     X     |   0   |     0    |    3  |    341 | 41/200
Necromancy      |     X     |   0   |     0    |   10  |   3260 | 460/650
Translocations  |     X     |   0   |     0    |    4  |    501 | 1/250
Transmutations  |           |   0   |     0    |    0  |      0 | 0/50
Fire Magic      |           |   0   |     0    |    0  |      0 | 0/50
Ice Magic       |           |   0   |     0    |    0  |      0 | 0/50
Air Magic       |     X     |   1   |   100    |   14  |   6480 | 480/1050
Earth Magic     |           |   0   |     0    |    0  |      0 | 0/50
Poison Magic    |     X     |   0   |     0    |    3  |    230 | 18/141
Invocations     |           |   0   |     0    |    0  |      0 | 0/42
Evocations      |     X     |   0   |     0    |    0  |      0 | 0/35

Spell bugs:

Durations:
    #5: 371
    #9: 47
    #21: 844
    #28: 834
    #66: 47

Attributes:
    #12: 5597
    #13: 2084
    #20: 1
    #23: 16200
    #24: 329295972
    #27: 652864

Mutations:
    #21: 1
    #24: 2
    #86: 1

Demon mutations:
    #21: 1
    #86: 1

Inventory bugs:

Equipment:
    eq slot #0, inv slot #47: staff of wizardry {!a}
    eq slot #2, inv slot #1: cursed +2 wizard hat
    eq slot #5, inv slot #40: cursed +3 shield of Qaph {rPois rF+ Acc-1 Dam+4}
    eq slot #9, inv slot #14: amulet "Tefud" {Clar Str+4 Dex+2 Dam+4}
    eq slot #10, inv slot #25: cursed +3 ring of evasion
    eq slot #11, inv slot #10: +3 ring of dexterity
    eq slot #12, inv slot #8: cursed ring of life protection
    eq slot #13, inv slot #6: cursed ring of protection from magic
    eq slot #14, inv slot #42: cursed +4 ring of intelligence
    eq slot #15, inv slot #18: cursed +4 ring of protection
    eq slot #16, inv slot #41: cursed +4 ring of intelligence
    eq slot #17, inv slot #33: cursed ring "Dethronne" {rC++ rN+ SInv Stlth++}

}}}}}}}}}}}


Screenshot:
▒▒▒▒▒·▒▒▒    ▒·▒▒···▒▒·▒
    ▒·▒▒▒▒▒▒▒▒···▒·▒▒▒·▒
    ▒··············▒ ▒·▒
    ▒▒▒▒▒▒▒▒▒▒···▒·▒ ▒·▒
             ▒·▒▒▒·▒ ▒·▒
             ▒·▒▒▒·▒▒▒·▒
             ▒·········▒
             ▒▒▒▒▒▒····▒▒▒▒▒▒
          ░░░ ▒·····)·······▒░
        ░░ ◦∆ ▒^············▒ ◦  ░
        ◦◦∆◦  ▒###··········▒ {◦
      ░ ◦∆◦  {▒####▒········▒ ◦{
           {◦{▒#@##··········▒◦{◦◦
      ░  ◦◦ ◦{▒##*▒········▒▒···◦
     ░ ◦◦◦◦ ◦NN▒▒#···⌠···▒▒▒◦◦····
        ◦  ·NSN{▒········· ∆{{◦···
     ░◦  ·····▒{···▒······ { {{◦N◦
      ◦◦◦ ····◦ {·········◦ {{{{
     ░ ◦ ◦◦··◦ ◦··N····[·   ◦ ◦ ◦
    ░ ◦◦░░◦ · { ····N    ◦  ◦  ◦
     ◦◦  ░  ◦◦◦ ◦·◦◦ ◦◦◦◦◦ ◦◦◦◦{◦
      ◦ ◦░ ◦◦   ◦ ◦◦  ◦◦◦ ◦ ◦ ◦◦░
    ░◦◦ ░  ◦ ◦ ◦ ◦◦◦ ◦ ◦ ◦◦    ░░
     ░◦◦   ◦ ◦  ◦◦  ◦◦ ◦   ◦◦  ░░◦

clua stack:


dlua stack:


Lua persistent data:
<<<<<<<<<<<<<<<<<<<<<<
bailey_type: bailey_polearm
ice_cave_hard: false
vault_current_stairs_glyph: }
>>>>>>>>>>>>>>>>>>>>>>

Lua marker contents:
<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>

From 6caf761dee925fa7fce098bfc1cec0897ca9cc45 Mon Sep 17 00:00:00 2001
From: Neil Moore <neil@s-z.org>
Date: Wed, 25 Feb 2015 11:58:03 -0500
Subject: [PATCH] Make bennu revival a fineff (#6401)

This fixes some tornado-related crashes.  Felid revival should get the
same treatment, but that is harder because of the need to preserve items.
---
 crawl-ref/source/fineff.cc    | 21 +++++++++++++++++++++
 crawl-ref/source/fineff.h     | 24 ++++++++++++++++++++++++
 crawl-ref/source/mon-abil.cc  |  1 +
 crawl-ref/source/mon-death.cc | 43 +++++++++++--------------------------------
 crawl-ref/source/mon-death.h  |  1 -
 5 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc
index 51b8252..b47628f 100644
--- a/crawl-ref/source/fineff.cc
+++ b/crawl-ref/source/fineff.cc
@@ -535,6 +535,27 @@ void rakshasa_clone_fineff::fire()
     }
 }
 
+void bennu_revive_fineff::fire()
+{
+    // Bennu only resurrect once and immediately in the same spot,
+    // so this is rather abbreviated compared to felids.
+    // XXX: Maybe generalize felid_revives and merge the two anyway?
+    monster_type type = MONS_BENNU;
+    monsterentry* me = get_monster_data(type);
+    ASSERT(me);
+
+    bool res_visible = you.see_cell(posn);
+
+    mgen_data mg(type, att, 0, 0, 0, posn, foe,
+                 (res_visible ? MG_DONT_COME : 0), GOD_NO_GOD,
+                 MONS_NO_MONSTER, 0, BLACK, PROX_ANYWHERE,
+                 level_id::current());
+
+    monster *newmons = create_monster(mg);
+    if (newmons)
+        newmons->props["bennu_revives"].get_byte() = revives + 1;
+}
+
 // Effects that occur after all other effects, even if the monster is dead.
 // For example, explosions that would hit other creatures, but we want
 // to deal with only one creature at a time, so that's handled last.
diff --git a/crawl-ref/source/fineff.h b/crawl-ref/source/fineff.h
index d8b16c0..4dd243f 100644
--- a/crawl-ref/source/fineff.h
+++ b/crawl-ref/source/fineff.h
@@ -290,6 +290,30 @@ protected:
     }
     int damage;
 };
+
+class bennu_revive_fineff : public final_effect
+{
+public:
+    // Each trigger is from the death of a different bennu---no merging.
+    bool mergeable(const final_effect &a) const { return false; }
+    void fire();
+
+    static void schedule(coord_def pos, int revives, beh_type att,
+                         unsigned short foe)
+    {
+        final_effect::schedule(new bennu_revive_fineff(pos, revives, att, foe));
+    }
+protected:
+    bennu_revive_fineff(coord_def pos, int _revives, beh_type _att,
+                        unsigned short _foe)
+        : final_effect(0, 0, pos), revives(_revives), att(_att), foe(_foe)
+    {
+    }
+    int revives;
+    beh_type att;
+    unsigned short foe;
+};
+
 void fire_final_effects();
 
 #endif
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 585fcf1..0405f0f 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1062,6 +1062,7 @@ bool lost_soul_revive(monster* mons, killer_type killer)
 
 void treant_release_fauna(monster* mons)
 {
+    // FIXME: this should be a fineff
     int count = mons->mangrove_pests;
     bool created = false;
 
diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
index f39aac5..c1fd452 100644
--- a/crawl-ref/source/mon-death.cc
+++ b/crawl-ref/source/mon-death.cc
@@ -2551,7 +2551,13 @@ int monster_die(monster* mons, killer_type killer,
              && (!summoned || duration > 0) && !wizard
              && mons_bennu_can_revive(mons))
     {
-        mons_bennu_revive(mons);
+        // All this information may be lost by the time the monster revives.
+        const int revives = (mons->props.exists("bennu_revives"))
+                          ? mons->props["bennu_revives"].get_byte() : 0;
+        const beh_type att = mons->has_ench(ENCH_CHARM) ? BEH_HOSTILE
+                                                        : SAME_ATTITUDE(mons);
+
+        bennu_revive_fineff::schedule(mons->pos(), revives, att, mons->foe);
     }
     else if (!mons->is_summoned())
     {
@@ -3411,6 +3417,10 @@ bool mons_felid_can_revive(const monster* mons)
 
 void mons_felid_revive(monster* mons)
 {
+    // FIXME: this should be a fineff like bennu_revive_fineff. But that
+    // is tricky because the original actor will be dead (and not carrying
+    // its items) by the time the fineff fires.
+
     // Mostly adapted from bring_to_safety()
     coord_def revive_place;
     int tries = 10000;
@@ -3473,34 +3483,3 @@ bool mons_bennu_can_revive(const monster* mons)
     return !mons->props.exists("bennu_revives")
            || mons->props["bennu_revives"].get_byte() < 1;
 }
-
-void mons_bennu_revive(monster* mons)
-{
-    // Bennu only resurrect once and immediately in the same spot,
-    // so this is rather abbreviated compared to felids.
-    // XXX: Maybe generalize felid_revives and merge the two anyway?
-    monster_type type = MONS_BENNU;
-    monsterentry* me = get_monster_data(type);
-    ASSERT(me);
-
-    const int revives = (mons->props.exists("bennu_revives"))
-                        ? mons->props["bennu_revives"].get_byte() + 1
-                        : 1;
-    bool res_visible = you.see_cell(mons->pos());
-
-    mgen_data mg(type, (mons->has_ench(ENCH_CHARM) ? BEH_HOSTILE
-                        : SAME_ATTITUDE(mons)),
-                        0, 0, 0, (mons->pos()), mons->foe,
-                        (res_visible ? MG_DONT_COME : 0), GOD_NO_GOD,
-                        MONS_NO_MONSTER, 0, BLACK, PROX_ANYWHERE,
-                        level_id::current());
-
-    mons->set_position(coord_def(0,0));
-
-    monster *newmons = create_monster(mg);
-    if (newmons)
-    {
-        newmons->props["bennu_revives"].get_byte() = revives;
-
-    }
-}
diff --git a/crawl-ref/source/mon-death.h b/crawl-ref/source/mon-death.h
index a196763..28fe568 100644
--- a/crawl-ref/source/mon-death.h
+++ b/crawl-ref/source/mon-death.h
@@ -81,5 +81,4 @@ bool mons_felid_can_revive(const monster* mons);
 void mons_felid_revive(monster* mons);
 
 bool mons_bennu_can_revive(const monster* mons);
-void mons_bennu_revive(monster* mons);
 #endif
-- 
2.1.3