[ViewVC] Diff of: cvs/deliantra/arch/inorganic/mercury.arc

Comparing deliantra/arch/inorganic/mercury.arc (file contents):
Revision 1.2 by pippijn, Tue Jan 2 21:50:07 2007 UTC vs.
Revision 1.3 by root, Tue Feb 6 22:40:22 2007 UTC

-Object mercury
+object fix_mercury
+name block
+name_pl blocks
+title of fixed mercury
-face mercury.x11
+face fix_mercury.x11
-material 2
+speed 0.5
-value 210
+nrof 1
+type 73
 resist_electricity 100
 resist_acid 100
-type 73
-nrof 1
-weight 3000
 material 512
 materialname mercury
-identified 1
+value 400
+weight 8000
+client_type 642
 editable 2048
 magicmap grey
-name_pl mercuries
-client_type 642
-end
-Object fix_mercury
-name block
-title of fixed mercury
-face fix_mercury.x11
 anim
 fix_mercury.x11
 fix_mercury.x12
 mina
-speed 0.5
+end
+object mercury
+name_pl mercuries
+face mercury.x11
+nrof 1
+type 73
+resist_electricity 100
+resist_acid 100
 material 512
 materialname mercury
-value 400
+value 210
-resist_electricity 100
-resist_acid 100
-type 73
-nrof 1
-weight 8000
+weight 3000
+client_type 642
+identified 1
 editable 2048
 magicmap grey
-name_pl blocks
-client_type 642
 end

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines