gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

fix: reset promoted worker metadata

Browse Source 
fix: #7471
(cherry picked from commit 6b87a9b932)
Signed-off-by: Itms <itms@wildfiregames.com>
This commit is contained in:
Langbart
2025-01-08 01:35:37 +01:00
committed by Itms
parent beee5b2b8b
commit 19fda90656
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/ai/petra/baseManager.js
+1 -1
View File
@@ -657,7 +657,7 @@ PETRA.BaseManager.prototype.reassignIdleWorkers = function(gameState, idleWorker
// Support elephant can only be builders
if (ent.hasClass("Support") && ent.hasClass("Elephant"))
{
ent.setMetadata(PlayerID, "subrole", "idle");
ent.setMetadata(PlayerID, "subrole", PETRA.Worker.SUBROLE_IDLE);
continue;
}
binaries/data/mods/public/simulation/ai/petra/basesManager.js
+11 -4
View File
@@ -157,10 +157,17 @@ PETRA.BasesManager.prototype.checkEvents = function(gameState, events)
const base = this.getBaseByID(baseID);
// Promoted workers should be reset - their new gathering rates/capabilities might differ meaningfully.
if (ent.getMetadata(PlayerID, "role") === PETRA.Worker.ROLE_WORKER) {
ent.deleteAllMetadata(PlayerID);
ent.setMetadata(PlayerID, "base", baseID);
base.assignRolelessUnits(undefined, [ent]);
if (ent.getMetadata(PlayerID, "role") === PETRA.Worker.ROLE_WORKER)
{
ent.setMetadata(PlayerID, "subrole", PETRA.Worker.SUBROLE_IDLE);
if (!ent.isGatherer())
{
// TODO: Find a way to properly reset the metadata, as this is currently done selectively
ent.setMetadata(PlayerID, "gather-type", undefined);
ent.setMetadata(PlayerID, "supply", undefined);
ent.setMetadata(PlayerID, "role", undefined);
base.assignRolelessUnits(gameState, [ent]);
}
continue;
}