Ticket #4334: TransformFix2.patch

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

@@ -137 +137 @@
 /**
  * Lock the gate, with sound. It will close at the next opportunity.
  */
-Gate.prototype.LockGate = function()
+Gate.prototype.LockGate = function(quiet)
 {
     this.locked = true;
     // If the door is closed, enable 'block pathfinding'
@@ -153 +153 @@
         this.OperateGate();
 
     // TODO: Possibly move the lock/unlock sounds to UI? Needs testing
-    PlaySound("gate_locked", this.entity);
+    if (!quiet)
+        PlaySound("gate_locked", this.entity);
 };
 
 /**

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

@@ -30 +30 @@
 
 Promotion.prototype.Promote = function(promotedTemplateName)
 {
-    // If the unit is dead, don't promote it
-    var cmpCurrentUnitHealth = Engine.QueryInterface(this.entity, IID_Health);
+    let cmpCurrentUnitHealth = Engine.QueryInterface(this.entity, IID_Health);
     if (cmpCurrentUnitHealth.GetHitpoints() == 0)
         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);
-    var cmpPromotedUnitPosition = Engine.QueryInterface(promotedUnitEntity, IID_Position);
-    if (cmpCurrentUnitPosition.IsInWorld())
-    {
-        var pos = cmpCurrentUnitPosition.GetPosition2D();
-        cmpPromotedUnitPosition.JumpTo(pos.x, pos.y);
-    }
-    var rot = cmpCurrentUnitPosition.GetRotation();
-    cmpPromotedUnitPosition.SetYRotation(rot.y);
-    cmpPromotedUnitPosition.SetXZRotation(rot.x, rot.z);
-    var heightOffset = cmpCurrentUnitPosition.GetHeightOffset();
-    cmpPromotedUnitPosition.SetHeightOffset(heightOffset);
+    if (!CanGarrisonedChangeTemplate(this.entity,promotedTemplateName))
+        return;
 
-    var cmpCurrentUnitOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    var cmpPromotedUnitOwnership = Engine.QueryInterface(promotedUnitEntity, IID_Ownership);
-    cmpPromotedUnitOwnership.SetOwner(cmpCurrentUnitOwnership.GetOwner());
+    this.promotedUnitEntity = ChangeEntityTemplate(this.entity, promotedTemplateName);
 
-    // change promoted unit health to the same percent of hitpoints as unit had before promotion
-    var cmpPromotedUnitHealth = Engine.QueryInterface(promotedUnitEntity, IID_Health);
-    var healthFraction = Math.max(0, Math.min(1, cmpCurrentUnitHealth.GetHitpoints() / cmpCurrentUnitHealth.GetMaxHitpoints()));
-    var promotedUnitHitpoints = Math.round(cmpPromotedUnitHealth.GetMaxHitpoints() * healthFraction);
-    cmpPromotedUnitHealth.SetHitpoints(promotedUnitHitpoints);
+    // cheer
+    let cmpCurrentUnitPosition = Engine.QueryInterface(this.entity, IID_Position);
+    let cmpPromotedUnitAI = Engine.QueryInterface(this.promotedUnitEntity, IID_UnitAI);
+    if (cmpCurrentUnitPosition.IsInWorld() && !cmpPromotedUnitAI.IsGarrisoned())
+        cmpPromotedUnitAI.Cheer();
 
-    var cmpPromotedUnitPromotion = Engine.QueryInterface(promotedUnitEntity, IID_Promotion);
+    // add promotion XP.
+    let cmpPromotedUnitPromotion = Engine.QueryInterface(this.promotedUnitEntity, IID_Promotion);
     if (cmpPromotedUnitPromotion)
         cmpPromotedUnitPromotion.IncreaseXp(this.currentXp);
-
-    var cmpCurrentUnitResourceGatherer = Engine.QueryInterface(this.entity, IID_ResourceGatherer);
-    var cmpPromotedUnitResourceGatherer = Engine.QueryInterface(promotedUnitEntity, IID_ResourceGatherer);
-    if (cmpCurrentUnitResourceGatherer && cmpPromotedUnitResourceGatherer)
-    {
-        var carriedResorces = cmpCurrentUnitResourceGatherer.GetCarryingStatus();
-        cmpPromotedUnitResourceGatherer.GiveResources(carriedResorces);
-    }
-
-    var cmpCurrentUnitAI = Engine.QueryInterface(this.entity, IID_UnitAI);
-    var cmpPromotedUnitAI = Engine.QueryInterface(promotedUnitEntity, IID_UnitAI);
-    var pos = cmpCurrentUnitAI.GetHeldPosition();
-    if (pos)
-        cmpPromotedUnitAI.SetHeldPosition(pos.x, pos.z);
-    if (cmpCurrentUnitAI.GetStanceName())
-        cmpPromotedUnitAI.SwitchToStance(cmpCurrentUnitAI.GetStanceName());
-
-    var orders = cmpCurrentUnitAI.GetOrders();
-    if (cmpCurrentUnitAI.IsGarrisoned())
-        cmpPromotedUnitAI.SetGarrisoned();
-    if (cmpCurrentUnitPosition.IsInWorld()) // do not cheer if not visibly garrisoned
-        cmpPromotedUnitAI.Cheer();  
-    cmpPromotedUnitAI.AddOrders(orders);
-
-    var workOrders = cmpCurrentUnitAI.GetWorkOrders();
-    cmpPromotedUnitAI.SetWorkOrders(workOrders);
-    cmpPromotedUnitAI.SetGuardOf(cmpCurrentUnitAI.IsGuardOf());
-
-    var cmpCurrentUnitGuard = Engine.QueryInterface(this.entity, IID_Guard);
-    var cmpPromotedUnitGuard = Engine.QueryInterface(promotedUnitEntity, IID_Guard);
-    if (cmpCurrentUnitGuard && cmpPromotedUnitGuard)
-        cmpPromotedUnitGuard.SetEntities(cmpCurrentUnitGuard.GetEntities());
-
-    Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: promotedUnitEntity });
-
-    // Destroy current entity
-    Engine.DestroyEntity(this.entity);
-    // save the entity id
-    this.promotedUnitEntity = promotedUnitEntity;
 };
 
 Promotion.prototype.IncreaseXp = function(amount)

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

@@ -5423 +5423 @@
  */
 UnitAI.prototype.Cheer = function()
 {
-    this.AddOrder("Cheering", { "force": true }, false);
+    this.AddOrder("Cheering", { "force": true }, true);
 };
 
 UnitAI.prototype.Pack = function(queued)

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

@@ -3 +3 @@
 // returns the ID of the new entity or INVALID_ENTITY.
 function ChangeEntityTemplate(oldEnt, newTemplate)
 {
-    // Done un/packing, copy our parameters to the final entity
     var newEnt = Engine.AddEntity(newTemplate);
     if (newEnt == INVALID_ENTITY)
     {
@@ -31 +30 @@
     if (cmpOwnership && cmpNewOwnership)
         cmpNewOwnership.SetOwner(cmpOwnership.GetOwner());
 
-    // Copy control groups
     CopyControlGroups(oldEnt, newEnt);
 
     // Rescale capture points
@@ -53 +51 @@
         cmpNewHealth.SetHitpoints(Math.round(cmpNewHealth.GetMaxHitpoints() * healthLevel));
     }
 
+    var cmpUnitResourceGatherer = Engine.QueryInterface(oldEnt, IID_ResourceGatherer);
+    var cmpNewUnitResourceGatherer = Engine.QueryInterface(newEnt, IID_ResourceGatherer);
+    if (cmpUnitResourceGatherer && cmpNewUnitResourceGatherer)
+        cmpNewUnitResourceGatherer.GiveResources(cmpUnitResourceGatherer.GetCarryingStatus());
+
     var cmpUnitAI = Engine.QueryInterface(oldEnt, IID_UnitAI);
     var cmpNewUnitAI = Engine.QueryInterface(newEnt, IID_UnitAI);
     if (cmpUnitAI && cmpNewUnitAI)
@@ -63 +66 @@
         if (cmpUnitAI.GetStanceName())
             cmpNewUnitAI.SwitchToStance(cmpUnitAI.GetStanceName());
         cmpNewUnitAI.AddOrders(cmpUnitAI.GetOrders());
+        cmpNewUnitAI.SetWorkOrders(cmpUnitAI.GetWorkOrders());
         cmpNewUnitAI.SetGuardOf(cmpUnitAI.IsGuardOf());
+        if (cmpUnitAI.IsGarrisoned())
+            cmpNewUnitAI.SetGarrisoned();
     }
 
-    // Maintain the list of guards
     var cmpGuard = Engine.QueryInterface(oldEnt, IID_Guard);
     var cmpNewGuard = Engine.QueryInterface(newEnt, IID_Guard);
     if (cmpGuard && cmpNewGuard)
         cmpNewGuard.SetEntities(cmpGuard.GetEntities());
 
+    var cmpGate = Engine.QueryInterface(oldEnt, IID_Gate);
+    var cmpNewGate = Engine.QueryInterface(newEnt, IID_Gate);
+    if (cmpGate && cmpNewGate)
+    {
+        cmpNewGate.opened = cmpGate.opened;
+        if (cmpGate.IsLocked)
+            cmpGate.LockGate(true);
+    }
+
+    var cmpTrader = Engine.QueryInterface(oldEnt, IID_Trader);
+    var cmpNewTrader = Engine.QueryInterface(newEnt, IID_Trader);
+    if (cmpTrader && cmpNewTrader)
+    {
+        cmpNewTrader.markets = cmpTrader.markets;
+        cmpNewTrader.index = cmpTrader.index;
+        cmpNewTrader.goods = {};
+        for (let p of cmpTrader.goods)
+            cmpNewTrader.goods[p] = cmpTrader.goods[p];
+    }
+
     TransferGarrisonedUnits(oldEnt, newEnt);
 
     Engine.BroadcastMessage(MT_EntityRenamed, { "entity": oldEnt, "newentity": newEnt });
@@ -83 +108 @@
 
 function CanGarrisonedChangeTemplate(ent, template)
 {
-    var cmpPosition = Engine.QueryInterface(ent, IID_Position);
     var unitAI = Engine.QueryInterface(ent, IID_UnitAI);
-    if (cmpPosition && !cmpPosition.IsInWorld() && unitAI && unitAI.IsGarrisoned())
+    if (unitAI && unitAI.IsGarrisoned())
     {
         // We're a garrisoned unit, assume impossibility as I've been unable to find a way to get the holder ID.
         // TODO: change this if that ever becomes possibles