feat: add pickup radius

Client/Application/ViewModels/AIConfigViewModel.cs

@@ -118,6 +118,7 @@ namespace Client.Application.ViewModels
         public uint DelevelingAttackDistance { get => delevelingAttackDistance; set { if (value != delevelingAttackDistance) { delevelingAttackDistance = value; OnPropertyChanged(); } } }
         public uint DelevelingSkillId { get => delevelingSkillId; set { if (value != delevelingSkillId) { delevelingSkillId = value; OnPropertyChanged(); } } }
         public byte MaxPassableHeight { get => maxPassableHeight; set { if (value != maxPassableHeight) { maxPassableHeight = value; OnPropertyChanged(); } } }
+        public short PickupRadius { get => pickupRadius; set { if (value != pickupRadius) { pickupRadius = value; OnPropertyChanged(); } } }
 
         public void LoadConfig()
         {
@@ -153,6 +154,7 @@ namespace Client.Application.ViewModels
             DelevelingAttackDistance = config.Deleveling.AttackDistance;
             DelevelingSkillId = config.Deleveling.SkillId;
             MaxPassableHeight = config.Combat.MaxPassableHeight;
+            PickupRadius = config.Combat.PickupRadius;
         }
 
         private void SaveConfig()
@@ -184,6 +186,7 @@ namespace Client.Application.ViewModels
             config.Deleveling.AttackDistance = DelevelingAttackDistance;
             config.Deleveling.SkillId = DelevelingSkillId;
             config.Combat.MaxPassableHeight = MaxPassableHeight;
+            config.Combat.PickupRadius = PickupRadius;
             SaveCollections();
         }
 
@@ -344,5 +347,6 @@ namespace Client.Application.ViewModels
         private uint delevelingAttackDistance = 0;
         private uint delevelingSkillId = 0;
         private byte? mobLevelUpperLimit = null;
+        private short pickupRadius = 0;
     }
 }

Client/Application/Views/AIConfig.xaml

@@ -202,9 +202,18 @@
                                         <RowDefinition Height="Auto"></RowDefinition>
                                         <RowDefinition Height="Auto"></RowDefinition>
                                         <RowDefinition Height="Auto"></RowDefinition>
+                                        <RowDefinition Height="Auto"></RowDefinition>
                                     </Grid.RowDefinitions>
                                     <CheckBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" IsChecked="{Binding PickupIfPossible}">Pickup if possible</CheckBox>
                                     <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
+                                        <Label>Pickup radius:</Label>
+                                        <TextBox Width="100" HorizontalAlignment="Left">
+                                            <TextBox.Text>
+                                                <Binding Path="PickupRadius" UpdateSourceTrigger="PropertyChanged"/>
+                                            </TextBox.Text>
+                                        </TextBox>
+                                    </StackPanel>
+                                    <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
                                         <Label>Max delta z:</Label>
                                         <TextBox Width="100" HorizontalAlignment="Left">
                                             <TextBox.Text>
@@ -212,7 +221,7 @@
                                             </TextBox.Text>
                                         </TextBox>
                                     </StackPanel>
-                                    <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
+                                    <StackPanel Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">
                                         <Label>Pickup attempts count:</Label>
                                         <TextBox Width="100" HorizontalAlignment="Left">
                                             <TextBox.Text>
@@ -221,13 +230,13 @@
                                         </TextBox>
                                     </StackPanel>
                                     <components:MultipleObjectSelector
-                                        Grid.Row="3"
+                                        Grid.Row="4"
                                         Grid.Column="0"
                                         Source="{Binding ExcludedItems}"
                                         Target="{Binding SelectedExcludedItems}"
                                         Header="Excluded:"/>
                                     <components:MultipleObjectSelector
-                                        Grid.Row="3"
+                                        Grid.Row="4"
                                         Grid.Column="1"
                                         Source="{Binding IncludedItems}"
                                         Target="{Binding SelectedIncludedItems}"

Client/Domain/AI/Combat/Helper.cs

@@ -34,7 +34,7 @@ namespace Client.Domain.AI.Combat
             return null;
         }
 
-        public static List<Drop> GetDropByConfig(WorldHandler worldHandler, Config config)
+        public static List<Drop> GetDropByConfig(WorldHandler worldHandler, Config config, Hero hero)
         {
             if (!config.Combat.PickupIfPossible)
             {
@@ -49,6 +49,8 @@ namespace Client.Domain.AI.Combat
                 result = result.Where(x => config.Combat.IncludedItemIdsToPickup.ContainsKey(x.ItemId));
             }
 
+            result = result.Where(x => x.Transform.Position.HorizontalDistance(hero.Transform.Position) <= config.Combat.PickupRadius);
+
             return result.ToList();
         }
 

Client/Domain/AI/Combat/TransitionBuilder.cs

@@ -35,9 +35,6 @@ namespace Client.Domain.AI.Combat
                             return false;
                         }
 
-                        // TODO если нет цели, а тебя атаковали, то моб берется автоматом в таргет, из-за этого баг в Rest и MoveToSpot
-                        // а без этой проверки зацикливается MoveToTarget->FindTarget->MoveToTarget
-                        // один из вариантов решения, брать себя в таргет при входе в Rest и MoveToSpot 
                         if (worldHandler.Hero.Target != null && (worldHandler.Hero.AttackerIds.Contains(worldHandler.Hero.Target.Id) || worldHandler.Hero.Target.VitalStats.IsDead))
                         {
                             return false;

Client/Domain/AI/Config.cs

@@ -48,6 +48,7 @@ namespace Client.Domain.AI
             public byte PickupAttemptsCount { get; set; } = 10;
             public Dictionary<uint, bool> ExcludedItemIdsToPickup { get; set; } = new Dictionary<uint, bool>();
             public Dictionary<uint, bool> IncludedItemIdsToPickup { get; set; } = new Dictionary<uint, bool>();
+            public short PickupRadius = 200;
         }
 
         public class DelevelingSection

Client/Domain/AI/State/PickupState.cs

@@ -15,7 +15,14 @@ namespace Client.Domain.AI.State
 
         public List<Drop> GetDrops(WorldHandler worldHandler, Config config)
         {
-            var drops = Helper.GetDropByConfig(worldHandler, config);
+            var hero = worldHandler.Hero;
+
+            if (hero == null)
+            {
+                return new List<Drop>();
+            }
+
+            var drops = Helper.GetDropByConfig(worldHandler, config, hero);
             for (var i = drops.Count - 1; i >= 0; i--)
             {
                 if (pickupAttempts.ContainsKey(drops[0].Id) && pickupAttempts[drops[0].Id] > config.Combat.PickupAttemptsCount)

L2BotDll/Application.h

@@ -78,4 +78,4 @@ private:
 
 const std::wstring Application::PIPE_NAME = std::wstring(L"PipeL2Bot");
 const uint16_t Application::CREATURE_RADIUS = 4000;
-const uint16_t Application::DROP_RADIUS = 1000;
+const uint16_t Application::DROP_RADIUS = 4000;