Ticket #4126: promotion.diff

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

@@ -119 +119 @@
     entitiesList = entitiesList.filter(
         function(v) { return !disabledEntities[v] && cmpTemplateManager.TemplateExists(v); }
     );
 
     // check if some templates need to show their advanced or elite version
-    var upgradeTemplate = function(templateName)
+    var upgradeTemplate = function(templateName, player)
     {
         var template = cmpTemplateManager.GetTemplate(templateName);
         while (template && template.Promotion !== undefined)
         {
-            var requiredXp = ApplyValueModificationsToTemplate("Promotion/RequiredXp", +template.Promotion.RequiredXp, cmpPlayer.GetPlayerID(), template);
+            if (template.Promotion.RequiredTechnology)
+            {
+                let cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
+                if (!cmpTechnologyManager || !cmpTechnologyManager.IsTechnologyResearched(template.Promotion.RequiredTechnology))
+                    break;
+            }
+            var requiredXp = ApplyValueModificationsToTemplate("Promotion/RequiredXp", +template.Promotion.RequiredXp, player, template);
             if (requiredXp > 0)
                 break;
             templateName = template.Promotion.Entity;
             template = cmpTemplateManager.GetTemplate(templateName);
         }
         return templateName;
     };
 
     for (let templateName of entitiesList)
-        this.entitiesList.push(upgradeTemplate(templateName));
+        this.entitiesList.push(upgradeTemplate(templateName, cmpPlayer.GetPlayerID()));
 
     for (let item of this.queue)
         if (item.unitTemplate)
-            item.unitTemplate = upgradeTemplate(item.unitTemplate);
+            item.unitTemplate = upgradeTemplate(item.unitTemplate, cmpPlayer.GetPlayerID());
 };
 
 /*
  * Returns list of technologies that can be researched by this building.
  */
@@ -276 +282 @@
             {
                 var requiredXp = ApplyValueModificationsToTemplate("Promotion/RequiredXp", +template.Promotion.RequiredXp, cmpPlayer.GetPlayerID(), template);
 
                 if (requiredXp == 0)
                 {
-                    this.AddBatch(template.Promotion.Entity, type, count, metadata);
-                    return;
+                    if (template.Promotion.RequiredTechnology)
+                    {
+                        let cmpTechnologyManager = QueryPlayerIDInterface(cmpPlayer.GetPlayerID(), IID_TechnologyManager);
+                        if (cmpTechnologyManager && cmpTechnologyManager.IsTechnologyResearched(template.Promotion.RequiredTechnology))
+                        {
+                            this.AddBatch(template.Promotion.Entity, type, count, metadata);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        this.AddBatch(template.Promotion.Entity, type, count, metadata);
+                        return;
+                    }
                 }
             }
 
             // Apply a time discount to larger batches.
             var timeMult = this.GetBatchTime(count);

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

@@ -3 +3 @@
 Promotion.prototype.Schema =
     "<element name='Entity'>" +
         "<text/>" +
     "</element>" +
     "<element name='RequiredXp'>" +
-        "<data type='positiveInteger'/>" +
-    "</element>";
+        "<data type='nonNegativeInteger'/>" +
+    "</element>" +
+    "<optional>" +
+        "<element name='AllowPromotedUnitProduction' a:help='Optional name of a technology which must be researched before the entity can be promoted'>" +
+            "<data type='boolean'/>" +
+        "</element>" +
+    "</optional>" +
+    "<optional>" +
+        "<element name='RequiredTechnology' a:help='Optional name of a technology which must be researched before the entity can be promoted'>" +
+            "<text/>" +
+        "</element>" +
+    "</optional>";
 
 Promotion.prototype.Init = function()
 {
     this.currentXp = 0;
 };
@@ -33 +43 @@
     // If the unit is dead, don't promote it
     var cmpCurrentUnitHealth = Engine.QueryInterface(this.entity, IID_Health);
     if (cmpCurrentUnitHealth.GetHitpoints() == 0)
         return;
 
+    // If the required technology is not researched, don't promote the unit
+    let cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
+    if (!cmpTechnologyManager || !cmpTechnologyManager.IsTechnologyResearched(this.template.RequiredTechnology))
+        return;
+
     // Create promoted unit entity
     var promotedUnitEntity = Engine.AddEntity(promotedTemplateName);
 
     // Copy parameters from current entity to promoted one
     var cmpCurrentUnitPosition = Engine.QueryInterface(this.entity, IID_Position);

binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json

@@ -5 +5 @@
     "requirements": {"all": [{"tech": "phase_city"}, {"civ": "mace"}]},
     "requirementsTooltip": "Unlocked in City Phase.",
     "icon": "shields_generic_silver.png",
     "researchTime": 40,
     "tooltip": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with greater health and armor.",
-    "modifications": [{"value": "Promotion/RequiredXp", "replace": 0}],
     "affects": ["Champion Infantry"],
     "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml

@@ -10 +10 @@
     <SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
-    <RequiredXp>2000</RequiredXp>
+    <RequiredXp>0</RequiredXp>
+    <RequiredTechnology>successors/upgrade_mace_silvershields</RequiredTechnology>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/mace_champion_hypaspist.xml</Actor>
   </VisualActor>
 </Entity>