Changeset 9901 for ps

Timestamp:

07/24/11 05:28:18 (13 years ago)

Author:

ben

Message:

Adds GetCivData to map generator API (to replace the hardcoded starting entities in rmgen).
Adds some starting entities to unfinished civs.

Location:

ps/trunk

Files:

• binaries/data/mods/public/civs/cart.json (modified) (1 diff)
• binaries/data/mods/public/civs/pers.json (modified) (1 diff)
• binaries/data/mods/public/civs/rome.json (modified) (1 diff)
• source/graphics/MapGenerator.cpp (modified) (2 diffs)
• source/graphics/MapGenerator.h (modified) (1 diff)

ps/trunk/binaries/data/mods/public/civs/cart.json

@@ -81 +81 @@
     "StartEntities":
     [
+        {
+            "Template": "structures/cart_civil_centre" 
+        },
+        {
+            "Template": "units/cart_support_female_citizen",
+            "Count": 4
+        },
+        {
+            "Template": "units/cart_infantry_spearman_b",
+            "Count": 4 
+        },
+        {
+            "Template": "units/cart_cavalry_swordsman_b" 
+        }
     ],
     "SelectableInGameSetup": false

ps/trunk/binaries/data/mods/public/civs/pers.json

@@ -87 +87 @@
     "StartEntities":
     [
+        {
+            "Template": "structures/pers_civil_centre"
+        }
     ],
     "SelectableInGameSetup": false

ps/trunk/binaries/data/mods/public/civs/rome.json

@@ -92 +92 @@
     "StartEntities":
     [
+        {
+            "Template": "structures/rome_civil_centre"
+        }
     ],
     "SelectableInGameSetup": false

ps/trunk/source/graphics/MapGenerator.cpp

@@ -92 +92 @@
     m_ScriptInterface->RegisterFunction<void, int, CMapGeneratorWorker::SetProgress>("SetProgress");
     m_ScriptInterface->RegisterFunction<void, CMapGeneratorWorker::MaybeGC>("MaybeGC");
+    m_ScriptInterface->RegisterFunction<std::vector<std::string>, CMapGeneratorWorker::GetCivData>("GetCivData");
 
     // Parse settings
@@ -173 +174 @@
 }
 
+std::vector<std::string> CMapGeneratorWorker::GetCivData(void* UNUSED(cbdata))
+{
+    VfsPath path(L"civs/");
+    VfsPaths pathnames;
+
+    std::vector<std::string> data;
+
+    // Load all JSON files in civs directory
+    Status ret = vfs::GetPathnames(g_VFS, path, L"*.json", pathnames);
+    if (ret == INFO::OK)
+    {
+        for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
+        {
+            // Load JSON file
+            CVFSFile file;
+            PSRETURN ret = file.Load(g_VFS, *it);
+            if (ret != PSRETURN_OK)
+            {
+                LOGERROR(L"CMapGeneratorWorker::GetCivData: Failed to load file '%ls': %hs", path.string().c_str(), GetErrorString(ret));
+            }
+            else
+            {
+                data.push_back(std::string(file.GetBuffer(), file.GetBuffer() + file.GetBufferSize()));
+            }
+        }
+    }
+    else
+    {
+        // Some error reading directory
+        wchar_t error[200];
+        LOGERROR(L"CMapGeneratorWorker::GetCivData: Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+    }
+
+    return data;
+
+}
+
 bool CMapGeneratorWorker::LoadScripts(const std::wstring& libraryName)
 {

ps/trunk/source/graphics/MapGenerator.h

@@ -124 +124 @@
     static void SetProgress(void* cbdata, int progress);
     static void MaybeGC(void* cbdata);
+    static std::vector<std::string> GetCivData(void* cbdata);
 
     std::set<std::wstring> m_LoadedLibraries;