Fix splash sounds when drinking from water container

jhaakma · Apr 17, 2023 · de1a54e · de1a54e
1 parent c07e75a
commit de1a54e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Data Files/MWSE/mods/mer/ashfall/liquid/LiquidContainer.lua b/Data Files/MWSE/mods/mer/ashfall/liquid/LiquidContainer.lua
@@ -48,6 +48,7 @@ local teaConfig = require "mer.ashfall.config.teaConfig"
 ---@field stewBuffs table The stew buffs
 ---@field capacity number Maximum water capacity of container
 ---@field holdsStew boolean Flag whether container is able to hold stew. If it can hold stew, it can't hold tea.
+---@field doPlaySound boolean *Default*: `true`. Flag whether to play a sound when adding water to the container
 local LiquidContainer = {}
 
 local dataValues = {
@@ -122,6 +123,7 @@ function LiquidContainer.new(e)
         liquidContainer.holdsStew = bottleData.holdsStew == true
         liquidContainer.reference = reference
         liquidContainer.itemId = id
+        liquidContainer.doPlaySound = true
         setmetatable(liquidContainer, meta )
         if liquidContainer.stewLevels then liquidContainer.waterType = "stew" end
         return liquidContainer
@@ -406,12 +408,20 @@ function LiquidContainer:doGraphicalUpdates()
     tes3ui.updateInventoryTiles()
 end
 
+---@param self Ashfall.LiquidContainer
+---@param bool boolean #Whether to play the water transfer sound when this container is filled or emptied
+function LiquidContainer:setPlaySound(bool)
+    self.doPlaySound = bool
+end
+
 function LiquidContainer:playSound()
-    tes3.playSound({reference = tes3.player, sound = "ashfall_water"})
+    if self.doPlaySound then
+        tes3.playSound({reference = tes3.player, sound = "ashfall_water"})
+    end
 end
 
 ---@alias Ashfall.LiquidContainer.LiquidName
----| '"Dirty Water"'
+---| '"Dirty water"'
 ---| '"Water"'
 ---| '"Stew"'
 ---| '"Soup"'

diff --git a/Data Files/MWSE/mods/mer/ashfall/needs/waterController.lua b/Data Files/MWSE/mods/mer/ashfall/needs/waterController.lua
@@ -28,7 +28,6 @@ local function douse(bottleData)
     common.data.wetness = common.data.wetness + waterUsed*wetnessPerWater
     event.trigger("Ashfall:updateCondition", { id = "wetness" })
 
-
     --handle bottleData if provided
     if bottleData then
         local liquidContainer = LiquidContainer.createFromData(bottleData)
@@ -204,6 +203,7 @@ local function doDrinkWater(bottleData)
     --Reduce liquid in bottleData
     local liquidContainer = LiquidContainer.createFromData(bottleData)
     if liquidContainer then
+        liquidContainer:setPlaySound(false)
         liquidContainer:reduce(thisSipSize)
     end
 end