diff options
| -rw-r--r-- | graphics/sprites/accessories/acc-chick-egg.xml | 8 | ||||
| -rw-r--r-- | graphics/sprites/npcs/XML1/billybons.xml (renamed from graphics/sprites/npcs/XML1/frederico.xml) | 2 | ||||
| -rw-r--r-- | graphics/sprites/npcs/XML1/hammock.xml | 2 | ||||
| -rw-r--r-- | graphics/sprites/npcs/XML1/sleepingorc.xml | 17 | ||||
| -rw-r--r-- | graphics/sprites/npcs/sprite/billybons.png (renamed from graphics/sprites/npcs/sprite/frederico.png) | bin | 3673 -> 3673 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/sprite/nard.png | bin | 3441 -> 3453 bytes | |||
| -rw-r--r-- | maps/000-2-3.tmx | 35 | ||||
| -rw-r--r-- | npcs.xml | 2 |
8 files changed, 42 insertions, 24 deletions
diff --git a/graphics/sprites/accessories/acc-chick-egg.xml b/graphics/sprites/accessories/acc-chick-egg.xml index ec7a6af8..ebecdda1 100644 --- a/graphics/sprites/accessories/acc-chick-egg.xml +++ b/graphics/sprites/accessories/acc-chick-egg.xml @@ -624,9 +624,8 @@ Copyright (C) 2011 Evol Online --> <frame index="2" delay="80" offsetY="-4"/> <frame index="6" delay="60" offsetY="-3"/> <frame index="6" delay="50" offsetY="-2"/> - <frame index="6" delay="50" offsetY="-1"/> <!-- Normal jump x1--> - <frame index="6" delay="45" offsetY="-1"/> + <frame index="6" delay="95" offsetY="-1"/> <frame index="6" delay="45" offsetY="-2"/> <frame index="6" delay="45" offsetY="-3"/> <frame index="6" delay="45" offsetY="-4"/> @@ -634,7 +633,7 @@ Copyright (C) 2011 Evol Online --> <frame index="6" delay="45" offsetY="-2"/> <frame index="6" delay="45" offsetY="-1"/> <!-- Back turning jump --> - <frame index="6" delay="100" offsetY="-1"/> + <frame index="6" delay="95" offsetY="-1"/> <frame index="6" delay="45" offsetY="-2"/> <frame index="6" delay="45" offsetY="-3"/> <frame index="6" delay="45" offsetY="-4"/> @@ -678,9 +677,8 @@ Copyright (C) 2011 Evol Online --> <frame index="0" delay="80" offsetY="-4"/> <frame index="7" delay="60" offsetY="-3"/> <frame index="7" delay="50" offsetY="-2"/> - <frame index="7" delay="50" offsetY="-1"/> <!-- Normal jump x1--> - <frame index="7" delay="45" offsetY="-1"/> + <frame index="7" delay="95" offsetY="-1"/> <frame index="7" delay="45" offsetY="-2"/> <frame index="7" delay="45" offsetY="-3"/> <frame index="7" delay="45" offsetY="-4"/> diff --git a/graphics/sprites/npcs/XML1/frederico.xml b/graphics/sprites/npcs/XML1/billybons.xml index 4e39c43c..90757589 100644 --- a/graphics/sprites/npcs/XML1/frederico.xml +++ b/graphics/sprites/npcs/XML1/billybons.xml @@ -2,7 +2,7 @@ <!-- Author : Reid Copyright (C) 2012 Evol Online --> <sprite> - <imageset name="base" src="graphics/sprites/npcs/sprite/frederico.png" width="49" height="42" offsetX="17" /> + <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"/> diff --git a/graphics/sprites/npcs/XML1/hammock.xml b/graphics/sprites/npcs/XML1/hammock.xml index 03b51669..a2065688 100644 --- a/graphics/sprites/npcs/XML1/hammock.xml +++ b/graphics/sprites/npcs/XML1/hammock.xml @@ -3,7 +3,7 @@ Copyright (C) 2011 Evol Online --> <sprite variants="2" variant_offset="1"> - <imageset name="base" src="graphics/sprites/npcs/sprite/zhammock.png" width="96" height="64" /> + <imageset name="base" src="graphics/sprites/npcs/sprite/hammock.png" width="96" height="64" /> <action name="stand" imageset="base"> <animation direction="default"> diff --git a/graphics/sprites/npcs/XML1/sleepingorc.xml b/graphics/sprites/npcs/XML1/sleepingorc.xml index 4aeaab8f..cf361a3b 100644 --- a/graphics/sprites/npcs/XML1/sleepingorc.xml +++ b/graphics/sprites/npcs/XML1/sleepingorc.xml @@ -2,12 +2,13 @@ <!-- 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="left"> - <sequence start="0" end="2" delay="380" /> - <frame index="1" delay="380" /> - <frame index="0" delay="500" /> - </animation> - </action> + <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/sprite/frederico.png b/graphics/sprites/npcs/sprite/billybons.png Binary files differindex 6b84f873..6b84f873 100644 --- a/graphics/sprites/npcs/sprite/frederico.png +++ b/graphics/sprites/npcs/sprite/billybons.png diff --git a/graphics/sprites/npcs/sprite/nard.png b/graphics/sprites/npcs/sprite/nard.png Binary files differindex 0c0cba54..50656762 100644 --- a/graphics/sprites/npcs/sprite/nard.png +++ b/graphics/sprites/npcs/sprite/nard.png diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx index 2e356faf..2a72b657 100644 --- a/maps/000-2-3.tmx +++ b/maps/000-2-3.tmx @@ -13,25 +13,44 @@ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32"> <image source="../graphics/tiles/Box.png" width="128" height="128"/> </tileset> - <tileset firstgid="401" name="Collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + <tileset firstgid="401" name="Ship-indoor_x2" tilewidth="96" tileheight="64"> + <image source="../graphics/tiles/Indoor/Ship-indoor_x2.png" width="384" height="128"/> + <tile id="0"> + <properties> + <property name="animation-delay0" value="40"/> + <property name="animation-delay1" value="18"/> + <property name="animation-delay2" value="15"/> + <property name="animation-delay3" value="30"/> + <property name="animation-delay4" value="18"/> + <property name="animation-delay5" value="15"/> + <property name="animation-frame0" value="0"/> + <property name="animation-frame1" value="1"/> + <property name="animation-frame2" value="2"/> + <property name="animation-frame3" value="3"/> + <property name="animation-frame4" value="2"/> + <property name="animation-frame5" value="1"/> + </properties> + </tile> </tileset> - <tileset firstgid="405" name="Carpet" tilewidth="32" tileheight="32"> + <tileset firstgid="409" name="Carpet" tilewidth="32" tileheight="32"> <image source="../graphics/tiles/Indoor/Carpet.png" width="96" height="96"/> </tileset> + <tileset firstgid="418" name="Collision" tilewidth="32" tileheight="32"> + <image source="../graphics/tiles/Collision.png" width="64" height="64"/> + </tileset> <layer name="Ground" width="52" height="53"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3SSQrCQBCF4RYEEdyIZCHiRZyWgieQLIPb3MBzOOvlPIkvGKEMEScw3fIvPgq6Nu/RFTvnYgAAAAAAgB8ZyqTEqGQ38iDvM2NpS0OiXEfmsjS77G3qQd5X+0Tuvk9NZmYXSp9MV/pGL+8zMLueBzlflRQspCl1WanYWja16nO+0yfN2fxZn63mTvaB9bnJ8p/dNX9L86B5lFMgfYq3Zvuk5u8SD7J+cm/2vmyXkPrYzPa+7L+lHuT89OYeqTrnN32qzgQAAAAAAPDPLop87lsQKwAA + H4sIAAAAAAAAA+3TTQqCQBiH8RkIImgT4SKki5S17ArhUtp6g07Sd12tk/SKCm9iZAY5E8/ih9hs/g+NsTEmBgAAAAAA+JG5WNaIas4iB/a+sxAj0RdBYSzWYqvOst9WDuxt2hOY5x4rZurMl57MREyVsOjpqbPQgZ1NJRUbMSh6dhK2Fwfb/c5PetKC3j+U94s8r+LmWU/pKLvv8jzbvK9sTRzY2eau+d5TvW9Zz8nmPbrFpx69WX8v+n9LHdjZ9s690vXOb3q63gQAAAAAAPDPHhhYIO4QKwAA </data> </layer> <layer name="Ground 2" width="52" height="53"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3TyQnCUBSF4WSjVmA/Ygt2YAt24ADGYak24FCAUzuSClTQrUe8QlaCvkcuwv/B4SZ5m3MTkiQAAAAAAAAIUUlfs65Z07wXznY2lyV3CjGwfW6FZz2b792qaYmFAmXqOlKmSleZKFs7mylzZeHY71vP/n17/2O7Htr9SlkrG69yke2Vg3L0LvKDtr7JSbOjmXuXiaShXVpK84/+/0/OykW5ehcBAAAAAAAAEMUDlksYDBArAAA= + H4sIAAAAAAAAA+3SwQ2CQBCFYTioVGA/xBbswBbsQDRZBLugAy3IWAGYyNVnHJK9L1mC/l/yMmS4vAkkCQAAAAAAAEIs0+9ca2aavffuZrOJ3CnEye55ebvC5nDbKo1YKFCprmflohyUWrlqv7AbnO3m4tP1aH0re3Yz6v8vdvomd8295mPqMiPJdctW2fzI/9YqnfKcuggAAAAAAACAUbwBl/OZqhArAAA= </data> </layer> <layer name="Fringe" width="52" height="53"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3SwQmAMAwF0PbgBh2mA7iPM3ipjm0GUFAv1fIeBEJOPyQpAQAAAMA9LWqL2nsHeWjN5/1IpkH3+rsSd6m9Q7y0XMxnvwYAAAAAfNABAyCpsxArAAA= + H4sIAAAAAAAAA+3RQQ0AIBADMPCAJPygAQk4xgAIuKV9Lfstaw0AAAAAsu3+zmlO8LaqRuFP1qefhTcBAAAAALkuBEIe+RArAAA= </data> </layer> <layer name="Over" width="52" height="53"> @@ -39,9 +58,9 @@ H4sIAAAAAAAAA+3RQQqDMBAF0BynSy/gqtpt1z1J7+cN9ETOotIgtiC4SPQ9+CTIBOZjSgAAAABwPq9Iu2P+8XlTqiv0GSNTZNiYr7HPPzX0ee+Yr6HP2f7Prz7PSJ/lFulS+X3u6btvfi67L2mye6m29m1W3/MAAAAAcIwZs0xCuRArAAA= </data> </layer> - <layer name="Collision" width="52" height="53" visible="0"> + <layer name="Collision" width="52" height="53"> <data encoding="base64" compression="gzip"> - H4sIAAAAAAAAA+3RIQ4AIAwEQfi/48UoHEVgmsI0GX+bjt7aAAAAAIBPrcvecbM7aqnUE90LPafO7J03v6ne89p/drujy96pp952AAAAgIomHzwjTBArAAA= + H4sIAAAAAAAAA+3TsQkAIAwEQN1/DBcV+yBiEw0XuCbVPyGjtzYAAAAAgK+siXbR/mWnk53zps+uZ3bOm9v83qfafaLclf6nap/sTAAAAACVTeEZAYQQKwAA </data> </layer> <objectgroup name="Object" width="52" height="53" visible="0"> @@ -56,7 +56,7 @@ IDs 990-999 = Special </npc> <npc id="311"> <!-- Elf-Man, drunken sailor. --> - <sprite>npcs/XML1/frederico.xml</sprite> + <sprite>npcs/XML1/billybons.xml</sprite> </npc> <npc id="312"> <!-- Present to an Evol's friend. --> |
