Changeset 907

Show
Ignore:
Timestamp:
05/16/08 21:11:36 (3 months ago)
Author:
takkaria
Message:

This is the big object list reordering. Savefile compat broken for sanity's sake. Graphics also broken, but will be fixed before release -- don't worry!

First off, this is an attempt to make the item list have a decent order, such that similar items are grouped together. Second, it's an attempt to make the object list more interesting; to remove needless duplication, purely bad items, and to add more variety. This involves a lot of things, which are summarised below. This is not a full changelog.

  • The mushrooms have been redesigned mostly from scratch. One mushroom (Sprinting) doesn't have an implementation right now.
  • Per suggestions on r.g.r.a, healing potions now have significant nutritional content.
  • Use enums in tvalsval.h rather than #defines.

#312:

  • Make scrolls appear in piles sometimes.

#313:

  • Changes here have been made already; the three temporary new mentioned have not been added but will be.

#316:

  • Tone down Rods of Fire Bolts a little.
  • Make rods start at dlev8 at the earliest.
  • Object/Treasure detection merged some time ago now.
  • Don't remove staff of CLW or steal anything from OAngband.

#320: (Rings)

  • Sustain rings combined
  • Bad rings removed
  • Give elemental rings brands, though currently non-functional
  • Add a whole bunch of rings based mostly on suggestions from the forum and r.g.r.a

#321: (Amulets)

  • DOOM removed
  • Adornment made rarer
  • Resistance kept
  • Amulet of Inertia kept (FA, but -3 speed)

#350: (Scrolls)

  • ?Deep descent added.
  • Redundant scrolls can stay; not too much of an issue.

#445: (Combat gear)

  • Body armour changes:
    • There are now only 17 types of body armour.
    • Body armour ACs are even-numbered until you reach the very top-end.
  • Footwear changes:
    • Footwear now goes: leather sandals -> boots -> iron shod -> steel shod -> mithril shod.
    • Add some Ethereal Slippers. (weightless, no AC, ignore elements)
  • Handwear changes:
    • Gauntlets now base AC of 3
    • Mithril Gauntlets with IGNORE_ACID, base AC 5
    • Cesti -> Caestus, now base AC 2 but +3 to-dam (brass knuckles)
    • Add Alchemist's Gloves, which ignore the elements and have only magical AC
    • Add commented-out Mining Gloves
  • Shield changes:
    • Shields now go: Wicker -> Small Metal -> Leather -> Large Metal -> Mithril
    • ACs of the above are 2, 4, 6, 8, 10
    • Weights adjusted so they go from 3lbs to 15lbs.
  • Cloak changes:
    • Shadow Cloak -> Elven Cloak, add stealth.
    • Add Ethereal Cloak, ignores elements and weighs nothing (but also 0 AC).
    • Add Fur Cloak, base AC of 3 but heavy.
  • Weapon changes:
    • Remove Gnomish Shovel, Dwarven Shovel, Pick, Dwarven Pick.
    • Remove the Sabre; tweak artifacts to use rapier.
    • Remove broken daggers/swords (and Narsil).
    • Return the Great in Two-Handed "Great" Flail. Rename Two-Handed to Zweihander. (Moria)
    • Merge short + small swords. Remove damage duplication between swords.
    • Add a Great Hammer (8d1), and a Maul (4d4).
    • Make Tridents 1d10.

#540: (Tweak the Elven rings again)

  • give Narya back resist fear
  • give Nenya sustain con
  • remove sust str/wis from Vilya but add sust con. (based on a suggestion by Timo)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/edit/artifact.txt

    r897 r907  
    8383N:1:of Galadriel 
    8484I:light:4:0 
    85 W:5:5:10:10000 
     85W:5:3:10:10000 
    8686P:0:1d1:0:0:0 
    8787F:ACTIVATE | NO_FUEL | 
     
    123123 
    124124N:4:of Carlammas 
    125 I:amulet:10:2 
     125I:amulet:50:2 
    126126W:50:10:3:60000 
    127127F:CON | HIDE_TYPE |  
     
    136136 
    137137N:5:of Ingwe 
    138 I:amulet:11:3 
     138I:amulet:51:3 
    139139W:65:30:3:90000 
    140140F:INT | WIS | CHR | INFRA | HIDE_TYPE |  
     
    151151 
    152152N:6:of the Dwarves 
    153 I:amulet:12:3 
     153I:amulet:52:3 
    154154W:70:50:3:75000 
    155155F:STR | CON | INFRA | HIDE_TYPE |  
     
    208208N:10:of Power 'Narya' 
    209209I:ring:34:1 
    210 W:70:30:2:100000 
     210W:70:50:2:100000 
    211211P:0:0d0:6:6:0 
    212 # F: DRAIN_MANA |  
    213212F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE |  
    214213F:ACTIVATE | FREE_ACT | SEE_INVIS |  
    215214F:SLOW_DIGEST | REGEN | TELEPATHY | 
    216 F:SUST_STR | SUST_DEX | IM_FIRE | RES_FIRE  
     215F:SUST_STR | SUST_CON | 
     216F:IM_FIRE | RES_FIRE | RES_FEAR 
    217217F:INSTA_ART 
    218218A:PROTEVIL:200+4d50 
     
    227227N:11:of Power 'Nenya' 
    228228I:ring:35:2 
    229 W:80:40:2:200000 
     229W:80:50:2:200000 
    230230P:0:0d0:8:8:0 
    231231F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE |  
    232232F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS |  
    233233F:FEATHER | REGEN 
    234 F:SUST_INT | SUST_WIS | 
     234F:SUST_INT | SUST_WIS | SUST_CON | 
    235235F:IM_COLD | RES_COLD | RES_BLIND | TELEPATHY |  
    236236F:INSTA_ART 
     
    248248W:90:80:2:300000 
    249249P:0:0d0:10:10:0 
    250 # F: DRAIN_MANA |  
    251250F:STR | INT | WIS | DEX | CON | CHR | SPEED | HIDE_TYPE |  
    252251F:ACTIVATE | HOLD_LIFE | FREE_ACT | SEE_INVIS |  
    253252F:FEATHER | SLOW_DIGEST | REGEN | TELEPATHY | 
    254 F:SUST_STR | SUST_DEX | SUST_INT | SUST_WIS
     253F:SUST_DEX | SUST_INT | SUST_CON
    255254F:IM_ELEC | RES_ELEC | RES_POIS | RES_DARK |  
    256255F:INSTA_ART 
     
    275274F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | 
    276275F:RES_FIRE | RES_COLD | RES_ELEC | RES_ACID | RES_DARK | 
     276F:RES_DISEN | RES_POIS | RES_NETHR 
    277277F:SUST_STR | SUST_DEX | SUST_CON |  
    278278F:SUST_INT | SUST_WIS | SUST_CHR |  
    279279F:INSTA_ART 
    280 A:BIZARRE:450+9d50 
     280A:BIZARRE:200+9d50 
    281281M:The One Ring glows intensely black... 
    282282D:"One Ring to rule them all, One Ring to find them, One Ring to bring  
     
    290290 
    291291N:14:'Elessar' 
    292 I:amulet:16:2 
     292I:amulet:53:2 
    293293W:60:60:3:40000 
    294294P:0:0d0:7:7:10 
     
    306306 
    307307N:15:'Evenstar' 
    308 I:amulet:17:0 
     308I:amulet:54:0 
    309309W:40:40:3:25000 
    310310F:HOLD_LIFE | SUST_CON | SUST_WIS | SUST_INT |  
     
    389389I:hard armour:Full Plate Armour~:1 
    390390W:30:3:300:50000 
    391 P:25:2d4:0:0:25 
     391P:26:2d4:0:0:25 
    392392F:CON |  
    393393F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |  
     
    400400I:hard armour:Metal Brigandine Armour~:2 
    401401W:30:3:200:30000 
    402 P:19:1d4:0:0:15 
     402P:20:1d4:0:0:15 
    403403F:STR | DEX | HIDE_TYPE | RES_FEAR |  
    404404F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_CONFU | RES_SOUND 
     
    464464I:soft armour:Hard Leather Armour~:0 
    465465W:50:20:100:35000 
    466 P:6:0d0:0:0:15 
     466P:8:0d0:0:0:15 
    467467F:RES_CHAOS | RES_NETHR | RES_POIS | ACTIVATE 
    468468A:PROTEVIL:100+d100 
     
    485485I:soft armour:Leather Scale Mail~:3 
    486486W:20:3:60:25000 
    487 P:11:1d1:-1:0:25 
     487P:10:1d1:-1:0:25 
    488488F:DEX | SPEED | HIDE_TYPE |  
    489489F:RES_ACID | RES_SHARD 
     
    520520 
    521521N:31:of Celegorm 
    522 I:shield:Large Leather Shield~:0 
     522I:shield:Leather Shield~:0 
    523523W:30:3:60:12000 
    524524P:4:1d2:0:0:20 
     
    732732 
    733733N:49:of Luthien 
    734 I:cloak:Shadow Cloak~:2 
     734I:cloak:Elven Cloak~:2 
    735735W:40:40:5:45000 
    736736P:6:0d0:0:0:20 
     
    746746 
    747747N:50:of Tuor 
    748 I:cloak:Shadow Cloak~:4 
     748I:cloak:Ethereal Cloak~:4 
    749749W:40:40:5:35000 
    750750P:6:0d0:0:0:12 
     
    761761I:gloves:Set~ of Gauntlets:3 
    762762W:55:35:25:40000 
    763 P:2:1d1:-5:-5:15 
     763P:3:1d1:-5:-5:14 
    764764F:INT | FREE_ACT | FEATHER | RES_ELEC | RES_DARK | RES_POIS | AGGRAVATE 
    765765F:ACTIVATE 
     
    793793I:gloves:Set~ of Gauntlets:0 
    794794W:10:3:25:15000 
    795 P:2:1d1:0:0:15 
     795P:3:1d1:0:0:14 
    796796F:RES_FIRE | REGEN | ACTIVATE 
    797797A:FIRE_BOLT:8+d8 
     
    803803I:gloves:Set~ of Gauntlets:0 
    804804W:10:3:25:13000 
    805 P:2:1d1:0:0:15 
     805P:3:1d1:0:0:14 
    806806F:RES_COLD | SLOW_DIGEST | ACTIVATE 
    807807A:COLD_BOLT:7+d7 
     
    813813I:gloves:Set~ of Gauntlets:0 
    814814W:10:3:25:11000 
    815 P:2:1d1:0:0:15 
     815P:3:1d1:0:0:14 
    816816F:RES_ELEC | LITE | ACTIVATE 
    817817A:ELEC_BOLT:6+d6 
     
    823823I:gloves:Set~ of Gauntlets:0 
    824824W:10:3:25:12000 
    825 P:2:1d1:0:0:15 
     825P:3:1d1:0:0:14 
    826826F:RES_ACID | FEATHER | ACTIVATE 
    827827A:ACID_BOLT:5+d5 
     
    833833I:gloves:Set~ of Gauntlets:-3 
    834834W:10:20:25:0 
    835 P:2:1d1:-12:-12:0 
     835P:3:1d1:-12:-12:0 
    836836F:STR | DEX | HIDE_TYPE |  
    837837F:RES_FIRE | RES_DISEN | FREE_ACT | DRAIN_EXP |  
     
    841841 
    842842 
    843 # Should be Cesti! 
    844843N:59:of Fingolfin 
    845 I:gloves:Set~ of Mithril Gauntlets:4 
     844I:gloves:Set~ of Caestus:4 
    846845W:40:15:40:110000 
    847846P:5:1d1:10:10:20 
    848 F:DEX | HIDE_TYPE |  
     847F:DEX | HIDE_TYPE | 
    849848F:FREE_ACT | RES_ACID | ACTIVATE | SHOW_MODS 
    850849A:ARROW:30+d30 
    851 M:Your Cesti grow magical spikes... 
     850M:Your Caestus grow magical spikes... 
    852851D:The hand-sheathing of Fingolfin, warrior-king of Elves and Men, who dealt  
    853852D:Morgoth seven mighty wounds and pain that will last forever. 
     
    857856 
    858857N:60:of Feanor 
    859 I:boots:Pair~ of Hard Leather Boots:15 
     858I:boots:Pair~ of Leather Boots:15 
    860859W:40:120:40:300000 
    861 P:3:1d1:0:0:20 
     860P:2:1d1:0:0:20 
    862861F:SPEED | HIDE_TYPE |  
    863862F:RES_NEXUS | ACTIVATE 
    864863A:HASTE1:200 
    865 M:Your Hard Leather Boots glow bright green... 
     864M:Your Leather Boots glow bright green... 
    866865D:This wondrous pair of leather boots once sped Feanor, creator of the  
    867866D:Silmarils and the mightiest of the Eldar, to fulfill his hero's challenge  
     
    872871 
    873872N:61:'Dal-i-thalion' 
    874 I:boots:Pair~ of Soft Leather Boots:5 
     873I:boots:Pair~ of Leather Boots:5 
    875874W:10:25:20:40000 
    876875P:2:1d1:0:0:15 
     
    885884 
    886885N:62:of Thror 
    887 I:boots:Pair~ of Metal Shod Boots:3 
     886I:boots:Pair~ of Steel Shod Boots:3 
    888887W:30:25:80:12000 
    889888P:6:1d1:0:0:20 
     
    894893 
    895894N:63:of Wormtongue 
    896 I:boots:Pair~ of Soft Leather Boots:3 
     895I:boots:Pair~ of Leather Boots:3 
    897896W:10:15:20:17000 
    898897P:2:1d1:-8:-8:0 
     
    10491048 
    10501049N:76:'Gurthang' 
    1051 I:sword:Two-Handed Sword~:2 
     1050I:sword:Zweihander~:2 
    10521051W:30:30:200:100000 
    10531052P:0:3d6:13:17:0 
     
    10611060 
    10621061N:77:'Zarcuthra' 
    1063 I:sword:Two-Handed Sword~:4 
     1062I:sword:Zweihander~:4 
    10641063W:30:180:250:200000 
    10651064P:0:4d6:19:21:0 
     
    10751074 
    10761075N:78:'Mormegil' 
    1077 I:sword:Two-Handed Sword~:-10 
     1076I:sword:Zweihander~:-10 
    10781077W:30:15:250:10000 
    10791078P:0:3d6:-15:-15:-10 
     
    10901089I:sword:Cutlass~:3 
    10911090W:20:8:110:28000 
    1092 P:0:1d7:10:11:0 
     1091P:0:1d8:10:11:0 
    10931092F:DEX | STEALTH | HIDE_TYPE |  
    10941093F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | FEATHER |  
     
    11811180 
    11821181N:87:'Careth Asdriag' 
    1183 I:sword:Sabre~:1 
     1182I:sword:Rapier~:1 
    11841183W:15:8:50:25000 
    1185 P:0:1d7:6:8:0 
     1184P:0:1d6:6:9:0 
    11861185F:BLOWS | HIDE_TYPE |  
    11871186F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT |  
     
    11921191 
    11931192N:88:'Sting' 
    1194 I:sword:Small Sword~:2 
     1193I:sword:Short Sword~:2 
    11951194W:20:15:75:100000 
    11961195P:0:1d6:7:8:0 
     
    12071206I:sword:Scimitar~:2 
    12081207W:20:15:130:30000 
    1209 P:0:2d5:9:11:0 
     1208P:0:4d2:9:11:0 
    12101209F:DEX | BLOWS | HIDE_TYPE |  
    12111210F:SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | SEE_INVIS |  
     
    15101509 
    15111510N:113:'Thunderfist' 
    1512 I:hafted:Two-Handed Flail~:4 
     1511I:hafted:Two-Handed Great Flail~:4 
    15131512W:45:38:300:160000 
    15141513P:0:4d6:5:18:0 
     
    15571556 
    15581557N:117:of Aule 
    1559 I:hafted:War Hammer~:4 
     1558I:hafted:Great Hammer~:4 
    15601559W:40:75:120:250000 
    15611560P:0:9d3:19:21:5 
     
    16241623 
    16251624N:122:'Turmil' 
    1626 I:hafted:Lucerne Hammer~:4 
     1625I:polearm:Lucerne Hammer~:4 
    16271626W:20:15:120:30000 
    16281627P:0:2d5:10:6:8 
    1629 F:WIS | INFRA | HIDE_TYPE |  
     1628F:WIS | INFRA | HIDE_TYPE | BLESSED | 
    16301629F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | LITE | REGEN |  
    16311630F:ACTIVATE | SHOW_MODS 
     
    16811680F:SPEED | HIDE_TYPE | BRAND_FIRE | 
    16821681F:RES_FIRE | ACTIVATE | SHOW_MODS 
    1683 M:Cubragol glows a deep red... 
    16841682D:A crossbow that grants fiery speed to he who finds it, and from which  
    16851683D:shoot bolts that blaze with flame unquenchable. 
     
    17401738 
    17411739N:131:of Erebor 
    1742 I:digger:Dwarven Pick~:5 
     1740I:digger:Pick~:5 
    17431741W:55:5:200:30000 
    17441742P:0:3d4:5:20:0 
     
    17781776 
    17791777N:134:of the Haradrim 
    1780 I:shield:Large Leather Shield~:2 
     1778I:shield:Leather Shield~:2 
    17811779W:35:12:120:25000 
    17821780P:4:1d2:0:0:15 
     
    17851783F:RES_FEAR | RES_BLIND | RES_POIS | AGGRAVATE 
    17861784A:BERSERKER:50 
    1787 M:Your Large Leather Shield glows in anger! 
     1785M:The Shield of the Haradrim glows in anger! 
    17881786D:The painted shield of a chieftain of Far Harad, gaudy and barbaric.   
    17891787D:Its wielder will fear nothing and fight with unnatural strength, but  
    17901788D:also draw attention to himself. 
    1791  
    1792  
    1793 N:135:'Narsil' 
    1794 I:sword:Broken Sword~:2 
    1795 W:10:4:30:2000 
    1796 P:0:3d2:6:10:0 
    1797 F:STR | DEX | BLOWS | 
    1798 F:SLAY_ORC | SLAY_TROLL | RES_FIRE |  
    1799 F:BLESSED | HIDE_TYPE 
    1800 D:The remnants of the sword whose shattered hilt once cut the One Ring  
    1801 D:off the hand of Sauron. 
    18021789 
    18031790 
  • trunk/lib/edit/ego_item.txt

    r305 r907  
    128128F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD 
    129129 
    130 ### Heavy metal armor only, not rusty ### 
     130### Heavy metal armor only ### 
    131131 
    132132N:12:(Dwarven) 
     
    134134W:0:2:0:5000 
    135135C:0:0:15:2 
    136 T:37:3:99 
     136T:37:0:99 
    137137F:IGNORE_ACID | IGNORE_FIRE | 
    138138F:FREE_ACT | 
     
    411411C:8:3:0:5 
    412412T:31:1:1 
     413T:31:5:5 
    413414F:DEX | SEARCH | SHOW_MODS | FEATHER | FREE_ACT | HIDE_TYPE 
    414415 
     
    417418W:50:12:0:7000 
    418419C:3:8:0:2 
    419 T:31:2:99 
     420T:31:2:4 
    420421F:STR | CON | SHOW_MODS | AGGRAVATE | HIDE_TYPE 
    421422 
  • trunk/lib/edit/flavor.txt

    r562 r907  
    1212# G:<char>:<attr> 
    1313# D:<text> 
     14 
     15# To see how many items are in here vs. those required by the number of 
     16# objects in object.txt, the following bash script may be useful: 
     17#  for i in 40 45 55 65 66 70 75 80; do 
     18#    X=`grep "I:$i" object.txt|wc -l` 
     19#    Y=`grep $i\$ flavor.txt | wc -l` 
     20#    echo "tval $i: in object, $X, in flavor, $Y" 
     21#  done 
    1422 
    1523# Version stamp (required) 
     
    12001208N:302:70 
    12011209G:?:w 
    1202  
    1203  
    1204 ### More Rods (from Un) ### 
    1205  
    1206 N:303:66 
    1207 G:-:w 
    1208 D:Ceremonial 
    1209  
    1210 N:304:66 
    1211 G:-:D 
    1212 D:Black 
    1213  
    1214 N:305:66 
    1215 G:-:r 
    1216 D:Red 
    1217  
    1218 N:306:66 
    1219 G:-:g 
    1220 D:Green 
    1221  
    1222 N:307:66 
    1223 G:-:b 
    1224 D:Blue 
    1225  
    1226 N:308:66 
    1227 G:-:D 
    1228 D:Divining 
    1229  
    1230 N:309:66 
    1231 G:-:w 
    1232 D:White 
    1233  
    1234 N:310:66 
    1235 G:-:w 
    1236 D:Lightning 
    1237  
    1238 N:311:66 
    1239 G:-:w 
    1240 D:Switch 
    1241  
    1242 N:312:66 
    1243 G:-:w 
    1244 D:Transparent 
  • trunk/lib/edit/limits.txt

    r426 r907  
    1919 
    2020# Maximum number of object kinds 
    21 M:K:515 
     21M:K:570 
    2222 
    2323# Maximum number of artifacts 
  • trunk/lib/edit/object.txt

    r889 r907  
    11# File: object.txt 
    2  
    3  
     2
    43# This file is used to initialize the "lib/data/object.raw" file, which is 
    5 # used to initialize the "object kind" information for the Angband game. 
    6  
    7 # Do not modify this file unless you know exactly what you are doing, 
    8 # unless you wish to risk possible system crashes and broken savefiles. 
    9 # After modifying this file, delete the "lib/data/object.raw" file. 
    10  
    11 # Add some "IGNORE_XXX" flags to Rings, Amulets, etc.  XXX XXX 
     4# used to initialize the "object kind" information for Angband.  Modifying 
     5# this file when you don't know what you're doing may be harmful to you or 
     6# your character's health.  It could possibly be considered cheating under 
     7# some circumstances, too. :) 
    128 
    139# === Understanding object.txt === 
     
    8076# Version stamp (required) 
    8177 
    82 V:3.0.11 
     78V:3.1.0 
     79 
    8380 
    8481 
     
    8986 
    9087 
    91 ##### Mushrooms ##### 
    92  
    93 # Removed in 3.1: Naivety, Disease, Sickness, Paralysis.  These were 
    94 # introduced in 2.7.8 as replacements for duplicated effects between 
    95 # some mushrooms and "hairy molds". 
    96  
    97 # Changed in 3.1: Cure Paranoia + Cure Confusion now "Clear Mind" 
    98 # Added in 3.1: Mending, which cures cut/stun/poison/blindness (idea from S) 
    99 #               Second Sight, which gives temp ESP and cures blindness 
    100  
    101 ## Basic "bad" kinds 
    102  
    103 N:1:Blindness 
    104 G:,:d 
    105 I:80:1:500 
    106 W:5:0:1:0 
    107 A:75:10 to 15 
    108 F:EASY_KNOW 
    109 E:BLIND 
    110  
    111 N:2:Paranoia 
    112 G:,:d 
    113 I:80:2:500 
    114 W:5:0:1:0 
    115 A:75:10 to 15 
    116 F:EASY_KNOW 
    117 E:SCARE 
    118  
    119 N:3:Confusion 
    120 G:,:d 
    121 I:80:3:500 
    122 W:5:0:1:0 
    123 A:75:10 to 15 
    124 F:EASY_KNOW 
    125 E:CONFUSE 
    126  
    127 N:4:Hallucination 
    128 G:,:d 
    129 I:80:4:500 
    130 W:10:0:1:0 
    131 A:75:10 to 15 
    132 F:EASY_KNOW 
    133 E:HALLUC 
    134  
    135 N:5:Poison 
    136 G:,:d 
    137 I:80:0:500 
    138 W:5:0:1:0 
    139 A:75:10 to 20 
    140 F:EASY_KNOW 
    141 E:POISON 
    142  
    143 ## 6 
    144  
    145 N:7:Weakness 
    146 G:,:d 
    147 I:80:6:500 
    148 W:10:0:1:0 
    149 A:75:15 to 30 
    150 F:EASY_KNOW 
    151 E:LOSE_STR 
    152  
    153 N:8:Stupidity 
    154 G:,:d 
    155 I:80:8:500 
    156 W:15:0:1:0 
    157 A:75:15 to 30 
    158 F:EASY_KNOW 
    159 E:LOSE_INT 
    160  
    161 N:9:Unhealth 
    162 G:,:d 
    163 I:80:10:500 
    164 W:15:0:1:0 
    165 A:40:20 to 50 
    166 P:0:10d10:0:0:0 
    167 F:EASY_KNOW 
    168 E:LOSE_CON2 
    169 D:It may also be thrown to inflict 10d10 points of damage. 
    170  
    171  
    172 ## Curing of various kinds 
    173  
    174 N:10:Cure Poison 
    175 G:,:d 
    176 I:80:12:500 
    177 W:10:0:1:60 
    178 A:100:10 to 40 
    179 M:70:1d4 
    180 F:EASY_KNOW 
    181 E:CURE_POISON 
    182  
    183 N:11:Cure Blindness 
    184 G:,:d 
    185 I:80:13:500 
    186 W:10:0:1:50 
    187 A:100:10 to 40 
    188 M:70:1d4 
    189 F:EASY_KNOW 
    190 E:CURE_BLINDNESS 
    191  
    192 N:12:Clear Mind 
    193 G:,:d 
    194 I:80:14:500 
    195 W:10:0:1:90 
    196 A:100:10 to 100 
    197 M:70:1d4 
    198 F:EASY_KNOW 
    199 E:CURE_MIND 
    200  
    201 N:13:Mending 
    202 G:,:d 
    203 I:80:25:500 
    204 W:10:0:1:100 
    205 A:80:20 to 100 
    206 M:70:1d4 
    207 F:EASY_KNOW 
    208 E:CURE_BODY 
    209  
    210 ## 14 
    211  
    212 N:15:Cure Serious Wounds 
    213 G:,:d 
    214 I:80:16:500 
    215 W:15:0:1:75 
    216 A:90:15 to 35 
    217 F:EASY_KNOW 
    218 E:CURE_SERIOUS 
    219  
    220 ## Restoration 
    221  
    222 N:16:Restore Strength 
    223 G:,:d 
    224 I:80:17:500 
    225 W:20:0:1:350 
    226 A:100:20 to 50 
    227 F:EASY_KNOW 
    228 E:RESTORE_STR 
    229  
    230 N:17:Restore Constitution 
    231 G:,:d 
    232 I:80:18:500 
    233 W:20:0:1:350 
    234 A:100:20 to 50 
    235 F:EASY_KNOW 
    236 E:RESTORE_CON 
    237  
    238 N:18:Restoring 
    239 G:,:d 
    240 I:80:19:500 
    241 W:20:0:1:1000 
    242 A:50:30 to 100 
    243 F:EASY_KNOW 
    244 E:RESTORE_ALL 
    245  
    246 ## A stranger mushroom 
    247  
    248 N:19:Second Sight 
    249 G:,:d 
    250 I:80:26:200 
    251 W:0:0:1:1250 
    252 A:20:15 to 100 
    253 F:EASY_KNOW 
    254 E:TMD_ESP 
    255  
    256  
    257 ## 20 
    258  
    259  
    260 ##### Normal Food ##### 
    261  
    262 # Removed in 3.1: Hard Biscuit, Beef Jerky, Fine Ale, Fine Wine 
    263 # Not considered interesting enough. 
    264  
    265 N:21:& Ration~ of Food 
     88 
     89##### Various Stuff ##### 
     90 
     91N:1:& Iron Spike~ 
     92G:~:W 
     93I:5:0:0 
     94W:1:0:10:1 
     95M:100:6d7 
     96A:75:1 to 100 
     97P:0:1d1:0:0:0 
     98F:EASY_KNOW 
     99D:These can be placed in doors to make them harder to open.  Multiple 
     100D: spikes may be used on a single door.  Each of the first 7 spikes will 
     101D: increase the door's resistance to bashing.  Placing more than 7 
     102D: spikes in one door will not have any further effect. 
     103 
     104N:2:& Wooden Torch~ 
     105G:~:u 
     106I:39:0:0 
     107W:1:0:12:2 
     108A:140:1 to 40 
     109P:0:1d1:0:0:0 
     110F:EASY_KNOW 
     111 
     112N:3:& Lantern~ 
     113G:~:U 
     114I:39:1:0 
     115W:3:0:50:35 
     116A:140:5 to 100 
     117P:0:1d1:0:0:0 
     118F:EASY_KNOW | IGNORE_FIRE 
     119 
     120N:4:& Flask~ of oil 
     121G:!:y 
     122I:77:0:7500 
     123W:1:0:10:3 
     124A:100:1 to 100 
     125P:0:2d6:0:0:0 
     126F:EASY_KNOW 
     127D:It can be used to fuel a lantern with 7500 turns of light, up to 
     128D: a maximum of 15000 turns of light. 
     129D:  When thrown, it is considered lit, so it does more than nominal 
     130D: damage (which occurs even against creatures resistant to fire). 
     131 
     132 
     133 
     134##### Food ##### 
     135 
     136### Normal Food ### 
     137 
     138N:10:& Ration~ of Food 
    266139G:,:U 
    267 I:80:35:6000 
     140I:80:1:6000 
    268141W:0:0:8:3 
    269142A:100:0 to 50 
     
    271144F:EASY_KNOW 
    272145E:FOOD_GOOD 
    273  
    274 N:22:& Slime Mold~ 
     146D:This nutritious but fairly bland food is familiar to anyone contemplating 
     147D: long journeys. 
     148 
     149N:11:& Slime Mold~ 
    275150G:,:g 
    276 I:80:36:2500 
     151I:80:2:2500 
    277152W:1:0:2:2 
    278153A:110:5 to 60 
     
    280155F:EASY_KNOW 
    281156E:FOOD_GOOD 
    282  
    283 N:23:& Piece~ of Elvish Waybread 
     157D:A strange fungal growth, prone to moving if not observed.  Not very tasty 
     158D: but quite filling. 
     159 
     160N:12:& Piece~ of Elvish Waybread 
    284161G:,:B 
    285 I:80:37:7500 
     162I:80:3:7500 
    286163W:5:0:3:10 
    287164A:90:30 to 100 
    288165F:EASY_KNOW 
    289166E:FOOD_WAYBREAD 
    290  
    291  
    292 ## Slots 24-29 for future expansion (maybe) ## 
    293  
    294  
    295 ##### Edged Weapons ##### 
    296  
    297 N:30:& Broken Dagger~ 
    298 G:|:D 
     167D:Food of the elves is always good; their waybread is no exception.  These 
     168D: thin cakes are wrapped in leaves and keep their tastiness for months. 
     169 
     170# 13 
     171# 14 
     172# 15 
     173 
     174### The shrooms, an interesting collection ### 
     175 
     176N:16:Second Sight 
     177G:,:d 
     178I:80:6:200 
     179W:0:0:1:0 
     180A:10:1 to 100 
     181F:EASY_KNOW 
     182E:TMD_ESP 
     183 
     184N:17:Fast Recovery 
     185G:,:d 
     186I:80:7:500 
     187W:0:0:1:0 
     188A:10:1 to 100 
     189M:70:1d4 
     190F:EASY_KNOW 
     191E:CURE_BODY 
     192 
     193N:18:Vigor 
     194G:,:d 
     195I:80:8:500 
     196W:0:0:1:0 
     197A:10:1 to 100 
     198F:EASY_KNOW 
     199E:RESTORE_ALL 
     200 
     201N:19:Clear Mind 
     202G:,:d 
     203I:80:9:500 
     204W:0:0:1:0 
     205A:10:1 to 100 
     206M:100:1d4 
     207F:EASY_KNOW 
     208E:CURE_MIND 
     209 
     210N:20:Emergency 
     211G:,:d 
     212I:80:10:500 
     213W:0:0:1:0 
     214A:10:1 to 100 
     215M:100:1d4 
     216F:EASY_KNOW 
     217E:SHROOM_EMERGENCY 
     218 
     219N:21:Terror 
     220G:,:d 
     221I:80:11:500 
     222W:0:0:1:0 
     223A:10:1 to 100 
     224M:100:1d4 
     225F:EASY_KNOW 
     226E:SHROOM_TERROR 
     227 
     228N:22:Stoneskin 
     229G:,:d 
     230I:80:12:500 
     231W:0:0:1:0 
     232A:10:1 to 100 
     233M:70:1d4 
     234F:EASY_KNOW 
     235E:SHROOM_STONE 
     236D:Its poison turns your skin to stone, albeit briefly. 
     237 
     238#N:23:Turbulence 
     239#G:,:d 
     240#I:80:13:500 
     241#W:0:0:1:0 
     242#A:10:1 to 100 
     243#M:70:1d4 
     244#F:EASY_KNOW 
     245#E:SHROOM_TURB 
     246 
     247N:24:Debility 
     248G:,:d 
     249I:80:14:500 
     250W:0:0:1:0 
     251A:10:1 to 100 
     252M:70:1d4 
     253F:EASY_KNOW 
     254E:SHROOM_DEBILITY 
     255 
     256N:25:Sprinting 
     257G:,:d 
     258I:80:15:500 
     259W:0:0:1:0 
     260A:1:10 to 100 
     261M:70:1d4 
     262F:EASY_KNOW 
     263E:SHROOM_SPRINTING 
     264 
     265N:26:Purging 
     266G:,:d 
     267I:80:16:0 
     268W:0:0:1:0 
     269A:1:10 to 100 
     270M:70:1d4 
     271F:EASY_KNOW 
     272E:SHROOM_PURGING 
     273 
     274 
     275##### Weapons ##### 
     276 
     277### Swords ### 
     278 
     279N:30:& Dagger~ 
     280G:|:W 
    299281I:23:1:0 
    300 W:0:0:5:1 
    301 P:0:1d1:0:0:0 
    302 F:SHOW_MODS 
    303  
    304 N:31:& Bastard Sword~ 
     282W:0:0:12:30 
     283A:100:0 to 100 
     284P:0:1d4:0:0:0 
     285D:A short two-edged blade perfect for thrusting. 
     286 
     287N:31:& Main Gauche~ 
    305288G:|:W 
    306 I:23:21:0 
    307 W:15:0:140:350 
    308 A:100:15 to 100 
    309 P:0:3d4:0:0:0 
    310 F:SHOW_MODS 
    311  
    312 N:32:& Scimitar~ 
     289I:23:2:0 
     290W:3:0:30:45 
     291A:100:3 to 100 
     292P:0:1d5:0:0:0 
     293 
     294N:32:& Rapier~ 
    313295G:|:W 
    314 I:23:18:0 
    315 W:10:0:130:250 
    316 A:100:10 to 100 
    317 P:0:2d5:0:0:0 
    318 F:SHOW_MODS 
    319  
    320 N:33:& Tulwar~ 
     296I:23:3:0 
     297W:5:0:40:70 
     298A:100:5 to 100 
     299P:0:1d6:0:0:0 
     300 
     301N:33:& Short Sword~ 
    321302G:|:W 
    322 I:23:15:0 
    323 W:5:0:100:200 
    324 A:100:5 to 100 
    325 P:0:2d4:0:0:0 
    326 F:SHOW_MODS 
    327  
    328 N:34:& Broad Sword~ 
    329 G:|:W 
    330 I:23:16:0 
    331 W:10:0:150:255 
    332 A:100:10 to 100 
    333 P:0:2d5:0:0:0 
    334 F:SHOW_MODS 
    335  
    336 N:35:& Short Sword~ 
    337 G:|:W 
    338 I:23:10:0 
     303I:23:4:0 
    339304W:5:0:80:90 
    340305A:100:5 to 100 
    341306P:0:1d7:0:0:0 
    342 F:SHOW_MODS 
    343  
    344 N:36:& Blade~ of Chaos 
     307 
     308N:34:& Cutlass~ 
     309G:|:W 
     310I:23:5:0 
     311W:5:0:110:120 
     312A:100:5 to 100 
     313P:0:1d8:0:0:0 
     314D:A thicker and slightly longer dagger, the sabre is a slashing sword.  It 
     315D: possesses a slight curve and only one side is sharp. 
     316 
     317N:35:& Tulwar~ 
     318G:|:W 
     319I:23:6:0 
     320W:5:0:100:170 
     321A:100:5 to 100 
     322P:0:2d4:0:0:0 
     323D:A wider-bladed cousin of the shamshir, with less of a curve. 
     324 
     325N:36:& Scimitar~ 
     326G:|:W 
     327I:23:7:0 
     328W:10:0:150:300 
     329A:100:10 to 100 
     330P:0:4d2:0:0:0 
     331D:A long sabre with an extreme curve to the blade. 
     332 
     333 
     334N:37:& Long Sword~ 
     335G:|:W 
     336I:23:8:0 
     337W:10:0:130:300 
     338A:50:10 to 100 
     339P:0:2d5:0:0:0 
     340 
     341N:38:& Broad Sword~ 
     342G:|:W 
     343I:23:9:0 
     344W:10:0:150:300 
     345A:50:10 to 100 
     346P:0:2d5:0:0:0 
     347 
     348 
     349N:39:& Bastard Sword~ 
     350G:|:W 
     351I:23:10:0 
     352W:15:0:140:400 
     353A:100:15 to 100 
     354P:0:3d4:0:0:0 
     355 
     356N:40:& Katana~ 
     357G:|:W 
     358I:23:11:0 
     359W:20:0:120:600 
     360A:100:20 to 100 
     361P:0:3d5:0:0:0 
     362 
     363N:41:& Zweihander~ 
     364G:|:W 
     365I:23:12:0 
     366W:30:0:200:700 
     367A:100:30 to 100 
     368P:0:3d6:0:0:0 
     369D:A sword requring two hands to wield. 
     370 
     371 
     372N:42:& Executioner's Sword~ 
     373G:|:r 
     374I:23:13:0 
     375W:40:0:260:850 
     376A:100:40 to 100 
     377P:0:4d5:0:0:0 
     378 
     379N:43:& Blade~ of Chaos 
    345380G:|:v 
    346 I:23:30:0 
     381I:23:14:0 
    347382W:70:0:180:4000 
    348383A:20:70 to 100 
    349384P:0:6d5:0:0:0 
    350 F:RES_CHAOS | SHOW_MODS 
    351  
    352 N:37:& Two-Handed Sword~ 
    353 G:|:W 
    354 I:23:25:0 
    355 W:30:0:200:775 
    356 A:100:30 to 100 
    357 P:0:3d6:0:0:0 
    358 F:SHOW_MODS 
    359  
    360 N:38:& Main Gauche~ 
    361 G:|:W 
    362 I:23:5:0 
    363 W:3:0:30:25 
     385F:RES_CHAOS 
     386 
     387 
     388 
     389### Whips ### 
     390 
     391N:50:& Whip~ 
     392G:\:D 
     393I:21:1:0 
     394W:3:0:30:30 
    364395A:100:3 to 100 
    365 P:0:1d5:0:0:0 
    366 F:SHOW_MODS 
    367  
    368 N:39:& Cutlass~ 
    369 G:|:W 
    370 I:23:12:0 
    371 W:5:0:110:85 
    372 A:100:5 to 100 
    373 P:0:1d7:0:0:0 
    374 F:SHOW_MODS 
    375  
    376 N:40:& Executioner's Sword~ 
    377 G:|:r 
    378 I:23:28:0 
    379 W:40:0:260:850 
    380 A:100:40 to 100 
    381 P:0:4d5:0:0:0 
    382 F:SHOW_MODS 
    383  
    384 N:41:& Katana~ 
    385 G:|:W 
    386 I:23:20:0 
    387 W:20:0:120:400 
    388 A:100:20 to 100 
    389 P:0:3d4:0:0:0 
    390 F:SHOW_MODS 
    391  
    392 N:42:& Long Sword~ 
    393 G:|:W 
    394 I:23:17:0 
    395 W:10:0:130:300 
    396 A:100:10 to 100 
    397 P:0:2d5:0:0:0 
    398 F:SHOW_MODS 
    399  
    400 N:43:& Dagger~ 
    401 G:|:W 
    402 I:23:4:0 
    403 W:0:0:12:10 
    404 A:100:0 to 100 
    405 P:0:1d4:0:0:0 
    406 F:SHOW_MODS 
    407  
    408 N:44:& Rapier~ 
    409 G:|:W 
    410 I:23:7:0 
    411 W:5:0:40:42 
    412 A:100:5 to 100 
    413 P:0:1d6:0:0:0 
    414 F:SHOW_MODS 
    415  
    416 N:45:& Sabre~ 
    417 G:|:W 
    418 I:23:11:0 
    419 W:5:0:50:50 
    420 A:100:5 to 100 
    421 P:0:1d7:0:0:0 
    422 F:SHOW_MODS 
    423  
    424 N:46:& Small Sword~ 
    425 G:|:W 
    426 I:23:8:0 
    427 W:5:0:75:48 
    428 A:100:5 to 100 
    429 P:0:1d6:0:0:0 
    430 F:SHOW_MODS 
    431  
    432 N:47:& Broken Sword~ 
    433 G:|:D 
    434 I:23:2:0 
    435 W:0:0:30:2 
    436 P:0:1d2:0:0:0 
    437 F:SHOW_MODS 
    438  
    439 ##### Blunt Weapons ##### 
    440  
    441 N:48:& Ball-and-Chain~ 
     396P:0:1d3:0:0:0 
     397 
     398N:51:& Ball-and-Chain~ 
    442399G:\:D 
    443 I:21:6:0 
     400I:21:2:0 
    444401W:20:0:150:200 
    445402A:100:20 to 100 
    446403P:0:2d4:0:0:0 
    447 F:SHOW_MODS 
    448  
    449 N:49:& Whip~ 
     404 
     405N:52:& Morning Star~ 
    450406G:\:D 
    451 I:21:2:0 
    452 W:3:0:30:30 
    453 A:100:3 to 100 
    454 P:0:1d3:0:0:0 
    455 F:SHOW_MODS 
    456  
    457 N:50:& Flail~ 
     407I:21:3:0 
     408W:10:0:150:396 
     409A:100:10 to 100 
     410P:0:2d6:0:0:0 
     411 
     412N:53:& Flail~ 
    458413G:\:D 
    459 I:21:13:0 
     414I:21:4:0 
    460415W:10:0:150:353 
    461416A:100:10 to 100 
    462417P:0:2d6:0:0:0 
    463 F:SHOW_MODS 
    464  
    465 N:51:& Two-Handed Flail~ 
     418 
     419N:54:& Two-Handed Great Flail~ 
    466420G:\:y 
    467 I:21:18:0 
     421I:21:5:0 
    468422W:45:0:280:590 
    469423A:100:45 to 100 
    470424P:0:3d6:0:0:0 
    471 F:SHOW_MODS 
    472  
    473 N:52:& Morning Star~ 
     425 
     426 
     427### Clubs ### 
     428 
     429N:55:& Mace~ 
    474430G:\:D 
    475 I:21:12:0 
    476 W:10:0:150:396 
    477 A:100:10 to 100 
    478 P:0:2d6:0:0:0 
    479 F:SHOW_MODS 
    480  
    481 N:53:& Mace~ 
    482 G:\:D 
    483 I:21:5:0 
     431I:21:10:0 
    484432W:5:0:120:130 
    485433A:100:5 to 100 
    486434P:0:2d4:0:0:0 
    487 F:SHOW_MODS 
    488  
    489 N:54:& Quarterstaff~ 
     435 
     436N:56:& Lead-Filled Mace~ 
     437G:\:D 
     438I:21:11:0 
     439W:15:0:180:502 
     440A:100:15 to 100 
     441P:0:4d3:0:0:0 
     442 
     443N:57:& Quarterstaff~ 
    490444G:\:U 
    491 I:21:3:0 
     445I:21:12:0 
    492446W:10:0:150:200 
    493447A:100:10 to 100 
    494448P:0:1d9:0:0:0 
    495 F:SHOW_MODS 
    496  
    497 N:55:& War Hammer~ 
     449 
     450N:58:& War Hammer~ 
    498451G:\:D 
    499 I:21:8:0 
     452I:21:13:0 
    500453W:5:0:120:225 
    501454A:100:5 to 100 
    502455P:0:3d3:0:0:0 
    503 F:SHOW_MODS 
    504  
    505 N:56:& Lead-Filled Mace~ 
     456 
     457N:59:& Maul~ 
     458G:\:D 
     459I:21:14:0 
     460W:5:0:200:130 
     461A:100:5 to 100 
     462P:0:4d4:0:0:0 
     463 
     464N:60:& Great Hammer~ 
    506465G:\:D 
    507466I:21:15:0 
    508 W:15:0:180:502 
    509 A:100:15 to 100 
    510 P:0:3d4:0:0:0 
    511 F:SHOW_MODS 
    512  
    513 N:57:& Mace~ of Disruption 
     467W:5:0:180:500 
     468A:100:20 to 100 
     469P:0:8d1:0:0:0 
     470 
     471 
     472N:61:& Mace~ of Disruption 
    514473G:\:v 
    515474I:21:20:0 
     
    517476A:20:80 to 100 
    518477P:0:5d8:0:0:0 
    519 F:SLAY_UNDEAD | SHOW_MODS 
    520  
    521 N:58:& Lucerne Hammer~ 
    522 G:\:B 
    523 I:21:10:0 
    524 W:10:0:120:376 
     478F:SLAY_UNDEAD 
     479 
     480 
     481 
     482 
     483### Spears ### 
     484 
     485N:65:& Spear~ 
     486G:/:s 
     487I:22:1:0 
     488W:5:0:50:36 
     489A:100:5 to 100 
     490P:0:1d6:0:0:0 
     491 
     492N:66:& Awl-Pike~ 
     493G:/:s 
     494I:22:2:0 
     495W:10:0:160:340 
    525496A:100:10 to 100 
     497P:0:1d8:0:0:0 
     498 
     499N:67:& Trident~ 
     500G:/:y 
     501I:22:3:0 
     502W:5:0:70:120 
     503A:100:5 to 100 
     504P:0:1d10:0:0:0 
     505 
     506N:68:& Halberd~ 
     507G:/:s 
     508I:22:4:0 
     509W:25:0:190:430 
     510A:100:25 to 100 
     511P:0:3d5:0:0:0 
     512 
     513N:69:& Pike~ 
     514G:/:s 
     515I:22:5:0 
     516W:15:0:160:358 
     517A:100:15 to 100 
    526518P:0:2d5:0:0:0 
    527 F:SHOW_MODS 
    528  
    529 ##### Polearms and Axes ##### 
    530  
    531 N:59:& Beaked Axe~ 
     519 
     520 
     521### Axes ### 
     522 
     523N:70:& Beaked Axe~ 
    532524G:/:s 
    533525I:22:10:0 
     
    535527A:100:15 to 100 
    536528P:0:2d6:0:0:0 
    537 F:SHOW_MODS 
    538  
    539 N:60:& Glaive~ 
    540 G:/:s 
    541 I:22:13:0 
    542 W:20:0:190:363 
    543 A:100:20 to 100 
    544 P:0:2d6:0:0:0 
    545 F:SHOW_MODS 
    546  
    547 N:61:& Halberd~ 
    548 G:/:s 
    549&nbs