Index: ps/trunk/binaries/data/mods/public/maps/scripts/Conquest.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/Conquest.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/Conquest.js @@ -1,9 +1,11 @@ -var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); -cmpTrigger.conquestClassFilter = "ConquestCritical"; +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.conquestClassFilter = "ConquestCritical"; -var data = {"enabled": true}; -cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); -cmpTrigger.RegisterTrigger("OnStructureBuilt", "ConquestAddStructure", data); -cmpTrigger.RegisterTrigger("OnTrainingFinished", "ConquestTrainingFinished", data); + let data = { "enabled": true }; + cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); + cmpTrigger.RegisterTrigger("OnStructureBuilt", "ConquestAddStructure", data); + cmpTrigger.RegisterTrigger("OnTrainingFinished", "ConquestTrainingFinished", data); -cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); + cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); +} Index: ps/trunk/binaries/data/mods/public/maps/scripts/ConquestCommon.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/ConquestCommon.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/ConquestCommon.js @@ -95,8 +95,9 @@ this.conquestDataInit = true; }; -var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); - -cmpTrigger.conquestEntitiesByPlayer = {}; -cmpTrigger.conquestDataInit = false; -cmpTrigger.conquestClassFilter = ""; +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.conquestEntitiesByPlayer = {}; + cmpTrigger.conquestDataInit = false; + cmpTrigger.conquestClassFilter = ""; +} Index: ps/trunk/binaries/data/mods/public/maps/scripts/ConquestStructures.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/ConquestStructures.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/ConquestStructures.js @@ -1,8 +1,10 @@ -var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); -cmpTrigger.conquestClassFilter = "Structure"; +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.conquestClassFilter = "Structure"; -var data = {"enabled": true}; -cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); -cmpTrigger.RegisterTrigger("OnStructureBuilt", "ConquestAddStructure", data); + let data = { "enabled": true }; + cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); + cmpTrigger.RegisterTrigger("OnStructureBuilt", "ConquestAddStructure", data); -cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); + cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); +} Index: ps/trunk/binaries/data/mods/public/maps/scripts/ConquestUnits.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/ConquestUnits.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/ConquestUnits.js @@ -1,8 +1,10 @@ -var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); -cmpTrigger.conquestClassFilter = "Unit"; +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.conquestClassFilter = "Unit"; -var data = {"enabled": true}; -cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); -cmpTrigger.RegisterTrigger("OnTrainingFinished", "ConquestTrainingFinished", data); + let data = { "enabled": true }; + cmpTrigger.RegisterTrigger("OnOwnershipChanged", "ConquestHandlerOwnerShipChanged", data); + cmpTrigger.RegisterTrigger("OnTrainingFinished", "ConquestTrainingFinished", data); -cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); + cmpTrigger.DoAfterDelay(0, "ConquestStartGameCount", null); +} Index: ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/Regicide.js @@ -106,7 +106,9 @@ return undefined; }; -let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); -cmpTrigger.regicideHeroes = []; -cmpTrigger.DoAfterDelay(0, "InitRegicideGame", {}); -cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckRegicideDefeat", { "enabled": true }); +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.regicideHeroes = []; + cmpTrigger.DoAfterDelay(0, "InitRegicideGame", {}); + cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckRegicideDefeat", { "enabled": true }); +} Index: ps/trunk/binaries/data/mods/public/maps/scripts/WonderVictory.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scripts/WonderVictory.js +++ ps/trunk/binaries/data/mods/public/maps/scripts/WonderVictory.js @@ -76,8 +76,10 @@ } }; -var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); -cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckWonderVictory", { "enabled": true }); -cmpTrigger.RegisterTrigger("OnPlayerWon", "DeleteWonderVictoryMessages", { "enabled": true }); -cmpTrigger.wonderVictoryTimers = {}; -cmpTrigger.wonderVictoryMessages = {}; +{ + let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); + cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckWonderVictory", { "enabled": true }); + cmpTrigger.RegisterTrigger("OnPlayerWon", "DeleteWonderVictoryMessages", { "enabled": true }); + cmpTrigger.wonderVictoryTimers = {}; + cmpTrigger.wonderVictoryMessages = {}; +}