Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop trying to scoop derelicts: closes #72

Browse Source
This commit is contained in:
cim 2013-12-23 23:13:10 +00:00
parent f29e3a2ff1
commit 65f3e2e197
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Scripts/oolite-priorityai.js
View File

@ -2173,7 +2173,7 @@ PriorityAIController.prototype.conditionScannerContainsRocks = function()
PriorityAIController.prototype.conditionScannerContainsSalvage = function() PriorityAIController.prototype.conditionScannerContainsSalvage = function()
{ {
return this.checkScannerWithPredicate(function(s) { return this.checkScannerWithPredicate(function(s) {
return s.isInSpace && s.scanClass == "CLASS_CARGO"; return s.isInSpace && s.scanClass == "CLASS_CARGO" && s.commodity != null;
}); });
} }
@ -2201,7 +2201,7 @@ PriorityAIController.prototype.conditionScannerContainsSalvageForGroup = functio
this.__ltcache.oolite_conditionScannerContainsSalvageForGroup = maxspeed; this.__ltcache.oolite_conditionScannerContainsSalvageForGroup = maxspeed;
} }
return this.checkScannerWithPredicate(function(s) { return this.checkScannerWithPredicate(function(s) {
return s.isInSpace && s.scanClass == "CLASS_CARGO" && s.velocity.magnitude() < this.__ltcache.oolite_conditionScannerContainsSalvageForGroup; return s.isInSpace && s.scanClass == "CLASS_CARGO" && s.commodity != null && s.velocity.magnitude() < this.__ltcache.oolite_conditionScannerContainsSalvageForGroup;
}); });
} }
@ -2213,7 +2213,7 @@ PriorityAIController.prototype.conditionScannerContainsSalvageForMe = function()
return false; return false;
} }
return this.checkScannerWithPredicate(function(s) { return this.checkScannerWithPredicate(function(s) {
return s.isInSpace && s.scanClass == "CLASS_CARGO" && s.velocity.magnitude() < this.ship.maxSpeed; return s.isInSpace && s.scanClass == "CLASS_CARGO" && s.commodity != null && s.velocity.magnitude() < this.ship.maxSpeed;
}); });
} }