summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/monsters/bunny.pngbin35990 -> 0 bytes
-rw-r--r--graphics/sprites/monsters/bunny.xml76
-rw-r--r--items/equip-torso/item5103_LightBlueSorcererRobeWhite.xml2
-rw-r--r--license.txt3
-rw-r--r--maps/046-3.tmx2
5 files changed, 3 insertions, 80 deletions
diff --git a/graphics/sprites/monsters/bunny.png b/graphics/sprites/monsters/bunny.png
deleted file mode 100644
index 98f3eaca..00000000
--- a/graphics/sprites/monsters/bunny.png
+++ /dev/null
Binary files differ
diff --git a/graphics/sprites/monsters/bunny.xml b/graphics/sprites/monsters/bunny.xml
deleted file mode 100644
index 7bca032e..00000000
--- a/graphics/sprites/monsters/bunny.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
- <imageset name="base" src="graphics/sprites/monsters/bunny.png|W" width="60" height="60"/>
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="33" delay="100" offsetY="10"/>
- <frame index="34" delay="100" offsetY="10"/>
- <frame index="33" delay="100" offsetY="10"/>
- <frame index="35" delay="100" offsetY="10"/>
- </animation>
- <animation direction="left">
- <frame index="0" delay="100" offsetY="10"/>
- <frame index="1" delay="100" offsetY="10"/>
- <frame index="0" delay="100" offsetY="10"/>
- <frame index="2" delay="100" offsetY="10"/>
- </animation>
- <animation direction="up">
- <frame index="22" delay="100" offsetY="10"/>
- <frame index="23" delay="100" offsetY="10"/>
- <frame index="22" delay="100" offsetY="10"/>
- <frame index="24" delay="100" offsetY="10"/>
- </animation>
- <animation direction="right">
- <frame index="11" delay="100" offsetY="10"/>
- <frame index="12" delay="100" offsetY="10"/>
- <frame index="11" delay="100" offsetY="10"/>
- <frame index="13" delay="100" offsetY="10"/>
- </animation>
- </action>
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="35" end="40" delay="100" offsetY="10"/>
- </animation>
- <animation direction="left">
- <sequence start="2" end="7" delay="100" offsetY="10"/>
- </animation>
- <animation direction="up">
- <sequence start="24" end="29" delay="100" offsetY="10"/>
- </animation>
- <animation direction="right">
- <sequence start="13" end="18" delay="100" offsetY="10"/>
- </animation>
- </action>
- <action name="dead" imageset="base">
- <animation direction="down">
- <frame index="43" delay="0" offsetY="10"/>
- </animation>
- <animation direction="left">
- <frame index="21" delay="0" offsetY="10"/>
- </animation>
- <animation direction="up">
- <frame index="32" delay="0" offsetY="10"/>
- </animation>
- <animation direction="right">
- <frame index="10" delay="0" offsetY="10"/>
- </animation>
- </action>
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="40" end="42" delay="100" offsetY="10"/>
- <end/>
- </animation>
- <animation direction="left">
- <sequence start="7" end="9" delay="100" offsetY="10"/>
- <end/>
- </animation>
- <animation direction="up">
- <sequence start="29" end="31" delay="100" offsetY="10"/>
- <end/>
- </animation>
- <animation direction="right">
- <sequence start="18" end="20" delay="100" offsetY="10"/>
- <end/>
- </animation>
- </action>
-</sprite>
diff --git a/items/equip-torso/item5103_LightBlueSorcererRobeWhite.xml b/items/equip-torso/item5103_LightBlueSorcererRobeWhite.xml
index 9c36c1b7..988f474e 100644
--- a/items/equip-torso/item5103_LightBlueSorcererRobeWhite.xml
+++ b/items/equip-torso/item5103_LightBlueSorcererRobeWhite.xml
@@ -6,7 +6,7 @@
<its:translateRule selector="//item/@effect" translate="yes"/>
<its:translateRule selector="//*" translate="no"/>
</its:rules>
- <item id="5103" image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc;R:#EFEFEF" name="Light Blue Sorcerer Robe (White)" description="A Dark Green lined Light Blue sorcerer robe." effect="M. Attack +20" type="equip-torso" defense="5" agi="1" weight="30" sellProtected="true">
+ <item id="5103" image="equipment/chest/sorcerer-robe.png|W:#16486e,498ec5,e4f2fc;R:#EFEFEF" name="Light Blue Sorcerer Robe (White)" description="A White lined Light Blue sorcerer robe." effect="M. Attack +20" type="equip-torso" defense="5" agi="1" weight="30" sellProtected="true">
<sprite gender="male">equipment/chest/sorcerer-robe-male.xml|#16486e,498ec5,e4f2fc;#EFEFEF</sprite>
<sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#16486e,498ec5,e4f2fc;#EFEFEF</sprite>
<replace sprite="pants">
diff --git a/license.txt b/license.txt
index 3db204b1..b9de10ed 100644
--- a/license.txt
+++ b/license.txt
@@ -224,7 +224,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/items/equipment/legs/assassinpants.png (Black Don) (GPLv2)
graphics/items/equipment/legs/bromenallegs.png (Skipy) (GPLv2)
graphics/items/equipment/legs/chaps.png (????) (GPLv2)
- graphics/items/equipment/legs/miniskirt.png (????) (GPLv2)
+ graphics/items/equipment/legs/miniskirt.png (jak1) (GPLv2)
graphics/items/equipment/legs/pants.png (Enchilado) (GPLv2), (CC BY-SA 3.0)
graphics/items/equipment/legs/shorts.png (????) (GPLv2)
graphics/items/equipment/legs/skirt.png (????) (GPLv2)
@@ -794,7 +794,6 @@ http://creativecommons.org/licenses/by-sa/3.0/
graphics/sprites/monsters/bat.png (neoriceisgood) (GPLv2)
graphics/sprites/monsters/bee.png (????) (GPLv2)
graphics/sprites/monsters/bluepar.png (Crush, Meway) (GPLv2), (CC BY-SA 3.0)
- graphics/sprites/monsters/bunny.png (pateame,Harufym) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/monsters/butterfly.png (Meway) (GPLv2), (CC BY-SA 3.0)
graphics/sprites/monsters/cave-maggot-giant.png (????, Neoriceisgood) (GPLv2)
graphics/sprites/monsters/cave-maggot.png (????, Neoriceisgood) (GPLv2)
diff --git a/maps/046-3.tmx b/maps/046-3.tmx
index 83373015..31a56678 100644
--- a/maps/046-3.tmx
+++ b/maps/046-3.tmx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" nextobjectid="22">
<properties>
- <property name="Name" value="Frosty Underground"/>
+ <property name="name" value="Frosty Underground"/>
<property name="music" value="explorers-melody.ogg"/>
</properties>
<tileset firstgid="1" source="../tilesets/collision.tsx"/>