- Mobs now by default are "everyone's" enemy, so mobs are able to hit each another.

- Added monster_ai&0x400 to use the previous 'smart' criteria that prevents mobs from fighting each another.
- Moved "unsetting" the angry mode from the mob_ai to the mob_damage function, where it'll work regardless of who hits the mob.


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

1 files changed, 11 insertions, 9 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index 286146e5c..32deef2bc 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1162,14 +1162,6 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap)
 				}
 			}
 		}
-		if (md->state.aggressive && md->attacked_id == md->target_id)
-		{	//No longer aggressive, change to retaliate AI.
-			md->state.aggressive = 0;
-			if(md->state.skillstate== MSS_ANGRY)
-				md->state.skillstate = MSS_BERSERK;
-			if(md->state.skillstate== MSS_FOLLOW)
-				md->state.skillstate = MSS_RUSH;
-		}
 		//Clear it since it's been checked for already.
 		md->attacked_id = 0;
 	}
@@ -1582,8 +1574,18 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage)
 {
 	int char_id = 0, flag = 0;
 
-	if (damage > 0) //Store total damage...
+	if (damage > 0)
+	{	//Store total damage...
 		md->tdmg+=damage;
+		if (md->state.aggressive)
+		{	//No longer aggressive, change to retaliate AI.
+			md->state.aggressive = 0;
+			if(md->state.skillstate== MSS_ANGRY)
+				md->state.skillstate = MSS_BERSERK;
+			if(md->state.skillstate== MSS_FOLLOW)
+				md->state.skillstate = MSS_RUSH;
+		}
+	}
 
 	if(md->guardian_data && md->guardian_data->number < MAX_GUARDIANS) // guardian hp update [Valaris] (updated by [Skotlex])
 		md->guardian_data->castle->guardian[md->guardian_data->number].hp = md->status.hp;