!feat(triggers): sound modifiers for voicetriggers (#111)

Author: Dolly132

config/config.json

@@ -29,10 +29,29 @@
 		"Host": "127.0.0.1",
 		"Port": 27019,
 		"SampleRate": 22050,
-		"Volume": 1.0,
-		"Speed": 1.0,
-		"Pitch": 1.0,
-		"Proxy": ""
+		"Proxy": "",
+
+		"AudioParams":
+		{
+			"Volume":
+			{
+				"Default": 1.0,
+				"Min": 0.0,
+				"Max": 1.0
+			},
+			"Speed":
+			{
+				"Default": 1.0,
+				"Min": 0.5,
+				"Max": 2.0
+			},
+			"Pitch":
+			{
+				"Default": 1.0,
+				"Min": 0.5,
+				"Max": 2.0
+			}
+		}
 	},
 
 	"GeoIP":

src/torchlight/AudioManager.py

@@ -21,6 +21,45 @@ def __init__(self, torchlight: Torchlight) -> None:
     def __del__(self) -> None:
         self.logger.info("~AudioManager()")
 
+    def ParseParams(self, trigger_params: dict, msg: str) -> dict[str, float]:
+        this_config = self.torchlight.config.config.get("VoiceServer", {}).get("AudioParams", {})
+        if not this_config:
+            return trigger_params
+
+        params: dict[str, float] = {}
+        for param in this_config:
+            if param in trigger_params and trigger_params[param] is not None:
+                params[param] = float(trigger_params[param])
+            else:
+                if isinstance(this_config[param], dict) and "Default" in this_config[param]:
+                    params[param] = float(this_config[param]["Default"])
+
+        msg_args = msg.split()
+        for arg in msg_args:
+            if "=" in arg:
+                key, value = arg.split("=", 1)
+                if not key or not value:
+                    continue
+
+                key = key.capitalize()
+                if key not in this_config:
+                    continue
+
+                if isinstance(this_config[key], dict):
+                    val: float = 1.0
+                    try:
+                        val = float(value)
+                    except ValueError:
+                        continue
+
+                    if "Min" not in this_config[key] or "Max" not in this_config[key]:
+                        continue
+
+                    val = max(this_config[key]["Min"], min(val, this_config[key]["Max"]))
+                    params[key] = val
+
+        return params
+
     def CheckLimits(self, player: Player) -> bool:
         level = player.admin.level
 

src/torchlight/Commands.py

@@ -613,7 +613,17 @@ async def _func(self, message: list[str], player: Player) -> int:
             return -1
 
         voice_trigger = message[0].lower()
-        trigger_number = message[1].lower()
+        trigger_number: str = ""
+        if message[1]:
+            parts = message[1].split()
+            trigger_parts = []
+            for part in parts:
+                if "=" in part:
+                    break
+                trigger_parts.append(part)
+
+            if trigger_parts:
+                trigger_number = " ".join(trigger_parts)
 
         sound = self.get_sound_path(
             player=player,
@@ -638,12 +648,15 @@ async def _func(self, message: list[str], player: Player) -> int:
             self.torchlight.SayChat(f"Now playing {{olive}}{self.random_trigger_name}")
             voice_trigger = self.random_trigger_name
 
+        self.torchlight.SetPlayerCooldown(player, self.torchlight.config["AntiSpam"]["ChatCooldown"])
+
         params = cast(dict, self.trigger_manager.voice_triggers[voice_trigger]["parameters"])
-        volume = float(params["Volume"])
-        speed = float(params["Speed"])
-        pitch = float(params["Pitch"])
+        modifiers = self.audio_manager.ParseParams(params, message[1])
+
+        volume = modifiers["Volume"]
+        speed = modifiers["Speed"]
+        pitch = modifiers["Pitch"]
 
-        self.torchlight.SetPlayerCooldown(player, self.torchlight.config["AntiSpam"]["ChatCooldown"])
         return audio_clip.Play(volume=volume, speed=speed, pitch=pitch)
 
     def get_sound_path(self, player: Player, voice_trigger: str, trigger_number: str) -> str | None:

src/torchlight/FFmpegAudioPlayer.py

@@ -29,9 +29,12 @@ def __init__(self, torchlight: Torchlight) -> None:
         self.host = self.config["Host"]
         self.port = self.config["Port"]
         self.sample_rate = float(self.config["SampleRate"])
-        self.volume = float(self.config["Volume"])
-        self.speed = float(self.config["Speed"])
-        self.pitch = float(self.config["Pitch"])
+
+        params = self.config.get("AudioParams", {})
+
+        self.volume = float(params.get("Volume", {}).get("Default", 1.0))
+        self.speed = float(params.get("Speed", {}).get("Default", 1.0))
+        self.pitch = float(params.get("Pitch", {}).get("Default", 1.0))
         self.proxy = self.config.get("Proxy", "")
 
         self.started_playing: float | None = None

src/torchlight/TriggerManager.py

@@ -25,11 +25,12 @@ def __init__(
     def Load(self) -> None:
         self.logger.info(f"Loading triggers from {self.config_filepath}")
 
+        voice_server_params = self.config.config.get("VoiceServer", {}).get("AudioParams", {})
         with open(self.config_filepath) as fp:
             default_parameters = {
-                "Volume": float(self.config.config.get("VoiceServer", {}).get("Volume", 1.0)),
-                "Speed": float(self.config.config.get("VoiceServer", {}).get("Speed", 1.0)),
-                "Pitch": float(self.config.config.get("VoiceServer", {}).get("Pitch", 1.0)),
+                "Volume": float(voice_server_params.get("Volume", {}).get("Default", 1.0)),
+                "Speed": float(voice_server_params.get("Speed", {}).get("Default", 1.0)),
+                "Pitch": float(voice_server_params.get("Pitch", {}).get("Default", 1.0)),
             }
 
             self.triggers_dict = json.load(fp, object_pairs_hook=OrderedDict)

src/torchlight/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.2"
+__version__ = "1.4.0"