diff --git a/spawners_mobs/LICENSE.txt b/spawners_mobs/LICENSE.txt index cd27df2..e0315d9 100644 --- a/spawners_mobs/LICENSE.txt +++ b/spawners_mobs/LICENSE.txt @@ -546,6 +546,40 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - spawners_mobs_bunny.ogg +**CC0-1.0, by bananplyte**, https://freesound.org/people/bananplyte/sounds + +- spawners_mobs_uruk_hai_hit.1.ogg +- spawners_mobs_uruk_hai_hit.2.ogg +- spawners_mobs_uruk_hai_hit.3.ogg +- spawners_mobs_uruk_hai_neutral.1.ogg +- spawners_mobs_uruk_hai_neutral.2.ogg +- spawners_mobs_uruk_hai_neutral.3.ogg +- spawners_mobs_uruk_hai_attack.1.ogg +- spawners_mobs_uruk_hai_attack.2.ogg +- spawners_mobs_uruk_hai_attack.3.ogg +- spawners_mobs_uruk_hai_death.1.ogg +- spawners_mobs_uruk_hai_death.2.ogg +- spawners_mobs_uruk_hai_death.3.ogg + +**CC-BY-4.0, by LittleRobotSoundFactory**, https://freesound.org/people/LittleRobotSoundFactory/sounds + +- spawners_mobs_balrog_hit.1.ogg +- spawners_mobs_balrog_hit.2.ogg +- spawners_mobs_balrog_hit.3.ogg +- spawners_mobs_balrog_neutral.1.ogg +- spawners_mobs_balrog_neutral.2.ogg +- spawners_mobs_balrog_neutral.3.ogg +- spawners_mobs_balrog_attack.1.ogg +- spawners_mobs_balrog_attack.2.ogg +- spawners_mobs_balrog_attack.3.ogg +- spawners_mobs_balrog_death.1.ogg +- spawners_mobs_balrog_death.2.ogg +- spawners_mobs_balrog_death.3.ogg + +**CC-BY-4.0, by LiamG_SFX**, https://freesound.org/people/LiamG_SFX/sounds/334234/ + +- spawners_mobs_balrog_fireball.ogg + ### Models **Original model by MirceaKitsune (CC BY-SA 3.0).** diff --git a/spawners_mobs/config.lua b/spawners_mobs/config.lua index 4d26f0a..04abab4 100644 --- a/spawners_mobs/config.lua +++ b/spawners_mobs/config.lua @@ -56,7 +56,7 @@ spawners_mobs.MOBS_PROPS = { egg_name_custom = '', dummy_size = { x = 0.3, y = 0.3 }, dummy_offset = -0.3, - dummy_mesh = 'mobs_cow.x', + dummy_mesh = 'mobs_cow.b3d', dummy_texture = { 'mobs_cow.png' }, night_only = false, sound_custom = '' @@ -66,7 +66,7 @@ spawners_mobs.MOBS_PROPS = { egg_name_custom = '', dummy_size = { x = 0.9, y = 0.9 }, dummy_offset = 0.2, - dummy_mesh = 'mobs_chicken.x', + dummy_mesh = 'mobs_chicken.b3d', dummy_texture = { 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png', 'mobs_chicken.png' }, night_only = false, sound_custom = 'mobs_chicken' @@ -76,7 +76,7 @@ spawners_mobs.MOBS_PROPS = { egg_name_custom = '', dummy_size = { x = 0.62, y = 0.62 }, dummy_offset = -0.3, - dummy_mesh = 'mobs_pumba.x', + dummy_mesh = 'mobs_pumba.b3d', dummy_texture = { 'mobs_pumba.png' }, night_only = false, sound_custom = 'mobs_pig' diff --git a/spawners_mobs/mob_balrog.lua b/spawners_mobs/mob_balrog.lua index 37764f0..be5a9b7 100644 --- a/spawners_mobs/mob_balrog.lua +++ b/spawners_mobs/mob_balrog.lua @@ -22,8 +22,10 @@ local balrog_def = { type = 'monster', passive = false, rotate = 180, - hp_min = 1000, - hp_max = 1250, + hp_min = 10, + hp_max = 15, + -- hp_min = 1000, + -- hp_max = 1250, pathfinding = false, attack_type = 'dogshoot', shoot_interval = 0.6, @@ -32,7 +34,8 @@ local balrog_def = { shoot_offset = 1, arrow = 'spawners_mobs:balrog_firebolt', reach = 5, - damage = 10, + damage = 1, + -- damage = 10, armor = 100, collisionbox = { -0.8, -2.1, -0.8, 0.8, 2.6, 0.8 }, visual_size = { x = 2, y = 2 }, diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.1.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.1.ogg index 1458191..289a9d5 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.1.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_attack.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.2.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.2.ogg index 44e185b..3787d80 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.2.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_attack.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.3.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.3.ogg index 253d3bb..1cb3965 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.3.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_attack.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.4.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.4.ogg deleted file mode 100644 index 47a4e05..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.5.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.5.ogg deleted file mode 100644 index b6593ca..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.5.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_attack.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_attack.ogg deleted file mode 100644 index 563510f..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_attack.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_death.1.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_death.1.ogg new file mode 100644 index 0000000..729fba3 Binary files /dev/null and b/spawners_mobs/sounds/spawners_mobs_balrog_death.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_death.2.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_death.2.ogg new file mode 100644 index 0000000..a7cf5d0 Binary files /dev/null and b/spawners_mobs/sounds/spawners_mobs_balrog_death.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_death.3.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_death.3.ogg new file mode 100644 index 0000000..4e5cb24 Binary files /dev/null and b/spawners_mobs/sounds/spawners_mobs_balrog_death.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_death.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_death.ogg deleted file mode 100644 index 8b0ba31..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_death.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_fireball.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_fireball.ogg index edf36c0..8191329 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_fireball.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_fireball.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.1.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.1.ogg index 3fd4351..502ba83 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.1.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_hit.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.2.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.2.ogg index 66b5db1..99d2b76 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.2.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_hit.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.3.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.3.ogg index 2126d49..a79e279 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.3.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_hit.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.4.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.4.ogg deleted file mode 100644 index defc3f1..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.5.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.5.ogg deleted file mode 100644 index 734267c..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.5.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_hit.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_hit.ogg deleted file mode 100644 index 2758090..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_hit.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.1.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.1.ogg index 2d9729e..fc2b338 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.1.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.2.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.2.ogg index 2ada628..12dff05 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.2.ogg and b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.3.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.3.ogg new file mode 100644 index 0000000..06c1ad9 Binary files /dev/null and b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.ogg b/spawners_mobs/sounds/spawners_mobs_balrog_neutral.ogg deleted file mode 100644 index ab735c0..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_balrog_neutral.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.1.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.1.ogg index cfaefe6..ee6ca95 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.1.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.2.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.2.ogg index b881531..95f6ee2 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.2.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.3.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.3.ogg index 5277e56..d6e035e 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.3.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.4.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.4.ogg deleted file mode 100644 index 9c210a1..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.ogg deleted file mode 100644 index 41d1d71..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_attack.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.1.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.1.ogg index 23d2236..b978bb6 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.1.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.2.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.2.ogg index 7d7593f..d821eb4 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.2.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.3.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.3.ogg index 32712c4..5f3655c 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.3.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.4.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.4.ogg deleted file mode 100644 index c4cdcc0..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.ogg deleted file mode 100644 index 50dadde..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_death.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.1.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.1.ogg index 15fc81f..d9f82f4 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.1.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.2.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.2.ogg index 181eadf..03dda9f 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.2.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.3.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.3.ogg index 160c333..5ca00f5 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.3.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.4.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.4.ogg deleted file mode 100644 index db7e574..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.5.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.5.ogg deleted file mode 100644 index 1a27a68..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.5.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.ogg deleted file mode 100644 index 7b33c56..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_hit.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.1.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.1.ogg index a35f6aa..b565cd2 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.1.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.1.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.2.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.2.ogg index 40adb21..a333409 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.2.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.2.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.3.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.3.ogg index 3f25677..4f41df5 100644 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.3.ogg and b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.3.ogg differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.4.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.4.ogg deleted file mode 100644 index 7567c64..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.4.ogg and /dev/null differ diff --git a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.ogg b/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.ogg deleted file mode 100644 index 33e3633..0000000 Binary files a/spawners_mobs/sounds/spawners_mobs_uruk_hai_neutral.ogg and /dev/null differ