Grasscutters/Akebi-GC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better method for pickup filter

Browse Source
This commit is contained in:
Fanixtar 2022-06-21 13:41:43 +07:00
parent 203556aad8
commit 290af2e3be
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cheat-library/src/user/cheat/world/AutoLoot.cpp
View File

@ -143,18 +143,6 @@ namespace cheat::feature
auto itemModule = GET_SINGLETON(MoleMole_ItemModule);
if (itemModule == nullptr)
return false;
if (f_PickupFilter)
{
if (!f_PickupFilter_Animals && entity->fields.entityType == app::EntityType__Enum_1::EnvAnimal)
return false;
if (!f_PickupFilter_DropItems && entity->fields.entityType == app::EntityType__Enum_1::DropItem)
return false;
if (!f_PickupFilter_Resources && entity->fields.entityType == app::EntityType__Enum_1::GatherObject)
return false;
}
auto entityId = entity->fields._runtimeID_k__BackingField;
if (f_DelayTime == 0)
@ -239,6 +227,17 @@ namespace cheat::feature
{
if (f_AutoPickup || f_UseCustomRange) {
float pickupRange = f_UseCustomRange ? f_CustomRange : 3.5f;
if (f_PickupFilter)
{
if (!f_PickupFilter_Animals && entity->fields.entityType == app::EntityType__Enum_1::EnvAnimal ||
!f_PickupFilter_DropItems && entity->fields.entityType == app::EntityType__Enum_1::DropItem ||
!f_PickupFilter_Resources && entity->fields.entityType == app::EntityType__Enum_1::GatherObject)
{
result = false;
return;
}
}
auto& manager = game::EntityManager::instance();
result = manager.avatar()->distance(entity) < pickupRange;
}