diff options
| author | Wushin <pasekei@gmail.com> | 2014-10-23 21:30:36 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-10-23 21:30:36 -0500 |
| commit | 7f59213d3a26aa301125bf85161e001bfb197711 (patch) | |
| tree | ec3497361f10b615182bd1af32a21de74314a778 | |
| parent | baa674c39fed0d1291888007e0284359d109c212 (diff) | |
| parent | 4d6f65a8454d5feb4606d12e94bbef2da8b92e16 (diff) | |
| download | clientdata-7f59213d3a26aa301125bf85161e001bfb197711.tar.gz clientdata-7f59213d3a26aa301125bf85161e001bfb197711.tar.bz2 clientdata-7f59213d3a26aa301125bf85161e001bfb197711.tar.xz clientdata-7f59213d3a26aa301125bf85161e001bfb197711.zip | |
Merge pull request #181 from mekolat/squeak
add bat squeak
| -rw-r--r-- | effects.xml | 1 | ||||
| -rw-r--r-- | items/generic/_include.xml | 1 | ||||
| -rw-r--r-- | items/usable/_include.xml | 1 | ||||
| -rw-r--r-- | items/usable/item3001_RubberBat.xml (renamed from items/generic/item3001_RubberBat.xml) | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/effects.xml b/effects.xml index 47bdeb3b..eba8ddf4 100644 --- a/effects.xml +++ b/effects.xml @@ -88,4 +88,5 @@ <effect id="401" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/> <!-- Add the data needed for the electricity boss battle. --> <effect id="402" audio="sfx/system/ship-bell2.ogg"/> + <effect id="403" audio="sfx/monsters/bat/bat-hit1.ogg"/> </being-effects> diff --git a/items/generic/_include.xml b/items/generic/_include.xml index 06ecbe01..2b387f8f 100644 --- a/items/generic/_include.xml +++ b/items/generic/_include.xml @@ -192,7 +192,6 @@ <include name="items/generic/item2258_PurpleCottonCloth.xml"/> <include name="items/generic/item2259_DarkGreenCottonCloth.xml"/> <include name="items/generic/item3000_JackOLantern.xml"/> - <include name="items/generic/item3001_RubberBat.xml"/> <include name="items/generic/item3002_RealisticBrain.xml"/> <include name="items/generic/item3003_JarofBlood.xml"/> <include name="items/generic/item3004_Tongue.xml"/> diff --git a/items/usable/_include.xml b/items/usable/_include.xml index 98efbb66..b35630ed 100644 --- a/items/usable/_include.xml +++ b/items/usable/_include.xml @@ -90,6 +90,7 @@ <include name="items/usable/item1258_Honey.xml"/> <include name="items/usable/item1280_Scissors.xml"/> <include name="items/usable/item1281_ShockSweet.xml"/> + <include name="items/usable/item3001_RubberBat.xml"/> <include name="items/usable/item3006_TonoriDelight.xml"/> <include name="items/usable/item3007_Marshmallow.xml"/> <include name="items/usable/item3009_JellySkull.xml"/> diff --git a/items/generic/item3001_RubberBat.xml b/items/usable/item3001_RubberBat.xml index 8e366d4c..f57acacb 100644 --- a/items/generic/item3001_RubberBat.xml +++ b/items/usable/item3001_RubberBat.xml @@ -6,5 +6,5 @@ <its:translateRule selector="//item/@effect" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <item id="3001" image="generic/rubberbat.png" name="Rubber Bat" description="Squeaks when you squeeze it." type="generic" weight="30"/> + <item id="3001" image="generic/rubberbat.png" name="Rubber Bat" description="Squeaks when you squeeze it." type="usable" weight="30"/> </items> |