@@ -2023,6 +2023,26 @@ void BattlescapeGenerator::generateMap(const std::vector<MapScript*> *script)
 					}
 					init();
 					break;
+				case MSC_SETUFO:
+					if (_game->getMod()->getUfo(command->getUFOName()))
+					{
+						ufoMap = _game->getMod()->getUfo(command->getUFOName())->getBattlescapeTerrainData()->getRandomMapBlock(999, 999, 0, false);
+						if (addCraft(ufoMap, command, _ufoPos))
+						{
+							for (x = _ufoPos.x; x < _ufoPos.x + _ufoPos.w; ++x)
+							{
+								for (y = _ufoPos.y; y < _ufoPos.y + _ufoPos.h; ++y)
+								{
+									if (_blocks[x][y])
+									{
+										loadMAP(_blocks[x][y], x * 10, y * 10, _terrain, 0);
+									}
+								}
+							}
+							success = true;
+						}
+					}
+					break;
 				default:
 					break;
 				}
 
@@ -75,6 +75,8 @@ void MapScript::load(const YAML::Node& node)
 			_type = MSC_RESIZE;
 			_sizeX = _sizeY = 0; // defaults: don't resize anything unless specified.
 		}
+		else if (command == "setUFO")
+			_type = MSC_SETUFO;
 		else
 		{
 			throw Exception("Unknown command: " + command);
@@ -260,6 +262,7 @@ void MapScript::load(const YAML::Node& node)
 
 	_executionChances = node["executionChances"].as<int>(_executionChances);
 	_executions = node["executions"].as<int>(_executions);
+	_ufoName = node["UFOName"].as<std::string>(_ufoName);
 	// take no chances, don't accept negative values here.
 	_label = std::abs(node["label"].as<int>(_label));
 }
@@ -377,4 +380,13 @@ MapBlock *MapScript::getNextBlock(RuleTerrain *terrain)
 	return 0;
 }
 
+/**
+ * Gets the name of the UFO in the case of "setUFO"
+ * @return the UFO name.
+ */
+std::string MapScript::getUFOName()
+{
+	return _ufoName;
+}
+
 }
@@ -46,7 +46,7 @@ struct TunnelData
 		return &replacements[type];
 	}
  };
-enum MapScriptCommand {MSC_UNDEFINED = -1, MSC_ADDBLOCK, MSC_ADDLINE, MSC_ADDCRAFT, MSC_ADDUFO, MSC_DIGTUNNEL, MSC_FILLAREA, MSC_CHECKBLOCK, MSC_REMOVE, MSC_RESIZE};
+enum MapScriptCommand {MSC_UNDEFINED = -1, MSC_ADDBLOCK, MSC_ADDLINE, MSC_ADDCRAFT, MSC_ADDUFO, MSC_DIGTUNNEL, MSC_FILLAREA, MSC_CHECKBLOCK, MSC_REMOVE, MSC_RESIZE, MSC_SETUFO};
 
 class MapBlock;
 class RuleTerrain;
@@ -61,6 +61,7 @@ class MapScript
 	int _sizeX, _sizeY, _sizeZ, _executionChances, _executions, _cumulativeFrequency, _label;
 	MapDirection _direction;
 	TunnelData *_tunnelData;
+	std::string _ufoName;
 
 	/// Randomly generate a group from within the array.
 	int getGroupNumber();
@@ -101,6 +102,8 @@ class MapScript
 	TunnelData *getTunnelData() {return _tunnelData;};
 	/// Randomly generate a block from within either the array of groups or blocks.
 	MapBlock *getNextBlock(RuleTerrain *terrain);
+	/// Gets the UFO's name (for setUFO)
+	std::string getUFOName();
 };
 }
 #endif
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ void MapScript::load(const YAML::Node& node)`
`75`	`75`	`_type = MSC_RESIZE;`
`76`	`76`	`_sizeX = _sizeY = 0; // defaults: don't resize anything unless specified.`
`77`	`77`	`}`
	`78`	`+ else if (command == "setUFO")`
	`79`	`+ _type = MSC_SETUFO;`
`78`	`80`	`else`
`79`	`81`	`{`
`80`	`82`	`throw Exception("Unknown command: " + command);`
`@@ -260,6 +262,7 @@ void MapScript::load(const YAML::Node& node)`
`260`	`262`
`261`	`263`	`_executionChances = node["executionChances"].as<int>(_executionChances);`
`262`	`264`	`_executions = node["executions"].as<int>(_executions);`
	`265`	`+ _ufoName = node["UFOName"].as<std::string>(_ufoName);`
`263`	`266`	`// take no chances, don't accept negative values here.`
`264`	`267`	`_label = std::abs(node["label"].as<int>(_label));`
`265`	`268`	`}`
`@@ -377,4 +380,13 @@ MapBlock MapScript::getNextBlock(RuleTerrain terrain)`
`377`	`380`	`return 0;`
`378`	`381`	`}`
`379`	`382`
	`383`	`+/**`
	`384`	`+ * Gets the name of the UFO in the case of "setUFO"`
	`385`	`+ * @return the UFO name.`
	`386`	`+ */`
	`387`	`+std::string MapScript::getUFOName()`
	`388`	`+{`
	`389`	`+ return _ufoName;`
	`390`	`+}`
	`391`	`+`
`380`	`392`	`}`