Merge branch 'moubi' into 'master'

add moubi to 008-1 and 008-1-1

See merge request evol/clientdata!150

10 files changed, 104 insertions, 7 deletions

diff --git a/LICENSE b/LICENSE
index 9e5681a2..c658c5a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -621,6 +621,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/monsters/mana-bug.png (Meway)                          (CC BY-SA 3.0,GPLv2)  (Micksha)
     graphics/sprites/monsters/mana-ghost.png (LEGACY)                       (GPLv2)               (-)
     graphics/sprites/monsters/mananatree.png (Len, Saphy)                   (CC BY-SA 3.0)        (Reid)
+    graphics/sprites/monsters/moubi.png (Yuuki)                             (GPLv2)               (Hocus, Reid)
     graphics/sprites/monsters/mouboo.png (Yuuki)                            (GPLv2)               (Reid)
     graphics/sprites/monsters/mushroom-spiky.png (LEGACY)                   (GPLv2)               (Micksha)
     graphics/sprites/monsters/mushroom-wicked.png (LEGACY)                  (GPLv2)               (Micksha)
diff --git a/graphics/sprites/emote.png b/graphics/sprites/emote.png
index 91babc8c..b0a2a839 100644
--- a/graphics/sprites/emote.png
+++ b/graphics/sprites/emote.png
diff --git a/graphics/sprites/monsters/moubi.png b/graphics/sprites/monsters/moubi.png
new file mode 100644
index 00000000..6a86ff21
--- /dev/null
+++ b/graphics/sprites/monsters/moubi.png
diff --git a/graphics/sprites/monsters/moubi.xml b/graphics/sprites/monsters/moubi.xml
new file mode 100644
index 00000000..9a051d20
--- /dev/null
+++ b/graphics/sprites/monsters/moubi.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!-- Authors: Micksha, Reid, Yuuki
+Copyright (C) 2016-2020 Evol Online -->
+
+<sprite>
+    <imageset name="mob"
+              src="graphics/sprites/monsters/moubi.png"
+              width="80"
+              height="80"/>
+
+    <action name="stand" imageset="mob">
+        <animation direction="down">
+            <frame index="0"/>
+        </animation>
+        <animation direction="left">
+            <frame index="15"/>
+        </animation>
+        <animation direction="up">
+            <frame index="30"/>
+        </animation>
+        <animation direction="right">
+            <frame index="45"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="mob">
+        <animation direction="down">
+            <sequence start="1" end="6" delay="75"/>
+        </animation>
+        <animation direction="left">
+            <sequence start="16" end="21" delay="75"/>
+        </animation>
+        <animation direction="up">
+            <sequence start="31" end="36" delay="75"/>
+        </animation>
+        <animation direction="right">
+            <sequence start="46" end="51" delay="75"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="mob">
+        <animation direction="down">
+            <sequence start="7" end="13" delay="75"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <sequence start="22" end="28" delay="75"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <sequence start="37" end="43" delay="75"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <sequence start="52" end="58" delay="75"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="mob">
+        <animation>
+            <frame index="14" delay="150"/>
+            <frame index="29" delay="150"/>
+            <frame index="44" delay="150"/>
+            <frame index="59" delay="5150"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy.png b/graphics/sprites/npcs/sprite/unanimated-legacy.png
index cd419199..f618ca6e 100644
--- a/graphics/sprites/npcs/sprite/unanimated-legacy.png
+++ b/graphics/sprites/npcs/sprite/unanimated-legacy.png
diff --git a/graphics/sprites/npcs/xml/unanimated-legacy.xml b/graphics/sprites/npcs/xml/unanimated-legacy.xml
index 5e560fec..c9fd06f0 100644
--- a/graphics/sprites/npcs/xml/unanimated-legacy.xml
+++ b/graphics/sprites/npcs/xml/unanimated-legacy.xml
@@ -2,7 +2,7 @@
 <!-- Author: Reid, Micksha
 Copyright (C) 2018 Evol Online -->
 
-<sprite variants="41" variant_offset="1">
+<sprite variants="42" variant_offset="1">
     <imageset name="npc"
               src="graphics/sprites/npcs/sprite/unanimated-legacy.png|S"
               width="64"
diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx
index 7633f18a..4ffd236d 100644
--- a/maps/008-1-1.tmx
+++ b/maps/008-1-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="88">
+<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="89">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -2657,7 +2657,7 @@
    </properties>
   </object>
   <object id="80" name="^WEST|PORT" type="anchor" x="1664" y="1920" width="32" height="32"/>
-  <object id="81" name="Butterfly" type="spawn" x="4032" y="2304" width="736" height="1088">
+  <object id="81" name="Butterfly" type="spawn" x="4032" y="2240" width="736" height="1088">
    <properties>
     <property name="death" value="10000"/>
     <property name="max_beings" value="8"/>
@@ -2712,5 +2712,13 @@
     <property name="dest_y" value="32"/>
    </properties>
   </object>
+  <object id="88" name="Moubi" type="spawn" x="3712" y="1792" width="2912" height="736">
+   <properties>
+    <property name="death" value="125000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1072"/>
+    <property name="spawn" value="20000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index db912421..e9a5d542 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="27" nextobjectid="226">
+<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="27" nextobjectid="227">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -3505,14 +3505,18 @@
     <property name="dest_y" value="34"/>
    </properties>
   </object>
-  <object id="97" name="To North Mine" type="warp" x="7968" y="704" width="64" height="32">
+  <object id="97" name="To North Mine" type="warp" x="7968" y="736" width="64" height="32">
    <properties>
-    <property name="ignore" value="this"/>
+    <property name="dest_map" value="008-3-4"/>
+    <property name="dest_x" value="88"/>
+    <property name="dest_y" value="76"/>
    </properties>
   </object>
   <object id="98" name="To Obelisk Cave" type="warp" x="9056" y="832" width="32" height="32">
    <properties>
-    <property name="ignore" value="this"/>
+    <property name="dest_map" value="008-3-3"/>
+    <property name="dest_x" value="37"/>
+    <property name="dest_y" value="56"/>
    </properties>
   </object>
   <object id="134" name="^FARM|MOUB" type="anchor" x="2272" y="4128" width="32" height="32"/>
@@ -4095,5 +4099,13 @@
     <property name="dest_y" value="48"/>
    </properties>
   </object>
+  <object id="226" name="Moubi" type="spawn" x="2624" y="3520" width="480" height="416">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1072"/>
+    <property name="spawn" value="30000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/monsters.xml b/monsters.xml
index 18b08566..afe64ffe 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -411,6 +411,9 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     <monster id="1071" name="Coal Veinbloc" targetCursor="small">
         <sprite>monsters/veinbloc-coal.xml</sprite>
     </monster>
+    <monster id="1072" name="Moubi" walkType="walk" targetCursor="small">
+        <sprite>monsters/moubi.xml</sprite>
+    </monster>
     <monster id="1100" name="Poison Skull" walkType="fly" targetCursor="small">
         <sprite>monsters/skull-poison.xml</sprite>
     </monster>
diff --git a/npcs.xml b/npcs.xml
index 062df999..131dca0f 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -558,6 +558,11 @@ IDs 900-999 = Special
         <sprite variant="34">npcs/xml/unanimated-legacy.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+    <npc id="209">
+        <!-- Woodland Wedding Officinator.  -->
+        <sprite variant="42">npcs/xml/unanimated-legacy.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Animated NPCs -->