Changeset View
Changeset View
Standalone View
Standalone View
binaries/data/mods/public/simulation/components/TechnologyManager.js
| function TechnologyManager() {} | function TechnologyManager() {} | ||||
| TechnologyManager.prototype.Schema = | TechnologyManager.prototype.Schema = | ||||
| "<empty/>"; | "<empty/>"; | ||||
| TechnologyManager.prototype.Serialize = function() | |||||
| { | |||||
| // The modifications cache will be affected by property reads from the GUI and other places so we shouldn't | |||||
| // serialize it. | |||||
| var ret = {}; | |||||
| for (var i in this) | |||||
| { | |||||
| if (this.hasOwnProperty(i)) | |||||
| ret[i] = this[i]; | |||||
| } | |||||
| ret.modificationCache = {}; | |||||
| return ret; | |||||
| }; | |||||
| TechnologyManager.prototype.Init = function() | TechnologyManager.prototype.Init = function() | ||||
| { | { | ||||
| this.researchedTechs = {}; // technologies which have been researched | this.researchedTechs = {}; // technologies which have been researched | ||||
| this.researchQueued = {}; // technologies which are queued for research | this.researchQueued = {}; // technologies which are queued for research | ||||
| this.researchStarted = {}; // technologies which are being researched currently (non-queued) | this.researchStarted = {}; // technologies which are being researched currently (non-queued) | ||||
| // This stores the modifications to unit stats from researched technologies | |||||
| // Example data: {"ResourceGatherer/Rates/food.grain": [ | |||||
| // {"multiply": 1.15, "affects": ["FemaleCitizen", "Infantry Swordsman"]}, | |||||
| // {"add": 2} | |||||
| // ]} | |||||
| this.modifications = {}; | |||||
| this.modificationCache = {}; // Caches the values after technologies have been applied | |||||
| // e.g. { "Attack/Melee/Hack" : {5: {"origValue": 8, "newValue": 10}, 7: {"origValue": 9, "newValue": 12}, ...}, ...} | |||||
| // where 5 and 7 are entity id's | |||||
| this.classCounts = {}; // stores the number of entities of each Class | this.classCounts = {}; // stores the number of entities of each Class | ||||
| this.typeCountsByClass = {}; // stores the number of entities of each type for each class i.e. | this.typeCountsByClass = {}; // stores the number of entities of each type for each class i.e. | ||||
| // {"someClass": {"unit/spearman": 2, "unit/cav": 5} "someOtherClass":...} | // {"someClass": {"unit/spearman": 2, "unit/cav": 5} "someOtherClass":...} | ||||
| // Some technologies are automatically researched when their conditions are met. They have no cost and are | // Some technologies are automatically researched when their conditions are met. They have no cost and are | ||||
| // researched instantly. This allows civ bonuses and more complicated technologies. | // researched instantly. This allows civ bonuses and more complicated technologies. | ||||
| this.autoResearchTech = {}; | this.autoResearchTech = {}; | ||||
| var allTechs = Engine.QueryInterface(SYSTEM_ENTITY, IID_DataTemplateManager).GetAllTechs(); | var allTechs = Engine.QueryInterface(SYSTEM_ENTITY, IID_DataTemplateManager).GetAllTechs(); | ||||
| ▲ Show 20 Lines • Show All 147 Lines • ▼ Show 20 Lines | if (!Engine.QueryInterface(msg.entity, IID_Foundation)) | ||||
| this.classCounts[cls] = this.classCounts[cls] || 0; | this.classCounts[cls] = this.classCounts[cls] || 0; | ||||
| this.classCounts[cls] += 1; | this.classCounts[cls] += 1; | ||||
| this.typeCountsByClass[cls] = this.typeCountsByClass[cls] || {}; | this.typeCountsByClass[cls] = this.typeCountsByClass[cls] || {}; | ||||
| this.typeCountsByClass[cls][template] = this.typeCountsByClass[cls][template] || 0; | this.typeCountsByClass[cls][template] = this.typeCountsByClass[cls][template] || 0; | ||||
| this.typeCountsByClass[cls][template] += 1; | this.typeCountsByClass[cls][template] += 1; | ||||
| } | } | ||||
| } | } | ||||
| // Newly created entity, check if any researched techs might apply | |||||
| // (only do this for new entities because even if an entity is converted or captured, | |||||
| // we want it to maintain whatever technologies previously applied) | |||||
wraitii: BTW is that still the behaviour we want? I believe it means units will get new technologies… | |||||
Not Done Inline ActionsGiven that we don't have conversion that doesn't apply to most things. It does apply to siege weapons though. Also I suspect this is at least partially inaccurate since quite a few OwnershipChanged handlers will run and things will be recalculated. That said changing behaviour is not something this diff should even attempt to do. leper: Given that we don't have conversion that doesn't apply to most things. It does apply to siege… | |||||
Done Inline ActionsI'm not sure this is correct in svn but regardless I believe converted units change their technologies with the new code, which may or may not be fixed. wraitii: I'm not sure this is correct in svn but regardless I believe converted units change their… | |||||
| if (msg.from == -1) | |||||
| { | |||||
| var modifiedComponents = {}; | |||||
| for (var name in this.modifications) | |||||
| { | |||||
| // We only need to find one one tech per component for a match | |||||
| var modifications = this.modifications[name]; | |||||
| var component = name.split("/")[0]; | |||||
| for (let modif of modifications) | |||||
| if (DoesModificationApply(modif, classes)) | |||||
| { | |||||
| if (!modifiedComponents[component]) | |||||
| modifiedComponents[component] = []; | |||||
| modifiedComponents[component].push(name); | |||||
| } | |||||
| } | |||||
| // Send mesage(s) to the entity so it knows about researched techs | |||||
| for (var component in modifiedComponents) | |||||
| Engine.PostMessage(msg.entity, MT_ValueModification, { "entities": [msg.entity], "component": component, "valueNames": modifiedComponents[component] }); | |||||
| } | |||||
| } | } | ||||
| if (msg.from == playerID) | if (msg.from == playerID) | ||||
| { | { | ||||
| var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager); | var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager); | ||||
| var template = cmpTemplateManager.GetCurrentTemplateName(msg.entity); | var template = cmpTemplateManager.GetCurrentTemplateName(msg.entity); | ||||
| // don't use foundations for the class counts | // don't use foundations for the class counts | ||||
| if (!Engine.QueryInterface(msg.entity, IID_Foundation)) | if (!Engine.QueryInterface(msg.entity, IID_Foundation)) | ||||
| Show All 9 Lines | if (!Engine.QueryInterface(msg.entity, IID_Foundation)) | ||||
| delete this.classCounts[cls]; | delete this.classCounts[cls]; | ||||
| this.typeCountsByClass[cls][template] -= 1; | this.typeCountsByClass[cls][template] -= 1; | ||||
| if (this.typeCountsByClass[cls][template] <= 0) | if (this.typeCountsByClass[cls][template] <= 0) | ||||
| delete this.typeCountsByClass[cls][template]; | delete this.typeCountsByClass[cls][template]; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| this.clearModificationCache(msg.entity); | |||||
| } | } | ||||
| }; | }; | ||||
| // Marks a technology as researched. Note that this does not verify that the requirements are met. | // Marks a technology as researched. Note that this does not verify that the requirements are met. | ||||
| TechnologyManager.prototype.ResearchTechnology = function(tech) | TechnologyManager.prototype.ResearchTechnology = function(tech) | ||||
| { | { | ||||
| this.StoppedResearch(tech); // The tech is no longer being currently researched | this.StoppedResearch(tech); // The tech is no longer being currently researched | ||||
| var template = this.GetTechnologyTemplate(tech); | var template = this.GetTechnologyTemplate(tech); | ||||
| if (!template) | if (!template) | ||||
| { | { | ||||
| error("Tried to research invalid technology: " + uneval(tech)); | error("Tried to research invalid technology: " + uneval(tech)); | ||||
| return; | return; | ||||
| } | } | ||||
| var modifiedComponents = {}; | |||||
| this.researchedTechs[tech] = template; | this.researchedTechs[tech] = template; | ||||
| // store the modifications in an easy to access structure | // store the modifications in an easy to access structure | ||||
| if (template.modifications) | if (template.modifications) | ||||
| { | { | ||||
| var affects = []; | var affects = []; | ||||
| if (template.affects && template.affects.length > 0) | if (template.affects && template.affects.length > 0) | ||||
| { | { | ||||
| for (let affect of template.affects) | for (let affect of template.affects) | ||||
| { | { | ||||
| // Put the list of classes into an array for convenient access | // Put the list of classes into an array for convenient access | ||||
| affects.push(affect.split(/\s+/)); | affects.push(affect.split(/\s+/)); | ||||
| } | } | ||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| affects.push([]); | affects.push([]); | ||||
| } | } | ||||
| // We add an item to this.modifications for every modification in the template.modifications array | // We add an item to this.modifications for every modification in the template.modifications array | ||||
| for (var i in template.modifications) | for (var i in template.modifications) | ||||
| { | { | ||||
| var modification = template.modifications[i]; | var modification = template.modifications[i]; | ||||
| if (!this.modifications[modification.value]) | |||||
| this.modifications[modification.value] = []; | |||||
| var modAffects = affects.slice(); | var modAffects = affects.slice(); | ||||
| if (modification.affects) | if (modification.affects) | ||||
| { | { | ||||
| var extraAffects = modification.affects.split(/\s+/); | var extraAffects = modification.affects.split(/\s+/); | ||||
| for (var a in modAffects) | for (var a in modAffects) | ||||
| modAffects[a] = modAffects[a].concat(extraAffects); | modAffects[a] = modAffects[a].concat(extraAffects); | ||||
| } | } | ||||
| var mod = {"affects": modAffects}; | var mod = {"affects": modAffects}; | ||||
| // copy the modification data into our new data structure | // copy the modification data into our new data structure | ||||
| for (var j in modification) | for (var j in modification) | ||||
| if (j !== "value" && j !== "affects") | if (j !== "value" && j !== "affects") | ||||
| mod[j] = modification[j]; | mod[j] = modification[j]; | ||||
| this.modifications[modification.value].push(mod); | let cmpModManager = Engine.QueryInterface(this.entity, IID_ModifiersManager); | ||||
| var component = modification.value.split("/")[0]; | cmpModManager.SetGlobalModifier(modification.value, "tech/"+tech, 5, mod); | ||||
| if (!modifiedComponents[component]) | |||||
| modifiedComponents[component] = []; | |||||
| modifiedComponents[component].push(modification.value); | |||||
| this.modificationCache[modification.value] = {}; | |||||
| } | } | ||||
| } | } | ||||
Not Done Inline ActionsMissing spaces with the operator, can be fixed when committing. Stan: Missing spaces with the operator, can be fixed when committing. | |||||
| if (template.replaces && template.replaces.length > 0) | if (template.replaces && template.replaces.length > 0) | ||||
| { | { | ||||
| for (var i of template.replaces) | for (var i of template.replaces) | ||||
| { | { | ||||
| if (!i || this.IsTechnologyResearched(i)) | if (!i || this.IsTechnologyResearched(i)) | ||||
| continue; | continue; | ||||
| Show All 23 Lines | TechnologyManager.prototype.ResearchTechnology = function(tech) | ||||
| // Change the EntityLimit if any | // Change the EntityLimit if any | ||||
| var cmpPlayerEntityLimits = QueryPlayerIDInterface(playerID, IID_EntityLimits); | var cmpPlayerEntityLimits = QueryPlayerIDInterface(playerID, IID_EntityLimits); | ||||
| if (cmpPlayerEntityLimits) | if (cmpPlayerEntityLimits) | ||||
| cmpPlayerEntityLimits.UpdateLimitsFromTech(tech); | cmpPlayerEntityLimits.UpdateLimitsFromTech(tech); | ||||
| // always send research finished message | // always send research finished message | ||||
| Engine.PostMessage(this.entity, MT_ResearchFinished, {"player": playerID, "tech": tech}); | Engine.PostMessage(this.entity, MT_ResearchFinished, {"player": playerID, "tech": tech}); | ||||
| /* | |||||
| for (var component in modifiedComponents) | for (var component in modifiedComponents) | ||||
| { | { | ||||
| Engine.PostMessage(SYSTEM_ENTITY, MT_TemplateModification, { "player": playerID, "component": component, "valueNames": modifiedComponents[component]}); | Engine.PostMessage(SYSTEM_ENTITY, MT_TemplateModification, { "player": playerID, "component": component, "valueNames": modifiedComponents[component]}); | ||||
| Engine.BroadcastMessage(MT_ValueModification, { "entities": ents, "component": component, "valueNames": modifiedComponents[component]}); | Engine.BroadcastMessage(MT_ValueModification, { "entities": ents, "component": component, "valueNames": modifiedComponents[component]}); | ||||
| } | } | ||||
| }; | */ | ||||
| // Clears the cached data for an entity from the modifications cache | |||||
| TechnologyManager.prototype.clearModificationCache = function(ent) | |||||
| { | |||||
| for (var valueName in this.modificationCache) | |||||
| delete this.modificationCache[valueName][ent]; | |||||
| }; | |||||
| // Caching layer in front of ApplyModificationsWorker | |||||
| // Note: be careful with the type of curValue, if it should be a numerical | |||||
| // value and is derived from template data, you must convert the string | |||||
| // from the template to a number using the + operator, before calling | |||||
| // this function! | |||||
| TechnologyManager.prototype.ApplyModifications = function(valueName, curValue, ent) | |||||
| { | |||||
| if (!this.modificationCache[valueName]) | |||||
| this.modificationCache[valueName] = {}; | |||||
| if (!this.modificationCache[valueName][ent] || this.modificationCache[valueName][ent].origValue != curValue) | |||||
| { | |||||
| let cmpIdentity = Engine.QueryInterface(ent, IID_Identity); | |||||
| if (!cmpIdentity) | |||||
| return curValue; | |||||
| this.modificationCache[valueName][ent] = { | |||||
| "origValue": curValue, | |||||
| "newValue": GetTechModifiedProperty(this.modifications, cmpIdentity.GetClassesList(), valueName, curValue) | |||||
| }; | |||||
| } | |||||
| return this.modificationCache[valueName][ent].newValue; | |||||
| }; | |||||
| // Alternative version of ApplyModifications, applies to templates instead of entities | |||||
| TechnologyManager.prototype.ApplyModificationsTemplate = function(valueName, curValue, template) | |||||
| { | |||||
| if (!template || !template.Identity) | |||||
| return curValue; | |||||
| return GetTechModifiedProperty(this.modifications, GetIdentityClasses(template.Identity), valueName, curValue); | |||||
| }; | }; | ||||
| // Marks a technology as being queued for research | // Marks a technology as being queued for research | ||||
| TechnologyManager.prototype.QueuedResearch = function(tech, researcher) | TechnologyManager.prototype.QueuedResearch = function(tech, researcher) | ||||
| { | { | ||||
| this.researchQueued[tech] = researcher; | this.researchQueued[tech] = researcher; | ||||
| }; | }; | ||||
| Show All 28 Lines | |||||
| // Gets the entity currently researching a technology | // Gets the entity currently researching a technology | ||||
| TechnologyManager.prototype.GetResearcher = function(tech) | TechnologyManager.prototype.GetResearcher = function(tech) | ||||
| { | { | ||||
| if (this.researchQueued[tech]) | if (this.researchQueued[tech]) | ||||
| return this.researchQueued[tech]; | return this.researchQueued[tech]; | ||||
| return undefined; | return undefined; | ||||
| }; | }; | ||||
| // Get helper data for tech modifications | |||||
| TechnologyManager.prototype.GetTechModifications = function() | |||||
| { | |||||
| return this.modifications; | |||||
| }; | |||||
| // called by GUIInterface for PlayerData. AI use. | // called by GUIInterface for PlayerData. AI use. | ||||
| TechnologyManager.prototype.GetQueuedResearch = function() | TechnologyManager.prototype.GetQueuedResearch = function() | ||||
| { | { | ||||
| return this.researchQueued; | return this.researchQueued; | ||||
| }; | }; | ||||
| TechnologyManager.prototype.GetStartedResearch = function() | TechnologyManager.prototype.GetStartedResearch = function() | ||||
| { | { | ||||
| return this.researchStarted; | return this.researchStarted; | ||||
| Show All 15 Lines | |||||
Wildfire Games · Phabricator
BTW is that still the behaviour we want? I believe it means units will get new technologies once they've been captured, but will have their old one on top. So potentially by switching back and forth you could have OP units, but haven't actually tried.