diff --git a/mods/CORE/mcl_moans/init.lua b/mods/CORE/mcl_moans/init.lua new file mode 100644 index 00000000..15cdd1c9 --- /dev/null +++ b/mods/CORE/mcl_moans/init.lua @@ -0,0 +1,5 @@ +mcl_moans = {} + +function mcl_moans.moan(spec) + minetest.sound_play("mcl_moan", spec) +end diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.1.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.1.ogg new file mode 100644 index 00000000..80fee91c Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.1.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.10.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.10.ogg new file mode 100644 index 00000000..25765109 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.10.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.11.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.11.ogg new file mode 100644 index 00000000..58230295 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.11.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.12.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.12.ogg new file mode 100644 index 00000000..fab77072 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.12.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.13.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.13.ogg new file mode 100644 index 00000000..4132437b Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.13.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.14.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.14.ogg new file mode 100644 index 00000000..2421cf95 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.14.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.2.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.2.ogg new file mode 100644 index 00000000..b57aaef9 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.2.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.3.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.3.ogg new file mode 100644 index 00000000..3757b51e Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.3.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.4.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.4.ogg new file mode 100644 index 00000000..967807f6 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.4.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.5.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.5.ogg new file mode 100644 index 00000000..3817de06 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.5.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.6.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.6.ogg new file mode 100644 index 00000000..22ae4d13 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.6.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.7.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.7.ogg new file mode 100644 index 00000000..03e0746a Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.7.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.8.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.8.ogg new file mode 100644 index 00000000..b5a1bf34 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.8.ogg differ diff --git a/mods/CORE/mcl_moans/sounds/mcl_moan.9.ogg b/mods/CORE/mcl_moans/sounds/mcl_moan.9.ogg new file mode 100644 index 00000000..e16f8522 Binary files /dev/null and b/mods/CORE/mcl_moans/sounds/mcl_moan.9.ogg differ diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index fae43a0d..496a930b 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -60,12 +60,13 @@ local cow_def = { mobs.make_baby_grow_faster(self,clicker) return end - local item = clicker:get_wielded_item() if item:get_name() == mobs_mc.items.bucket and clicker:get_inventory() then + local inv = clicker:get_inventory() inv:remove_item("main", mobs_mc.items.bucket) - minetest.sound_play("mobs_mc_cow_milk", {pos=self.object:get_pos(), gain=0.6}) + mcl_moans.moan({object = self.object}) + minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6}) -- if room add bucket of milk to inventory, otherwise drop as item if inv:room_for_item("main", {name=mobs_mc.items.milk}) then clicker:get_inventory():add_item("main", mobs_mc.items.milk) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index cb2e972b..dd47922b 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -532,7 +532,7 @@ local function show_trade_formspec(playername, trader, tradenum) .."listring[current_player;main]" .."listring["..tradeinv..";input]" .."listring[current_player;main]" - minetest.sound_play("mobs_mc_villager_trade", {to_player = playername}, true) + minetest.sound_play("mcl_moan", {to_player = playername}, true) minetest.show_formspec(playername, tradeinv_name, formspec) end @@ -594,13 +594,13 @@ local update_offer = function(inv, player, sound) (trade.locked == false)) then inv:set_stack("output", 1, inv:get_stack("offered", 1)) if sound then - minetest.sound_play("mobs_mc_villager_accept", {to_player = name}, true) + minetest.sound_play("mcl_moan", {to_player = name}, true) end return true else inv:set_stack("output", 1, ItemStack("")) if sound then - minetest.sound_play("mobs_mc_villager_deny", {to_player = name}, true) + minetest.sound_play("mcl_moan", {to_player = name}, true) end return false end @@ -795,7 +795,7 @@ local trade_inventory = { if not wanted2:is_empty() then inv:remove_item("input", inv:get_stack("wanted", 2)) end - minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()}, true) + minetest.sound_play("mcl_moan", {to_player = player:get_player_name()}, true) end update_offer(inv, player, true) end, @@ -901,9 +901,9 @@ local trade_inventory = { update_offer(inv, player, false) end if accept then - minetest.sound_play("mobs_mc_villager_accept", {to_player = name}, true) + minetest.sound_play("mcl_moan", {to_player = name}, true) else - minetest.sound_play("mobs_mc_villager_deny", {to_player = name}, true) + minetest.sound_play("mcl_moan", {to_player = name}, true) end end, } @@ -971,9 +971,9 @@ mobs:register_mob("mobs_mc:villager", { can_despawn = false, -- TODO: sounds sounds = { - random = "mobs_mc_villager", - damage = "mobs_mc_villager_hurt", - death = "mobs_mc_villager_hurt", + random = "mcl_moan", + damage = "mcl_moan", + death = "mcl_moan", distance = 10, }, animation = { diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua index cb0fddd9..383d40ef 100644 --- a/mods/ITEMS/mcl_mobitems/init.lua +++ b/mods/ITEMS/mcl_mobitems/init.lua @@ -189,7 +189,8 @@ minetest.register_on_rightclickplayer(function(player, clicker) if item:get_name() == "mcl_buckets:bucket_empty" and clicker:get_inventory() then local inv = clicker:get_inventory() inv:remove_item("main", "mcl_buckets:bucket_empty") - minetest.sound_play("mobs_mc_cow_milk", {pos=player:get_pos(), gain=0.6}) + mcl_moans.moan({object = player}) + minetest.sound_play("mobs_mc_cow_milk", {object = player, gain = 0.6}) -- if room add bucket of cum to inventory, otherwise drop as item if inv:room_for_item("main", {name="mcl_mobitems:cum_bucket"}) then clicker:get_inventory():add_item("main", "mcl_mobitems:cum_bucket")