Ticket #1404: output2.diff

binaries/data/mods/public/maps/skirmishes/Acropolis

@@ -27788 +27788 @@
         </Entity>
     </Entities>
     <Paths/>
-</Scenario>
- No newline at end of file
+</Scenario>

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

@@ -23 +23 @@
         { "goods":  "wood", "proba": 30 },
         { "goods": "stone", "proba": 35 },
         { "goods": "metal", "proba": 35 } ];
+    this.startingTech = [];
+    this.disabledTech = [];
     this.team = -1; // team number of the player, players on the same team will always have ally diplomatic status - also this is useful for team emblems, scoring, etc.
     this.teamsLocked = false;
     this.state = "active"; // game state - one of "active", "defeated", "won"
@@ -319 +321 @@
         this.tradingGoods.push( {"goods": resource, "proba": tradingGoods[resource]} );
 };
 
+Player.prototype.SetStartingTech = function(tech)
+{
+    this.startingTech = tech;
+};
+
+Player.prototype.SetDisabledTech = function(tech)
+{
+    this.disabledTech = tech;
+};
+
+Player.prototype.GetStartingTech = function(tech)
+{
+    return this.startingTech;
+};
+
+Player.prototype.GetDisabledTech = function(tech)
+{
+    return this.disabledTech;
+};
+
 Player.prototype.GetState = function()
 {
     return this.state;

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

@@ -146 +146 @@
     if (!cmpTechnologyManager)
         return [];
     
+    var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
+    var disabledTech = cmpPlayer.GetDisabledTech();
+    
     var techs = string.split(/\s+/);
     var techList = [];
     var superseded = {}; // Stores the tech which supersedes the key 
@@ -155 +158 @@
     for (var i in techs)
     {
         var tech = techs[i];
-        var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
-        if (!template.supersedes || techs.indexOf(template.supersedes) === -1)
-            techList.push(tech);
-        else
-            superseded[template.supersedes] = tech;
+        if(disabledTech.indexOf(tech)==-1){
+            var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+            if (!template.supersedes || techs.indexOf(template.supersedes) === -1)
+                techList.push(tech);
+            else
+                superseded[template.supersedes] = tech;
+        }
     }
     
     // Now make researched/in progress techs invisible

binaries/data/mods/public/simulation/helpers/Player.js

@@ -90 +90 @@
 
             if (getSetting(pData, pDefs, "Resources") !== undefined)
                 cmpPlayer.SetResourceCounts(getSetting(pData, pDefs, "Resources"));
+            
+            if (getSetting(pData, pDefs, "StartingTech") !== undefined)
+                cmpPlayer.SetStartingTech(getSetting(pData, pDefs, "StartingTech"));
+            
+            var startingTech = cmpPlayer.GetStartingTech();
+            var cmpTechnologyManager = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_TechnologyManager);
+            for(var j in startingTech){
+                cmpTechnologyManager.ResearchTechnology(startingTech[j]);
+            }
+            
+            if (getSetting(pData, pDefs, "DisabledTech") !== undefined)
+                cmpPlayer.SetDisabledTech(getSetting(pData, pDefs, "DisabledTech"));
 
             // If diplomacy explicitly defined, use that; otherwise use teams
             if (getSetting(pData, pDefs, "Diplomacy") !== undefined)