From aad50e2c107f84ccedf1d36a6d64719703473e56 Mon Sep 17 00:00:00 2001 From: Ali-G Date: Tue, 14 Jun 2011 17:33:22 +0200 Subject: Reorganised some spritesheets. Isn't finished yet. Also added 2 new mobs. --- graphics/sprites/monsters/butterfly.png | Bin 0 -> 1886 bytes graphics/sprites/monsters/butterfly.xml | 89 +++++++++++++++++++ graphics/sprites/monsters/cave-maggot-giant.png | Bin 0 -> 17859 bytes graphics/sprites/monsters/cave-maggot-giant.xml | 70 +++++++++++++++ graphics/sprites/monsters/cave-maggot.png | Bin 0 -> 4589 bytes graphics/sprites/monsters/cave-maggot.xml | 66 +++++++++++++++ graphics/sprites/monsters/duck.png | Bin 0 -> 6082 bytes graphics/sprites/monsters/duck.xml | 70 +++++++++++++++ graphics/sprites/monsters/element-ball.png | Bin 0 -> 57604 bytes graphics/sprites/monsters/element-ball.xml | 94 +++++++++++++++++++++ graphics/sprites/monsters/flower.png | Bin 0 -> 11025 bytes graphics/sprites/monsters/flower.xml | 51 +++++++++++ graphics/sprites/monsters/fluffy.png | Bin 0 -> 6491 bytes graphics/sprites/monsters/fluffy.xml | 70 +++++++++++++++ graphics/sprites/monsters/ghost-pumpkin.png | Bin 0 -> 22241 bytes graphics/sprites/monsters/ghost-pumpkin.xml | 42 +++++++++ graphics/sprites/monsters/monster-butterfly.png | Bin 1886 -> 0 bytes graphics/sprites/monsters/monster-butterfly.xml | 89 ------------------- .../sprites/monsters/monster-cave-maggot-giant.png | Bin 17859 -> 0 bytes .../sprites/monsters/monster-cave-maggot-giant.xml | 70 --------------- graphics/sprites/monsters/monster-cave-maggot.png | Bin 4589 -> 0 bytes graphics/sprites/monsters/monster-cave-maggot.xml | 66 --------------- graphics/sprites/monsters/monster-duck.png | Bin 6082 -> 0 bytes graphics/sprites/monsters/monster-duck.xml | 70 --------------- graphics/sprites/monsters/monster-element-ball.png | Bin 57604 -> 0 bytes graphics/sprites/monsters/monster-element-ball.xml | 94 --------------------- graphics/sprites/monsters/monster-flower.png | Bin 11025 -> 0 bytes graphics/sprites/monsters/monster-flower.xml | 51 ----------- graphics/sprites/monsters/monster-fluffy.png | Bin 6491 -> 0 bytes graphics/sprites/monsters/monster-fluffy.xml | 70 --------------- .../sprites/monsters/monster-ghost-pumpkin.png | Bin 22241 -> 0 bytes .../sprites/monsters/monster-ghost-pumpkin.xml | 42 --------- monsters.xml | 37 +++++--- 33 files changed, 578 insertions(+), 563 deletions(-) create mode 100644 graphics/sprites/monsters/butterfly.png create mode 100644 graphics/sprites/monsters/butterfly.xml create mode 100644 graphics/sprites/monsters/cave-maggot-giant.png create mode 100644 graphics/sprites/monsters/cave-maggot-giant.xml create mode 100644 graphics/sprites/monsters/cave-maggot.png create mode 100644 graphics/sprites/monsters/cave-maggot.xml create mode 100644 graphics/sprites/monsters/duck.png create mode 100644 graphics/sprites/monsters/duck.xml create mode 100644 graphics/sprites/monsters/element-ball.png create mode 100644 graphics/sprites/monsters/element-ball.xml create mode 100644 graphics/sprites/monsters/flower.png create mode 100644 graphics/sprites/monsters/flower.xml create mode 100644 graphics/sprites/monsters/fluffy.png create mode 100644 graphics/sprites/monsters/fluffy.xml create mode 100644 graphics/sprites/monsters/ghost-pumpkin.png create mode 100644 graphics/sprites/monsters/ghost-pumpkin.xml delete mode 100644 graphics/sprites/monsters/monster-butterfly.png delete mode 100644 graphics/sprites/monsters/monster-butterfly.xml delete mode 100644 graphics/sprites/monsters/monster-cave-maggot-giant.png delete mode 100644 graphics/sprites/monsters/monster-cave-maggot-giant.xml delete mode 100644 graphics/sprites/monsters/monster-cave-maggot.png delete mode 100644 graphics/sprites/monsters/monster-cave-maggot.xml delete mode 100644 graphics/sprites/monsters/monster-duck.png delete mode 100644 graphics/sprites/monsters/monster-duck.xml delete mode 100644 graphics/sprites/monsters/monster-element-ball.png delete mode 100644 graphics/sprites/monsters/monster-element-ball.xml delete mode 100644 graphics/sprites/monsters/monster-flower.png delete mode 100644 graphics/sprites/monsters/monster-flower.xml delete mode 100644 graphics/sprites/monsters/monster-fluffy.png delete mode 100644 graphics/sprites/monsters/monster-fluffy.xml delete mode 100644 graphics/sprites/monsters/monster-ghost-pumpkin.png delete mode 100644 graphics/sprites/monsters/monster-ghost-pumpkin.xml diff --git a/graphics/sprites/monsters/butterfly.png b/graphics/sprites/monsters/butterfly.png new file mode 100644 index 00000000..f15cd2c7 Binary files /dev/null and b/graphics/sprites/monsters/butterfly.png differ diff --git a/graphics/sprites/monsters/butterfly.xml b/graphics/sprites/monsters/butterfly.xml new file mode 100644 index 00000000..0c6647bf --- /dev/null +++ b/graphics/sprites/monsters/butterfly.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/cave-maggot-giant.png b/graphics/sprites/monsters/cave-maggot-giant.png new file mode 100644 index 00000000..4eee44d7 Binary files /dev/null and b/graphics/sprites/monsters/cave-maggot-giant.png differ diff --git a/graphics/sprites/monsters/cave-maggot-giant.xml b/graphics/sprites/monsters/cave-maggot-giant.xml new file mode 100644 index 00000000..635b8011 --- /dev/null +++ b/graphics/sprites/monsters/cave-maggot-giant.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/cave-maggot.png b/graphics/sprites/monsters/cave-maggot.png new file mode 100644 index 00000000..fe5f3c0d Binary files /dev/null and b/graphics/sprites/monsters/cave-maggot.png differ diff --git a/graphics/sprites/monsters/cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml new file mode 100644 index 00000000..58b2f752 --- /dev/null +++ b/graphics/sprites/monsters/cave-maggot.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/duck.png b/graphics/sprites/monsters/duck.png new file mode 100644 index 00000000..44319fb9 Binary files /dev/null and b/graphics/sprites/monsters/duck.png differ diff --git a/graphics/sprites/monsters/duck.xml b/graphics/sprites/monsters/duck.xml new file mode 100644 index 00000000..4aa1c812 --- /dev/null +++ b/graphics/sprites/monsters/duck.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/element-ball.png b/graphics/sprites/monsters/element-ball.png new file mode 100644 index 00000000..9d28f45a Binary files /dev/null and b/graphics/sprites/monsters/element-ball.png differ diff --git a/graphics/sprites/monsters/element-ball.xml b/graphics/sprites/monsters/element-ball.xml new file mode 100644 index 00000000..6815846a --- /dev/null +++ b/graphics/sprites/monsters/element-ball.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/flower.png b/graphics/sprites/monsters/flower.png new file mode 100644 index 00000000..f398b862 Binary files /dev/null and b/graphics/sprites/monsters/flower.png differ diff --git a/graphics/sprites/monsters/flower.xml b/graphics/sprites/monsters/flower.xml new file mode 100644 index 00000000..afa65e7c --- /dev/null +++ b/graphics/sprites/monsters/flower.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/fluffy.png b/graphics/sprites/monsters/fluffy.png new file mode 100644 index 00000000..8cb26d03 Binary files /dev/null and b/graphics/sprites/monsters/fluffy.png differ diff --git a/graphics/sprites/monsters/fluffy.xml b/graphics/sprites/monsters/fluffy.xml new file mode 100644 index 00000000..ee074b31 --- /dev/null +++ b/graphics/sprites/monsters/fluffy.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/ghost-pumpkin.png b/graphics/sprites/monsters/ghost-pumpkin.png new file mode 100644 index 00000000..e464c885 Binary files /dev/null and b/graphics/sprites/monsters/ghost-pumpkin.png differ diff --git a/graphics/sprites/monsters/ghost-pumpkin.xml b/graphics/sprites/monsters/ghost-pumpkin.xml new file mode 100644 index 00000000..4d867290 --- /dev/null +++ b/graphics/sprites/monsters/ghost-pumpkin.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/monster-butterfly.png b/graphics/sprites/monsters/monster-butterfly.png deleted file mode 100644 index f15cd2c7..00000000 Binary files a/graphics/sprites/monsters/monster-butterfly.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-butterfly.xml b/graphics/sprites/monsters/monster-butterfly.xml deleted file mode 100644 index 063983aa..00000000 --- a/graphics/sprites/monsters/monster-butterfly.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.png b/graphics/sprites/monsters/monster-cave-maggot-giant.png deleted file mode 100644 index 4eee44d7..00000000 Binary files a/graphics/sprites/monsters/monster-cave-maggot-giant.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.xml b/graphics/sprites/monsters/monster-cave-maggot-giant.xml deleted file mode 100644 index e3c65356..00000000 --- a/graphics/sprites/monsters/monster-cave-maggot-giant.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-cave-maggot.png b/graphics/sprites/monsters/monster-cave-maggot.png deleted file mode 100644 index fe5f3c0d..00000000 Binary files a/graphics/sprites/monsters/monster-cave-maggot.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-cave-maggot.xml b/graphics/sprites/monsters/monster-cave-maggot.xml deleted file mode 100644 index ac2a0741..00000000 --- a/graphics/sprites/monsters/monster-cave-maggot.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-duck.png b/graphics/sprites/monsters/monster-duck.png deleted file mode 100644 index 44319fb9..00000000 Binary files a/graphics/sprites/monsters/monster-duck.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-duck.xml b/graphics/sprites/monsters/monster-duck.xml deleted file mode 100644 index dcb03026..00000000 --- a/graphics/sprites/monsters/monster-duck.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-element-ball.png b/graphics/sprites/monsters/monster-element-ball.png deleted file mode 100644 index 9d28f45a..00000000 Binary files a/graphics/sprites/monsters/monster-element-ball.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-element-ball.xml b/graphics/sprites/monsters/monster-element-ball.xml deleted file mode 100644 index 99934944..00000000 --- a/graphics/sprites/monsters/monster-element-ball.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-flower.png b/graphics/sprites/monsters/monster-flower.png deleted file mode 100644 index f398b862..00000000 Binary files a/graphics/sprites/monsters/monster-flower.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-flower.xml b/graphics/sprites/monsters/monster-flower.xml deleted file mode 100644 index f7753277..00000000 --- a/graphics/sprites/monsters/monster-flower.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/monsters/monster-fluffy.png b/graphics/sprites/monsters/monster-fluffy.png deleted file mode 100644 index 8cb26d03..00000000 Binary files a/graphics/sprites/monsters/monster-fluffy.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-fluffy.xml b/graphics/sprites/monsters/monster-fluffy.xml deleted file mode 100644 index 938051c7..00000000 --- a/graphics/sprites/monsters/monster-fluffy.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.png b/graphics/sprites/monsters/monster-ghost-pumpkin.png deleted file mode 100644 index e464c885..00000000 Binary files a/graphics/sprites/monsters/monster-ghost-pumpkin.png and /dev/null differ diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/monster-ghost-pumpkin.xml deleted file mode 100644 index 27aa7a9f..00000000 --- a/graphics/sprites/monsters/monster-ghost-pumpkin.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/monsters.xml b/monsters.xml index e1b5bc5e..5463f214 100644 --- a/monsters.xml +++ b/monsters.xml @@ -19,9 +19,6 @@ monsters/scorpion/scorpion-hit3.ogg monsters/scorpion/scorpion-hit4.ogg monsters/scorpion/scorpion-miss1.ogg - @@ -94,7 +91,7 @@ - monsters/monster-flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f + monsters/flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f monsters/flower/flower-hit1.ogg monsters/flower/flower-hit2.ogg monsters/flower/flower-miss1.ogg @@ -128,7 +125,7 @@ - monsters/monster-fluffy.xml + monsters/fluffy.xml monsters/fluffy/fluffy-hit1.ogg monsters/fluffy/fluffy-hit2.ogg monsters/fluffy/fluffy-hit3.ogg @@ -167,7 +164,7 @@ - monsters/monster-fluffy.xml + monsters/fluffy.xml monsters/fluffy/fluffy-hit1.ogg monsters/fluffy/fluffy-hit2.ogg monsters/fluffy/fluffy-hit3.ogg @@ -281,7 +278,7 @@ - monsters/monster-duck.xml + monsters/duck.xml @@ -296,12 +293,12 @@ - monsters/monster-butterfly.xml|#660000,FF3300,FFCC99,FFCCCC + monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC monsters/accessories/generic-shadow-small-circle.xml - monsters/monster-cave-maggot.xml| + monsters/cave-maggot.xml| monsters/maggot/maggot-hit1.ogg monsters/maggot/maggot-hit2.ogg monsters/maggot/maggot-miss1.ogg @@ -325,7 +322,7 @@ - monsters/monster-cave-maggot-giant.xml|#565051,ffffff + monsters/cave-maggot-giant.xml|#565051,ffffff monsters/maggot/maggot-hit1.ogg monsters/maggot/maggot-hit2.ogg monsters/maggot/maggot-miss1.ogg @@ -399,7 +396,7 @@ - monsters/monster-element-ball.xml + monsters/element-ball.xml @@ -455,4 +452,22 @@ monsters/monster-serqet.xml + + monsters/monster-spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000 + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + + + monsters/monster-scorpion.xml|#211b0e,5c3e20,a68d42,ffffff + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + -- cgit v1.2.3-70-g09d2