diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 17:21:15 +0200 |
| commit | 9b8362e5767b9b0fb4251c16c80669b288f06648 (patch) | |
| tree | 4b78772e1b17ce69cd877f49edf3d2a31b4d9920 /npcs.xml | |
| parent | bbed5a765c152fee8a4ed8adc78423d9737c4d46 (diff) | |
| parent | 5409675d5d3cba9f4a55ca6a783d038eb69f9ccc (diff) | |
| download | clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.gz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.bz2 clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.tar.xz clientdata-9b8362e5767b9b0fb4251c16c80669b288f06648.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
monsters.xml
Diffstat (limited to 'npcs.xml')
| -rw-r--r-- | npcs.xml | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -317,8 +317,8 @@ <npc id="173"> <sprite variant="73">npcs/npc.xml</sprite> </npc> - <!-- Aisha, Omar's daughter --> - <npc id="174"> + <!-- Kadiya (Omar's sick daughter) --> + <npc id="174" nameOffsetX="16" targetOffsetX="16"> <sprite variant="74">npcs/npc.xml</sprite> </npc> <!-- Miriam the cat burglar --> @@ -936,6 +936,19 @@ <npc id="376"> <sprite>npcs/npc-weaver.xml</sprite> </npc> + <!-- Trapper --> + <npc id="377"> + <sprite>player_male_base.xml</sprite> + <sprite>hairstyles/hairstyle05.xml|#8c6625,dab425,ffffff</sprite> + <sprite>equipment/head/silkheadband.xml|W:#412300,c9866b,8d4900</sprite> + <sprite>equipment/chest/leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite> + <sprite>equipment/legs/pants-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite> + <sprite>equipment/feet/furboots-male.xml</sprite> + </npc> + <!-- Supply Chest for South Tulimshar Mine Quest --> + <npc id="378"> + <sprite>npcs/npc-supply-crate.xml</sprite> + </npc> <!-- empty (Invisible NPC used in scripts) --> <!-- for npcs that shouldn't be selectable (e.g. in magic effects) use 127, for warps/doors use 45, |