Various minor fixes, reworked warg target priority and chase behavior.

Byak0 · Oct 29, 2024 · ee8911a · ee8911a
1 parent f9cc4ae
commit ee8911a
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 92 deletions.
diff --git a/Alliance.Client/_Module/SubModule.xml b/Alliance.Client/_Module/SubModule.xml
@@ -2,7 +2,7 @@
 <Module>
   <Id value="Alliance" />
   <Name value="Alliance" />
-  <Version value="v0.1.8.9" />
+  <Version value="v0.1.9.0" />
   <ModuleCategory value="Multiplayer" />
   <DependedModules>
     <DependedModule Id="Native" />

diff --git a/Alliance.Common/CommonProps.props b/Alliance.Common/CommonProps.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AllianceVersion>0.1.8.9</AllianceVersion>
+    <AllianceVersion>0.1.9.0</AllianceVersion>
   </PropertyGroup>
 </Project>
diff --git a/Alliance.Editor/_Module/SubModule.xml b/Alliance.Editor/_Module/SubModule.xml
@@ -2,7 +2,7 @@
 <Module>
   <Id value="Alliance.Editor" />
   <Name value="Alliance.Editor" />
-  <Version value="v0.1.8.9" />
+  <Version value="v0.1.9.0" />
   <ModuleCategory value="Singleplayer" />
   <DependedModules>
     <DependedModule Id="Native" />

diff --git a/Alliance.Server/Core/Utils/CoreUtils.cs b/Alliance.Server/Core/Utils/CoreUtils.cs
@@ -32,10 +32,12 @@ public static void TakeDamage(Agent victim, Agent attacker, int damage, float ma
 
 			if (victim.Health <= 0) return;
 
-			if (attacker?.MissionPeer != null)
+			// Retrieve peer from either agent or rider agent
+			MissionPeer peer = attacker?.MissionPeer != null ? attacker.MissionPeer : attacker.RiderAgent?.MissionPeer != null ? attacker.RiderAgent.MissionPeer : null;
+			if (peer != null)
 			{
 				//Communicate damage to client to display PersonalKillFeed
-				GameNetwork.BeginModuleEventAsServer(attacker.MissionPeer.GetNetworkPeer());
+				GameNetwork.BeginModuleEventAsServer(peer.GetNetworkPeer());
 				GameNetwork.WriteMessage(new SyncPersonalKillFeedNotification(attacker, victim, false, false, false, victim.Health <= damage, false, false, damage));
 				GameNetwork.EndModuleEventAsServer();
 			}

diff --git a/Alliance.Server/Extensions/WargAttack/Behavior/BoneCheckDuringAnimationBehavior.cs b/Alliance.Server/Extensions/WargAttack/Behavior/BoneCheckDuringAnimationBehavior.cs
@@ -27,6 +27,7 @@ public class BoneCheckDuringAnimationBehavior : MissionBehavior
 		private Agent target;
 		private List<sbyte> boneIds;
 		private float minDistanceSquared;
+		private float startDelay;
 		private float duration;
 		private bool isChecking;
 
@@ -37,12 +38,13 @@ public class BoneCheckDuringAnimationBehavior : MissionBehavior
 		public Action<Agent, Agent> OnBoneFoundParryCallback;
 
 		// Constructor callback
-		public BoneCheckDuringAnimationBehavior(Agent agent, Agent target, List<sbyte> boneIds, float duration, float minDistanceSquared, Action<Agent, Agent> onBoneFoundCallback, Action<Agent, Agent> onBoneFoundParryCallback)
+		public BoneCheckDuringAnimationBehavior(Agent agent, Agent target, List<sbyte> boneIds, float startDelay, float duration, float minDistanceSquared, Action<Agent, Agent> onBoneFoundCallback, Action<Agent, Agent> onBoneFoundParryCallback)
 		{
 			this.agent = agent;
 			this.target = target;
 			this.boneIds = boneIds;
 			this.minDistanceSquared = minDistanceSquared;
+			this.startDelay = startDelay;
 			this.duration = duration;
 			isChecking = true;
 			OnBoneFoundCallback = onBoneFoundCallback; // register callback
@@ -62,6 +64,8 @@ public override void OnMissionTick(float dt)
 				return;
 			}
 
+			if (time < startDelay) return;
+
 			sbyte boneInRange = SearchBoneInRange(agent, target, boneIds, minDistanceSquared);
 
 			// If a bone is found, call the callback.