From b5d806229218ce5c01bf575f82ed553fc2c79646 Mon Sep 17 00:00:00 2001 From: wushin Date: Sun, 15 Jun 2014 23:55:34 -0500 Subject: Mushroom Sprite Sheets added --- graphics/particles/monster-moonshroom.particle.xml | 24 +++++ graphics/particles/moonshroom-attack.particle.xml | 30 ++++++ .../monsters/accessories/mushroom-base1-arms1.png | Bin 0 -> 1768 bytes .../monsters/accessories/mushroom-base1-arms1.xml | 96 +++++++++++++++++++ .../accessories/mushroom-base1-cap1-spikes.png | Bin 0 -> 1120 bytes .../accessories/mushroom-base1-cap1-spikes.xml | 80 ++++++++++++++++ .../monsters/accessories/mushroom-base1-cap1.png | Bin 0 -> 2478 bytes .../monsters/accessories/mushroom-base1-cap1.xml | 80 ++++++++++++++++ .../monsters/accessories/mushroom-base1-cap2.png | Bin 0 -> 3456 bytes .../monsters/accessories/mushroom-base1-cap2.xml | 80 ++++++++++++++++ .../monsters/accessories/mushroom-base1-face1.png | Bin 0 -> 1655 bytes .../monsters/accessories/mushroom-base1-face1.xml | 103 +++++++++++++++++++++ .../monsters/accessories/mushroom-base1-face2.png | Bin 0 -> 1703 bytes .../monsters/accessories/mushroom-base1-face2.xml | 103 +++++++++++++++++++++ .../monsters/accessories/mushroom-base1.png | Bin 0 -> 3250 bytes .../monsters/accessories/mushroom-base1.xml | 72 ++++++++++++++ graphics/sprites/monsters/moonshroom.png | Bin 0 -> 11287 bytes graphics/sprites/monsters/moonshroom.xml | 64 +++++++++++++ license.txt | 8 ++ monsters.xml | 14 ++- 20 files changed, 752 insertions(+), 2 deletions(-) create mode 100644 graphics/particles/monster-moonshroom.particle.xml create mode 100644 graphics/particles/moonshroom-attack.particle.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-arms1.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap1.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap2.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-face1.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-face1.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-face2.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1-face2.xml create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1.png create mode 100644 graphics/sprites/monsters/accessories/mushroom-base1.xml create mode 100644 graphics/sprites/monsters/moonshroom.png create mode 100644 graphics/sprites/monsters/moonshroom.xml diff --git a/graphics/particles/monster-moonshroom.particle.xml b/graphics/particles/monster-moonshroom.particle.xml new file mode 100644 index 00000000..74df1d86 --- /dev/null +++ b/graphics/particles/monster-moonshroom.particle.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/particles/moonshroom-attack.particle.xml b/graphics/particles/moonshroom-attack.particle.xml new file mode 100644 index 00000000..1fbdc01b --- /dev/null +++ b/graphics/particles/moonshroom-attack.particle.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.png b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.png new file mode 100644 index 00000000..aceb7139 Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml new file mode 100644 index 00000000..f37db88b --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png new file mode 100644 index 00000000..5bdd50d2 Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml new file mode 100644 index 00000000..239961a0 --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.png b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.png new file mode 100644 index 00000000..49574e9e Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml new file mode 100644 index 00000000..752e14ee --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.png b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.png new file mode 100644 index 00000000..56b43e52 Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml new file mode 100644 index 00000000..e4f22daa --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face1.png b/graphics/sprites/monsters/accessories/mushroom-base1-face1.png new file mode 100644 index 00000000..a9cbc128 Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-face1.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml new file mode 100644 index 00000000..cffeb7ba --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face2.png b/graphics/sprites/monsters/accessories/mushroom-base1-face2.png new file mode 100644 index 00000000..a8e1cf25 Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1-face2.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml new file mode 100644 index 00000000..b78e8ade --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/accessories/mushroom-base1.png b/graphics/sprites/monsters/accessories/mushroom-base1.png new file mode 100644 index 00000000..e95efc8a Binary files /dev/null and b/graphics/sprites/monsters/accessories/mushroom-base1.png differ diff --git a/graphics/sprites/monsters/accessories/mushroom-base1.xml b/graphics/sprites/monsters/accessories/mushroom-base1.xml new file mode 100644 index 00000000..0c1b8e99 --- /dev/null +++ b/graphics/sprites/monsters/accessories/mushroom-base1.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/moonshroom.png b/graphics/sprites/monsters/moonshroom.png new file mode 100644 index 00000000..66d98851 Binary files /dev/null and b/graphics/sprites/monsters/moonshroom.png differ diff --git a/graphics/sprites/monsters/moonshroom.xml b/graphics/sprites/monsters/moonshroom.xml new file mode 100644 index 00000000..be815e17 --- /dev/null +++ b/graphics/sprites/monsters/moonshroom.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/license.txt b/license.txt index 2bba2174..c0d93814 100644 --- a/license.txt +++ b/license.txt @@ -799,6 +799,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/monsters/mushroom-red.png (Yuuki) (GPLv2) graphics/sprites/monsters/mushroom-spiky.png (Yuuki) (GPLv2) graphics/sprites/monsters/mushroom-wicked.png (Cassy, Yuuki) (GPLv2) + graphics/sprites/monsters/mushroom-moon.png (Cassy, Yuuki) (GPLv2) graphics/sprites/monsters/nutcracker.png (Chayenne, ????, Alige, Lizandra, Salmondine) (GPLv2) graphics/sprites/monsters/penguin.png (Fother) (GPLv2) graphics/sprites/monsters/pinkie.png (Crush) (GPLv2), (CC BY-SA 3.0) @@ -846,6 +847,13 @@ http://creativecommons.org/licenses/by-sa/3.0/ graphics/sprites/monsters/accessories/slime-rudolph.png (????) (GPLv2) graphics/sprites/monsters/accessories/slime-santa.png (????) (GPLv2) graphics/sprites/monsters/accessories/slime-seajelly.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-arms1.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-cap1.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-cap2.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-face1.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1-face2.png (FotherJ) (GPLv2), (CC BY-SA 3.0) + graphics/sprites/monsters/accessories/mushroom-base1.png (FotherJ) (GPLv2), (CC BY-SA 3.0) ## NPCs graphics/sprites/npcs/bones.png (FotherJ, Salmondine) (GPLv2) graphics/sprites/npcs/childoutfits.png (Milla, Mrgrey, Nami, Salmondine, Wombat) (GPLv2) diff --git a/monsters.xml b/monsters.xml index 3f95df48..6804134a 100644 --- a/monsters.xml +++ b/monsters.xml @@ -73,7 +73,10 @@ monsters/scorpion/scorpion-miss1.ogg - monsters/mushroom-red.xml + monsters/accessories/mushroom-base1.xml|#B38336,FFF5CC + monsters/accessories/mushroom-base1-arms1.xml|#B38336,FFF5CC + monsters/accessories/mushroom-base1-face2.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC + monsters/accessories/mushroom-base1-cap1.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC monsters/shroom/shroom-hit1.ogg @@ -101,7 +104,10 @@ monsters/pinkie/pinkie-miss1.ogg - monsters/mushroom-spiky.xml + monsters/accessories/mushroom-base1.xml|#B37410,FFF5CC + monsters/accessories/mushroom-base1-face1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#7B4E07,FFF5CC + monsters/accessories/mushroom-base1-cap1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#B36E00,FFF5CC + monsters/accessories/mushroom-base1-cap1-spikes.xml|#CC9C3D,FFFFCC monsters/shroom/shroom-hit1.ogg @@ -663,4 +669,8 @@ equipment/hands/magefire.xml + + monsters/moonshroom.xml + monsters/shroom/shroom-hit1.ogg + -- cgit v1.2.3-60-g2f50