Index: ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
+++ ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
@@ -1,4 +1,34 @@
 /**
+ * Loads history and gameplay data of all civs.
+ * Can be used from GUI and rmgen (because the simulation functions differ currently).
+ *
+ * @param selectableOnly {boolean} - Only load civs that can be selected
+ *        in the gamesetup. Scenario maps might set non-selectable civs.
+ */
+function loadCivFiles(selectableOnly)
+{
+	let propertyNames = [
+		"Code", "Culture", "Name", "Emblem", "History", "Music", "Factions", "CivBonuses", "TeamBonuses",
+		"Structures", "StartEntities", "Formations", "AINames", "SkirmishReplacements", "SelectableInGameSetup"];
+
+	let civData = {};
+
+	for (let filename of Engine.BuildDirEntList("simulation/data/civs/", "*.json", false))
+	{
+		let data = Engine.ReadJSONFile(filename);
+
+		for (let prop of propertyNames)
+			if (data[prop] === undefined)
+				throw new Error(filename + " doesn't contain " + prop);
+
+		if (!selectableOnly || data.SelectableInGameSetup)
+			civData[data.Code] = data;
+	}
+
+	return civData;
+}
+
+/**
  * Gets an array of all classes for this identity template
  */
 function GetIdentityClasses(template)
Index: ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
+++ ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
@@ -2,7 +2,6 @@
 
 <objects>
 
-	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/civinfo/civinfo.js"/>
Index: ps/trunk/binaries/data/mods/public/gui/common/functions_civinfo.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/functions_civinfo.js
+++ ps/trunk/binaries/data/mods/public/gui/common/functions_civinfo.js
@@ -1,34 +0,0 @@
-/**
- * Loads history and some gameplay data for civs.
- *
- *  @param selectableOnly {boolean} - Only load those which can be selected
- *         in the gamesetup. Scenario maps might set non-selectable civs.
- *  @param gaia {boolean} - Whether to include gaia as a mock civ.
- */
-function loadCivData(selectableOnly, gaia)
-{
-	let civData = {};
-	let civFiles = Engine.BuildDirEntList("simulation/data/civs/", "*.json", false);
-
-	for (let filename of civFiles)
-	{
-		let data = Engine.ReadJSONFile(filename);
-		if (!data)
-			continue;
-
-		translateObjectKeys(data, ["Name", "Description", "History", "Special"]);
-		if (!selectableOnly || data.SelectableInGameSetup)
-			civData[data.Code] = data;
-
-		// Sanity check
-		for (let prop of ["Code", "Culture", "Name", "Emblem", "History", "Music", "Factions", "CivBonuses",
-		                  "TeamBonuses", "Structures", "StartEntities", "Formations", "AINames", "SelectableInGameSetup"])
-			if (data[prop] == undefined)
-				error(filename + " doesn't contain " + prop);
-	}
-
-	if (gaia)
-		civData.gaia = { "Code": "gaia", "Name": translate("Gaia") };
-
-	return deepfreeze(civData);
-}
Index: ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js
+++ ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js
@@ -37,6 +37,21 @@
 		filename => filename.substring(pathname.length, filename.length - 5));
 }
 
+/**
+ * Returns translated history and gameplay data of all civs, optionally including a mock gaia civ.
+ */
+function loadCivData(selectableOnly, gaia)
+{
+	let civData = loadCivFiles(selectableOnly);
+
+	translateObjectKeys(civData, ["Name", "Description", "History", "Special"]);
+
+	if (gaia)
+		civData.gaia = { "Code": "gaia", "Name": translate("Gaia") };
+
+	return deepfreeze(civData);
+}
+
 // A sorting function for arrays of objects with 'name' properties, ignoring case
 function sortNameIgnoreCase(x, y)
 {
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -3,7 +3,6 @@
 <objects>
 
 	<script file="gui/common/color.js"/>
-	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/common/gamedescription.js"/>
Index: ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
+++ ps/trunk/binaries/data/mods/public/gui/reference/structree/structree.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <objects>
-	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/common/tooltips.js"/>
Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -4,7 +4,6 @@
 
 	<!-- Used to display game info. -->
 	<script file="gui/common/color.js" />
-	<script file="gui/common/functions_civinfo.js" />
 	<script file="gui/common/functions_utility.js" />
 	<script file="gui/common/gamedescription.js"/>
 	<script file="gui/common/settings.js" />
Index: ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
+++ ps/trunk/binaries/data/mods/public/gui/savedgames/load.xml
@@ -3,7 +3,6 @@
 <objects>
 
 	<script file="gui/common/color.js" />
-	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_global_object.js" />
 	<script file="gui/common/functions_utility.js" />
 	<script file="gui/common/functions_utility_loadsave.js" />
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml
@@ -4,7 +4,6 @@
 
 <script file="gui/common/color.js"/>
 <script file="gui/common/colorFades.js"/>
-<script file="gui/common/functions_civinfo.js"/>
 <script file="gui/common/functions_global_object.js"/>
 <script file="gui/common/functions_utility.js"/>
 <script file="gui/common/gamedescription.js"/>
Index: ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
+++ ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
@@ -2,7 +2,6 @@
 
 <objects>
 	<script file="gui/common/functions_global_object.js"/>
-	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/common/gamedescription.js"/>
 	<script file="gui/common/settings.js"/>
Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen/library.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/rmgen/library.js
+++ ps/trunk/binaries/data/mods/public/maps/random/rmgen/library.js
@@ -21,6 +21,8 @@
 // Default angle for buildings
 const BUILDING_ORIENTATION = - PI / 4;
 
+const g_CivData = deepfreeze(loadCivFiles(false));
+
 function fractionToTiles(f)
 {
 	return g_Map.size * f;
Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen/mapgen.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/rmgen/mapgen.js
+++ ps/trunk/binaries/data/mods/public/maps/random/rmgen/mapgen.js
@@ -12,21 +12,8 @@
 	"Declination": 0.523599
 };
 
-var g_CivData = {};
-
 function InitMap()
 {
-	// Get civ data as array of JSON strings
-	var data = Engine.GetCivData();
-	if (!data || !data.length)
-		throw new Error("InitMapGen: error reading civ data");
-
-	for (var i = 0; i < data.length; ++i)
-	{
-		var civData = JSON.parse(data[i]);
-		g_CivData[civData.Code] = civData;
-	}
-
 	log("Creating new map...");
 	g_Map = new Map(g_MapSettings.Size, g_MapSettings.BaseHeight);
 	initTerrain(g_MapSettings.BaseTerrain);
Index: ps/trunk/source/graphics/MapGenerator.h
===================================================================
--- ps/trunk/source/graphics/MapGenerator.h
+++ ps/trunk/source/graphics/MapGenerator.h
@@ -125,9 +125,6 @@
 	static void ExportMap(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data);
 	static void SetProgress(ScriptInterface::CxPrivate* pCxPrivate, int progress);
 	static void MaybeGC(ScriptInterface::CxPrivate* pCxPrivate);
-	static bool FileExists(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& filePath);
-	static JS::Value ReadJSONFile(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& filePath);
-	static std::vector<std::string> GetCivData(ScriptInterface::CxPrivate* pCxPrivate);
 	static CParamNode GetTemplate(ScriptInterface::CxPrivate* pCxPrivate, const std::string& templateName);
 	static bool TemplateExists(ScriptInterface::CxPrivate* pCxPrivate, const std::string& templateName);
 	static std::vector<std::string> FindTemplates(ScriptInterface::CxPrivate* pCxPrivate, const std::string& path, bool includeSubdirectories);
Index: ps/trunk/source/graphics/MapGenerator.cpp
===================================================================
--- ps/trunk/source/graphics/MapGenerator.cpp
+++ ps/trunk/source/graphics/MapGenerator.cpp
@@ -105,7 +105,6 @@
 	m_ScriptInterface->RegisterFunction<void, JS::HandleValue, CMapGeneratorWorker::ExportMap>("ExportMap");
 	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");
 	m_ScriptInterface->RegisterFunction<CParamNode, std::string, CMapGeneratorWorker::GetTemplate>("GetTemplate");
 	m_ScriptInterface->RegisterFunction<bool, std::string, CMapGeneratorWorker::TemplateExists>("TemplateExists");
 	m_ScriptInterface->RegisterFunction<std::vector<std::string>, std::string, bool, CMapGeneratorWorker::FindTemplates>("FindTemplates");
@@ -197,39 +196,6 @@
 	self->m_ScriptInterface->MaybeGC();
 }
 
-std::vector<std::string> CMapGeneratorWorker::GetCivData(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
-{
-	VfsPath path(L"simulation/data/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 (const VfsPath& p : pathnames)
-		{
-			// Load JSON file
-			CVFSFile file;
-			PSRETURN ret = file.Load(g_VFS, p);
-			if (ret != PSRETURN_OK)
-				LOGERROR("CMapGeneratorWorker::GetCivData: Failed to load file '%s': %s", p.string8(), GetErrorString(ret));
-			else
-				data.push_back(file.DecodeUTF8()); // assume it's UTF-8
-		}
-	}
-	else
-	{
-		// Some error reading directory
-		wchar_t error[200];
-		LOGERROR("CMapGeneratorWorker::GetCivData: Error reading directory '%s': %s", path.string8(), utf8_from_wstring(StatusDescription(ret, error, ARRAY_SIZE(error))));
-	}
-
-	return data;
-
-}
-
 CParamNode CMapGeneratorWorker::GetTemplate(ScriptInterface::CxPrivate* pCxPrivate, const std::string& templateName)
 {
 	CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);