Page MenuHomeWildfire Games
Differential D270 Diff 8141 binaries/data/mods/public/simulation/components/ProductionQueue.js

Changeset View

Standalone View

View Options

binaries/data/mods/public/simulation/components/ProductionQueue.js

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
}; };
ProductionQueue.prototype.CalculateEntitiesList = function() ProductionQueue.prototype.CalculateEntitiesList = function()
{ {
this.entitiesList = []; this.entitiesList = [];
if (!this.template.Entities) if (!this.template.Entities)
return; return;
let string = this.template.Entities._string; let string = this.template.Entities._string;
if (!string) if (!string)
return; return;
FreagarachUnsubmitted
Not Done
Inline Actions

Should be gone, we could want to start with the possibility to produce entities, but only after researching a tech. (So starting with an empty entity list.)

Freagarach: Should be gone, we could want to start with the possibility to produce entities, but only after…
wraitiiAuthorUnsubmitted
Done
Inline Actions

ah, good point, thanks.

wraitii: ah, good point, thanks.
string = ApplyValueModificationsToEntity("ProductionQueue/Entities/Tokens", string, this.entity);
StanUnsubmitted
Not Done
Inline Actions

Check is after below, not sure if that has any influence.

Stan: Check is after below, not sure if that has any influence.
wraitiiAuthorUnsubmitted
Done
Inline Actions

?

wraitii: ?
// Replace the "{civ}" and "{native}" codes with the owner's civ ID and entity's civ ID. // Replace the "{civ}" and "{native}" codes with the owner's civ ID and entity's civ ID.
let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager); let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
let cmpPlayer = QueryOwnerInterface(this.entity); let cmpPlayer = QueryOwnerInterface(this.entity);
if (!cmpPlayer) if (!cmpPlayer)
return; return;
let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity); let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
if (cmpIdentity) if (cmpIdentity)
Show All 22 LinesProductionQueue.prototype.CalculateEntitiesList = function()
for (let templateName of entitiesList) for (let templateName of entitiesList)
this.entitiesList.push(upgradeTemplate(templateName)); this.entitiesList.push(upgradeTemplate(templateName));
for (let item of this.queue) for (let item of this.queue)
if (item.unitTemplate) if (item.unitTemplate)
item.unitTemplate = upgradeTemplate(item.unitTemplate); item.unitTemplate = upgradeTemplate(item.unitTemplate);
}; };
StanUnsubmitted
Not Done
Inline Actions

Don't use concat, it's very bad. At least two times slower than a foreach with push... cc @bb

There seem to be a lot of split and join here, maybe it can be rewritten to be faster.

Stan: Don't use concat, it's very bad. At least two times slower than a foreach with push... cc @bb…
wraitiiAuthorUnsubmitted
Done
Inline Actions

Thanks for the note, I'll rewrite

wraitii: Thanks for the note, I'll rewrite
wraitiiAuthorUnsubmitted
Done
Inline Actions

Did a few changes but it seems the tech call is by far the slowest bit.
Seems to take around 30-40µs, which is consequent but this is supposed to be a rare occurrence.

wraitii: Did a few changes but it seems the tech call is by far the slowest bit. Seems to take around 30…
FreagarachUnsubmitted
Not Done
Inline Actions

(Multiline?)

Freagarach: (Multiline?)
wraitiiAuthorUnsubmitted
Done
Inline Actions

seems readable like that to me.

wraitii: seems readable like that to me.
/* /*
* Returns list of technologies that can be researched by this building. * Returns list of technologies that can be researched by this building.
*/ */
ProductionQueue.prototype.GetTechnologiesList = function() ProductionQueue.prototype.GetTechnologiesList = function()
{ {
if (!this.template.Technologies) if (!this.template.Technologies)
return []; return [];
var string = this.template.Technologies._string; var string = this.template.Technologies._string;
StanUnsubmitted
Not Done
Inline Actions

inline?

Stan: inline?
FreagarachUnsubmitted
Not Done
Inline Actions

^

Freagarach: ^
if (!string) if (!string)
return []; return [];
var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager); var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
if (!cmpTechnologyManager) if (!cmpTechnologyManager)
return []; return [];
var cmpPlayer = QueryOwnerInterface(this.entity); var cmpPlayer = QueryOwnerInterface(this.entity);
var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity); var cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
if (!cmpPlayer || !cmpIdentity) if (!cmpPlayer || !cmpIdentity)
StanUnsubmitted
Not Done
Inline Actions

I guess you can't use the one in Identity?

Stan: I guess you can't use the one in Identity?
wraitiiAuthorUnsubmitted
Done
Inline Actions

not sure what you mean? We explicitly want the civilisation of the player here, otherwise it's {native}.

wraitii: not sure what you mean? We explicitly want the civilisation of the player here, otherwise it's…
return []; return [];
var techs = string.split(/\s+/); var techs = string.split(/\s+/);
StanUnsubmitted
Not Done
Inline Actions

Not sure you need !! unless the value of the array can be falsy?

Stan: Not sure you need !! unless the value of the array can be falsy?
// Replace the civ specific technologies // Replace the civ specific technologies
for (let i = 0; i < techs.length; ++i) for (let i = 0; i < techs.length; ++i)
{ {
let tech = techs[i]; let tech = techs[i];
if (tech.indexOf("{civ}") == -1) if (tech.indexOf("{civ}") == -1)
continue; continue;
let civTech = tech.replace("{civ}", cmpPlayer.GetCiv()); let civTech = tech.replace("{civ}", cmpPlayer.GetCiv());
▲ Show 20 Lines • Show All 665 Lines • ▼ Show 20 LinesProductionQueue.prototype.UnpauseProduction = function()
this.timer = cmpTimer.SetTimeout(this.entity, IID_ProductionQueue, "ProgressTimeout", g_ProgressInterval, {}); this.timer = cmpTimer.SetTimeout(this.entity, IID_ProductionQueue, "ProgressTimeout", g_ProgressInterval, {});
}; };
ProductionQueue.prototype.OnValueModification = function(msg) ProductionQueue.prototype.OnValueModification = function(msg)
{ {
// if the promotion requirements of units is changed, // if the promotion requirements of units is changed,
// update the entities list so that automatically promoted units are shown // update the entities list so that automatically promoted units are shown
// appropriately in the list // appropriately in the list
if (msg.component == "Promotion") if (msg.component == "Promotion" || msg.component == "ProductionQueue")
this.CalculateEntitiesList(); this.CalculateEntitiesList();
let cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
StanUnsubmitted
Done
Inline Actions

check ?

Stan: check ?
StanUnsubmitted
Done
Inline Actions

According to the undying nephalim when an unit with an aura promotes this error is dispmayed

a small problem it causes though.... units that promote that have an aura it now shows a huge error at the top of the screen
<p class="error">ERROR: Script message handler OnValueModification failed</p>
<p class="error">ERROR: Script message handler OnValueModification failed</p>
<p class="error">ERROR: Script message handler OnGlobalValueModification failed</p>
<p class="error">ERROR: JavaScript error: simulation/components/ProductionQueue.js line 843
TypeError: cmpPlayer is null
  ProductionQueue.prototype.OnValueModification@simulation/components/ProductionQueue.js:843:15
  AuraManager.prototype.RemoveBonus@simulation/components/AuraManager.js:168:1
  Auras.prototype.RemoveBonus@simulation/components/Auras.js:436:1
  Auras.prototype.RegisterGlobalOwnershipChanged@simulation/components/Auras.js:326:1
  AuraManager.prototype.OnGlobalOwnershipChanged@simulation/components/AuraManager.js:271:4</p>
<p class="error">ERROR: Script message handler OnGlobalOwnershipChanged failed</p>
Stan: According to the undying nephalim when an unit with an aura promotes this error is dispmayed…
StanUnsubmitted
Done
Inline Actions

Only global auras not range ones.

Stan: Only global auras not range ones.
let cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
cmpGuiInterface.PushNotification({
StanUnsubmitted
Done
Inline Actions

We should really have a convention for === Maybe @Krinkle has an opinion :)

Stan: We should really have a convention for === Maybe @Krinkle has an opinion :)
"type": "forceselectionrefresh",
"players": [cmpPlayer.GetPlayerID()]
});
elexisUnsubmitted
Not Done
Inline Actions

This sounds very expensive if this is done for every OnValueModification of every component that ends up with a tooltip.

I suppose we dont want a live-stream of events but only an update each turn?

Consider the current game with 1600 units on the map in a 4v4 with 200 pop per player which is the current lobby mainland status quo.
And those are only units, there can also be hundreds (thousands?) of structures affected by value modifications, with multiple components per entity that can have tokens.

elexis: This sounds very expensive if this is done for every `OnValueModification` of every component…
wraitiiAuthorUnsubmitted
Done
Inline Actions

You're right, a much better solution is to poll Gui Interface to recreate the selection.
I've also done some changes to try and avoid spurious reconstruction of the selection.

wraitii: You're right, a much better solution is to poll Gui Interface to recreate the selection. I've…
}; };
ProductionQueue.prototype.OnDisabledTemplatesChanged = function(msg) ProductionQueue.prototype.OnDisabledTemplatesChanged = function(msg)
{ {
SilierUnsubmitted
Not Done
Inline Actions

what does this mean?

Silier: what does this mean?
wraitiiAuthorUnsubmitted
Done
Inline Actions

The whole selection is dirtied anytime something may change, we don't actually check if something has changed.

I'll clarify the comment.

wraitii: The whole selection is dirtied anytime something may change, we don't actually check if…
// if the disabled templates of the player is changed, // if the disabled templates of the player is changed,
// update the entities list so that this is reflected there // update the entities list so that this is reflected there
this.CalculateEntitiesList(); this.CalculateEntitiesList();
}; };
Engine.RegisterComponentType(IID_ProductionQueue, "ProductionQueue", ProductionQueue); Engine.RegisterComponentType(IID_ProductionQueue, "ProductionQueue", ProductionQueue);
Wildfire Games · Phabricator