Fixed offensive skill formulas of KG/OB to official.

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>

3 files changed, 39 insertions, 43 deletions

diff --git a/src/config/const.h b/src/config/const.h
index 7b5ed5506..e10d2ad2a 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -73,17 +73,16 @@
 /* Renewal's dmg level modifier, used as a macro for a easy way to turn off. */
 #ifdef RENEWAL_LVDMG
 	#define RE_LVL_DMOD(val) do { \
-		if( status->get_lv(src) > 100 && (val) > 0 ) \
+		if( (val) > 0 ) \
 			skillratio = skillratio * status->get_lv(src) / (val); \
 	} while(0)
 	#define RE_LVL_MDMOD(val) do { \
-		if( status->get_lv(src) > 100 && (val) > 0) \
+		if ( (val) > 0 ) \
 			md.damage = md.damage * status->get_lv(src) / (val); \
 	} while(0)
 	/* ranger traps special */
 	#define RE_LVL_TMDMOD() do { \
-		if( status->get_lv(src) > 100 ) \
-			md.damage = md.damage * 150 / 100 + md.damage * status->get_lv(src) / 100; \
+		md.damage = md.damage * 150 / 100 + md.damage * status->get_lv(src) / 100; \
 	} while(0)
 #else
 	#define RE_LVL_DMOD(val)
diff --git a/src/map/battle.c b/src/map/battle.c
index f740d6518..f32919c85 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2078,11 +2078,6 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 				case NJ_KIRIKAGE:
 					skillratio += 100 * (skill_lv-1);
 					break;
-#ifdef RENEWAL
-				case NJ_KUNAI:
-					skillratio += 50 + 150 * skill_lv;
-					break;
-#endif
 				case KN_CHARGEATK:
 					{
 						int k = (flag-1)/3; //+100% every 3 cells of distance
@@ -2521,6 +2516,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					RE_LVL_DMOD(120);
 					if( tsc && tsc->data[SC_KO_JYUMONJIKIRI] )
 						skillratio += status->get_lv(src) * skill_lv;
+					break;
 				case KO_HUUMARANKA:
 					skillratio += -100 + 150 * skill_lv + status_get_agi(src) + status_get_dex(src) + 100 * (sd ? pc->checkskill(sd, NJ_HUUMA) : 0);
 					break;
@@ -2528,11 +2524,6 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					skillratio += -100 + 100 * skill_lv;
 					RE_LVL_DMOD(100);
 					break;
-				case KO_BAKURETSU:
-					skillratio += -100 + (50 + status_get_dex(src) / 4) * skill_lv * (sd?pc->checkskill(sd,NJ_TOBIDOUGU):10) * 4 / 100;
-					RE_LVL_DMOD(120);
-					skillratio += 10 * (sd ? sd->status.job_level : 0);
-					break;
 				case MH_NEEDLE_OF_PARALYZE:
 					skillratio += 600 + 100 * skill_lv;
 					break;
@@ -3933,14 +3924,16 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 		break;
 	case KO_HAPPOKUNAI:
 		{
-			struct Damage wd = battle->calc_weapon_attack(src,target,skill_id,skill_lv,mflag);
+			struct Damage wd = battle->calc_weapon_attack(src, target, 0, 1, mflag);
 #ifdef RENEWAL
 			short totaldef = status->get_total_def(target);
 #else
 			short totaldef = tstatus->def2 + (short)status->get_def(target);
 #endif
-			md.damage = 3 * wd.damage * (5 + skill_lv) / 5;
+			if ( sd )	wd.damage += sd->bonus.arrow_atk;
+			md.damage = (int)(3 * (1 + wd.damage) * (5 + skill_lv) / 5.0f);
 			md.damage -= totaldef;
+
 		}
 		break;
 	}
@@ -4242,10 +4235,14 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 					wd.div_ = tstatus->size + 2 + ( (rnd()%100 < 50-tstatus->size*10) ? 1 : 0 );
 				break;
 #ifdef RENEWAL
+			case NJ_KUNAI:
 			case HW_MAGICCRASHER:
+			case NJ_SYURIKEN:
+			case GS_MAGICALBULLET:
+#endif
+			case KO_BAKURETSU:
 				flag.tdef = 1;
 				break;
-#endif
 		}
 	} else //Range for normal attacks.
 		wd.flag |= flag.arrow?BF_LONG:BF_SHORT;
@@ -4597,7 +4594,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 				break;
 			case NJ_SYURIKEN: // [malufett]
 				GET_NORMAL_ATTACK( (sc && sc->data[SC_MAXIMIZEPOWER]?1:0)|(sc && sc->data[SC_WEAPONPERFECT]?8:0) );
-				wd.damage += battle->calc_masteryfix(src, target, skill_id, skill_lv, 4 * skill_lv + (sd ? sd->bonus.arrow_atk : 0), wd.div_, 0, flag.weapon) - status->get_total_def(target);
+				wd.damage += battle->calc_masteryfix(src, target, skill_id, skill_lv, 4 * skill_lv + (sd ? sd->bonus.arrow_atk : 0), wd.div_, 0, flag.weapon);
 				break;
 			case MO_EXTREMITYFIST: // [malufett]
 				{
@@ -4736,13 +4733,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 			status_change_end(src, SC_EXEEDBREAK, INVALID_TIMER);
 		}
 
-
-	#ifdef RENEWAL
-		if( sd && skill_id == NJ_KUNAI ){
-			flag.tdef = 1;
-			ATK_ADD( sd->bonus.arrow_atk );
-		}
-	#endif
 		switch(skill_id){
 			case SR_GATEOFHELL:
 				if (wd.dmg_lv != ATK_FLEE)
@@ -4776,6 +4766,15 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 					wd.damage = battle->calc_masteryfix(src, target, skill_id, skill_lv, wd.damage, wd.div_, 0, flag.weapon);
 				}
 	#endif
+
+			case KO_BAKURETSU:
+			{
+				GET_NORMAL_ATTACK((sc && sc->data[SC_MAXIMIZEPOWER] ? 1 : 0) | (sc && sc->data[SC_WEAPONPERFECT] ? 8 : 0));
+				skillratio = skill_lv * (50 + status_get_dex(src) / 4);
+				skillratio = (int)(skillratio * (sd ? pc->checkskill(sd, NJ_TOBIDOUGU) : 10) * 40.f / 100.0f * status->get_lv(src) / 120);
+				ATK_RATE(skillratio + 10 * (sd ? sd->status.job_level : 0));
+			}
+				break;
 			default:
 				ATK_RATE(battle->calc_skillratio(BF_WEAPON, src, target, skill_id, skill_lv, skillratio, wflag));
 		}
@@ -4805,7 +4804,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 				ATK_ADD( status->get_matk(src, 2) );
 #else
 				ATK_ADD( battle->calc_magic_attack(src, target, skill_id, skill_lv, wflag).damage );
-				flag.tdef = 1;
 #endif
 #ifndef RENEWAL
 			case NJ_SYURIKEN:
diff --git a/src/map/skill.c b/src/map/skill.c
index 6bfecf46f..9130ab014 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3574,7 +3574,6 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 		case WM_SEVERE_RAINSTORM_MELEE:
 		case WM_GREAT_ECHO:
 		case GN_SLINGITEM_RANGEMELEEATK:
-		case KO_JYUMONJIKIRI:
 		case KO_SETSUDAN:
 		case GC_DARKCROW:
 		case LG_OVERBRAND_BRANDISH:
@@ -4216,27 +4215,27 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 		}
 			break;
 
+		case KO_JYUMONJIKIRI:
 		case GC_DARKILLUSION:
 			{
 				short x, y;
-				short dir = map->calc_dir(src,bl->x,bl->y);
+				short dir = map->calc_dir(bl, src->x, src->y);
 
-				if( dir > 0 && dir < 4) x = 2;
-				else if( dir > 4 ) x = -2;
-				else x = 0;
-				if( dir > 2 && dir < 6 ) y = 2;
-				else if( dir == 7 || dir < 2 ) y = -2;
-				else y = 0;
+				if ( dir < 4 ) {
+					x = bl->x + 2 * (dir > 0) - 3 * (dir > 0);
+					y = bl->y + 1 - (dir / 2) - (dir > 2);
+				} else {
+					x = bl->x + 2 * (dir > 4) - 1 * (dir > 4);
+					y = bl->y + (dir / 6) - 1 + (dir > 6);
+				}
 
-				if( unit->movepos(src, bl->x+x, bl->y+y, 1, 1) )
-				{
-					clif->slide(src,bl->x+x,bl->y+y);
+				if ( unit->movepos(src, x, y, 1, 1) ) {
+					clif->slide(src, x, y);
 					clif->fixpos(src); // the official server send these two packets.
-					skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
-					if( rnd()%100 < 4 * skill_lv )
-						skill->castend_damage_id(src,bl,GC_CROSSIMPACT,skill_lv,tick,flag);
+					skill->attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
+					if ( rnd() % 100 < 4 * skill_lv &&	skill_id == GC_DARKILLUSION )
+						skill->castend_damage_id(src, bl, GC_CROSSIMPACT, skill_lv, tick, flag);
 				}
-
 			}
 			break;
 		case GC_WEAPONCRUSH:
@@ -6041,7 +6040,6 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		case MO_ABSORBSPIRITS:
 		{
 			int sp = 0;
-			int i;
 			if ( dstsd && dstsd->spiritball
 				&& (sd == dstsd || map_flag_vs(src->m) || (sd->duel_group && sd->duel_group == dstsd->duel_group))
 				&& ((dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK) != MAPID_REBELLION)
@@ -6055,7 +6053,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				mob->target(dstmd,src,0);
 			}
 			if ( dstsd ) {
-				for (i = SPIRITS_TYPE_CHARM_WATER; i < SPIRITS_TYPE_SPHERE; i++)
+				int i;
+				for ( i = SPIRITS_TYPE_CHARM_WATER; i < SPIRITS_TYPE_SPHERE; i++ )
 					pc->del_charm(dstsd, dstsd->spiritcharm[i], i);
 			}
 			if (sp) status->heal(src, 0, sp, 3);