Index: ps/trunk/binaries/data/mods/public/maps/random/tests/test_Constraint.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/tests/test_Constraint.js (revision 27966) +++ ps/trunk/binaries/data/mods/public/maps/random/tests/test_Constraint.js (revision 27967) @@ -1,31 +1,31 @@ Engine.GetTemplate = (path) => { return { "Identity": { "GenericName": null, "Icon": null, "History": null } }; }; Engine.LoadLibrary("rmgen"); var g_MapSettings = { "Size": 512 }; -var g_Map = new RandomMap(0, 0, "blackness"); +var g_Map = new RandomMap(0, "blackness"); { let tileClass = new TileClass(g_Map.getSize()); let addedPos = new Vector2D(5, 0); tileClass.add(addedPos); let origin = new Vector2D(0, 0); TS_ASSERT(!(new AvoidTileClassConstraint(tileClass, 0).allows(addedPos))); TS_ASSERT(new AvoidTileClassConstraint(tileClass, 0).allows(origin)); TS_ASSERT(!(new AvoidTileClassConstraint(tileClass, 5).allows(origin))); TS_ASSERT(new NearTileClassConstraint(tileClass, 5).allows(origin)); TS_ASSERT(new NearTileClassConstraint(tileClass, 20).allows(origin)); TS_ASSERT(!(new NearTileClassConstraint(tileClass, 4).allows(origin))); } Index: ps/trunk/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js (revision 27966) +++ ps/trunk/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js (revision 27967) @@ -1,73 +1,73 @@ Engine.GetTemplate = (path) => { return { "Identity": { "GenericName": null, "Icon": null, "History": null } }; }; Engine.LoadLibrary("rmgen"); { var g_MapSettings = { "Size": 512 }; - var g_Map = new RandomMap(0, 0, "blackness"); + var g_Map = new RandomMap(0, "blackness"); let center = new Vector2D(10, 10); let area = createArea(new DiskPlacer(3, center)); // Contains center TS_ASSERT(area.contains(center)); // Contains disk boundaries TS_ASSERT(area.contains(new Vector2D(10, 13))); TS_ASSERT(area.contains(new Vector2D(10, 7))); TS_ASSERT(area.contains(new Vector2D(7, 10))); TS_ASSERT(area.contains(new Vector2D(13, 10))); // Does not contain rectangle vertices TS_ASSERT(!area.contains(new Vector2D(13, 13))); TS_ASSERT(!area.contains(new Vector2D(7, 7))); TS_ASSERT(!area.contains(new Vector2D(13, 7))); TS_ASSERT(!area.contains(new Vector2D(7, 13))); // Does not contain points outside disk range TS_ASSERT(!area.contains(new Vector2D(10, 14))); TS_ASSERT(!area.contains(new Vector2D(10, 6))); TS_ASSERT(!area.contains(new Vector2D(6, 10))); TS_ASSERT(!area.contains(new Vector2D(14, 10))); area = createArea(new DiskPlacer(3, new Vector2D(0, 0))); // Does not allow points out of map boundaries TS_ASSERT(!area.contains(new Vector2D(-1, -1))); // Contains map edge TS_ASSERT(area.contains(new Vector2D(0, 0))); } { // Contains points outside map disk range on CircularMap var g_MapSettings = { "Size": 512, "CircularMap": true }; - var g_Map = new RandomMap(0, 0, "blackness"); + var g_Map = new RandomMap(0, "blackness"); var area = createArea(new DiskPlacer(10, new Vector2D(436, 436))); TS_ASSERT(area.contains(new Vector2D(438, 438))); TS_ASSERT(area.contains(new Vector2D(437, 436))); TS_ASSERT(area.contains(new Vector2D(436, 437))); TS_ASSERT(area.contains(new Vector2D(435, 435))); area = createArea(new DiskPlacer(3, new Vector2D(0, 0))); // Does not allow points out of map boundaries TS_ASSERT(!area.contains(new Vector2D(-1, -1))); } { var g_MapSettings = { "Size": 320, "CircularMap": true }; - var g_Map = new RandomMap(0, 0, "blackness"); + var g_Map = new RandomMap(0, "blackness"); // Does not error with floating point radius var area = createArea(new DiskPlacer(86.4, new Vector2D(160, 160))); // Does not error with extreme out of bounds disk area = createArea(new DiskPlacer(86.4, new Vector2D(800, 800))); // Does not error when disk on edge area = createArea(new DiskPlacer(10, new Vector2D(321, 321))); } Index: ps/trunk/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js (revision 27966) +++ ps/trunk/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js (revision 27967) @@ -1,32 +1,32 @@ Engine.GetTemplate = (path) => { return { "Identity": { "GenericName": null, "Icon": null, "History": null } }; }; Engine.LoadLibrary("rmgen"); var g_MapSettings = { "Size": 512 }; -var g_Map = new RandomMap(0, 0, "blackness"); +var g_Map = new RandomMap(0, "blackness"); { let min = new Vector2D(4, 4); let max = new Vector2D(10, 10); let center = Vector2D.average([min, max]); createArea( new RectPlacer(min, max), new LayeredPainter(["red", "blue"], [2])); TS_ASSERT_EQUALS(g_Map.getTexture(min), "red"); TS_ASSERT_EQUALS(g_Map.getTexture(max), "red"); TS_ASSERT_EQUALS(g_Map.getTexture(new Vector2D(-1, -1).add(max)), "red"); TS_ASSERT_EQUALS(g_Map.getTexture(new Vector2D(-2, -2).add(max)), "blue"); TS_ASSERT_EQUALS(g_Map.getTexture(new Vector2D(-3, -3).add(max)), "blue"); TS_ASSERT_EQUALS(g_Map.getTexture(center), "blue"); } Index: ps/trunk/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js (revision 27966) +++ ps/trunk/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js (revision 27967) @@ -1,27 +1,27 @@ Engine.GetTemplate = (path) => { return { "Identity": { "GenericName": null, "Icon": null, "History": null } }; }; Engine.LoadLibrary("rmgen"); var g_MapSettings = { "Size": 512 }; -var g_Map = new RandomMap(0, 0, "blackness"); +var g_Map = new RandomMap(0, "blackness"); { let min = new Vector2D(5, 5); let max = new Vector2D(7, 7); let area = createArea(new RectPlacer(min, max)); TS_ASSERT(!area.contains(new Vector2D(-1, -1).add(min))); TS_ASSERT(area.contains(min)); TS_ASSERT(area.contains(max)); TS_ASSERT(area.contains(max.clone())); TS_ASSERT(area.contains(Vector2D.average([min, max]))); } Index: ps/trunk/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js (revision 27966) +++ ps/trunk/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js (revision 27967) @@ -1,40 +1,40 @@ Engine.GetTemplate = (path) => { return { "Identity": { "GenericName": null, "Icon": null, "History": null } }; }; Engine.LoadLibrary("rmgen"); var g_MapSettings = { "Size": 512 }; var g_Map; { let min = new Vector2D(5, 5); let center = new Vector2D(6, 6); let max = new Vector2D(7, 7); let minHeight = 20; let maxHeight = 25; // Test SmoothingPainter { - g_Map = new RandomMap(0, 0, "blackness"); + g_Map = new RandomMap(0, "blackness"); let centerHeight = g_Map.getHeight(center); createArea( new RectPlacer(min, max), [ new RandomElevationPainter(minHeight, maxHeight), new SmoothingPainter(2, 1, 1) ]); TS_ASSERT_GREATER_EQUAL(g_Map.getHeight(center), centerHeight); TS_ASSERT_LESS_EQUAL(g_Map.getHeight(center), minHeight); } }