summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE6
-rw-r--r--graphics/items/usable/pets/cat-black.pngbin0 -> 377 bytes
-rw-r--r--graphics/items/usable/pets/cat.pngbin0 -> 365 bytes
-rw-r--r--graphics/items/usable/pets/dog.pngbin0 -> 784 bytes
-rw-r--r--graphics/items/usable/pets/ratte.pngbin0 -> 525 bytes
-rw-r--r--graphics/sprites/monsters/pet-black-cat.xml52
-rw-r--r--graphics/sprites/monsters/pet-cat.xml8
-rw-r--r--graphics/sprites/monsters/pet-dog.xml11
-rw-r--r--items.xml36
9 files changed, 48 insertions, 65 deletions
diff --git a/LICENSE b/LICENSE
index 627a58c3..2857f609 100644
--- a/LICENSE
+++ b/LICENSE
@@ -686,6 +686,12 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/usable/food/applecocktail.png (
graphics/items/usable/food/cactuscocktail.png
graphics/items/usable/food/cherrycocktail.png
+#### Pets
+ graphics/items/usable/pets/dog.png (Indigovox) (GPL v2) (TMW-BR)
+ graphics/items/usable/pets/ratte.png (Indigovox) (GPL v2) (TMW-BR)
+ graphics/items/usable/pets/cat.png (?) (GPL v2) (LoF)
+ graphics/items/usable/pets/cat-black.png (?) (GPL v2) (LoF)
+
## Minimaps
graphics/minimaps/000-0.png (Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/items/usable/pets/cat-black.png b/graphics/items/usable/pets/cat-black.png
new file mode 100644
index 00000000..b3169f02
--- /dev/null
+++ b/graphics/items/usable/pets/cat-black.png
Binary files differ
diff --git a/graphics/items/usable/pets/cat.png b/graphics/items/usable/pets/cat.png
new file mode 100644
index 00000000..07cc23cd
--- /dev/null
+++ b/graphics/items/usable/pets/cat.png
Binary files differ
diff --git a/graphics/items/usable/pets/dog.png b/graphics/items/usable/pets/dog.png
new file mode 100644
index 00000000..8e599e6c
--- /dev/null
+++ b/graphics/items/usable/pets/dog.png
Binary files differ
diff --git a/graphics/items/usable/pets/ratte.png b/graphics/items/usable/pets/ratte.png
new file mode 100644
index 00000000..f6b4dc3a
--- /dev/null
+++ b/graphics/items/usable/pets/ratte.png
Binary files differ
diff --git a/graphics/sprites/monsters/pet-black-cat.xml b/graphics/sprites/monsters/pet-black-cat.xml
index 37d0874e..393128c6 100644
--- a/graphics/sprites/monsters/pet-black-cat.xml
+++ b/graphics/sprites/monsters/pet-black-cat.xml
@@ -2,55 +2,5 @@
<sprite>
<imageset name="base" src="graphics/sprites/monsters/pet-black-cat.png" width="32" height="32" />
- <action name="stand" imageset="base">
- <animation direction="down">
- <sequence start="19" end="19" delay="25" offsetX="-30" />
- </animation>
- <animation direction="left">
- <sequence start="22" end="22" delay="25" offsetX="-30" />
- </animation>
- <animation direction="up">
- <sequence start="13" end="13" delay="25" offsetX="-30" />
- </animation>
- <animation direction="right">
- <sequence start="16" end="16" delay="25" offsetX="-30" />
- </animation>
- </action>
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="19" end="19" delay="150" offsetX="-30" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="22" end="22" delay="150" offsetX="-30" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="13" end="13" delay="150" offsetX="-30" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="16" end="16" delay="150" offsetX="-30" />
- <end />
- </animation>
- </action>
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="18" end="20" delay="150" offsetX="-30" />
- <frame index="19" delay="150" offsetX="-30" />
- </animation>
- <animation direction="left">
- <sequence start="21" end="23" delay="100" offsetX="-30" />
- <frame index="22" delay="150" offsetX="-30" />
- </animation>
- <animation direction="up">
- <sequence start="12" end="14" delay="100" offsetX="-30" />
- <frame index="13" delay="150" offsetX="-30" />
- </animation>
- <animation direction="right">
- <sequence start="15" end="17" delay="100" offsetX="-30" />
- <frame index="16" delay="150" offsetX="-30" />
- </animation>
-
- </action>
+ <include file="graphics/sprites/monsters/pet-cat.xml"/>
</sprite>
diff --git a/graphics/sprites/monsters/pet-cat.xml b/graphics/sprites/monsters/pet-cat.xml
index 34546af2..bf569cad 100644
--- a/graphics/sprites/monsters/pet-cat.xml
+++ b/graphics/sprites/monsters/pet-cat.xml
@@ -4,16 +4,16 @@
<action name="stand" imageset="base">
<animation direction="down">
- <sequence start="19" end="19" delay="25" offsetX="-30" />
+ <frame index="19" delay="25" offsetX="-30"/>
</animation>
<animation direction="left">
- <sequence start="22" end="22" delay="25" offsetX="-30" />
+ <frame index="22" delay="25" offsetX="-30"/>
</animation>
<animation direction="up">
- <sequence start="13" end="13" delay="25" offsetX="-30" />
+ <frame index="13" delay="25" offsetX="-30"/>
</animation>
<animation direction="right">
- <sequence start="16" end="16" delay="25" offsetX="-30" />
+ <frame index="16" delay="25" offsetX="-30"/>
</animation>
</action>
<action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/pet-dog.xml b/graphics/sprites/monsters/pet-dog.xml
index bdb8e439..e793df39 100644
--- a/graphics/sprites/monsters/pet-dog.xml
+++ b/graphics/sprites/monsters/pet-dog.xml
@@ -58,16 +58,7 @@
</action>
<action name="dead" imageset="base">
- <animation direction="down">
- <frame index="24" offsetX="-32"/>
- </animation>
- <animation direction="left">
- <frame index="24" offsetX="-32"/>
- </animation>
- <animation direction="up">
- <frame index="24" offsetX="-32"/>
- </animation>
- <animation direction="right">
+ <animation direction="default">
<frame index="24" offsetX="-32"/>
</animation>
</action>
diff --git a/items.xml b/items.xml
index 6e2d6d4d..47a45084 100644
--- a/items.xml
+++ b/items.xml
@@ -5282,6 +5282,42 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
sellProtected="true"
weight="520"
/>
+ <item id="4003"
+ image="usable/pets/dog.png"
+ name="Doggy Dog"
+ description="Faithful companion"
+ type="generic"
+ useButton="Wake"
+ sellProtected="true"
+ weight="800"
+ />
+ <item id="4004"
+ image="usable/pets/cat.png"
+ name="Catty Cat"
+ description="Faithful companion"
+ type="generic"
+ useButton="Wake"
+ sellProtected="true"
+ weight="800"
+ />
+ <item id="4005"
+ image="usable/pets/cat-black.png"
+ name="Black Cat"
+ description="Unluck to your foes"
+ type="generic"
+ useButton="Wake"
+ sellProtected="true"
+ weight="800"
+ />
+ <item id="4006"
+ image="usable/pets/ratte.png"
+ name="Ratte the Ratto"
+ description="Faithful companion"
+ type="generic"
+ useButton="Wake"
+ sellProtected="true"
+ weight="200"
+ />
<!-- Cards -->
<item id="5000"