From 518252679f642d00057889b462eb8c87b0992de7 Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Thu, 8 Apr 2021 08:42:57 -0400 Subject: [PATCH] Fix a lot of things --- mods/ENTITIES/extra_mobs/cod.lua | 4 +++- mods/ENTITIES/extra_mobs/depends.txt | 1 + mods/ENTITIES/extra_mobs/dolphin.lua | 2 +- mods/ENTITIES/extra_mobs/fox.lua | 8 ++++---- mods/ENTITIES/extra_mobs/glow_squid.lua | 2 +- mods/ENTITIES/extra_mobs/hoglin+zoglin.lua | 4 ++-- mods/ENTITIES/extra_mobs/piglin.lua | 8 ++++---- mods/ENTITIES/extra_mobs/salmon.lua | 2 +- mods/ENTITIES/extra_mobs/strider.lua | 4 ++-- mods/ENTITIES/mcl_mobs/spawning.lua | 4 +++- mods/ENTITIES/mobs_mc/silverfish.lua | 1 - 11 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 mods/ENTITIES/extra_mobs/depends.txt diff --git a/mods/ENTITIES/extra_mobs/cod.lua b/mods/ENTITIES/extra_mobs/cod.lua index 32b9639807..3d3289734b 100644 --- a/mods/ENTITIES/extra_mobs/cod.lua +++ b/mods/ENTITIES/extra_mobs/cod.lua @@ -101,7 +101,9 @@ mobs:register_mob("extra_mobs:cod", cod) --spawning TODO: in schools -local water = mobs_mc.spawn_height.water + +local water = mobs_mc.spawn_height.water + 1 + mobs:spawn_specific( "extra_mobs:cod", "overworld", diff --git a/mods/ENTITIES/extra_mobs/depends.txt b/mods/ENTITIES/extra_mobs/depends.txt new file mode 100644 index 0000000000..db57bb24f8 --- /dev/null +++ b/mods/ENTITIES/extra_mobs/depends.txt @@ -0,0 +1 @@ +mobs_mc \ No newline at end of file diff --git a/mods/ENTITIES/extra_mobs/dolphin.lua b/mods/ENTITIES/extra_mobs/dolphin.lua index b16e13bf7c..467cf4017d 100644 --- a/mods/ENTITIES/extra_mobs/dolphin.lua +++ b/mods/ENTITIES/extra_mobs/dolphin.lua @@ -90,7 +90,7 @@ mobs:register_mob("extra_mobs:dolphin", dolphin) --spawning TODO: in schools -local water = mobs_mc.spawn_height.water +local water = mobs_mc.spawn_height.water + 1 mobs:spawn_specific( "extra_mobs:dolphin", "overworld", diff --git a/mods/ENTITIES/extra_mobs/fox.lua b/mods/ENTITIES/extra_mobs/fox.lua index 0f17714720..d42e6902ae 100644 --- a/mods/ENTITIES/extra_mobs/fox.lua +++ b/mods/ENTITIES/extra_mobs/fox.lua @@ -150,8 +150,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -0, -500) +mobs_mc.spawn_height.water, +mobs_mc.spawn_height.overworld_max) --mobs:spawn_specific("extra_mobs:fox", "overworld", "ground", 0, minetest.LIGHT_MAX+1, 30, 6000, 3, 0, 500) mobs:spawn_specific( @@ -169,8 +169,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -0, -500) +mobs_mc.spawn_height.water, +mobs_mc.spawn_height.overworld_max) -- spawn eggs mobs:register_egg("extra_mobs:fox", S("Fox"), "extra_mobs_spawn_icon_fox.png", 0) diff --git a/mods/ENTITIES/extra_mobs/glow_squid.lua b/mods/ENTITIES/extra_mobs/glow_squid.lua index b66a2a0f33..6f9fc38c9c 100644 --- a/mods/ENTITIES/extra_mobs/glow_squid.lua +++ b/mods/ENTITIES/extra_mobs/glow_squid.lua @@ -74,7 +74,7 @@ mobs:register_mob("extra_mobs:glow_squid",{ -- spawning -local water = mobs_mc.spawn_height.water +local water = mobs_mc.spawn_height.water + 1 mobs:spawn_specific( "extra_mobs:glow_squid", "overworld", diff --git a/mods/ENTITIES/extra_mobs/hoglin+zoglin.lua b/mods/ENTITIES/extra_mobs/hoglin+zoglin.lua index e83e88a960..06708e5732 100644 --- a/mods/ENTITIES/extra_mobs/hoglin+zoglin.lua +++ b/mods/ENTITIES/extra_mobs/hoglin+zoglin.lua @@ -127,8 +127,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -mcl_vars.mg_nether_min, -mcl_vars.mg_nether_max) +mobs_mc.spawn_height.nether_min, +mobs_mc.spawn_height.nether_max) -- spawn eggs mobs:register_egg("extra_mobs:hoglin", S("Hoglin"), "extra_mobs_spawn_icon_hoglin.png", 0) diff --git a/mods/ENTITIES/extra_mobs/piglin.lua b/mods/ENTITIES/extra_mobs/piglin.lua index 5975649bae..bb111c7d75 100644 --- a/mods/ENTITIES/extra_mobs/piglin.lua +++ b/mods/ENTITIES/extra_mobs/piglin.lua @@ -276,8 +276,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -mcl_vars.mg_nether_min, -mcl_vars.mg_nether_max) +mobs_mc.spawn_height.nether_min, +mobs_mc.spawn_height.nether_max) mobs:spawn_specific( "extra_mobs:sword_piglin", @@ -291,8 +291,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -mcl_vars.mg_nether_min, -mcl_vars.mg_nether_max) +mobs_mc.spawn_height.nether_min, +mobs_mc.spawn_height.nether_max) -- spawn eggs mobs:register_egg("extra_mobs:piglin", S("piglin"), "extra_mobs_spawn_icon_piglin.png", 0) mobs:register_egg("extra_mobs:piglin_brute", S("piglin Brute"), "extra_mobs_spawn_icon_piglin.png", 0) diff --git a/mods/ENTITIES/extra_mobs/salmon.lua b/mods/ENTITIES/extra_mobs/salmon.lua index bb03a7e512..c8d6e1cfd5 100644 --- a/mods/ENTITIES/extra_mobs/salmon.lua +++ b/mods/ENTITIES/extra_mobs/salmon.lua @@ -60,7 +60,7 @@ mobs:register_mob("extra_mobs:salmon", salmon) --spawning TODO: in schools -local water = mobs_mc.spawn_height.water +local water = mobs_mc.spawn_height.water + 1 mobs:spawn_specific( "extra_mobs:salmon", "overworld", diff --git a/mods/ENTITIES/extra_mobs/strider.lua b/mods/ENTITIES/extra_mobs/strider.lua index 164bae2f8d..1847161565 100644 --- a/mods/ENTITIES/extra_mobs/strider.lua +++ b/mods/ENTITIES/extra_mobs/strider.lua @@ -229,8 +229,8 @@ minetest.LIGHT_MAX+1, 30, 6000, 3, -mcl_vars.mg_nether_min, -mcl_vars.mg_nether_max) +mobs_mc.spawn_height.nether_min, +mobs_mc.spawn_height.nether_max) -- spawn eggs mobs:register_egg("extra_mobs:strider", S("Strider"), "extra_mobs_spawn_icon_strider.png", 0) diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua index 01e2eb9e53..0b386390b7 100644 --- a/mods/ENTITIES/mcl_mobs/spawning.lua +++ b/mods/ENTITIES/mcl_mobs/spawning.lua @@ -461,11 +461,13 @@ function mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_ligh end for y = min_height, max_height do - print(y) + --print(y) end end end + print("--") + print(min_height, max_height) --[[ diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index 9befe19054..433211503b 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -23,7 +23,6 @@ mobs:register_mob("mobs_mc:silverfish", { }, pathfinding = 1, visual_size = {x=3, y=3}, - sounds = {"FlowerForest", sounds = { random = "mobs_mc_silverfish_idle", death = "mobs_mc_silverfish_death",