Changeset View
Changeset View
Standalone View
Standalone View
binaries/data/mods/public/simulation/ai/petra/worker.js
| Show All 35 Lines | if (!subrole) // subrole may-be undefined after a transport, garrisoning, army, ... | ||||
| return; | return; | ||||
| } | } | ||||
| this.ent = ent; | this.ent = ent; | ||||
| let unitAIState = ent.unitAIState(); | let unitAIState = ent.unitAIState(); | ||||
| if ((subrole === "hunter" || subrole === "gatherer") && | if ((subrole === "hunter" || subrole === "gatherer") && | ||||
| (unitAIState === "INDIVIDUAL.GATHER.GATHERING" || unitAIState === "INDIVIDUAL.GATHER.APPROACHING" || | (unitAIState === "INDIVIDUAL.GATHER.GATHERING" || unitAIState === "INDIVIDUAL.GATHER.APPROACHING" || | ||||
| unitAIState === "INDIVIDUAL.COMBAT.APPROACHING")) | unitAIState === "INDIVIDUAL.COMBAT.APPROACHING")) | ||||
Sandarac: Perhaps it would be better to include "worker" in this variable name, in order to make it clear… | |||||
Not Done Inline Actionsgood catch. It is now moved where needed. mimo: good catch. It is now moved where needed. | |||||
| { | { | ||||
| if (this.isInaccessibleSupply(gameState) && !this.retryGathering(gameState, subrole)) | if (this.isInaccessibleSupply(gameState) && !this.retryGathering(gameState, subrole)) | ||||
| ent.stopMoving(); | ent.stopMoving(); | ||||
| // Check that we have not drifted too far | // Check that we have not drifted too far | ||||
| if (unitAIState === "INDIVIDUAL.COMBAT.APPROACHING" && ent.unitAIOrderData().length) | if (unitAIState === "INDIVIDUAL.COMBAT.APPROACHING" && ent.unitAIOrderData().length) | ||||
| { | { | ||||
| let orderData = ent.unitAIOrderData()[0]; | let orderData = ent.unitAIOrderData()[0]; | ||||
| ▲ Show 20 Lines • Show All 315 Lines • ▼ Show 20 Lines | m.Worker.prototype.startGathering = function(gameState) | ||||
| }; | }; | ||||
| let navalManager = gameState.ai.HQ.navalManager; | let navalManager = gameState.ai.HQ.navalManager; | ||||
| let supply; | let supply; | ||||
| // first look in our own base if accessible from our present position | // first look in our own base if accessible from our present position | ||||
| if (this.accessIndex === access) | if (this.accessIndex === access) | ||||
| { | { | ||||
| if ((supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].nearby))) | supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].nearby); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| // --> for food, try to gather from fields if any, otherwise build one if any | // --> for food, try to gather from fields if any, otherwise build one if any | ||||
| if (resource === "food") | if (resource === "food") | ||||
| { | { | ||||
| if ((supply = this.gatherNearestField(gameState, this.baseID))) | supply = this.gatherNearestField(gameState, this.baseID); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| else if (this.ent.isBuilder() && (supply = this.buildAnyField(gameState, this.baseID))) | supply = this.buildAnyField(gameState, this.baseID); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.repair(supply); | this.ent.repair(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| if ((supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].medium))) | supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].medium); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| // So if we're here we have checked our whole base for a proper resource (or it was not accessible) | // So if we're here we have checked our whole base for a proper resource (or it was not accessible) | ||||
| // --> check other bases directly accessible | // --> check other bases directly accessible | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.ID === this.baseID) | if (base.ID === this.baseID) | ||||
| continue; | continue; | ||||
| if (base.accessIndex !== access) | if (base.accessIndex !== access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].nearby))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].nearby); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| if (resource === "food") // --> for food, try to gather from fields if any, otherwise build one if any | if (resource === "food") // --> for food, try to gather from fields if any, otherwise build one if any | ||||
| { | { | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.ID === this.baseID) | if (base.ID === this.baseID) | ||||
| continue; | continue; | ||||
| if (base.accessIndex !== access) | if (base.accessIndex !== access) | ||||
| continue; | continue; | ||||
| if ((supply = this.gatherNearestField(gameState, base.ID))) | supply = this.gatherNearestField(gameState, base.ID); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| if (this.ent.isBuilder() && (supply = this.buildAnyField(gameState, base.ID))) | supply = this.buildAnyField(gameState, base.ID); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| this.ent.repair(supply); | this.ent.repair(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.ID === this.baseID) | if (base.ID === this.baseID) | ||||
| continue; | continue; | ||||
| if (base.accessIndex !== access) | if (base.accessIndex !== access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].medium))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].medium); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| // Okay may-be we haven't found any appropriate dropsite anywhere. | // Okay may-be we haven't found any appropriate dropsite anywhere. | ||||
| Show All 15 Lines | m.Worker.prototype.startGathering = function(gameState) | ||||
| if (shouldBuild) | if (shouldBuild) | ||||
| return true; | return true; | ||||
| // Still nothing ... try bases which need a transport | // Still nothing ... try bases which need a transport | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.accessIndex === access) | if (base.accessIndex === access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].nearby))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].nearby); | ||||
| { | if (supply && navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | ||||
Not Done Inline ActionsMaybe it is time to rework some of this function to remove these assignments in selection statements, which are bad practice (perhaps not in this diff). Sandarac: Maybe it is time to rework some of this function to remove these assignments in selection… | |||||
Not Done Inline Actionsok done mimo: ok done | |||||
| if (navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | |||||
| { | { | ||||
| if (base.ID !== this.baseID) | if (base.ID !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| if (resource === "food") // --> for food, try to gather from fields if any, otherwise build one if any | if (resource === "food") // --> for food, try to gather from fields if any, otherwise build one if any | ||||
| { | { | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.accessIndex === access) | if (base.accessIndex === access) | ||||
| continue; | continue; | ||||
| if ((supply = this.gatherNearestField(gameState, base.ID))) | supply = this.gatherNearestField(gameState, base.ID); | ||||
| { | if (supply && navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | ||||
| if (navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | |||||
| { | { | ||||
| if (base.ID !== this.baseID) | if (base.ID !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | supply = this.buildAnyField(gameState, base.ID); | ||||
| if ((supply = this.buildAnyField(gameState, base.ID))) | if (supply && navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | ||||
| { | |||||
| if (navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | |||||
| { | { | ||||
| if (base.ID !== this.baseID) | if (base.ID !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.accessIndex === access) | if (base.accessIndex === access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].medium))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].medium); | ||||
| { | if (supply && navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | ||||
| if (navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | |||||
| { | { | ||||
| if (base.ID !== this.baseID) | if (base.ID !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| // Okay so we haven't found any appropriate dropsite anywhere. | // Okay so we haven't found any appropriate dropsite anywhere. | ||||
| // Try to help building one if any non-accessible foundation available | // Try to help building one if any non-accessible foundation available | ||||
| shouldBuild = this.ent.isBuilder() && foundations.some(function(foundation) { | shouldBuild = this.ent.isBuilder() && foundations.some(function(foundation) { | ||||
| if (!foundation || foundation.getMetadata(PlayerID, "access") === access) | if (!foundation || foundation.getMetadata(PlayerID, "access") === access) | ||||
| return false; | return false; | ||||
| if (foundation.resourceDropsiteTypes() && foundation.resourceDropsiteTypes().indexOf(resource) !== -1) | if (foundation.resourceDropsiteTypes() && foundation.resourceDropsiteTypes().indexOf(resource) !== -1) | ||||
| { | { | ||||
| let foundationAccess = m.getLandAccess(gameState, foundation); | let foundationAccess = m.getLandAccess(gameState, foundation); | ||||
| if (navalManager.requireTransport(gameState, this.ent, access, foundationAccess, foundation.position())) | if (navalManager.requireTransport(gameState, this.ent, access, foundationAccess, foundation.position())) | ||||
| { | { | ||||
| if (foundation.getMetadata(PlayerID, "base") !== this.baseID) | if (foundation.getMetadata(PlayerID, "base") !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", foundation.getMetadata(PlayerID, "base")); | this.ent.setMetadata(PlayerID, "base", foundation.getMetadata(PlayerID, "base")); | ||||
| this.ent.setMetadata(PlayerID, "target-foundation", foundation.id()); | this.ent.setMetadata(PlayerID, "target-foundation", foundation.id()); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| return false; | return false; | ||||
| }, this); | }, this); | ||||
| if (shouldBuild) | if (shouldBuild) | ||||
| return true; | return true; | ||||
| // Still nothing, we look now for faraway resources, first in the accessible ones, then in the others | // Still nothing, we look now for faraway resources, first in the accessible ones, then in the others | ||||
| // except for food which is not worth (farms or corrals should be used) | // except for food when farms or corrals can be used | ||||
| if (resource !== "food") | let allowDistant = true; | ||||
| if (resource === "food") | |||||
| { | |||||
| if (gameState.ai.HQ.turnCache.allowDistantFood === undefined) | |||||
| gameState.ai.HQ.turnCache.allowDistantFood = | |||||
| !gameState.ai.HQ.canBuild(gameState, "structures/{civ}_field") && | |||||
| !gameState.ai.HQ.canBuild(gameState, "structures/{civ}_corral"); | |||||
| allowDistant = gameState.ai.HQ.turnCache.allowDistantFood; | |||||
| } | |||||
| if (allowDistant) | |||||
SandaracUnsubmitted Not Done Inline ActionsI was rather thinking of doing (after updating turnCache.allowDistantFood): if (resource !== "food" || gameState.ai.HQ.turnCache.allowDistantFood) What do you think? Sandarac: I was rather thinking of doing (after updating turnCache.allowDistantFood):
```
if (resource ! | |||||
mimoAuthorUnsubmitted Not Done Inline ActionsWouldn't that force us to update allowDistantFood in the cache even if no food gatherer at this turn? which does not happen with the current code (although that would be irrelevant for performance, better avoid useless computations). mimo: Wouldn't that force us to update allowDistantFood in the cache even if no food gatherer at this… | |||||
SandaracUnsubmitted Not Done Inline ActionsOkay. Sandarac: Okay. | |||||
| { | { | ||||
| if (this.accessIndex === access) | if (this.accessIndex === access) | ||||
| { | { | ||||
| if ((supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].faraway))) | supply = findSupply(this.ent, this.base.dropsiteSupplies[resource].faraway); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.ID === this.baseID) | if (base.ID === this.baseID) | ||||
| continue; | continue; | ||||
| if (base.accessIndex !== access) | if (base.accessIndex !== access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].faraway))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].faraway); | ||||
| if (supply) | |||||
| { | { | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| this.ent.gather(supply); | this.ent.gather(supply); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| for (let base of gameState.ai.HQ.baseManagers) | for (let base of gameState.ai.HQ.baseManagers) | ||||
| { | { | ||||
| if (base.accessIndex === access) | if (base.accessIndex === access) | ||||
| continue; | continue; | ||||
| if ((supply = findSupply(this.ent, base.dropsiteSupplies[resource].faraway))) | supply = findSupply(this.ent, base.dropsiteSupplies[resource].faraway); | ||||
| { | if (supply && navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | ||||
| if (navalManager.requireTransport(gameState, this.ent, access, base.accessIndex, supply.position())) | |||||
| { | { | ||||
| if (base.ID !== this.baseID) | if (base.ID !== this.baseID) | ||||
| this.ent.setMetadata(PlayerID, "base", base.ID); | this.ent.setMetadata(PlayerID, "base", base.ID); | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| // If we are here, we have nothing left to gather ... certainly no more resources of this type | // If we are here, we have nothing left to gather ... certainly no more resources of this type | ||||
| gameState.ai.HQ.lastFailedGather[resource] = gameState.ai.elapsedTime; | gameState.ai.HQ.lastFailedGather[resource] = gameState.ai.elapsedTime; | ||||
| if (gameState.ai.Config.debug > 2) | if (gameState.ai.Config.debug > 2) | ||||
| warn(" >>>>> worker with gather-type " + resource + " with nothing to gather "); | warn(" >>>>> worker with gather-type " + resource + " with nothing to gather "); | ||||
| this.ent.setMetadata(PlayerID, "subrole", "idle"); | this.ent.setMetadata(PlayerID, "subrole", "idle"); | ||||
| return false; | return false; | ||||
| }; | }; | ||||
| ▲ Show 20 Lines • Show All 221 Lines • ▼ Show 20 Lines | |||||
| }; | }; | ||||
| /** | /** | ||||
| * WARNING with the present options of AI orders, the unit will not gather after building the farm. | * WARNING with the present options of AI orders, the unit will not gather after building the farm. | ||||
| * This is done by calling the gatherNearestField function when construction is completed. | * This is done by calling the gatherNearestField function when construction is completed. | ||||
| */ | */ | ||||
| m.Worker.prototype.buildAnyField = function(gameState, baseID) | m.Worker.prototype.buildAnyField = function(gameState, baseID) | ||||
| { | { | ||||
| if (!this.ent.isBuilder()) | |||||
| return false; | |||||
| let baseFoundations = gameState.getOwnFoundations().filter(API3.Filters.byMetadata(PlayerID, "base", baseID)); | let baseFoundations = gameState.getOwnFoundations().filter(API3.Filters.byMetadata(PlayerID, "base", baseID)); | ||||
| let maxGatherers = gameState.getTemplate(gameState.applyCiv("structures/{civ}_field")).maxGatherers(); | let maxGatherers = gameState.getTemplate(gameState.applyCiv("structures/{civ}_field")).maxGatherers(); | ||||
| let bestFarmEnt = false; | let bestFarmEnt = false; | ||||
| let bestFarmDist = 10000000; | let bestFarmDist = 10000000; | ||||
| let pos = this.ent.position(); | let pos = this.ent.position(); | ||||
| for (let found of baseFoundations.values()) | for (let found of baseFoundations.values()) | ||||
| { | { | ||||
| if (!found.hasClass("Field")) | if (!found.hasClass("Field")) | ||||
| ▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator
Perhaps it would be better to include "worker" in this variable name, in order to make it clear what this var is for, as it can be accessed from outside of worker.
But I'm also not sure if this var is needed, as it is only used in the one check at the end of the function, and this whole check here on turnCache.allowDistantFood could be moved below, so it is only done if needed.