summaryrefslogtreecommitdiff
path: root/npcs.xml
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-10-24 12:35:48 +0000
committerJesusaves <cpntb1@ymail.com>2020-10-24 12:35:48 +0000
commit7007645cb99c6da8cfd21416b08f7a7e62743b89 (patch)
tree852db7b591cc10c19db9c823eb361110e837039a /npcs.xml
parentea0c989f1d7166aee026318571cce15d7823372b (diff)
parent71be91b5c03b09139465723ffb56ed8fd6d5a0fe (diff)
downloadclientdata-7007645cb99c6da8cfd21416b08f7a7e62743b89.tar.gz
clientdata-7007645cb99c6da8cfd21416b08f7a7e62743b89.tar.bz2
clientdata-7007645cb99c6da8cfd21416b08f7a7e62743b89.tar.xz
clientdata-7007645cb99c6da8cfd21416b08f7a7e62743b89.zip
Merge branch 'jesusalva/contentIII' into 'master'
Content III See merge request evol/clientdata!178
Diffstat (limited to 'npcs.xml')
-rw-r--r--npcs.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/npcs.xml b/npcs.xml
index 7e953762..8bc8a139 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -658,6 +658,16 @@ IDs 900-999 = Special
<sprite>npcs/xml/jukebox.xml</sprite>
<menu name="Select Track" command="talk 'NAME'"/>
</npc>
+ <npc id="229">
+ <!-- La Marine. -->
+ <sprite>npcs/xml/marine.xml</sprite>
+ <menu name="Board" command="talk 'NAME'"/>
+ </npc>
+ <npc id="230">
+ <!-- Tiki, Candor's Sandwich Maker -->
+ <sprite>npcs/xml/tiki.xml</sprite>
+ <menu name="Talk" command="talk 'NAME'"/>
+ </npc>
<!-- Animated NPCs -->
@@ -1163,6 +1173,11 @@ IDs 900-999 = Special
<sprite>equipment/shields/woodenshield.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
+ <npc id="478">
+ <!-- Summoning circle. -->
+ <particlefx>graphics/particles/circle-magic.xml</particlefx>
+ <menu name="Summon" command="talk 'NAME'"/>
+ </npc>
<!-- Test NPCs -->