Index: binaries/data/mods/public/maps/scripts/Regicide.js
===================================================================
--- binaries/data/mods/public/maps/scripts/Regicide.js
+++ binaries/data/mods/public/maps/scripts/Regicide.js
@@ -1,127 +0,0 @@
-Trigger.prototype.CheckRegicideDefeat = function(data)
-{
-	if (data.entity == this.regicideHeroes[data.from])
-		TriggerHelper.DefeatPlayer(data.from);
-};
-
-Trigger.prototype.InitRegicideGame = function(msg)
-{
-	let cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
-	let regicideGarrison = cmpEndGameManager.GetGameTypeSettings().regicideGarrison;
-
-	let playersCivs = [];
-	for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID)
-		playersCivs[playerID] = QueryPlayerIDInterface(playerID).GetCiv();
-
-	// Get all hero templates of these civs
-	let heroTemplates = {};
-	let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-	for (let templateName of cmpTemplateManager.FindAllTemplates(false))
-	{
-		if (templateName.substring(0,6) != "units/")
-			continue;
-
-		let identity = cmpTemplateManager.GetTemplate(templateName).Identity;
-		let classes = GetIdentityClasses(identity);
-
-		if (classes.indexOf("Hero") == -1 ||
-		    playersCivs.every(civ => civ != identity.Civ))
-			continue;
-
-		if (!heroTemplates[identity.Civ])
-			heroTemplates[identity.Civ] = [];
-
-		if (heroTemplates[identity.Civ].indexOf(templateName) == -1)
-			heroTemplates[identity.Civ].push({
-				"templateName": regicideGarrison ? templateName : "ungarrisonable|" + templateName,
-				"classes": classes
-			});
-	}
-
-	// Sort available spawn points by preference
-	let spawnPreferences = ["CivilCentre", "Structure", "Ship"];
-	let getSpawnPreference = entity => {
-
-		let cmpIdentity = Engine.QueryInterface(entity, IID_Identity);
-		if (!cmpIdentity)
-			return -1;
-
-		let classes = cmpIdentity.GetClassesList();
-
-		for (let i in spawnPreferences)
-			if (classes.indexOf(spawnPreferences[i]) != -1)
-				return spawnPreferences.length - i;
-		return 0;
-	};
-
-	// Attempt to spawn one hero per player
-	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-	for (let playerID = 1; playerID < TriggerHelper.GetNumberOfPlayers(); ++playerID)
-	{
-		let spawnPoints = cmpRangeManager.GetEntitiesByPlayer(playerID).sort((entity1, entity2) =>
-			getSpawnPreference(entity2) - getSpawnPreference(entity1));
-
-		// Spawn the hero on land as close as possible
-		if (!regicideGarrison && TriggerHelper.EntityHasClass(spawnPoints[0], "Ship"))
-		{
-			let shipPosition = Engine.QueryInterface(spawnPoints[0], IID_Position).GetPosition2D();
-			let distanceToShip = entity =>
-				Engine.QueryInterface(entity, IID_Position).GetPosition2D().distanceTo(shipPosition);
-			spawnPoints = TriggerHelper.GetLandSpawnPoints().sort((entity1, entity2) =>
-				distanceToShip(entity1) - distanceToShip(entity2));
-		}
-
-		this.regicideHeroes[playerID] = this.SpawnRegicideHero(playerID, heroTemplates[playersCivs[playerID]], spawnPoints);
-	}
-};
-
-/**
- * Spawn a random hero at one of the given locations (which are checked in order).
- * Garrison it if the location is a ship.
- *
- * @param spawnPoints - entity IDs at which to spawn
- */
-Trigger.prototype.SpawnRegicideHero = function(playerID, heroTemplates, spawnPoints)
-{
-	for (let heroTemplate of shuffleArray(heroTemplates))
-		for (let spawnPoint of spawnPoints)
-		{
-			let cmpPosition = Engine.QueryInterface(spawnPoint, IID_Position);
-			if (!cmpPosition || !cmpPosition.IsInWorld())
-				continue;
-
-			// Consider nomad maps where units start on a ship
-			let isShip = TriggerHelper.EntityHasClass(spawnPoint, "Ship");
-			if (isShip)
-			{
-				let cmpGarrisonHolder = Engine.QueryInterface(spawnPoint, IID_GarrisonHolder);
-				if (cmpGarrisonHolder.IsFull() ||
-				    !MatchesClassList(heroTemplate.classes, cmpGarrisonHolder.GetAllowedClasses()))
-					continue;
-			}
-
-			let hero = TriggerHelper.SpawnUnits(spawnPoint, heroTemplate.templateName, 1, playerID);
-			if (!hero.length)
-				continue;
-
-			hero = hero[0];
-
-			if (isShip)
-			{
-				let cmpUnitAI = Engine.QueryInterface(hero, IID_UnitAI);
-				cmpUnitAI.Garrison(spawnPoint);
-			}
-
-			return hero;
-		}
-
-	error("Couldn't spawn hero for player " + playerID);
-	return undefined;
-};
-
-{
-	let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
-	cmpTrigger.regicideHeroes = [];
-	cmpTrigger.DoAfterDelay(0, "InitRegicideGame", {});
-	cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckRegicideDefeat", { "enabled": true });
-}
Index: binaries/data/mods/public/simulation/components/Trigger_Regicide.js
===================================================================
--- binaries/data/mods/public/simulation/components/Trigger_Regicide.js
+++ binaries/data/mods/public/simulation/components/Trigger_Regicide.js
@@ -1,10 +1,16 @@
-Trigger.prototype.CheckRegicideDefeat = function(data)
+Engine.RegisterInterface("Regicide");
+
+function Regicide() {}
+
+Regicide.prototype = Object.create(Trigger.prototype);
+
+Regicide.prototype.OnGlobalOwnershipChanged = function(data)
 {
 	if (data.entity == this.regicideHeroes[data.from])
 		TriggerHelper.DefeatPlayer(data.from);
 };
 
-Trigger.prototype.InitRegicideGame = function(msg)
+Regicide.prototype.InitRegicideGame = function(msg)
 {
 	let cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
 	let regicideGarrison = cmpEndGameManager.GetGameTypeSettings().regicideGarrison;
@@ -81,7 +87,7 @@
  *
  * @param spawnPoints - entity IDs at which to spawn
  */
-Trigger.prototype.SpawnRegicideHero = function(playerID, heroTemplates, spawnPoints)
+Regicide.prototype.SpawnRegicideHero = function(playerID, heroTemplates, spawnPoints)
 {
 	for (let heroTemplate of shuffleArray(heroTemplates))
 		for (let spawnPoint of spawnPoints)
@@ -119,9 +125,14 @@
 	return undefined;
 };
 
+Regicide.prototype.Init = function()
 {
-	let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
-	cmpTrigger.regicideHeroes = [];
-	cmpTrigger.DoAfterDelay(0, "InitRegicideGame", {});
-	cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckRegicideDefeat", { "enabled": true });
-}
+	Trigger.prototype.Init.call(this);
+	this.regicideHeroes = [];
+
+	// TriggerHelper is still in the maps/ directory, so loaded later, so calling this init later
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_Regicide, "InitRegicideGame", 100, {});
+};
+
+Engine.RegisterSystemComponentType(IID_Regicide, "Regicide", Regicide);
Index: binaries/data/mods/public/simulation/data/settings/victory_conditions/regicide.json
===================================================================
--- binaries/data/mods/public/simulation/data/settings/victory_conditions/regicide.json
+++ binaries/data/mods/public/simulation/data/settings/victory_conditions/regicide.json
@@ -8,8 +8,7 @@
 		[
 			"scripts/TriggerHelper.js",
 			"scripts/ConquestCommon.js",
-			"scripts/Conquest.js",
-			"scripts/Regicide.js"
+			"scripts/Conquest.js"
 		]
 	}
 }