Set initial aggro of 'added' mobs to 1

Dawn-of-Light · Oct 27, 2022 · d903180 · d903180
1 parent 479a3ee
commit d903180
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/GameServer/ai/brain/DragonBrain.cs b/GameServer/ai/brain/DragonBrain.cs
@@ -129,7 +129,7 @@ protected override void CheckNPCAggro()
 				{
 					if (CalculateAggroLevelToTarget(npc) > 0)
 					{
-						AddToAggroList(npc, (npc.Level + 1) << 1);
+						AddToAggroList(npc, 1);
 					}
 				}
 			}

diff --git a/GameServer/ai/brain/GuardBrain.cs b/GameServer/ai/brain/GuardBrain.cs
@@ -55,7 +55,7 @@ protected override void CheckPlayerAggro()
 				if (!Body.IsWithinRadius(player, AggroRange))
 					continue;
 
-				AddToAggroList(player, player.EffectiveLevel << 1);
+				AddToAggroList(player, 1);
 				return;
 			}
 		}
@@ -75,7 +75,7 @@ protected override void CheckNPCAggro()
 				if (!npc.IsWithinRadius(Body, AggroRange))
 					continue;
 
-				AddToAggroList(npc, npc.Level << 1);
+				AddToAggroList(npc, 1);
 				return;
 			}
 		}

diff --git a/GameServer/ai/brain/Guards/KeepGuardBrain.cs b/GameServer/ai/brain/Guards/KeepGuardBrain.cs
@@ -134,7 +134,7 @@ protected override void CheckPlayerAggro()
 						Body.Say("Want to attack player " + player.Name);
 					}
 
-					AddToAggroList(player, player.EffectiveLevel << 1);
+					AddToAggroList(player, 1);
 					return;
 				}
 			}
@@ -171,7 +171,7 @@ protected override void CheckNPCAggro()
 						Body.Say("Want to attack player " + player.Name + " pet " + npc.Name);
 					}
 
-					AddToAggroList(npc, (npc.Level + 1) << 1);
+					AddToAggroList(npc, 1);
 					return;
 				}
 			}

diff --git a/GameServer/ai/brain/StandardMobBrain.cs b/GameServer/ai/brain/StandardMobBrain.cs
@@ -247,9 +247,9 @@ protected virtual void CheckNPCAggro()
 				if (CalculateAggroLevelToTarget(npc) > 0)
 				{
 					if (npc.Brain is ControlledNpcBrain) // This is a pet or charmed creature, checkLOS
-						AddToAggroList(npc, (npc.Level + 1) << 1, true);
+						AddToAggroList(npc, 1, true);
 					else
-						AddToAggroList(npc, (npc.Level + 1) << 1);
+						AddToAggroList(npc, 1);
 				}
 			}
 		}
@@ -290,7 +290,7 @@ protected virtual void CheckPlayerAggro()
 
 				if (CalculateAggroLevelToTarget(player) > 0)
 				{
-					AddToAggroList(player, player.EffectiveLevel << 1, true);
+					AddToAggroList(player, 1, true);
 				}
 			}
 		}

diff --git a/GameServer/spells/Masterlevel/Convoker.cs b/GameServer/spells/Masterlevel/Convoker.cs
@@ -933,7 +933,7 @@ protected override void CheckNPCAggro()
 			if (!(npc.Brain is IControlledBrain || npc is GameGuard))
 				continue;
 
-			AddToAggroList(npc, npc.Level << 1);
+			AddToAggroList(npc, 1);
 			return;
 		}
 	}

diff --git a/GameServer/spells/negative/FriendBrain.cs b/GameServer/spells/negative/FriendBrain.cs
@@ -32,7 +32,7 @@ protected override void CheckPlayerAggro()
 					if (!GameServer.ServerRules.IsAllowedToAttack(m_spellHandler.Caster, player, true))
 						continue;
 
-					AddToAggroList(player, player.EffectiveLevel<<1);
+					AddToAggroList(player, 1);
 				}
 			}
 		}
@@ -45,7 +45,7 @@ protected override void CheckNPCAggro()
 				{
 					if (GameServer.ServerRules.IsAllowedToAttack(m_spellHandler.Caster, npc, true))
 					{
-						AddToAggroList(npc, npc.Level<<1);
+						AddToAggroList(npc, 1);
 						return;
 					}
 				}
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,7 +129,7 @@ protected override void CheckNPCAggro() @@
     				{
     					if (CalculateAggroLevelToTarget(npc) > 0)
     					{
-    						AddToAggroList(npc, (npc.Level + 1) << 1);
+    						AddToAggroList(npc, 1);
     					}
     				}
     			}
@@ Expand Down @@