Changeset 9909 for ps

Timestamp:

07/24/11 22:04:04 (13 years ago)

Author:

ben

Message:

Fixes rmgen to use GetCivData and handle invalid/unfinished civs.

Location:

ps/trunk/binaries/data/mods/public/maps/random

Files:

• new_rms_test.js (modified) (3 diffs)
• rmgen/library.js (modified) (1 diff)
• rmgen/mapgen.js (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/maps/random/new_rms_test.js

@@ -24 +24 @@
 
 var playerX = new Array(numPlayers);
-var playerY = new Array(numPlayers);
+var playerZ = new Array(numPlayers);
 var playerAngle = new Array(numPlayers);
 
@@ -32 +32 @@
     playerAngle[i] = startAngle + i*2*PI/numPlayers;
     playerX[i] = 0.5 + 0.39*cos(playerAngle[i]);
-    playerY[i] = 0.5 + 0.39*sin(playerAngle[i]);
+    playerZ[i] = 0.5 + 0.39*sin(playerAngle[i]);
 }
 
@@ -39 +39 @@
     log("Creating base for player " + (i + 1) + "...");
     
-    // get the x and y in tiles
+    // get the x and z in tiles
     var fx = fractionToTiles(playerX[i]);
-    var fy = fractionToTiles(playerY[i]);
+    var fz = fractionToTiles(playerZ[i]);
     var ix = round(fx);
-    var iy = round(fy);
+    var iz = round(fz);
 
-    // create the TC and citizens
-    var civ = getCivCode(i);
-    var group = new SimpleGroup(
-        [                           // elements (type, count, distance)
-            new SimpleObject("structures/"+civ+"_civil_centre", 1,1, 0,0),
-            new SimpleObject("units/"+civ+"_support_female_citizen", 3,3, 5,5)
-        ],
-        true, null, ix, iy
+    // get civ specific starting entities
+    var civEntities = getStartingEntities(i);
+    
+    // create the TC
+    var group = new SimpleGroup(    // elements (type, min/max count, min/max distance)
+        [new SimpleObject(civEntities[0].Template, 1,1, 0,0)],
+        true, null, ix, iz
     );
     createObjectGroup(group, i+1);
+    
+    // create starting units
+    var uDist = 8;
+    var uAngle = playerAngle[i] + PI + randFloat(-PI/8, PI/8);
+    for (var j = 1; j < civEntities.length; ++j)
+    {
+        var count = (civEntities[j].Count !== undefined ? civEntities[j].Count : 1);
+        var ux = round(fx + uDist * cos(uAngle));
+        var uz = round(fz + uDist * sin(uAngle));
+        group = new SimpleGroup(    // elements (type, min/max count, min/max distance)
+            [new SimpleObject(civEntities[j].Template, count,count, 1,ceil(count/2))],
+            true, null, ux, uz
+        );
+        createObjectGroup(group, i+1);
+        uAngle += PI/4;
+    }
 }
 

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

@@ -390 +390 @@
 function getStartingEntities(player)
 {   
-    // This is a temporary hack until map generator has a LoadCivData method
-    var civStartingEntities = {
-        "celt" : [
-            {
-                "Template": "structures/celt_civil_centre" 
-            },
-            {
-                "Template": "units/celt_support_female_citizen",
-                "Count": 4
-            },
-            {
-                "Template": "units/celt_infantry_spearman_b",
-                "Count": 4 
-            },
-            {
-                "Template": "units/celt_cavalry_swordsman_b" 
-            }
-        ],
-        "hele" : [
-            {
-                "Template": "structures/hele_civil_centre"
-            },
-            {
-                "Template": "units/hele_support_female_citizen",
-                "Count": 4
-            },
-            {
-                "Template": "units/hele_infantry_spearman_b",
-                "Count": 4
-            },
-            {
-                "Template": "units/hele_cavalry_swordsman_b"
-            }
-        ],
-        "iber" : [
-            {
-                "Template": "structures/iber_civil_centre"
-            },
-            {
-                "Template": "units/iber_support_female_citizen",
-                "Count": 4
-            },
-            {
-                "Template": "units/iber_infantry_spearman_b",
-                "Count": 4
-            },
-            {
-                "Template": "units/iber_cavalry_spearman_b"
-            }
-        ]
-    };
-    
-    return civStartingEntities[getCivCode(player)];
+    var civ = getCivCode(player);
+    if (!g_CivData[civ] || (g_CivData[civ].SelectableInGameSetup !== undefined && !g_CivData[civ].SelectableInGameSetup) || !g_CivData[civ].StartEntities || !g_CivData[civ].StartEntities.length)
+    {
+        warn("Invalid or unimplemented civ '"+civ+"' specified, falling back to 'hele'");
+        civ = "hele";
+    }
+    
+    return g_CivData[civ].StartEntities;
 }
 

ps/trunk/binaries/data/mods/public/maps/random/rmgen/mapgen.js

@@ -29 +29 @@
 };
 
+var g_CivData = {};
+
 /////////////////////////////////////////////////////////////////////////////////////
 
@@ -37 +39 @@
         // Should never get this far, failed settings would abort prior to loading scripts
         throw("InitMapGen: settings missing");
+    }
+    
+    // Get civ data as array of JSON strings
+    var data = RMS.GetCivData();
+    if (!data || !data.length)
+    {
+        throw("InitMapGen: error reading civ data");
+    }
+    for (var i = 0; i < data.length; ++i)
+    {
+        var civData = JSON.parse(data[i]);
+        g_CivData[civData.Code] = civData;
     }