summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE5
-rw-r--r--graphics/sprites/monsters/pixie2.pngbin0 -> 4879 bytes
-rw-r--r--graphics/sprites/monsters/pixie2.xml62
-rw-r--r--graphics/sprites/monsters/pixie3.pngbin0 -> 5038 bytes
-rw-r--r--graphics/sprites/monsters/pixie3.xml6
-rw-r--r--graphics/sprites/monsters/pixie4.pngbin0 -> 4801 bytes
-rw-r--r--graphics/sprites/monsters/pixie4.xml6
-rw-r--r--monsters.xml6
8 files changed, 81 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 50b1edec..47cb8c7e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1546,6 +1546,9 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/monsters/pinkie.png (Crush) (CC BY-SA 3.0) (-)
graphics/sprites/monsters/piou.png (Reid) (CC BY-SA 3.0) (FotherJ)
graphics/sprites/monsters/pixie.png (The Mana World DE) (GPLv2) (?)
+ graphics/sprites/monsters/pixie2.png (FotherJ) (GPLv2) (?)
+ graphics/sprites/monsters/pixie3.png (FotherJ) (GPLv2) (?)
+ graphics/sprites/monsters/pixie4.png (FotherJ) (GPLv2) (?)
graphics/sprites/monsters/plant.png (Crush, Seradest) (GPLv2) (-)
graphics/sprites/monsters/psi-brain.png (?) (GPLv2) (TMW Org.)
graphics/sprites/monsters/plushroom.png (Reid) (CC BY-SA 3.0) (-)
@@ -1669,7 +1672,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/npcs/sprite/statues.png (jesusalva, ?) (GPLv2) (LoF, TMW-Br, TMW2)
graphics/sprites/npcs/sprite/switch.png (Miloslav Číž) (CC0) (OpenGameArt)
graphics/sprites/npcs/sprite/tarlan.png (Reid) (CC BY-SA 3.0) (Modanung)
- graphics/sprites/npcs/sprite/teddygirl.png (?) (GPL 2.0) (Invertika)
+ graphics/sprites/npcs/sprite/teddygirl.png (Crush) (GPL 2.0) (Invertika)
graphics/sprites/npcs/sprite/terry.png (Reid) (CC BY-SA 3.0) (Salva)
graphics/sprites/npcs/sprite/trap.png (TMW-Br, jesusalva) (GPLv2) (-)
graphics/sprites/npcs/sprite/treeleaf.png (Sogomn) (CC BY-SA 3.0) (Reid)
diff --git a/graphics/sprites/monsters/pixie2.png b/graphics/sprites/monsters/pixie2.png
new file mode 100644
index 00000000..deb2d88b
--- /dev/null
+++ b/graphics/sprites/monsters/pixie2.png
Binary files differ
diff --git a/graphics/sprites/monsters/pixie2.xml b/graphics/sprites/monsters/pixie2.xml
new file mode 100644
index 00000000..6e8a69ed
--- /dev/null
+++ b/graphics/sprites/monsters/pixie2.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!-- Fother -->
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/pixie2.png" width="20" height="20" />
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="12" />
+ </animation>
+ <animation direction="left">
+ <frame index="4" />
+ </animation>
+ <animation direction="up">
+ <frame index="0" />
+ </animation>
+ <animation direction="right">
+ <frame index="8" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="12" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <frame index="4" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <frame index="0" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <frame index="8" />
+ <end />
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="15"/>
+ </animation>
+ </action>
+
+<action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="12" end="15" delay="150" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="4" end="7" delay="150" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="0" end="3" delay="150" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="8" end="11" delay="150" />
+ <end />
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/monsters/pixie3.png b/graphics/sprites/monsters/pixie3.png
new file mode 100644
index 00000000..ced7bcc5
--- /dev/null
+++ b/graphics/sprites/monsters/pixie3.png
Binary files differ
diff --git a/graphics/sprites/monsters/pixie3.xml b/graphics/sprites/monsters/pixie3.xml
new file mode 100644
index 00000000..aa81d884
--- /dev/null
+++ b/graphics/sprites/monsters/pixie3.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/pixie3.png" width="20" height="20" />
+
+ <include file="monsters/pixie2.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/pixie4.png b/graphics/sprites/monsters/pixie4.png
new file mode 100644
index 00000000..26d3a6cb
--- /dev/null
+++ b/graphics/sprites/monsters/pixie4.png
Binary files differ
diff --git a/graphics/sprites/monsters/pixie4.xml b/graphics/sprites/monsters/pixie4.xml
new file mode 100644
index 00000000..03e39f53
--- /dev/null
+++ b/graphics/sprites/monsters/pixie4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/pixie4.png" width="20" height="20" />
+
+ <include file="monsters/pixie2.xml"/>
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index e14c62c5..e763751f 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1127,15 +1127,15 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or s
<sound event="hit">monsters/frostiana/hit1.ogg</sound>
</monster>
<monster id="1215" name="Vanity Pixie">
- <sprite>monsters/pixie.xml|#aaaaee</sprite>
+ <sprite>monsters/pixie2.xml</sprite>
<sound event="hit">monsters/frostiana/hit1.ogg</sound>
</monster>
<monster id="1216" name="Holy Pixie">
- <sprite>monsters/pixie.xml|#ffffff</sprite>
+ <sprite>monsters/pixie4.xml</sprite>
<sound event="hit">monsters/frostiana/hit1.ogg</sound>
</monster>
<monster id="1217" name="Shadow Pixie">
- <sprite>monsters/pixie.xml|#ee00aa</sprite>
+ <sprite>monsters/pixie3.xml</sprite>
<sound event="hit">monsters/frostiana/hit1.ogg</sound>
</monster>
<monster id="1218" name="Nulity Pixie">