Now Lua can be used in scripts tag in faction tag in XML

source/glest_game/game/script_manager.cpp

@@ -554,7 +554,16 @@ namespace
 					script->getCode() + "end\n",
 					script->getName());
 			}
-
+			//load code
+			for (int i = 0; i < world->getFactionCount(); ++i) {
+				FactionType const* type = world->getFaction(i)->getType();
+				for (int j = 0; j < type->getScriptCount(); j++) {
+					const Script* script = type->getScript(j);
+					luaScript.loadCode("function " + script->getName() + "()" +
+						script->getCode() + "end\n",
+						script->getName());
+				}
+			}
 
 			//!!!
 	  //      string data_path= getGameReadWritePath(GameConstants::path_data_CacheLookupKey);

source/glest_game/types/faction_type.cpp

@@ -462,6 +462,16 @@ namespace Glest {
 
 				}
 
+				if (factionNode->hasChild("scripts")) {
+					const XmlNode *scriptsNode = factionNode->getChild("scripts");
+
+					for (int i = 0; i < (int) scriptsNode->getChildCount(); ++i) {
+						const XmlNode *scriptNode = scriptsNode->getChild(i);
+
+						scripts.emplace_back(Script(getFunctionName(scriptNode), scriptNode->getText()));
+					}
+				}
+
 				//read ai behavior
 				if (factionNode->hasChild("ai-behavior") == true) {
 					const XmlNode *aiNode = factionNode->getChild("ai-behavior");
@@ -571,6 +581,15 @@ namespace Glest {
 					c_str(), __FUNCTION__, __LINE__);
 		}
 
+		string FactionType::getFunctionName(const XmlNode * scriptNode) {
+			string name = scriptNode->getName();
+
+			for (int i = 0; i < (int) scriptNode->getAttributeCount(); ++i) {
+				name += "_" + scriptNode->getAttribute(i)->getValue();
+			}
+			return name;
+		}
+
 		int FactionType::
 			getAIBehaviorStaticOverideValue(AIBehaviorStaticValueCategory type)
 			const {

source/glest_game/types/faction_type.h

@@ -24,6 +24,7 @@
 #   include <string>
 #   include "util.h"
 #   include "leak_dumper.h"
+#   include "scenario.h"
 
 using Shared::Sound::StrSound;
 
@@ -103,6 +104,7 @@ namespace Glest {
 			std::vector < const UpgradeType *>vctAIBehaviorUpgrades;
 			std::map < AIBehaviorStaticValueCategory,
 				int >mapAIBehaviorStaticOverrideValues;
+			std::vector<Script> scripts;
 
 			bool isLinked;
 
@@ -133,6 +135,7 @@ namespace Glest {
 			int getAIBehaviorStaticOverideValue(AIBehaviorStaticValueCategory type)
 				const;
 
+			string getFunctionName(const XmlNode * scriptNode);
 			//get
 			bool getIsLinked() const {
 				return isLinked;
@@ -147,6 +150,12 @@ namespace Glest {
 			const UnitType *getUnitType(int i) const {
 				return &unitTypes[i];
 			}
+			int getScriptCount() const {
+				return (int) scripts.size();
+			}
+			const Script *getScript(int i) const {
+				return &scripts[i];
+			}
 			const UpgradeType *getUpgradeType(int i) const {
 				return &upgradeTypes[i];
 			}

source/glest_game/world/world.cpp

@@ -477,6 +477,12 @@ namespace Glest {
 			techTree = new TechTree(pathList);
 			techtreeChecksum = techTree->loadTech(techName, factions,
 				checksum, loadedFileList, validationMode);
+			XmlTree xmlTree;
+			string currentPath = techTree->findPath(techName, pathList);
+			endPathWithSlash(currentPath);
+			string path = currentPath + lastDir(currentPath) + ".xml";
+			const XmlNode *techTreeNode = xmlTree.getRootNode();
+			if (scriptManager) scriptManager->init(this, this->getGame()->getGameCameraPtr(), techTreeNode);
 			return techtreeChecksum;
 		}