diff options
| author | Reid <reidyaro@gmail.com> | 2012-05-23 23:14:58 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-05-23 23:14:58 +0200 |
| commit | 1f984976298155aa60169e04d30dba4eb09f73b1 (patch) | |
| tree | 996dfe3b45977f3aad501affa945c45a697d7c99 | |
| parent | fff9c1f556e21115d07a7ecb2faa6c117e2adc4f (diff) | |
| download | clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.gz clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.bz2 clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.xz clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.zip | |
Correct some problem caused by the merge.
51 files changed, 534 insertions, 106 deletions
@@ -1,18 +1,18 @@ <?xml version="1.0"?> <emotes> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> <its:translateRule selector="//emote/@name" translate="yes"/> <its:translateRule selector="//emote/sprite/@name" translate="yes"/> <its:translateRule selector="//*" translate="no"/> </its:rules> - <!-- The sprite tags are purely for backwards compatibility. --> + <!-- Important note that the sprite tags are purely for + backwards compatibility --> <emote id="0" name="Disgust" effectid="10000" - image="graphics/emotes/disgust.png" + image="graphics/particles/emotes/disgust.png" width="30" height="32"> <sprite name="Disgust" variant="0">emote.xml</sprite> </emote> @@ -20,7 +20,7 @@ <emote id="1" name="Surprise" effectid="10001" - image="graphics/emotes/surprise.png" + image="graphics/particles/emotes/surprise.png" width="30" height="32"> <sprite name="Surprise" variant="1">emote.xml</sprite> </emote> @@ -28,7 +28,7 @@ <emote id="2" name="Happy" effectid="10002" - image="graphics/emotes/happy.png" + image="graphics/particles/emotes/happy.png" width="30" height="32"> <sprite name="Happy" variant="2">emote.xml</sprite> </emote> @@ -36,7 +36,7 @@ <emote id="3" name="Sad" effectid="10003" - image="graphics/emotes/sad.png" + image="graphics/particles/emotes/sad.png" width="30" height="32"> <sprite name="Sad" variant="3">emote.xml</sprite> </emote> @@ -44,7 +44,7 @@ <emote id="4" name="Evil" effectid="10004" - image="graphics/emotes/evil.png" + image="graphics/particles/emotes/evil.png" width="30" height="32"> <sprite name="Evil" variant="4">emote.xml</sprite> </emote> @@ -52,7 +52,7 @@ <emote id="5" name="Wink" effectid="10005" - image="graphics/emotes/wink.png" + image="graphics/particles/emotes/wink.png" width="30" height="32"> <sprite name="Wink" variant="5">emote.xml</sprite> </emote> @@ -60,7 +60,7 @@ <emote id="6" name="Angel" effectid="10006" - image="graphics/emotes/angel.png" + image="graphics/particles/emotes/angel.png" width="30" height="32"> <sprite name="Angel" variant="6">emote.xml</sprite> </emote> @@ -68,7 +68,7 @@ <emote id="7" name="Blush" effectid="10007" - image="graphics/emotes/blush.png" + image="graphics/particles/emotes/blush.png" width="30" height="32"> <sprite name="Blush" variant="7">emote.xml</sprite> </emote> @@ -76,7 +76,7 @@ <emote id="8" name="Tongue" effectid="10008" - image="graphics/emotes/tongue.png" + image="graphics/particles/emotes/tongue.png" width="30" height="32"> <sprite name="Tongue" variant="8">emote.xml</sprite> </emote> @@ -84,7 +84,7 @@ <emote id="9" name="Grin" effectid="10009" - image="graphics/emotes/grin.png" + image="graphics/particles/emotes/grin.png" width="30" height="32"> <sprite name="Grin" variant="9">emote.xml</sprite> </emote> @@ -92,7 +92,7 @@ <emote id="10" name="Upset" effectid="10010" - image="graphics/emotes/upset.png" + image="graphics/particles/emotes/upset.png" width="30" height="32"> <sprite name="Upset" variant="10">emote.xml</sprite> </emote> @@ -100,7 +100,7 @@ <emote id="11" name="Perturbed" effectid="10011" - image="graphics/emotes/perturbed.png" + image="graphics/particles/emotes/perturbed.png" width="30" height="32"> <sprite name="Perturbed" variant="11">emote.xml</sprite> </emote> @@ -108,7 +108,7 @@ <emote id="12" name="Speech" effectid="10012" - image="graphics/emotes/speech.png" + image="graphics/particles/emotes/speech.png" width="30" height="32"> <sprite name="Speech" variant="14">emote.xml</sprite> </emote> @@ -116,7 +116,7 @@ <emote id="13" name="Blah" effectid="10013" - image="graphics/emotes/blah.png" + image="graphics/particles/emotes/blah.png" width="30" height="32"> <sprite name="Blah" variant="13">emote.xml</sprite> </emote> diff --git a/graphics/sprites/emote.xml b/graphics/sprites/emote.xml index b2e1a340..231d6ed2 100644 --- a/graphics/sprites/emote.xml +++ b/graphics/sprites/emote.xml @@ -2,12 +2,11 @@ <!-- Original Author possible tmw, tmw br, ufb projects Copyright (C) 2010-2011 Evol Online --> <sprite variants="15" variant_offset="1"> - <imageset name="base" src="graphics/sprites/emote.png" width="30" height="32"/> + <imageset name="base" src="graphics/sprites/emotions.png" width="30" height="32" /> <action name="stand" imageset="base"> <animation direction="default"> - <frame index="0"/> + <frame index="0" /> </animation> </action> - </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle10.xml b/graphics/sprites/hairstyles/hairstyle10.xml index bf75e10e..db0faf6e 100644 --- a/graphics/sprites/hairstyles/hairstyle10.xml +++ b/graphics/sprites/hairstyles/hairstyle10.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle10.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle11.xml b/graphics/sprites/hairstyles/hairstyle11.xml index 2e13bb69..a184fe4a 100644 --- a/graphics/sprites/hairstyles/hairstyle11.xml +++ b/graphics/sprites/hairstyles/hairstyle11.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle11.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle12.xml b/graphics/sprites/hairstyles/hairstyle12.xml index 0340644f..58344bd5 100644 --- a/graphics/sprites/hairstyles/hairstyle12.xml +++ b/graphics/sprites/hairstyles/hairstyle12.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle12.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle14.xml b/graphics/sprites/hairstyles/hairstyle14.xml index 700b9715..2cfa32f9 100644 --- a/graphics/sprites/hairstyles/hairstyle14.xml +++ b/graphics/sprites/hairstyles/hairstyle14.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle14.png|W" width="40" height="42" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle15.xml b/graphics/sprites/hairstyles/hairstyle15.xml index 0d58d865..caca096d 100644 --- a/graphics/sprites/hairstyles/hairstyle15.xml +++ b/graphics/sprites/hairstyles/hairstyle15.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle15.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle16.xml b/graphics/sprites/hairstyles/hairstyle16.xml index 0cb62d4d..a8cb497e 100644 --- a/graphics/sprites/hairstyles/hairstyle16.xml +++ b/graphics/sprites/hairstyles/hairstyle16.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle16.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle17.xml b/graphics/sprites/hairstyles/hairstyle17.xml index 55e18a45..b8d1a729 100644 --- a/graphics/sprites/hairstyles/hairstyle17.xml +++ b/graphics/sprites/hairstyles/hairstyle17.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle17.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle18.xml b/graphics/sprites/hairstyles/hairstyle18.xml index 6ce45c6f..ceabab0f 100644 --- a/graphics/sprites/hairstyles/hairstyle18.xml +++ b/graphics/sprites/hairstyles/hairstyle18.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle18.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle19.xml b/graphics/sprites/hairstyles/hairstyle19.xml index 0adac4a9..4d1de43c 100644 --- a/graphics/sprites/hairstyles/hairstyle19.xml +++ b/graphics/sprites/hairstyles/hairstyle19.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle19.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle20.xml b/graphics/sprites/hairstyles/hairstyle20.xml index 6683bbcb..1dd9991f 100644 --- a/graphics/sprites/hairstyles/hairstyle20.xml +++ b/graphics/sprites/hairstyles/hairstyle20.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle20.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle21.xml b/graphics/sprites/hairstyles/hairstyle21.xml index 6cb93146..9ded3c80 100644 --- a/graphics/sprites/hairstyles/hairstyle21.xml +++ b/graphics/sprites/hairstyles/hairstyle21.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle21.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle22.xml b/graphics/sprites/hairstyles/hairstyle22.xml index 3aee098f..7c340442 100644 --- a/graphics/sprites/hairstyles/hairstyle22.xml +++ b/graphics/sprites/hairstyles/hairstyle22.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle22.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle24.xml b/graphics/sprites/hairstyles/hairstyle24.xml index fd04d66a..9d363875 100644 --- a/graphics/sprites/hairstyles/hairstyle24.xml +++ b/graphics/sprites/hairstyles/hairstyle24.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle24.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle25.xml b/graphics/sprites/hairstyles/hairstyle25.xml index 186fa90f..1e548852 100644 --- a/graphics/sprites/hairstyles/hairstyle25.xml +++ b/graphics/sprites/hairstyles/hairstyle25.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2011 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/hairstyles/hairstyle26.xml b/graphics/sprites/hairstyles/hairstyle26.xml index 7f9cd79a..4f4f9fa5 100644 --- a/graphics/sprites/hairstyles/hairstyle26.xml +++ b/graphics/sprites/hairstyles/hairstyle26.xml @@ -5,6 +5,6 @@ Copyright (C) 2010-2012 Evol Online --> <imageset name="base" src="graphics/sprites/hairstyles/hairstyle26.png|W" width="40" height="40" /> - <include file="hairstyles/hairstyle01.xml"/> + <include file="hairstyles/hairstyle1.xml"/> </sprite> diff --git a/graphics/sprites/icons/hidden.png b/graphics/sprites/icons/hidden.png Binary files differindex d2417669..c326d0ad 100755..100644 --- a/graphics/sprites/icons/hidden.png +++ b/graphics/sprites/icons/hidden.png diff --git a/graphics/sprites/icons/hidden.xml b/graphics/sprites/icons/hidden.xml index d916d6c8..04f77265 100644 --- a/graphics/sprites/icons/hidden.xml +++ b/graphics/sprites/icons/hidden.xml @@ -1,16 +1,12 @@ <?xml version="1.0"?> +<!-- Original Author possible tmw, tmw br, ufb projects +Copyright (C) 2010-2011 Evol Online --> <sprite> - <imageset name="icon" src="graphics/sprites/icons/hidden.png" width="10" height="9" offsetX="-8" offsetY="6"/> - <action name="default" imageset="icon"> + <imageset name="base" src="graphics/sprites/icons/hidden.png" width="12" height="12" /> + + <action name="default" imageset="base"> <animation direction="default"> - <frame index="0" delay="2000"/> - <frame index="1" delay="150"/> - <frame index="2" delay="300"/> - <frame index="1" delay="200"/> - <frame index="0" delay="1500"/> - <frame index="1" delay="100"/> - <frame index="2" delay="100"/> - <frame index="1" delay="100"/> + <frame index="0" offsetY="-15" delay="0"/> </animation> </action> </sprite> diff --git a/graphics/sprites/monsters/piou.xml b/graphics/sprites/monsters/piou.xml index 9116d0fb..73a01dc7 100644 --- a/graphics/sprites/monsters/piou.xml +++ b/graphics/sprites/monsters/piou.xml @@ -4,7 +4,7 @@ Copyright (C) 2011 Evol Online --> <sprite> <imageset name="piou" src="graphics/sprites/monsters/piou.png" width="10" height="9" offsetY="-12"/> - <imageset name="egg" src="graphics/sprites/accessories/piousse-egg.png" width="11" height="11" offsetY="-12"/> + <imageset name="egg" src="graphics/sprites/accessories/acc-piousse-egg.png" width="11" height="11" offsetY="-12"/> <action name="spawn" imageset="egg"> diff --git a/graphics/sprites/npcs/xml/alige.xml b/graphics/sprites/npcs/xml/alige.xml new file mode 100644 index 00000000..ca101e2c --- /dev/null +++ b/graphics/sprites/npcs/xml/alige.xml @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<!-- Author : Reid, Dan +Copyright (C) 2011 Evol Online --> +<sprite> + <imageset name="npc" src="graphics/sprites/npcs/sprite/alige.png" width="11" height="5" offsetX="0" offsetY="-13"/> + + <action name="stand" imageset="npc"> + <!-- Open eyes animation --> + <animation direction="left"> + <frame index="2" delay="100"/> + <frame index="1" delay="90"/> + </animation> + + <!-- Close eyes animation --> + <animation direction="up"> + <frame index="1" delay="100"/> + <frame index="2" delay="90"/> + </animation> + + <!-- Opened eyes --> + <animation direction="right"> + <frame index="0" delay="9000"/> + <frame index="1" delay="90"/> + <frame index="2" delay="80"/> + <frame index="3" delay="200"/> + <frame index="2" delay="80"/> + <frame index="1" delay="80"/> + </animation> + + <!-- Closed eyes --> + <animation direction="down"> + <frame index="3"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/animated_hammock1.xml b/graphics/sprites/npcs/xml/animated_hammock1.xml new file mode 100644 index 00000000..7d6a24b4 --- /dev/null +++ b/graphics/sprites/npcs/xml/animated_hammock1.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011-2012 Evol Online --> +<sprite> + <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/> + <action name="stand" imageset="npc"> + <!-- Mooving hammock. --> + <animation direction="left"> + <frame index="3" delay="300"/> + <frame index="2" delay="180"/> + <frame index="1" delay="150"/> + <frame index="0" delay="400"/> + <frame index="1" delay="180"/> + <frame index="2" delay="150"/> + </animation> + <!-- Static hammock. --> + <animation direction="up"> + <frame index="3"/> + </animation> + </action> +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/animated_hammock2.xml b/graphics/sprites/npcs/xml/animated_hammock2.xml new file mode 100644 index 00000000..1853d7cc --- /dev/null +++ b/graphics/sprites/npcs/xml/animated_hammock2.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011-2012 Evol Online --> +<sprite> + <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/> + <action name="stand" imageset="npc"> + <!-- Mooving hammock. --> + <animation direction="left"> + <frame index="7" delay="300"/> + <frame index="6" delay="180"/> + <frame index="5" delay="150"/> + <frame index="4" delay="400"/> + <frame index="5" delay="180"/> + <frame index="6" delay="150"/> + </animation> + <!-- Static hammock. --> + <animation direction="up"> + <frame index="7"/> + </animation> + </action> +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/billybons.xml b/graphics/sprites/npcs/xml/billybons.xml new file mode 100644 index 00000000..90757589 --- /dev/null +++ b/graphics/sprites/npcs/xml/billybons.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/billybons.png" width="49" height="42" offsetX="17" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/elmo1.xml b/graphics/sprites/npcs/xml/elmo1.xml new file mode 100644 index 00000000..89e31c90 --- /dev/null +++ b/graphics/sprites/npcs/xml/elmo1.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/elmo1.png" width="50" height="70" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/gugli.xml b/graphics/sprites/npcs/xml/gugli.xml new file mode 100644 index 00000000..37e0eadc --- /dev/null +++ b/graphics/sprites/npcs/xml/gugli.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<!-- Author : Reid 4144 +Copyright (C) 2011-2012 Evol Online + +Example of the extended animation tags. +Allow set in attribute value any frame numbers. + +Both of these examples show the same thing: + <sequence start="55" end="60" delay="75" /> + <sequence value="55-60" delay="75" /> + <sequence value="55,56,57,58,59,60" delay="75" /> --> + +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/gugli.png" width="70" height="70" offsetX ="-7" offsetY ="2"/> + + <action name="stand" imageset="base"> + + <animation direction="default"> + <label name="start"/> + <!-- 40% used on "long" label. --> + <goto label="long" rand="40"/> + <!-- 100% from the 60% unused percent are used on "simple" label. --> + <goto label="simple" rand="100"/> + <!-- Long move leg animation. --> + <label name="long"/> + <frame index="0" delay="120"/> + <sequence value="1,2" delay="110"/> + <frame index="3" delay="120"/> + <sequence value="2,1" delay="110"/> + <jump label="start"/> + <!-- Simple move leg animation. --> + <label name="simple"/> + <frame index="0" delay="120"/> + <frame index="1" delay="110"/> + <frame index="2" delay="120"/> + <frame index="1" delay="110"/> + <jump label="start"/> + </animation> + </action> + +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/hammock.xml b/graphics/sprites/npcs/xml/hammock.xml new file mode 100644 index 00000000..a2065688 --- /dev/null +++ b/graphics/sprites/npcs/xml/hammock.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011 Evol Online --> +<sprite variants="2" variant_offset="1"> + + <imageset name="base" src="graphics/sprites/npcs/sprite/hammock.png" width="96" height="64" /> + + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" /> + </animation> + </action> + +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/julia.xml b/graphics/sprites/npcs/xml/julia.xml new file mode 100644 index 00000000..0937934f --- /dev/null +++ b/graphics/sprites/npcs/xml/julia.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2010-2011 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/julia.png" width="50" height="70" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/magic_arpan.xml b/graphics/sprites/npcs/xml/magic_arpan.xml new file mode 100644 index 00000000..dd695d65 --- /dev/null +++ b/graphics/sprites/npcs/xml/magic_arpan.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/magic_arpan.png" width="32" height="64" /> + <action name="stand" imageset="base"> + <animation direction="default"> +<!-- Eye animation --> + <frame index="0" delay="7000"/> + <frame index="3" delay="60"/> + <frame index="4" delay="120"/> + <frame index="3" delay="70"/> +<!-- Mouth animation --> + <frame index="0" delay="6000"/> + <sequence start="1" end="2" delay="130" repeat="4" /> + <frame index="1" delay="90"/> +<!-- Eye animation --> + <frame index="0" delay="3500"/> + <frame index="3" delay="60"/> + <frame index="4" delay="120"/> + <frame index="3" delay="70"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/nard.xml b/graphics/sprites/npcs/xml/nard.xml new file mode 100644 index 00000000..7bf901b4 --- /dev/null +++ b/graphics/sprites/npcs/xml/nard.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/nard.png" width="64" height="64" offsetX="16" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="10000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/npc.xml b/graphics/sprites/npcs/xml/npc.xml new file mode 100644 index 00000000..347d0ec0 --- /dev/null +++ b/graphics/sprites/npcs/xml/npc.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite variants="5" variant_offset="1"> + + <imageset name="base" src="graphics/sprites/npcs/sprite/npc.png|S" width="64" height="64" /> + + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" /> + </animation> + </action> + +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/piousrocket.xml b/graphics/sprites/npcs/xml/piousrocket.xml new file mode 100644 index 00000000..cde4eb57 --- /dev/null +++ b/graphics/sprites/npcs/xml/piousrocket.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011 Evol Online --> +<sprite> + <imageset name="npc" src="graphics/sprites/npcs/sprite/piousrocket.png" width="13" height="50" offsetX="-2"/> + + <action name="stand" imageset="npc"> + <!-- Jump piousrocket --> + <animation direction="left"> + <frame index="1" delay="90"/> + <frame index="2" delay="80"/> + <frame index="3" delay="70"/> + <frame index="11" delay="100"/> + <frame index="0" delay="80"/> + <frame index="1" delay="90"/> + <frame index="2" delay="80"/> + <frame index="3" delay="70"/> + <frame index="4" delay="100"/> + <sequence start="5" end="6" delay="90" /> + <frame index="7" delay="110"/> + <sequence start="8" end="10" delay="90" /> + <frame index="11" delay="100"/> + </animation> + <!-- Static piou --> + <animation direction="up"> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/rattosailor.xml b/graphics/sprites/npcs/xml/rattosailor.xml new file mode 100644 index 00000000..0ab0dc83 --- /dev/null +++ b/graphics/sprites/npcs/xml/rattosailor.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2010-2011 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/rattosailor.png" width="50" height="70" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/sailors.xml b/graphics/sprites/npcs/xml/sailors.xml new file mode 100644 index 00000000..6e0fb6bb --- /dev/null +++ b/graphics/sprites/npcs/xml/sailors.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/sailors.png" width="278" height="149"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="19" offsetX="19"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/sapartan.xml b/graphics/sprites/npcs/xml/sapartan.xml new file mode 100644 index 00000000..8f74b08a --- /dev/null +++ b/graphics/sprites/npcs/xml/sapartan.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/sapartan.png" width="32" height="57" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/silvio.xml b/graphics/sprites/npcs/xml/silvio.xml new file mode 100644 index 00000000..7d6a7212 --- /dev/null +++ b/graphics/sprites/npcs/xml/silvio.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2011 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/silvio.png" width="40" height="50" /> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" delay="7000"/> + <frame index="1" delay="60"/> + <frame index="2" delay="120"/> + <frame index="1" delay="70"/> + <frame index="0" delay="3500"/> + <frame index="1" delay="60"/> + <frame index="2" delay="120"/> + <frame index="1" delay="70"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/sleepingorc.xml b/graphics/sprites/npcs/xml/sleepingorc.xml new file mode 100644 index 00000000..cf361a3b --- /dev/null +++ b/graphics/sprites/npcs/xml/sleepingorc.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2010-2012 Evol Online --> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/sleepingorc.png" width="32" height="64" /> + + <action name="stand" imageset="base"> + <animation direction="default"> + <sequence start="0" end="2" delay="380" /> + <frame index="1" delay="380" /> + <frame index="0" delay="500" /> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/smallnpc.xml b/graphics/sprites/npcs/xml/smallnpc.xml new file mode 100644 index 00000000..c2b1565f --- /dev/null +++ b/graphics/sprites/npcs/xml/smallnpc.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite variants="2" variant_offset="1"> + + <imageset name="base" src="graphics/sprites/npcs/sprite/smallnpc.png" width="32" height="32" /> + + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0" /> + </animation> + </action> + +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/npcs/xml/tarlan.xml b/graphics/sprites/npcs/xml/tarlan.xml new file mode 100644 index 00000000..54dc4fe8 --- /dev/null +++ b/graphics/sprites/npcs/xml/tarlan.xml @@ -0,0 +1,78 @@ +<?xml version="1.0"?> +<!-- Author : Reid +Copyright (C) 2012 Evol Online --> +<sprite> + + <imageset name="tarlan" src="graphics/sprites/npcs/sprite/tarlan.png" width="64" height="64" offsetX="-8"/> + + <action name="stand" imageset="tarlan"> + <animation direction="default"> + <!-- Getting ready to fight --> + <frame index="0" delay="3141" offsetX="8"/> + <frame index="1" delay="100" offsetX="5"/> + <frame index="2" delay="220" offsetX="4"/> + <!-- Fight --> + <frame index="3" delay="110"/> + <frame index="4" delay="140"/> + <sequence start="5" end="6" delay="120"/> + <frame index="5" delay="90"/> + <frame index="4" delay="140"/> + <frame index="3" delay="110"/> + <frame index="4" delay="130"/> + <sequence start="5" end="6" delay="120"/> + <frame index="5" delay="90"/> + <frame index="4" delay="140"/> + <frame index="3" delay="110"/> + <!-- Stop --> + <frame index="7" delay="110" offsetX="5"/> + <frame index="0" delay="100" offsetX="8"/> + <frame index="8" delay="800" offsetX="10"/> + <frame index="0" delay="120" offsetX="8"/> + <frame index="1" delay="100" offsetX="5"/> + <frame index="2" delay="210" offsetX="4"/> + <!-- Fight again longer and faster --> + <frame index="3" delay="100"/> + <frame index="4" delay="130"/> + <sequence start="5" end="6" delay="110"/> + <frame index="5" delay="85"/> + <frame index="4" delay="120"/> + <frame index="3" delay="95"/> + <frame index="4" delay="130"/> + <sequence start="5" end="6" delay="105"/> + <frame index="5" delay="80"/> + <frame index="4" delay="115"/> + <frame index="3" delay="95"/> + <frame index="4" delay="115"/> + <sequence start="5" end="6" delay="105"/> + <frame index="5" delay="80"/> + <frame index="4" delay="115"/> + <frame index="3" delay="95"/> + <frame index="4" delay="115"/> + <sequence start="5" end="6" delay="105"/> + <frame index="5" delay="80"/> + <frame index="4" delay="115"/> + <frame index="3" delay="100"/> + <frame index="4" delay="130"/> + <sequence start="5" end="6" delay="110"/> + <frame index="5" delay="90"/> + <frame index="4" delay="130"/> + <frame index="3" delay="105"/> + <!-- Get hitted --> + <frame index="7" delay="110" offsetX="5"/> + <frame index="0" delay="100" offsetX="8"/> + <frame index="8" delay="900" offsetX="10"/> + <frame index="9" delay="140" offsetX="11"/> + <!-- Down --> + <frame index="10" delay="110" offsetX="8" offsetY="2"/> + <!-- Bird --> + <sequence start="11" end="12" delay="105" repeat="8" offsetY="5" offsetX="8"/> + <!-- Sit --> + <frame index="13" delay="90" offsetY="5" offsetX="8"/> + <frame index="14" delay="5926" offsetY="5" offsetX="8"/> + <!-- Get back --> + <frame index="15" delay="130" offsetX="8"/> + <frame index="0" delay="3141" offsetX="8"/> + </animation> + </action> + +</sprite>
\ No newline at end of file diff --git a/graphics/tilesets/Tree_x4.png b/graphics/tilesets/Tree_x4.png Binary files differindex c9458e15..b1db498c 100644 --- a/graphics/tilesets/Tree_x4.png +++ b/graphics/tilesets/Tree_x4.png @@ -35,31 +35,31 @@ Multiple's colors dye is now setted up by itemcolors.xml. <!-- Hairsprites --> <item id="-1" type="hairsprite" name="Flat ponytail"> - <sprite>hairstyles/hairstyle01.xml</sprite> + <sprite>hairstyles/hairstyle1.xml</sprite> </item> <item id="-2" type="hairsprite" name="Bowl cut"> - <sprite>hairstyles/hairstyle02.xml</sprite> + <sprite>hairstyles/hairstyle2.xml</sprite> </item> <item id="-3" type="hairsprite" name="Combed back"> - <sprite>hairstyles/hairstyle03.xml</sprite> + <sprite>hairstyles/hairstyle3.xml</sprite> </item> <item id="-4" type="hairsprite" name="Emo"> - <sprite>hairstyles/hairstyle04.xml</sprite> + <sprite>hairstyles/hairstyle4.xml</sprite> </item> <item id="-5" type="hairsprite" name="Mohawk"> - <sprite>hairstyles/hairstyle05.xml</sprite> + <sprite>hairstyles/hairstyle5.xml</sprite> </item> <item id="-6" type="hairsprite" name="Pompadour"> - <sprite>hairstyles/hairstyle06.xml</sprite> + <sprite>hairstyles/hairstyle6.xml</sprite> </item> <item id="-7" type="hairsprite" name="Center parting"> - <sprite>hairstyles/hairstyle07.xml</sprite> + <sprite>hairstyles/hairstyle7.xml</sprite> </item> <item id="-8" type="hairsprite" name="Long and slick"> - <sprite>hairstyles/hairstyle08.xml</sprite> + <sprite>hairstyles/hairstyle8.xml</sprite> </item> <item id="-9" type="hairsprite" name="Short and curly"> - <sprite>hairstyles/hairstyle09.xml</sprite> + <sprite>hairstyles/hairstyle9.xml</sprite> </item> <item id="-10" type="hairsprite" name="Pigtails"> <sprite>hairstyles/hairstyle10.xml</sprite> @@ -481,7 +481,7 @@ Multiple's colors dye is now setted up by itemcolors.xml. <!-- Head --> <item id="2900" - image="equipment/head/bandana.png" + image="equipment/head/bandana hat.png" name="Bandana" description="A striped bandana." effect="Defense +1" @@ -489,7 +489,7 @@ Multiple's colors dye is now setted up by itemcolors.xml. defense="1" weight="13" max-per-slot="1"> - <sprite>equipment/head/bandana.xml</sprite> + <sprite>equipment/head/bandana hat.xml</sprite> <replace sprite="hair"> <item from="-3" to="-2" /> <item from="-5" to="-4" /> diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx index 04311e0b..f87f9d3d 100644 --- a/maps/000-0-0.tmx +++ b/maps/000-0-0.tmx @@ -7,19 +7,19 @@ <property name="music" value="bartk-indoor-artis.ogg"/> </properties> <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/> </tileset> <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/> </tileset> <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Shadow.png" width="160" height="160"/> + <image source="../graphics/tilesets/Indoor/Shadow.png" width="160" height="160"/> </tileset> <tileset firstgid="410" name="Box" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/> + <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/> </tileset> <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <layer name="Ground" width="44" height="44"> <data encoding="base64" compression="gzip"> diff --git a/maps/000-0.tmx b/maps/000-0.tmx index 7d7959ad..4b6987f9 100644 --- a/maps/000-0.tmx +++ b/maps/000-0.tmx @@ -15,7 +15,7 @@ <property name="overlay1scrollY" value="0.35"/> </properties> <tileset firstgid="1" name="Water" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Water.png" width="480" height="352"/> + <image source="../graphics/tilesets/Water.png" width="480" height="352"/> <tile id="120"> <properties> <property name="animation-delay0" value="18"/> @@ -340,16 +340,16 @@ </tile> </tileset> <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ship_base.png" width="704" height="320"/> + <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/> </tileset> <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ship2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/> </tileset> <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <tileset firstgid="646" name="Ground" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ground.png" width="512" height="512"/> + <image source="../graphics/tilesets/Ground.png" width="512" height="512"/> </tileset> <layer name="Ground" width="47" height="47"> <data encoding="base64" compression="gzip"> diff --git a/maps/000-1.tmx b/maps/000-1.tmx index 46bed959..c03b9525 100644 --- a/maps/000-1.tmx +++ b/maps/000-1.tmx @@ -10,19 +10,22 @@ <property name="overlay0scrollY" value="0.1"/> </properties> <tileset firstgid="1" name="Water" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Water.png" width="480" height="352"/> + <image source="../graphics/tilesets/Water.png" width="480" height="352"/> </tileset> <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ship_base.png" width="704" height="320"/> + <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/> </tileset> <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ship2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/> </tileset> <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <tileset firstgid="646" name="Ground" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Ground.png" width="512" height="512"/> + <image source="../graphics/tilesets/Ground.png" width="512" height="512"/> + </tileset> + <tileset firstgid="902" name="Tree_x4" tilewidth="96" tileheight="128"> + <image source="../graphics/tilesets/Tree_x4.png" width="480" height="256"/> </tileset> <layer name="Ground" width="120" height="140"> <data encoding="base64" compression="gzip"> @@ -41,7 +44,7 @@ </layer> <layer name="Over" width="120" height="140"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgbKjKnngAYBAA== + H4sIAAAAAAAAA+3OQQ0AAAgEoNvMb2dbqA9IQAIAAAAAAAAAAAAAAAAAAAAAAAAA8EPX9QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANg2pJBGHIAGAQA= </data> </layer> <layer name="Collision" width="120" height="140"> diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx index bfbc57fb..3d5f957d 100644 --- a/maps/000-2-0.tmx +++ b/maps/000-2-0.tmx @@ -6,13 +6,13 @@ <property name="music" value="bartk-indoor-artis.ogg"/> </properties> <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/> </tileset> <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/> </tileset> <tileset firstgid="385" name="Candle" tilewidth="32" tileheight="64"> - <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/> + <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/> <tile id="0"> <properties> <property name="animation-delay0" value="13"/> @@ -43,10 +43,10 @@ </tile> </tileset> <tileset firstgid="391" name="Box" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/> + <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/> </tileset> <tileset firstgid="411" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <layer name="Ground" width="52" height="53"> <data encoding="base64" compression="gzip"> diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx index d577eee2..5af26a6f 100644 --- a/maps/000-2-1.tmx +++ b/maps/000-2-1.tmx @@ -7,13 +7,13 @@ <property name="music" value="bartk-indoor-artis.ogg"/> </properties> <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/> </tileset> <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/> </tileset> <tileset firstgid="385" name="Candle" tilewidth="32" tileheight="64"> - <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/> + <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/> <tile id="0"> <properties> <property name="animation-delay0" value="13"/> @@ -44,13 +44,13 @@ </tile> </tileset> <tileset firstgid="391" name="Box" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/> + <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/> </tileset> <tileset firstgid="411" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <tileset firstgid="415" name="Ship-indoor_x3" tilewidth="64" tileheight="128"> - <image source="../graphics/tiles/Indoor/Ship-indoor_x3.png" width="64" height="128"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor_x3.png" width="64" height="128"/> </tileset> <layer name="Ground" width="83" height="59"> <data encoding="base64" compression="gzip"> diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx index 3c359395..84a5c418 100644 --- a/maps/000-2-2.tmx +++ b/maps/000-2-2.tmx @@ -7,16 +7,16 @@ <property name="music" value="bartk-indoor-artis.ogg"/> </properties> <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/> </tileset> <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/> </tileset> <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/> + <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/> </tileset> <tileset firstgid="405" name="Candle" tilewidth="32" tileheight="64"> - <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/> + <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/> <tile id="0"> <properties> <property name="animation-delay0" value="13"/> @@ -47,13 +47,13 @@ </tile> </tileset> <tileset firstgid="411" name="Shadow" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Shadow.png" width="160" height="160"/> + <image source="../graphics/tilesets/Indoor/Shadow.png" width="160" height="160"/> </tileset> <tileset firstgid="436" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <tileset firstgid="440" name="Ship-indoor_x3" tilewidth="64" tileheight="128"> - <image source="../graphics/tiles/Indoor/Ship-indoor_x3.png" width="64" height="128"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor_x3.png" width="64" height="128"/> </tileset> <layer name="Ground" width="70" height="62"> <data encoding="base64" compression="gzip"> diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx index bec5b644..17117ba1 100644 --- a/maps/000-2-3.tmx +++ b/maps/000-2-3.tmx @@ -6,19 +6,19 @@ <property name="music" value="bartk-indoor-artis.ogg"/> </properties> <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/> + <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/> </tileset> <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/> + <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/> </tileset> <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/> + <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/> </tileset> <tileset firstgid="405" name="Carpet" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Indoor/Carpet.png" width="96" height="96"/> + <image source="../graphics/tilesets/Indoor/Carpet.png" width="96" height="96"/> </tileset> <tileset firstgid="414" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <image source="../graphics/tilesets/Collision.png" width="64" height="64"/> </tileset> <layer name="Ground" width="52" height="53" visible="0"> <data encoding="base64" compression="gzip"> diff --git a/monsters.xml b/monsters.xml index 85cc4adc..75b6e17f 100644 --- a/monsters.xml +++ b/monsters.xml @@ -39,7 +39,7 @@ exemple : </monster> <monster id="1" name="Piousse" targetCursor="small" walkType="walk"> <sprite>monsters/piou.xml</sprite> - <sprite>accessories/piousse-egg.xml</sprite> + <sprite>accessories/acc-piousse-egg.xml</sprite> <sound event="die">monsters/piou/piou-die-1.ogg</sound> <sound event="hit">monsters/piou/piou-hit-1.ogg</sound> <sound event="hurt">monsters/piou/piou-hurt-1.ogg</sound> @@ -58,7 +58,7 @@ exemple : </monster> <monster id="3" name="Ratto" targetCursor="small" walkType="walk"> <sprite>monsters/ratto.xml</sprite> - <sprite>accessories/ratto-tail.xml</sprite> + <sprite>accessories/acc-ratto-tail.xml</sprite> <sound event="hit">monsters/ratto/ratto-dying1.ogg</sound> <sound event="hit">monsters/ratto/ratto-hit1.ogg</sound> <sound event="hit">monsters/ratto/ratto-hit2.ogg</sound> @@ -76,17 +76,17 @@ exemple : <sprite>monsters/croc.xml</sprite> </monster> <monster id="5" name="Little Blub" targetCursor="small" walkType="walkswim"> - <sprite>monsters/blub-little.xml</sprite> - <sprite>accessories/littleblub-tentacle.xml</sprite> + <sprite>monsters/littleblub.xml</sprite> + <sprite>accessories/acc-littleblub-tentacle.xml</sprite> <sound event="hit">monsters/blub/blub-hit1.ogg</sound> </monster> <!--<monster id="6" name="Blub" targetCursor="medium" walkType="walkswim"> <sprite>monsters/blub.xml</sprite> - <sprite>accessories/blub-tentacle.xml</sprite> + <sprite>accessories/acc-blub-tentacle.xml</sprite> </monster> <monster id="7" name="Top Blub" targetCursor="medium" walkType="walkswim"> <sprite>monsters/blub.xml</sprite> - <sprite>accessories/blub-tentacle.xml</sprite> - <sprite>accessories/blub-tophat.xml</sprite> + <sprite>accessories/acc-blub-tentacle.xml</sprite> + <sprite>accessories/acc-blub-tophat.xml</sprite> </monster> --> </monsters> @@ -93,7 +93,7 @@ IDs 990-999 = Special <npc id="313"> <!-- Human-Man, sitting on a box with purple hair. --> <sprite>npcs/xml/gugli.xml</sprite> - <sprite>accessories/eye-right-blink.xml</sprite> + <sprite>accessories/acc-eye-right-blink.xml</sprite> </npc> <npc id="314"> <!-- Human-Small-Man, standing with a bottle of wine at his hand. --> @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <units> - <unit type="currency" base=" Zeny" round="0"/> - <unit type="weight" base=" Ali" round="0"> - <level symbol=" Kali" count="1000" round="2"/> + <unit type="currency" base=" GP" round="0"/> + <unit type="weight" base=" g" round="0"> + <level symbol=" Kg" count="1000" round="2"/> </unit> </units> |
