Merge branch 'icons' into 'master'

icon offset fixes and outlines

See merge request legacy/clientdata!474

25 files changed, 100 insertions, 53 deletions

diff --git a/graphics/particles/hex-facet-outline-50.png b/graphics/particles/hex-facet-outline-50.png
new file mode 100644
index 00000000..711f6828
--- /dev/null
+++ b/graphics/particles/hex-facet-outline-50.png
diff --git a/graphics/particles/hex-facet-outline.png b/graphics/particles/hex-facet-outline.png
new file mode 100644
index 00000000..c68dd9e2
--- /dev/null
+++ b/graphics/particles/hex-facet-outline.png
diff --git a/graphics/sprites/icons/feather-outline.png b/graphics/sprites/icons/feather-outline.png
new file mode 100644
index 00000000..47eeb709
--- /dev/null
+++ b/graphics/sprites/icons/feather-outline.png
diff --git a/graphics/sprites/icons/feather.xml b/graphics/sprites/icons/feather.xml
index 010e25c4..6926a782 100644
--- a/graphics/sprites/icons/feather.xml
+++ b/graphics/sprites/icons/feather.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/feather.png" width="13" height="20"/>
+  <imageset name="base" src="graphics/sprites/icons/feather-outline.png" width="15" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12" delay="100"/>
+      <frame index="0" offsetY="-9" delay="100"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/green-barrier.xml b/graphics/sprites/icons/green-barrier.xml
index 0e74d763..68cbc8f9 100644
--- a/graphics/sprites/icons/green-barrier.xml
+++ b/graphics/sprites/icons/green-barrier.xml
@@ -3,7 +3,7 @@
   <imageset name="base" src="graphics/sprites/icons/green-barrier.png" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12" delay="0"/>
+      <frame index="0" offsetY="-9" delay="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/haste-potion.xml b/graphics/sprites/icons/haste-potion.xml
index 887d1b91..67c159dd 100644
--- a/graphics/sprites/icons/haste-potion.xml
+++ b/graphics/sprites/icons/haste-potion.xml
@@ -3,10 +3,10 @@
   <imageset name="base" src="graphics/sprites/icons/potion-c.png|G" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12" delay="100"/>
-      <frame index="1" offsetY="-12" delay="100"/>
-      <frame index="2" offsetY="-12" delay="100"/>
-      <frame index="3" offsetY="-12" delay="100"/>
+      <frame index="0" offsetY="-9" delay="100"/>
+      <frame index="1" offsetY="-9" delay="100"/>
+      <frame index="2" offsetY="-9" delay="100"/>
+      <frame index="3" offsetY="-9" delay="100"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/healing.png b/graphics/sprites/icons/healing.png
new file mode 100644
index 00000000..dfc6b804
--- /dev/null
+++ b/graphics/sprites/icons/healing.png
diff --git a/graphics/sprites/icons/healing.xml b/graphics/sprites/icons/healing.xml
new file mode 100644
index 00000000..d05f95fb
--- /dev/null
+++ b/graphics/sprites/icons/healing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2011-2012 Evol Online -->
+
+<sprite>
+    <imageset name="icon"
+              src="graphics/sprites/icons/healing.png"
+              width="14"
+              height="15"
+              offsetY="-11"/>
+
+    <action name="default" imageset="icon">
+        <animation direction="default">
+            <sequence start="0" end="2" delay="100"/>
+            <frame index="1" delay="100"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/icons/hidden-outline.png b/graphics/sprites/icons/hidden-outline.png
new file mode 100644
index 00000000..f1011b7c
--- /dev/null
+++ b/graphics/sprites/icons/hidden-outline.png
diff --git a/graphics/sprites/icons/hidden.xml b/graphics/sprites/icons/hidden.xml
index e2b8f1d9..a528c3d4 100644
--- a/graphics/sprites/icons/hidden.xml
+++ b/graphics/sprites/icons/hidden.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/hidden.png" width="12" height="12"/>
+  <imageset name="base" src="graphics/sprites/icons/hidden-outline.png" width="12" height="11"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="15" delay="0"/>
+      <frame index="0" offsetY="-12" delay="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/invisible-outline.png b/graphics/sprites/icons/invisible-outline.png
new file mode 100644
index 00000000..f40f4b2c
--- /dev/null
+++ b/graphics/sprites/icons/invisible-outline.png
diff --git a/graphics/sprites/icons/invisible.xml b/graphics/sprites/icons/invisible.xml
index cbb4d0cd..1367408a 100644
--- a/graphics/sprites/icons/invisible.xml
+++ b/graphics/sprites/icons/invisible.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/invisible.png" width="16" height="24"/>
+  <imageset name="base" src="graphics/sprites/icons/invisible-outline.png" width="16" height="24"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-10" delay="2000"/>
-      <frame index="1" offsetY="-10" delay="100"/>
-      <frame index="2" offsetY="-10" delay="100"/>
-      <frame index="3" offsetY="-10" delay="100"/>
-      <frame index="4" offsetY="-10" delay="100"/>
-      <frame index="0" offsetY="-10" delay="5000"/>
-      <frame index="1" offsetY="-10" delay="100"/>
-      <frame index="2" offsetY="-10" delay="100"/>
-      <frame index="3" offsetY="-10" delay="100"/>
-      <frame index="4" offsetY="-10" delay="100"/>
-      <frame index="0" offsetY="-10" delay="3000"/>
-      <frame index="7" offsetY="-10" delay="500"/>
-      <frame index="0" offsetY="-10" delay="3000"/>
-      <frame index="5" offsetY="-10" delay="50"/>
-      <frame index="6" offsetY="-10" delay="50"/>
-      <frame index="5" offsetY="-10" delay="50"/>
-      <frame index="6" offsetY="-10" delay="50"/>
-      <frame index="5" offsetY="-10" delay="50"/>
-      <frame index="6" offsetY="-10" delay="50"/>
-      <frame index="5" offsetY="-10" delay="50"/>
-      <frame index="6" offsetY="-10" delay="50"/>
-      <frame index="5" offsetY="-10" delay="50"/>
-      <frame index="6" offsetY="-10" delay="50"/>
-      <frame index="0" offsetY="-10" delay="3000"/>
-      <frame index="7" offsetY="-10" delay="300"/>
-      <frame index="0" offsetY="-10" delay="5000"/>
-      <frame index="7" offsetY="-10" delay="200"/>
+      <frame index="0" offsetY="-6" delay="2000"/>
+      <frame index="1" offsetY="-6" delay="100"/>
+      <frame index="2" offsetY="-6" delay="100"/>
+      <frame index="3" offsetY="-6" delay="100"/>
+      <frame index="4" offsetY="-6" delay="100"/>
+      <frame index="0" offsetY="-6" delay="5000"/>
+      <frame index="1" offsetY="-6" delay="100"/>
+      <frame index="2" offsetY="-6" delay="100"/>
+      <frame index="3" offsetY="-6" delay="100"/>
+      <frame index="4" offsetY="-6" delay="100"/>
+      <frame index="0" offsetY="-6" delay="3000"/>
+      <frame index="7" offsetY="-6" delay="500"/>
+      <frame index="0" offsetY="-6" delay="3000"/>
+      <frame index="5" offsetY="-6" delay="50"/>
+      <frame index="6" offsetY="-6" delay="50"/>
+      <frame index="5" offsetY="-6" delay="50"/>
+      <frame index="6" offsetY="-6" delay="50"/>
+      <frame index="5" offsetY="-6" delay="50"/>
+      <frame index="6" offsetY="-6" delay="50"/>
+      <frame index="5" offsetY="-6" delay="50"/>
+      <frame index="6" offsetY="-6" delay="50"/>
+      <frame index="5" offsetY="-6" delay="50"/>
+      <frame index="6" offsetY="-6" delay="50"/>
+      <frame index="0" offsetY="-6" delay="3000"/>
+      <frame index="7" offsetY="-6" delay="300"/>
+      <frame index="0" offsetY="-6" delay="5000"/>
+      <frame index="7" offsetY="-6" delay="200"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/iron-potion.xml b/graphics/sprites/icons/iron-potion.xml
index 2d34a4d0..7fcfc80d 100644
--- a/graphics/sprites/icons/iron-potion.xml
+++ b/graphics/sprites/icons/iron-potion.xml
@@ -3,7 +3,7 @@
   <imageset name="base" src="graphics/sprites/icons/potion-b.png|G" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12"/>
+      <frame index="0" offsetY="-9"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/red-rotating-hex.xml b/graphics/sprites/icons/red-rotating-hex.xml
index 107b16be..bb23b77b 100644
--- a/graphics/sprites/icons/red-rotating-hex.xml
+++ b/graphics/sprites/icons/red-rotating-hex.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/particles/hex-facet-50.png|W" width="9" height="11"/>
+  <imageset name="base" src="graphics/particles/hex-facet-outline.png|W" width="11" height="13"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="1" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="2" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="3" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="4" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="5" offsetX="-3" offsetY="-16" delay="120"/>
-      <frame index="6" offsetX="-2" offsetY="-16" delay="120"/>
-      <frame index="7" offsetX="-2" offsetY="-16" delay="120"/>
+      <frame index="0" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="1" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="2" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="3" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="4" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="5" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="6" offsetX="-2" offsetY="-12" delay="120"/>
+      <frame index="7" offsetX="-2" offsetY="-12" delay="120"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/spell-attack-generic-outline.png b/graphics/sprites/icons/spell-attack-generic-outline.png
new file mode 100644
index 00000000..a6232f87
--- /dev/null
+++ b/graphics/sprites/icons/spell-attack-generic-outline.png
diff --git a/graphics/sprites/icons/spell-attack-generic.xml b/graphics/sprites/icons/spell-attack-generic.xml
index c4185bc5..3ce09dc7 100644
--- a/graphics/sprites/icons/spell-attack-generic.xml
+++ b/graphics/sprites/icons/spell-attack-generic.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/icons/spell-attack-generic.png" width="13" height="20"/>
+  <imageset name="base" src="graphics/sprites/icons/spell-attack-generic-outline.png" width="13" height="21"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12" delay="100"/>
+      <frame index="0" offsetY="-8" delay="100"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/spell-cooldown-outline.png b/graphics/sprites/icons/spell-cooldown-outline.png
new file mode 100644
index 00000000..bc16cb7b
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown.png b/graphics/sprites/icons/spell-cooldown.png
new file mode 100644
index 00000000..c34d1669
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown.png
diff --git a/graphics/sprites/icons/spell-cooldown.xml b/graphics/sprites/icons/spell-cooldown.xml
new file mode 100644
index 00000000..c9f5ff26
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/spell-cooldown-outline.png" width="13" height="21"/>
+  <action name="default" imageset="base">
+    <animation direction="default">
+      <frame index="0" offsetY="-8" delay="100"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/icons/spell-shearing.xml b/graphics/sprites/icons/spell-shearing.xml
index f2e73c75..fb0bc452 100644
--- a/graphics/sprites/icons/spell-shearing.xml
+++ b/graphics/sprites/icons/spell-shearing.xml
@@ -3,7 +3,7 @@
   <imageset name="base" src="graphics/sprites/icons/spell-shearing.png" width="13" height="20"/>
   <action name="default" imageset="base">
     <animation direction="default">
-      <frame index="0" offsetY="-12" delay="100"/>
+      <frame index="0" offsetY="-9" delay="100"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/icons/weight-big.png b/graphics/sprites/icons/weight-big.png
new file mode 100644
index 00000000..632c9d1f
--- /dev/null
+++ b/graphics/sprites/icons/weight-big.png
diff --git a/graphics/sprites/icons/weight-big.xml b/graphics/sprites/icons/weight-big.xml
new file mode 100644
index 00000000..c64f89fe
--- /dev/null
+++ b/graphics/sprites/icons/weight-big.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/weight-big.png" width="16" height="16"/>
+  <action name="default" imageset="base">
+    <animation direction="default">
+      <frame index="0" offsetY="-10" delay="500"/>
+      <frame index="0" offsetY="-11" delay="500"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/icons/weight-small.png b/graphics/sprites/icons/weight-small.png
new file mode 100644
index 00000000..c4a14281
--- /dev/null
+++ b/graphics/sprites/icons/weight-small.png
diff --git a/graphics/sprites/icons/weight-small.xml b/graphics/sprites/icons/weight-small.xml
new file mode 100644
index 00000000..acc9e77a
--- /dev/null
+++ b/graphics/sprites/icons/weight-small.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/weight-small.png" width="12" height="16"/>
+  <action name="default" imageset="base">
+    <animation direction="default">
+      <frame index="0" offsetY="-10" delay="500"/>
+      <frame index="0" offsetY="-11" delay="500"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/status-effects.xml b/status-effects.xml
index 92562369..b2e47a68 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <status-effects>
-  <status-effect name="item-healing" id="70" opt2="256" persistent-particle-effect="yes" particle="graphics/particles/circle.particle.xml"/>
+  <status-effect name="item-healing" id="70" opt2="256" icon="icons/healing.xml" persistent-particle-effect="yes" particle="graphics/particles/circle.particle.xml"/>
   <status-effect name="speed" id="37" opt2="32" icon="icons/haste-potion.xml|#da69e5,ffdaff" persistent-particle-effect="yes" particle="graphics/particles/pink-violent-glow.particle.xml"/>
   <status-effect name="strength" id="185" opt2="128" icon="icons/iron-potion.xml|#c05000,f0a000,f0f09f" persistent-particle-effect="yes" particle="graphics/particles/orange-violent-glow.particle.xml"/>
   <status-effect name="invisibility" id="4096" option="4096" icon="icons/invisible.xml" start-message="You are now invisible." end-message="You are no longer invisible." persistent-particle-effect="yes" particle="graphics/particles/sphere-white.particle.xml"/>
   <status-effect name="poison" id="132" opt2="1" icon="icons/poison.xml" persistent-particle-effect="yes" particle="graphics/particles/green-bubbles.particle.xml"/>
   <status-effect name="slow-poison" id="14" opt2="512" icon="icons/slow-poison.xml" persistent-particle-effect="yes" particle="graphics/particles/small-green-bubbles.particle.xml"/>
-  <status-effect name="weight 50%" id="35"/>
-  <status-effect name="weight 90%" id="36"/>
+  <status-effect name="weight 50%" id="35" icon="icons/weight-small.xml"/>
+  <status-effect name="weight 90%" id="36" icon="icons/weight-big.xml"/>
   <status-effect name="hide" id="194" option="64" icon="icons/hidden.xml"/>
   <status-effect name="halt-regenerate" id="195"/>
   <status-effect name="flying-backpack" id="196" icon="icons/feather.xml"/>