- Fixed Potion Pitcher sometimes crashing the server.

- Fixed a compile warning by adjusting the acid demonstration formula.
- Added flag 2 to the skill_castnodex_db file for skills that shouldn't be affected by delay/cast reducing skills/effects.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5714 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 9c8c94d57..dbd706e07 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2807,13 +2807,13 @@ struct Damage  battle_calc_misc_attack(
 		aflag = (aflag&~BF_RANGEMASK)|BF_LONG;

 		break;

 	case CR_ACIDDEMONSTRATION:

-		//This equation is not official, but it's the closest to the official one 

-		//that Viccious Pucca and the other folks at the forums could come up with. [Skotlex]

-		// updated the formula based on a Japanese formula found to be exact [Reddozen]

-		damage = (int)((0.7 * status_get_vit(target) * (int_ * int_)) / (status_get_vit(target) + int_));

-		if (tsd) damage/=2;

-		aflag = (aflag&~BF_RANGEMASK)|BF_LONG;

-		break;

+		{	// updated the formula based on a Japanese formula found to be exact [Reddozen]

+			int vit = status_get_vit(target);

+			damage = 7*(vit*int_*int_) / (10*(vit+int_));

+			if (tsd) damage/=2;

+			aflag = (aflag&~BF_RANGEMASK)|BF_LONG;

+			break;

+		}

 	case NJ_ZENYNAGE:

 		{

 		int dmgnage = (500*skill_lv)+rand()%(500*skill_lv);