Merge pull request #770 from erdelf/master

erdelf · web-flow · commit a774c01ae2dc · 2025-01-26T07:53:19.000+01:00
Squadron Sergeant via data id
diff --git a/AutoDuty/Managers/SquadronManager.cs b/AutoDuty/Managers/SquadronManager.cs
@@ -106,7 +106,7 @@ internal unsafe bool OpenSquadron(AtkUnitBase* aub)
             }
 
             // Attempt to get the squadron sergeant once and reuse the result --- This still sets this every call I will change this to one and done later.
-            IGameObject? gameObject = ObjectHelper.GetObjectByPartialName("Squadron Sergeant");
+            IGameObject? gameObject = ObjectHelper.GetObjectByDataId(1016924u) ?? ObjectHelper.GetObjectByDataId(1016986u) ?? ObjectHelper.GetObjectByDataId(1016987u);
             if (gameObject == null || !MovementHelper.Move(gameObject, 0.25f, 6f))
             {
                 return false;

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ internal unsafe bool OpenSquadron(AtkUnitBase* aub)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// Attempt to get the squadron sergeant once and reuse the result --- This still sets this every call I will change this to one and done later.`
`109`		`- IGameObject? gameObject = ObjectHelper.GetObjectByPartialName("Squadron Sergeant");`
	`109`	`+ IGameObject? gameObject = ObjectHelper.GetObjectByDataId(1016924u) ?? ObjectHelper.GetObjectByDataId(1016986u) ?? ObjectHelper.GetObjectByDataId(1016987u);`
`110`	`110`	`if (gameObject == null \|\| !MovementHelper.Move(gameObject, 0.25f, 6f))`
`111`	`111`	`{`
`112`	`112`	`return false;`