CF: Some archetype fixes

To: crossfire (at) ifi.uio.no
Subject: CF: Some archetype fixes
From: Jan Echternach <>
Date: Thu, 11 May 2000 16:28:36 +0200
Mail-Followup-To:
Reply-To: Jan Echternach <>
Sender:

Hi,

Most firewall archetypes didn't have a level, even though firewalls
cast spells.

arch sea1 had walk_on 1 set which was wrong.

arch fire_trail had walk_on 1 and fly_on 1 set which was also wrong.

Finally, the patch removes the type 37 (GRAVE) from
arch/dev/unused/0.91.1/grave.arc as a preparation for removing the
GRAVE type from include/defines.h.

I will apply the patch to the CVS tree if there are no objections.

-- 
Jan

diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/dev/unused/0.91.1/grave.arc arch/dev/unused/0.91.1/grave.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/dev/unused/0.91.1/grave.arc	Mon Mar 29 06:50:45 1999
--- arch/dev/unused/0.91.1/grave.arc	Thu May 11 13:18:11 2000
***************
*** 1,7 ****
  Object grave_open
  name the open grave
  face grave_open.111
- type 37
  no_pick 1
  color_fg brown
  editable 8
--- 1,6 ----
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/ground/sea.arc arch/ground/sea.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/ground/sea.arc	Mon Mar 29 06:52:18 1999
--- arch/ground/sea.arc	Thu May 11 13:01:35 2000
***************
*** 29,35 ****
  no_pick 1
  editable 8
  is_floor 1
- walk_on 1
  end
- 
- 
--- 29,32 ----
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/ground/volcano.arc arch/ground/volcano.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/ground/volcano.arc	Mon Mar 29 06:52:19 1999
--- arch/ground/volcano.arc	Thu May 11 14:40:24 2000
***************
*** 3,8 ****
--- 3,9 ----
  other_arch lava
  face volcano_lo.111
  type 62
+ level 1
  no_pick 1
  slow_move 15
  is_hilly 1
***************
*** 15,20 ****
--- 16,22 ----
  other_arch lava
  face volcano_lo.211
  type 62
+ level 1
  x 1
  no_pick 1
  slow_move 15
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/magic/meteor.arc arch/magic/meteor.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/magic/meteor.arc	Mon Mar 29 06:53:01 1999
--- arch/magic/meteor.arc	Thu May 11 13:05:20 2000
***************
*** 33,39 ****
  food 9
  is_used_up 1
  no_pick 1
- fly_on 1
- walk_on 1
  editable 0
  end
--- 33,37 ----
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/misc/cannon.arc arch/misc/cannon.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/misc/cannon.arc	Mon Mar 29 06:54:03 1999
--- arch/misc/cannon.arc	Thu May 11 14:39:41 2000
***************
*** 2,7 ****
--- 2,8 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  speed -0.4
***************
*** 13,18 ****
--- 14,20 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 1
***************
*** 25,30 ****
--- 27,33 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 2
***************
*** 37,42 ****
--- 40,46 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 3
***************
*** 49,54 ****
--- 53,59 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 4
***************
*** 61,66 ****
--- 66,72 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 5
***************
*** 73,78 ****
--- 79,85 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 6
***************
*** 85,90 ****
--- 92,98 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_7.111
  color_fg brown
  sp 7
***************
*** 97,102 ****
--- 105,111 ----
  other_arch shell
  name cannon
  type 62
+ level 1
  face cannon_0.111
  color_fg brown
  sp 8
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/wall/bulletwall/bulletwall.arc arch/wall/bulletwall/bulletwall.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/wall/bulletwall/bulletwall.arc	Mon Mar 29 07:02:32 1999
--- arch/wall/bulletwall/bulletwall.arc	Thu May 11 14:37:16 2000
***************
*** 2,7 ****
--- 2,8 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_0.111
  color_bg yellow
  speed -0.4
***************
*** 15,20 ****
--- 16,22 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_1.111
  color_bg yellow
  sp 1
***************
*** 29,34 ****
--- 31,37 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_2.111
  color_bg yellow
  sp 2
***************
*** 43,48 ****
--- 46,52 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_3.111
  color_bg yellow
  sp 3
***************
*** 57,62 ****
--- 61,67 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_4.111
  color_bg yellow
  sp 4
***************
*** 71,76 ****
--- 76,82 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_5.111
  color_bg yellow
  sp 5
***************
*** 85,90 ****
--- 91,97 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_6.111
  color_bg yellow
  sp 6
***************
*** 99,104 ****
--- 106,112 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_7.111
  color_bg yellow
  sp 7
***************
*** 113,118 ****
--- 121,127 ----
  other_arch bullet
  name bulletwall
  type 62
+ level 1
  face bul_wall_8.111
  color_bg yellow
  sp 8
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/wall/firewall/firewall.arc arch/wall/firewall/firewall.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/wall/firewall/firewall.arc	Wed Apr 19 13:07:16 2000
--- arch/wall/firewall/firewall.arc	Thu May 11 14:37:54 2000
***************
*** 21,26 ****
--- 21,27 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_1.111
  color_fg grey
  color_bg yellow
***************
*** 36,41 ****
--- 37,43 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_2.111
  color_fg grey
  color_bg yellow
***************
*** 51,56 ****
--- 53,59 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_3.111
  color_fg grey
  color_bg yellow
***************
*** 66,71 ****
--- 69,75 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_4.111
  color_fg grey
  color_bg yellow
***************
*** 81,86 ****
--- 85,91 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_5.111
  color_fg grey
  color_bg yellow
***************
*** 96,101 ****
--- 101,107 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_6.111
  color_fg grey
  color_bg yellow
***************
*** 111,116 ****
--- 117,123 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_7.111
  color_fg grey
  color_bg yellow
***************
*** 126,131 ****
--- 133,139 ----
  other_arch firebullet_s
  name firewall
  type 62
+ level 1
  face firewall_8.111
  color_fg grey
  color_bg yellow
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/wall/lbulletwall/lbull_wall.arc arch/wall/lbulletwall/lbull_wall.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/wall/lbulletwall/lbull_wall.arc	Mon Mar 29 07:02:46 1999
--- arch/wall/lbulletwall/lbull_wall.arc	Thu May 11 14:38:21 2000
***************
*** 2,7 ****
--- 2,8 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.101
  anim
  lbull_wall.111
***************
*** 27,32 ****
--- 28,34 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.111
  color_bg yellow
  sp 1
***************
*** 42,47 ****
--- 44,50 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.121
  color_bg yellow
  sp 2
***************
*** 57,62 ****
--- 60,66 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.131
  color_bg yellow
  sp 3
***************
*** 72,77 ****
--- 76,82 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.141
  color_bg yellow
  sp 4
***************
*** 87,92 ****
--- 92,98 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.151
  color_bg yellow
  sp 5
***************
*** 102,107 ****
--- 108,114 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.161
  color_bg yellow
  sp 6
***************
*** 117,122 ****
--- 124,130 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.171
  color_bg yellow
  sp 7
***************
*** 132,137 ****
--- 140,146 ----
  other_arch lbullet
  name large bulletwall
  type 62
+ level 1
  face lbull_wall.181
  color_bg yellow
  sp 8
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/wall/lightningwall/light_wall.arc arch/wall/lightningwall/light_wall.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/wall/lightningwall/light_wall.arc	Mon Mar 29 07:02:56 1999
--- arch/wall/lightningwall/light_wall.arc	Thu May 11 14:38:57 2000
***************
*** 2,7 ****
--- 2,8 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  dam 5
  face light_wall.101
  color_bg yellow
***************
*** 16,21 ****
--- 17,23 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.111
  anim
  light_wall.111
***************
*** 43,48 ****
--- 45,51 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.111
  color_bg yellow
  sp 1
***************
*** 58,63 ****
--- 61,67 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.121
  color_bg yellow
  sp 2
***************
*** 73,78 ****
--- 77,83 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.131
  color_bg yellow
  sp 3
***************
*** 88,93 ****
--- 93,99 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.141
  color_bg yellow
  sp 4
***************
*** 103,108 ****
--- 109,115 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.151
  color_bg yellow
  sp 5
***************
*** 118,123 ****
--- 125,131 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.161
  color_bg yellow
  sp 6
***************
*** 133,138 ****
--- 141,147 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.171
  color_bg yellow
  sp 7
***************
*** 148,153 ****
--- 157,163 ----
  other_arch lightning_s
  name lightningwall
  type 62
+ level 1
  face light_wall.181
  color_bg yellow
  sp 8
diff -rcN ../../orig/crossfire-0.95.5-arch-patch3/wall/speedbwall/speedbwall.arc arch/wall/speedbwall/speedbwall.arc
*** ../../orig/crossfire-0.95.5-arch-patch3/wall/speedbwall/speedbwall.arc	Mon Mar 29 07:02:57 1999
--- arch/wall/speedbwall/speedbwall.arc	Thu May 11 14:39:06 2000
***************
*** 2,7 ****
--- 2,8 ----
  other_arch speedball
  name speedball wall
  type 62
+ level 1
  face speedbwall.111
  color_bg yellow
  anim

Follow-Ups:
- Re: CF: Some archetype fixes
  - From: Jan Echternach <>

Prev by Date: Re: CF: Re: apply() cleanup
Next by Date: Re: CF: Re: apply() cleanup
Prev by thread: Re: CF: BUG: Morks Tower (Siegfried)
Next by thread: Re: CF: Some archetype fixes
Index(es):
- Date
- Thread