From 118e9f190573d85706169b0fb687be0cdaef1458 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Sat, 13 Dec 2008 14:34:06 +0000 Subject: [PATCH] Extract some 'magicmap' and 'visibility' attributes into .face files. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@10956 282e977c-c81d-0410-88c4-b93c2d0d6712 --- inorganic/cinna.face | 3 +++ inorganic/dirt.face | 3 +++ inorganic/dust_effect.arc | 1 - inorganic/dust_effect.face | 9 +++++++++ inorganic/fix_mercury.face | 6 ++++++ inorganic/graphite.face | 3 +++ inorganic/grave_dirt.arc | 1 - inorganic/gypsum.face | 3 +++ inorganic/lead.arc | 1 - inorganic/lead.face | 3 +++ inorganic/lstone.face | 3 +++ inorganic/mercury.arc | 2 -- inorganic/mercury.face | 3 +++ inorganic/min_oil.face | 3 +++ inorganic/minerals.arc | 8 -------- inorganic/phil_minerals.arc | 3 --- inorganic/phil_phos.face | 9 +++++++++ inorganic/phil_salt.face | 9 +++++++++ inorganic/phil_sulphur.face | 9 +++++++++ inorganic/phosphor.face | 3 +++ inorganic/pyrite.face | 3 +++ inorganic/rock2.arc | 1 - inorganic/rock2.face | 3 +++ inorganic/salt.face | 3 +++ inorganic/stone.arc | 1 - inorganic/sulphur.face | 3 +++ inorganic/true_lead.arc | 1 - inorganic/true_lead.face | 3 +++ inorganic/uf6pile.arc | 3 --- inorganic/uf6pile.face | 3 +++ inorganic/uranium.arc | 3 --- inorganic/uranium.face | 3 +++ inorganic/uraniumoxide.arc | 1 - 33 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 inorganic/cinna.face create mode 100644 inorganic/dirt.face create mode 100644 inorganic/dust_effect.face create mode 100644 inorganic/fix_mercury.face create mode 100644 inorganic/graphite.face create mode 100644 inorganic/gypsum.face create mode 100644 inorganic/lead.face create mode 100644 inorganic/lstone.face create mode 100644 inorganic/mercury.face create mode 100644 inorganic/min_oil.face create mode 100644 inorganic/phil_phos.face create mode 100644 inorganic/phil_salt.face create mode 100644 inorganic/phil_sulphur.face create mode 100644 inorganic/phosphor.face create mode 100644 inorganic/pyrite.face create mode 100644 inorganic/rock2.face create mode 100644 inorganic/salt.face create mode 100644 inorganic/sulphur.face create mode 100644 inorganic/true_lead.face create mode 100644 inorganic/uf6pile.face create mode 100644 inorganic/uranium.face diff --git a/inorganic/cinna.face b/inorganic/cinna.face new file mode 100644 index 000000000..fe3ab1091 --- /dev/null +++ b/inorganic/cinna.face @@ -0,0 +1,3 @@ +face cinna.111 +magicmap red +end diff --git a/inorganic/dirt.face b/inorganic/dirt.face new file mode 100644 index 000000000..54f46e40f --- /dev/null +++ b/inorganic/dirt.face @@ -0,0 +1,3 @@ +face dirt.111 +magicmap brown +end diff --git a/inorganic/dust_effect.arc b/inorganic/dust_effect.arc index a561d8a2e..2d9f9819c 100644 --- a/inorganic/dust_effect.arc +++ b/inorganic/dust_effect.arc @@ -3,7 +3,6 @@ name cloud of dust type 79 level 1 face dust_effect.111 -magicmap brown anim dust_effect.111 dust_effect.112 diff --git a/inorganic/dust_effect.face b/inorganic/dust_effect.face new file mode 100644 index 000000000..5d899598a --- /dev/null +++ b/inorganic/dust_effect.face @@ -0,0 +1,9 @@ +face dust_effect.111 +magicmap brown +end +face dust_effect.112 +magicmap brown +end +face dust_effect.113 +magicmap brown +end diff --git a/inorganic/fix_mercury.face b/inorganic/fix_mercury.face new file mode 100644 index 000000000..bdf168f1e --- /dev/null +++ b/inorganic/fix_mercury.face @@ -0,0 +1,6 @@ +face fix_mercury.111 +magicmap grey +end +face fix_mercury.112 +magicmap grey +end diff --git a/inorganic/graphite.face b/inorganic/graphite.face new file mode 100644 index 000000000..4f56f714c --- /dev/null +++ b/inorganic/graphite.face @@ -0,0 +1,3 @@ +face graphite.111 +magicmap black +end diff --git a/inorganic/grave_dirt.arc b/inorganic/grave_dirt.arc index f656dcf24..c472d06a7 100644 --- a/inorganic/grave_dirt.arc +++ b/inorganic/grave_dirt.arc @@ -3,7 +3,6 @@ nrof 1 name graveyard dirt face dirt.111 type 73 -magicmap brown material 64 weight 100 value 1 diff --git a/inorganic/gypsum.face b/inorganic/gypsum.face new file mode 100644 index 000000000..87b410530 --- /dev/null +++ b/inorganic/gypsum.face @@ -0,0 +1,3 @@ +face gypsum.111 +magicmap blue +end diff --git a/inorganic/lead.arc b/inorganic/lead.arc index 4c9c4e10d..896634a49 100644 --- a/inorganic/lead.arc +++ b/inorganic/lead.arc @@ -8,7 +8,6 @@ resist_acid 100 materialname lead weight 5000 nrof 1 -magicmap grey name_pl leads client_type 642 end diff --git a/inorganic/lead.face b/inorganic/lead.face new file mode 100644 index 000000000..24892072c --- /dev/null +++ b/inorganic/lead.face @@ -0,0 +1,3 @@ +face lead.111 +magicmap grey +end diff --git a/inorganic/lstone.face b/inorganic/lstone.face new file mode 100644 index 000000000..4faed08b3 --- /dev/null +++ b/inorganic/lstone.face @@ -0,0 +1,3 @@ +face lstone.111 +magicmap green +end diff --git a/inorganic/mercury.arc b/inorganic/mercury.arc index 535fdc081..84f2c5a92 100644 --- a/inorganic/mercury.arc +++ b/inorganic/mercury.arc @@ -10,7 +10,6 @@ weight 3000 material 512 materialname mercury identified 1 -magicmap grey name_pl mercuries client_type 642 end @@ -32,7 +31,6 @@ resist_acid 100 type 73 nrof 1 weight 8000 -magicmap grey name_pl blocks client_type 642 end diff --git a/inorganic/mercury.face b/inorganic/mercury.face new file mode 100644 index 000000000..90db116fa --- /dev/null +++ b/inorganic/mercury.face @@ -0,0 +1,3 @@ +face mercury.111 +magicmap grey +end diff --git a/inorganic/min_oil.face b/inorganic/min_oil.face new file mode 100644 index 000000000..7c8236b29 --- /dev/null +++ b/inorganic/min_oil.face @@ -0,0 +1,3 @@ +face min_oil.111 +magicmap brown +end diff --git a/inorganic/minerals.arc b/inorganic/minerals.arc index dd9205774..12dfbe98e 100644 --- a/inorganic/minerals.arc +++ b/inorganic/minerals.arc @@ -9,7 +9,6 @@ value 40 resist_fire -100 weight 2500 -magicmap brown name_pl bottles client_type 641 end @@ -22,7 +21,6 @@ material 64 materialname salt type 73 value 10 -magicmap white weight 500 name_pl piles client_type 641 @@ -36,7 +34,6 @@ material 64 materialname sulphur type 73 value 15 -magicmap yellow resist_fire -100 resist_acid 100 @@ -55,7 +52,6 @@ material 64 materialname graphite type 73 value 1 -magicmap black resist_fire -100 resist_electricity -100 resist_acid 100 @@ -73,7 +69,6 @@ material 64 materialname phosphorus type 73 value 45 -magicmap grey resist_fire -100 resist_electricity -100 @@ -92,7 +87,6 @@ material 64 materialname cinnabar type 73 value 70 -magicmap red weight 3000 name_pl piles client_type 641 @@ -106,7 +100,6 @@ material 66 materialname pyrite type 73 value 8 -magicmap grey weight 2000 name_pl piles client_type 641 @@ -120,7 +113,6 @@ material 64 materialname gypsum type 73 value 9 -magicmap blue resist_acid 100 weight 1500 diff --git a/inorganic/phil_minerals.arc b/inorganic/phil_minerals.arc index 3763ad959..e2c5af172 100644 --- a/inorganic/phil_minerals.arc +++ b/inorganic/phil_minerals.arc @@ -27,7 +27,6 @@ type 73 anim_speed 3 client_anim_random 1 value 110 -magicmap yellow resist_fire -100 resist_acid 100 weight 500 @@ -50,7 +49,6 @@ anim_speed 2 client_anim_random 1 type 73 value 350 -magicmap grey resist_fire -100 resist_electricity -100 resist_acid 100 @@ -74,7 +72,6 @@ type 73 anim_speed 3 client_anim_random 1 value 80 -magicmap white weight 500 name_pl piles client_type 642 diff --git a/inorganic/phil_phos.face b/inorganic/phil_phos.face new file mode 100644 index 000000000..4b1a80415 --- /dev/null +++ b/inorganic/phil_phos.face @@ -0,0 +1,9 @@ +face phil_phos.111 +magicmap grey +end +face phil_phos.112 +magicmap grey +end +face phil_phos.113 +magicmap grey +end diff --git a/inorganic/phil_salt.face b/inorganic/phil_salt.face new file mode 100644 index 000000000..36f63f61a --- /dev/null +++ b/inorganic/phil_salt.face @@ -0,0 +1,9 @@ +face phil_salt.111 +magicmap white +end +face phil_salt.112 +magicmap white +end +face phil_salt.113 +magicmap white +end diff --git a/inorganic/phil_sulphur.face b/inorganic/phil_sulphur.face new file mode 100644 index 000000000..3e3e7255c --- /dev/null +++ b/inorganic/phil_sulphur.face @@ -0,0 +1,9 @@ +face phil_sulphur.111 +magicmap yellow +end +face phil_sulphur.112 +magicmap yellow +end +face phil_sulphur.113 +magicmap yellow +end diff --git a/inorganic/phosphor.face b/inorganic/phosphor.face new file mode 100644 index 000000000..156205807 --- /dev/null +++ b/inorganic/phosphor.face @@ -0,0 +1,3 @@ +face phosphor.111 +magicmap grey +end diff --git a/inorganic/pyrite.face b/inorganic/pyrite.face new file mode 100644 index 000000000..7f986adc1 --- /dev/null +++ b/inorganic/pyrite.face @@ -0,0 +1,3 @@ +face pyrite.111 +magicmap grey +end diff --git a/inorganic/rock2.arc b/inorganic/rock2.arc index 837274b57..6ed8f8976 100644 --- a/inorganic/rock2.arc +++ b/inorganic/rock2.arc @@ -5,7 +5,6 @@ material 64 value 100 type 73 weight 220 -magicmap grey nrof 1 name_pl rocks client_type 641 diff --git a/inorganic/rock2.face b/inorganic/rock2.face new file mode 100644 index 000000000..a1cc5a018 --- /dev/null +++ b/inorganic/rock2.face @@ -0,0 +1,3 @@ +face rock2.111 +magicmap grey +end diff --git a/inorganic/salt.face b/inorganic/salt.face new file mode 100644 index 000000000..0b727a459 --- /dev/null +++ b/inorganic/salt.face @@ -0,0 +1,3 @@ +face salt.111 +magicmap white +end diff --git a/inorganic/stone.arc b/inorganic/stone.arc index 3c7cf9467..840010887 100644 --- a/inorganic/stone.arc +++ b/inorganic/stone.arc @@ -6,7 +6,6 @@ value 1 resist_acid 100 type 73 weight 800 -magicmap green nrof 1 name_pl river stones client_type 641 diff --git a/inorganic/sulphur.face b/inorganic/sulphur.face new file mode 100644 index 000000000..73ceaeac6 --- /dev/null +++ b/inorganic/sulphur.face @@ -0,0 +1,3 @@ +face sulphur.111 +magicmap yellow +end diff --git a/inorganic/true_lead.arc b/inorganic/true_lead.arc index e379b72bc..2ef07c02b 100644 --- a/inorganic/true_lead.arc +++ b/inorganic/true_lead.arc @@ -10,7 +10,6 @@ materialname lead type 73 nrof 1 weight 5000 -magicmap grey name_pl blocks client_type 642 end diff --git a/inorganic/true_lead.face b/inorganic/true_lead.face new file mode 100644 index 000000000..71a1fe76a --- /dev/null +++ b/inorganic/true_lead.face @@ -0,0 +1,3 @@ +face true_lead.111 +magicmap grey +end diff --git a/inorganic/uf6pile.arc b/inorganic/uf6pile.arc index 6d695dd1d..06108185b 100644 --- a/inorganic/uf6pile.arc +++ b/inorganic/uf6pile.arc @@ -7,7 +7,6 @@ material 64 materialname uranium hexafluoride type 73 value 77 -magicmap white weight 5000 name_pl piles client_type 641 @@ -22,7 +21,6 @@ material 64 materialname uranium hexafluoride type 73 value 5 -magicmap white weight 5000 name_pl piles client_type 641 @@ -37,7 +35,6 @@ material 64 materialname uranium hexafluoride type 73 value 200 -magicmap white weight 5000 name_pl piles client_type 641 diff --git a/inorganic/uf6pile.face b/inorganic/uf6pile.face new file mode 100644 index 000000000..e4faa567a --- /dev/null +++ b/inorganic/uf6pile.face @@ -0,0 +1,3 @@ +face uf6pile.111 +magicmap white +end diff --git a/inorganic/uranium.arc b/inorganic/uranium.arc index f66c51efb..14de43070 100644 --- a/inorganic/uranium.arc +++ b/inorganic/uranium.arc @@ -7,7 +7,6 @@ material 2 materialname uranium type 73 value 25 -magicmap black weight 5000 name_pl piles client_type 641 @@ -23,7 +22,6 @@ materialname enriched uranium type 73 glow_radius 1 value 4000 -magicmap black weight 5000 name_pl piles client_type 641 @@ -38,7 +36,6 @@ material 2 materialname depleted uranium type 73 value 10 -magicmap black weight 5000 name_pl piles client_type 641 diff --git a/inorganic/uranium.face b/inorganic/uranium.face new file mode 100644 index 000000000..62370bd42 --- /dev/null +++ b/inorganic/uranium.face @@ -0,0 +1,3 @@ +face uranium.111 +magicmap black +end diff --git a/inorganic/uraniumoxide.arc b/inorganic/uraniumoxide.arc index 81ff2c0d8..595dba917 100644 --- a/inorganic/uraniumoxide.arc +++ b/inorganic/uraniumoxide.arc @@ -7,7 +7,6 @@ material 64 materialname uraniumoxide type 73 value 2 -magicmap yellow weight 5000 name_pl piles client_type 641