CF: distributing include/define.h and other imminent updates

[David Andrew Michael Noelle <>]

    While I was moving the materials into their own new header file,
material.h, I pulled several things out of defines.h that seemed to belong
elsewhere.  Hopefully, this should make them easier to find, but if anyone
objects, speak up now and I'll just leave defines.h alone.  After the
update it can still be undone easily enough, it's just easier to do before.

    All of the changes are listed here, followed by a detailed list of all
the other changes I'm uploading.  Aside from defines.h, none of it is news,
but it's all here if you're really curious and extremely bored.


include/defines.h
- moved object type numbers to object.h
- moved flag numbers to object.h
- moved NROFREALSPELLS to spells.h
- moved path numbers to spells.h
- moved DESCRIBE_PATH macro to spells.h
- moved ARMOUR_ and WEAPON_ macros to player.h
- moved player state numbers to player.h
- moved monster movement numbers to living.h
- moved NROFSKILLS to skills.h


include/global.h
- #defines from spells.h and material.h loaded early

include/player.h
- added gen_sp_armour variable

include/spellist.h
- added mana spells, Dancing Sword, and Animate Weapon

include/spells.h
- added mana spells, Dancing Sword, and Animate Weapon

server/alchemy.c:
minor cleanup

server/apply.c:
split multiple lighters

server/attack.c: 
- vulnerability gives -4 to saving throw against non-damage attack effects
- immunity to acid reduces the probability of corrosion
- immunity and protection and not vulnerability to acid prevents corrosion
- magic bonus improves item's saving throw against acid
- vulnerability to drain doubles rate of exp loss, protection halves rate
- holy word slaying is checked in hit_player, no need to double-checkk
in hit_player_attacktype
- prot:magic and vuln:magic affect all magical damage, not just raw magic
- Holy Word and Turn Undead affect undead at half strength if they're not
listed as an enemy race
- Holy Word and Turn Undead have no effect on undead if they're listed as
a friendly race
- minor bugfix/cleanup

server/gods.c:
- minor bugfix/cleanup
- luck slightly improves chance of divine intervention

server/input.c
- fixed typo

server/main.c
- trivial bulletproofing, probably no effect

server/player.c
- sp regen penalty from armour calculated in fix_player instead of being
recalculated for each spell point gained.

server/shop.c
- payment will come from open pouches if you don't have enough in your
top-level inventory
- money for sold items will go into open pouches until they're full,
then overflow into top-level inventory

server/skills.c
- minor bugfix in throwing
- writing in one of a stack of books seperates one book out first

server/spell_effect.c
- generalized staff_to_snake to animate_weapon

server/spell_util.c
- Staff to Snake, Dancing Sword, and Animate Weapon spells now all use
animate_weapon function
- holy golems avoid damaging their owners
- raw mana spells

common/living.c
- minor bugfix
- fix_player now calculates sp regen penalty from armour

common/readable.c
- spelling fix: grimore -> grimoire

doc/crossfire.c
- minor edits

include/sproto.h
- added animate_weapon and pay_from_container prototypes

include/material.h
- new

lib/spell_params
- added entries for mana spells along with their fire equivalents

lib/formulae
- minor spelling fixes to match minor spelling fixes in artifacts

lib/artifacts

Weapons
- Sanwe -> Gnarg (any weapon)
  chance 5, value x10, magic 0, dam 120%

- Lythander (any weapon)
  chance 5, value x20, magic 0, luck +1, weight 90%

- Gwormi -> Gaea (wooden weapons only)
  chance 20, value x50, magic 2, regen +1, dam 110%

- Slay Demon -> Valriel (any weapon)
  chance 15, value x30, magic 2, weapon speed 120%, slaying demon

- (new) Gorokh (any weapon)
  chance 15, value x30, magic 2, weapon speed 120%, slaying angel

- (new) the Devourers (any weapon)
  chance 8, value x30, magic 1, attacktype: physical, cold, depletion

- (new) Mostrai (axes and hammers only)
  chance 10, value x12, magic 1, dam 140%, weight 115%

- (new) Sorig (metal weapons only)
  chance 5, value x15, magic 1, weight 95%, weapon speed 125%
  attacktype physical, electricity

- (new) Ruggilli (metal weapons only)
  chance 5, value 15, magic 1, weight 85%, weapon speed 110%
  attacktype physical, fire

Helmets (moved to after weapons, with the rest of the armour)
- Lordliness -> Valriel (full helm only)
  chance 20, value x50, magic 2, Wis +1, Cha +1

- Uriel -> Sorig
  chance 10, value x20, magic 1, ac +1, armour 120%, prot electricity

Shields
- Theodin -> Mostrai
  chance 8, value x24, magic 1, prot fire

- Gnarg
  chance 8, value x12, magic 1, ac +1, armour 180%, Cha -1

Gauntlets
- (new) Sorig (gauntlets only)
  chance 15, value x75, magic 2, armour 10, weight 125%, attack: electricity

- (new) Sorig (gloves only)
  chance 10, value x10, magic 1, armour 5, weight 125%, prot: electricity

Armour
- (new) Valriel (plate and scale only)
  chance 6, value x20, magic 1, armour 120%, weight 110%

- (new) Gorokh (plate and scale only)
  chance 6, value x15, magic 1, ac +2, armour 110%, weight 105%

- (new) Ruggilli (plate, scale, or dragon armour)
  chance 10, value x55, magic 3, ac +1, armour 120%, weight 90%, prot: fire

- (new) Gaea
  chance 10, value x25, magic 2, ac +1, armour 120%

Cloaks
- (lesser version of cloak of the Underworld) the Devourers
  chance 3, difficulty 3, value x50, magic 3, weight 50%, material 0, Cha -2,
  prot: acid, drain, ghosthit, depletion

Bows
- (new) Valriel
  chance 10, value x15, magic 1, weight 110%, damage 200%

- (new) Gorokh
  chance 15, value x15, magic 2, damage 160%, attacktype: physical, acid

- (new) Lythander (not crossbow)
  chance 10, value x22, magic 1, weight 75%, wc +1, speed 150%

- (new) Ruggilli (crossbow only)
  chance 10, value x18, magic 2, weight 85%, wc +1, speed 110%,
  attacktype: fire

- (new) Sorig
  chance 12, value x20, magic 2, weight 95%, wc +1, speed 125%,
  attacktype: electricity

- (new) Mostrai (crossbow only)
  chance 5, value x50, magic 3, damage 140%, speed 75%,
  attacktype: weaponmagic

- (new) Thunder
  chance 10, dificulty 5, value x10, magic 2, weight 90%, damage 150%, wc +2
  attacktype: physical, slow, paralyze

...and a few minor spelling fixes


Added "nrof 1" to the following archetypes:
arch/armour/boots/elvenboots.arc
arch/armour/boots/idaten.arc
arch/armour/boots/lev_boots.arc
arch/armour/boots/speedboots.arc
arch/armour/cloak/magic_resist.arc
arch/armour/helmet/helmet_bri.arc
commit/arch/armour/helmet/helmetxray.arc
commit/arch/armour/mail/Pdragonmail.arc
commit/arch/armour/mail/dragonmail.arc
commit/arch/armour/mail/gale.arc
commit/arch/armour/mail/wdsm.arc
commit/arch/armour/shield/DShield.arc
commit/arch/armour/shield/DShieldm.arc
commit/arch/armour/shield/DShieldms.arc
commit/arch/armour/shield/DShields.arc
commit/arch/armour/shield/dragon_shi.arc
commit/arch/armour/shield/eyeshield.arc
commit/arch/armour/shield/holyshield.arc
commit/arch/armour/shield/reflector.arc
commit/arch/armour/shield/uw_shield.arc
commit/arch/armour/shield/wds.arc
commit/arch/flesh/human/corpse.arc
commit/arch/flesh/human/corpse1.arc
commit/arch/flesh/human/corpse_pl.arc
commit/arch/indoor/clock.arc
commit/arch/misc/Bagpipe/bagpipe.arc
commit/arch/misc/chalice.arc
commit/arch/misc/crown.arc
commit/arch/misc/torch_cyan.arc
commit/arch/misc/torch_indigo.arc
commit/arch/misc/torch_vermilion.arc
commit/arch/readable/bookRead.arc
commit/arch/readable/book_clasp.arc
commit/arch/readable/card.arc
commit/arch/readable/diploma.arc
commit/arch/readable/letter.arc
commit/arch/readable/note.arc
commit/arch/readable/quarto.arc
commit/arch/readable/scroll.arc
commit/arch/readable/scroll_2.arc
commit/arch/readable/tome.arc
commit/arch/spell/gu_horn.arc
commit/arch/spell/horn.arc
commit/arch/spell/horn2.arc
commit/arch/spell/horn3.arc
commit/arch/talisman/collar.arc
commit/arch/weapon/artifact/ChaosSword/CSword.arc
commit/arch/weapon/artifact/Darkblade/darkblade.arc
commit/arch/weapon/artifact/Demonbane/demonbane.arc
commit/arch/weapon/artifact/Fhammer/frost_hammer.arc
commit/arch/weapon/artifact/Firestar/fakefirestar.arc
commit/arch/weapon/artifact/Firestar/firestar.arc
commit/arch/weapon/artifact/Gram/gram.arc
commit/arch/weapon/artifact/Kdagger/k_dagger.arc
commit/arch/weapon/artifact/Lslasher/lava_s.arc
commit/arch/weapon/artifact/Masamune/masamune.arc
commit/arch/weapon/artifact/Sting/sting.arc
commit/arch/weapon/artifact/UW_Sword/uw_sword.arc
commit/arch/weapon/artifact/bonecrush.arc
commit/arch/weapon/artifact/defender.arc
commit/arch/weapon/artifact/dragonslay.arc
commit/arch/weapon/artifact/excalibur.arc
commit/arch/weapon/artifact/firebrand.arc
commit/arch/weapon/artifact/frostbrand.arc
commit/arch/weapon/artifact/harakiri.arc
commit/arch/weapon/artifact/mjoellnir.arc
commit/arch/weapon/artifact/skullcleav.arc
commit/arch/weapon/chained/nunchacu_1.arc
commit/arch/weapon/chained/nunchacu_2.arc
commit/arch/weapon/chained/shootingstar.arc
commit/arch/weapon/misc/shovel_1.arc
commit/arch/weapon/misc/stake.arc
commit/arch/weapon/misc/taifu_1.arc
commit/arch/weapon/sword/katana_1.arc

arch/armour/helmet/wiz_hat.arc
Changed (Int +2) to (Int +1, Pow +1)
Added nrof 1

commit/arch/armour/mail/mithril_ar_ele.arc
Changed (Cha +2) to (Cha +1, speed +1)
reduced penalties to sp regen and movement speed

commit/arch/armour/mail/robe_midnight.arc
Changed (Wis +2) to (Pow +2)
Added nrof 1

commit/arch/spell/power_crystal.arc
removed duplicate weight entry
Did _not_ add nrof 1

commit/arch/weapon/artifact/HolyAvenger/holyave.arc
Added attacktype: blinding and nrof 1

commit/arch/weapon/artifact/Usword/uk_sd.arc
changed weight 1qq000 (yes, the letter Q) to 11100
added nrof 1

commit/arch/weapon/artifact/deathbring.arc
added attacktype: depletion and nrof 1

commit/arch/weapon/artifact/magi_staff.arc
changed name from Staff of Magi to Staff of the Magi
changed stat bonuses from (Int +2, Wis +1) to (Int +1, Pow +2)
added wc +5 and nrof 1

commit/arch/weapon/artifact/mournblade.arc
changed attacktype: magic, drain to attacktype: drain, weaponmaigc
added nrof 1

commit/arch/weapon/artifact/stormbring.arc
changed prot: magic to prot: magic, electricity
changed attacktype: magic, drain to attacktype: electricity, drain
added nrof 1

-
[you can put yourself on the announcement list only or unsubscribe altogether
by sending an email stating your wishes to ]