Ticket #3747: 3747+3801_modifiers.patch

binaries/data/mods/public/globalscripts/Technologies.js

@@ -4 +4 @@
  * any global state, but each context should do its own caching as needed.
  * Also it cannot directly access the simulation and requires data passed to it.
  */
- 
+
+/**
+ * Returns the name of the technology defining the bonus for a given rank
+ */
+const g_UnitBonusTechNameSuffix = "_unit_bonus";
+function GetUnitBonusTechName(rank = "basic")
+{
+    return rank.toLowerCase() + g_UnitBonusTechNameSuffix;
+}
+
 /**
  * Returns modified property value modified by the applicable tech
  * modifications.
  *
  * @param currentTechModifications Object with mapping of property names to
  * modification arrays, retrieved from the intended player's TechnologyManager.
- * @param classes Array contianing the class list of the template.
+ * @param classes Array containing the class list of the template.
  * @param propertyName String encoding the name of the value.
  * @param propertyValue Number storing the original value. Can also be
  * non-numberic, but then only "replace" techs can be supported.
@@ -44 +53 @@
 }
 
 /**
+ * Derives modifications (to be applied to entities) from a given technology
+ * 
+ * @param techTemplate The technology template to derive the modifications from.
+ * @return Object containing the relevant modifications.
+ */
+function DeriveModificationsFromTech(techTemplate)
+{
+    if (!techTemplate.modifications)
+        return {};
+
+    let techMods = {};
+    let techAffects = [];
+    if (techTemplate.affects && techTemplate.affects.length > 0)
+        for (let affected of techTemplate.affects)
+            techAffects.push(affected.split(/\s+/));
+    else
+        techAffects.push([]);
+
+    for (let mod of techTemplate.modifications)
+    {
+        let affects = techAffects.slice();
+        if (mod.affects)
+        {
+            let specAffects = mod.affects.split(/\s+/);
+            for (let a in affects)
+                affects[a] = affects[a].concat(specAffects);
+        }
+
+        let newModifier = {
+            "affects": affects
+        };
+        for (let idx in mod)
+            if (idx !== "value" && idx !== "affects")
+                newModifier[idx] = mod[idx];
+
+        if (!techMods[mod.value])
+            techMods[mod.value] = [];
+        techMods[mod.value].push(newModifier);
+    }
+    return techMods;
+}
+
+/**
  * Returns whether the given modification applies to the entity containing the given class list
  */
 function DoesModificationApply(modification, classes)

binaries/data/mods/public/globalscripts/Templates.js

@@ -79 +79 @@
     var func;
     if (player)
         func = ApplyValueModificationsToTemplate;
+    else if (g_Modifiers)
+        func = function(property, val, c, template) {
+            return GetTechModifiedProperty(g_Modifiers, GetIdentityClasses(template.Identity), property, val);
+        }
     else
         func = function(a, val, c, d) { return val; }
 

binaries/data/mods/public/gui/structree/load.js

@@ -35 +35 @@
     return rates;
 }
 
+function preloadUnit(templateName)
+{
+    if (!Engine.TemplateExists(templateName))
+        return;
+    let template = loadTemplate(templateName);
+
+    if (template.Builder && template.Builder.Entities._string)
+        for (let build of template.Builder.Entities._string.split(" "))
+        {
+            build = build.replace("{civ}", g_SelectedCiv);
+            if (g_Lists.structures.indexOf(build) < 0)
+                g_Lists.structures.push(build);
+        }
+
+    if (template.ProductionQueue)
+    {
+        if (template.ProductionQueue.Entities)
+            for (let build of template.ProductionQueue.Entities._string.split(" "))
+            {
+                build = build.replace("{civ}", g_SelectedCiv);
+                if (g_Lists.units.indexOf(build) === -1)
+                    g_Lists.units.push(build);
+            }
+
+        if (template.ProductionQueue.Technologies)
+            for (let research of template.ProductionQueue.Technologies._string.split(" "))
+                if (g_Lists.techs.indexOf(research) < 0)
+                    g_Lists.techs.push(research);
+    }
+
+    if (template.Identity.Rank)
+    {
+        let promotionTech = GetUnitBonusTechName(template.Identity.Rank);
+        if (g_Lists.modifiers.indexOf(promotionTech) < 0)
+            g_Lists.modifiers.push(promotionTech);
+
+        // recurse through promotions to get all techs
+        if (template.Promotion)
+            preloadUnit(template.Promotion.Entity);
+    }
+}
+
 function loadUnit(templateName)
 {
     if (!Engine.TemplateExists(templateName))
@@ -61 +103 @@
         {
             unit.production.units = [];
             for (let build of template.ProductionQueue.Entities._string.split(" "))
-            {
-                build = build.replace("{civ}", g_SelectedCiv);
-                unit.production.units.push(build);
-                if (g_Lists.units.indexOf(build) < 0)
-                    g_Lists.units.push(build);
-            }
+                unit.production.units.push(build.replace("{civ}", g_SelectedCiv));
         }
         if (template.ProductionQueue.Technologies)
         {
             unit.production.techs = [];
             for (let research of template.ProductionQueue.Technologies._string.split(" "))
-            {
                 unit.production.techs.push(research);
-                if (g_Lists.techs.indexOf(research) < 0)
-                    g_Lists.techs.push(research);
-            }
         }
     }
 
@@ -98 +131 @@
     return unit;
 }
 
+function preloadStructure(templateName)
+{
+    let template = loadTemplate(templateName);
+
+    if (template.ProductionQueue && template.ProductionQueue.Entities && template.ProductionQueue.Entities._string)
+        for (let build of template.ProductionQueue.Entities._string.split(" "))
+        {
+            build = build.replace("{civ}", g_SelectedCiv);
+            if (g_Lists.units.indexOf(build) < 0)
+                g_Lists.units.push(build);
+        }
+}
+
 function loadStructure(templateName)
 {
     var template = loadTemplate(templateName);
@@ -124 +170 @@
             {
                 build = build.replace("{civ}", g_SelectedCiv);
                 structure.production.units.push(build);
-                if (g_Lists.units.indexOf(build) < 0)
-                    g_Lists.units.push(build);
             }
 
         if (template.ProductionQueue.Technologies && template.ProductionQueue.Technologies._string)
@@ -261 +305 @@
     return phase;
 }
 
+function loadModifierTech(modCode)
+{
+    if (!Engine.FileExists("simulation/data/technologies/"+modCode+".json"))
+        return {};
+    return loadTechData(modCode);
+}
+
 function loadTechnologyPair(pairCode)
 {
     var pairInfo = loadTechData(pairCode);

binaries/data/mods/public/gui/structree/structree.js

@@ -7 +7 @@
 
 var g_Lists = {};
 var g_CivData = {};
+var g_Modifiers = {};
 var g_SelectedCiv = "";
 var g_CallbackSet = false;
 
@@ -58 +59 @@
     g_Lists = {
         "units": [],
         "structures": [],
-        "techs": []
+        "techs": [],
+        "modifiers": []
     };
+    g_Modifiers = {};
+
+    // Get initial modifier techs
+    if (g_CivData[g_SelectedCiv].CivBonusTechs)
+        g_Lists.modifiers = g_CivData[g_SelectedCiv].CivBonusTechs;
 
     // get initial units
-    var startStructs = [];
+    let startStructs = [];
     for (let entity of g_CivData[civCode].StartEntities)
     {
         if (entity.Template.slice(0, 5) == "units")
@@ -74 +81 @@
         }
     }
 
-    // Load units and structures
-    var unitCount = 0;
+    // Compile lists of units and structures belonging to this civ
+    let unitCount = 0;
     do
     {
         for (let u of g_Lists.units)
-            if (!g_ParsedData.units[u])
-                g_ParsedData.units[u] = loadUnit(u);
+            preloadUnit(u);
 
         unitCount = g_Lists.units.length;
 
         for (let s of g_Lists.structures)
-            if (!g_ParsedData.structures[s])
-                g_ParsedData.structures[s] = loadStructure(s);
+            preloadStructure(s);
 
     } while (unitCount < g_Lists.units.length);
 
+
+    // Load modifiers
+    for (let modCode of g_Lists.modifiers)
+    {
+        let modTech = loadModifierTech(modCode);
+        let derivedModifiers = DeriveModificationsFromTech(modTech);
+
+        for (let modPath in derivedModifiers)
+        {
+            if (!g_Modifiers[modPath])
+                g_Modifiers[modPath] = [];
+            g_Modifiers[modPath] = g_Modifiers[modPath].concat(derivedModifiers[modPath]);
+        }
+    }
+
+    // Properly load units and structures, now we have modifiers
+    for (let u of g_Lists.units)
+        if (!g_ParsedData.units[u])
+            g_ParsedData.units[u] = loadUnit(u);
+
+    for (let s of g_Lists.structures)
+        if (!g_ParsedData.structures[s])
+            g_ParsedData.structures[s] = loadStructure(s);
+
     // Load technologies
-    var techPairs = {};
+    let techPairs = {};
     for (let techcode of g_Lists.techs)
     {
         let realcode = depath(techcode);

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

@@ -267 +267 @@
     // store the modifications in an easy to access structure
     if (template.modifications)
     {
-        var affects = [];
-        if (template.affects && template.affects.length > 0)
+        let derivedModifiers = DeriveModificationsFromTech(template);
+        for (let modifierPath in derivedModifiers)
         {
-            for (let affect of template.affects)
-            {
-                // Put the list of classes into an array for convenient access
-                affects.push(affect.split(/\s+/));
-            }
-        }
-        else
-        {
-            affects.push([]);
-        }
-
-        // We add an item to this.modifications for every modification in the template.modifications array
-        for (var i in template.modifications)
-        {
-            var modification = template.modifications[i];
-            if (!this.modifications[modification.value])
-                this.modifications[modification.value] = [];
-            
-            var modAffects = affects.slice();
-            if (modification.affects)
-            {
-                var extraAffects = modification.affects.split(/\s+/);
-                for (var a in modAffects)
-                    modAffects[a] = modAffects[a].concat(extraAffects);
-            }
-
-            var mod = {"affects": modAffects};
-
-            // copy the modification data into our new data structure
-            for (var j in modification)
-                if (j !== "value" && j !== "affects")
-                    mod[j] = modification[j];
+            if (!this.modifications[modifierPath])
+                this.modifications[modifierPath] = [];
+            this.modifications[modifierPath] = this.modifications[modifierPath].concat(derivedModifiers[modifierPath]);
 
-            this.modifications[modification.value].push(mod);
-            var component = modification.value.split("/")[0];
+            let component = modifierPath.split("/")[0];
             if (!modifiedComponents[component])
                 modifiedComponents[component] = [];
-            modifiedComponents[component].push(modification.value);
-            this.modificationCache[modification.value] = {};
+            modifiedComponents[component].push(modifierPath);
+            this.modificationCache[modifierPath] = {};
         }
     }
 

binaries/data/mods/public/simulation/data/civs/athen.json

@@ -79 +79 @@
             "Description":"Ships construct 25% faster."
         }
     ],
+    "CivBonusTechs":
+    [
+        "hellenes/civbonus_hellenic_architecture"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/brit.json

@@ -75 +75 @@
             "Description": "Bonus to tech speed." 
         } 
     ],
+    "CivBonusTechs":
+    [
+        "celts/civbonus_celts_wooden_struct"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/cart.json

@@ -73 +73 @@
             "Description": "+33% trade profit international routes."
         }
     ],
+    "CivBonusTechs":
+    [
+        "carthaginians/civbonus_triple_walls"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/gaul.json

@@ -75 +75 @@
             "Description": "Bonus to tech speed." 
         } 
     ],
+    "CivBonusTechs":
+    [
+        "celts/civbonus_celts_wooden_struct"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/iber.json

@@ -73 +73 @@
             "Description": "Citizen-soldier infantry skirmishers and cavalry skirmishers -20% cost for allies."
         } 
     ],
+    "CivBonusTechs":
+    [
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/mace.json

@@ -84 +84 @@
             "Description":"+15% tribute and trade bonus on metal."
         }
     ],
+    "CivBonusTechs":
+    [
+        "hellenes/civbonus_hellenic_architecture"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/maur.json

@@ -73 +73 @@
             "Description": "Allied Temple techs -50% cost and research time."
         } 
     ],
+    "CivBonusTechs":
+    [
+        "mauryans/civbonus_maur_popcap",
+        "mauryans/wooden_walls"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/pers.json

@@ -83 +83 @@
             "Description": "+25% trade profit land routes."
         } 
     ],
+    "CivBonusTechs":
+    [
+        "persians/civbonus_pers_popcap"
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/ptol.json

@@ -83 +83 @@
             "Description":"All allies automatically gain a slow trickle of food income."
         }
     ],
+    "CivBonusTechs":
+    [
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/rome.json

@@ -68 +68 @@
             "Description": "Allied citizen-soldiers gain a +15% attack when in Roman territory."
         } 
     ],
+    "CivBonusTechs":
+    [
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/sele.json

@@ -84 +84 @@
             "Description":"Allied Civic Centers are 20% cheaper."
         }
     ],
+    "CivBonusTechs":
+    [
+    ],
     "Structures":
     [
         {

binaries/data/mods/public/simulation/data/civs/spart.json

@@ -84 +84 @@
             "Description":"Allies can train Spartiates."
         }
     ],
+    "CivBonusTechs":
+    [
+        "hellenes/civbonus_hellenic_architecture",
+        "hellenes/civpenalty_spart_popcap"
+    ],
     "Structures":
     [
         {