From a8898c55265b4ab6334503c65e033eb5f7528e78 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 14 Feb 2013 16:02:18 +0100 Subject: Add Npc 375 for annual easter events. (3 Eggs on the Ground) --- graphics/sprites/npcs/npc-annualeaster.png | Bin 0 -> 764 bytes graphics/sprites/npcs/npc-annualeaster.xml | 9 +++++++++ npcs.xml | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 graphics/sprites/npcs/npc-annualeaster.png create mode 100644 graphics/sprites/npcs/npc-annualeaster.xml diff --git a/graphics/sprites/npcs/npc-annualeaster.png b/graphics/sprites/npcs/npc-annualeaster.png new file mode 100644 index 00000000..ec3e6fd4 Binary files /dev/null and b/graphics/sprites/npcs/npc-annualeaster.png differ diff --git a/graphics/sprites/npcs/npc-annualeaster.xml b/graphics/sprites/npcs/npc-annualeaster.xml new file mode 100644 index 00000000..3f396423 --- /dev/null +++ b/graphics/sprites/npcs/npc-annualeaster.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/npcs.xml b/npcs.xml index 275a24b4..03b20964 100644 --- a/npcs.xml +++ b/npcs.xml @@ -926,6 +926,10 @@ graphics/particles/demonfire.particle.xml + + npcs/npc-annualeaster.xml + + -- cgit v1.2.3-60-g2f50 From 30e07d0760cfc9533510c751aceacb956c4cf4cb Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 14 Feb 2013 19:33:15 +0100 Subject: Add recolored eggshell heads. --- graphics/items/equipment/head/blueeggshell.png | Bin 0 -> 590 bytes graphics/items/equipment/head/darkeggshell.png | Bin 0 -> 590 bytes graphics/items/equipment/head/greeneggshell.png | Bin 0 -> 590 bytes graphics/items/equipment/head/orangeeggshell.png | Bin 0 -> 590 bytes graphics/items/equipment/head/redeggshell.png | Bin 0 -> 590 bytes graphics/items/equipment/head/yelloweggshell.png | Bin 0 -> 590 bytes graphics/sprites/equipment/head/blueeggshell.png | Bin 0 -> 2100 bytes graphics/sprites/equipment/head/blueeggshell.xml | 117 +++++++++++++++++++++ graphics/sprites/equipment/head/darkeggshell.png | Bin 0 -> 2073 bytes graphics/sprites/equipment/head/darkeggshell.xml | 117 +++++++++++++++++++++ graphics/sprites/equipment/head/greeneggshell.png | Bin 0 -> 2077 bytes graphics/sprites/equipment/head/greeneggshell.xml | 117 +++++++++++++++++++++ graphics/sprites/equipment/head/orangeeggshell.png | Bin 0 -> 2135 bytes graphics/sprites/equipment/head/orangeeggshell.xml | 117 +++++++++++++++++++++ graphics/sprites/equipment/head/redeggshell.png | Bin 0 -> 2084 bytes graphics/sprites/equipment/head/redeggshell.xml | 117 +++++++++++++++++++++ graphics/sprites/equipment/head/yelloweggshell.png | Bin 0 -> 2080 bytes graphics/sprites/equipment/head/yelloweggshell.xml | 117 +++++++++++++++++++++ items.xml | 79 +++++++++++++- 19 files changed, 780 insertions(+), 1 deletion(-) create mode 100644 graphics/items/equipment/head/blueeggshell.png create mode 100644 graphics/items/equipment/head/darkeggshell.png create mode 100644 graphics/items/equipment/head/greeneggshell.png create mode 100644 graphics/items/equipment/head/orangeeggshell.png create mode 100644 graphics/items/equipment/head/redeggshell.png create mode 100644 graphics/items/equipment/head/yelloweggshell.png create mode 100644 graphics/sprites/equipment/head/blueeggshell.png create mode 100644 graphics/sprites/equipment/head/blueeggshell.xml create mode 100644 graphics/sprites/equipment/head/darkeggshell.png create mode 100644 graphics/sprites/equipment/head/darkeggshell.xml create mode 100644 graphics/sprites/equipment/head/greeneggshell.png create mode 100644 graphics/sprites/equipment/head/greeneggshell.xml create mode 100644 graphics/sprites/equipment/head/orangeeggshell.png create mode 100644 graphics/sprites/equipment/head/orangeeggshell.xml create mode 100644 graphics/sprites/equipment/head/redeggshell.png create mode 100644 graphics/sprites/equipment/head/redeggshell.xml create mode 100644 graphics/sprites/equipment/head/yelloweggshell.png create mode 100644 graphics/sprites/equipment/head/yelloweggshell.xml diff --git a/graphics/items/equipment/head/blueeggshell.png b/graphics/items/equipment/head/blueeggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/blueeggshell.png differ diff --git a/graphics/items/equipment/head/darkeggshell.png b/graphics/items/equipment/head/darkeggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/darkeggshell.png differ diff --git a/graphics/items/equipment/head/greeneggshell.png b/graphics/items/equipment/head/greeneggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/greeneggshell.png differ diff --git a/graphics/items/equipment/head/orangeeggshell.png b/graphics/items/equipment/head/orangeeggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/orangeeggshell.png differ diff --git a/graphics/items/equipment/head/redeggshell.png b/graphics/items/equipment/head/redeggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/redeggshell.png differ diff --git a/graphics/items/equipment/head/yelloweggshell.png b/graphics/items/equipment/head/yelloweggshell.png new file mode 100644 index 00000000..a23ef84d Binary files /dev/null and b/graphics/items/equipment/head/yelloweggshell.png differ diff --git a/graphics/sprites/equipment/head/blueeggshell.png b/graphics/sprites/equipment/head/blueeggshell.png new file mode 100644 index 00000000..e70fad5c Binary files /dev/null and b/graphics/sprites/equipment/head/blueeggshell.png differ diff --git a/graphics/sprites/equipment/head/blueeggshell.xml b/graphics/sprites/equipment/head/blueeggshell.xml new file mode 100644 index 00000000..abeca9e4 --- /dev/null +++ b/graphics/sprites/equipment/head/blueeggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/darkeggshell.png b/graphics/sprites/equipment/head/darkeggshell.png new file mode 100644 index 00000000..6594109a Binary files /dev/null and b/graphics/sprites/equipment/head/darkeggshell.png differ diff --git a/graphics/sprites/equipment/head/darkeggshell.xml b/graphics/sprites/equipment/head/darkeggshell.xml new file mode 100644 index 00000000..f3cc2bad --- /dev/null +++ b/graphics/sprites/equipment/head/darkeggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/greeneggshell.png b/graphics/sprites/equipment/head/greeneggshell.png new file mode 100644 index 00000000..746df72e Binary files /dev/null and b/graphics/sprites/equipment/head/greeneggshell.png differ diff --git a/graphics/sprites/equipment/head/greeneggshell.xml b/graphics/sprites/equipment/head/greeneggshell.xml new file mode 100644 index 00000000..84428a3f --- /dev/null +++ b/graphics/sprites/equipment/head/greeneggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/orangeeggshell.png b/graphics/sprites/equipment/head/orangeeggshell.png new file mode 100644 index 00000000..005d771e Binary files /dev/null and b/graphics/sprites/equipment/head/orangeeggshell.png differ diff --git a/graphics/sprites/equipment/head/orangeeggshell.xml b/graphics/sprites/equipment/head/orangeeggshell.xml new file mode 100644 index 00000000..e3e64f50 --- /dev/null +++ b/graphics/sprites/equipment/head/orangeeggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/redeggshell.png b/graphics/sprites/equipment/head/redeggshell.png new file mode 100644 index 00000000..c104bd83 Binary files /dev/null and b/graphics/sprites/equipment/head/redeggshell.png differ diff --git a/graphics/sprites/equipment/head/redeggshell.xml b/graphics/sprites/equipment/head/redeggshell.xml new file mode 100644 index 00000000..ecad2383 --- /dev/null +++ b/graphics/sprites/equipment/head/redeggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/head/yelloweggshell.png b/graphics/sprites/equipment/head/yelloweggshell.png new file mode 100644 index 00000000..74854bdc Binary files /dev/null and b/graphics/sprites/equipment/head/yelloweggshell.png differ diff --git a/graphics/sprites/equipment/head/yelloweggshell.xml b/graphics/sprites/equipment/head/yelloweggshell.xml new file mode 100644 index 00000000..1f1fe3ef --- /dev/null +++ b/graphics/sprites/equipment/head/yelloweggshell.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/items.xml b/items.xml index fb43c6e2..76505acb 100644 --- a/items.xml +++ b/items.xml @@ -3431,7 +3431,84 @@ equipment/legs/shorts-male.xml|#95887F,E0D1C9 equipment/legs/shorts-female.xml|#95887F,E0D1C9 - + + equipment/head/redeggshell.xml + + + + + + equipment/head/blueeggshell.xml + + + + + + equipment/head/yelloweggshell.xml + + + + + + equipment/head/greeneggshell.xml + + + + + + equipment/head/orangeeggshell.xml + + + + + + equipment/head/darkeggshell.xml + + + + Date: Fri, 15 Feb 2013 23:24:51 +0100 Subject: Optimized eggshell hats: * Delete png/xml files of recolored eggshells. * Made original eggshell hat dyeable (reduce number of shades + desaturate) * Add dye string for current eggshell hat (give back its slight blue tint) * Add dye strings for the 6 easter 2013 eggshell hats * Fix incorrect IDs of orange/dark eggshell hats --- graphics/items/equipment/head/blueeggshell.png | Bin 590 -> 0 bytes graphics/items/equipment/head/darkeggshell.png | Bin 590 -> 0 bytes graphics/items/equipment/head/eggshell-hat.png | Bin 590 -> 435 bytes graphics/items/equipment/head/greeneggshell.png | Bin 590 -> 0 bytes graphics/items/equipment/head/orangeeggshell.png | Bin 590 -> 0 bytes graphics/items/equipment/head/redeggshell.png | Bin 590 -> 0 bytes graphics/items/equipment/head/yelloweggshell.png | Bin 590 -> 0 bytes graphics/sprites/equipment/head/blueeggshell.png | Bin 2100 -> 0 bytes graphics/sprites/equipment/head/blueeggshell.xml | 117 --------------------- graphics/sprites/equipment/head/darkeggshell.png | Bin 2073 -> 0 bytes graphics/sprites/equipment/head/darkeggshell.xml | 117 --------------------- graphics/sprites/equipment/head/eggshell.png | Bin 2156 -> 1549 bytes graphics/sprites/equipment/head/eggshell.xml | 2 +- graphics/sprites/equipment/head/greeneggshell.png | Bin 2077 -> 0 bytes graphics/sprites/equipment/head/greeneggshell.xml | 117 --------------------- graphics/sprites/equipment/head/orangeeggshell.png | Bin 2135 -> 0 bytes graphics/sprites/equipment/head/orangeeggshell.xml | 117 --------------------- graphics/sprites/equipment/head/redeggshell.png | Bin 2084 -> 0 bytes graphics/sprites/equipment/head/redeggshell.xml | 117 --------------------- graphics/sprites/equipment/head/yelloweggshell.png | Bin 2080 -> 0 bytes graphics/sprites/equipment/head/yelloweggshell.xml | 117 --------------------- items.xml | 32 +++--- 22 files changed, 17 insertions(+), 719 deletions(-) delete mode 100644 graphics/items/equipment/head/blueeggshell.png delete mode 100644 graphics/items/equipment/head/darkeggshell.png delete mode 100644 graphics/items/equipment/head/greeneggshell.png delete mode 100644 graphics/items/equipment/head/orangeeggshell.png delete mode 100644 graphics/items/equipment/head/redeggshell.png delete mode 100644 graphics/items/equipment/head/yelloweggshell.png delete mode 100644 graphics/sprites/equipment/head/blueeggshell.png delete mode 100644 graphics/sprites/equipment/head/blueeggshell.xml delete mode 100644 graphics/sprites/equipment/head/darkeggshell.png delete mode 100644 graphics/sprites/equipment/head/darkeggshell.xml delete mode 100644 graphics/sprites/equipment/head/greeneggshell.png delete mode 100644 graphics/sprites/equipment/head/greeneggshell.xml delete mode 100644 graphics/sprites/equipment/head/orangeeggshell.png delete mode 100644 graphics/sprites/equipment/head/orangeeggshell.xml delete mode 100644 graphics/sprites/equipment/head/redeggshell.png delete mode 100644 graphics/sprites/equipment/head/redeggshell.xml delete mode 100644 graphics/sprites/equipment/head/yelloweggshell.png delete mode 100644 graphics/sprites/equipment/head/yelloweggshell.xml diff --git a/graphics/items/equipment/head/blueeggshell.png b/graphics/items/equipment/head/blueeggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/blueeggshell.png and /dev/null differ diff --git a/graphics/items/equipment/head/darkeggshell.png b/graphics/items/equipment/head/darkeggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/darkeggshell.png and /dev/null differ diff --git a/graphics/items/equipment/head/eggshell-hat.png b/graphics/items/equipment/head/eggshell-hat.png index a23ef84d..882d9d3a 100644 Binary files a/graphics/items/equipment/head/eggshell-hat.png and b/graphics/items/equipment/head/eggshell-hat.png differ diff --git a/graphics/items/equipment/head/greeneggshell.png b/graphics/items/equipment/head/greeneggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/greeneggshell.png and /dev/null differ diff --git a/graphics/items/equipment/head/orangeeggshell.png b/graphics/items/equipment/head/orangeeggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/orangeeggshell.png and /dev/null differ diff --git a/graphics/items/equipment/head/redeggshell.png b/graphics/items/equipment/head/redeggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/redeggshell.png and /dev/null differ diff --git a/graphics/items/equipment/head/yelloweggshell.png b/graphics/items/equipment/head/yelloweggshell.png deleted file mode 100644 index a23ef84d..00000000 Binary files a/graphics/items/equipment/head/yelloweggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/blueeggshell.png b/graphics/sprites/equipment/head/blueeggshell.png deleted file mode 100644 index e70fad5c..00000000 Binary files a/graphics/sprites/equipment/head/blueeggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/blueeggshell.xml b/graphics/sprites/equipment/head/blueeggshell.xml deleted file mode 100644 index abeca9e4..00000000 --- a/graphics/sprites/equipment/head/blueeggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/equipment/head/darkeggshell.png b/graphics/sprites/equipment/head/darkeggshell.png deleted file mode 100644 index 6594109a..00000000 Binary files a/graphics/sprites/equipment/head/darkeggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/darkeggshell.xml b/graphics/sprites/equipment/head/darkeggshell.xml deleted file mode 100644 index f3cc2bad..00000000 --- a/graphics/sprites/equipment/head/darkeggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/equipment/head/eggshell.png b/graphics/sprites/equipment/head/eggshell.png index 1c66d53a..067c5994 100644 Binary files a/graphics/sprites/equipment/head/eggshell.png and b/graphics/sprites/equipment/head/eggshell.png differ diff --git a/graphics/sprites/equipment/head/eggshell.xml b/graphics/sprites/equipment/head/eggshell.xml index 3685a4ff..b8c63a5c 100644 --- a/graphics/sprites/equipment/head/eggshell.xml +++ b/graphics/sprites/equipment/head/eggshell.xml @@ -1,6 +1,6 @@ - + diff --git a/graphics/sprites/equipment/head/greeneggshell.png b/graphics/sprites/equipment/head/greeneggshell.png deleted file mode 100644 index 746df72e..00000000 Binary files a/graphics/sprites/equipment/head/greeneggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/greeneggshell.xml b/graphics/sprites/equipment/head/greeneggshell.xml deleted file mode 100644 index 84428a3f..00000000 --- a/graphics/sprites/equipment/head/greeneggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/equipment/head/orangeeggshell.png b/graphics/sprites/equipment/head/orangeeggshell.png deleted file mode 100644 index 005d771e..00000000 Binary files a/graphics/sprites/equipment/head/orangeeggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/orangeeggshell.xml b/graphics/sprites/equipment/head/orangeeggshell.xml deleted file mode 100644 index e3e64f50..00000000 --- a/graphics/sprites/equipment/head/orangeeggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/equipment/head/redeggshell.png b/graphics/sprites/equipment/head/redeggshell.png deleted file mode 100644 index c104bd83..00000000 Binary files a/graphics/sprites/equipment/head/redeggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/redeggshell.xml b/graphics/sprites/equipment/head/redeggshell.xml deleted file mode 100644 index ecad2383..00000000 --- a/graphics/sprites/equipment/head/redeggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/sprites/equipment/head/yelloweggshell.png b/graphics/sprites/equipment/head/yelloweggshell.png deleted file mode 100644 index 74854bdc..00000000 Binary files a/graphics/sprites/equipment/head/yelloweggshell.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/yelloweggshell.xml b/graphics/sprites/equipment/head/yelloweggshell.xml deleted file mode 100644 index 1f1fe3ef..00000000 --- a/graphics/sprites/equipment/head/yelloweggshell.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/items.xml b/items.xml index 76505acb..f0ae9c8e 100644 --- a/items.xml +++ b/items.xml @@ -3432,79 +3432,79 @@ equipment/legs/shorts-female.xml|#95887F,E0D1C9 - equipment/head/redeggshell.xml + equipment/head/eggshell.xml|#BC5959,E33636,FFA0A0 - equipment/head/blueeggshell.xml + equipment/head/eggshell.xml|#7eabfe,6590C7,cccfe7 - equipment/head/yelloweggshell.xml + equipment/head/eggshell.xml|#EFD806,D7C821,FFF476 - equipment/head/greeneggshell.xml + equipment/head/eggshell.xml|#2A9409,70BA59,ACF696 - - equipment/head/orangeeggshell.xml + equipment/head/eggshell.xml|#9B5D00,E17828,F7B37E - - equipment/head/darkeggshell.xml + equipment/head/eggshell.xml|#482D07,574123,877863 @@ -3971,14 +3971,14 @@ equipment/head/rabbit-ears.xml|#ffffff - equipment/head/eggshell.xml + equipment/head/eggshell.xml|#727272,A0A9AC,DBECF2 -- cgit v1.2.3-60-g2f50