From 91bb99da49c85c082d0d43f986b572ce80921adb Mon Sep 17 00:00:00 2001 From: Alige Date: Fri, 1 Jun 2012 11:02:59 +0200 Subject: Changed "coconut" to "croconut" in all files of clientdata. --- LICENSE | 6 ++- graphics/items/food/coconut-half.png | Bin 623 -> 0 bytes graphics/items/food/coconut.png | Bin 480 -> 0 bytes graphics/items/food/croconut-half.png | Bin 0 -> 623 bytes graphics/items/food/croconut.png | Bin 0 -> 480 bytes graphics/sprites/accessories/coconut.xml | 69 ------------------------- graphics/sprites/accessories/croconut.xml | 69 +++++++++++++++++++++++++ graphics/sprites/monsters/coconut.png | Bin 1810 -> 0 bytes graphics/sprites/monsters/coconut.xml | 81 ------------------------------ graphics/sprites/monsters/croconut.png | Bin 0 -> 1810 bytes graphics/sprites/monsters/croconut.xml | 81 ++++++++++++++++++++++++++++++ items.xml | 10 ++-- monsters.xml | 8 +-- npcs.xml | 2 +- sfx/monsters/coconut/die1.ogg | Bin 8480 -> 0 bytes sfx/monsters/croconut/die1.ogg | Bin 0 -> 8551 bytes 16 files changed, 164 insertions(+), 162 deletions(-) delete mode 100644 graphics/items/food/coconut-half.png delete mode 100644 graphics/items/food/coconut.png create mode 100644 graphics/items/food/croconut-half.png create mode 100644 graphics/items/food/croconut.png delete mode 100644 graphics/sprites/accessories/coconut.xml create mode 100644 graphics/sprites/accessories/croconut.xml delete mode 100644 graphics/sprites/monsters/coconut.png delete mode 100644 graphics/sprites/monsters/coconut.xml create mode 100644 graphics/sprites/monsters/croconut.png create mode 100644 graphics/sprites/monsters/croconut.xml delete mode 100644 sfx/monsters/coconut/die1.ogg create mode 100644 sfx/monsters/croconut/die1.ogg diff --git a/LICENSE b/LICENSE index a38ba6cf..7ba10879 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Licensed under Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0 http://creative maps/* (Reid) graphics/items/generic/use/acorn.png (Reid) - graphics/items/generic/coconut.png (Hal9000) + graphics/items/generic/croconut.png (Hal9000) graphics/items/generic/feathers.png (Reid) graphics/items/generic/fragmenttortugasshell.png (Reid) graphics/items/generic/rattooth.png (Reid) @@ -11,11 +11,12 @@ Licensed under Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0 http://creative graphics/items/generic/tortugasshell.png (Reid) graphics/items/use/bread.png (Reid) graphics/items/use/cheese.png (Reid) - graphics/items/use/halfcoconut.png (Hal9000) + graphics/items/use/halfcroconut.png (Hal9000) graphics/items/use/lettuce.png (Reid) graphics/items/use/piberries.png (Reid) graphics/items/equipment/boots.png (Enchilado) graphics/sprites/monsters/croc.png (Reid) + graphics/sprites/monsters/croconut.png (Hal9000) graphics/sprites/hairstyles/hairstyle26.png (Tayoko) graphics/tilesets/Accessories (Hal9000) graphics/tilesets/Tree_x3.png (Hal9000) @@ -28,6 +29,7 @@ Licensed under Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0 http://creative sfx/monsters/croc/hurt3.ogg (Ezili) sfx/monsters/croc/miss1.ogg (Ezili) sfx/monsters/croc/spawn1.ogg (Ezili) + sfx/monsters/croconut/die1.ogg (KomradeJack) sfx/monsters/piou/die1.ogg (Ezili) sfx/monsters/piou/hit1.ogg (Ezili) sfx/monsters/piou/hurt1.ogg (Ezili) diff --git a/graphics/items/food/coconut-half.png b/graphics/items/food/coconut-half.png deleted file mode 100644 index a1ead900..00000000 Binary files a/graphics/items/food/coconut-half.png and /dev/null differ diff --git a/graphics/items/food/coconut.png b/graphics/items/food/coconut.png deleted file mode 100644 index 927d76b7..00000000 Binary files a/graphics/items/food/coconut.png and /dev/null differ diff --git a/graphics/items/food/croconut-half.png b/graphics/items/food/croconut-half.png new file mode 100644 index 00000000..a1ead900 Binary files /dev/null and b/graphics/items/food/croconut-half.png differ diff --git a/graphics/items/food/croconut.png b/graphics/items/food/croconut.png new file mode 100644 index 00000000..927d76b7 Binary files /dev/null and b/graphics/items/food/croconut.png differ diff --git a/graphics/sprites/accessories/coconut.xml b/graphics/sprites/accessories/coconut.xml deleted file mode 100644 index 09cac5c1..00000000 --- a/graphics/sprites/accessories/coconut.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/accessories/croconut.xml b/graphics/sprites/accessories/croconut.xml new file mode 100644 index 00000000..46009f14 --- /dev/null +++ b/graphics/sprites/accessories/croconut.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/monsters/coconut.png b/graphics/sprites/monsters/coconut.png deleted file mode 100644 index e6288383..00000000 Binary files a/graphics/sprites/monsters/coconut.png and /dev/null differ diff --git a/graphics/sprites/monsters/coconut.xml b/graphics/sprites/monsters/coconut.xml deleted file mode 100644 index 0374c696..00000000 --- a/graphics/sprites/monsters/coconut.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/graphics/sprites/monsters/croconut.png b/graphics/sprites/monsters/croconut.png new file mode 100644 index 00000000..e6288383 Binary files /dev/null and b/graphics/sprites/monsters/croconut.png differ diff --git a/graphics/sprites/monsters/croconut.xml b/graphics/sprites/monsters/croconut.xml new file mode 100644 index 00000000..3416c808 --- /dev/null +++ b/graphics/sprites/monsters/croconut.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/items.xml b/items.xml index cdc4947b..9b85151c 100644 --- a/items.xml +++ b/items.xml @@ -282,16 +282,16 @@ Multiple's colors dye is now setted up by itemcolors.xml. type="usable" weight="2"/>--> diff --git a/monsters.xml b/monsters.xml index 3be9b9b7..c6ee25ad 100644 --- a/monsters.xml +++ b/monsters.xml @@ -76,7 +76,7 @@ exemple : monsters/croc.xml - monsters/coconut.xml + monsters/blub-little.xml accessories/littleblub-tentacle.xml monsters/blub/hit1.ogg @@ -90,8 +90,8 @@ exemple : accessories/blub-tophat.xml --> - monsters/coconut.xml - monsters/coconut/hurt1.ogg - monsters/coconut/die1.ogg + monsters/croconut.xml + monsters/croconut/hurt1.ogg + monsters/croconut/die1.ogg diff --git a/npcs.xml b/npcs.xml index c8c6887d..90566dd0 100644 --- a/npcs.xml +++ b/npcs.xml @@ -106,7 +106,7 @@ IDs 990-999 = Special npcs/xml/tarlan.xml - accessories/coconut.xml + accessories/croconut.xml diff --git a/sfx/monsters/coconut/die1.ogg b/sfx/monsters/coconut/die1.ogg deleted file mode 100644 index 69ee7d21..00000000 Binary files a/sfx/monsters/coconut/die1.ogg and /dev/null differ diff --git a/sfx/monsters/croconut/die1.ogg b/sfx/monsters/croconut/die1.ogg new file mode 100644 index 00000000..7a5a3988 Binary files /dev/null and b/sfx/monsters/croconut/die1.ogg differ -- cgit v1.2.3-70-g09d2