From 797e2b728c34e2037da494070913bbe2f84a91c2 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Mon, 3 Sep 2012 02:50:41 +0000 Subject: Fixed bugreport:6581 applied balance update to MO_EXTREMITYFIST. Fixed bugreport:6457 where SR_CURSEDCIRCLE is not remove when target dies. Fixed bugreport:6535 updated GN_CRAZY_WEED to its official behavior. Fixed bugreport:6592 added a missing break in Spiral Pierce skillratio at battle.c. Fixed a faulty skillratio formula of GN_CART_TORNADO. Thanks to Lighta git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16738 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 564c08a1f..a3a097c92 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1997,6 +1997,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo ATK_ADD(weight * skill_lv) skillratio += 50*skill_lv; } + break; #endif case ASC_METEORASSAULT: skillratio += 40*skill_lv-60; @@ -2448,7 +2449,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo // ATK [( Skill Level x 50 ) + ( Cart Weight / ( 150 - Caster’s Base STR ))] + ( Cart Remodeling Skill Level x 50 )] % skillratio = 50 * skill_lv; if( sd && sd->cart_weight) - skillratio += sd->cart_weight/10 / (150-sstatus->str) + pc_checkskill(sd, GN_REMODELING_CART) * 50; + skillratio += sd->cart_weight/10 / max(150-sstatus->str,1) + pc_checkskill(sd, GN_REMODELING_CART) * 50; break; case GN_CARTCANNON: // ATK [{( Cart Remodeling Skill Level x 50 ) x ( INT / 40 )} + ( Cart Cannon Skill Level x 60 )] % @@ -5050,7 +5051,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case MS_MAGNUM: case RA_DETONATOR: case RA_SENSITIVEKEEN: - case GN_CRAZYWEED: + case GN_CRAZYWEED_ATK: case RK_STORMBLAST: case RK_PHANTOMTHRUST: case SR_RAMPAGEBLASTER: -- cgit v1.2.3-70-g09d2