Allow cash ticking sound to overlap

2022-10-11 15:58:37 +03:00
parent fde4f8d0e5
commit 347148e02f
6 changed files with 72 additions and 49 deletions
--- a/mods/cnc/audio/notifications.yaml
+++ b/mods/cnc/audio/notifications.yaml
@@ -54,19 +54,21 @@ Sounds:
 	Notifications:
 		Appear: appear1
 		Beacon: bleep2
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		Beepy2: beepy2
 		Beepy3: beepy3
 		Beepy6: beepy6
 		CashTickDown: tone16
+			InterruptType: Overlap
 		CashTickUp: tone15
 			VolumeModifier: 0.33
+			InterruptType: Overlap
 		ChatLine: scold1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickDisabledSound: scold2
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickSound: button
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		Cloak: trans1
 		Clock: clock1
 		Construction: constru2
--- a/mods/d2k/audio/notifications.yaml
+++ b/mods/d2k/audio/notifications.yaml
@@ -67,17 +67,19 @@ Sounds:
 		DisablePower: POWRDN1
 		EnablePower: POWRUP1
 		CashTickUp: CASHTIK1
+			InterruptType: Overlap
 		CashTickDown: CASHTIK1
+			InterruptType: Overlap
 		LevelUp: SCORTIK1
 		ChatLine: CHAT1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		BuildPaletteOpen: BUTTON1
 		BuildPaletteClose: BUTTON1
 		TabClick: SIDEBAR1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickSound: BUTTON1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickDisabledSound: ENDLIST1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		Beacon: CHAT1
-			AllowInterrupt: true
+			InterruptType: Interrupt
--- a/mods/ra/audio/notifications.yaml
+++ b/mods/ra/audio/notifications.yaml
@@ -120,18 +120,20 @@ Sounds:
 		RadarDown: radardn1
 		CashTickUp: cashup1
 			VolumeModifier: 0.33
+			InterruptType: Overlap
 		CashTickDown: cashdn1
 			VolumeModifier: 0.33
+			InterruptType: Overlap
 		LevelUp: hydrod1
 		DisablePower: bleep11
 		EnablePower: bleep12
 		ChatLine: rabeep1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickSound: ramenu1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickDisabledSound:
 		Beacon: beepslct
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		AlertBuzzer: buzzy1
 		AlertBleep: bleep6
 		BaseSetup: bleep9
--- a/mods/ts/audio/sounds-generic.yaml
+++ b/mods/ts/audio/sounds-generic.yaml
@@ -2,7 +2,7 @@ Sounds:
 	Notifications:
 		Bargraph: bargraph
 		Beacon: message1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		Bestbox: bestbox
 		Blip: blip
 		BuildPaletteClose: emblem
@@ -11,14 +11,16 @@ Sounds:
 		CantPushButtonSound: scold8
 		CashTickDown: creddwn1
 			VolumeModifier: 0.33
+			InterruptType: Overlap
 		CashTickUp: credup1
 			VolumeModifier: 0.33
+			InterruptType: Overlap
 		ChatLine: message1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickDisabledSound: wrong1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		ClickSound: clicky1
-			AllowInterrupt: true
+			InterruptType: Interrupt
 		GameForming: gamefrm1
 		Gdiclose: gdiclose
 		Gdiopen: gdiopen