summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/npcs/xml/richard.xml4
-rw-r--r--npcs.xml21
2 files changed, 16 insertions, 9 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index be90738d..c3a3f843 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
<!-- Author: Micksha
=======
<!-- Author: Reid
>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
+=======
+<!-- Author: Micksha
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Copyright (C) 2015 Evol Online -->
<sprite>
diff --git a/npcs.xml b/npcs.xml
index 2b625ced..09aa8db2 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -369,31 +369,28 @@ IDs 900-999 = Special
<menu name="Talk" command="talk 'NAME'"/>
</npc>
<npc id="170">
- <!-- LEGACY - Young Boy, Mike. -->
- <sprite variant="20">npcs/xml/unanimated-legacy.xml</sprite>
- <menu name="Talk" command="talk 'NAME'"/>
- </npc>
- <npc id="171">
<!-- LEGACY - Princess, Celestia. -->
<sprite variant="0">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="172">
+ <npc id="171">
<!-- LEGACY - Young Man without taste, Dyer. -->
<sprite variant="1">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="173">
+ <npc id="172">
<!-- LEGACY - Young Man with Top Hat, Dimond. -->
<sprite variant="2">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="174">
+ <npc id="173">
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
<!-- LEGACY - Mid-aged Man, Chef. -->
<sprite variant="3">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="175">
+ <npc id="174">
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
<!-- LEGACY - Young sexy lady with Rabbit Ears. -->
<sprite variant="4">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
@@ -745,18 +742,24 @@ IDs 900-999 = Special
<sprite>npcs/xml/lumberjack.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
+<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
+=======
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
<npc id="453">
<!-- Human with legacy Ranger Hat and a Scythe. -->
<sprite>npcs/xml/hinnak.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
+<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
<npc id="454">
<!-- Human Male, removing his monocle for winking. -->
<sprite>npcs/xml/richard.xml</sprite>
</npc>
=======
>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
+=======
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
<!-- Test NPCs -->
<npc id="800" allowDelete="false">