summaryrefslogtreecommitdiff
path: root/src/map/pet.c
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-13 19:53:10 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-13 19:53:10 +0000
commit61980833a1b7ffe229712f782f14425ab4fef90e (patch)
tree20eb8796273fc7c6c8794fb4d6caee8d552314b6 /src/map/pet.c
parent40fc56ca294bbc0ec69831f2f41201616e838405 (diff)
downloadhercules-61980833a1b7ffe229712f782f14425ab4fef90e.tar.gz
hercules-61980833a1b7ffe229712f782f14425ab4fef90e.tar.bz2
hercules-61980833a1b7ffe229712f782f14425ab4fef90e.tar.xz
hercules-61980833a1b7ffe229712f782f14425ab4fef90e.zip
autoloot, poison spore and more on the unknown skill [Shinomori]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1105 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
-rw-r--r--src/map/pet.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index c50e76087..b4dddc372 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1577,19 +1577,22 @@ int pet_skillattack_timer(int tid,unsigned int tick,int id,int data)
}
if(md && rand()%100 < sd->pet.intimate*pd->skilltimer/100 ) {
- if(pd->skilltype==6 || pd->skilltype==176) {
+ switch(pd->skilltype)
+ {
+ case SM_PROVOKE:
+ //case NPC_POISON: poison is not handled there
skill_castend_nodamage_id(&pd->bl,&md->bl,pd->skilltype,pd->skillval,tick,0);
- }
-
- else if(pd->skilltype==110){
+ break;
+ case BS_HAMMERFALL:
skill_castend_pos2(&pd->bl,md->bl.x,md->bl.y,pd->skilltype,pd->skillval,tick,0);
- }
-
- else if(pd->skilltype==91) {
+ break;
+ case WZ_HEAVENDRIVE:
skill_castend_pos2(&pd->bl,md->bl.x,md->bl.y,pd->skilltype,pd->skillval+rand()%100,tick,0);
- }
- else
+ break;
+ default:
skill_castend_damage_id(&pd->bl,&md->bl,pd->skilltype,pd->skillval,tick,0);
+ break;
+ }
pd->skillbonustimer=add_timer(gettick()+1000,pet_skillattack_timer,sd->bl.id,0);
return 0;
}