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.

---
 npcs.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'npcs.xml')

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-60-g2f50