summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE6
-rw-r--r--graphics/items/food/croconut-half.png (renamed from graphics/items/food/coconut-half.png)bin623 -> 623 bytes
-rw-r--r--graphics/items/food/croconut.png (renamed from graphics/items/food/coconut.png)bin480 -> 480 bytes
-rw-r--r--graphics/sprites/accessories/croconut.xml (renamed from graphics/sprites/accessories/coconut.xml)4
-rw-r--r--graphics/sprites/monsters/croconut.png (renamed from graphics/sprites/monsters/coconut.png)bin1810 -> 1810 bytes
-rw-r--r--graphics/sprites/monsters/croconut.xml (renamed from graphics/sprites/monsters/coconut.xml)4
-rw-r--r--items.xml10
-rw-r--r--monsters.xml8
-rw-r--r--npcs.xml2
-rw-r--r--sfx/monsters/croconut/die1.ogg (renamed from sfx/monsters/coconut/die1.ogg)bin8480 -> 8551 bytes
10 files changed, 18 insertions, 16 deletions
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/croconut-half.png
index a1ead900..a1ead900 100644
--- a/graphics/items/food/coconut-half.png
+++ b/graphics/items/food/croconut-half.png
Binary files differ
diff --git a/graphics/items/food/coconut.png b/graphics/items/food/croconut.png
index 927d76b7..927d76b7 100644
--- a/graphics/items/food/coconut.png
+++ b/graphics/items/food/croconut.png
Binary files differ
diff --git a/graphics/sprites/accessories/coconut.xml b/graphics/sprites/accessories/croconut.xml
index 09cac5c1..46009f14 100644
--- a/graphics/sprites/accessories/coconut.xml
+++ b/graphics/sprites/accessories/croconut.xml
@@ -2,9 +2,9 @@
<!-- Original Author : Reid
Copyright (C) 2012 Evol Online -->
<sprite>
- <imageset name="coconut" src="graphics/sprites/monsters/coconut.png" width="18" height="18" offsetY="-61"/>
+ <imageset name="croconut" src="graphics/sprites/monsters/croconut.png" width="18" height="18" offsetY="-61"/>
- <action name="stand" imageset="coconut">
+ <action name="stand" imageset="croconut">
<animation direction="default">
<frame index="1" delay="4211"/>
diff --git a/graphics/sprites/monsters/coconut.png b/graphics/sprites/monsters/croconut.png
index e6288383..e6288383 100644
--- a/graphics/sprites/monsters/coconut.png
+++ b/graphics/sprites/monsters/croconut.png
Binary files differ
diff --git a/graphics/sprites/monsters/coconut.xml b/graphics/sprites/monsters/croconut.xml
index 0374c696..3416c808 100644
--- a/graphics/sprites/monsters/coconut.xml
+++ b/graphics/sprites/monsters/croconut.xml
@@ -5,7 +5,7 @@ Copyright (C) 2010-2012 Evol Online
50% from the 95% unused percent from "mooving" label are used on "moovinglong" label.
100% from the 47,5% unused percent from "moovinglong" label are used on "static" label.-->
<sprite>
- <imageset name="base" src="graphics/sprites/monsters/coconut.png" width="18" height="18" offsetX="32" offsetY="-61"/>
+ <imageset name="base" src="graphics/sprites/monsters/croconut.png" width="18" height="18" offsetX="32" offsetY="-61"/>
<action name="stand" imageset="base">
<animation direction="default">
@@ -55,7 +55,7 @@ Copyright (C) 2010-2012 Evol Online
<action name="dead" imageset="base">
<animation>
- <!-- Coconut is falling -->
+ <!-- Croconut is falling -->
<frame index="1" delay="80" offsetY="1"/>
<frame index="1" delay="60" offsetY="2"/>
<frame index="1" delay="50" offsetY="4"/>
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"/>-->
<item id="512"
- image="food/coconut-half.png"
- name="Half Coconut"
+ image="food/croconut-half.png"
+ name="Half Croconut"
description="The inside seems delicious."
effect="+40 HP"
type="usable"
weight="14"/>
<item id="513"
- image="food/coconut.png"
- name="Coconut"
- description="Fallen from a palm tree, this coconut can be opened."
+ image="food/croconut.png"
+ name="Croconut"
+ description="Fallen from a palm tree, this croconut can be opened."
type="usable"
weight="30"/>
diff --git a/monsters.xml b/monsters.xml
index 3be9b9b7..c6ee25ad 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -76,7 +76,7 @@ exemple :
<sprite>monsters/croc.xml</sprite>
</monster>
<monster id="5" name="Little Blub" targetCursor="small" walkType="walkswim">
- <sprite>monsters/coconut.xml</sprite>
+ <sprite>monsters/blub-little.xml</sprite>
<sprite>accessories/littleblub-tentacle.xml</sprite>
<sound event="hit">monsters/blub/hit1.ogg</sound>
</monster>
@@ -90,8 +90,8 @@ exemple :
<sprite>accessories/blub-tophat.xml</sprite>
</monster> -->
<monster id="8" name="Coco Tree" targetCursor="large">
- <sprite>monsters/coconut.xml</sprite>
- <sound event="hurt">monsters/coconut/hurt1.ogg</sound>
- <sound event="die">monsters/coconut/die1.ogg</sound>
+ <sprite>monsters/croconut.xml</sprite>
+ <sound event="hurt">monsters/croconut/hurt1.ogg</sound>
+ <sound event="die">monsters/croconut/die1.ogg</sound>
</monster>
</monsters>
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
<npc id="316">
<!-- Tritan-Man, hitting a palm tree. -->
<sprite>npcs/xml/tarlan.xml</sprite>
- <sprite>accessories/coconut.xml</sprite>
+ <sprite>accessories/croconut.xml</sprite>
</npc>
diff --git a/sfx/monsters/coconut/die1.ogg b/sfx/monsters/croconut/die1.ogg
index 69ee7d21..7a5a3988 100644
--- a/sfx/monsters/coconut/die1.ogg
+++ b/sfx/monsters/croconut/die1.ogg
Binary files differ