diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-03-03 21:39:04 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-03-03 21:39:04 +0000 |
| commit | 0b63dcb70cb8104b676ee6135d95c73ec7ecaf2b (patch) | |
| tree | a37572b06b4e3fd3d92132d69f68a6ee064afa2d | |
| parent | 6abbf9672965fefe3acdf3f747fcc5e9ab78ae23 (diff) | |
| parent | 212d869de997844bdf6eb7ed56f6e8f3a5329f5c (diff) | |
| download | clientdata-0b63dcb70cb8104b676ee6135d95c73ec7ecaf2b.tar.gz clientdata-0b63dcb70cb8104b676ee6135d95c73ec7ecaf2b.tar.bz2 clientdata-0b63dcb70cb8104b676ee6135d95c73ec7ecaf2b.tar.xz clientdata-0b63dcb70cb8104b676ee6135d95c73ec7ecaf2b.zip | |
Merge branch 'Yannika' into 'master'
add Yannika (for walking sprite) and dialogs (for Jesusalva)
See merge request evol/clientdata!92
| -rw-r--r-- | npcdialogs.xml | 13 | ||||
| -rw-r--r-- | npcs.xml | 10 |
2 files changed, 22 insertions, 1 deletions
diff --git a/npcdialogs.xml b/npcdialogs.xml index 8522f3e5..2a60b108 100644 --- a/npcdialogs.xml +++ b/npcdialogs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Author: 4144 +<!-- Author: 4144, Jesusalva Copyright (C) 2016 Evol Online --> <dialogs> @@ -9,12 +9,21 @@ Copyright (C) 2016 Evol Online --> <button x="40" y="0" name=">>" value="next" /> </menu> </dialog> + + <dialog name="craft3"> + <inventory cell="inventory_cell2.xml" columns="3" /> + </dialog> + <dialog name="craft4"> + <inventory cell="inventory_cell2.xml" columns="4" /> + </dialog> + <dialog name="test1" hideText="true"> <menu> <image x="0" y="0" image="equipmentbox.png" /> <button x="10" y="40" image="buttonplay.png" imageWidth="16" imageHeight="16" value="next" /> </menu> </dialog> + <dialog name="test2"> <menu> <button x="0" y="0" name="<<" value="previous" /> @@ -23,4 +32,6 @@ Copyright (C) 2016 Evol Online --> </menu> <inventory cell="inventory_cell2.xml" columns="3" /> </dialog> + </dialogs> + @@ -831,6 +831,16 @@ IDs 900-999 = Special <sprite>npcs/xml/valia.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> + <npc id="463"> + <!-- Yannika, Hinnaks sandwich-making wife. --> + <sprite>races/human-female.xml</sprite> + <sprite>hairstyles/hairstyle13.xml</sprite> + <sprite>equipment/chest/tanktop-female.xml|#620e48,bf1b8b,e32bcf,ffb6f7</sprite> + <sprite>equipment/legs/cottonskirt-female.xml|#3c1554,6d3195,c987d1</sprite> + <sprite>equipment/head/brimmedflowerhat.xml</sprite> + <sprite>equipment/feet/boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> <!-- Test NPCs --> <npc id="800" allowDelete="false"> |