diff --git a/binaries/data/mods/public/audio/interface/alarm/alarm_techcomplete.xml b/binaries/data/mods/public/audio/interface/alarm/alarm_techcomplete.xml index 9d22bbd4ab..18c8f0c0e5 100644 --- a/binaries/data/mods/public/audio/interface/alarm/alarm_techcomplete.xml +++ b/binaries/data/mods/public/audio/interface/alarm/alarm_techcomplete.xml @@ -1,11 +1,13 @@ - - - 1 - 1 - 100 - 1 - 360 - 360 + + + 1 + owner + 1 + 1 + 100 + 1 + 360 + 360 0 1 1 diff --git a/binaries/data/mods/public/simulation/components/ProductionQueue.js b/binaries/data/mods/public/simulation/components/ProductionQueue.js index 346460c80f..4cadc7250e 100644 --- a/binaries/data/mods/public/simulation/components/ProductionQueue.js +++ b/binaries/data/mods/public/simulation/components/ProductionQueue.js @@ -637,6 +637,16 @@ ProductionQueue.prototype.ProgressTimeout = function(data) var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager); cmpTechnologyManager.ResearchTechnology(item.technologyTemplate); + var template = cmpTechnologyManager.GetTechnologyTemplate(item.technologyTemplate); + + if (template && template.soundComplete) + { + var cmpSoundManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_SoundManager); + + if (cmpSoundManager) + cmpSoundManager.PlaySoundGroup(template.soundComplete, this.entity); + } + time -= item.timeRemaining; this.queue.shift(); diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city.json b/binaries/data/mods/public/simulation/data/technologies/phase_city.json index 6040358c54..264985cd7a 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city.json @@ -3,5 +3,6 @@ "requirements": { "any": [{"tech":"phase_city_generic"}, {"tech":"phase_city_spart"}, {"tech":"phase_city_britons"}, {"tech":"city_phase_gauls"}, {"tech":"phase_city_pair_celts"}, {"tech":"phase_city_athen"}]}, "autoResearch": true, "modifications": [{"value": "TerritoryInfluence/Radius", "multiplier": 1.50}], - "affects": ["CivCentre"] + "affects": ["CivCentre"], + "soundComplete": "interface/alarm/alarm_techcomplete.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json index e7748c12af..c3e241d50b 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json @@ -12,5 +12,6 @@ "researchTime": 80, "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civilisation Centres increased by another +50%. Silver Owls civ bonus grants an extra +10% metal gather rate to all workers.", "modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.1}], - "affects": ["Worker"] -} \ No newline at end of file + "affects": ["Worker"], + "soundComplete": "interface/alarm/alarm_techcomplete.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_britons.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_britons.json index c67d5751a8..3206233471 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_britons.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_britons.json @@ -6,5 +6,6 @@ "requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civ Centres).", "icon": "city_phase.png", "researchTime": 80, - "tooltip": "Advance to City Phase, which unlocks Brythonic structures and units. Territory radius for Civilisation Centres increased by another +50%" + "tooltip": "Advance to City Phase, which unlocks Brythonic structures and units. Territory radius for Civilisation Centres increased by another +50%", + "soundComplete": "interface/alarm/alarm_techcomplete.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_gauls.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_gauls.json index 3afed0b813..e60e34d1d1 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_gauls.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_gauls.json @@ -6,5 +6,6 @@ "requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civ Centres).", "icon": "city_phase.png", "researchTime": 80, - "tooltip": "Advance to City Phase, which unlocks Gallic structures and units. Territory radius for Civilisation Centres increased by another +50%" + "tooltip": "Advance to City Phase, which unlocks Gallic structures and units. Territory radius for Civilisation Centres increased by another +50%", + "soundComplete": "interface/alarm/alarm_techcomplete.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json index 764e917f0b..b3ef7a79b4 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json @@ -13,5 +13,6 @@ "supersedes": "phase_town_generic", "icon": "city_phase.png", "researchTime": 80, - "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civilisation Centres increased by another +50%" + "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civilisation Centres increased by another +50%", + "soundComplete": "interface/alarm/alarm_techcomplete.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_spart.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_spart.json index e0b46632ea..4746cd84e9 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_spart.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_spart.json @@ -14,5 +14,6 @@ "modifications": [ {"value": "Promotion/RequiredXp", "multiplier": 0.1, "affects": ["CitizenSoldier"]}, {"value": "Player/MaxPopulation", "multiplier": 0.9} - ] -} \ No newline at end of file + ], + "soundComplete": "interface/alarm/alarm_techcomplete.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town.json b/binaries/data/mods/public/simulation/data/technologies/phase_town.json index 0fd5222385..a025067f7d 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town.json @@ -3,5 +3,6 @@ "requirements": { "any": [{"tech":"phase_town_generic"}, {"tech":"phase_town_athen"}]}, "autoResearch": true, "modifications": [{"value": "TerritoryInfluence/Radius", "multiplier": 1.30}], - "affects": ["CivCentre"] + "affects": ["CivCentre"], + "soundComplete": "interface/alarm/alarm_techcomplete.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json b/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json index e1ad96bccf..3b879fb429 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json @@ -12,5 +12,6 @@ "researchTime": 80, "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civilization Centers increased by +30%. 'Silver Owls' civ bonus grants an extra +10% metal gather rate to all workers.", "modifications": [{"value": "ResourceGatherer/Rates/metal.ore", "multiplier": 1.1}], - "affects": ["Worker"] -} \ No newline at end of file + "affects": ["Worker"], + "soundComplete": "interface/alarm/alarm_techcomplete.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json b/binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json index 63481a5965..c7c1dc1a6a 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json @@ -7,5 +7,6 @@ "supersedes": "phase_village", "icon": "town_phase.png", "researchTime": 80, - "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civilization Centers increased by +30%" + "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civilization Centers increased by +30%", + "soundComplete": "interface/alarm/alarm_techcomplete.xml" }