From 94bad013f7075b5888d3f1f6a148fe6e2d3f5cb1 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Thu, 26 Jul 2012 18:08:30 +0000 Subject: Updated NJ_HUUMA to renewal behavior.(bugreport:6330) Updated some wizard skills(WZ_METEOR,WZ_HEAVENDRIVE,WZ_VERMILION) to its RE damage ratio.(bugreport:6334,bugreport:6329, bugreport:6333) Fixed bugreport:6321 where skill ratio of RK_HUNDREDSPEAR is adjusted too much. Follow up r16492 where damage dealt to traps should now show/display w/o affecting other skills behavior. Fixed a glitch in UNT_DUMMYSKILL where it triggers multiple time that causes multiple damage something related with bugreport:6201. Added some Kagerou/Oboro skills and more to come :). (KO_YAMIKUMO, KO_RIGHT, KO_LEFT, KO_JYUMONJIKIRI, KO_SETSUDAN, KO_BAKURETSU, KO_HAPPOKUNAI, KO_MUCHANAGE) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16506 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 91 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 20 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 6cc0ae044..5e051f6bd 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -865,6 +865,7 @@ int battle_calc_bg_damage(struct block_list *src, struct block_list *bl, int dam case PA_PRESSURE: case HW_GRAVITATION: case NJ_ZENYNAGE: + case KO_MUCHANAGE: break; default: if( flag&BF_SKILL ) @@ -930,6 +931,7 @@ int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int dama case PA_PRESSURE: case HW_GRAVITATION: case NJ_ZENYNAGE: + case KO_MUCHANAGE: break; default: /* Uncomment if you want god-mode Emperiums at 100 defense. [Kisuka] @@ -2098,7 +2100,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo short index = sd->equip_index[EQI_HAND_R]; if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON ) - skillratio += max(10000 - sd->inventory_data[index]->weight, 0); + skillratio += max(10000 - sd->inventory_data[index]->weight, 0) / 10; skillratio += 50 * pc_checkskill(sd,LK_SPIRALPIERCE); } // (1 + [(Caster’s Base Level - 100) / 200]) skillratio = skillratio * (100 + (status_get_lv(src)-100) / 2) / 100; @@ -2478,6 +2480,19 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo case EL_ROCK_CRUSHER: skillratio += 700; break; + case KO_JYUMONJIKIRI: + if( tsc && tsc->data[SC_JYUMONJIKIRI] ) + wd.div_ = wd.div_ * -1;// needs more info + skillratio += -100 + 150 * skill_lv; + case KO_HUUMARANKA: + skillratio += -100 + 150 * skill_lv + sstatus->dex/2 + sstatus->agi/2; // needs more info + break; + case KO_SETSUDAN: + skillratio += 100 * (skill_lv-1); + break; + case KO_BAKURETSU: + skillratio = 50 * skill_lv * (sd?pc_checkskill(sd,NJ_TOBIDOUGU):10); + break; case MH_STAHL_HORN: skillratio += 500 + 100 * skill_lv; break; @@ -2552,6 +2567,12 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo ATK_ADD( status_get_lv(target) * 50 ); //mobs } break; + case KO_SETSUDAN: + if( tsc && tsc->data[SC_SPIRIT] ){ + ATK_ADDRATE(10*tsc->data[SC_SPIRIT]->val1);// +10% custom value. + status_change_end(target,SC_SPIRIT,INVALID_TIMER); + } + break; } } //Div fix. @@ -3117,14 +3138,18 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo { //Dual-wield if (wd.damage) { - skill = pc_checkskill(sd,AS_RIGHT); - wd.damage = wd.damage * (50 + (skill * 10))/100; + if( skill = pc_checkskill(sd,AS_RIGHT) ) + wd.damage = wd.damage * (50 + (skill * 10))/100; + else if( skill = pc_checkskill(sd,KO_RIGHT) ) + wd.damage = wd.damage * (70 + (skill * 10))/100; if(wd.damage < 1) wd.damage = 1; } if (wd.damage2) { - skill = pc_checkskill(sd,AS_LEFT); - wd.damage2 = wd.damage2 * (30 + (skill * 10))/100; + if( skill = pc_checkskill(sd,AS_LEFT) ) + wd.damage2 = wd.damage2 * (30 + (skill * 10))/100; + else if( skill = pc_checkskill(sd,KO_LEFT) ) + wd.damage2 = wd.damage2 * (50 + (skill * 10))/100; if(wd.damage2 < 1) wd.damage2 = 1; } } else if(sd->status.weapon == W_KATAR && !skill_num) @@ -3505,9 +3530,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case WZ_SIGHTRASHER: skillratio += 20*skill_lv; break; - case WZ_VERMILION: - skillratio += 20*skill_lv-20; - break; case WZ_WATERBALL: skillratio += 30*skill_lv; break; @@ -3541,11 +3563,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case NJ_RAIGEKISAI: skillratio += 60 + 40*skill_lv; break; - #ifdef RENEWAL - case NJ_HUUJIN: - skillratio += 50; - break; - #endif case NJ_KAMAITACHI: case NPC_ENERGYDRAIN: skillratio += 100*skill_lv; @@ -3553,6 +3570,31 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case NPC_EARTHQUAKE: skillratio += 100 +100*skill_lv +100*(skill_lv/2); break; + #ifdef RENEWAL + case WZ_HEAVENDRIVE: + case WZ_METEOR: + skillratio += 25; + break; + case WZ_VERMILION: + { + int interval = 0, per = interval , ratio = per; + while( (per++) < skill_lv ){ + ratio += interval; + if(per%3==0) interval += 20; + } + if( skill_lv > 9 ) + ratio -= 10; + skillratio += ratio; + } + break; + case NJ_HUUJIN: + skillratio += 50; + break; + #else + case WZ_VERMILION: + skillratio += 20*skill_lv-20; + break; + #endif /** * Arch Bishop **/ @@ -4068,13 +4110,14 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * md.damage = INT_MAX>>1; break; case NJ_ZENYNAGE: - md.damage = skill_get_zeny(skill_num ,skill_lv); - if (!md.damage) md.damage = 2; - md.damage = md.damage + rnd()%md.damage; - if (is_boss(target)) - md.damage=md.damage/3; - else if (tsd) - md.damage=md.damage/2; + case KO_MUCHANAGE: + md.damage = skill_get_zeny(skill_num ,skill_lv); + if (!md.damage) md.damage = 2; + md.damage = rand()%md.damage + md.damage / (skill_num==NJ_ZENYNAGE?1:2) ; + if (is_boss(target)) + md.damage=md.damage / (skill_num==NJ_ZENYNAGE?3:2); + else if (tsd) // need confirmation for KO_MUCHANAGE + md.damage=md.damage/2; break; case GS_FLING: md.damage = sd?sd->status.job_level:status_get_lv(src); @@ -4128,6 +4171,14 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * //[{( Hell Plant Skill Level x Caster’s Base Level ) x 10 } + {( Caster’s INT x 7 ) / 2 } x { 18 + ( Caster’s Job Level / 4 )] x ( 5 / ( 10 - Summon Flora Skill Level )) md.damage = ( skill_lv * status_get_lv(src) * 10 ) + ( sstatus->int_ * 7 / 2 ) * ( 18 + (sd?sd->status.job_level:0) / 4 ) * ( 5 / (10 - (sd?pc_checkskill(sd,AM_CANNIBALIZE):0)) ); break; + case KO_HAPPOKUNAI: + { + struct Damage wd = battle_calc_weapon_attack(src,target,skill_num,skill_lv,mflag); + short totaldef = tstatus->def2 + (short)status_get_def(target); + md.damage = wd.damage * 60 * (5 + skill_lv) / 100; + md.damage -= totaldef; + } + break; } if (nk&NK_SPLASHSPLIT){ // Divide ATK among targets -- cgit v1.2.3-70-g09d2