From ed41067640c512709c2cdbed42241840a22ba23e Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 23 Apr 2009 13:57:22 +0000 Subject: Made some adjustments to the land skill code, based on official information: - Expanded and corrected the land skill view id enum in skill.h - Renamed UNT_ATTACK_SKILLS to UNT_DUMMYSKILL and UNT_KAENSIN to UNT_KAEN (official terminology) - changed GS_DESPERADO to use the UNT_DUMMYSKILL view id instead of UNT_KAENSIN (and is it supposed to be a land skill at all?) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13688 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 7620fe91b..84bdfe5bd 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7124,7 +7124,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns switch (sg->unit_id) { case UNT_FIREWALL: - case UNT_KAENSIN: + case UNT_KAEN: { int count=0; const int x = bl->x, y = bl->y; @@ -7203,7 +7203,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); break; - case UNT_ATTACK_SKILLS: + case UNT_DUMMYSKILL: switch (sg->skill_id) { case SG_SUN_WARM: //SG skills [Komurka] @@ -7241,6 +7241,12 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns if (skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0) <= 0 && tsc) tsc->sg_counter=0; //Attack absorbed. break; + + case GS_DESPERADO: + if (rand()%100 < src->val1) + skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); + break; + default: skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); } @@ -7464,11 +7470,6 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); break; - case UNT_DESPERADO: - if (rand()%100 < src->val1) - skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0); - break; - case UNT_GROUNDDRIFT_WIND: case UNT_GROUNDDRIFT_DARK: case UNT_GROUNDDRIFT_POISON: -- cgit v1.2.3-60-g2f50