diff options
| author | Micksha <Micksha@users.noreply.github.com> | 2018-09-10 13:08:06 +0200 |
|---|---|---|
| committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:56:44 +0100 |
| commit | 35fea39ce875f2b356d00cc26dae044cfb5c9140 (patch) | |
| tree | 2bf1dd148e6911328faa23474806c231a6a432e1 /npcs.xml | |
| parent | 1ea62b12e9b80fb43d0aea1346db562314683602 (diff) | |
| download | clientdata-35fea39ce875f2b356d00cc26dae044cfb5c9140.tar.gz clientdata-35fea39ce875f2b356d00cc26dae044cfb5c9140.tar.bz2 clientdata-35fea39ce875f2b356d00cc26dae044cfb5c9140.tar.xz clientdata-35fea39ce875f2b356d00cc26dae044cfb5c9140.zip | |
add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Diffstat (limited to 'npcs.xml')
| -rw-r--r-- | npcs.xml | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -344,7 +344,11 @@ 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> @@ -369,6 +373,14 @@ 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'"/> @@ -393,6 +405,7 @@ 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> @@ -448,6 +461,8 @@ 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 --> @@ -794,6 +809,7 @@ 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> @@ -811,6 +827,8 @@ 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 <!-- Test NPCs --> <npc id="800" allowDelete="false"> |