diff --git a/control/config.txt b/control/config.txt index e73ce9c48f..60bc1bd60b 100644 --- a/control/config.txt +++ b/control/config.txt @@ -75,7 +75,6 @@ attackAuto_considerDamagedAggressive 0 attackDistance 1 attackDistanceAuto 1 attackMaxDistance 1 -attackMaxRouteDistance 50 attackMaxRouteTime 4 attackMinPlayerDistance 2 attackMinPortalDistance 4 diff --git a/src/AI/CoreLogic.pm b/src/AI/CoreLogic.pm index 48ee9829cf..8eb8330b7e 100644 --- a/src/AI/CoreLogic.pm +++ b/src/AI/CoreLogic.pm @@ -828,7 +828,7 @@ sub processTake { $field->baseName, $pos->{x}, $pos->{y}, - maxRouteDistance => $config{'attackMaxRouteDistance'}, + maxRouteDistance => $config{'attackRouteMaxPathDistance'}, noSitAuto => 1, distFromGoal => 1, isItemTake => 1 @@ -3403,7 +3403,7 @@ sub processItemsGather { $field->baseName, $pos->{x}, $pos->{y}, - maxRouteDistance => $config{'attackMaxRouteDistance'}, + maxRouteDistance => $config{'attackRouteMaxPathDistance'}, noSitAuto => 1, distFromGoal => 1, isItemGather => 1 diff --git a/src/Interface/Wx.pm b/src/Interface/Wx.pm index 1299bf91d1..7c28f00a7e 100644 --- a/src/Interface/Wx.pm +++ b/src/Interface/Wx.pm @@ -1187,7 +1187,7 @@ sub onAdvancedConfig { $cfg->addCategory('server', 'Grid', ['master', 'server', 'username', 'password', 'char']); $cfg->addCategory('X-Kore', 'Grid', ['XKore', 'XKore_silent', 'XKore_bypassBotDetection', 'XKore_exeName', 'XKore_listenIp', 'XKore_listenPort', 'XKore_publicIp', 'secureAdminPassword', 'adminPassword', 'callSign', 'commandPrefix']); $cfg->addCategory('lockMap', 'Grid', ['lockMap', 'lockMap_x', 'lockMap_y', 'lockMap_randX', 'lockMap_randY']); - $cfg->addCategory('attack', 'Grid', ['attackAuto', 'attackAuto_party', 'attackAuto_onlyWhenSafe', 'attackAuto_followTarget', 'attackAuto_inLockOnly', 'attackDistance', 'attackDistanceAuto', 'attackMaxDistance', 'attackMaxRouteDistance', 'attackMaxRouteTime', 'attackMinPlayerDistance', 'attackMinPortalDistance', 'attackUseWeapon', 'attackNoGiveup', 'attackCanSnipe', 'attackCheckLOS', 'attackLooters', 'attackChangeTarget', 'aggressiveAntiKS']); + $cfg->addCategory('attack', 'Grid', ['attackAuto', 'attackAuto_party', 'attackAuto_onlyWhenSafe', 'attackAuto_followTarget', 'attackAuto_inLockOnly', 'attackDistance', 'attackDistanceAuto', 'attackMaxDistance', 'attackRouteMaxPathDistance', 'attackMaxRouteTime', 'attackMinPlayerDistance', 'attackMinPortalDistance', 'attackUseWeapon', 'attackNoGiveup', 'attackCanSnipe', 'attackCheckLOS', 'attackLooters', 'attackChangeTarget', 'aggressiveAntiKS']); $cfg->addCategory('route', 'Grid', ['route_escape_reachedNoPortal', 'route_escape_randomWalk', 'route_escape_shout', 'route_randomWalk', 'route_randomWalk_inTown', 'route_randomWalk_maxRouteTime', 'route_maxWarpFee', 'route_maxNpcTries', 'route_teleport', 'route_teleport_minDistance', 'route_teleport_maxTries', 'route_teleport_notInMaps', 'route_step']); $cfg->addCategory('teleport', 'Grid', ['teleportAuto_hp', 'teleportAuto_sp', 'teleportAuto_idle', 'teleportAuto_portal', 'teleportAuto_search', 'teleportAuto_minAggressives', 'teleportAuto_minAggressivesInLock', 'teleportAuto_onlyWhenSafe', 'teleportAuto_maxDmg', 'teleportAuto_maxDmgInLock', 'teleportAuto_deadly', 'teleportAuto_useSkill', 'teleportAuto_useChatCommand', 'teleportAuto_allPlayers', 'teleportAuto_atkCount', 'teleportAuto_atkMiss', 'teleportAuto_unstuck', 'teleportAuto_dropTarget', 'teleportAuto_dropTargetKS', 'teleportAuto_attackedWhenSitting', 'teleportAuto_totalDmg', 'teleportAuto_totalDmgInLock', 'teleportAuto_equip_leftAccessory', 'teleportAuto_equip_rightAccessory', 'teleportAuto_lostHomunculus']); $cfg->addCategory('follow', 'Grid', ['follow', 'followTarget', 'followEmotion', 'followEmotion_distance', 'followFaceDirection', 'followDistanceMax', 'followDistanceMin', 'followLostStep', 'followSitAuto', 'followBot']); diff --git a/src/Network/Receive.pm b/src/Network/Receive.pm index dff697a6ed..8c3b0efa61 100644 --- a/src/Network/Receive.pm +++ b/src/Network/Receive.pm @@ -11553,7 +11553,7 @@ sub skill_cast { getVector(\%vec, \%coords, $char->{pos_to}); moveAlongVector(\%pos, $char->{pos_to}, \%vec, distance($char->{pos_to}, \%coords)); ai_route($field->baseName, $pos{x}, $pos{y}, - maxRouteDistance => $config{attackMaxRouteDistance}, + maxRouteDistance => $config{attackRouteMaxPathDistance}, maxRouteTime => $config{attackMaxRouteTime}, noMapRoute => 1); message TF("Avoid casting Skill - switch position to : %s,%s\n", $pos{x}, $pos{y}), 1;