From d899eda0e3faf57d8fb2a4a92dd47b5354d4b183 Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 9 Nov 2008 23:22:11 +0000
Subject: [PATCH] Remove obsolete color_fg, extract animations to .face.

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@10325 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 monster/angel/angel.arc       | 13 +-----------
 monster/angel/angel.face      | 14 +++++++++++++
 monster/angel/angelknight.arc |  2 +-
 monster/angel/archangel.arc   | 37 ++++++-----------------------------
 monster/angel/archangel.face  |  8 ++++++++
 monster/angel/highangel.arc   |  2 +-
 monster/angel/liteangel.arc   |  8 +-------
 monster/angel/liteangel.face  |  9 +++++++++
 monster/angel/mesangel.arc    |  2 +-
 monster/angel/retribution.arc |  2 +-
 10 files changed, 43 insertions(+), 54 deletions(-)
 create mode 100644 monster/angel/archangel.face
 create mode 100644 monster/angel/liteangel.face

diff --git a/monster/angel/angel.arc b/monster/angel/angel.arc
index 92426f6d2..254e8d01f 100644
--- a/monster/angel/angel.arc
+++ b/monster/angel/angel.arc
@@ -3,17 +3,7 @@ randomitems angel
 race angel
 name angel
 face angel.111
-anim
-facings 4
-angel.111
-angel.112
-angel.131
-angel.132
-angel.151
-angel.152
-angel.171
-angel.172
-mina
+animation angel
 is_animated 1
 monster 1
 move_type walk fly_low
@@ -51,7 +41,6 @@ can_use_weapon 1
 can_use_ring 1
 attack_movement 4
 attacktype 1048577
-color_fg black
 body_skill 1
 body_torso 1
 body_head 1
diff --git a/monster/angel/angel.face b/monster/angel/angel.face
index 7c98a858f..7d2d5b3cd 100644
--- a/monster/angel/angel.face
+++ b/monster/angel/angel.face
@@ -1,3 +1,5 @@
+face angel.111
+magicmap black
 animation angel_sword
 facings 4
 angel.111
@@ -17,3 +19,15 @@ angel_sword.171
 angel_sword.172
 angel_sword.171
 mina
+animation angel
+facings 4
+angel.111
+angel.112
+angel.131
+angel.132
+angel.151
+angel.152
+angel.171
+angel.172
+mina
+end
diff --git a/monster/angel/angelknight.arc b/monster/angel/angelknight.arc
index 86ed060ba..f25df6ff8 100644
--- a/monster/angel/angelknight.arc
+++ b/monster/angel/angelknight.arc
@@ -2,6 +2,7 @@ Object angel_knight
 name Angel Knight
 race angel
 face angelknight.x11
+magicmap black
 monster 1
 move_type walk fly_low
 level 8
@@ -34,7 +35,6 @@ can_use_armour 1
 can_use_weapon 1
 can_use_ring 1
 attacktype 1048577
-color_fg black
 body_skill 1
 body_torso 1
 body_head 1
diff --git a/monster/angel/archangel.arc b/monster/angel/archangel.arc
index 52f019b2d..989781186 100644
--- a/monster/angel/archangel.arc
+++ b/monster/angel/archangel.arc
@@ -3,12 +3,7 @@ randomitems archangel
 name Arch Angel
 race angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
-color_fg white
+animation archangel
 monster 1
 move_type walk fly_low
 sleep 1
@@ -74,11 +69,7 @@ More
 Object ArchAngel_2
 name Arch Angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
+animation archangel
 monster 1
 move_type walk fly_low
 alive 1
@@ -90,11 +81,7 @@ More
 Object ArchAngel_3
 name Arch Angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
+animation archangel
 monster 1
 move_type walk fly_low
 alive 1
@@ -106,11 +93,7 @@ More
 Object ArchAngel_4
 name Arch Angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
+animation archangel
 monster 1
 move_type walk fly_low
 alive 1
@@ -123,11 +106,7 @@ More
 Object ArchAngel_5
 name Arch Angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
+animation archangel
 monster 1
 move_type walk fly_low
 alive 1
@@ -140,11 +119,7 @@ More
 Object ArchAngel_6
 name Arch Angel
 face archangel.x11
-anim
-archangel.x11
-archangel.x12
-archangel.x13
-mina
+animation archangel
 monster 1
 move_type walk fly_low
 alive 1
diff --git a/monster/angel/archangel.face b/monster/angel/archangel.face
new file mode 100644
index 000000000..90f1d48f0
--- /dev/null
+++ b/monster/angel/archangel.face
@@ -0,0 +1,8 @@
+face archangel.x11
+magicmap white
+animation archangel
+archangel.x11
+archangel.x12
+archangel.x13
+mina
+end
diff --git a/monster/angel/highangel.arc b/monster/angel/highangel.arc
index 714608b8c..efe07846c 100644
--- a/monster/angel/highangel.arc
+++ b/monster/angel/highangel.arc
@@ -3,7 +3,7 @@ randomitems high_angel
 name High Angel
 race angel
 face highangel.118
-color_fg white
+magicmap white
 animation highangel
 monster 1
 move_type walk fly_low
diff --git a/monster/angel/liteangel.arc b/monster/angel/liteangel.arc
index 79fd324f6..7c60fe0fb 100644
--- a/monster/angel/liteangel.arc
+++ b/monster/angel/liteangel.arc
@@ -3,13 +3,7 @@ name light angel
 randomitems liteangel
 race angel
 face liteangel.112
-color_fg white
-anim
-liteangel.111
-liteangel.112
-liteangel.113
-liteangel.114
-mina
+animation liteangel
 monster 1
 move_type walk fly_low
 sleep 1
diff --git a/monster/angel/liteangel.face b/monster/angel/liteangel.face
new file mode 100644
index 000000000..44618aac9
--- /dev/null
+++ b/monster/angel/liteangel.face
@@ -0,0 +1,9 @@
+face liteangel.112
+magicmap white
+anim
+liteangel.111
+liteangel.112
+liteangel.113
+liteangel.114
+mina
+end
diff --git a/monster/angel/mesangel.arc b/monster/angel/mesangel.arc
index e5f510c2d..6d3847030 100644
--- a/monster/angel/mesangel.arc
+++ b/monster/angel/mesangel.arc
@@ -3,7 +3,7 @@ name messenger
 randomitems mesangel
 race angel
 face liteangel.112
-color_fg white
+magicmap white
 anim
 liteangel.111
 liteangel.112
diff --git a/monster/angel/retribution.arc b/monster/angel/retribution.arc
index d56e586b9..f51ecc441 100644
--- a/monster/angel/retribution.arc
+++ b/monster/angel/retribution.arc
@@ -2,6 +2,7 @@ Object destroying_angel
 name Retributioner
 race angel
 face retributioner.x11
+magicmap black
 randomitems angel
 monster 1
 move_type walk fly_low
@@ -38,7 +39,6 @@ can_use_shield 1
 can_use_armour 1
 can_use_weapon 1
 can_use_ring 1
-color_fg black
 body_skill 1
 body_torso 1
 body_head 1