From 10993b4459341860cdfac4ae5b953c0264b09fc0 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Fri, 20 Jul 2018 13:09:52 +0200
Subject: Add the first few npcs: old Koga, Lumberjack, Richard.

---
 graphics/sprites/npcs/xml/koga.xml       | 11 +++++++++++
 graphics/sprites/npcs/xml/lumberjack.xml | 14 ++++++++++++++
 graphics/sprites/npcs/xml/richard.xml    |  4 ++++
 npcs.xml                                 | 10 ++++++++++
 4 files changed, 39 insertions(+)

diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
index 6b3f17ad..5f63da70 100644
--- a/graphics/sprites/npcs/xml/koga.xml
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -1,3 +1,4 @@
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha
 Copyright (C) 2018 Evol Online -->
@@ -13,4 +14,14 @@ 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/koga.png" width="634" height="477"/>
+  <action name="stand" imageset="base">
+    <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 20fcc97b..1a2f6ee0 100644
--- a/graphics/sprites/npcs/xml/lumberjack.xml
+++ b/graphics/sprites/npcs/xml/lumberjack.xml
@@ -1,3 +1,4 @@
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Reid, Micksha
 Copyright (C) 2010-2018 Evol Online -->
@@ -10,12 +11,25 @@ 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/npc-lumberjack.png" width="42" height="63"/>
+  <action name="stand" imageset="base">
+    <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>
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index c307b530..be90738d 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
 <!-- Author: Micksha
+=======
+<!-- Author: Reid
+>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
 Copyright (C) 2015 Evol Online -->
 
 <sprite>
diff --git a/npcs.xml b/npcs.xml
index 05e0e718..2b625ced 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -726,6 +726,7 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="451">
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
         <!-- HURNS - Elven Female, walking sprite for Melinda NPC. -->
         <sprite>races/elven-female.xml</sprite>
         <sprite>equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293</sprite>
@@ -733,11 +734,18 @@ IDs 900-999 = Special
         <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
         <sprite>equipment/neck/copper-necklace.xml|#315a67,a4a4ae,dce5d6,ffffff</sprite>
         <sprite>hairstyles/hairstyle22.xml|#16211f,162e29,195145,1d7a62,29a27a,51de9c,c9f7bc</sprite>
+=======
+        <!-- Human Male, removing his monocle for winking. -->
+        <sprite>npcs/xml/richard.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
+>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
     <npc id="452">
         <!-- Legendary Luberjack. -->
         <sprite>npcs/xml/lumberjack.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
     <npc id="453">
         <!-- Human with legacy Ranger Hat and a Scythe. -->
         <sprite>npcs/xml/hinnak.xml</sprite>
@@ -747,6 +755,8 @@ IDs 900-999 = Special
         <!-- Human Male, removing his monocle for winking. -->
         <sprite>npcs/xml/richard.xml</sprite>
     </npc>
+=======
+>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">
-- 
cgit v1.2.3-70-g09d2