Changeset 9610 for ps

Timestamp:

06/10/11 01:52:29 (14 years ago)

Author:

ben

Message:

 

Location:

ps/trunk/binaries/data

Files:

• mods/public/gui/common/functions_utility.js (modified) (1 diff)
• mods/public/gui/gamesetup/gamesetup.js (modified) (6 diffs)
• mods/public/simulation/data/map_sizes.json (added)
• tools/atlas/lists.xml (modified) (2 diffs)
• tools/atlas/toolbar/player.png (added)

ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js

@@ -163 +163 @@
 // ====================================================================
 
+// Load map size data
+function initMapSizes()
+{
+    var filename = "simulation/data/map_sizes.json";
+    var sizes = {
+        names: [],
+        tiles: [],
+        default: 0
+    };
+    var rawData = readFile(filename);
+    if (!rawData)
+        error("Failed to read map sizes file: "+filename);
+    
+    try
+    {   // Catch nasty errors from JSON parsing
+        // TODO: Need more info from the parser on why it failed: line number, position, etc!
+        var data = JSON.parse(rawData);
+        if (!data || !data.Sizes)
+            error("Failed to parse map sizes in: "+filename+" (check for valid JSON data)");
+        
+        for (var i = 0; i < data.Sizes.length; ++i)
+        {
+            sizes.names.push(data.Sizes[i].LongName);
+            sizes.tiles.push(data.Sizes[i].Tiles);
+            
+            if (data.Sizes[i].Default)
+                sizes.default = i;
+        }
+    }
+    catch(err)
+    {
+        error(err.toString()+": parsing map sizes in "+filename);
+    }
+    
+    return sizes;
+}
+
+// ====================================================================
+
 // Convert integer color values to string (for use in GUI objects)
 function iColorToString(color)

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Constants
-// TODO: Move these into common location (other scripts may need)
-const MAP_SIZES_TEXT = ["Tiny (2 player)", "Small (3 player)", "Medium (4 player)", "Normal (6 player)", "Large (8 player)", "Very Large", "Giant"];
-const MAP_SIZES_DATA = [128, 192, 256, 320, 384, 448, 512];
-const MAP_SIZES_DEFAULTIDX = 2;
-
+// TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
 const VICTORY_TEXT = ["Conquest", "None"];
 const VICTORY_DATA = ["conquest", "endless"];
@@ -33 +29 @@
 };
 
+var g_MapSizes = {};
+
 var g_AIs = [];
 
@@ -85 +83 @@
     g_DefaultPlayerData = initPlayerDefaults();
     g_DefaultPlayerData.shift();
+    
+    g_MapSizes = initMapSizes();
 
     // Init civs
@@ -139 +139 @@
         
         var mapSize = getGUIObjectByName("mapSize");
-        mapSize.list = MAP_SIZES_TEXT;
-        mapSize.list_data = MAP_SIZES_DATA;
+        mapSize.list = g_MapSizes.names;
+        mapSize.list_data = g_MapSizes.tiles;
         mapSize.onSelectionChange = function()
         {   // Update attributes so other players can see change
             if (this.selected != -1)
             {
-                g_GameAttributes.settings.Size = MAP_SIZES_DATA[this.selected];
+                g_GameAttributes.settings.Size = g_MapSizes.tiles[this.selected];
             }
             
@@ -769 +769 @@
     var numPlayersBox = getGUIObjectByName("numPlayersBox");
 
-    var sizeIdx = (MAP_SIZES_DATA.indexOf(mapSettings.Size) != -1 ? MAP_SIZES_DATA.indexOf(mapSettings.Size) : MAP_SIZES_DEFAULTIDX);
+    var sizeIdx = (g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes.default);
     var victoryIdx = (VICTORY_DATA.indexOf(mapSettings.GameType) != -1 ? VICTORY_DATA.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);
     
@@ -797 +797 @@
         else
         {   // Client
-            mapSizeText.caption = "Map size: " + MAP_SIZES_TEXT[sizeIdx];
+            mapSizeText.caption = "Map size: " + g_MapSizes.names[sizeIdx];
             revealMapText.caption = "Reveal map: " + (mapSettings.RevealMap ? "Yes" : "No");
             victoryConditionText.caption = "Victory condition: " + VICTORY_TEXT[victoryIdx];

ps/trunk/binaries/data/tools/atlas/lists.xml

@@ -26 +26 @@
 
   <animations>
-
-    <item>attack1     </item>
-    <item>attack2     </item>
-    <item>build       </item>
-    <item>corpse      </item>
-    <item>death       </item>
-    <item>gather_fruit</item>
-    <item>gather_grain</item>
-    <item>gather_wood </item>
-    <item>gather_stone</item>
-    <item>gather_metal</item>
-    <item>gather_ruins</item>
+    <item>idle          </item>
+    <item>walk          </item>
+    <item>run           </item>
+    <item>melee         </item>
+    <item>death         </item>
+    <item>build         </item>
+    <item>gather_fruit  </item>
+    <item>gather_grain  </item>
+    <item>gather_meat   </item>
+    <item>gather_tree   </item>
+    <item>gather_rock   </item>
+    <item>gather_ore    </item>
+    <item>gather_ruins  </item>
     <item>gather_treasure</item>
-    <item>idle        </item>
-    <item>melee       </item>
-    <item>run         </item>
-    <item>walk        </item>
   </animations>
 
@@ -57 +54 @@
   </playercolours>
   
-  <mapsizes>
-    <size name="Tiny" tiles="128"/>
-    <size name="Small" tiles="192"/>
-    <size name="Medium" tiles="256"/>
-    <size name="Normal" tiles="320"/>
-    <size name="Large" tiles="384"/>
-    <size name="Very Large" tiles="448"/>
-    <size name="Giant" tiles="512"/>
-  </mapsizes>
-
 </lists>