diff options
| author | Micksha <Micksha@users.noreply.github.com> | 2018-09-10 13:17:03 +0200 |
|---|---|---|
| committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:55:13 +0100 |
| commit | d52830e6cd1476ddf3c5b78637a118c57fdb973b (patch) | |
| tree | 49f30200ce2fa9c244f03bef0cac84bbc9a03bb0 | |
| parent | 44f319744c1a37cd4b5b48b4e58d27057efa6700 (diff) | |
| download | clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.gz clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.bz2 clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.xz clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.zip | |
fix issues with koga and lumberjack, fix license file
| -rw-r--r-- | graphics/sprites/npcs/xml/koga.xml | 4 | ||||
| -rw-r--r-- | graphics/sprites/npcs/xml/lumberjack.xml | 4 | ||||
| -rw-r--r-- | graphics/sprites/npcs/xml/richard.xml | 8 | ||||
| -rw-r--r-- | npcs.xml | 3 |
4 files changed, 6 insertions, 13 deletions
diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml index 5f63da70..b95e610b 100644 --- a/graphics/sprites/npcs/xml/koga.xml +++ b/graphics/sprites/npcs/xml/koga.xml @@ -17,8 +17,8 @@ Copyright (C) 2018 Evol Online --> ======= <?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"> + <imageset name="base" src="graphics/sprites/npcs/sprite/koga.png" width="634" height="477"/> + <action name="stand" imageset="npc"> <animation direction="default"> <frame index="0"/> </animation> diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml index 1a2f6ee0..5603e511 100644 --- a/graphics/sprites/npcs/xml/lumberjack.xml +++ b/graphics/sprites/npcs/xml/lumberjack.xml @@ -14,8 +14,8 @@ Copyright (C) 2010-2018 Evol Online --> ======= <?xml version="1.0"?> <sprite> - <imageset name="base" src="graphics/sprites/npcs/npc-lumberjack.png" width="42" height="63"/> - <action name="stand" imageset="base"> + <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/> + <action name="stand" imageset="npc"> <animation direction="default"> <!-- eyes movements --> >>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard. diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml index d0765ba4..d59cfe9d 100644 --- a/graphics/sprites/npcs/xml/richard.xml +++ b/graphics/sprites/npcs/xml/richard.xml @@ -1,13 +1,5 @@ <?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> @@ -739,9 +739,10 @@ IDs 900-999 = Special <sprite>npcs/xml/hinnak.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> - <npc id="454"> + <npc id="454"> <!-- Human Male, removing his monocle for winking. --> <sprite>npcs/xml/richard.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> </npc> <npc id="455"> <!-- Old Lady reading a sheet of paper - Sophialla. --> |