summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-09-10 13:27:46 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 12:55:13 +0100
commit9c1e4f708afbf28913c0b56551e973c3dc2aa213 (patch)
tree8fe6565e30de724b7e287aad8c41b1d3fcdf1d2e /graphics/sprites/npcs
parentd52830e6cd1476ddf3c5b78637a118c57fdb973b (diff)
downloadclientdata-9c1e4f708afbf28913c0b56551e973c3dc2aa213.tar.gz
clientdata-9c1e4f708afbf28913c0b56551e973c3dc2aa213.tar.bz2
clientdata-9c1e4f708afbf28913c0b56551e973c3dc2aa213.tar.xz
clientdata-9c1e4f708afbf28913c0b56551e973c3dc2aa213.zip
lumberjack and koga still messy, trying to fix
Diffstat (limited to 'graphics/sprites/npcs')
-rw-r--r--graphics/sprites/npcs/xml/koga.xml11
-rw-r--r--graphics/sprites/npcs/xml/lumberjack.xml24
2 files changed, 7 insertions, 28 deletions
diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
index b95e610b..6b3f17ad 100644
--- a/graphics/sprites/npcs/xml/koga.xml
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -1,4 +1,3 @@
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
<?xml version="1.0" encoding="utf-8"?>
<!-- Author: Micksha
Copyright (C) 2018 Evol Online -->
@@ -14,14 +13,4 @@ Copyright (C) 2018 Evol Online -->
<frame index="0"/>
</animation>
</action>
-=======
-<?xml version="1.0"?>
-<sprite variants="1" variant_offset="1">
- <imageset name="base" src="graphics/sprites/npcs/sprite/koga.png" width="634" height="477"/>
- <action name="stand" imageset="npc">
- <animation direction="default">
- <frame index="0"/>
- </animation>
- </action>
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
</sprite>
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>