From 5ca8431803975b04356a09d5bf6e68eadb62e77e Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 10 Jun 2019 12:54:50 -0300 Subject: Update Pixie's sprites with Fother's Scrap Works --- LICENSE | 5 ++- graphics/sprites/monsters/pixie2.png | Bin 0 -> 4879 bytes graphics/sprites/monsters/pixie2.xml | 62 +++++++++++++++++++++++++++++++++++ graphics/sprites/monsters/pixie3.png | Bin 0 -> 5038 bytes graphics/sprites/monsters/pixie3.xml | 6 ++++ graphics/sprites/monsters/pixie4.png | Bin 0 -> 4801 bytes graphics/sprites/monsters/pixie4.xml | 6 ++++ monsters.xml | 6 ++-- 8 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 graphics/sprites/monsters/pixie2.png create mode 100644 graphics/sprites/monsters/pixie2.xml create mode 100644 graphics/sprites/monsters/pixie3.png create mode 100644 graphics/sprites/monsters/pixie3.xml create mode 100644 graphics/sprites/monsters/pixie4.png create mode 100644 graphics/sprites/monsters/pixie4.xml 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 Binary files /dev/null and b/graphics/sprites/monsters/pixie2.png 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/pixie3.png b/graphics/sprites/monsters/pixie3.png new file mode 100644 index 00000000..ced7bcc5 Binary files /dev/null and b/graphics/sprites/monsters/pixie3.png 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 @@ + + + + + + diff --git a/graphics/sprites/monsters/pixie4.png b/graphics/sprites/monsters/pixie4.png new file mode 100644 index 00000000..26d3a6cb Binary files /dev/null and b/graphics/sprites/monsters/pixie4.png 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 @@ + + + + + + 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 monsters/frostiana/hit1.ogg - monsters/pixie.xml|#aaaaee + monsters/pixie2.xml monsters/frostiana/hit1.ogg - monsters/pixie.xml|#ffffff + monsters/pixie4.xml monsters/frostiana/hit1.ogg - monsters/pixie.xml|#ee00aa + monsters/pixie3.xml monsters/frostiana/hit1.ogg -- cgit v1.2.3-70-g09d2