Ticket #2243: actorTech.3.diff

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

@@ -18 +18 @@
     return ret;
 };
 
+
+TechnologyManager.prototype.Deserialize = function(msg)
+{
+    for (var i in msg)
+    {
+        if (msg.hasOwnProperty(i))
+            this[i] = msg[i];
+    }
+    this.modificationCache = {};
+    // warn components that were initialized before the technologymanager was initialized
+    var notifiedComponents = [];
+    for (var name in this.modifications)
+    {
+        // We only need to find one one tech per component for a match
+        var component = name.split("/")[0];
+        if (notifiedComponents.indexOf(component) == -1)
+        {
+            notifiedComponents.push(component);
+            this.componentsToNotifyOnUpdate.push(component);
+        }
+    }
+};
+
 TechnologyManager.prototype.Init = function ()
 {
     var cmpTechTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
@@ -25 +48 @@
     this.researchedTechs = {}; // technologies which have been researched
     this.researchQueued = {};  // technologies which are queued for research
     this.researchStarted = {}; // technologies which are being researched currently (non-queued)
+    this.componentsToNotifyOnUpdate = [];
     
     // This stores the modifications to unit stats from researched technologies
     // Example data: {"ResourceGatherer/Rates/food.grain": [ 
@@ -56 +80 @@
 TechnologyManager.prototype.OnUpdate = function () 
 {
     this.UpdateAutoResearch();
+
+    for each (var component in this.componentsToNotifyOnUpdate)
+        Engine.BroadcastMessage(MT_ValueModification, { "component": component });
+    this.componentsToNotifyOnUpdate = [];
 }
 
 
@@ -356 +384 @@
         this.modificationCache[valueName][ent] = {"origValue": curValue};
         var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
         var templateName = cmpTemplateManager.GetCurrentTemplateName(ent);
-        // Ensure that preview entites have the same properties as the final building
-        if (templateName.indexOf("preview|") != -1)
-            templateName = templateName.slice(8);
+        // Ensure that preview or construction entites have the same properties as the final building
+        if (templateName.indexOf("preview|") > -1 || templateName.indexOf("construction|") > -1 )
+            templateName = templateName.slice(templateName.indexOf("|") + 1);
         this.modificationCache[valueName][ent].newValue = GetTechModifiedProperty(this.modifications, cmpTemplateManager.GetTemplate(templateName), valueName, curValue);
     }
-    
     return this.modificationCache[valueName][ent].newValue;
 };
 

binaries/data/mods/public/simulation/data/technologies/phase_town.json

@@ -2 +2 @@
     "genericName": "Town Phase",
     "requirements": { "any": [{"tech":"phase_town_generic"}, {"tech":"phase_town_athen"}]},
     "autoResearch": true,
-    "modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.30}],
+    "modifications": [{"value": "TerritoryInfluence/Radius", "multiply": 1.30},{"value": "VisualActor/Actor", "replace":"structures/athenians/gymnasion.xml"}],
     "affects": ["CivCentre"],
     "soundComplete": "interface/alarm/alarm_phase.xml"
 }

source/simulation2/components/CCmpVisualActor.cpp

@@ -30 +30 @@
 #include "ICmpTemplateManager.h"
 #include "ICmpTerrain.h"
 #include "ICmpUnitMotion.h"
+#include "ICmpValueModificationManager.h"
 #include "ICmpVision.h"
 
 #include "graphics/Decal.h"
@@ -56 +57 @@
         componentManager.SubscribeToMessageType(MT_Interpolate);
         componentManager.SubscribeToMessageType(MT_RenderSubmit);
         componentManager.SubscribeToMessageType(MT_OwnershipChanged);
+        componentManager.SubscribeToMessageType(MT_ValueModification);
         componentManager.SubscribeGloballyToMessageType(MT_TerrainChanged);
     }
 
@@ -62 +64 @@
     DEFAULT_COMPONENT_ALLOCATOR(VisualActor)
 
 private:
-    std::wstring m_ActorName;
+    std::wstring m_OriginalActorName, m_ActorName;
+    bool m_IsFoundationActor;
     CUnit* m_Unit;
 
     fixed m_R, m_G, m_B; // shading colour
@@ -181 +184 @@
 
         m_Seed = GetEntityId();
 
-        if (paramNode.GetChild("Foundation").IsOk() && paramNode.GetChild("FoundationActor").IsOk())
-            m_ActorName = paramNode.GetChild("FoundationActor").ToString();
+        m_IsFoundationActor = paramNode.GetChild("Foundation").IsOk() && paramNode.GetChild("FoundationActor").IsOk();
+        if (m_IsFoundationActor)
+            m_OriginalActorName = m_ActorName = paramNode.GetChild("FoundationActor").ToString();
         else
-            m_ActorName = paramNode.GetChild("Actor").ToString();
+            m_OriginalActorName = m_ActorName = paramNode.GetChild("Actor").ToString();
 
         m_VisibleInAtlasOnly = paramNode.GetChild("VisibleInAtlasOnly").ToBool();
 
@@ -297 +301 @@
         {
             const CMessageOwnershipChanged& msgData = static_cast<const CMessageOwnershipChanged&> (msg);
             m_Unit->GetModel().SetPlayerID(msgData.to);
+
+            // also update the actor for local entities
+            CmpPtr<ICmpValueModificationManager> cmpValueModificationManager(GetSystemEntity());
+            std::wstring newActorName;
+            if (m_IsFoundationActor)
+                newActorName = cmpValueModificationManager->ApplyModifications(L"VisualActor/FoundationActor", m_OriginalActorName, GetEntityId());
+            else
+                newActorName = cmpValueModificationManager->ApplyModifications(L"VisualActor/Actor", m_OriginalActorName, GetEntityId());
+            if (newActorName != m_ActorName)
+            {
+                m_ActorName = newActorName;
+                ReloadActor();
+            }
             break;
         }
         case MT_TerrainChanged:
@@ -305 +322 @@
             m_Unit->GetModel().SetTerrainDirty(msgData.i0, msgData.j0, msgData.i1, msgData.j1);
             break;
         }
+        case MT_ValueModification:
+        {
+            const CMessageValueModification& msgData = static_cast<const CMessageValueModification&> (msg);
+            if (msgData.component != L"VisualActor")
+                break;
+            CmpPtr<ICmpValueModificationManager> cmpValueModificationManager(GetSystemEntity());
+            std::wstring newActorName;
+            if (m_IsFoundationActor)
+                newActorName = cmpValueModificationManager->ApplyModifications(L"VisualActor/FoundationActor", m_OriginalActorName, GetEntityId());
+            else
+                newActorName = cmpValueModificationManager->ApplyModifications(L"VisualActor/Actor", m_OriginalActorName, GetEntityId());
+            if (newActorName != m_ActorName)
+            {
+                m_ActorName = newActorName;
+                ReloadActor();
+            }
+            break;
         }
+        }
     }
 
     virtual CBoundingBoxAligned GetBounds()
@@ -511 +546 @@
     if (GetSimContext().HasUnitManager())
     {
         std::set<CStr> selections;
-        m_Unit = GetSimContext().GetUnitManager().CreateUnit(m_ActorName, GetActorSeed(), selections);
+        std::wstring actorName = m_ActorName;
+        if (actorName.find(L".xml") == std::wstring::npos)
+            actorName += L".xml";
+        m_Unit = GetSimContext().GetUnitManager().CreateUnit(actorName, GetActorSeed(), selections);
         if (m_Unit)
         {
             CModelAbstract& model = m_Unit->GetModel();
@@ -629 +667 @@
         return;
 
     std::set<CStr> selections;
-    CUnit* newUnit = GetSimContext().GetUnitManager().CreateUnit(m_ActorName, GetActorSeed(), selections);
+    std::wstring actorName = m_ActorName;
+    if (actorName.find(L".xml") == std::wstring::npos)
+        actorName += L".xml";
+    CUnit* newUnit = GetSimContext().GetUnitManager().CreateUnit(actorName, GetActorSeed(), selections);
 
     if (!newUnit)
         return;

source/simulation2/components/ICmpValueModificationManager.cpp

@@ -39 +39 @@
     {
         return m_Script.Call<u32>("ApplyModifications", valueName, currentValue, entity);
     }
+
+    virtual std::wstring ApplyModifications(std::wstring valueName, std::wstring currentValue, entity_id_t entity)
+    {
+        return m_Script.Call<std::wstring>("ApplyModifications", valueName, currentValue, entity);
+    }
 };
 
 REGISTER_COMPONENT_SCRIPT_WRAPPER(ValueModificationManagerScripted)

source/simulation2/components/ICmpValueModificationManager.h

@@ -32 +32 @@
 public:
     virtual fixed ApplyModifications(std::wstring valueName, fixed currentValue, entity_id_t entity) = 0;
     virtual u32 ApplyModifications(std::wstring valueName, u32 currentValue, entity_id_t entity) = 0;
+    virtual std::wstring ApplyModifications(std::wstring valueName, std::wstring currentValue, entity_id_t entity) = 0;
 
     DECLARE_INTERFACE_TYPE(ValueModificationManager)
 };