Add the first few npcs: old Koga, Lumberjack, Richard.

4 files changed, 6 insertions, 41 deletions

diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
index cb74e8bf..6b3f17ad 100644
--- a/graphics/sprites/npcs/xml/koga.xml
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -13,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/koga.png" width="634" height="477"/>
-  <action name="stand" imageset="base">
-    <animation direction="default">
-      <frame index="0"/>
-    </animation>
-  </action>
-
 </sprite>
diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml
index 9735995c..c4883524 100644
--- a/graphics/sprites/npcs/xml/lumberjack.xml
+++ b/graphics/sprites/npcs/xml/lumberjack.xml
@@ -1,3 +1,4 @@
+
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha
 Copyright (C) 2018 Evol Online -->
@@ -9,16 +10,6 @@ Copyright (C) 2018 Evol Online -->
               height="63"/>
 
       <!-- eyes movements -->
-
-    <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 -->
       <frame index="0" delay="3000"/>
       <frame index="1" delay="80"/>
       <frame index="0" delay="1500"/>
@@ -27,5 +18,4 @@ Copyright (C) 2018 Evol Online -->
       <frame index="1" delay="300"/>
         </animation>
     </action>
-
 </sprite>
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index 3c436ef5..2a8bd562 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha
-
 Copyright (C) 2018 Evol Online -->
 
 <sprite>
@@ -13,7 +12,6 @@ Copyright (C) 2018 Evol Online -->
             <label name="start"/>
             <goto label="static" rand="95"/>
             <goto label="winking" rand="100"/>
-            <goto label="winking" rand="5"/>
             <!-- winking -->
             <label name="winking"/>
                 <sequence start="0" end="2" delay="160"/>
diff --git a/npcs.xml b/npcs.xml
index 7f29da7f..600b94fa 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -344,11 +344,7 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="165">
-<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
-        <!-- LEGACY - Waitress, former Melinda. -->
-=======
         <!-- LEGACY - Waitress, Melinda. -->
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <sprite variant="16">npcs/xml/unanimated-legacy.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -373,14 +369,6 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="170">
-<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
-=======
-        <!-- LEGACY - Young Boy, Mike.  -->
-        <sprite variant="20">npcs/xml/unanimated-legacy.xml</sprite>
-        <menu name="Talk" command="talk 'NAME'"/>
-    </npc>
-    <npc id="170">
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <!-- LEGACY - Princess, Celestia.  -->
         <sprite variant="0">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
@@ -405,7 +393,6 @@ IDs 900-999 = Special
         <sprite variant="4">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
     <npc id="175">
         <!-- LEGACY - Drinker Roamingo, sitting.  -->
         <sprite variant="22">npcs/xml/unanimated-legacy.xml</sprite>
@@ -461,8 +448,6 @@ IDs 900-999 = Special
         <sprite variant="28">npcs/xml/unanimated-legacy.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-=======
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
 
     <!-- Animated NPCs -->
 
@@ -809,7 +794,6 @@ IDs 900-999 = Special
         <sprite>npcs/xml/hinnak.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
     <npc id="454">
         <!-- Human Male, removing his monocle for winking. -->
         <sprite>npcs/xml/richard.xml</sprite>
@@ -827,8 +811,11 @@ IDs 900-999 = Special
         <sprite>equipment/chest/shirt-male.xml|#2b2b2b,382140,3f3f3f,3a254e,585858,3b3769,858585,3c3d83,a7a7a7,4246a6,d6d6d6,5a9cdb,ffffff,afedd2</sprite>
         <sprite>hairstyles/hairstyle01.xml</sprite>
     </npc>
-=======
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
+    <npc id="452">
+        <!-- Legendary Luberjack. -->
+        <sprite>npcs/xml/lumberjack.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">