From 37cc6e4af9d6530141fd9a31ffb2a47f50d4a7c7 Mon Sep 17 00:00:00 2001
From: gumi <mekolat@users.noreply.github.com>
Date: Wed, 18 Jan 2017 11:38:57 -0500
Subject: update blinking evil, add color variants

---
 graphics/items/equipment/head/blinkingevil.png   | Bin 464 -> 623 bytes
 graphics/sprites/equipment/head/blinkingevil.png | Bin 4866 -> 4972 bytes
 graphics/sprites/equipment/head/blinkingevil.xml | 157 +++++++++++++++++++++--
 items/equip-head/_include.xml                    |   4 +
 items/equip-head/item2270_BlinkingEvil.xml       |   4 +-
 items/equip-head/item2271_BlinkingEvilRed.xml    |  12 ++
 items/equip-head/item2272_BlinkingEvilBlue.xml   |  12 ++
 items/equip-head/item2273_BlinkingEvilPink.xml   |  12 ++
 items/equip-head/item2274_BlinkingEvilYellow.xml |  12 ++
 9 files changed, 200 insertions(+), 13 deletions(-)
 create mode 100644 items/equip-head/item2271_BlinkingEvilRed.xml
 create mode 100644 items/equip-head/item2272_BlinkingEvilBlue.xml
 create mode 100644 items/equip-head/item2273_BlinkingEvilPink.xml
 create mode 100644 items/equip-head/item2274_BlinkingEvilYellow.xml

diff --git a/graphics/items/equipment/head/blinkingevil.png b/graphics/items/equipment/head/blinkingevil.png
index 4a678e6e..387080ae 100644
Binary files a/graphics/items/equipment/head/blinkingevil.png and b/graphics/items/equipment/head/blinkingevil.png differ
diff --git a/graphics/sprites/equipment/head/blinkingevil.png b/graphics/sprites/equipment/head/blinkingevil.png
index c736fa83..76ec7b8f 100644
Binary files a/graphics/sprites/equipment/head/blinkingevil.png and b/graphics/sprites/equipment/head/blinkingevil.png differ
diff --git a/graphics/sprites/equipment/head/blinkingevil.xml b/graphics/sprites/equipment/head/blinkingevil.xml
index a202a50c..4c9b81b1 100644
--- a/graphics/sprites/equipment/head/blinkingevil.xml
+++ b/graphics/sprites/equipment/head/blinkingevil.xml
@@ -1,18 +1,39 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/blinkingevil.png" width="21" height="21"/>
+  <imageset name="base" src="graphics/sprites/equipment/head/blinkingevil.png|R" width="21" height="21"/>
   <action name="stand" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-35"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="2000"/>
+      <frame index="10" offsetX="-1" offsetY="-34" delay="75"/>
+      <frame index="11" offsetX="-2" offsetY="-34" delay="300"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="1500"/>
+      <frame index="11" offsetX="-2" offsetY="-34" delay="300"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="500"/>
+      <frame index="11" offsetX="-2" offsetY="-34" delay="350"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="1500"/>
+      <frame index="10" offsetX="-1" offsetY="-34" delay="3500"/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="-4" offsetY="-37"/>
+      <frame index="1" offsetX="-4" offsetY="-37" delay="1750"/>
+      <frame index="13" offsetX="-7" offsetY="-35" delay="100"/>
+      <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
+      <frame index="1" offsetX="-4" offsetY="-37" delay="1000"/>
+      <frame index="13" offsetX="-7" offsetY="-35" delay="150"/>
+      <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
+      <frame index="1" offsetX="-4" offsetY="-37" delay="2500"/>
+      <frame index="13" offsetX="-7" offsetY="-35" delay="100"/>
+      <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-35"/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="2" offsetY="-37"/>
+      <frame index="3" offsetX="2" offsetY="-37" delay="1750"/>
+      <frame index="12" offsetX="1" offsetY="-35" delay="150"/>
+      <frame index="3" offsetX="2" offsetY="-37" delay="300"/>
+      <frame index="12" offsetX="1" offsetY="-35" delay="150"/>
+      <frame index="3" offsetX="2" offsetY="-37" delay="1500"/>
+      <frame index="12" offsetX="1" offsetY="-35" delay="250"/>
     </animation>
   </action>
   <action name="walk" imageset="base">
@@ -73,14 +94,15 @@
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="225"/>
-      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-34" delay="225"/>
+      <frame index="16" offsetX="-2" offsetY="-31" delay="75"/>
+      <frame index="16" offsetX="-2" offsetY="-32" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="1" offsetX="3" offsetY="-29" delay="225"/>
-      <frame index="1" offsetX="5" offsetY="-30" delay="150"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="225"/>
+      <frame index="18" offsetX="-3" offsetY="-35" delay="75"/>
+      <frame index="18" offsetX="-3" offsetY="-35" delay="75"/>
       <end/>
     </animation>
     <animation direction="up">
@@ -90,8 +112,9 @@
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-29" delay="225"/>
-      <frame index="3" offsetX="-5" offsetY="-30" delay="150"/>
+      <frame index="3" offsetX="-1" offsetY="-36" delay="225"/>
+      <frame index="17" offsetX="-5" offsetY="-35" delay="75"/>
+      <frame index="17" offsetX="-5" offsetY="-35" delay="75"/>
       <end/>
     </animation>
   </action>
@@ -153,4 +176,116 @@
       <frame index="4" offsetX="17" offsetY="-13" delay="2500"/>
     </animation>
   </action>
+  <action name="attack_2hand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-34" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="16" offsetX="-2" offsetY="-35" delay="140"/>
+      <frame index="16" offsetX="-2" offsetY="-29" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-4" offsetY="-35" delay="140"/>
+      <frame index="1" offsetX="-1" offsetY="-37" delay="140"/>
+      <frame index="18" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="18" offsetX="-10" offsetY="-31" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="4" offsetY="-35" delay="140"/>
+      <frame index="3" offsetX="1" offsetY="-37" delay="140"/>
+      <frame index="17" offsetX="-3" offsetY="-37" delay="140"/>
+      <frame index="17" offsetX="2" offsetY="-32" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_sword_stab" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-36" delay="100"/>
+      <frame index="16" offsetX="-1" offsetY="-37" delay="100"/>
+      <frame index="0" offsetX="-1" offsetY="-34" delay="100"/>
+      <frame index="16" offsetX="-1" offsetY="-33" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-39" delay="100"/>
+      <frame index="18" offsetX="2" offsetY="-40" delay="100"/>
+      <frame index="1" offsetX="-2" offsetY="-37" delay="100"/>
+      <frame index="18" offsetX="-3" offsetY="-36" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY="-39" delay="100"/>
+      <frame index="17" offsetX="-2" offsetY="-40" delay="100"/>
+      <frame index="3" offsetX="1" offsetY="-37" delay="100"/>
+      <frame index="17" offsetX="2" offsetY="-36" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_spear" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
+      <frame index="16" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="16" offsetX="-2" offsetY="-33" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-39" delay="140"/>
+      <frame index="18" offsetX="4" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="18" offsetX="-3" offsetY="-36" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
+      <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
+      <frame index="17" offsetX="-3" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="2" offsetY="-41" delay="140"/>
+      <frame index="17" offsetX="4" offsetY="-36" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_chop" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
+      <frame index="16" offsetX="-2" offsetY="-37" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+      <frame index="16" offsetX="-1" offsetY="-34" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
+      <frame index="18" offsetX="2" offsetY="-40" delay="140"/>
+      <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
+      <frame index="18" offsetX="-3" offsetY="-37" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+      <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="17" offsetX="-1" offsetY="-40" delay="140"/>
+      <frame index="3" offsetX="0" offsetY="-41" delay="140"/>
+      <frame index="17" offsetX="4" offsetY="-37" delay="140"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index cd8c3c8f..ddc50d12 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -174,6 +174,10 @@
   <include name="items/equip-head/item2268_PurpleBeret.xml"/>
   <include name="items/equip-head/item2269_DarkGreenBeret.xml"/>
   <include name="items/equip-head/item2270_BlinkingEvil.xml"/>
+  <include name="items/equip-head/item2271_BlinkingEvilRed.xml"/>
+  <include name="items/equip-head/item2272_BlinkingEvilBlue.xml"/>
+  <include name="items/equip-head/item2273_BlinkingEvilPink.xml"/>
+  <include name="items/equip-head/item2274_BlinkingEvilYellow.xml"/>
   <include name="items/equip-head/item4020_CandleHelmet.xml"/>
   <include name="items/equip-head/item4027_YetiMask.xml"/>
   <include name="items/equip-head/item4028_WizardHat.xml"/>
diff --git a/items/equip-head/item2270_BlinkingEvil.xml b/items/equip-head/item2270_BlinkingEvil.xml
index 8d0856b1..3cd99b77 100644
--- a/items/equip-head/item2270_BlinkingEvil.xml
+++ b/items/equip-head/item2270_BlinkingEvil.xml
@@ -6,7 +6,7 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="2270" image="equipment/head/blinkingevil.png" name="Mask of Blinking Evil" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
-    <sprite gender="unisex">equipment/head/blinkingevil.xml</sprite>
+  <item id="2270" image="equipment/head/blinkingevil.png|W:#009900,00bf00,00d900,00ff00" name="Mask of Blinking Evil (Green)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+    <sprite gender="unisex">equipment/head/blinkingevil.xml|#009900,00bf00,00d900,00ff00</sprite>
   </item>
 </items>
diff --git a/items/equip-head/item2271_BlinkingEvilRed.xml b/items/equip-head/item2271_BlinkingEvilRed.xml
new file mode 100644
index 00000000..add5e296
--- /dev/null
+++ b/items/equip-head/item2271_BlinkingEvilRed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="2271" image="equipment/head/blinkingevil.png|W:#d90000,ff0000" name="Mask of Blinking Evil (Red)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+    <sprite gender="unisex">equipment/head/blinkingevil.xml</sprite>
+  </item>
+</items>
diff --git a/items/equip-head/item2272_BlinkingEvilBlue.xml b/items/equip-head/item2272_BlinkingEvilBlue.xml
new file mode 100644
index 00000000..3df7e241
--- /dev/null
+++ b/items/equip-head/item2272_BlinkingEvilBlue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="2272" image="equipment/head/blinkingevil.png|W:#002d99,0038be,0040da,004bff" name="Mask of Blinking Evil (Blue)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+    <sprite gender="unisex">equipment/head/blinkingevil.xml|#002d99,0038be,0040da,004bff</sprite>
+  </item>
+</items>
diff --git a/items/equip-head/item2273_BlinkingEvilPink.xml b/items/equip-head/item2273_BlinkingEvilPink.xml
new file mode 100644
index 00000000..ab6cbe35
--- /dev/null
+++ b/items/equip-head/item2273_BlinkingEvilPink.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="2273" image="equipment/head/blinkingevil.png|W:#bf2296,f245a7,ff6ea8,ff99bd" name="Mask of Blinking Evil (Pink)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+    <sprite gender="unisex">equipment/head/blinkingevil.xml|#bf2296,f245a7,ff6ea8,ff99bd</sprite>
+  </item>
+</items>
diff --git a/items/equip-head/item2274_BlinkingEvilYellow.xml b/items/equip-head/item2274_BlinkingEvilYellow.xml
new file mode 100644
index 00000000..0873dde2
--- /dev/null
+++ b/items/equip-head/item2274_BlinkingEvilYellow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="2274" image="equipment/head/blinkingevil.png|W:#b4b427,d2bb27,ffff00,f3ff32" name="Mask of Blinking Evil (Yellow)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+    <sprite gender="unisex">equipment/head/blinkingevil.xml|#b4b427,d2bb27,ffff00,f3ff32</sprite>
+  </item>
+</items>
-- 
cgit v1.2.3-60-g2f50