- Cleaned some of mpeg's updated work.

- Fixed HT_BLITZBEAT hitting neutral characters when it auto-triggers.
- Simplified the Tatami Gaeshi code.
- Fixed AS_SPLASHER doing full damage on everyone except targetted char instead of the other way around.
- Fixed KAENSIN clearing out SUITON cells and viceversa.
- The spawn area is now seen as range rather than absolute for mob spawn lines. This means that x,y,10,10 will spawn the mob on a 21x21 grid around the given x,y point.
- Some clean up of the mob-spawn code. Now you can specify negative areas, so that a spawn location such as 100,150,0,-1 will spawn a mob always on x=100, but any Y value of the current map.


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

1 files changed, 1 insertions, 9 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 9b846e82c..13bca77a4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2276,21 +2276,13 @@ struct Damage battle_calc_magic_attack(
 
 				switch(skill_num){
 					case MG_NAPALMBEAT:
+					case MG_FIREBALL:
 						skillratio += skill_lv*10-30;
 						break;
 					case MG_SOULSTRIKE:
 						if (battle_check_undead(tstatus->race,tstatus->def_ele))
 							skillratio += 5*skill_lv;
 						break;
-					case MG_FIREBALL:
-						if(mflag>2)
-							ad.damage = 0;
-						else {
-							int drate[]={100,90,70};
-							MATK_RATE(drate[mflag]);
-							skillratio += 70+10*skill_lv;
-						}
-						break;
 					case MG_FIREWALL:
 						skillratio -= 50;
 						break;