[crossfire] [patch] cleanup of archetypes 1
Stefan Huehner
stefan at huehner.org
Sun Sep 10 19:31:43 CDT 2006
Hi,
the attached patch works on the 'Objects using the old spell number
instead of having a spell object in their inventory' issue mentioned in
[1]. In case of type = 62 aka FIREWALL, the dam field was used before to
denote the number of the spell to be cast. This has been replaced by
'other_arch' containing the name of the spell.
the attached patch removes some of the dam fields, where the arch
already contained the 'other_arch' field.
Please double check and consider applying.
Regards,
Stefan
-------------- next part --------------
? arch.diff
Index: wall/firewall/firewall.arc
===================================================================
RCS file: /cvsroot/crossfire/arch/wall/firewall/firewall.arc,v
retrieving revision 1.7
diff -u -c -1 -5 -u -r1.7 firewall.arc
--- wall/firewall/firewall.arc 23 Jul 2006 17:47:59 -0000 1.7
+++ wall/firewall/firewall.arc 11 Sep 2006 00:27:32 -0000
@@ -1,173 +1,164 @@
Object firewall
other_arch spell_small_fireball
alive 1
level 1
type 62
activate_on_push 1
activate_on_release 1
face earthwall.111
color_fg grey
color_bg yellow
speed -0.02
hp 250
maxhp 250
-dam 1
ac 3
exp 50
resist_fire 100
blocksview 1
editable 32
visibility 100
end
Object firewall_1
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_1.111
color_fg grey
color_bg yellow
sp 1
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_2
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_2.111
color_fg grey
color_bg yellow
sp 2
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_3
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_3.111
color_fg grey
color_bg yellow
sp 3
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_4
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_4.111
color_fg grey
color_bg yellow
sp 4
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_5
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_5.111
color_fg grey
color_bg yellow
sp 5
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_6
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_6.111
color_fg grey
color_bg yellow
sp 6
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_7
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_7.111
color_fg grey
color_bg yellow
sp 7
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Object firewall_8
other_arch spell_small_fireball
name firewall
type 62
activate_on_push 1
activate_on_release 1
level 1
face firewall_8.111
color_fg grey
color_bg yellow
sp 8
-dam 1
speed -0.02
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
end
Index: wall/lbulletwall/lbull_wall.arc
===================================================================
RCS file: /cvsroot/crossfire/arch/wall/lbulletwall/lbull_wall.arc,v
retrieving revision 1.5
diff -u -c -1 -5 -u -r1.5 lbull_wall.arc
--- wall/lbulletwall/lbull_wall.arc 23 Jul 2006 17:47:59 -0000 1.5
+++ wall/lbulletwall/lbull_wall.arc 11 Sep 2006 00:27:32 -0000
@@ -9,173 +9,164 @@
anim
lbull_wall.111
lbull_wall.121
lbull_wall.131
lbull_wall.141
lbull_wall.151
lbull_wall.161
lbull_wall.171
lbull_wall.181
mina
is_animated 0
color_bg yellow
speed -0.16
no_pick 1
no_pass 1
-dam 29
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_1
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.111
color_bg yellow
sp 1
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_2
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.121
color_bg yellow
sp 2
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_3
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.131
color_bg yellow
sp 3
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_4
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.141
color_bg yellow
sp 4
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_5
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.151
color_bg yellow
sp 5
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_6
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.161
color_bg yellow
sp 6
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_7
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.171
color_bg yellow
sp 7
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lbulletwall_8
other_arch spell_lg_magic_bullet
name large bulletwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face lbull_wall.181
color_bg yellow
sp 8
-dam 29
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Index: wall/lightningwall/light_wall.arc
===================================================================
RCS file: /cvsroot/crossfire/arch/wall/lightningwall/light_wall.arc,v
retrieving revision 1.5
diff -u -c -1 -5 -u -r1.5 light_wall.arc
--- wall/lightningwall/light_wall.arc 23 Jul 2006 17:47:59 -0000 1.5
+++ wall/lightningwall/light_wall.arc 11 Sep 2006 00:27:32 -0000
@@ -1,23 +1,22 @@
Object lightningwall
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
-dam 5
face light_wall.101
color_bg yellow
speed -0.1
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_t
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
@@ -25,177 +24,168 @@
level 1
face light_wall.111
anim
light_wall.111
light_wall.121
light_wall.131
light_wall.141
light_wall.151
light_wall.161
light_wall.171
light_wall.181
mina
color_bg yellow
sp 1
maxsp 1
-dam 5
is_animated 0
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_1
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.111
color_bg yellow
sp 1
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_2
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.121
color_bg yellow
sp 2
speed -0.04
no_pick 1
no_pass 1
-dam 5
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_3
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.131
color_bg yellow
sp 3
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_4
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.141
color_bg yellow
sp 4
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_5
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.151
color_bg yellow
sp 5
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_6
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.161
color_bg yellow
sp 6
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_7
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.171
color_bg yellow
sp 7
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
Object lightningwall_8
other_arch spell_sm_lightning
name lightningwall
type 62
activate_on_push 1
activate_on_release 1
level 1
face light_wall.181
color_bg yellow
sp 8
-dam 5
speed -0.04
no_pick 1
no_pass 1
blocksview 1
editable 32
visibility 100
magicmap yellow
end
More information about the crossfire
mailing list