Ticket #797: units_on_walls.diff

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

@@ +1 @@
+
+function BuildingWalker() {}
+
+BuildingWalker.prototype.Schema =
+    "<element name='WalkingHeight'>" +
+        "<ref name='nonNegativeDecimal'/>" +
+    "</element>";
+
+BuildingWalker.prototype.Init = function()
+{
+    warn("created");
+    this.buildingEntities = [];
+    // TODO
+};
+
+BuildingWalker.prototype.GetWalkingHeight = function()
+{
+    var walkingHeight = +this.template.WalkingHeight;
+    return ApplyTechModificationsToEntity("BuildingWalker/WalkingHeight", walkingHeight, this.entity);
+};
+
+BuildingWalker.prototype.AddEntity = function(entity)
+{
+    this.buildingEntities.push(entity);
+    var cmpPosition = Engine.QueryInterface(entity, IID_Position);
+    var thisPosition = Engine.QueryInterface(this.entity, IID_Position);
+    cmpPosition.SetHeightFixed(this.GetWalkingHeight() + thisPosition.GetPosition().y);
+}
+
+BuildingWalker.prototype.RemoveEntity = function(entity)
+{
+    var index = this.buildingEntities.indexOf(entity);
+    if (index == -1)
+        return;
+    this.buildingEntities.splice(index,1);
+    var cmpPosition = Engine.QueryInterface(entity, IID_Position);
+    cmpPosition.SetHeightOffset(0.0);
+    
+}
+
+BuildingWalker.prototype.OnDestroy = function()
+{
+    for (var i = 0; i < this.buildingEntities.length; i++)
+    {
+        this.RemoveEntity(this.buildingEntities[i]);
+        // TODO garison to neares tower, or unload next to gate
+    }
+}
+
+Engine.RegisterComponentType(IID_BuildingWalker, "BuildingWalker", BuildingWalker);

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

@@ -197 +197 @@
     
     var cmpNewPosition = Engine.QueryInterface(entity, IID_Position);
     cmpNewPosition.JumpTo(pos.x, pos.z);
+    // TODO notify walls units are garisoning, instead of just redefining the offset
+    cmpNewPosition.SetHeightOffset(0.0);
     // TODO: what direction should they face in?
     
     Engine.PostMessage(this.entity, MT_GarrisonedUnitsChanged, {});
@@ -225 +227 @@
     }
 };
 
+GarrisonHolder.prototype.EjectToWall = function(entities, forced, targetID)
+{
+    var buildingWalker = Engine.QueryInterface(targetID, IID_BuildingWalker);
+    var targetPos = Engine.QueryInterface(targetID, IID_Position).GetPosition();
+    var thisPos = Engine.QueryInterface(this.entity, IID_Position).GetPosition2D();
+    var dv = {x: targetPos.x-thisPos.x, y:targetPos.z-thisPos.y};
+    var l = Math.sqrt(dv.x * dv.x + dv.y * dv.y); 
+    
+    for (var i = 0; i < entities.length; i++)
+    {
+
+        // TODO only allow ranged units, 
+        // check if there is some space left, 
+        // only ungarison if you're on the target wall, not next to it 
+        // ...
+
+        var entityIndex = this.entities.indexOf(entities[i]);
+
+        this.spaceOccupied -= 1;
+        this.entities.splice(entityIndex, 1);
+        
+        var cmpUnitAI = Engine.QueryInterface(entities[i], IID_UnitAI);
+        if (cmpUnitAI)
+            cmpUnitAI.Ungarrison();
+
+        var cmpProductionQueue = Engine.QueryInterface(entities[i], IID_ProductionQueue);
+        if (cmpProductionQueue)
+            cmpProductionQueue.UnpauseProduction();
+        
+        var cmpPosition = Engine.QueryInterface(entities[i], IID_Position);
+        cmpPosition.JumpTo(thisPos.x + dv.x / l * (7+2*i), thisPos.y + dv.y / l * (7+2*i));
+        buildingWalker.AddEntity(entities[i]);
+    
+        Engine.PostMessage(this.entity, MT_GarrisonedUnitsChanged, {});
+        
+    }
+    
+    this.UpdateGarrisonFlag();
+    var success = true;
+    return success;
+
+};
+
 /**
  * Ejects units and orders them to move to the Rally Point.
  * Returns true if successful, false if not
@@ -233 +278 @@
 {
     var ejectedEntities = [];
     var success = true;
+    var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
+    var template = cmpTemplateManager.GetCurrentTemplateName(this.entity);
+    if (template.indexOf("wall_tower") != -1)
+    {
+        // this is a wall tower, is it ejecting to a wall?
+        var cmpRallyPoint = Engine.QueryInterface(this.entity, IID_RallyPoint); 
+        var commands = GetRallyPointCommands(cmpRallyPoint, entities);
+        warn(cmpRallyPoint.GetPositions()[0].x+", "+cmpRallyPoint.GetPositions()[0].z);
+    
+        // TODO only works when wall is repairable 
+        // instead use the position query, and query for objectso n this position   
+        if (commands.length > 0 && commands[0].target)
+        {
+            warn(commands[0].target.toString());
+            var buildingWalker = Engine.QueryInterface(commands[0].target, IID_BuildingWalker);         if (buildingWalker)
+                return this.EjectToWall(entities, forced, commands[0].target);
+        }
+        
+    }
+    
     for each (var entity in entities)
     {
         if (this.Eject(entity, forced))

binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_long">
+  <BuildingWalker>
+    <WalkingHeight>8.5</WalkingHeight>
+  </BuildingWalker>
   <Footprint>
-    <Square width="37" depth="9"/>
+    <Square width="37" depth="11"/>
     <Height>9.0</Height>
   </Footprint>
   <Identity>
@@ -11 +14 @@
     <History>High and strongly built defensive stone walls were a common structure of the Iberian Peninsula during the period, and for long thereafter.</History>
   </Identity>
   <Obstruction>
-    <Static width="36.0" depth="8"/>
+    <Obstructions>
+        <Front width="36.0" depth="4.0" x="0.0" z="4.5"/>
+        <Back width="36.0" depth="4.0" x="0.0" z="-4.5"/>
+        <Left width="1.0" depth="10.0" x="-17.5" z="0.0"/>
+        <Right width="1.0" depth="10.0" x="17.5" z="0.0"/>
+    </Obstructions>
   </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/wall_long.xml</Actor>

binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml

@@ -31 +31 @@
     <stone>15</stone>
     <metal>0</metal>
   </Loot>
-  <Obstruction>
-    <Static width="6.0" depth="6.0"/>
-  </Obstruction>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>