CF: bugs, typos, and other trivial fixes

[David Andrew Michael Noelle <>]

    I just did a diff -cr to pull out all the various changes I've been trying
out.  I think some of them are ready to be published here, for further testing
and decisions on whether to include them.  Comments on the changes I've made
are marked with my initials, D.A.M.N.

    These are primarily trivial fixes for bugs and typos and minor oversights.
Some of them are debatable, though.  Specifically, the first one.

artifacts and formulae:
  potion of strength (temporary - like strength spell) renamed to potion of
might so it doesn't have the same name as the stat potion.  Right now, you 
can't tell which one is listed on a shop's inventory.

archetypes:
  "nrof 1" added to demon's head, mercury, fixed mercury, true lead
  "weight 3" added to power_crystal - the weight of the one in the GemTunnel

apply.c:
  typo "ateempt" changed to "attempt"

-- 
            -Dave Noelle,                 
            -the Villa Straylight,  http://www.straylight.org

diff -cr crossfire-0.95.4/lib/artifacts crossfire-0.95.4-mod/lib/artifacts
*** crossfire-0.95.4/lib/artifacts	Tue Jul 13 00:42:17 1999
--- crossfire-0.95.4-mod/lib/artifacts	Thu Aug  5 22:51:25 1999
***************
*** 2578,2584 ****
  #
  Allowed potion_generic
  chance 1
! Object strength
  type 5
  sp 39
  value 1
--- 2578,2584 ----
  #
  Allowed potion_generic
  chance 1
! Object might
  type 5
  sp 39
  value 1
diff -cr crossfire-0.95.4/lib/formulae crossfire-0.95.4-mod/lib/formulae
*** crossfire-0.95.4/lib/formulae	Tue Jul 13 00:42:17 1999
--- crossfire-0.95.4-mod/lib/formulae	Thu Aug  5 22:52:11 1999
***************
*** 418,424 ****
  #    permantent stat raising items is a playbalance no no I think).  
  #
  # -- strength spell
! Object strength
  arch potion_generic
  chance 18
  ingred 3 water of the wise,ogre's arm,pile of philosophical salt
--- 418,424 ----
  #    permantent stat raising items is a playbalance no no I think).  
  #
  # -- strength spell
! Object might
  arch potion_generic
  chance 18
  ingred 3 water of the wise,ogre's arm,pile of philosophical salt
diff -cr crossfire-0.95.4/arch/flesh/demon/demon_head.arc crossfire-0.95.4-mod/arch/flesh/demon/demon_head.arc
*** crossfire-0.95.4/arch/flesh/demon/demon_head.arc	Sun Mar 28 23:04:59 1999
--- crossfire-0.95.4-mod/arch/flesh/demon/demon_head.arc	Fri Aug  6 13:11:40 1999
***************
*** 3,8 ****
--- 3,9 ----
  face demon_head.111
  material 32
  type 72
+ nrof 1
  weight 25
  editable 2048
  value 400
diff -cr crossfire-0.95.4/arch/inorganic/mercury.arc crossfire-0.95.4-mod/arch/inorganic/mercury.arc
*** crossfire-0.95.4/arch/inorganic/mercury.arc	Sun Mar 28 23:05:13 1999
--- crossfire-0.95.4-mod/arch/inorganic/mercury.arc	Fri Aug  6 13:13:19 1999
***************
*** 4,9 ****
--- 4,10 ----
  value 210
  immune 72
  type 73
+ nrof 1
  weight 3000
  identified 1
  editable 2048
***************
*** 22,27 ****
--- 23,29 ----
  value 4000
  immune 72
  type 73
+ nrof 1
  weight 8000
  editable 2048
  magicmap grey
diff -cr crossfire-0.95.4/arch/inorganic/true_lead.arc crossfire-0.95.4-mod/arch/inorganic/true_lead.arc
*** crossfire-0.95.4/arch/inorganic/true_lead.arc	Sun Mar 28 23:05:14 1999
--- crossfire-0.95.4-mod/arch/inorganic/true_lead.arc	Fri Aug  6 13:13:41 1999
***************
*** 6,11 ****
--- 6,12 ----
  value 13000
  immune 68
  type 73
+ nrof 1
  weight 5000
  editable 2048
  magicmap grey
diff -cr crossfire-0.95.4/arch/spell/power_crystal.arc crossfire-0.95.4-mod/arch/spell/power_crystal.arc
*** crossfire-0.95.4/arch/spell/power_crystal.arc	Sun Mar 28 23:00:54 1999
--- crossfire-0.95.4-mod/arch/spell/power_crystal.arc	Fri Aug  6 13:16:21 1999
***************
*** 9,14 ****
--- 9,15 ----
  power_crystal.114
  mina
  type 156
+ weight 3
  color_fg white
  value 10000000
  material 64
diff -cr crossfire-0.95.4/lib/archetypes crossfire-0.95.4-mod/lib/archetypes
*** crossfire-0.95.4/lib/archetypes	Tue Jul 13 00:42:17 1999
--- crossfire-0.95.4-mod/lib/archetypes	Thu Aug  5 22:26:40 1999
***************
*** 5066,5071 ****
--- 5066,5072 ----
  face demon_head.111
  material 32
  type 72
+ nrof 1
  weight 25
  editable 2048
  value 400
***************
*** 7833,7838 ****
--- 7834,7840 ----
  Object mercury
  face mercury.111
  material 2
+ nrof 1
  value 210
  immune 72
  type 73
***************
*** 7850,7855 ****
--- 7852,7858 ----
  value 4000
  immune 72
  type 73
+ nrof 1
  weight 8000
  editable 2048
  end
***************
*** 8042,8047 ****
--- 8045,8051 ----
  value 13000
  immune 68
  type 73
+ nrof 1
  weight 5000
  editable 2048
  end
***************
*** 22492,22497 ****
--- 22496,22502 ----
  material 64
  is_animated 1
  editable 4096
+ weight 3
  end
  Object prepare_weapon
  name Prepare Weapon
diff -cr crossfire-0.95.4/server/apply.c crossfire-0.95.4-mod/server/apply.c
*** crossfire-0.95.4/server/apply.c	Tue Jul 13 00:42:14 1999
--- crossfire-0.95.4-mod/server/apply.c	Tue Aug  3 17:59:56 1999
***************
*** 2403,2409 ****
          if(lighter->last_eat && lighter->stats.food) /* lighter is used up */ 
  	    lighter->stats.food--; 
          else if(lighter->last_eat) {           /* no charges left in lighter */ 
! 	     new_draw_info_format(NDI_UNIQUE, 0,who,"You ateempt to light the %s with the %s and nothing happens.", item->name,
lighter->name);
  	     return;
          }
  	nrof=item->nrof;
--- 2403,2409 ----
          if(lighter->last_eat && lighter->stats.food) /* lighter is used up */ 
  	    lighter->stats.food--; 
          else if(lighter->last_eat) {           /* no charges left in lighter */ 
! 	     new_draw_info_format(NDI_UNIQUE, 0,who,"You attempt to light the %s with the %s and nothing happens.", item->name,
lighter->name);
  	     return;
          }
  	nrof=item->nrof;
-
[you can put yourself on the announcement list only or unsubscribe altogether
by sending an email stating your wishes to ]