Pet Bonding PR

data/dfndata/creatures/creatures.dfn

@@ -2372,13 +2372,13 @@ ANIMAL
 }
 
 [CREATURE 0xa8]
-{ Imp - Shadow Fiend
+{ Shadow Fiend
 ICON=0x259f
-SOUND_STARTATTACK=0x1a6
-SOUND_IDLE=0x1a7
-SOUND_ATTACK=0x1a8
-SOUND_DEFEND=0x1a9
-SOUND_DIE=0x1aa
+SOUND_STARTATTACK=0x37A
+SOUND_IDLE=0x37B
+SOUND_ATTACK=0x37A
+SOUND_DEFEND=0x37F
+SOUND_DIE=0x381
 ANIM_CASTAREA=0x07,3
 ANIM_CASTTARGET=0x07,3
 ANIM_ATTACK1=0x04,4

data/dfndata/items/ItemMenu.bulk.dfn

@@ -11982,6 +11982,8 @@ ADDITEM=0x0F0C
 ADDITEM=0x0F0C-b
 0x0F0C=greater heal potion
 ADDITEM=0x0F0C-c
+0x0F04=pet bonding potion
+ADDITEM=petbondingpotion
 <=Previous Menu
 ITEMMENU=8
 }

data/dfndata/items/magic/potions.dfn

@@ -393,4 +393,16 @@ script=5041
 {
 get=0x1940
 sectionid=0x1940
+}
+
+[petbondingpotion]
+{
+get=base_potion
+name=Pet Bonding Potion
+id=0x0F04
+colour=2629
+value=80 40
+type=19
+morey=10
+morez=1
 }

data/dfndata/items/npcmenu.bulk.dfn

@@ -11,6 +11,10 @@ NPC=gianttoad
 NPC=scorpion
 0x2123=Sewer Rat
 NPC=sewerrat
+0x422F=phoenix
+NPC=phoenix
+0x2763=bakekitsune
+NPC=bakekitsune
 <=Previous Menu
 ITEMMENU=5001
 }
@@ -96,6 +100,10 @@ NPC=whitewolf
 NPC=squirrel
 0x2d98=Ferret
 NPC=ferret
+0x2764=crane
+NPC=crane
+0x2768=gaman
+NPC=gaman
 <=Previous Menu
 ITEMMENU=5001
 }
@@ -145,9 +153,9 @@ Arachnids
 NPC=dreadspider
 0x25c5=Frost Spider
 NPC=frostspider
-0x26c6=Giant Spider
+0x20fd=Giant Spider
 NPC=spider
-0x26c4=Giant Black Widow
+0x25c4=Giant Black Widow
 NPC=giantblackwidow
 0x25c9=Terathan Drone
 NPC=teradrone
@@ -186,6 +194,8 @@ NPC=moloch
 NPC=chaosdaemon
 0x259f=Shadow Fiend
 NPC=shadowfiend
+0x276d=oni
+NPC=oni
 <=Previous Menu
 ITEMMENU=5002
 }
@@ -256,6 +266,8 @@ NPC=shadowironele
 NPC=valoriteele
 0x20d7=Verite Elemental
 NPC=veriteele
+0x20d7=raiju
+NPC=raiju
 <=Previous Menu
 ITEMMENU=5002
 }
@@ -343,6 +355,32 @@ NPC=meerwarrior
 NPC=meereternal
 0x0305=a meer captain
 NPC=meercaptain
+0x20de=a lizardman
+NPC=lizardman
+0x20de=a spear lizardman
+NPC=spearlizardman
+0x20de=a mace lizardman
+NPC=macelizardman
+0x20e3=a ratman
+NPC=ratman
+0x20e3=a mace ratman
+NPC=maceratman
+0x20e3=a sword ratman
+NPC=swordratman
+0x20e3=a mage ratman
+NPC=ratmanmage
+0x20e3=a archer ratman
+NPC=ratmanarcher
+0x276b=a kappa
+NPC=kappa
+0x2772=a yomotsu elder
+NPC=yomotsuelder
+0x2773=a yomotsu priest
+NPC=yomotsupriest
+0x281b=a yomotsu warrior
+NPC=yomotsuwarrior
+0x2767=a fan dancer
+NPC=fandancer
 <=Previous Menu
 ITEMMENU=5002
 }
@@ -460,7 +498,9 @@ NPC=etherealswampdragon
 0x281c=Fire Beetle
 NPC=firebeetle
 0x276a=hiryu
-NPC=giantbeetle
+NPC=hiryu
+0x276a=lesser hiryu
+NPC=lesserhiryu
 0x2d95=Reptalon
 NPC=reptalon
 0x2d96=Cu Sidhe
@@ -502,10 +542,16 @@ NPC=ophapprentice
 NPC=ophshaman
 0x25ac=Ophidian Matriarch
 NPC=ophmatriarch
+0x25ac=an ophidian justicar
+NPC=ophjusticar
+0x25ac=an ophidian zealot
+NPC=ophzealot
 0x25c2=Silver Serpent
 NPC=silverserpent
 0x20fc=Snake
 NPC=snake
+0x2771=a yamandon
+NPC=yamandon
 <=Previous Menu
 ITEMMENU=5002
 }
@@ -543,6 +589,12 @@ NPC=mummy
 NPC=rottingcorpse
 0x2591=a Ghoul
 NPC=ghoul
+0x25c7=a spectral armor
+NPC=spectralarmor
+0x276c=lady of the snow
+NPC=ladyofthesnow
+0x276e=revenant lion
+NPC=revenantlion
 <=Previous Menu
 ITEMMENU=5002
 }
@@ -680,6 +732,8 @@ NPC=f_waitress
 NPC=f_weaponsmith
 0x2107=Weaver
 NPC=f_weaver
+0x2107=Veterinarian
+NPC=f_veterinarian
 <=Previous Menu
 ITEMMENU=5003
 }
@@ -816,6 +870,8 @@ NPC=m_waiter
 NPC=m_weaponsmith
 0x2106=Weaver
 NPC=m_weaver
+0x2106=Veterinarian
+NPC=m_veterinarian
 <=Previous Menu
 ITEMMENU=5003
 }

data/dfndata/npc/femalevendors.dfn

@@ -1080,4 +1080,30 @@ SHOPLIST=BlacksmithShopping
 SCRIPT=3214
 CUSTOMINTTAG=bodType 1
 CUSTOMINTTAG=bodSubtype 3
+}
+
+[f_veterinarian]
+{
+GET=basevendor
+NAMELIST=2
+TITLE=the veterinarian
+ID=0x0191
+EQUIPITEM=listobject15
+HAIRCOLOR=15
+EQUIPITEM=0x0e8a
+EQUIPITEM=listobject40
+COLORLIST=5
+EQUIPITEM=listobject41
+COLORLIST=5
+EQUIPITEM=listobject42
+COLORLIST=5
+EQUIPITEM=listobject43
+EQUIPITEM=listobject45
+COLORLIST=5
+ANATOMY=750 980
+FORENSICS=650 880
+HEALING=640 1000
+SPIRITSPEAK=600 830
+SHOPLIST=HealerShopping
+SCRIPT=3109
 }

data/dfndata/npc/malevendors.dfn

@@ -1128,4 +1128,32 @@ SHOPLIST=BlacksmithShopping
 SCRIPT=3214
 CUSTOMINTTAG=bodType 1
 CUSTOMINTTAG=bodSubtype 3
+}
+
+[m_veterinarian]
+{
+GET=basevendor
+NAMELIST=1
+TITLE=the veterinarian
+ID=0x0190
+EQUIPITEM=listobject13
+HAIRCOLOR=15
+EQUIPITEM=listobject14
+COLORMATCHHAIR
+EQUIPITEM=0x0e8a
+EQUIPITEM=listobject20
+COLORLIST=5
+EQUIPITEM=listobject21
+COLORLIST=5
+EQUIPITEM=listobject22
+COLORLIST=5
+EQUIPITEM=listobject23
+EQUIPITEM=listobject25
+COLORLIST=5
+ANATOMY=750 980
+FORENSICS=650 880
+HEALING=640 1000
+SPIRITSPEAK=600 830
+SHOPLIST=HealerShopping
+SCRIPT=3109
 }

data/dfndata/npc/vendors.dfn

@@ -188,10 +188,10 @@ GET=m_tinker f_tinker
 GET=m_vagabond f_vagabond
 }
 
-//[vet]
-//{Note: Not implemented Yet
-//GET=m_vet f_vet
-//}
+[veterinarian]
+{
+GET=m_veterinarian f_veterinarian
+}
 
 [waiter]
 {

data/dfndata/spawn/felucca/spawn_felucca_town_britain.dfn

@@ -79,7 +79,7 @@ CALL=1
 [REGIONSPAWN 5]
 {
 NAME=Britannia Animal Care
-NPC=animaltrainer
+NPC=veterinarian
 MAXNPCS=1
 X1=1508
 Y1=1565

data/dfndata/spawn/felucca/spawn_felucca_town_delucia.dfn

@@ -343,3 +343,18 @@ MINTIME=30
 MAXTIME=60
 CALL=5
 }
+
+[REGIONSPAWN 1536]
+{
+NAME=delucia - stables
+NPC=veterinarian
+MAXNPCS=1
+X1=5291
+Y1=4004
+X2=5299
+Y2=4011
+WORLD=0
+MINTIME=480
+MAXTIME=600
+CALL=1
+}

data/dfndata/spawn/felucca/spawn_felucca_town_minoc.dfn

@@ -617,3 +617,18 @@ MINTIME=480
 MAXTIME=600
 CALL=1
 }
+
+[REGIONSPAWN 544]
+{
+NAME=Minoc - Stables
+NPC=veterinarian
+MAXNPCS=1
+X1=2515
+Y1=375
+X2=2518
+Y2=377
+WORLD=0
+MINTIME=480
+MAXTIME=600
+CALL=1
+}

data/dfndata/spawn/felucca/spawn_felucca_town_trinsic.dfn

@@ -757,3 +757,18 @@ MINTIME=60
 MAXTIME=90
 CALL=1
 }
+
+[REGIONSPAWN 1154]
+{
+NAME=Trinsic animal trainer
+NPC=veterinarian
+MAXNPCS=1
+X1=1821
+Y1=2732
+X2=1823
+Y2=2735
+WORLD=0
+MINTIME=480
+MAXTIME=600
+CALL=1
+}

data/dfndata/spawn/trammel/spawn_trammel_town_britain.dfn

@@ -79,7 +79,7 @@ CALL=1
 [REGIONSPAWN 7005]
 {
 NAME=Britannia Animal Care
-NPC=animaltrainer
+NPC=veterinarian
 MAXNPCS=1
 X1=1508
 Y1=1565

data/dfndata/spawn/trammel/spawn_trammel_town_delucia.dfn

@@ -343,3 +343,18 @@ MINTIME=30
 MAXTIME=60
 CALL=5
 }
+
+[REGIONSPAWN 8536]
+{
+NAME=delucia - stables
+NPC=veterinarian
+MAXNPCS=1
+X1=5291
+Y1=4004
+X2=5299
+Y2=4011
+WORLD=1
+MINTIME=480
+MAXTIME=600
+CALL=1
+}

data/dfndata/spawn/trammel/spawn_trammel_town_minoc.dfn

@@ -617,3 +617,18 @@ MINTIME=480
 MAXTIME=600
 CALL=1
 }
+
+[REGIONSPAWN 7544]
+{
+NAME=Minoc - Stables
+NPC=veterinarian
+MAXNPCS=1
+X1=2515
+Y1=375
+X2=2518
+Y2=377
+WORLD=1
+MINTIME=480
+MAXTIME=600
+CALL=1
+}