diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index 47a0424e9..2c8fcb180 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -118,6 +118,18 @@ Origin of those models: * [bevibeldesign](https://freesound.org/people/bevibeldesign/) * `mobs_mc_wither_spawn.ogg` (CC0) * Source: +* [pointparkcinema](https://freesound.org/people/pointparkcinema/) + * `mobs_mc_guardian_random.1.ogg` (CC0) + * Source: +* [nornalbion](https://freesound.org/people/nornalbion/) + * `mobs_mc_guardian_random.2.ogg` (CC BY 3.0) + * `mobs_mc_guardian_random.3.ogg` (CC BY 3.0) + * `mobs_mc_guardian_hurt.*.ogg` (CC BY 3.0) + * Sounds were modified + * Source: +* [TheBuilder15](https://freesound.org/people/TheBuilder15/) + * `mobs_mc_guardian_death.ogg` (CC0) + * Source: * Blender Foundation (CC BY 3.0) * `mobs_sheep.ogg`, * daufinsyd (MIT License) diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua index c641ed57a..4a7152acd 100644 --- a/mods/ENTITIES/mobs_mc/guardian.lua +++ b/mods/ENTITIES/mobs_mc/guardian.lua @@ -1,5 +1,3 @@ --- v1.4 - --################### --################### GUARDIAN --################### @@ -28,8 +26,10 @@ mobs:register_mob("mobs_mc:guardian", { }, visual_size = {x=3, y=3}, sounds = { - damage = "mobs_mc_squid_hurt", - -- TODO: more and better sounds + random = "mobs_mc_guardian_random", + war_cry = "mobs_mc_guardian_random", + damage = {name="mobs_mc_guardian_hurt", gain=0.3}, + death = "mobs_mc_guardian_death", distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua index 14396face..2eab57417 100644 --- a/mods/ENTITIES/mobs_mc/guardian_elder.lua +++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua @@ -28,8 +28,11 @@ mobs:register_mob("mobs_mc:guardian_elder", { }, visual_size = {x=7, y=7}, sounds = { - damage = "mobs_mc_squid_hurt", - -- TODO: more and better sounds + random = "mobs_mc_guardian_random", + war_cry = "mobs_mc_guardian_random", + damage = {name="mobs_mc_guardian_hurt", gain=0.3}, + death = "mobs_mc_guardian_death", + base_pitch = 0.6, distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_death.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_death.ogg new file mode 100644 index 000000000..93c093d05 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_death.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.1.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.1.ogg new file mode 100644 index 000000000..7d7cad3f8 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.1.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.2.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.2.ogg new file mode 100644 index 000000000..9d870486b Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_hurt.2.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.1.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.1.ogg new file mode 100644 index 000000000..d33157c14 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.1.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.2.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.2.ogg new file mode 100644 index 000000000..5853e16c5 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.2.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.3.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.3.ogg new file mode 100644 index 000000000..9fc4df09d Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_guardian_random.3.ogg differ