Merge branch 'master' into 'github/fork/Ledmitz/punch_sfx'

# Conflicts:
#   items/racesprite/item-106_Undead.xml

9 files changed, 131 insertions, 0 deletions

diff --git a/graphics/sprites/equipment/shields/dragon.png b/graphics/sprites/equipment/shields/dragon.png
new file mode 100644
index 00000000..3f11c57a
--- /dev/null
+++ b/graphics/sprites/equipment/shields/dragon.png
diff --git a/graphics/sprites/equipment/shields/dragon.xml b/graphics/sprites/equipment/shields/dragon.xml
new file mode 100644
index 00000000..844e2efc
--- /dev/null
+++ b/graphics/sprites/equipment/shields/dragon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Jesusalva
+Copyright (C) 2018 TMW2: Moubootaur Legends -->
+<sprite>
+    <imageset name="shield"
+              src="graphics/sprites/equipment/shields/dragon.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/shields/standard.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/shields/leather.png b/graphics/sprites/equipment/shields/leather.png
new file mode 100644
index 00000000..54c2e5b4
--- /dev/null
+++ b/graphics/sprites/equipment/shields/leather.png
diff --git a/graphics/sprites/equipment/shields/leather.xml b/graphics/sprites/equipment/shields/leather.xml
new file mode 100644
index 00000000..9ee3b506
--- /dev/null
+++ b/graphics/sprites/equipment/shields/leather.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Jesusalva
+Copyright (C) 2018 TMW2: Moubootaur Legends -->
+<sprite>
+    <imageset name="shield"
+              src="graphics/sprites/equipment/shields/leather.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/shields/standard.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/shields/standard.xml b/graphics/sprites/equipment/shields/standard.xml
new file mode 100644
index 00000000..e7716eaa
--- /dev/null
+++ b/graphics/sprites/equipment/shields/standard.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<sprite>
+   <imageset name="shield" src="graphics/sprites/equipment/shields/dragon.png" width="64" height="64" />
+
+   <action name="default" imageset="shield">
+   </action>
+
+   <action name="stand" imageset="shield">
+      <animation direction="down">
+        <frame index="0" />
+      </animation>
+      <animation direction="left">
+        <frame index="18" />
+      </animation>
+      <animation direction="up">
+        <frame index="36" />
+      </animation>
+      <animation direction="right">
+        <frame index="54" />
+      </animation>
+   </action>
+
+   <action name="walk" imageset="shield">
+      <animation direction="down">
+         <sequence start="1" end="6" delay="75" />
+      </animation>
+      <animation direction="left">
+         <sequence start="19" end="24" delay="75" />
+      </animation>
+      <animation direction="up">
+         <sequence start="37" end="42" delay="75" />
+      </animation>
+      <animation direction="right">
+         <sequence start="55" end="60" delay="75" />
+      </animation>
+   </action>
+
+   <action name="sit" imageset="shield">
+      <animation direction="down">
+        <frame index="7" />
+      </animation>
+      <animation direction="left">
+        <frame index="25" />
+      </animation>
+      <animation direction="up">
+        <frame index="43" />
+      </animation>
+      <animation direction="right">
+        <frame index="61" />
+      </animation>
+   </action>
+
+   <action name="dead" imageset="shield">
+      <animation direction="down">
+        <frame index="8" offsetX ="0" offsetY ="32" />
+      </animation>
+      <animation direction="left">
+        <frame index="8" offsetX ="0" offsetY ="32" />
+      </animation>
+      <animation direction="up">
+        <frame index="8" offsetX ="0" offsetY ="32" />
+      </animation>
+      <animation direction="right">
+        <frame index="8" offsetX ="0" offsetY ="32" />
+      </animation>
+   </action>
+
+   <action name="attack" imageset="shield">
+      <animation direction="down">
+         <sequence start="9" end="12" delay="75" />
+           <end />
+      </animation>
+      <animation direction="left">
+         <sequence start="27" end="30" delay="75" />
+           <end />
+      </animation>
+      <animation direction="up">
+         <sequence start="45" end="48" delay="75" />
+           <end />
+      </animation>
+      <animation direction="right">
+         <sequence start="63" end="66" delay="75" />
+           <end />
+      </animation>
+   </action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/shields/steel.png b/graphics/sprites/equipment/shields/steel.png
new file mode 100644
index 00000000..696307fd
--- /dev/null
+++ b/graphics/sprites/equipment/shields/steel.png
diff --git a/graphics/sprites/equipment/shields/steel.xml b/graphics/sprites/equipment/shields/steel.xml
new file mode 100644
index 00000000..19d7a9a5
--- /dev/null
+++ b/graphics/sprites/equipment/shields/steel.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Jesusalva
+Copyright (C) 2018 TMW2: Moubootaur Legends -->
+<sprite>
+    <imageset name="shield"
+              src="graphics/sprites/equipment/shields/steel.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/shields/standard.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/shields/wooden.png b/graphics/sprites/equipment/shields/wooden.png
new file mode 100644
index 00000000..0958c470
--- /dev/null
+++ b/graphics/sprites/equipment/shields/wooden.png
diff --git a/graphics/sprites/equipment/shields/wooden.xml b/graphics/sprites/equipment/shields/wooden.xml
new file mode 100644
index 00000000..e79b8397
--- /dev/null
+++ b/graphics/sprites/equipment/shields/wooden.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Jesusalva
+Copyright (C) 2018 TMW2: Moubootaur Legends -->
+<sprite>
+    <imageset name="shield"
+              src="graphics/sprites/equipment/shields/wooden.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/shields/standard.xml"/>
+</sprite>