Add explicit animations; extract some 'magicmap' and 'visibility' attributes into .face files.

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@11301 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-01 09:39:27 +00:00 · 2009-02-01 09:39:27 +00:00 · 89e0a0deb7
parent 0f6c1f4d19
commit 89e0a0deb7
98 changed files with 178 additions and 90 deletions
--- a/jewel/amber_coin.arc
+++ b/jewel/amber_coin.arc
@ -2,7 +2,6 @@ Object ambercoin
 name amberium coin
 race gold and jewels
 face amber_coin.111
-magicmap orange
 nrof 1
 type 36
 material 2
--- a/jewel/amber_coin.face
+++ b/jewel/amber_coin.face
@ -0,0 +1,3 @@
+face amber_coin.111
+magicmap orange
+end
--- a/jewel/amethyst.arc
+++ b/jewel/amethyst.arc
@ -3,11 +3,7 @@ name amethyst
 race gold and jewels
 type 60
 face amethyst.111
-anim
-amethyst.111
-amethyst.112
-mina
-magicmap green
+animation amethyst
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/amethyst.face
+++ b/jewel/amethyst.face
@ -0,0 +1,10 @@
+animation amethyst
+amethyst.111
+amethyst.112
+mina
+face amethyst.111
+magicmap green
+end
+face amethyst.112
+magicmap green
+end
--- a/jewel/bronzebar.arc
+++ b/jewel/bronzebar.arc
@ -2,7 +2,6 @@ Object bronzebar
 name bronze bar
 race gold and jewels
 face bronzebar.111
-magicmap orange
 nrof 1
 type 73
 material 2
--- a/jewel/bronzebar.face
+++ b/jewel/bronzebar.face
@ -0,0 +1,3 @@
+face bronzebar.111
+magicmap orange
+end
--- a/jewel/copperbar.arc
+++ b/jewel/copperbar.arc
@ -2,7 +2,6 @@ Object copperbar
 name copper bar
 race gold and jewels
 face copperbar.111
-magicmap orange
 nrof 1
 type 73
 material 2
--- a/jewel/copperbar.face
+++ b/jewel/copperbar.face
@ -0,0 +1,3 @@
+face copperbar.111
+magicmap orange
+end
--- a/jewel/copperore.arc
+++ b/jewel/copperore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of copper
 race gold and jewels
 face ore_g.111
-magicmap green
 nrof 1
 type 73
 material 64
--- a/jewel/copperore1kg.arc
+++ b/jewel/copperore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of copper
 race gold and jewels
 face oresmall_g.111
-magicmap green
 nrof 1
 type 73
 material 64
--- a/jewel/emerald.arc
+++ b/jewel/emerald.arc
@ -2,11 +2,7 @@ Object emerald
 face emerald.111
 race gold and jewels
 type 60
-anim
-emerald.111
-emerald.112
-mina
-magicmap green
+animation emerald
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/emerald.face
+++ b/jewel/emerald.face
@ -0,0 +1,10 @@
+animation emerald
+emerald.111
+emerald.112
+mina
+face emerald.111
+magicmap green
+end
+face emerald.112
+magicmap green
+end
--- a/jewel/gem.arc
+++ b/jewel/gem.arc
@ -3,11 +3,7 @@ name diamond
 race gold and jewels
 type 60
 face gem.111
-anim
-gem.111
-gem.112
-mina
-magicmap green
+animation gem
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/gem.face
+++ b/jewel/gem.face
@ -1,3 +1,11 @@
+animation gem
+gem.111
+gem.112
+mina
 face gem.111
+magicmap green
 visibility 100
 end
+face gem.112
+magicmap green
+end
--- a/jewel/goldbar.arc
+++ b/jewel/goldbar.arc
@ -2,7 +2,6 @@ Object goldbar
 name gold bar
 race gold and jewels
 face goldbar.111
-magicmap orange
 nrof 1
 type 60
 material 2
--- a/jewel/goldbar.face
+++ b/jewel/goldbar.face
@ -0,0 +1,3 @@
+face goldbar.111
+magicmap orange
+end
--- a/jewel/goldblock.arc
+++ b/jewel/goldblock.arc
@ -2,7 +2,6 @@ Object goldblock
 name gold block
 race gold and jewels
 face goldblock.111
-magicmap orange
 nrof 1
 type 60
 material 2
--- a/jewel/goldblock.face
+++ b/jewel/goldblock.face
@ -0,0 +1,3 @@
+face goldblock.111
+magicmap orange
+end
--- a/jewel/goldcoin.arc
+++ b/jewel/goldcoin.arc
@ -2,7 +2,6 @@ Object goldcoin
 name gold coin
 race gold and jewels
 face goldcoin.111
-magicmap yellow
 nrof 1
 type 36
 material 2
--- a/jewel/goldcoin.face
+++ b/jewel/goldcoin.face
@ -0,0 +1,3 @@
+face goldcoin.111
+magicmap yellow
+end
--- a/jewel/goldore.arc
+++ b/jewel/goldore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of gold
 race gold and jewels
 face ore_y.111
-magicmap orange
 nrof 1
 type 73
 material 64
--- a/jewel/goldore1kg.arc
+++ b/jewel/goldore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of gold
 race gold and jewels
 face oresmall_y.111
-magicmap orange
 nrof 1
 type 73
 material 64
--- a/jewel/goldround.arc
+++ b/jewel/goldround.arc
@ -3,7 +3,6 @@ name gold round
 name_pl gold rounds
 race gold and jewels
 face goldround.111
-magicmap orange
 nrof 1
 type 60
 material 2
--- a/jewel/goldround.face
+++ b/jewel/goldround.face
@ -0,0 +1,3 @@
+face goldround.111
+magicmap orange
+end
--- a/jewel/ironbar.arc
+++ b/jewel/ironbar.arc
@ -2,7 +2,6 @@ Object ironbar
 name iron bar
 race gold and jewels
 face ironbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
--- a/jewel/ironbar.face
+++ b/jewel/ironbar.face
@ -0,0 +1,3 @@
+face ironbar.111
+magicmap grey
+end
--- a/jewel/ironore.arc
+++ b/jewel/ironore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of iron
 race gold and jewels
 face ore_r.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/ironore1kg.arc
+++ b/jewel/ironore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of iron
 race gold and jewels
 face oresmall_r.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/jade_coin.arc
+++ b/jewel/jade_coin.arc
@ -2,7 +2,6 @@ Object jadecoin
 name jade coin
 race gold and jewels
 face jade_coin.111
-magicmap green
 nrof 1
 type 36
 material 2
--- a/jewel/jade_coin.face
+++ b/jewel/jade_coin.face
@ -0,0 +1,3 @@
+face jade_coin.111
+magicmap green
+end
--- a/jewel/leadbar.arc
+++ b/jewel/leadbar.arc
@ -2,7 +2,6 @@ Object leadbar
 name lead bar
 race gold and jewels
 face leadbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
--- a/jewel/leadbar.face
+++ b/jewel/leadbar.face
@ -0,0 +1,3 @@
+face leadbar.111
+magicmap grey
+end
--- a/jewel/leadore.arc
+++ b/jewel/leadore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of lead
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/leadore1kg.arc
+++ b/jewel/leadore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of lead
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/mithril.arc
+++ b/jewel/mithril.arc
@ -3,12 +3,7 @@ name mithril crystal
 race gold and jewels
 type 73
 face mithril.111
-anim
-mithril.111
-mithril.112
-mithril.113
-mithril.114
-mina
+animation mithril
 nrof 1
 anim_speed 5
 client_anim_random 1
@ -17,7 +12,6 @@ weight 50
 material 2
 materialname mithril
 identified 1
-magicmap grey
 name_pl mithril crystals
 client_type 2011
 end
--- a/jewel/mithril.face
+++ b/jewel/mithril.face
@ -0,0 +1,18 @@
+animation mithril
+mithril.111
+mithril.112
+mithril.113
+mithril.114
+mina
+face mithril.111
+magicmap grey
+end
+face mithril.112
+magicmap grey
+end
+face mithril.113
+magicmap grey
+end
+face mithril.114
+magicmap grey
+end
--- a/jewel/nugget_huge.arc
+++ b/jewel/nugget_huge.arc
@ -6,7 +6,6 @@ nrof 1
 material 2
 materialname gold
 type 73
-magicmap orange
 value 177777
 weight 700000000
 name_pl huge gold nuggets
--- a/jewel/nugget_huge.face
+++ b/jewel/nugget_huge.face
@ -0,0 +1,3 @@
+face nugget_huge.111
+magicmap orange
+end
--- a/jewel/nugget_lar.arc
+++ b/jewel/nugget_lar.arc
@ -2,7 +2,6 @@ Object largenugget
 name large gold nugget
 race gold and jewels
 face nugget_lar.111
-magicmap orange
 nrof 1
 type 60
 material 2
--- a/jewel/nugget_lar.face
+++ b/jewel/nugget_lar.face
@ -0,0 +1,3 @@
+face nugget_lar.111
+magicmap orange
+end
--- a/jewel/nugget_sma.arc
+++ b/jewel/nugget_sma.arc
@ -2,7 +2,6 @@ Object smallnugget
 name small gold nugget
 race gold and jewels
 face nugget_sma.111
-magicmap orange
 nrof 1
 type 60
 material 2
--- a/jewel/nugget_sma.face
+++ b/jewel/nugget_sma.face
@ -0,0 +1,3 @@
+face nugget_sma.111
+magicmap orange
+end
--- a/jewel/ore_b.face
+++ b/jewel/ore_b.face
@ -0,0 +1,3 @@
+face ore_b.111
+magicmap grey
+end
--- a/jewel/ore_g.face
+++ b/jewel/ore_g.face
@ -0,0 +1,3 @@
+face ore_g.111
+magicmap green
+end
--- a/jewel/ore_r.face
+++ b/jewel/ore_r.face
@ -0,0 +1,3 @@
+face ore_r.111
+magicmap grey
+end
--- a/jewel/ore_y.face
+++ b/jewel/ore_y.face
@ -0,0 +1,3 @@
+face ore_y.111
+magicmap orange
+end
--- a/jewel/oresmall_b.face
+++ b/jewel/oresmall_b.face
@ -0,0 +1,3 @@
+face oresmall_b.111
+magicmap grey
+end
--- a/jewel/oresmall_g.face
+++ b/jewel/oresmall_g.face
@ -0,0 +1,3 @@
+face oresmall_g.111
+magicmap green
+end
--- a/jewel/oresmall_r.face
+++ b/jewel/oresmall_r.face
@ -0,0 +1,3 @@
+face oresmall_r.111
+magicmap grey
+end
--- a/jewel/oresmall_y.face
+++ b/jewel/oresmall_y.face
@ -0,0 +1,3 @@
+face oresmall_y.111
+magicmap orange
+end
--- a/jewel/pearl.arc
+++ b/jewel/pearl.arc
@ -2,11 +2,7 @@ Object pearl
 face pearl.111
 race gold and jewels
 type 60
-anim
-pearl.111
-pearl.112
-mina
-magicmap white
+animation pearl
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/pearl.face
+++ b/jewel/pearl.face
@ -1,3 +1,11 @@
+animation pearl
+pearl.111
+pearl.112
+mina
 face pearl.111
+magicmap white
 visibility 100
 end
+face pearl.112
+magicmap white
+end
--- a/jewel/platbar.arc
+++ b/jewel/platbar.arc
@ -2,7 +2,6 @@ Object platbar
 name platinum bar
 race gold and jewels
 face platbar.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/platbar.face
+++ b/jewel/platbar.face
@ -0,0 +1,3 @@
+face platbar.111
+magicmap grey
+end
--- a/jewel/platblock.arc
+++ b/jewel/platblock.arc
@ -3,7 +3,6 @@ name platinum block
 name_pl platinum blocks
 race gold and jewels
 face platblock.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/platblock.face
+++ b/jewel/platblock.face
@ -0,0 +1,3 @@
+face platblock.111
+magicmap grey
+end
--- a/jewel/platore.arc
+++ b/jewel/platore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of platinum
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/platore1kg.arc
+++ b/jewel/platore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of platinum
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/platround.arc
+++ b/jewel/platround.arc
@ -3,7 +3,6 @@ name platinum round
 name_pl platinum rounds
 race gold and jewels
 face platround.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/platround.face
+++ b/jewel/platround.face
@ -0,0 +1,3 @@
+face platround.111
+magicmap grey
+end
--- a/jewel/plt_coin.arc
+++ b/jewel/plt_coin.arc
@ -2,7 +2,6 @@ Object platinacoin
 name platinum coin
 race gold and jewels
 face plt_coin.111
-magicmap grey
 nrof 1
 type 36
 material 2
--- a/jewel/plt_coin.face
+++ b/jewel/plt_coin.face
@ -0,0 +1,3 @@
+face plt_coin.111
+magicmap grey
+end
--- a/jewel/ruby.arc
+++ b/jewel/ruby.arc
@ -2,11 +2,7 @@ Object ruby
 face ruby.111
 race gold and jewels
 type 60
-anim
-ruby.111
-ruby.112
-mina
-magicmap red
+animation ruby
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/ruby.face
+++ b/jewel/ruby.face
@ -1,3 +1,11 @@
+animation ruby
+ruby.111
+ruby.112
+mina
 face ruby.111
+magicmap red
 visibility 100
 end
+face ruby.112
+magicmap red
+end
--- a/jewel/sapphire.arc
+++ b/jewel/sapphire.arc
@ -2,11 +2,7 @@ Object sapphire
 face sapphire.111
 race gold and jewels
 type 60
-anim
-sapphire.111
-sapphire.112
-mina
-magicmap blue
+animation sapphire
 nrof 1
 anim_speed 10
 client_anim_random 1
--- a/jewel/sapphire.face
+++ b/jewel/sapphire.face
@ -0,0 +1,10 @@
+animation sapphire
+sapphire.111
+sapphire.112
+mina
+face sapphire.111
+magicmap blue
+end
+face sapphire.112
+magicmap blue
+end
--- a/jewel/silverbar.arc
+++ b/jewel/silverbar.arc
@ -2,7 +2,6 @@ Object silverbar
 name silver bar
 race gold and jewels
 face silverbar.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/silverbar.face
+++ b/jewel/silverbar.face
@ -0,0 +1,3 @@
+face silverbar.111
+magicmap grey
+end
--- a/jewel/silverblock.arc
+++ b/jewel/silverblock.arc
@ -3,7 +3,6 @@ name silver block
 name_pl silver blocks
 race gold and jewels
 face silverblock.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/silverblock.face
+++ b/jewel/silverblock.face
@ -0,0 +1,3 @@
+face silverblock.111
+magicmap grey
+end
--- a/jewel/silvercoin.arc
+++ b/jewel/silvercoin.arc
@ -2,7 +2,6 @@ Object silvercoin
 name silver coin
 race gold and jewels
 face silvercoin.111
-magicmap grey
 nrof 1
 type 36
 material 2
--- a/jewel/silvercoin.face
+++ b/jewel/silvercoin.face
@ -0,0 +1,3 @@
+face silvercoin.111
+magicmap grey
+end
--- a/jewel/silverore.arc
+++ b/jewel/silverore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of silver
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/silverore1kg.arc
+++ b/jewel/silverore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of silver
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/silverround.arc
+++ b/jewel/silverround.arc
@ -3,7 +3,6 @@ name silver round
 name_pl silver rounds
 race gold and jewels
 face silverround.111
-magicmap grey
 nrof 1
 type 60
 material 2
--- a/jewel/silverround.face
+++ b/jewel/silverround.face
@ -0,0 +1,3 @@
+face silverround.111
+magicmap grey
+end
--- a/jewel/steelbar.arc
+++ b/jewel/steelbar.arc
@ -2,7 +2,6 @@ Object steelbar
 name steel bar
 race gold and jewels
 face steelbar.111
-magicmap grey
 nrof 1
 type 73
 material 0
--- a/jewel/steelbar.face
+++ b/jewel/steelbar.face
@ -0,0 +1,3 @@
+face steelbar.111
+magicmap grey
+end
--- a/jewel/tinbar.arc
+++ b/jewel/tinbar.arc
@ -2,7 +2,6 @@ Object tinbar
 name tin bar
 race gold and jewels
 face tinbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
--- a/jewel/tinbar.face
+++ b/jewel/tinbar.face
@ -0,0 +1,3 @@
+face tinbar.111
+magicmap grey
+end
--- a/jewel/tinore.arc
+++ b/jewel/tinore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of tin
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/tinore1kg.arc
+++ b/jewel/tinore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of tin
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/uraniumbar.arc
+++ b/jewel/uraniumbar.arc
@ -2,7 +2,6 @@ Object uraniumbar
 name uranium bar
 race gold and jewels
 face uraniumbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
@ -25,7 +24,6 @@ face uraniumbar.111
 attacktype 4
 dam 5
 speed 0.100000
-magicmap grey
 nrof 1
 type 73
 material 2
@ -45,7 +43,6 @@ Object depleteduraniumbar
 name depleted uranium bar
 race gold and jewels
 face uraniumbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
--- a/jewel/uraniumbar.face
+++ b/jewel/uraniumbar.face
@ -0,0 +1,3 @@
+face uraniumbar.111
+magicmap grey
+end
--- a/jewel/uraniumore.arc
+++ b/jewel/uraniumore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of uranium
 race gold and jewels
 face ore_y.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/uraniumore1kg.arc
+++ b/jewel/uraniumore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of uranium
 race gold and jewels
 face oresmall_y.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessore_b.arc
+++ b/jewel/worthlessore_b.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessore_g.arc
+++ b/jewel/worthlessore_g.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face ore_g.111
-magicmap green
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessore_r.arc
+++ b/jewel/worthlessore_r.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face ore_r.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessore_y.arc
+++ b/jewel/worthlessore_y.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face ore_y.111
-magicmap orange
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessoresmall_b.arc
+++ b/jewel/worthlessoresmall_b.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessoresmall_g.arc
+++ b/jewel/worthlessoresmall_g.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face oresmall_g.111
-magicmap green
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessoresmall_r.arc
+++ b/jewel/worthlessoresmall_r.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face oresmall_r.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/worthlessoresmall_y.arc
+++ b/jewel/worthlessoresmall_y.arc
@ -4,7 +4,6 @@ name_pl ores
 title of nothing
 race gold and jewels
 face oresmall_y.111
-magicmap orange
 nrof 1
 type 73
 material 64
--- a/jewel/zincbar.arc
+++ b/jewel/zincbar.arc
@ -2,7 +2,6 @@ Object zincbar
 name zinc bar
 race gold and jewels
 face zincbar.111
-magicmap grey
 nrof 1
 type 73
 material 2
--- a/jewel/zincbar.face
+++ b/jewel/zincbar.face
@ -0,0 +1,3 @@
+face zincbar.111
+magicmap grey
+end
--- a/jewel/zincore.arc
+++ b/jewel/zincore.arc
@ -4,7 +4,6 @@ name_pl ores
 title of zinc
 race gold and jewels
 face ore_b.111
-magicmap grey
 nrof 1
 type 73
 material 64
--- a/jewel/zincore1kg.arc
+++ b/jewel/zincore1kg.arc
@ -4,7 +4,6 @@ name_pl ores
 title of zinc
 race gold and jewels
 face oresmall_b.111
-magicmap grey
 nrof 1
 type 73
 material 64