- In CELL_NOSTACK mode, mob_canreach will now ignore other players when checking if there's a path to the player.

- Added RG_RAID to the list of skills that need a status_checkskilluse on skill_attack.
- Added the mapflag check monster_noteleport to AL_TELEPORT.
- Fixed the sc_def rate not being reduced in status_change_start.
- The battle config options sp_rate and hp_rate are now applied independently of the same type of bonuses from cards.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 56260bb47..13d8d0cb2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1525,7 +1525,7 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 		return 0;

 	

 	//Note that splash attacks often only check versus the targetted mob, those around the splash area normally don't get checked for being hidden/cloaked/etc. [Skotlex]

-	if ((skill_get_nk(skillid) == NK_SPLASH_DAMAGE || skillid == ASC_METEORASSAULT || skillid == SN_SHARPSHOOTING)

+	if ((skill_get_nk(skillid) == NK_SPLASH_DAMAGE || skillid == ASC_METEORASSAULT || skillid == SN_SHARPSHOOTING || skillid == RG_RAID)

 		&& !status_check_skilluse(dsrc, bl, skillid, 1))

 		return 0;

 

@@ -3163,7 +3163,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 	if(status_isdead(bl) && skillid != NPC_REBIRTH && skillid != ALL_RESURRECTION && skillid != PR_REDEMPTIO)

 		return 1;

 

-	if (skillid >= 0 && skillid < sizeof(SkillStatusChangeTable)/sizeof(SkillStatusChangeTable[0]))

+	if (skillid > 0 && skillid < MAX_SKILL)

 		type = SkillStatusChangeTable[skillid];

 //Shouldn't be needed, skillnotok's return value is highly unlikely to have changed after you started casting. [Skotlex]

 //	if (sd && skillnotok(skillid, sd)) // [MouseJstr]

@@ -4344,7 +4344,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				clif_skill_warppoint(sd,skillid,"Random",

 					mapindex_id2name(sd->status.save_point.map),"","");

 			}

-		} else if(dstmd)

+		} else if(dstmd && !map[sd->bl.m].flag.monster_noteleport)

 			mob_warp(dstmd,-1,-1,-1,3);

 		break;