--- deliantra/arch/spell/Bullet/vitriol.arc	2007/01/02 21:58:23	1.2
+++ deliantra/arch/spell/Bullet/vitriol.arc	2007/02/06 22:41:23	1.3
@@ -1,64 +1,65 @@
 # vitriol is the 'bullet' form of vitriol.
-Object vitriol
+object vitriol
 name vitriol
 other_arch vitriol_splash
-type 102
-subtype 5
 face v_splash.x11
 animation vitriol_splash
-is_turnable 0
-walk_on 1
-fly_on 1
-glow_radius 2
 speed 1
-flying 1
-no_pick 1
-attacktype 64
-editable 0
-end
-#
-# vitriol splash is the cone form the bullet turns into
-#
-Object vitriol_splash
-name vitriol splash
-other_arch vitriol_pool
 type 102
-subtype 7
-face v_splash.x11
-anim
-v_splash.x11
-v_splash.x12
-mina
-is_turnable 1
-walk_on 1
-fly_on 1
+subtype 5
+attacktype 64
 glow_radius 2
-speed 1
-wc -30
-flying 1
+move_type all
+move_on all
 no_pick 1
+is_turnable 0
 editable 0
 end
+
 #
 # vitriol pool is what the splash above drops.
 # Note that this is put unchanged onto the map.
-Object vitriol_pool
+object vitriol_pool
+name vitriol pool
+face v_pool.x11
+dam 15
+wc -30
+speed 0.2
+level 1
 type 102
 subtype 7
-level 1
-walk_on 1
-wc -30
+attacktype 64
+duration 30
+move_on all
+no_pick 1
 stand_still 1
-name vitriol pool
-face v_pool.x11
+editable 8
 anim
 v_pool.x11
 v_pool.x12
 mina
-speed 0.2
+end
+
+#
+# vitriol splash is the cone form the bullet turns into
+#
+object vitriol_splash
+name vitriol splash
+other_arch vitriol_pool
+face v_splash.x11
+wc -30
+speed 1
+type 102
+subtype 7
+glow_radius 2
+move_type all
+move_on all
 no_pick 1
-attacktype 64
-duration 30
-dam 15
-editable 8
+is_turnable 1
+editable 0
+anim
+v_splash.x11
+v_splash.x12
+mina
 end
+