Merge pull request #648 from erdelf/master

erdelf · web-flow · commit 70d8c8dc422d · 2024-11-19T01:45:46.000+01:00
fix of item termination option logic
diff --git a/AutoDuty/AutoDuty.cs b/AutoDuty/AutoDuty.cs
@@ -347,12 +347,13 @@ internal void LoadPath()
         }
     }
 
-    private unsafe bool StopLoop => Configuration.EnableTerminationActions && (CurrentTerritoryContent == null ||
-                                    (Configuration.StopLevel && Player.Level >= Configuration.StopLevelInt) ||
-                                    (Configuration.StopNoRestedXP && AgentHUD.Instance()->ExpRestedExperience == 0) ||
-                                    (Configuration.StopItemQty && Configuration.StopItemAll 
-                                        ? Configuration.StopItemQtyItemDictionary.All(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)
-                                        : Configuration.StopItemQtyItemDictionary.Any(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)));
+    private unsafe bool StopLoop => Configuration.EnableTerminationActions && 
+                                        (CurrentTerritoryContent == null ||
+                                        (Configuration.StopLevel && Player.Level >= Configuration.StopLevelInt) ||
+                                        (Configuration.StopNoRestedXP && AgentHUD.Instance()->ExpRestedExperience == 0) ||
+                                        (Configuration.StopItemQty && (Configuration.StopItemAll 
+                                            ? Configuration.StopItemQtyItemDictionary.All(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)
+                                            : Configuration.StopItemQtyItemDictionary.Any(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value))));
 
     private void TrustLeveling()
     {

Original file line number	Diff line number	Diff line change
`@@ -347,12 +347,13 @@ internal void LoadPath()`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`350`		`- private unsafe bool StopLoop => Configuration.EnableTerminationActions && (CurrentTerritoryContent == null \|\|`
`351`		`- (Configuration.StopLevel && Player.Level >= Configuration.StopLevelInt) \|\|`
`352`		`- (Configuration.StopNoRestedXP && AgentHUD.Instance()->ExpRestedExperience == 0) \|\|`
`353`		`- (Configuration.StopItemQty && Configuration.StopItemAll`
`354`		`- ? Configuration.StopItemQtyItemDictionary.All(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)`
`355`		`- : Configuration.StopItemQtyItemDictionary.Any(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)));`
	`350`	`+ private unsafe bool StopLoop => Configuration.EnableTerminationActions &&`
	`351`	`+ (CurrentTerritoryContent == null \|\|`
	`352`	`+ (Configuration.StopLevel && Player.Level >= Configuration.StopLevelInt) \|\|`
	`353`	`+ (Configuration.StopNoRestedXP && AgentHUD.Instance()->ExpRestedExperience == 0) \|\|`
	`354`	`+ (Configuration.StopItemQty && (Configuration.StopItemAll`
	`355`	`+ ? Configuration.StopItemQtyItemDictionary.All(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value)`
	`356`	`+ : Configuration.StopItemQtyItemDictionary.Any(x => InventoryManager.Instance()->GetInventoryItemCount(x.Key) >= x.Value.Value))));`
`356`	`357`
`357`	`358`	`private void TrustLeveling()`
`358`	`359`	`{`