From b266bbb2d31cf525c4419ba4c05052cda4221e5c Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Thu, 10 Sep 2020 00:26:18 +0200 Subject: Acquire: Avoid requesting items from the current container via fillers at other places --- System.c4g/ClonkAutoBuy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'System.c4g/ClonkAutoBuy.c') diff --git a/System.c4g/ClonkAutoBuy.c b/System.c4g/ClonkAutoBuy.c index 70a020a..0722fcf 100644 --- a/System.c4g/ClonkAutoBuy.c +++ b/System.c4g/ClonkAutoBuy.c @@ -5,22 +5,23 @@ func ControlCommandAcquire(object target, Tx, int Ty, object target2, id def) { // TODO: decide based on distance to AvailableObject/Homebase and Retriever which one to use if(!target) // TODO: avoid "stealing" { - var retriever = FindObject2(Find_InRect(-500, -250, 1000, 500), Find_Func("IsRetriever"), Find_Func("CanRetrieveObject", def, false, target2), Find_Exclude(target), Sort_Distance()); + var excludeOrigin = target2 || Contained(); + var retriever = FindObject2(Find_InRect(-500, -250, 1000, 500), Find_Func("IsRetriever"), Find_Func("CanRetrieveObject", def, false, excludeOrigin), Find_Exclude(target), Sort_Distance()); if(retriever) { FinishCommand(this, true); - if(retriever->~HowToProduce(this, def, target2)) + if(retriever->~HowToProduce(this, def, excludeOrigin)) { return true; } } - if(!GetAvailableObject (def, target2)) + if(!GetAvailableObject(def, target2)) { - var produceRetriever = FindObject2(Find_InRect(-500, -250, 1000, 500), Find_Func("IsRetriever"), Find_Func("CanRetrieveObject", def, true, target2), Find_Exclude(target), Sort_Distance()); + var produceRetriever = FindObject2(Find_InRect(-500, -250, 1000, 500), Find_Func("IsRetriever"), Find_Func("CanRetrieveObject", def, true, excludeOrigin), Find_Exclude(target), Sort_Distance()); if(produceRetriever) { FinishCommand(this, true); - if(produceRetriever->~HowToProduce(this, def, target2)) + if(produceRetriever->~HowToProduce(this, def, excludeOrigin)) { return true; } -- cgit v1.2.3-54-g00ecf