diff options
Diffstat (limited to 'graphics/sprites/npcs/xml/lumberjack.xml')
-rw-r--r-- | graphics/sprites/npcs/xml/lumberjack.xml | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml index 5603e511..d4cb81ae 100644 --- a/graphics/sprites/npcs/xml/lumberjack.xml +++ b/graphics/sprites/npcs/xml/lumberjack.xml @@ -1,8 +1,10 @@ -<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a -<?xml version="1.0" encoding="utf-8"?> -<!-- Author: Reid, Micksha -Copyright (C) 2010-2018 Evol Online --> +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/> + <action name="stand" imageset="npc"> + <animation direction="default"> + <!-- eyes movements --> <sprite> <imageset name="base" src="graphics/sprites/npcs/sprite/lumberjack.png" @@ -11,25 +13,13 @@ Copyright (C) 2010-2018 Evol Online --> <action name="stand" imageset="base"> <animation direction="default"> -======= -<?xml version="1.0"?> -<sprite> - <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/> - <action name="stand" imageset="npc"> - <animation direction="default"> - <!-- eyes movements --> ->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard. <frame index="0" delay="3000"/> <frame index="1" delay="80"/> <frame index="0" delay="1500"/> <frame index="1" delay="80"/> <frame index="0" delay="3000"/> <frame index="1" delay="300"/> -<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a </animation> </action> -======= - </animation> - </action> ->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard. + </sprite> |