Merge branch 'jesusalva/python' into 'master'

Cupid's Love (client-side)

See merge request evol/clientdata!144

6 files changed, 25 insertions, 2 deletions

diff --git a/LICENSE b/LICENSE
index 35ae52e4..ebec9486 100644
--- a/LICENSE
+++ b/LICENSE
@@ -415,6 +415,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/particles/sparkles.png (Crush)                                 (CC BY-SA 3.0)        (-)
     graphics/particles/star-medium.png (Crush)                              (CC BY-SA 3.0)        (-)
     graphics/particles/star-small.png (Crush)                               (CC BY-SA 3.0)        (-)
+    graphics/particles/python.png (LEGACY)                                  (GUMI)                (-)
     graphics/particles/training-arrow.png (Alige, Crush)                    (CC BY-SA 3.0)        (Reid)
     graphics/particles/zzz.png (Reid)                                       (CC BY-SA 3.0)        (Alige, Hal9000)
 
@@ -1053,6 +1054,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Scythe
     sfx/weapons/scythe/hit1.ogg (LEGACY)                                    (CC BY-SA 3.0)        (Micksha)
     sfx/weapons/scythe/miss1.ogg (Cosmostrator)                             (CC BY-SA 3.0)        (Socapex)
+## Env
+    sfx/env/fart.ogg (LEGACY)                                               (GUMI)                (-)
 
 # /
     palette.gpl (Reid)                                                      (CC BY-SA 3.0)        (-)
diff --git a/effects.xml b/effects.xml
index c8dd04f1..ace91900 100644
--- a/effects.xml
+++ b/effects.xml
@@ -43,6 +43,7 @@ Copyright (C) 2010-2014 Evol Online -->
     <effect id="37" particle="graphics/particles/lightning1.xml"/>
     <effect id="38" particle="graphics/particles/magic.black.xml"/>
     <effect id="39" particle="graphics/particles/electricity.blue.xml"/>
+    <effect id="69" particle="graphics/particles/python.xml" audio="env/fart.ogg"/>
     <effect id="344"/> <!-- @summon GM command particle effect. -->
 
     <!-- known server special effects
diff --git a/graphics/particles/python.png b/graphics/particles/python.png
new file mode 100644
index 00000000..a66b2e8b
--- /dev/null
+++ b/graphics/particles/python.png
diff --git a/graphics/particles/python.xml b/graphics/particles/python.xml
new file mode 100644
index 00000000..35c28b1e
--- /dev/null
+++ b/graphics/particles/python.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- Author: Gumi
+Copyright (C) 2004-2020 The Mana World -->
+
+<effect>
+    <particle
+            position-x="0"
+            position-y="0"
+            position-z="270"
+            lifetime="300">
+        <animation
+                imageset="graphics/particles/python.png"
+                width="512"
+                height="512">
+            <sequence start="0" end="8" delay="40"/>
+            <frame index="8"/>
+        </animation>
+    </particle>
+</effect>
diff --git a/maps/sec_pri.tmx b/maps/sec_pri.tmx
index 44ff32af..f0e58e67 100644
--- a/maps/sec_pri.tmx
+++ b/maps/sec_pri.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="68" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="18" nextobjectid="1">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="68" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="18" nextobjectid="1">
  <properties>
   <property name="author" value="kytty"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -856,7 +856,7 @@
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,1239,1239,1242,0,1242,1239,1242,0,1242,1239,1242,0,1242,1239,1239,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,1239,0,0,1242,1239,0,0,1242,1239,0,0,1242,1239,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
-1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,1242,1242,0,1239,0,0,0,1239,0,0,0,1239,0,0,0,1239,0,1242,1242,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
+1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,1242,1242,0,1239,0,0,0,1239,0,0,0,1239,0,0,0,1239,0,1242,1242,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1242,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,1239,1239,0,1239,0,0,0,1239,0,0,0,1239,0,0,0,1239,0,1239,1239,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,1239,0,0,0,1239,0,0,0,1239,0,0,0,1239,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
 1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,
diff --git a/sfx/env/fart.ogg b/sfx/env/fart.ogg
new file mode 100644
index 00000000..ff71ee27
--- /dev/null
+++ b/sfx/env/fart.ogg