Merge branch 'icons' into 'master'

mana guardian/tyrant, kaflosh and frillyar status symbols

See merge request legacy/clientdata!477

11 files changed, 41 insertions, 0 deletions

diff --git a/graphics/sprites/icons/spell-cooldown-ar-outline.png b/graphics/sprites/icons/spell-cooldown-ar-outline.png
new file mode 100644
index 00000000..5441acd9
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-ar-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-ar.png b/graphics/sprites/icons/spell-cooldown-ar.png
new file mode 100644
index 00000000..04058e16
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-ar.png
diff --git a/graphics/sprites/icons/spell-cooldown-ar.xml b/graphics/sprites/icons/spell-cooldown-ar.xml
new file mode 100644
index 00000000..58c16b4d
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-ar.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/spell-cooldown-ar-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-cooldown-mg.png b/graphics/sprites/icons/spell-cooldown-mg.png
new file mode 100644
index 00000000..31e46a53
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-mg.png
diff --git a/graphics/sprites/icons/spell-cooldown-mg.xml b/graphics/sprites/icons/spell-cooldown-mg.xml
new file mode 100644
index 00000000..f4282793
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-mg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/spell-cooldown-mg.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-cooldown-mt.png b/graphics/sprites/icons/spell-cooldown-mt.png
new file mode 100644
index 00000000..84fe8322
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-mt.png
diff --git a/graphics/sprites/icons/spell-cooldown-mt.xml b/graphics/sprites/icons/spell-cooldown-mt.xml
new file mode 100644
index 00000000..87b8ef2e
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-mt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/spell-cooldown-mt.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-cooldown-r-outline.png b/graphics/sprites/icons/spell-cooldown-r-outline.png
new file mode 100644
index 00000000..af56eda5
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-r-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-r.png b/graphics/sprites/icons/spell-cooldown-r.png
new file mode 100644
index 00000000..67555ebf
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-r.png
diff --git a/graphics/sprites/icons/spell-cooldown-r.xml b/graphics/sprites/icons/spell-cooldown-r.xml
new file mode 100644
index 00000000..f0a7f6e7
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-r.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/icons/spell-cooldown-r-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/status-effects.xml b/status-effects.xml
index b2e47a68..a928a4ad 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -18,4 +18,9 @@
   <status-effect name="spell-shearing" id="2001" icon="icons/spell-shearing.xml"/>
   <status-effect name="spell-protection-generic" id="2002" icon="icons/spell-protection-generic.xml"/>
   <status-effect name="spell-haste" id="2003" icon="icons/spell-haste.xml"/>
+  <status-effect name="spell-cooldown" id="71" icon="icons/spell-cooldown.xml"/>
+  <status-effect name="spell-cooldown-mg" id="72" icon="icons/spell-cooldown-mg.xml"/>
+  <status-effect name="spell-cooldown-mt" id="73" icon="icons/spell-cooldown-mt.xml"/>
+  <status-effect name="spell-cooldown-r" id="74" icon="icons/spell-cooldown-r.xml"/>
+  <status-effect name="spell-cooldown-ar" id="75" icon="icons/spell-cooldown-ar.xml"/>
 </status-effects>