From 900625b17b3aceb19b1cc14dbacdc678c8d1c356 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 14 Sep 2018 16:27:58 +0200 Subject: [PATCH] Add ghast shoot/death sound, add many sound TODOs --- mods/ENTITIES/mobs_mc/agent.lua | 1 + mods/ENTITIES/mobs_mc/bat.lua | 1 + mods/ENTITIES/mobs_mc/chicken.lua | 3 +-- mods/ENTITIES/mobs_mc/cow+mooshroom.lua | 3 +-- mods/ENTITIES/mobs_mc/ender_dragon.lua | 1 + mods/ENTITIES/mobs_mc/enderman.lua | 2 +- mods/ENTITIES/mobs_mc/endermite.lua | 2 ++ mods/ENTITIES/mobs_mc/ghast.lua | 8 +++++--- mods/ENTITIES/mobs_mc/guardian.lua | 1 + mods/ENTITIES/mobs_mc/guardian_elder.lua | 1 + mods/ENTITIES/mobs_mc/horse.lua | 1 + mods/ENTITIES/mobs_mc/iron_golem.lua | 5 +---- mods/ENTITIES/mobs_mc/ocelot.lua | 1 + mods/ENTITIES/mobs_mc/parrot.lua | 1 + mods/ENTITIES/mobs_mc/polar_bear.lua | 5 +---- mods/ENTITIES/mobs_mc/rabbit.lua | 2 +- mods/ENTITIES/mobs_mc/shulker.lua | 1 + mods/ENTITIES/mobs_mc/silverfish.lua | 2 +- mods/ENTITIES/mobs_mc/snowman.lua | 1 + mods/ENTITIES/mobs_mc/spider.lua | 1 + mods/ENTITIES/mobs_mc/squid.lua | 4 ++++ mods/ENTITIES/mobs_mc/vex.lua | 2 ++ mods/ENTITIES/mobs_mc/villager.lua | 7 +------ mods/ENTITIES/mobs_mc/villager_evoker.lua | 8 +------- mods/ENTITIES/mobs_mc/villager_vindicator.lua | 6 +----- mods/ENTITIES/mobs_mc/witch.lua | 7 +------ mods/ENTITIES/mobs_mc/wither.lua | 1 + mods/ENTITIES/mobs_mc/wolf.lua | 5 +---- 28 files changed, 37 insertions(+), 46 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/agent.lua b/mods/ENTITIES/mobs_mc/agent.lua index a55011753..9de2292e8 100644 --- a/mods/ENTITIES/mobs_mc/agent.lua +++ b/mods/ENTITIES/mobs_mc/agent.lua @@ -19,6 +19,7 @@ mobs:register_mob("mobs_mc:agent", { textures = { {"mobs_mc_agent.png"}, }, + -- TODO: sounds visual_size = {x=3, y=3}, walk_velocity = 0.6, run_velocity = 2, diff --git a/mods/ENTITIES/mobs_mc/bat.lua b/mods/ENTITIES/mobs_mc/bat.lua index d30bc98d5..27a0d23c0 100644 --- a/mods/ENTITIES/mobs_mc/bat.lua +++ b/mods/ENTITIES/mobs_mc/bat.lua @@ -19,6 +19,7 @@ mobs:register_mob("mobs_mc:bat", { visual_size = {x=1, y=1}, sounds = { random = "mobs_rat", -- TODO: This sound is supposed to be very high-pitched and scary + -- TODO: more sounds? distance = 16, }, walk_velocity = 4.5, diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua index cd8a22b2b..a29311b62 100644 --- a/mods/ENTITIES/mobs_mc/chicken.lua +++ b/mods/ENTITIES/mobs_mc/chicken.lua @@ -47,8 +47,7 @@ mobs:register_mob("mobs_mc:chicken", { fall_speed = -2.25, sounds = { random = "mobs_chicken", - death = "Chickenhurt1", -- TODO: replace - damage = "Chickenhurt1", -- TODO: replace + -- TODO: death, damage distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index 46b157118..15f62d3ea 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -34,8 +34,7 @@ local cow_def = { runaway = true, sounds = { random = "mobs_mc_cow", - death = "Cowhurt1", -- TODO: Replace - damage = "Cowhurt1", -- TODO: Replace + -- TODO: death, damage distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua index 183b07811..c6e99f47b 100644 --- a/mods/ENTITIES/mobs_mc/ender_dragon.lua +++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua @@ -54,6 +54,7 @@ mobs:register_mob("mobs_mc:enderdragon", { walk_velocity = 6, run_velocity = 6, sounds = { + -- TODO: more sounds shoot_attack = "mobs_mc_ender_dragon_shoot", attack = "mobs_mc_ender_dragon_attack", distance = 60, diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua index 1b60dac60..459c1a4aa 100644 --- a/mods/ENTITIES/mobs_mc/enderman.lua +++ b/mods/ENTITIES/mobs_mc/enderman.lua @@ -180,7 +180,7 @@ mobs:register_mob("mobs_mc:enderman", { sounds = { war_cry = "mobs_sandmonster", death = "green_slime_death", - damage = "Creeperdeath", + -- TODO: damage, random distance = 16, }, walk_velocity = 0.2, diff --git a/mods/ENTITIES/mobs_mc/endermite.lua b/mods/ENTITIES/mobs_mc/endermite.lua index 6c40f8c29..6cdcaf765 100644 --- a/mods/ENTITIES/mobs_mc/endermite.lua +++ b/mods/ENTITIES/mobs_mc/endermite.lua @@ -23,6 +23,8 @@ mobs:register_mob("mobs_mc:endermite", { makes_footstep_sound = false, sounds = { random = "mobs_rat", + distance = 16, + -- TODO: more sounds }, walk_velocity = 1, run_velocity = 2, diff --git a/mods/ENTITIES/mobs_mc/ghast.lua b/mods/ENTITIES/mobs_mc/ghast.lua index f12006476..5cb0080f0 100644 --- a/mods/ENTITIES/mobs_mc/ghast.lua +++ b/mods/ENTITIES/mobs_mc/ghast.lua @@ -28,11 +28,13 @@ mobs:register_mob("mobs_mc:ghast", { }, visual_size = {x=12, y=12}, sounds = { - shoot = "mobs_fireball", - death = "zombiedeath", - damage = "ghast_damage", + shoot_attack = "mobs_fireball", + death = "mobs_mc_zombie_death", attack = "mobs_fireball", random = "mobs_eerie", + distance = 16, + -- TODO: damage + -- TODO: better death }, walk_velocity = 1.6, run_velocity = 3.2, diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua index 131487148..56bda522f 100644 --- a/mods/ENTITIES/mobs_mc/guardian.lua +++ b/mods/ENTITIES/mobs_mc/guardian.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:guardian", { visual_size = {x=3, y=3}, sounds = { damage = "mobs_mc_squid_hurt", + -- TODO: more and better sounds distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua index 78c21f104..11dba11a9 100644 --- a/mods/ENTITIES/mobs_mc/guardian_elder.lua +++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:guardian_elder", { visual_size = {x=7, y=7}, sounds = { damage = "mobs_mc_squid_hurt", + -- TODO: more and better sounds distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua index 25bfb2dd3..960a1f8e9 100644 --- a/mods/ENTITIES/mobs_mc/horse.lua +++ b/mods/ENTITIES/mobs_mc/horse.lua @@ -102,6 +102,7 @@ local horse = { run_end = 40, }, textures = horse_textures, + -- TODO: sounds fear_height = 4, fly = false, walk_chance = 60, diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua index 0c30e6d67..ebd93dc64 100644 --- a/mods/ENTITIES/mobs_mc/iron_golem.lua +++ b/mods/ENTITIES/mobs_mc/iron_golem.lua @@ -27,10 +27,7 @@ mobs:register_mob("mobs_mc:iron_golem", { }, visual_size = {x=3, y=3}, makes_footstep_sound = true, - sounds = { - -- TODO - distance = 16, - }, + -- TODO: sounds view_range = 16, stepheight = 1.1, owner = "", diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua index 7bfdd6741..e6c385cf1 100644 --- a/mods/ENTITIES/mobs_mc/ocelot.lua +++ b/mods/ENTITIES/mobs_mc/ocelot.lua @@ -51,6 +51,7 @@ local ocelot = { fear_height = 4, sounds = { random = "mobs_kitten", + -- TODO: more sounds distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua index ef421557b..89e4c77fc 100644 --- a/mods/ENTITIES/mobs_mc/parrot.lua +++ b/mods/ENTITIES/mobs_mc/parrot.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:parrot", { makes_footstep_sound = true, walk_velocity = 3, run_velocity = 5, + -- TODO: sounds drops = { {name = mobs_mc.items.feather, chance = 1, diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua index 8028655a3..84da77e7a 100644 --- a/mods/ENTITIES/mobs_mc/polar_bear.lua +++ b/mods/ENTITIES/mobs_mc/polar_bear.lua @@ -50,10 +50,7 @@ mobs:register_mob("mobs_mc:polar_bear", { lava_damage = 5, light_damage = 0, fear_height = 4, - sounds = { - random = "Cowhurt1", -- TODO: Replace - distance = 16, - }, + -- TODO: sounds animation = { speed_normal = 25, speed_run = 50, stand_start = 0, stand_end = 0, diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index 0a15f3c78..d0a8d8491 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/mods/ENTITIES/mobs_mc/rabbit.lua @@ -24,7 +24,7 @@ local rabbit = { {"mobs_mc_rabbit_black.png"}, }, visual_size = {x=1.5, y=1.5}, - sounds = {}, + -- TODO: sounds: random, damage, death makes_footstep_sound = false, walk_velocity = 1, run_velocity = 3.7, diff --git a/mods/ENTITIES/mobs_mc/shulker.lua b/mods/ENTITIES/mobs_mc/shulker.lua index f7f4dabca..ddb17e7c3 100644 --- a/mods/ENTITIES/mobs_mc/shulker.lua +++ b/mods/ENTITIES/mobs_mc/shulker.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:shulker", { visual = "mesh", mesh = "mobs_mc_shulker.b3d", textures = { "mobs_mc_endergolem.png", }, + -- TODO: sounds -- TODO: Make shulker dye-able visual_size = {x=3, y=3}, walk_chance = 0, diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index b7f518291..7c9157cc2 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -21,7 +21,7 @@ mobs:register_mob("mobs_mc:silverfish", { }, pathfinding = 1, visual_size = {x=3, y=3}, - sounds = {}, + -- TODO: sounds makes_footstep_sound = false, walk_velocity = 0.6, run_velocity = 2, diff --git a/mods/ENTITIES/mobs_mc/snowman.lua b/mods/ENTITIES/mobs_mc/snowman.lua index 2a467a810..c5e560455 100644 --- a/mods/ENTITIES/mobs_mc/snowman.lua +++ b/mods/ENTITIES/mobs_mc/snowman.lua @@ -34,6 +34,7 @@ mobs:register_mob("mobs_mc:snowman", { collisionbox = {-0.35, -0.01, -0.35, 0.35, 1.89, 0.35}, visual = "mesh", mesh = "mobs_mc_snowman.b3d", + -- TODO: sounds: damage, death textures = { "mobs_mc_snowman.png", --snowman texture "farming_pumpkin_side.png", --top diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index a04f705df..2fe6ae53a 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -37,6 +37,7 @@ local spider = { sounds = { random = "mobs_spider", attack = "mobs_spider", + -- TODO: sounds: walk, death distance = 16, }, walk_velocity = 3.9, diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua index a2ea34abf..721f861b8 100644 --- a/mods/ENTITIES/mobs_mc/squid.lua +++ b/mods/ENTITIES/mobs_mc/squid.lua @@ -24,6 +24,8 @@ mobs:register_mob("mobs_mc:squid", { }, sounds = { damage = "mobs_mc_squid_hurt", + death = "mobs_mc_squid_hurt", + -- TODO: sounds: random, damage, death distance = 16, }, animation = { @@ -56,6 +58,8 @@ mobs:register_mob("mobs_mc:squid", { blood_texture = "mobs_mc_squid_blood.png", }) +-- TODO: Behaviour: squirt + -- Spawn near the water surface local water = mobs_mc.spawn_height.water diff --git a/mods/ENTITIES/mobs_mc/vex.lua b/mods/ENTITIES/mobs_mc/vex.lua index b7d1570d3..ec881dcdd 100644 --- a/mods/ENTITIES/mobs_mc/vex.lua +++ b/mods/ENTITIES/mobs_mc/vex.lua @@ -38,6 +38,7 @@ mobs:register_mob("mobs_mc:vex", { sounds = { random = "mobs_rat", death = "green_slime_death", + -- TODO: Sounds: random (better), death (better), damage distance = 16, }, animation = { @@ -53,6 +54,7 @@ mobs:register_mob("mobs_mc:vex", { }, do_custom = function(self, dtime) -- Glow red while attacking + -- TODO: Charge sound if self.state == "attack" then if self.base_texture[2] ~= "mobs_mc_vex_charging.png" then self.base_texture[2] = "mobs_mc_vex_charging.png" diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 8709ecdb2..892afadfc 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -929,12 +929,7 @@ mobs:register_mob("mobs_mc:villager", { walk_velocity = 1.2, run_velocity = 2.4, drops = {}, - sounds = { - random = "mobs_mc_villager_noise", - death = "mobs_mc_villager_death", - damage = "mobs_mc_villager_damage", - distance = 16, - }, + -- TODO: sounds animation = { stand_speed = 25, stand_start = 40, diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index 1e7fa9ecb..9c96e7ee7 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -61,13 +61,7 @@ mobs:register_mob("mobs_mc:evoker", { min = 1, max = 1,}, }, - sounds = { - random = "Villagerdead", - death = "Villagerdead", - damage = "mese_dragon", - attack = "zombiedeath", - distance = 16, - }, + -- TODO: sounds animation = { stand_speed = 25, stand_start = 40, diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index aafd083be..82eff89be 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -47,11 +47,7 @@ mobs:register_mob("mobs_mc:vindicator", { min = 1, max = 1,}, }, - sounds = { - random = "Villager1", - death = "Villagerdead", - damage = "Villagerhurt1", - }, + -- TODO: sounds animation = { stand_speed = 25, stand_start = 40, diff --git a/mods/ENTITIES/mobs_mc/witch.lua b/mods/ENTITIES/mobs_mc/witch.lua index 85abbdc2e..7edce46e5 100644 --- a/mods/ENTITIES/mobs_mc/witch.lua +++ b/mods/ENTITIES/mobs_mc/witch.lua @@ -50,12 +50,7 @@ mobs:register_mob("mobs_mc:witch", { {name = mobs_mc.items.sugar, chance = 8, min = 0, max = 2,}, {name = mobs_mc.items.stick, chance = 4, min = 0, max = 2,}, }, - sounds = { - random = "Villager1", - death = "Villagerdead", - damage = "Villagerhurt1", - distance = 16, - }, + -- TODO: sounds animation = { speed_normal = 30, speed_run = 60, diff --git a/mods/ENTITIES/mobs_mc/wither.lua b/mods/ENTITIES/mobs_mc/wither.lua index a29cbef12..4c85390ec 100644 --- a/mods/ENTITIES/mobs_mc/wither.lua +++ b/mods/ENTITIES/mobs_mc/wither.lua @@ -37,6 +37,7 @@ mobs:register_mob("mobs_mc:wither", { sounds = { shoot_attack = "mobs_mc_ender_dragon_shoot", attack = "mobs_mc_ender_dragon_attack", + -- TODO: sounds distance = 60, }, jump = true, diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua index 934fd753c..1884b6dec 100644 --- a/mods/ENTITIES/mobs_mc/wolf.lua +++ b/mods/ENTITIES/mobs_mc/wolf.lua @@ -35,10 +35,7 @@ local wolf = { }, visual_size = {x=3, y=3}, makes_footstep_sound = true, - sounds = { - war_cry = "mobs_wolf_attack", - distance = 16, - }, + -- TODO: sounds pathfinding = 1, floats = 1, view_range = 16,