diff options
| author | Saulc <lucashelaine14@gmail.com> | 2018-02-11 17:16:16 +0100 |
|---|---|---|
| committer | Saulc <lucashelaine14@gmail.com> | 2018-02-11 17:16:16 +0100 |
| commit | 2f3cd0936f75459c036d3b6205b8f78477ccf371 (patch) | |
| tree | 0f0d89f41ea7b378e41720d6feb0f685d9971eb0 | |
| parent | b279eee788f4fbf830338f91adfc15233c4b1abe (diff) | |
| parent | 5265eeabdf2d1bf6be6111efe5b0d2a9dc4d104e (diff) | |
| download | clientdata-2f3cd0936f75459c036d3b6205b8f78477ccf371.tar.gz clientdata-2f3cd0936f75459c036d3b6205b8f78477ccf371.tar.bz2 clientdata-2f3cd0936f75459c036d3b6205b8f78477ccf371.tar.xz clientdata-2f3cd0936f75459c036d3b6205b8f78477ccf371.zip | |
Merge branch 'master' of gitlab.com:TMW2/clientdata
| -rw-r--r-- | items.xml | 5 | ||||
| -rw-r--r-- | npcs.xml | 15 |
2 files changed, 18 insertions, 2 deletions
@@ -319,6 +319,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. name="Delicious Cookie" description="This is a reward from the Cookie Master. Be careful before you eat it, its effects are unknown..." useButton="Eat" + defense="0" effect="Unknown" type="equip-torso"> <replace /> @@ -2358,13 +2359,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. <item id="1319" image="equipment/chest/valentinedress.png|W:#222255,4444ff,ffffff,ffffff" name="Valentine Dress" - description="A dress made for your Valentin's day." + description="A dress made for your Valentin's day. Could be red, though." defense="250" level="15" type="equip-torso" weight="35"> <sprite gender="unisex">equipment/chest/valentinedress-male.xml|#222255,4444ff,ffffff,ffffff</sprite> - <sprite gender="female">equipment/chest/valentinedress-female.xml|#212121</sprite> + <sprite gender="female">equipment/chest/valentinedress-female.xml|#222255,4444ff,ffffff,ffffff</sprite> </item> <item id="1320" image="equipment/chest/vnecksweater.png" @@ -645,6 +645,21 @@ IDs 900-999 = Special <sprite>races/human-male.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> + <npc id="802" walkType="all" allowEquipment="true"> + <!-- npc with player look (female). --> + <sprite>races/human-female.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="803" walkType="all" allowEquipment="true"> + <!-- npc with elf look. --> + <sprite>races/elven-male.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="804" walkType="all" allowEquipment="true"> + <!-- npc with elf look (female). --> + <sprite>races/elven-female.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> <!-- Special NPCs --> <!-- WIP <npc id="900"> |