Ticket #2944: generic_wall_builder_rmgen.patch

binaries/data/mods/public/maps/random/rmgen/library.js

@@ -394 +394 @@
     return g_MapSettings.PlayerData.length;
 }
 
+// Takes nothing, Returns an array of strings representing all available civilizations
+function getCivList()
+{
+    var raw_civData = RMS.GetCivData();
+    var civList = [];
+    for (var i = 0; i < raw_civData.length; ++i)
+        civList.push(JSON.parse(raw_civData[i]).Code);
+    
+    return civList;
+}
+
 function getCivCode(player)
 {
     if (g_MapSettings.PlayerData[player].Civ)

binaries/data/mods/public/maps/random/rmgen/misc.js

@@ -157 +157 @@
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // placeCivDefaultEntities
 //
 //  Creates the default starting player entities depending on the players civ
 //  fx&fy: position of player base
 //  playerid: id of player
 //  angle: angle of main base building, optional, default is BUILDING_ANGlE
-//  kwargs: Takes some optional keyword arguments to tweek things
-//      'iberWall': may be false, 'walls' (default) or 'towers'. Determines the defensive structures Iberians get as civ bonus
+//  kwargs: Optional. Takes an associative array with keyword arguments to tweak things:
+//      Known keys: 'iberWall': may be false, 'walls' (default) or 'towers'. Determines the defensive structures Iberians get as civ bonus
 //
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function placeCivDefaultEntities(fx, fz, playerid, angle, kwargs)
 {
     // Unpack kwargs

binaries/data/mods/public/maps/random/rmgen/wall_builder.js

@@ -107 +107 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 var wallStyles = {};
 
-// Generic civ dependent wall style definition. "rome_siege" needs some tweek...
-var wallScaleByType = {"athen" : 1.5, "brit" : 1.5, "cart" : 1.8, "celt" : 1.5, "gaul" : 1.5, "hele" : 1.5, "iber" : 1.5, "mace" : 1.5, "maur": 1.5, "pers" : 1.5, "ptol" : 1.5, "rome" : 1.5, "sele" : 1.5, "spart" : 1.5, "rome_siege" : 1.5};
+// Generic civ dependent wall style definition. Some, e.g. "rome_siege" needs tweaking...
+var civList = getCivList();
+var wallScaleByType = {};
+for (var i = 0; i < civList.length; i++)
+{
+    if (civList[i] == "cart")
+        wallScaleByType[civList[i]] = 1.8;
+    else if (civList[i] == "theb") // Not a full civ
+        {}
+    else
+        wallScaleByType[civList[i]] = 1.5;
+}
+// Non-civ but civ specific wall styles
+wallScaleByType.rome_siege = 1.5;
 for (var style in wallScaleByType)
 {
     var civ = style;
@@ -626 +638 @@
 //  maxBendOff    Optional. How irregular the circle should be. 0 means regular circle, PI/2 means very irregular. Default is 0 (regular circle)
 //
 //  NOTE: Don't use wall elements with bending like corners!
-//  TODO: Perhaps add eccentricity and maxBendOff functionality (untill now an unused argument)
+//  TODO: Perhaps add eccentricity
+//  TODO: Check if maxBendOff parameter works in all cases
 //  TODO: Perhaps add functionality for spirals
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function placeCircularWall(centerX, centerY, radius, wallPart, style, playerId, orientation, maxAngle, endWithFirst, maxBendOff)
@@ -654 +667 @@
     
     // Check arguments
     if (maxBendOff > PI/2 || maxBendOff < 0)
-        warn("placeCircularWall maxBendOff sould satisfy 0 < maxBendOff < PI/2 (~1.5) but it is: " + maxBendOff);
+        warn("placeCircularWall maxBendOff should satisfy 0 < maxBendOff < PI/2 (~1.5) but it is: " + maxBendOff);
     for (var elementIndex = 0; elementIndex < wallPart.length; elementIndex++)
     {
         var bending = wallStyles[style][wallPart[elementIndex]].bending;

binaries/data/mods/public/maps/random/wall_demo.js

@@ -61 +61 @@
 var buildableMapSize = mapSize - 2 * distToMapBorder;
 var actualX = distToMapBorder;
 var actualY = distToMapBorder;
+
 // Wall styles are chosen by strings so the civ strings got by g_MapSettings.PlayerData[playerId - 1].Civ can be used
-// Other styles may be present as well but besides the civ styles only 'palisades' includes all wall element types (yet)
-const wallStyleList = ["athen", "brit", "cart", "celt", "gaul", "hele", "iber", "mace", "maur", "pers", "ptol", "rome", "sele", "spart", "rome_siege", "palisades"];
+var wallStyleList = getCivList();
+// Remove civ "theb" if present (not a full faction)
+if (wallStyleList.indexOf("theb") != -1)
+    wallStyleList.splice(wallStyleList.indexOf("theb"), 1);
+// Other styles may be available as well...
+wallStyleList.push("rome_siege");
+wallStyleList.push("palisades");
 
 
 ////////////////////////////////////////
@@ -75 +81 @@
     var startX = actualX + styleIndex * buildableMapSize/wallStyleList.length; // X coordinate of the first wall element
     var startY = actualY; // Y coordinate of the first wall element
     var style = wallStyleList[styleIndex]; // // The wall's style like 'cart', 'celt', 'hele', 'iber', 'pers', 'rome', 'romeSiege' or 'palisades'
-    var orientation = styleIndex * PI/64; // Orientation of the first wall element. 0 means 'outside' or 'front' is right (positive X, like object placement)
+    var orientation = PI/16 * sin(styleIndex * PI/4); // Orientation of the first wall element. 0 means 'outside' or 'front' is right (positive X, like object placement in Atlas)
     // That means the wall will be build towards top (positive Y) if no corners are used
     var playerId = 0; // Owner of the wall (like in placeObject). 0 is Gaia, 1 is Player 1 (default colour blue), ...
     placeWall(startX, startY, wall, style, playerId, orientation); // Actually placing the wall
@@ -155 +161 @@
 {
     for (var wallIndex = 0; wallIndex < numWallsPerStyle; wallIndex++)
     {
-        var startX = actualX + (styleIndex * numWallsPerStyle + wallIndex) * distToOtherWalls; // X coordinate the wall will start from
+        var startX = actualX + (styleIndex * numWallsPerStyle + wallIndex) * buildableMapSize/wallStyleList.length/numWallsPerStyle; // X coordinate the wall will start from
         var startY = actualY; // Y coordinate the wall will start from
         var endX = startX; // X coordinate the wall will end
         var endY = actualY + (wallIndex + 1) * maxWallLength/numWallsPerStyle; // Y coordinate the wall will end
@@ -167 +173 @@
         // placeObject(endX, endY, 'other/obelisk', 0, 0*PI); // Place visual marker to see where exsactly the wall ends
     }
 }
-actualX = distToMapBorder; // Reset actualX
-actualY += maxWallLength + distToOtherWalls; // Increase actualY for next wall placement method
 
 
 // Export map data

binaries/data/mods/public/maps/random/wall_demo.json

@@ -2 +2 @@
     "settings" : {
         "Name" : "Wall Demo",
         "Script" : "wall_demo.js",
-        "Description" : "A demonstration of wall placement methods/code in random maps. Very large map size is recommended.",
+        "Description" : "A demonstration of wall placement methods/code in random maps. Giant map size is recommended!",
         "BaseTerrain" : ["grass1"],
         "BaseHeight" : 0,
         "Keywords": ["demo"],