Changeset 320

Timestamp:

07/10/07 18:12:18 (2 years ago)

Author:

takkaria

Message:

Move artifacts and rings properly across to the new system, (#234)

Files:

• trunk/lib/edit/artifact.txt (modified) (69 diffs)
• trunk/lib/edit/object.txt (modified) (5 diffs)
• trunk/src/cmd6.c (modified) (2 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/effects.c (modified) (8 diffs)
• trunk/src/effects.h (modified) (1 diff)
• trunk/src/init1.c (modified) (12 diffs)
• trunk/src/load.c (modified) (3 diffs)
• trunk/src/obj-info.c (modified) (2 diffs)
• trunk/src/save.c (modified) (1 diff)
• trunk/src/types.h (modified) (2 diffs)
• trunk/src/use-obj.c (modified) (4 diffs)

trunk/lib/edit/artifact.txt

@@ -22 +22 @@
-# P: base armor class : base damage : plus to-hit : plus to-dam : plus to-ac
-# F: flag | flag | etc
-
+
+
-# D: description
-
@@ -86 +87 @@
-F:ACTIVATE | NO_FUEL |
-F:INSTA_ART
-
+
+
-D:A small crystal phial, with the light of Earendil's Star contained inside.  
-D:Its light is imperishable, and near it darkness cannot endure.
@@ -99 +101 @@
-F:ACTIVATE | SEE_INVIS | NO_FUEL |
-F:INSTA_ART
-
+
+
-D:The shining Star of the West, a treasured heirloom of Elendil's house.
-
@@ -110 +113 @@
-F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_LITE | RES_DARK | NO_FUEL |
-F:INSTA_ART
-
+
+
-D:A great globe seemingly filled with moonlight, the famed Heart of the 
-D:Mountain, which splinters the light that falls upon it into a thousand 
@@ -124 +128 @@
-F:ACTIVATE | RES_FIRE | 
-F:INSTA_ART
-
+
+
-D:A fiery circle of bronze, with mighty spells to ward off and banish evil.
-
@@ -137 +142 @@
-F:RES_ACID | RES_COLD | RES_ELEC | 
-F:INSTA_ART
-
+
+
-D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing 
-D:of evil could stand.
@@ -167 +173 @@
-F:RES_CHAOS | RES_BLIND | AGGRAVATE | DRAIN_EXP | 
-F:INSTA_ART | HIDE_TYPE
-
+
+
-D:A great globe with a heart of fire, providing the wearer with sight 
-D:of far places - at a cost, for those espied upon are aware of it.
@@ -192 +199 @@
-F:ACTIVATE | 
-F:INSTA_ART
-
+
+
-D:The treasure of Tulkas, most fleet and wrathful of the Valar.
-
@@ -209 +217 @@
-F:IM_FIRE | RES_FIRE | RES_NETHR | RES_FEAR |
-F:INSTA_ART
-
+
+
-D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one 
-D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -228 +237 @@
-F:IM_COLD | RES_COLD | RES_BLIND | TELEPATHY | 
-F:INSTA_ART
-
+
+
-D:The Ring of Adamant, with a pure white stone as centerpiece.  Nenya is one 
-D:of the three Rings of Power created by the Elves and hidden by them from 
@@ -247 +257 @@
-F:IM_ELEC | RES_ELEC | RES_POIS | RES_DISEN | 
-F:INSTA_ART
-
+
+
-D:The Ring of Sapphire, with clear blue gems that shine like stars, 
-D:glittering untouchable despite all that Morgoth ever wrought.  Vilya is 
@@ -269 +280 @@
-F:SUST_INT | SUST_WIS | SUST_CHR | 
-F:INSTA_ART
-
+
+
-D:"One Ring to rule them all, One Ring to find them, One Ring to bring 
-D:them all and in the darkness bind them."  Made of massive gold, and 
@@ -287 +299 @@
-F:ACTIVATE |
-F:INSTA_ART
-
+
+
-D:A green stone, imbued with the power of Elvendom and fit to be borne by 
-D:a true King of Men, one such as brings healing after victory in battle.
@@ -301 +314 @@
-F:ACTIVATE |
-F:INSTA_ART
-
+
+
-D:A plain white jewel, given by Queen Arwen to Frodo Baggins before his 
-D:return to the Shire.
@@ -322 +336 @@
-F:LITE | SEE_INVIS | AGGRAVATE | 
-F:ACTIVATE
-
+
+
-D:A massive suit of heavy dragon scales deeply saturated with many colors.  
-D:It throbs with angry energies, and you feel the raw elemental might of 
@@ -339 +354 @@
-F:RES_SHARD | RES_NETHR | RES_NEXUS | RES_CHAOS | RES_DISEN | 
-F:ACTIVATE
-
+
+
-D:A suit of adamant, set with scales of every color, surrounded in a nimbus 
-D:of perfectly untramelled yet inextricably intermingled and utterly mastered 
@@ -355 +371 @@
-F:FREE_ACT | SLOW_DIGEST | REGEN | 
-F:ACTIVATE
-
+
+
-D:A great suit of dragon hide, set with scales of many hues. Even the 
-D:mightiest wyrms of Law and Chaos fear the judgement of its wearer.
@@ -373 +390 @@
-F:RES_CHAOS | RES_CONFU | RES_FEAR | 
-F:ACTIVATE
-
+
+
-D:A suit of imperishable adamant, with unconquerable strength to endure evil 
-D:and disruptive magics, that protects the life force of its wearer as 
@@ -413 +431 @@
-F:STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | ACTIVATE
-
+
+
-D:This wondrous suit of fine-linked chain shimmers as though of pure silver.  
-D:It stands untouched amidst the fury of the elements, and a power of 
@@ -428 +447 @@
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_DARK | 
-F:RES_DISEN | ACTIVATE
-
+
+
-D:A shimmering suit of true-silver, forged long ago by dwarven smiths of 
-D:legend.  It gleams with purest white as you gaze upon it, and mighty are 
@@ -455 +475 @@
-F:INT | WIS | CON | HIDE_TYPE | 
-F:RES_ACID | RES_POIS | RES_CONFU | ACTIVATE
-
+
+
-D:A hauberk, leggings, and sleeves of interlocking steel rings, strategically 
-D:reinforced at vital locations with a second layer of chain.  Magics to 
@@ -470 +491 @@
-P:6:0d0:0:0:15
-F:RES_CHAOS | RES_NETHR | RES_POIS | ACTIVATE
-
+
+
-D:Contained within this studded cuirass of pliable leather is the memory of 
-D:unvanquished Himring, defiant fortress surrounded by the legions of Morgoth.
@@ -511 +533 @@
-F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE | 
-F:SUST_WIS | SUST_DEX | SUST_CHR
-
+
+
-D:The legendary shield of Ereinion Gil-galad, who fought his way to the 
-D:gates of the Dark Tower, and with whom came light even to Gorgoroth.
@@ -655 +678 @@
-F:INT | WIS | SEARCH | HIDE_TYPE | 
-F:RES_BLIND | RES_CONFU | SEE_INVIS | ACTIVATE
-
+
+
-D:A famous helm of forged iron granting extraordinary powers of mind and 
-D:awareness.
@@ -683 +707 @@
-F:RES_CONFU | RES_SOUND | RES_CHAOS | 
-F:LITE | SEE_INVIS | REGEN | ACTIVATE
-
+
+
-D:The shining winged circlet brought by Elendil from dying Numenor, emblem of 
-D:Gondor through an age of the world.
@@ -699 +724 @@
-F:RES_SHARD | RES_SOUND | RES_COLD | 
-F:RES_LITE | RES_DARK | RES_BLIND | LITE
-:0
+
-D:A crown of massive gold, set with wondrous jewels of thought and warding, 
-D:worn by the kings of ancient Numenor.
@@ -713 +738 @@
-P:1:0d0:0:0:15
-F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | ACTIVATE
-
+
+
-D:A cape worn by a hero from Valinor, a land utterly beyond the strife 
-D:of Elements.
@@ -726 +752 @@
-F:INT | WIS | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | ACTIVATE
-
+
+
-D:This elven-grey mantle possesses great powers of tranquility and of 
-D:concealment, and grants the wearer the knowledge and understanding of 
@@ -740 +767 @@
-F:DEX | CHR | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
-
+
+
-D:A cloak of translucent, pearly grey, with glowing elven-runes to restore 
-D:magic showing calm and clear as moonlight on still water.
@@ -764 +792 @@
-F:STEALTH | SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
-
+
+
-D:A crystal-blue cape of fine silk worn by a silent messenger of the forces 
-D:of Law. Seldom will the wearer be diverted from his mission.
@@ -777 +806 @@
-F:INT | WIS | CHR | SPEED | STEALTH | HIDE_TYPE | 
-F:RES_ACID | RES_FIRE | RES_COLD | ACTIVATE
-
+
+
-D:The opaque midnight folds of this cloak, inset with a multitude of tiny 
-D:diamonds, swirl around you and you feel a hint, a fragment of the 
@@ -807 +837 @@
-F:INT | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | AGGRAVATE
-F:ACTIVATE
-
+
+
-D:The iron-shod gauntlets of the Dark Elven smith Eol, tingling with magics 
-D:that he could channel in battle.
@@ -830 +861 @@
-P:1:0d0:0:0:10
-F:FREE_ACT | RES_LITE | SUST_CON | LITE | ACTIVATE
-
+
+
-D:These gloves glow so brightly as to light the way for the player and cast 
-D:magical bolts with great frequency.
@@ -842 +874 @@
-P:2:1d1:0:0:15
-F:RES_FIRE | REGEN | ACTIVATE
-
+
+
-D:A set of gauntlets that smoulder with an unnatural heat.
-
@@ -853 +886 @@
-P:2:1d1:0:0:15
-F:RES_COLD | SLOW_DIGEST | ACTIVATE
-
+
+
-D:A set of handgear, freezing with unnatural cold.
-
@@ -864 +898 @@
-P:2:1d1:0:0:15
-F:RES_ELEC | LITE | ACTIVATE
-
+
+
-D:A set of handgear with sparks that crackle across its knuckleguards.
-
@@ -875 +910 @@
-P:2:1d1:0:0:15
-F:RES_ACID | FEATHER | ACTIVATE
-
+
+
-D:A set of gauntlets that gives off a foul, acrid odour yet remains untarnished.
-
@@ -900 +936 @@
-F:DEX | HIDE_TYPE | 
-F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS
-
+
+
-D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who dealt 
-D:Morgoth seven mighty wounds and pain that will last forever.
@@ -915 +952 @@
-F:SPEED | HIDE_TYPE | 
-F:RES_NEXUS | ACTIVATE
-
+
+
-D:This wondrous pair of leather boots once sped Feanor, creator of the 
-D:Silmarils and the mightiest of the Eldar, to fulfill his hero's challenge 
@@ -932 +970 @@
-F:ACTIVATE | FREE_ACT | 
-F:RES_NETHR | RES_CHAOS | RES_CONFU | SUST_CON
-
+
+
-D:A pair of high-laced shoes, strong against the powers of corruption and 
-D:withering, that grant the wearer extraordinary agility.
@@ -956 +995 @@
-F:INT | DEX | STEALTH | SPEED | FEATHER | LIGHT_CURSE | HIDE_TYPE
-F:ACTIVATE
-
+
+
-D:A pair of running shoes once used by the treacherous Grima son of 
-D:Galmod, the Wormtongue of Edoras.  They are aptly suited for a 
@@ -1000 +1040 @@
-P:0:2d4:4:6:0
-F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS
-
+
+
-D:A flame, instead of a blade, seems to spring forth from this dagger's hilt.
-
@@ -1011 +1052 @@
-P:0:2d4:4:6:0
-F:BRAND_COLD | RES_COLD | ACTIVATE | SHOW_MODS
-
+
+
-D:From the hilt of this dagger springs not so much a blade as an icicle.
-
@@ -1022 +1064 @@
-P:0:2d4:4:6:0
-F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS
-
+
+
-D:In this dagger is bound the very force of the lightning.
-
@@ -1033 +1076 @@
-P:0:2d4:4:3:0
-F:SLAY_ORC | BRAND_POIS | RES_POIS | RES_DISEN | ACTIVATE | SHOW_MODS
-
+
+
-D:A large stiletto dagger that glistens with odorless poison, to which the 
-D:wearer seems oddly immune.
@@ -1047 +1091 @@
-F:BRAND_COLD | RES_COLD | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:SHOW_MODS
-
+
+
-D:A frosty dagger wreathed in a nimbus of ice with a hilt of elk horn and 
-D:an edge to wound the wind.
@@ -1076 +1121 @@
-F:SLAY_DEMON | SLAY_ORC | FREE_ACT | RES_COLD | FEATHER | 
-F:SLOW_DIGEST | ACTIVATE | SHOW_MODS
-
+
+
-D:The beautiful sword of Thingol, justly named "King's Ire".  It glistens 
-D:icy enough to freeze the hearts of demons, and you feel supple and 
@@ -1217 +1263 @@
-F:FREE_ACT | RES_COLD | RES_LITE | LITE | SEE_INVIS | SLOW_DIGEST | REGEN | 
-F:ACTIVATE | SHOW_MODS
-
+
+
-D:The weapon of Fingolfin, High King of the Noldor; it shines like a column 
-D:of ice lit by light unquenchable.  Morgoth came but unwillingly to meet it 
@@ -1233 +1280 @@
-F:RES_FIRE | RES_DISEN | 
-F:SUST_STR | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS
-
+
+
-D:The famed "Flame of the West", the Sword that was Broken and is forged 
-D:again.  It glows with the essence of fire, its wearer is mighty in combat, 
@@ -1366 +1414 @@
-F:WIS | CON | HIDE_TYPE | 
-F:SLAY_DRAGON | TELEPATHY | SLOW_DIGEST | ACTIVATE | SHOW_MODS
-
+
+
-D:The narrow axe head of this weapon would pierce the armour of a very 
-D:Dragon, and the designs of your enemies stand naked and revealed.
@@ -1418 +1467 @@
-F:BRAND_COLD | RES_COLD | SLAY_EVIL | SLAY_TROLL | SLAY_ORC | KILL_UNDEAD | 
-F:FREE_ACT | SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS
-
+
+
-D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of Elves, 
-D:against which all the foul corruptions of Sauron dashed in vain.
@@ -1433 +1483 @@
-F:BRAND_FIRE | SLAY_GIANT | SLAY_ANIMAL | RES_FIRE | RES_LITE | 
-F:FEATHER | LITE | SEE_INVIS | ACTIVATE | BLESSED | SHOW_MODS
-
+
+
-D:The thrusting spear of wise Orome the Vala, strong against giants of frost, 
-D:and able to pierce rock or flesh with ease.
@@ -1491 +1542 @@
-F:SEE_INVIS | ACTIVATE | 
-F:BLESSED | SHOW_MODS
-
+
+
-D:The axe of Eonwe, leader of the Hosts of the West before the gates of 
-D:Thangorodrim, strikes with icy wrath at the undead, disperses hosts of 
@@ -1520 +1572 @@
-F:STR | DEX | HIDE_TYPE | 
-F:SLAY_TROLL | SLAY_ORC | ACTIVATE | SHOW_MODS
-
+
+
-D:A superbly crafted double-bladed axe once borne by Ceruthain, commander 
-D:of the Rangers of Arnor.
@@ -1576 +1629 @@
-F:SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE | 
-F:BLESSED | SHOW_MODS
-
+
+
-D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightest of all the 
-D:powers of good save Manwe himself, Ulmo laughs to scorn the dread powers 
@@ -1591 +1645 @@
-F:BRAND_COLD | BRAND_FIRE | FREE_ACT | RES_FIRE | RES_COLD | 
-F:RES_LITE | LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
-
+
+
-D:Binding elemental powers whose struggles turn this weapon red and purest 
-D:white, this shining reaper bears within it a power of going forth and 
@@ -1608 +1663 @@
-F:BRAND_ACID | RES_ACID | RES_DARK | RES_FIRE | LITE | 
-F:SLAY_DRAGON | SLAY_TROLL | SHOW_MODS
-
+
+
-D:Wielded by Hurin Thalion, last lord of Dor-Lomin at the Battle 
-D:of Tears Unnumbered.  He stood alone, his friends and kinsmen 
@@ -1641 +1697 @@
-F:SLAY_EVIL | BRAND_FIRE | RES_FIRE | RES_CONFU | ACTIVATE | 
-F:SHOW_MODS
-
+
+
-D:A flail whose head befuddles those who stare as you whirl it round, and 
-D:becomes a fiery comet as you bring it down.
@@ -1680 +1737 @@
-P:0:2d6:5:7:2
-F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS
-
-
-
+
+
+
+
-
-
@@ -1693 +1751 @@
-F:KILL_DRAGON | BRAND_ELEC | IM_ELEC | RES_ELEC | 
-F:ACTIVATE | SHOW_MODS
-
+
+
-D:A great ridged mace that surrounds you in a nimbus of living lightning; 
-D:you remain utterly untouched, even as fat sparks crackle around your 
@@ -1735 +1794 @@
-F:INT | WIS | HIDE_TYPE | 
-F:SLAY_EVIL | RES_LITE | LITE | SEE_INVIS | ACTIVATE | SHOW_MODS
-
+
+
-D:The radiant golden staff of an Istar of legend; this wizard's companion 
-D:grants keen sight and clear knowledge of many hidden things.
@@ -1749 +1809 @@
-F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC | 
-F:HOLD_LIFE | RES_FIRE | RES_NETHR | SEE_INVIS | ACTIVATE | SHOW_MODS
-
+
+
-D:A staff tall and sturdy, borne of old by Gandalf.  Rough-hewn runes that 
-D:invoke the element of Earth stand bold upon its gnarled surface, and no 
@@ -1783 +1844 @@
-F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | LITE | REGEN | 
-F:ACTIVATE | SHOW_MODS
-
+
+
-D:Wielded by the High Priest of Meneltarma, this great mace gleams coldly as 
-D:though moonlit, and it can strike as mighty a blow spiritually as 
@@ -1801 +1863 @@
-F:SLAY_ANIMAL | KILL_DRAGON | SLAY_TROLL | SLAY_GIANT | 
-F:ACTIVATE | SHOW_MODS
-
+
+
-D:A great crackling Balrog's whip of flame, this weapon could bring 
-D:even Ungoliant to heel.
@@ -1840 +1903 @@
-F:SPEED | HIDE_TYPE | 
-F:RES_FIRE | ACTIVATE | SHOW_MODS
-
+
+
-D:A crossbow that grants fiery speed to he who finds it, and from which 
-D:shoot bolts that blaze with flame unquenchable.
@@ -1854 +1918 @@
-F:RES_LITE | RES_DARK | RES_BLIND | RES_ELEC | 
-F:HIDE_TYPE | ACTIVATE | SHOW_MODS
-
+
+
-D:A great brazen arbalest with arms of gleaming steel shooting quarrels with 
-D:mighty power for those brave enough to risk betrayal.
@@ -1897 +1962 @@
-F:RES_DARK | RES_DISEN |
-F:ACTIVATE | 
-
+
+
-D:A mighty Dwarven mattock, as good for hewing orc-necks as for hewing 
-D:stone.  Nain, King of the Iron Hills, brought his mattock-wielding 
@@ -1929 +1995 @@
-F:RES_FIRE | RES_ELEC | RES_NETHR | HOLD_LIFE | 
-F:ACTIVATE
-
+
+
-D:The weapon of a mighty dwarven priest, whose shade is rumoured to 
-D:still haunt the halls of Angband itself.
@@ -1956 +2023 @@
-F:STR | CON | SUST_STR | SUST_CON | HIDE_TYPE | 
-F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE
-
+
+
-D:The painted shield of a chieftain of Far Harad, gaudy and barbaric.  
-D:Its wielder will fear nothing and fight with unnatural strength, but 

trunk/lib/edit/object.txt

@@ -21 +21 @@
-# C: charges
-# M: chance of being generated in a pile : dice for number of items
+# E: effect when used : recharge time (if applicable)
-# F: flag | flag | etc
-# D: description
@@ -1244 +1245 @@
-F:RES_FIRE | IGNORE_FIRE | 
-F:ACTIVATE
-
+:50+d50
-
-N:147:Acid
@@ -1254 +1255 @@
-F:RES_ACID | IGNORE_ACID | 
-F:ACTIVATE
-
+:50+d50
-
-N:148:Ice
@@ -1264 +1265 @@
-F:RES_COLD | IGNORE_COLD | 
-F:ACTIVATE
-
+:50+d50
-
-N:149:Woe
@@ -3809 +3810 @@
-A:50/2
-F:RES_ELEC | IGNORE_ELEC | ACTIVATE
-
+:50+d50
-
-### Items 432-436 unused ###

trunk/src/cmd6.c

@@ -119 +119 @@
-                case TV_WAND:  msg = "use the wand";  what = "wand";  break;
-                case TV_STAFF: msg = "use the staff"; what = "staff"; break;
-e it";   
+atee it";
-        }
-
@@ -264 +264 @@
-                        floor_item_charges(0 - item);
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else if (use == USE_SINGLE)

trunk/src/defines.h

@@ -59 +59 @@
- * Version of random artifact code.
- */
-2
+3
-
-

trunk/src/effects.c

@@ -69 +69 @@
-        int px = p_ptr->px;
-
+        if (o_ptr->name1)
+                effect = a_info[o_ptr->name1].effect;
+
-        switch (effect)
-        {
@@ -203 +206 @@
-                {
-                        if (hp_player(damroll(4, 8))) *ident = TRUE;
+                        if (set_timed(TMD_CUT, (p_ptr->timed[TMD_CUT] / 2) - 50)) *ident = TRUE;
-                        return TRUE;
-                }
@@ -530 +534 @@
-                }
-
+                case EF_ILLUMINATION:
+                {
+                        if (lite_area(damroll(2, 15), 3)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_CLAIRVOYANCE:
+                {
+                        *ident = TRUE;
+                        wiz_lite();
+                        (void)detect_traps();
+                        (void)detect_doors();
+                        (void)detect_stairs();
+                        return TRUE;
+                }
+
+                case EF_DISP_EVIL:
+                {
+                        *ident = TRUE;
+                        dispel_evil(p_ptr->lev * 5);
+                        return TRUE;
+                }
+
+                case EF_HASTE2:
+                {
+                        *ident = TRUE;
+                        if (!p_ptr->timed[TMD_FAST])
+                                (void)set_timed(TMD_FAST, randint(75) + 75);
+                        else
+                                (void)inc_timed(TMD_FAST, 5);
+                        return TRUE;
+                }
+
+                case EF_FIRE3:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_FIRE, dir, 120, 3);
+                        return TRUE;
+                }
+
+                case EF_FROST5:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_COLD, dir, 200, 3);
+                        return TRUE;
+                }
+
+                case EF_ELEC2:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_ELEC, dir, 250, 3);
+                        return TRUE;
+                }
+
+                case EF_BIZARRE:
+                {
+                        *ident = TRUE;
+                        ring_of_power(dir);
+                        return TRUE;
+                }
+
+
+                case EF_STAR_BALL:
+                {
+                        int i;
+                        *ident = TRUE;
+                        for (i = 0; i < 8; i++) fire_ball(GF_ELEC, ddd[i], 150, 3);
+                        return TRUE;
+                }
+
+                case EF_RAGE_BLESS_RESIST:
+                {
+                        *ident = TRUE;
+                        (void)hp_player(30);
+                        (void)clear_timed(TMD_AFRAID);
+                        (void)inc_timed(TMD_SHERO, randint(50) + 50);
+                        (void)inc_timed(TMD_BLESSED, randint(50) + 50);
+                        (void)inc_timed(TMD_OPP_ACID, randint(50) + 50);
+                        (void)inc_timed(TMD_OPP_ELEC, randint(50) + 50);
+                        (void)inc_timed(TMD_OPP_FIRE, randint(50) + 50);
+                        (void)inc_timed(TMD_OPP_COLD, randint(50) + 50);
+                        (void)inc_timed(TMD_OPP_POIS, randint(50) + 50);
+                        return TRUE;
+                }
+
+                case EF_HEAL2:
+                {
+                        *ident = TRUE;
+                        (void)hp_player(1000);
+                        (void)clear_timed(TMD_CUT);
+                        return TRUE;
+                }
+
+                case EF_DETECT_ALL:
+                {
+                                *ident = TRUE;
+                        detect_all();
+                        return TRUE;
+                }
+
+                case EF_HEAL1:
+                {
+                        *ident = TRUE;
+                        (void)hp_player(500);
+                        (void)clear_timed(TMD_CUT);
+                        return TRUE;
+                }
+
+                case EF_RESIST_ALL:
+                {
+                        if (inc_timed(TMD_OPP_ACID, randint(20) + 20)) *ident = TRUE;
+                        if (inc_timed(TMD_OPP_ELEC, randint(20) + 20)) *ident = TRUE;
+                        if (inc_timed(TMD_OPP_FIRE, randint(20) + 20)) *ident = TRUE;
+                        if (inc_timed(TMD_OPP_COLD, randint(20) + 20)) *ident = TRUE;
+                        if (inc_timed(TMD_OPP_POIS, randint(20) + 20)) *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_SLEEPII:
+                {
+                        *ident = TRUE;
+                        sleep_monsters_touch();
+                        return TRUE;
+                }
+
+                case EF_RESTORE_LIFE:
+                {
+                        *ident = TRUE;
+                        restore_level();
+                        return TRUE;
+                }
+
+                case EF_MISSILE:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_MISSILE, dir, damroll(2, 6));
+                        return TRUE;
+                }
+
+                case EF_FIRE1:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_FIRE, dir, damroll(9, 8));
+                        return TRUE;
+                }
+
+                case EF_FROST1:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_COLD, dir, damroll(6, 8));
+                        return TRUE;
+                }
+
+                case EF_LIGHTNING_BOLT:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_ELEC, dir, damroll(4, 8));
+                        return TRUE;
+                }
+
+                case EF_ACID1:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_ACID, dir, damroll(5, 8));
+                        return TRUE;
+                }
+
+                case EF_ARROW:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_ARROW, dir, 150);
+                        return TRUE;
+                }
+
+                case EF_HASTE1:
+                {
+                        *ident = TRUE;
+                        if (!p_ptr->timed[TMD_FAST])
+                                (void)set_timed(TMD_FAST, randint(20) + 20);
+                        else
+                                (void)inc_timed(TMD_FAST, 5);
+                        return TRUE;
+                }
+
+                case EF_REM_FEAR_POIS:
+                {
+                        *ident = TRUE;
+                        (void)clear_timed(TMD_AFRAID);
+                        (void)clear_timed(TMD_POISONED);
+                        return TRUE;
+                }
+
+                case EF_STINKING_CLOUD:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_POIS, dir, 12, 3);
+                        return TRUE;
+                }
+
+                case EF_FROST2:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_COLD, dir, 48, 2);
+                        return TRUE;
+                }
+
+                case EF_FROST4:
+                {
+                        *ident = TRUE;
+                        fire_bolt(GF_COLD, dir, damroll(12, 8));
+                        return TRUE;
+                }
+
+                case EF_FROST3:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_COLD, dir, 100, 2);
+                        return TRUE;
+                }
+
+                case EF_FIRE2:
+                {
+                        *ident = TRUE;
+                        fire_ball(GF_FIRE, dir, 72, 2);
+                        return TRUE;
+                }
+
+                case EF_DRAIN_LIFE2:
+                {
+                        *ident = TRUE;
+                        drain_life(dir, 120);
+                        return TRUE;
+                }
+
+                case EF_STONE_TO_MUD:
+                {
+                        *ident = TRUE;
+                        wall_to_mud(dir);
+                        return TRUE;
+                }
+
+                case EF_TELE_AWAY:
+                {
+                        *ident = TRUE;
+                        teleport_monster(dir);
+                        return TRUE;
+                }
+
+                case EF_CONFUSE2:
+                {
+                        *ident = TRUE;
+                        confuse_monster(dir, 20);
+                        return TRUE;
+                }
+
+                case EF_PROBE:
+                {
+                        *ident = TRUE;
+                        probing();
+                        return TRUE;
+                }
+
+                case EF_DRAIN_LIFE1:
+                {
+                        *ident = TRUE;
+                        drain_life(dir, 90);
+                        return TRUE;
+                }
+
+                case EF_FIREBRAND:
+                {
+                        *ident = TRUE;
+                        if (!brand_bolts()) return FALSE;
+                        return TRUE;
+                }
+ 
+                case EF_STARLIGHT:
+                {
+                        int k;
+                        for (k = 0; k < 8; k++) strong_lite_line(ddd[k]);
+                        *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_MANA_BOLT:
+                {
+                        fire_bolt(GF_MANA, dir, damroll(12, 8));
+                        *ident = TRUE;
+                        return TRUE;
+                }
+
+                case EF_BERSERKER:
+                {
+                        if (inc_timed(TMD_SHERO, randint(50) + 50)) *ident = TRUE;
+                        return TRUE;
+                }
-
-
@@ -550 +850 @@
-                case EF_RING_ACID:
-                {
+                        *ident = TRUE;