Merge pull request #7287 from abcdefg30/all-notifications

Added all ra notifications to notifications.yaml

mods/ra/maps/allies-01/allies01.lua

@@ -141,11 +141,11 @@ HelicopterGone = function()
 end
 
 MissionAccomplished = function()
-	Media.PlaySpeechNotification(player, "Win")
+	Media.PlaySpeechNotification(player, "MissionAccomplished")
 end
 
 MissionFailed = function()
-	Media.PlaySpeechNotification(player, "Lose")
+	Media.PlaySpeechNotification(player, "MissionFailed")
 end
 
 SetUnitStances = function()

mods/ra/maps/allies-02/allies02.lua

@@ -21,11 +21,11 @@ RunInitialActivities = function()
 end
 
 MissionAccomplished = function()
-	Media.PlaySpeechNotification(player, "Win")
+	Media.PlaySpeechNotification(player, "MissionAccomplished")
 end
 
 MissionFailed = function()
-	Media.PlaySpeechNotification(player, "Lose")
+	Media.PlaySpeechNotification(player, "MissionFailed")
 end
 
 Tick = function()

mods/ra/maps/allies-03a/allies03a.lua

@@ -113,12 +113,12 @@ InitObjectives = function()
 
 	Trigger.OnPlayerLost(player, function()
 		Trigger.AfterDelay(25, function()
-			Media.PlaySpeechNotification(player, "Lose")
+			Media.PlaySpeechNotification(player, "MissionFailed")
 		end)
 	end)
 	Trigger.OnPlayerWon(player, function()
 		Trigger.AfterDelay(25, function()
-			Media.PlaySpeechNotification(player, "Win")
+			Media.PlaySpeechNotification(player, "MissionAccomplished")
 		end)
 	end)
 end

mods/ra/maps/intervention/intervention.lua

@@ -227,11 +227,11 @@ WorldLoaded = function()
 	end)
 
 	Trigger.OnPlayerWon(player, function()
-		Media.PlaySpeechNotification(player, "Win")
+		Media.PlaySpeechNotification(player, "MissionAccomplished")
 	end)
 
 	Trigger.OnPlayerLost(player, function()
-		Media.PlaySpeechNotification(player, "Lose")
+		Media.PlaySpeechNotification(player, "MissionFailed")
 	end)
 
 	sovietObjective = soviets.AddPrimaryObjective("Destroy the village.")

mods/ra/maps/monster-tank-madness/monster-tank-madness.lua

@@ -260,7 +260,7 @@ InitObjectives = function()
 	end)
 
 	Trigger.OnPlayerLost(player, function()
-		Media.PlaySpeechNotification(player, "Lose")
+		Media.PlaySpeechNotification(player, "MissionFailed")
 
 		ussr.MarkCompletedObjective(USSRObj)
 		badguy.MarkCompletedObjective(BadGuyObj)
@@ -268,7 +268,7 @@ InitObjectives = function()
 		turkey.MarkCompletedObjective(TurkeyObj)
 	end)
 	Trigger.OnPlayerWon(player, function()
-		Media.PlaySpeechNotification(player, "Win")
+		Media.PlaySpeechNotification(player, "MissionAccomplished")
 		Media.DisplayMessage("Dr. Demitri has been extracted and the super tanks have been dealt with.")
 
 		ussr.MarkFailedObjective(USSRObj)

mods/ra/maps/soviet-01/soviet01.lua

@@ -50,11 +50,11 @@ WorldLoaded = function()
 	JeepDemolishingBridge()
 
 	Trigger.OnPlayerWon(player, function()
-		Media.PlaySpeechNotification(player, "Win")
+		Media.PlaySpeechNotification(player, "MissionAccomplished")
 	end)
 
 	Trigger.OnPlayerLost(player, function()
-		Media.PlaySpeechNotification(player, "Lose")
+		Media.PlaySpeechNotification(player, "MissionFailed")
 	end)
 
 	Trigger.AfterDelay(DateTime.Seconds(2), InsertYaks)

mods/ra/maps/survival01/survival01.lua

@@ -281,10 +281,10 @@ InitObjectives = function()
 	end)
 
 	Trigger.OnPlayerLost(allies, function()
-		Media.PlaySpeechNotification(allies, "Lose")
+		Media.PlaySpeechNotification(allies, "MissionFailed")
 	end)
 	Trigger.OnPlayerWon(allies, function()
-		Media.PlaySpeechNotification(allies, "Win")
+		Media.PlaySpeechNotification(allies, "MissionAccomplished")
 		Media.DisplayMessage("The French forces have survived and dismantled the soviet presence in the area!")
 	end)
 end

mods/ra/notifications.yaml

@@ -1,54 +1,117 @@
 Speech:
 	Notifications:
-		Repairing: repair1
-		LowPower: lopower1
-		SilosNeeded: silond1
-		PrimaryBuildingSelected: pribldg1
-		BuildingCannotPlaceAudio: nodeply1
-		NewOptions: newopt1
-		Win: misnwon1
-		Lose: misnlst1
-		BaseAttack: baseatk1
-		HarvesterAttack:
-		Leave: bct1
-		StartGame: bctrinit
-		UnitReady: unitrdy1
-		NoBuild: nobuild1
-		Training: train1
-		OnHold: onhold1
-		Cancelled: cancld1
-		Building: abldgin1
-		ConstructionComplete: conscmp1
-		UnitLost: unitlst1
-		NavalUnitLost: navylst1
+		AbombAvailable: aavail1
+		AbombLaunchDetected: alaunch1
+		AbombPrepping: aprep1
+		AbombReady: aready1
 		AirUnitLost: aunitl1
-		BuildingCaptured: strucap1
-		UnitStolen: unitsto
-		ReinforcementsArrived: reinfor1
-		SignalFlareNorth: flaren1
-		AlliedReinforcementsArrived: aarrive1
 		AlliedForcesApproaching: aappro1
+		AlliedForcesFallen: afallen1
+		AlliedForcesSelected: aselect1
+		AlliedReinforcementsArrived: aarrive1
+		AlliedReinforcementsEast: aarive1
+		AlliedReinforcementsNorth: aarrivn1
+		AlliedReinforcementsSouth: aarrivs1
+		AlliedReinforcementsWest: aarrivw1
+		AtomBombLaunchDetected: atlnch1
+		AtomBombPrepping: atprep1
+		BaseAttack: baseatk1
+		Building: abldgin1
+		BuildingCannotPlaceAudio: nodeply1
+		BuildingCaptured: strucap1
+		BuildingInfiltrated: bldginf1
+		BuildingInProgress: progres1
+		BuildingProgress: bldgprg1
+		Cancelled: cancld1
+		ChronosphereCharging: chrochr1
+		ChronosphereReady: chrordy1
+		ChronosphereTestSuccessful: chroyes1
+		CommandCenterAttack: cmdcntr1
+		CommandoFreed: comndof1
+		CommandoRescued: comndor1
+		ConstructionComplete: conscmp1
+		ControlCenterDeactivated: cntlded1
 		ConvoyApproaching: convyap1
 		ConvoyUnitLost: convlst1
-		TargetFreed: targfre1
-		TargetRescued: targres1
+		CreditsStolen: credit1
+		EnemyUnitsApproaching: enmyapp1
+		ExplosiveChargePlaced: xploplc1
+		FirstObjectiveMet: 1objmet1
+		FourtyMinutesRemaining: 40minr
+		HarvesterAttack:
+		InsufficientFunds: nofunds1
+		InsufficientPower: nopowr1
+		IronCurtainCharging: ironchg1
+		IronCurtainReady: ironrdy1
+		KosyginFreed: kosyfre1
+		KosyginRescued: kosyres1
+		Leave: bct1
+		Lose: misnlst1
+		LowPower: lopower1
+		MercenaryFreed: mercf1
+		MercenaryRescued: mercr1
+		MissionAccomplished: misnwon1
+		MissionFailed: misnlst1
+		MissionLoaded: load1
+		MissionSaved: save1
+		MissionTimerInitialised: mtimein1
+		NavalUnitLost: navylst1
+		NewOptions: newopt1
+		NoBuild: nobuild1
 		ObjectiveMet: objmet1
 		ObjectiveNotMet: objnmet1
-		ObjectiveReached: objrch1
 		ObjectiveNotReached: objnrch1
+		ObjectiveReached: objrch1
+		OnHold: onhold1
+		OperationControlTerminated: opterm1
+		PrimaryBuildingSelected: pribldg1
+		ReinforcementsArrived: reinfor1
+		Repairing: repair1
+		SatelliteLaunched: satlnch1
+		SecondObjectiveMet: 2objmet1
+		SelectTarget: slcttgt1
+		SignalFlare: flare1
+		SignalFlareEast: flaree1
+		SignalFlareNorth: flaren1
+		SignalFlareSouth: flares1
+		SignalFlareWest: flarew1
+		SilosNeeded: silond1
+		SonarPulseReady: pulse1
+		SovietEmpireFallen: sovefal1
+		SovietEmpireSelected: sovemp1
+		SovietForcesApproaching: sovfapp1
+		SovietForcesFallen: sovforc1
+		SovietReinforcementsArrived: sovrein1
+		SpyPlaneReady: spypln1
+		StartGame: bctrinit
+		StructureDestroyed: strckil1
+		StructureSold: strusld1
+		TanyaFreed: tanyaf1
+		TanyaRescued: tanyar1
+		TargetFreed: targfre1
+		TargetRescued: targres1
 		TenMinutesRemaining: 10minr
-		TwentyMinutesRemaining: 20minr
+		ThirdObjectiveMet: 3objmet1
 		ThirtyMinutesRemaining: 30minr
-		FourtyMinutesRemaining: 40minr
+		TimerStarted: timergo1
+		TimerStopped: timerno1
+		Training: train1
+		TwentyMinutesRemaining: 20minr
+		UnitArmorUpgraded: armorup1
+		UnitFirepowerUpgraded: firepo1
+		UnitFull: unitful1
+		UnitLost: unitlst1
+		UnitReady: unitrdy1
+		UnitRepaired: unitrep1
+		UnitSold: unitsld1
+		UnitSpeedUpgraded: unitspd1
+		UnitStolen: unitsto
 		WarningOneMinuteRemaining: 1minr
 		WarningTwoMinutesRemaining: 2minr
 		WarningThreeMinutesRemaining: 3minr
 		WarningFourMinutesRemaining: 4minr
 		WarningFiveMinutesRemaining: 5minr
-		ControlCenterDeactivated: cntlded1
-		OperationControlTerminated: opterm1
-		MissionTimerInitialised: mtimein1
-		EnemyUnitsApproaching: enmyapp1
+		Win: misnwon1
 
 Sounds:
 	Notifications: