Merge branch 'RubberBat' into 'master'

Rubber Bat

See merge request evol/clientdata!168

4 files changed, 6 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index 997e982c..783f18f9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1115,6 +1115,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     maps/jail.tmx (Kytty)                                                   (CC BY-SA 3.0)        (Micksha)
 
 # Sound Effects
+## Items
+### Rubber Bat
+    sfx/items/legacy/rubberbat.ogg (Cosmotrator)                            (GPL v2)              (-)
 ## Monsters
 ### Blub
     sfx/monsters/blub/die1.ogg (Cosmostrator)                               (CC BY-SA 3.0)        (Alige, Socapex)
diff --git a/effects.xml b/effects.xml
index ace91900..2cb98d8a 100644
--- a/effects.xml
+++ b/effects.xml
@@ -44,6 +44,7 @@ Copyright (C) 2010-2014 Evol Online -->
     <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="70" audio="items/legacy/rubberbat.ogg"/> <!-- Legacy Rubber Bat squeeze sound  -->
     <effect id="344"/> <!-- @summon GM command particle effect. -->
 
     <!-- known server special effects
diff --git a/items.xml b/items.xml
index 02f22db3..14c1d27a 100644
--- a/items.xml
+++ b/items.xml
@@ -3569,7 +3569,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="merge/rubberbat.png"
         name="Rubber Bat"
         description="Squeaks when you squeeze it."
-        type="generic"
+        useButton="Squeeze"
+        type="usable"
         weight="30"/>
    <item id="8028"
         image="merge/santacookie.png"
diff --git a/sfx/items/legacy/rubberbat.ogg b/sfx/items/legacy/rubberbat.ogg
new file mode 100644
index 00000000..3b28bb61
--- /dev/null
+++ b/sfx/items/legacy/rubberbat.ogg