From 392e49a6097460851f10501cfe34a9ee86010468 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 7 May 2008 18:46:21 +0000 Subject: - Added function battle_attr_ratio to handle just getting the attribute table data. Fixes Sense messing up with elemental based statuses. - Added Throw tomahawk to the list of items that do not trigger the equipment breaking code. - Moved a bit around the SC_ start of dancing skills to fix Moonlight petals pushing back the casters. - Modified status_damage to handle SC_KAZIEL. The return value of *_dead functions can pass 8 to specify that kaziel should not be triggered (ie: pvp/gvg) - Infinite Endure won't be passed on to devoted characters. - Infinite Endure is no longer saved on logout. - Added check to avoid gms opening vending shops if they don't have the required level. - Moved around the Steel Body S. Novice code, simplified it so it triggers before most of the penalties (death is cancelled). - Fixed the flee penalty not applying when you walk into a gvg map. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12688 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 7222f618e..47b25a0ef 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6419,6 +6419,19 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli safestrncpy(group->valstr, "Boo!", MESSAGE_SIZE); } + if (group->state.song_dance) { + if(sd){ + sd->skillid_dance = skillid; + sd->skilllv_dance = skilllv; + } + if ( + sc_start4(src, SC_DANCING, 100, skillid, (int)group, skilllv, + (group->state.song_dance&2?BCT_SELF:0), limit+1000) && + sd && group->state.song_dance&2 && skillid != CG_HERMODE //Hermod is a encore with a warp! + ) + skill_check_pc_partner(sd, skillid, &skilllv, 1, 1); + } + limit = group->limit; for( i = 0; i < layout->count; i++ ) { @@ -6496,18 +6509,6 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli return NULL; } - if (group->state.song_dance) { - if(sd){ - sd->skillid_dance = skillid; - sd->skilllv_dance = skilllv; - } - if ( - sc_start4(src, SC_DANCING, 100, skillid, (int)group, skilllv, - (group->state.song_dance&2?BCT_SELF:0), limit+1000) && - sd && group->state.song_dance&2 && skillid != CG_HERMODE //Hermod is a encore with a warp! - ) - skill_check_pc_partner(sd, skillid, &skilllv, 1, 1); - } if (skillid == NJ_TATAMIGAESHI) //Store number of tiles. group->val1 = group->alive_count; -- cgit v1.2.3-70-g09d2