Merge branch 'DarkDuck' into 'master'

Add DarkDuck clientdata

See merge request TMW2/clientdata!79

5 files changed, 77 insertions, 7 deletions

diff --git a/LICENSE b/LICENSE
index 182f1097..610341fa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1794,6 +1794,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/sprites/monsters/yetifly.png (Saulc)                           (GPLv2)                 (Bcs86, Hkurn, Skipy) 
 	graphics/sprites/monsters/yetiking.png (Saulc)                          (GPLv2)                 (Bcs86, Hkurn, Skipy) 
 	graphics/sprites/monsters/zombie.png (FotherJ)                          (CC BY-SA 3.0)          (-)
+	graphics/sprites/monsters/darkduck.png (Meway, ?)                       (CC BY-SA 3.0)          (TMW-Br, dangerDuck)
 
 #### Accessories
 	graphics/sprites/monsters/accessories/banditbow.png (?)                 (GPLv2)                 (jesusalva)
diff --git a/graphics/sprites/monsters/darkduck.png b/graphics/sprites/monsters/darkduck.png
new file mode 100644
index 00000000..38881433
--- /dev/null
+++ b/graphics/sprites/monsters/darkduck.png
diff --git a/graphics/sprites/monsters/darkduck.xml b/graphics/sprites/monsters/darkduck.xml
new file mode 100644
index 00000000..1d378113
--- /dev/null
+++ b/graphics/sprites/monsters/darkduck.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/darkduck.png|W;M;R;G;C;B" width="48" height="26"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="10"/>
+    </animation>
+    <animation direction="up">
+      <frame index="20"/>
+    </animation>
+    <animation direction="right">
+      <frame index="30"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="1" end="3" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="11" end="13" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="21" end="23" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="31" end="33" delay="75"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="down">
+      <frame index="9"/>
+    </animation>
+    <animation direction="left">
+      <frame index="19"/>
+    </animation>
+    <animation direction="up">
+      <frame index="29"/>
+    </animation>
+    <animation direction="right">
+      <frame index="39"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="5" end="8" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="15" end="18" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="25" end="28" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="35" end="38" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index 6390a249..dcfedab1 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1288,6 +1288,14 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
         <sprite>monsters/slime-mother.xml|#ae6244,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	</monster>
+	<monster id="1248" name="Dark Duck" targetCursor="medium" walkType="walkswim">
+		<sprite>monsters/darkduck.xml</sprite>
+		<sound event="hit">weapons/lightsaber/hit1.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit2.ogg</sound>
+		<sound event="hit">weapons/lightsaber/hit3.ogg</sound>
+		<sound event="hit">weapons/lightsaber/crit.ogg</sound>
+		<sound event="miss">weapons/lightsaber/miss.ogg</sound>
+	</monster>
 
   <!-- RESERVED -->
   <monster id="1493" name="Game Master">
diff --git a/quests.xml b/quests.xml
index 7f80dd5c..9fd3e542 100644
--- a/quests.xml
+++ b/quests.xml
@@ -2436,14 +2436,11 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 		</quest>
 		<quest name="Pirate of S.A.R.A.H" group="Lilit" complete="4">
 			<name>Pirates of S.A.R.A.H.</name>
-			<text>The tritans have been defeated.</text>
-			<text>Unsurprisingly, S.A.R.A.H. was behind the attack.</text>
+			<text>The tritans have been defeated and I have been initiated into the Duck Side.</text>
+			<text>The Elder has granted me permission to use Duck Dungeon, a sort of training grounds.</text>
 			<text></text>
-			<text>The ducks are quite grateful for my help.</text>
-			<text>Even so, Duck Island is in ruins.</text>
-			<text></text>
-			<text>My work is not done yet...</text>
-			<text>the Elder mentioned something about 'replanting' the island.</text>
+			<text>Yet something doesn't quite feel right...</text>
+			<text>Who are the ducks, really?</text>
 			<text></text>
 			<questgiver>Elder</questgiver>
 			<coordinates x="28" y="73">Duck Island.</coordinates>