Changeset 325

Show
Ignore:
Timestamp:
07/12/07 18:42:23 (1 year ago)
Author:
takkaria
Message:

#234:

  • move everything across to the new system, nuke obj-info.c
  • rods now use charge
  • effect descriptions no longer given on unknown items
  • TrapDet work again
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/edit/artifact.txt

    r322 r325  
    113113F:ACTIVATE | SEE_INVIS | HOLD_LIFE | RES_LITE | RES_DARK | NO_FUEL | 
    114114F:INSTA_ART 
    115 A:DETECT_ALL:30+d30 
     115A:DET_ALL:30+d30 
    116116M:The Arkenstone forms an image in your mind... 
    117117D:A great globe seemingly filled with moonlight, the famed Heart of the  
    …… 
    142142F:RES_ACID | RES_COLD | RES_ELEC |  
    143143F:INSTA_ART 
    144 A:DISP_EVIL:50+d50 
     144A:DISPEL_EVIL:50+d50 
    145145M:The amulet floods the area with goodness... 
    146146D:The ancient heirloom of Ingwe, high lord of the Vanyar, against whom nothing  
    …… 
    217217F:IM_FIRE | RES_FIRE | RES_NETHR | RES_FEAR | 
    218218F:INSTA_ART 
    219 A:FIRE3:20+d20 
     219A:FIRE_BALL:20+d20 
    220220M:Narya glows deep red... 
    221221D:The Ring of Fire, set with a ruby that glows like flame.  Narya is one  
    …… 
    237237F:IM_COLD | RES_COLD | RES_BLIND | TELEPATHY |  
    238238F:INSTA_ART 
    239 A:FROST5:20+d20 
     239A:COLD_BALL2:20+d20 
    240240M:Nenya glows bright white... 
    241241D:The Ring of Adamant, with a pure white stone as centerpiece.  Nenya is one  
    …… 
    257257F:IM_ELEC | RES_ELEC | RES_POIS | RES_DISEN |  
    258258F:INSTA_ART 
    259 A:ELEC2:20+d20 
     259A:ELEC_BALL2:20+d20 
    260260M:Vilya glows deep blue... 
    261261D:The Ring of Sapphire, with clear blue gems that shine like stars,  
    …… 
    533533F:RES_ELEC | RES_ACID | RES_DISEN | RES_DARK | HIDE_TYPE |  
    534534F:SUST_WIS | SUST_DEX | SUST_CHR 
    535 A:STARLIGHT:100 
     535A:STARLIGHT2:100 
    536536M:Your Sheild of Deflection glows with the light of a thousand stars... 
    537537D:The legendary shield of Ereinion Gil-galad, who fought his way to the  
    …… 
    678678F:INT | WIS | SEARCH | HIDE_TYPE |  
    679679F:RES_BLIND | RES_CONFU | SEE_INVIS | ACTIVATE 
    680 A:DETECT_ALL:55+d55 
     680A:DET_ALL:55+d55 
    681681M:Holhenneth forms an image in your mind... 
    682682D:A famous helm of forged iron granting extraordinary powers of mind and  
    …… 
    874874P:2:1d1:0:0:15 
    875875F:RES_FIRE | REGEN | ACTIVATE 
    876 A:FIRE1:8+d8 
     876A:FIRE_BOLT:8+d8 
    877877M:Your Gauntlets are covered in fire... 
    878878D:A set of gauntlets that smoulder with an unnatural heat. 
    …… 
    886886P:2:1d1:0:0:15 
    887887F:RES_COLD | SLOW_DIGEST | ACTIVATE 
    888 A:FROST1:7+d7 
     888A:COLD_BOLT:7+d7 
    889889M:Your Gauntlets are covered in frost... 
    890890D:A set of handgear, freezing with unnatural cold. 
    …… 
    898898P:2:1d1:0:0:15 
    899899F:RES_ELEC | LITE | ACTIVATE 
    900 A:LIGHTNING_BOLT:6+d6 
     900A:ELEC_BOLT:6+d6 
    901901M:Your Gauntlets are covered in sparks... 
    902902D:A set of handgear with sparks that crackle across its knuckleguards. 
    …… 
    910910P:2:1d1:0:0:15 
    911911F:RES_ACID | FEATHER | ACTIVATE 
    912 A:ACID1:5+d5 
     912A:ACID_BOLT:5+d5 
    913913M:Your Gauntlets are covered in acid... 
    914914D:A set of gauntlets that gives off a foul, acrid odour yet remains untarnished. 
    …… 
    10401040P:0:2d4:4:6:0 
    10411041F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS 
    1042 A:FIRE1:8+d8 
     1042A:FIRE_BOLT:8+d8 
    10431043M:Narthanc is covered in fire... 
    10441044D:A flame, instead of a blade, seems to spring forth from this dagger's hilt. 
    …… 
    10521052P:0:2d4:4:6:0 
    10531053F:BRAND_COLD | RES_COLD | ACTIVATE | SHOW_MODS 
    1054 A:FROST1:7+d8 
     1054A:COLD_BOLT:7+d8 
    10551055M:Nimthanc is covered in frost... 
    10561056D:From the hilt of this dagger springs not so much a blade as an icicle. 
    …… 
    10641064P:0:2d4:4:6:0 
    10651065F:BRAND_ELEC | RES_ELEC | ACTIVATE | SHOW_MODS 
    1066 A:LIGHTNING_BOLT:6+d6 
     1066A:ELEC_BOLT:6+d6 
    10671067M:Dethanc is covered in sparks... 
    10681068D:In this dagger is bound the very force of the lightning. 
    …… 
    10911091F:BRAND_COLD | RES_COLD | SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE |  
    10921092F:SHOW_MODS 
    1093 A:FROST2:5+d5 
     1093A:COLD_BALL50:5+d5 
    10941094M:Your Dagger is covered in frost... 
    10951095D:A frosty dagger wreathed in a nimbus of ice with a hilt of elk horn and  
    …… 
    11211121F:SLAY_DEMON | SLAY_ORC | FREE_ACT | RES_COLD | FEATHER |  
    11221122F:SLOW_DIGEST | ACTIVATE | SHOW_MODS 
    1123 A:FROST4:50 
     1123A:COLD_BOLT2:50 
    11241124M:Arunuth glows a pale blue... 
    11251125D:The beautiful sword of Thingol, justly named "King's Ire".  It glistens  
    …… 
    12631263F:FREE_ACT | RES_COLD | RES_LITE | LITE | SEE_INVIS | SLOW_DIGEST | REGEN |  
    12641264F:ACTIVATE | SHOW_MODS 
    1265 A:FROST3:40 
     1265A:COLD_BALL100:40 
    12661266M:Ringil glows an intense blue... 
    12671267D:The weapon of Fingolfin, High King of the Noldor; it shines like a column  
    …… 
    12801280F:RES_FIRE | RES_DISEN |  
    12811281F:SUST_STR | SUST_DEX | SEE_INVIS | ACTIVATE | SHOW_MODS 
    1282 A:FIRE2:40 
     1282A:FIRE_BOLT72:40 
    12831283M:Anduril rages in fire... 
    12841284D:The famed "Flame of the West", the Sword that was Broken and is forged  
    …… 
    14671467F:BRAND_COLD | RES_COLD | SLAY_EVIL | SLAY_TROLL | SLAY_ORC | KILL_UNDEAD |  
    14681468F:FREE_ACT | SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS 
    1469 A:FROST3:35 
     1469A:COLD_BALL100:35 
    14701470M:Aeglos glows an intense blue... 
    14711471D:The mighty spear of Gil-galad, famed as "Snow-point" in the songs of Elves,  
    …… 
    16291629F:SEE_INVIS | SLOW_DIGEST | REGEN | ACTIVATE |  
    16301630F:BLESSED | SHOW_MODS 
    1631 A:TELE_AWAY:50 
     1631A:TELE_OTHER:50 
    16321632M:Your Trident glows deep red... 
    16331633D:The awesome weapon of the Vala Ulmo, Lord of Waters.  Mightest of all the  
    …… 
    17371737P:0:2d6:5:7:2 
    17381738F:BRAND_FIRE | RES_FIRE | ACTIVATE | SHOW_MODS 
    1739 A:FIRE2:20 
     1739A:FIRE_BOLT72:20 
    17401740M:Firestar rages in fire... 
    17411741D:A famed battle-lord of old with a ruddy head, coloured as embers are that 
    …… 
    18091809F:SLAY_EVIL | BRAND_FIRE | SLAY_TROLL | SLAY_ORC |  
    18101810F:HOLD_LIFE | RES_FIRE | RES_NETHR | SEE_INVIS | ACTIVATE | SHOW_MODS 
    1811 A:PROBE:20 
     1811A:PROBING:20 
    18121812M:The Quarterstaff of Olorin glows brightly... 
    18131813D:A staff tall and sturdy, borne of old by Gandalf.  Rough-hewn runes that  
    …… 
    18631863F:SLAY_ANIMAL | KILL_DRAGON | SLAY_TROLL | SLAY_GIANT |  
    18641864F:ACTIVATE | SHOW_MODS 
    1865 A:FIRE3:15 
     1865A:FIRE_BALL:15 
    18661866M:The whip glows deep red... 
    18671867D:A great crackling Balrog's whip of flame, this weapon could bring  
    …… 
    19951995F:RES_FIRE | RES_ELEC | RES_NETHR | HOLD_LIFE |  
    19961996F:ACTIVATE 
    1997 A:DISP_EVIL:100+d100 
     1997A:DISPEL_EVIL:100+d100 
    19981998M:The Ball-and-Chain floods the area will goodness... 
    19991999D:The weapon of a mighty dwarven priest, whose shade is rumoured to  

  • trunk/lib/edit/object.txt

    r321 r325  
    15961596A:5/1:10/1 
    15971597F:EASY_KNOW 
    1598 D:DET_TRAPS 
     1598E:DET_TRAP 
    15991599 
    16001600## XXX 195 XXX ## 
    …… 
    22222222P:0:1d1:0:0:0 
    22232223C:6+d10 
    2224 D:It lights up a line of squares, inflicting 6d8 points of damage on 
    2225 D: light-sensitive creatures on the line. 
     2224E:LIGHT_LINE 
    22262225 
    22272226N:270:Lightning Bolts 
    …… 
    22322231P:0:1d1:0:0:0 
    22332232C:6+d8 
    2234 D:It shoots a lightning bolt that inflicts 6d6 points of damage, with a 
    2235 D: 20% chance of getting a lightning beam. 
     2233E:ELEC_BOLT 
    22362234 
    22372235N:271:Frost Bolts 
    …… 
    22422240P:0:1d1:0:0:0 
    22432241C:6+d5 
    2244 D:It shoots a frost bolt that inflicts 6d8 points of damage, with a 20% 
    2245 D: chance of getting a cold beam. 
     2242E:COLD_BOLT 
    22462243 
    22472244N:272:Fire Bolts 
    …… 
    22522249P:0:1d1:0:0:0 
    22532250C:6+d8 
    2254 D:It shoots a fire bolt that inflicts 12d8 points of damage, with a 20% 
    2255 D: chance of getting a fire beam. 
     2251E:FIRE_BOLT2 
    22562252 
    22572253N:273:Stone to Mud 
    …… 
    22622258P:0:1d1:0:0:0 
    22632259C:3+d4 
    2264 D:It turns the first section of wall encountered by the beam shot by 
    2265 D: this spell into mud. 
    2266 D:  Permanent walls are not affected. 
    2267 D:  If a monster that is susceptible to rock remover is caught in the 
    2268 D: beam, it will take 20+1d30 points of damage. 
     2260E:STONE_TO_MUD 
    22692261 
    22702262N:274:Polymorph 
    …… 
    22752267P:0:1d1:0:0:0 
    22762268C:6+d8 
    2277 D:It attempts to polymorph a single monster. 
    2278 D:  Uniques are unaffected. 
     2269E:POLYMORPH 
    22792270 
    22802271N:275:Heal Monster 
    …… 
    22852276P:0:1d1:0:0:0 
    22862277C:8+d20 
    2287 D:It cures a single monster for 4d6 points of damage. 
     2278E:MON_HEAL 
    22882279 
    22892280N:276:Haste Monster 
    …… 
    22942285P:0:1d1:0:0:0 
    22952286C:8+d20 
    2296 D:It hastes a single monster. 
     2287E:MON_HASTE 
    22972288 
    22982289N:277:Slow Monster 
    …… 
    23032294P:0:1d1:0:0:0 
    23042295C:6+d10 
    2305 D:It attempts to slow down a single monster. 
    2306 D:  Uniques are unaffected. 
     2296E:MON_SLOW 
    23072297 
    23082298N:278:Confuse Monster 
    …… 
    23132303P:0:1d1:0:0:0 
    23142304C:6+d12 
    2315 D:It attempts to confuse a single monster. 
    2316 D:  Uniques are unaffected. 
     2305E:MON_CONFUSE 
    23172306 
    23182307N:279:Sleep Monster 
    …… 
    23232312P:0:1d1:0:0:0 
    23242313C:8+d15 
    2325 D:It attempts to put a single monster to sleep. 
    2326 D:  Uniques are unaffected. 
     2314E:MON_SLEEP 
    23272315 
    23282316N:280:Drain Life 
    …… 
    23332321P:0:1d1:0:0:0 
    23342322C:3+d3 
    2335 D:It inflicts 150 points of damage on a single monster that is not 
    2336 D: undead, a demon, an elemental, a golem, or a vortex. 
     2323E:DRAIN_LIFE3 
    23372324 
    23382325N:281:Trap/Door Destruction 
    …… 
    23432330P:0:1d1:0:0:0 
    23442331C:6+d8 
    2345 D:It destroys all doors and disarms all traps in a line. 
     2332E:TDOOR_DEST 
    23462333 
    23472334N:282:Magic Missile 
    …… 
    23522339P:0:1d1:0:0:0 
    23532340C:6+d10 
    2354 D:It fires a magic missile that inflicts 3d4 points of damage, with a 
    2355 D: 20% chance of getting a magic beam. 
     2341E:MISSILE 
    23562342 
    23572343N:283:Clone Monster 
    …… 
    23622348P:0:1d1:0:0:0 
    23632349C:3+d5 
    2364 D:It hastes and fully heals a single monster.  If the monster is next to 
    2365 D: an empty space and not a unique, a new monster of the same type will 
    2366 D: be created. 
     2350E:MON_CLONE 
    23672351 
    23682352N:284:Scare Monster 
    …… 
    23732357P:0:1d1:0:0:0 
    23742358C:3+d5 
    2375 D:It attempts to scare a single monster. 
    2376 D:  Uniques are unaffected. 
     2359E:MON_SCARE 
    23772360 
    23782361N:285:Teleport Other 
    …… 
    23832366P:0:1d1:0:0:0 
    23842367C:6+d5 
    2385 D:It produces a beam that teleports all monsters caught in it up to 100 
    2386 D: squares away. 
     2368E:TELE_OTHER 
    23872369 
    23882370N:286:Disarming 
    …… 
    23932375P:0:1d1:0:0:0 
    23942376C:4+d5 
    2395 D:It produces a beam that disarms all traps, unlocks all locked doors 
    2396 D: and reveals all secret doors. 
     2377E:DISARMING 
    23972378 
    23982379N:287:Lightning Balls 
    …… 
    24042385C:4+d8 
    24052386F:IGNORE_ELEC 
    2406 D:It shoots a radius-2 lightning ball that inflicts 64 points of damage 
    2407 D: at its center. 
     2387E:ELEC_BALL 
    24082388 
    24092389N:288:Cold Balls 
    …… 
    24152395C:2+d6 
    24162396F:IGNORE_COLD 
    2417 D:It shoots a radius-2 frost ball that inflicts 96 points of damage at 
    2418 D: its center. 
     2397E:COLD_BALL100 
    24192398 
    24202399N:289:Fire Balls 
    …… 
    24262405C:2+d4 
    24272406F:IGNORE_FIRE 
    2428 D:It shoots a radius-2 fire ball that inflicts 144 points of damage at 
    2429 D: its center. 
     2407E:FIRE_BALL 
    24302408 
    24312409N:290:Stinking Cloud 
    …… 
    24362414P:0:1d1:0:0:0 
    24372415C:6+d8 
    2438 D:It shoots a radius-2 poison cloud that inflicts 12 points of damage at 
    2439 D: its center. 
     2416E:STINKING_CLOUD 
    24402417 
    24412418N:291:Acid Balls 
    …… 
    24472424C:2+d5 
    24482425F:IGNORE_ACID 
    2449 D:It shoots a radius-2 acid ball that inflicts 120 points of damage at 
    2450 D: its center. 
     2426E:ACID_BALL 
    24512427 
    24522428N:292:Wonder 
    …… 
    24582434C:8+d15 
    24592435F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    2460 D:It has a random effect chosen from the various wand effects, except 
    2461 D: Dragon's Flame, Dragon's Frost, Dragon's Breath, Annihilation. 
     2436E:WONDER 
    24622437 
    24632438## XXX 293 XXX ## 
    …… 
    24702445P:0:1d1:0:0:0 
    24712446C:6+d8 
    2472 D:It shoots an acid bolt that inflicts 10d8 points of damage, with a 20% 
    2473 D: chance of getting an acid beam. 
     2447E:ACID_BOLT2 
    24742448 
    24752449N:295:Dragon's Flame 
    …… 
    24812455C:1+d3 
    24822456F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    2483 D:It shoots a radius-3 fire ball that inflicts 200 points of damage at 
    2484 D: its center. 
     2457E:FIRE_BALL200 
    24852458 
    24862459N:296:Dragon's Frost 
    …… 
    24922465C:1+d3 
    24932466F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    2494 D:It shoots a radius-3 frost ball that inflicts 160 points of damage at 
    2495 D: its center. 
     2467E:COLD_BALL160 
    24962468 
    24972469N:297:Dragon's Breath 
    …… 
    25032475C:1+d3 
    25042476F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    2505 D:It shoots a radius-3 fire/frost/acid/lightning/poison ball that 
    2506 D: inflicts 200/160/200/180/120 points of damage at its center (damage 
    2507 D: type chosen at random). 
     2477E:WAND_BREATH 
    25082478 
    25092479N:298:Annihilation 
    …… 
    25152485C:1+d2 
    25162486F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    2517 D:It inflicts 250 points of damage on a single monster that is not 
    2518 D: undead, a demon, an elemental, a golem, or a vortex. 
     2487E:DRAIN_LIFE4 
    25192488 
    25202489## XXX 299 XXX ## 
    …… 
    25302499P:0:1d2:0:0:0 
    25312500C:6+d5 
    2532 D:It detects all traps in the immediate area. 
     2501E:DET_TRAP 
    25332502 
    25342503N:301:Treasure Location 
    …… 
    25392508P:0:1d2:0:0:0 
    25402509C:8+d20 
    2541 D:It detects all treasure in the immediate area. 
     2510E:DET_GOLD 
    25422511 
    25432512N:302:Object Location 
    …… 
    25482517P:0:1d2:0:0:0 
    25492518C:6+d15 
    2550 D:It detects all objects in the immediate area. 
     2519E:DET_OBJ 
    25512520 
    25522521N:303:Teleportation 
    …… 
    25572526P:0:1d2:0:0:0 
    25582527C:5+d4 
    2559 D:It teleports you randomly with a maximum range of 100 squares. 
     2528E:TELE_LONG 
    25602529 
    25612530N:304:Earthquakes 
    …… 
    25662535P:0:1d2:0:0:0 
    25672536C:3+d5 
    2568 D:It causes an earthquake centered on you that has a 10-square radius; 
    2569 D: this randomly places new walls and floor space.  Monsters can be 
    2570 D: caught by a newly created wall; this does not affect monsters that 
    2571 D: can bore through rock or pass through walls, but otherwise monsters 
    2572 D: take 4d8 points of damage if they can evade the falling rock, or are 
    2573 D: lost inside the rock forever if they cannot. 
     2537E:EARTHQUAKES 
    25742538 
    25752539N:305:Summoning 
    …… 
    25792543A:10/1:50/1 
    25802544P:0:1d2:0:0:0 
    2581 C:1+d3 
    2582 D:It summons 1d4 monsters that are generated at the current dungeon 
    2583 D: level. 
    2584 D:  If a monster normally appears in groups, a whole group will appear. 
    2585 D:  If a monster normally has escorts, it will appear with escorts. 
     2545C:2d3 
     2546E:SUMMON_MON 
    25862547 
    25872548N:306:Light 
    …… 
    25922553P:0:1d2:0:0:0 
    25932554C:8+d20 
    2594 D:It lights up an area with a radius of 2 squares, plus the entire room 
    2595 D: if you are currently in one. 
    2596 D:  This inflicts 2d8 points of damage on any light-sensitive creatures 
    2597 D: within the radius of the spell. 
     2555E:LIGHT 
    25982556 
    25992557N:307:*Destruction* 
    …… 
    26042562P:0:1d2:0:0:0 
    26052563C:1+d3 
    2606 D:It destroys a circular area centered at you with a radius of 15 
    2607 D: squares, randomly placing new walls and floor space (stairs are 
    2608 D: immune).  All monsters and objects (excluding artifacts) are removed 
    2609 D: from the affected area. 
    2610 D:  This effect will also cause blindness lasting for 10+1d10 turns 
    2611 D: unless you have resistance to either blindness or light. 
     2564E:DESTRUCTION2 
    26122565 
    26132566N:308:Starlight 
    …… 
    26182571P:0:1d2:0:0:0 
    26192572C:6+d5 
    2620 D:It fires a line of light in all eight cardinal directions; 
    2621 D: light-sensitive monsters caught in one of the lines take 6d8 points 
    2622 D: of damage. 
     2573E:STARLIGHT 
    26232574 
    26242575N:309:Haste Monsters 
    …… 
    26292580P:0:1d2:0:0:0 
    26302581C:8+d8 
    2631 D:It hastes all monsters within line of sight. 
     2582E:LOSHASTE 
    26322583 
    26332584N:310:Slow Monsters 
    …… 
    26382589P:0:1d2:0:0:0 
    26392590C:6+d5 
    2640 D:It attempts to slow down all monsters within line of sight. 
    2641 D:  Uniques are unaffected. 
     2591E:LOSSLOW 
    26422592 
    26432593N:311:Sleep Monsters 
    …… 
    26482598P:0:1d2:0:0:0 
    26492599C:6+d5 
    2650 D:It attempts to put all monsters within line of sight to sleep. 
    2651 D:  Uniques are unaffected. 
     2600E:LOSSLEEP 
    26522601 
    26532602N:312:Cure Light Wounds 
    …… 
    26582607P:0:1d2:0:0:0 
    26592608C:6+d5 
    2660 D:It cures 1d8 points of damage. 
     2609#! now works like a real CLW effect 
     2610E:CURE_LIGHT 
    26612611 
    26622612N:313:Detect Invisible 
    …… 
    26672617P:0:1d2:0:0:0 
    26682618C:8+d15 
    2669 D:It detects all invisible monsters in the immediate area. 
     2619E:DET_INVIS 
    26702620 
    26712621N:314:Speed 
    …… 
    26762626P:0:1d2:0:0:0 
    26772627C:4+d3 
    2678 D:It hastes you (+10 to speed) for 15+1d30 turns (or 5 additional turns 
    2679 D: if you already are under the effect of a temporary haste 
    2680 D: enchantment). 
     2628#! now duration d25+15; used to be d30+15 
     2629E:HASTE 
    26812630 
    26822631N:315:Slowness 
    …… 
    26872636P:0:1d2:0:0:0 
    26882637C:8+d8 
    2689 D:It slows you down (-10 to speed) for 15+1d30 turns; this duration is 
    2690 D: cumulative with other temporary slowing enchantments. 
     2638E:SLOW 
    26912639 
    26922640N:316:Door/Stair Location 
    …… 
    26972645P:0:1d2:0:0:0 
    26982646C:6+d8 
    2699 D:It detects all doors and stairs in the immediate area. 
     2647E:DET_DOORSTAIR 
    27002648 
    27012649N:317:Remove Curse 
    …… 
    27062654P:0:1d2:0:0:0 
    27072655C:4+d3 
    2708 D:It removes all ordinary curses from all equipped items. 
    2709 D:  Heavy or permanent curses are unaffected. 
     2656E:REMOVE_CURSE 
    27102657 
    27112658N:318:Detect Evil 
    …… 
    27162663P:0:1d2:0:0:0 
    27172664C:8+d15 
    2718 D:It detects all evil monsters in the immediate area. 
     2665E:DET_EVIL 
    27192666 
    27202667N:319:Curing 
    …… 
    27252672P:0:1d2:0:0:0 
    27262673C:4+d3 
    2727 D:It cures all stunning, heals all cut damage, neutralizes poison, and 
    2728 D: cures blindness and confusion. 
     2674E:CURE_TEMP 
    27292675 
    27302676N:320:Dispel Evil 
    …… 
    27352681P:0:1d2:0:0:0 
    27362682C:4+d3 
    2737 D:It inflicts 60 points of damage on all evil monsters within line of 
    2738 D: sight. 
     2683E:DISPEL_EVIL60 
    27392684 
    27402685N:321:Probing 
    …… 
    27452690P:0:1d2:0:0:0 
    27462691C:2+d6 
    2747 D:It probes all monsters within line of sight, giving information both 
    2748 D: on the current hit points of the monsters and many of their 
    2749 D: characteristics and abilities (excluding melee, spellcasting, and 
    2750 D: breath attacks). 
     2692E:PROBING 
    27512693 
    27522694N:322:Darkness 
    …… 
    27572699P:0:1d2:0:0:0 
    27582700C:8+d8 
    2759 D:It darkens all squares within 3 squares of you, plus the entire room 
    2760 D: if you are currently in one; and blinds you for 3+1d5 turns, unless 
    2761 D: you have resistance to blindness. 
     2701E:DARKNESS 
    27622702 
    27632703N:323:Banishment 
    …… 
    27682708P:0:1d2:0:0:0 
    27692709C:1+d2 
    2770 D:It removes all monsters represented by a chosen symbol from the level. 
    2771 D:  Uniques are unaffected. 
    2772 D:  You take 1d4 points of damage for every monster removed. 
     2710E:BANISHMENT 
    27732711 
    27742712N:324:Power 
    …… 
    27792717P:0:1d2:0:0:0 
    27802718C:1+d3 
    2781 D:It inflicts 120 points of damage on all monsters within line of sight. 
     2719E:DISPEL_ALL 
    27822720 
    27832721N:325:the Magi 
    …… 
    27872725A:70/2 
    27882726P:0:1d2:0:0:0 
    2789 C:2+d2 
    2790 D:It restores both intelligence and mana points to maximum if either or 
    2791 D: both are currently below maximum. 
    2792  
    2793 N:326:Perception 
     2727C:2+1d2 
     2728E:STAFF_MAGI 
     2729 
     2730N:326:Identify 
    27942731G:_:d 
    27952732I:55:5:0 
    …… 
    27982735P:0:1d2:0:0:0 
    27992736C:5+d15 
    2800 D:It reveals all normal (magical but non-hidden) powers of one object. 
    2801 D:  (The spell may be aborted without using up a charge.) 
     2737E:IDENTIFY 
    28022738 
    28032739N:327:Holiness 
    …… 
    28072743A:70/2 
    28082744P:0:1d2:0:0:0 
    2809 C:2+d2 
    2810 D:It inflicts 120 points of damage on all evil monsters within line of 
    2811 D: sight, cures 50 points of damage, cures all stunning, heals all cut 
    2812 D: damage, neutralizes poison, removes fear, and also grants you the 
    2813 D: enchantment of protection from evil for a duration equal to 1d25 plus 
    2814 D: three times your character level. 
    2815  
    2816 N:328:Enlightenment 
     2745C:2d2 
     2746E:STAFF_HOLY 
     2747 
     2748N:328:Mapping 
    28172749G:_:d 
    28182750I:55:9:0 
    …… 
    28212753P:0:1d2:0:0:0 
    28222754C:5+d5 
    2823 D:It maps out a portion of the level centered on you. 
     2755E:MAPPING 
    28242756 
    28252757N:329:Healing 
    …… 
    28302762P:0:1d2:0:0:0 
    28312763C:1+d2 
    2832 D:It cures 300 points of damage, cures all stunning, and heals all cut 
    2833 D: damage. 
    2834  
     2764#! now cures poison, blindness, conf also 
     2765E:CURE_FULL 
    28352766 
    28362767##### Basic Books ##### 
    …… 
    30162947N:351:Door/Stair Location 
    30172948G:-:d 
    3018 I:66:1:70 
     2949I:66:1:0 
    30192950W:15:0:15:1000 
    30202951A:15/1 
    30212952P:0:1d1:0:0:0 
    30222953F:EASY_KNOW 
    3023 D:It detects all secret doors and stairs in the immediate area. 
     2954E:DET_DOORSTAIR:70 
    30242955 
    30252956N:352:Trap Location 
    30262957G:-:d 
    3027 I:66:0:50 
     2958I:66:0:0 
    30282959W:5:0:15:100 
    30292960A:5/1 
    30302961P:0:1d1:0:0:0 
    30312962F:EASY_KNOW 
    3032 D:It detects all traps in the immediate area. 
     2963E:DET_TRAP:50 
    30332964 
    30342965N:353:Probing 
    30352966G:-:d 
    3036 I:66:7:50 
     2967I:66:7:0 
    30372968W:40:0:15:4000 
    30382969A:40/4 
    30392970P:0:1d1:0:0:0 
    30402971F:EASY_KNOW 
    3041 D:It probes all monsters within line of sight, giving information both 
    3042 D: on the current hit points of the monsters and many of their 
    3043 D: characteristics and abilities (excluding melee, spellcasting, and 
    3044 D: breath attacks). 
     2972E:PROBING:50 
    30452973 
    30462974N:354:Recall 
    30472975G:-:d 
    3048 I:66:3:60 
     2976I:66:3:0 
    30492977W:30:0:15:4000 
    30502978A:30/4 
    30512979P:0:1d1:0:0:0 
    30522980F:EASY_KNOW | IGNORE_ELEC 
    3053 D:It invokes the spell of recall. 
     2981E:RECALL:60 
    30542982 
    30552983N:355:Illumination 
    30562984G:-:d 
    3057 I:66:4:30 
     2985I:66:4:0 
    30582986W:20:0:15:1000 
    30592987A:20/1 
    30602988P:0:1d1:0:0:0 
    30612989F:EASY_KNOW 
    3062 D:It lights up an area with a radius of 2 squares, plus the entire room 
    3063 D: if you are currently in one. 
    3064 D:  This inflicts 2d8 points of damage on any light-sensitive creatures 
    3065 D: within the radius of the spell. 
     2990E:LIGHT:30 
    30662991 
    30672992N:356:Light 
    30682993G:-:d 
    3069 I:66:15:9 
     2994I:66:15:0 
    30702995W:10:0:15:500 
    30712996A:10/1 
    30722997P:0:1d1:0:0:0 
    30732998F:EASY_KNOW 
    3074 D:It lights up a line of squares, inflicting 6d8 points of damage on any 
    3075 D: light-sensitive creatures on the line. 
     2999E:LIGHT_LINE:9 
    30763000 
    30773001N:357:Lightning Bolts 
    30783002G:-:d 
    3079 I:66:21:11 
     3003I:66:21:0 
    30803004W:20:0:15:2000 
    30813005A:20/1 
    30823006P:0:1d1:0:0:0 
    30833007F:EASY_KNOW 
    3084 D:It shoots a lightning bolt that inflicts 6d6 points of damage, with a 
    3085 D: 10% chance of getting a lightning beam. 
     3008E:ELEC_BOLT:11 
    30863009 
    30873010N:358:Frost Bolts 
    30883011G:-:d 
    3089 I:66:23:13 
     3012I:66:23:0 
    30903013W:25:0:15:2500 
    30913014A:25/1 
    30923015P:0:1d1:0:0:0 
    30933016F:EASY_KNOW 
    3094 D:It shoots a frost bolt that inflicts 10d8 points of damage, with a 10% 
    3095 D: chance of getting a frost beam. 
     3017E:COLD_BOLT2:13 
    30963018 
    30973019N:359:Fire Bolts 
    30983020G:-:d 
    3099 I:66:22:15 
     3021I:66:22:0 
    31003022W:30:0:15:3000 
    31013023A:30/1 
    31023024P:0:1d1:0:0:0 
    31033025F:EASY_KNOW 
    3104 D:It shoots a fire bolt that inflicts 16d8 points of damage, with a 10% 
    3105 D: chance of getting a fire beam. 
     3026E:FIRE_BOLT3:15 
    31063027 
    31073028N:360:Polymorph 
    31083029G:-:d 
    3109 I:66:19:25 
     3030I:66:19:0 
    31103031W:35:0:15:1200 
    31113032A:35/1 
    31123033P:0:1d1:0:0:0 
    31133034F:EASY_KNOW 
    3114 D:It attempts to polymorph a single monster. 
    3115 D:  Uniques are unaffected. 
     3035E:POLYMORPH:25 
    31163036 
    31173037N:361:Slow Monster 
    31183038G:-:d 
    3119 I:66:17:20 
     3039I:66:17:0 
    31203040W:30:0:15:1500 
    31213041A:30/1 
    31223042P:0:1d1:0:0:0 
    31233043F:EASY_KNOW 
    3124 D:It attempts to slow down a single monster. 
    3125 D:  Uniques are unaffected. 
     3044E:MON_SLOW:20 
    31263045 
    31273046N:362:Sleep Monster 
    31283047G:-:d 
    3129 I:66:16:18 
     3048I:66:16:0 
    31303049W:30:0:15:1500 
    31313050A:30/1 
    31323051P:0:1d1:0:0:0 
    31333052F:EASY_KNOW 
    3134 D:It attempts to put a single monster to sleep. 
    3135 D:  Uniques are unaffected. 
     3053E:MON_SLEEP:18 
    31363054 
    31373055N:363:Drain Life 
    31383056G:-:d 
    3139 I:66:18:23 
     3057I:66:18:0 
    31403058W:75:0:15:3600 
    31413059A:75/4 
    31423060P:0:1d1:0:0:0 
    31433061F:EASY_KNOW 
    3144 D:It inflicts 150 points of damage on a single monster that is not 
    3145 D: undead, a demon, an elemental, a golem, or a vortex. 
     3062E:DRAIN_LIFE3:23 
    31463063 
    31473064N:364:Teleport Other 
    31483065G:-:d 
    3149 I:66:13:25 
     3066I:66:13:0 
    31503067W:45:0:15:1400 
    31513068A:45/2 
    31523069P:0:1d1:0:0:0 
    31533070F:EASY_KNOW 
    3154 D:It produces a beam that teleports all monsters caught in it up to 100 
    3155 D: squares away. 
     3071E:TELE_OTHER:25 
    31563072 
    31573073N:365:Disarming 
    31583074G:-:d 
    3159 I:66:14:30 
     3075I:66:14:0 
    31603076W:35:0:15:2100 
    31613077A:35/1 
    31623078P:0:1d1:0:0:0 
    31633079F:EASY_KNOW 
    3164 D:It produces a beam that disarms all traps, unlocks all locked doors 
    3165 D: and reveals all secret doors. 
     3080E:DISARMING:30 
    31663081 
    31673082N:366:Lightning Balls 
    31683083G:-:d 
    3169 I:66:25:23 
     3084I:66:25:0 
    31703085W:55:0:15:4000 
    31713086A:55/1 
    31723087P:0:1d1:0:0:0 
    31733088F:EASY_KNOW 
    3174 D:It shoots a radius-2 lightning ball that inflicts 64 points of damage 
    3175 D: at its center. 
     3089E:ELEC_BALL:23 
    31763090 
    31773091N:367:Cold Balls 
    31783092G:-:d 
    3179 I:66:27:25 
     3093I:66:27:0 
    31803094W:60:0:15:4500 
    31813095A:60/1 
    31823096P:0:1d1:0:0:0 
    31833097F:EASY_KNOW 
    3184 D:It shoots a radius-2 frost ball that inflicts 96 points of damage at 
    3185 D: its center. 
     3098E:COLD_BALL100:25 
    31863099 
    31873100N:368:Fire Balls 
    31883101G:-:d 
    3189 I:66:26:30 
     3102I:66:26:0 
    31903103W:75:0:15:5000 
    31913104A:75/1 
    31923105P:0:1d1:0:0:0 
    31933106F:EASY_KNOW 
    3194 D:It shoots a radius-2 fire ball that inflicts 144 points of damage at 
    3195 D: its center. 
     3107E:FIRE_BALL:30 
    31963108 
    31973109N:369:Acid Balls 
    31983110G:-:d 
    3199 I:66:24:27 
     3111I:66:24:0 
    32003112W:70:0:15:5500 
    32013113A:70/1 
    32023114P:0:1d1:0:0:0 
    32033115F:EASY_KNOW 
    3204 D:It shoots a radius-2 acid ball that inflicts 120 points of damage at 
    3205 D: its center. 
     3116E:ACID_BALL:27 
    32063117 
    32073118N:370:Acid Bolts 
    32083119G:-:d 
    3209 I:66:20:12 
     3120I:66:20:0 
    32103121W:40:0:15:3500 
    32113122A:40/1 
    32123123P:0:1d1:0:0:0 
    32133124F:EASY_KNOW 
    3214 D:It shoots an acid bolt that inflicts 12d8 points of damage, with a 10% 
    3215 D: chance of getting an acid beam. 
    3216  
    3217 N:371:Enlightenment 
    3218 G:-:d 
    3219 I:66:5:99 
     3125E:ACID_BOLT3:12 
     3126 
     3127N:371:Magic Mapping 
     3128G:-:d 
     3129I:66:5:0 
    32203130W:65:0:15:10000 
    32213131A:65/4 
    32223132P:0:1d1:0:0:0 
    32233133F:EASY_KNOW 
    3224 D:It maps out a portion of the level centered on you. 
    3225  
    3226 N:372:Perception 
    3227 G:-:d 
    3228 I:66:2:10 
     3134E:MAPPING:100 
     3135 
     3136N:372:Identify 
     3137G:-:d 
     3138I:66:2:0 
    32293139W:50:0:15:13000 
    32303140A:50/8 
    32313141P:0:1d1:0:0:0 
    32323142F:EASY_KNOW | IGNORE_ELEC 
    3233 D:It reveals all normal (magical but non-hidden) powers of one object. 
    3234 D:  (The spell may be aborted without using up a charge.) 
     3143E:IDENTIFY:10 
    32353144 
    32363145N:373:Curing 
    32373146G:-:d 
    3238 I:66:8:999 
     3147I:66:8:0 
    32393148W:65:0:15:15000 
    32403149A:65/8 
    32413150P:0:1d1:0:0:0 
    32423151F:EASY_KNOW | IGNORE_ELEC 
    3243 D:It cures all stunning, heals all cut damage, neutralizes poison, and 
    3244 D: cures blindness and confusion. 
     3152E:CURE_TEMP:1000 
    32453153 
    32463154N:374:Healing 
    32473155G:-:d 
    3248 I:66:9:999 
     3156I:66:9:0 
    32493157W:80:0:15:20000 
    32503158A:80/8 
    32513159P:0:1d1:0:0:0 
    32523160F:EASY_KNOW | IGNORE_ELEC 
    3253 D:It cures 500 points of damage, cures all stunning, and heals all cut 
    3254 D: damage. 
     3161E:HEAL3:1000 
    32553162 
    32563163N:375:Detection 
    32573164G:-:d 
    3258 I:66:6:99 
     3165I:66:6:0 
    32593166W:30:0:15:5000 
    32603167A:30/8 
    32613168P:0:1d1:0:0:0 
    32623169F:EASY_KNOW | IGNORE_ELEC 
    3263 D:It detects all treasure, objects, secret doors, stairs, traps, and 
    3264 D: monsters in the immediate area. 
     3170E:DET_ALL:100 
    32653171 
    32663172N:376:Restoration 
    32673173G:-:d 
    3268 I:66:10:999 
     3174I:66:10:0 
    32693175W:80:0:15:25000 
    32703176A:80/16 
    32713177P:0:1d1:0:0:0 
    32723178F:EASY_KNOW | IGNORE_ELEC 
    3273 D:It restores experience points and all stats to maximum if any of them 
    3274 D: are below maximum. 
     3179E:RESTORE_ST_LEV:1000 
    32753180 
    32763181N:377:Speed 
    32773182G:-:d 
    3278 I:66:11:99 
     3183I:66:11:0 
    32793184W:95:0:15:50000 
    32803185A:95/16 
    32813186P:0:1d1:0:0:0 
    32823187F:EASY_KNOW | IGNORE_ELEC 
    3283 D:It hastes you (+10 to speed) for 15+1d30 turns (or 5 additional turns 
    3284 D: if you already are under the effect of a temporary haste 
    3285 D: enchantment). 
     3188E:HASTE:100 
    32863189 
    32873190 
    …… 
    34733376F:RES_ACID | 
    34743377F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3378E:ACID_BALL:450+1d450 
    34753379 
    34763380N:401:Blue Dragon Scale Mail~ 
    …… 
    34823386F:RES_ELEC | 
    34833387F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3388E:DRAGON_BLUE:450+1d450 
    34843389 
    34853390N:402:White Dragon Scale Mail~ 
    …… 
    34913396F:RES_COLD | 
    34923397F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3398E:COLD_BALL100:450+1d450 
    34933399 
    34943400N:403:Red Dragon Scale Mail~ 
    …… 
    35003406F:RES_FIRE | 
    35013407F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3408E:DRAGON_RED:450+1d450 
    35023409 
    35033410N:404:Green Dragon Scale Mail~ 
    …… 
    35093416F:RES_POIS | 
    35103417F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3418E:DRAGON_GREEN:450+1d450 
    35113419 
    35123420N:405:Multi-Hued Dragon Scale Mail~ 
    …… 
    35183426F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS | 
    35193427F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3428E:DRAGON_MULTIHUED:225+1d225 
    35203429 
    35213430N:406:Pseudo-Dragon Scale Mail~ 
    …… 
    35273436F:RES_LITE | RES_DARK | 
    35283437F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3438E:DRAGON_SHINING:300+1d300 
    35293439 
    35303440N:407:Law Dragon Scale Mail~ 
    …… 
    35363446F:RES_SOUND | RES_SHARD | 
    35373447F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3448E:DRAGON_LAW:300+1d300 
    35383449 
    35393450N:408:Bronze Dragon Scale Mail~ 
    …… 
    35453456F:RES_CONFU | 
    35463457F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3458E:DRAGON_BRONZE:450+1d450 
    35473459 
    35483460N:409:Gold Dragon Scale Mail~ 
    …… 
    35543466F:RES_SOUND | 
    35553467F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3468E:DRAGON_GOLD:450+1d450 
    35563469 
    35573470N:410:Chaos Dragon Scale Mail~ 
    …… 
    35633476F:RES_CHAOS | RES_DISEN | 
    35643477F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3478E:DRAGON_CHAOS:300+1d300 
    35653479 
    35663480N:411:Balance Dragon Scale Mail~ 
    …… 
    35723486F:RES_SOUND | RES_SHARD | RES_CHAOS | RES_DISEN | 
    35733487F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3488E:DRAGON_BALANCE:300+1d300 
    35743489 
    35753490N:412:Power Dragon Scale Mail~ 
    …… 
    35833498F:RES_LITE | RES_DARK | RES_NEXUS | RES_NETHR | RES_CHAOS | 
    35843499F:ACTIVATE | IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
     3500E:DRAGON_POWER:300+1d300 
    35853501 
    35863502## XXX 413 XXX ## 

  • trunk/src/Makefile.src

    r317 r325  
    5353        tables.o \ 
    5454        ui.o \ 
    55         use-obj.o  \ 
    5655        util.o  \ 
    5756        variable.o \ 

  • trunk/src/cmd6.c

    r321 r325  
    1919#include "angband.h" 
    2020#include "effects.h" 
    21 #include "script.h" 
     21 
    2222 
    2323/* Types of item use */ 
    …… 
    6565 
    6666        /* All still charging? */ 
    67         if (o_ptr->timeout > (o_ptr->pval - k_ptr->pval)) return FALSE; 
     67        if (o_ptr->number <= (o_ptr->timeout + (k_ptr->time_base - 1)) / k_ptr->time_base) return FALSE; 
    6868 
    6969        /* Otherwise OK */ 
    …… 
    163163 
    164164        return TRUE; 
     165} 
     166 
     167/* 
     168 * Return the chance of an effect beaming, given a tval. 
     169 */ 
     170static int beam_chance(int tval) 
     171{ 
     172        switch (tval) 
     173        { 
     174                case TV_WAND: return 20; 
     175                case TV_ROD:  return 10; 
     176        } 
     177 
     178        return 0; 
    165179} 
    166180 
    …… 
    236250        } 
    237251 
    238         /* Use the object */ 
    239         if (effect) 
    240         { 
    241                 /* Do effect */ 
    242         used = do_effect(effect, &ident, dir); 
    243  
    244                 /* Food feeds the player */ 
    245                 if (o_ptr->tval == TV_FOOD || o_ptr->tval == TV_POTION) 
    246                         (void)set_food(p_ptr->food + o_ptr->pval); 
    247         } 
    248         else 
    249         { 
    250                 /* Use the more prosaic method */ 
    251                 used = use_obje