Index: ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
@@ -37,7 +37,7 @@
"" +
"" +
"" +
- "" +
+ "" +
"" +
"" +
"" +
@@ -99,7 +99,7 @@
"width": +this.template.UnitSeparationWidthMultiplier,
"depth": +this.template.UnitSeparationDepthMultiplier
};
- this.sloppyness = +this.template.Sloppyness;
+ this.sloppiness = +this.template.Sloppiness;
this.widthDepthRatio = +this.template.WidthDepthRatio;
this.minColumns = +(this.template.MinColumns || 0);
this.maxColumns = +(this.template.MaxColumns || 0);
@@ -762,8 +762,8 @@
x += side * centerGap / 2;
}
let column = Math.ceil(n / 2) + Math.ceil(c / 2) * side;
- let r1 = randFloat(-1, 1) * this.sloppyness;
- let r2 = randFloat(-1, 1) * this.sloppyness;
+ let r1 = randFloat(-1, 1) * this.sloppiness;
+ let r2 = randFloat(-1, 1) * this.sloppiness;
offsets.push(new Vector2D(x + r1, z + r2));
offsets[offsets.length - 1].row = r + 1;
Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
@@ -212,8 +212,21 @@
GetHitpoints: function() { return 0; },
});
- var controllerFormation = ConstructComponent(controller, "Formation", {"FormationName": "Line Closed", "FormationShape": "square", "ShiftRows": "false", "SortingClasses": "", "WidthDepthRatio": 1, "UnitSeparationWidthMultiplier": 1, "UnitSeparationDepthMultiplier": 1, "SpeedMultiplier": 1, "Sloppyness": 0});
- var controllerAI = ConstructComponent(controller, "UnitAI", { "FormationController": "true", "DefaultStance": "aggressive" });
+ let controllerFormation = ConstructComponent(controller, "Formation", {
+ "FormationName": "Line Closed",
+ "FormationShape": "square",
+ "ShiftRows": "false",
+ "SortingClasses": "",
+ "WidthDepthRatio": 1,
+ "UnitSeparationWidthMultiplier": 1,
+ "UnitSeparationDepthMultiplier": 1,
+ "SpeedMultiplier": 1,
+ "Sloppiness": 0
+ });
+ let controllerAI = ConstructComponent(controller, "UnitAI", {
+ "FormationController": "true",
+ "DefaultStance": "aggressive"
+ });
AddMock(controller, IID_Position, {
JumpTo: function(x, z) { this.x = x; this.z = z; },
@@ -366,8 +379,21 @@
GetHitpoints: function() { return 40; },
});
- var controllerFormation = ConstructComponent(controller, "Formation", {"FormationName": "Line Closed", "FormationShape": "square", "ShiftRows": "false", "SortingClasses": "", "WidthDepthRatio": 1, "UnitSeparationWidthMultiplier": 1, "UnitSeparationDepthMultiplier": 1, "SpeedMultiplier": 1, "Sloppyness": 0});
- var controllerAI = ConstructComponent(controller, "UnitAI", { "FormationController": "true", "DefaultStance": "aggressive" });
+ let controllerFormation = ConstructComponent(controller, "Formation", {
+ "FormationName": "Line Closed",
+ "FormationShape": "square",
+ "ShiftRows": "false",
+ "SortingClasses": "",
+ "WidthDepthRatio": 1,
+ "UnitSeparationWidthMultiplier": 1,
+ "UnitSeparationDepthMultiplier": 1,
+ "SpeedMultiplier": 1,
+ "Sloppiness": 0
+ });
+ let controllerAI = ConstructComponent(controller, "UnitAI", {
+ "FormationController": "true",
+ "DefaultStance": "aggressive"
+ });
AddMock(controller, IID_Position, {
"GetTurretParent": () => INVALID_ENTITY,
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
@@ -5,6 +5,6 @@
Close Order
3
4
- 0.25
+ 0.25
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
@@ -7,6 +7,6 @@
1.5
4
3
- 0.5
+ 0.5
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -22,7 +22,7 @@
6..6,1..-1: syntagma_04;
7...-1,1..-1: syntagma_back
- 0.15
+ 0.15
false
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
@@ -7,7 +7,7 @@
Wedge
triangle
true
- 0.25
+ 0.25
1.1
1.1
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -23,7 +23,7 @@
-->
2
- Requires at least 2 Soldiers or Siege engines.
+ Requires at least 2 Soldiers or Siege Engines.
1
square
Hero Champion Cavalry Melee Ranged
@@ -31,7 +31,7 @@
1
1
1
- 0
+ 0