Update node_specific spawns for mobs, and fix llama biome spawn.

mods/ENTITIES/mcl_mobs/api.lua

@@ -2865,7 +2865,7 @@ local do_states = function(self, dtime)
 
 			if self.shoot_interval
 			and self.timer > self.shoot_interval
-			and not minetest.raycast(p, self.attack:get_pos(), false, false):next()
+			and minetest.raycast(p, self.attack:get_pos(), false, false):next()
 			and random(1, 100) <= 60 then
 
 				self.timer = 0

mods/ENTITIES/mobs_mc/chicken.lua

@@ -109,10 +109,9 @@ mcl_mobs:register_mob("mobs_mc:chicken", {
 mcl_mobs:spawn_specific(
 "mobs_mc:chicken",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
-	"IcePlainsSpikes",
 	"ColdTaiga",
 	"ColdTaiga_beach",
 	"ColdTaiga_beach_water",

mods/ENTITIES/mobs_mc/cow+mooshroom.lua

@@ -148,10 +148,9 @@ mcl_mobs:register_mob("mobs_mc:mooshroom", mooshroom_def)
 mcl_mobs:spawn_specific(
 "mobs_mc:cow",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
-	"IcePlainsSpikes",
 	"ColdTaiga",
 	"ColdTaiga_beach",
 	"ColdTaiga_beach_water",
@@ -200,7 +199,7 @@ mcl_vars.mg_overworld_max)
 mcl_mobs:spawn_specific(
 "mobs_mc:mooshroom",
 "overworld",
-"ground",
+"mcl_core:mycelium",
 {
 "MushroomIslandShore",
 "MushroomIsland"

mods/ENTITIES/mobs_mc/creeper.lua

@@ -274,7 +274,6 @@ mcl_mobs:spawn_specific(
 "Plains",
 "Desert",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -301,7 +300,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",
@@ -340,7 +338,6 @@ mcl_mobs:spawn_specific(
 "Forest_deep_ocean",
 "JungleM_deep_ocean",
 "FlowerForest_deep_ocean",
-"MushroomIsland_ocean",
 "MegaTaiga_ocean",
 "StoneBeach_deep_ocean",
 "IcePlainsSpikes_deep_ocean",
@@ -350,7 +347,6 @@ mcl_mobs:spawn_specific(
 "MesaBryce_deep_ocean",
 "ExtremeHills+_deep_ocean",
 "ExtremeHills_ocean",
-"MushroomIsland_deep_ocean",
 "Forest_ocean",
 "MegaTaiga_deep_ocean",
 "JungleEdge_ocean",
@@ -376,7 +372,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",

mods/ENTITIES/mobs_mc/enderman.lua

@@ -627,7 +627,6 @@ mcl_mobs:spawn_specific(
 "Plains",
 "Desert",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -654,7 +653,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",
@@ -693,7 +691,6 @@ mcl_mobs:spawn_specific(
 "Forest_deep_ocean",
 "JungleM_deep_ocean",
 "FlowerForest_deep_ocean",
-"MushroomIsland_ocean",
 "MegaTaiga_ocean",
 "StoneBeach_deep_ocean",
 "IcePlainsSpikes_deep_ocean",
@@ -703,7 +700,6 @@ mcl_mobs:spawn_specific(
 "MesaBryce_deep_ocean",
 "ExtremeHills+_deep_ocean",
 "ExtremeHills_ocean",
-"MushroomIsland_deep_ocean",
 "Forest_ocean",
 "MegaTaiga_deep_ocean",
 "JungleEdge_ocean",
@@ -729,7 +725,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",

mods/ENTITIES/mobs_mc/llama.lua

@@ -215,7 +215,7 @@ mcl_mobs:register_mob("mobs_mc:llama", {
 mcl_mobs:spawn_specific(
 "mobs_mc:llama",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"Mesa",
 	"MesaPlateauFM_grasstop",
@@ -223,12 +223,11 @@ mcl_mobs:spawn_specific(
 	"MesaPlateauFM",
 	"MesaPlateauF_grasstop",
 	"MesaBryce",
-	"Jungle",
-	"Jungle_shore",
-	"JungleM",
-	"JungleM_shore",
-	"JungleEdge",
-	"JungleEdgeM",
+	"ExtremeHills",
+	"ExtremeHills_beach",
+	"ExtremeHillsM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
 },
 0,
 minetest.LIGHT_MAX+1,

mods/ENTITIES/mobs_mc/ocelot.lua

@@ -157,7 +157,7 @@ local base_spawn_chance = 5000
 mcl_mobs:spawn_specific(
 "mobs_mc:ocelot",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 "Jungle",
 "JungleEdgeM",

mods/ENTITIES/mobs_mc/parrot.lua

@@ -171,7 +171,7 @@ mcl_mobs:register_mob("mobs_mc:parrot", {
 mcl_mobs:spawn_specific(
 "mobs_mc:parrot",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass", "group:leaves", "group:tree"},
 {
 "Jungle",
 "JungleEdgeM",

mods/ENTITIES/mobs_mc/pig.lua

@@ -191,10 +191,9 @@ mcl_mobs:register_mob("mobs_mc:pig", {
 mcl_mobs:spawn_specific(
 "mobs_mc:pig",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
-	"IcePlainsSpikes",
 	"ColdTaiga",
 	"ColdTaiga_beach",
 	"ColdTaiga_beach_water",

mods/ENTITIES/mobs_mc/polar_bear.lua

@@ -71,7 +71,7 @@ mcl_mobs:register_mob("mobs_mc:polar_bear", {
 mcl_mobs:spawn_specific(
 "mobs_mc:polar_bear",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass","group:ice"},
 {
 "ColdTaiga",
 "IcePlainsSpikes",

mods/ENTITIES/mobs_mc/rabbit.lua

@@ -127,7 +127,7 @@ mcl_mobs:register_mob("mobs_mc:killer_bunny", killer_bunny)
 mcl_mobs:spawn_specific(
 "mobs_mc:rabbit",
 "overworld",
-"ground",
+{"mcl_core:dirt_with_grass","group:sand","mcl_core:snow_block"},
 {
 "Desert",
 "FlowerForest",

mods/ENTITIES/mobs_mc/sheep.lua

@@ -307,10 +307,9 @@ mcl_mobs:register_mob("mobs_mc:sheep", {
 mcl_mobs:spawn_specific(
 "mobs_mc:sheep",
 "overworld",
-"ground",
+"mcl_core:dirt_with_grass",
 {
 	"flat",
-	"IcePlainsSpikes",
 	"ColdTaiga",
 	"ColdTaiga_beach",
 	"ColdTaiga_beach_water",
@@ -321,7 +320,6 @@ mcl_mobs:spawn_specific(
 	"ExtremeHillsM",
 	"ExtremeHills+",
 	"ExtremeHills+_snowtop",
-	"StoneBeach",
 	"Plains",
 	"Plains_beach",
 	"SunflowerPlains",

mods/ENTITIES/mobs_mc/skeleton+stray.lua

@@ -90,9 +90,10 @@ local skeleton = {
 	arrow = "mcl_bows:arrow_entity",
 	shoot_arrow = function(self, pos, dir)
 		if mod_bows then
-			-- 2-4 damage per arrow
-			local dmg = math.max(4, math.random(2, 8))
-			mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg)
+			-- 1-4 damage per arrow
+			local dmg = math.random(1, 4)
+			local power = 26
+			mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, power, dmg)
 		end
 	end,
 	shoot_interval = 2,
@@ -162,7 +163,6 @@ mcl_mobs:spawn_specific(
 "Plains",
 "Desert",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -189,7 +189,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",
@@ -228,7 +227,6 @@ mcl_mobs:spawn_specific(
 "Forest_deep_ocean",
 "JungleM_deep_ocean",
 "FlowerForest_deep_ocean",
-"MushroomIsland_ocean",
 "MegaTaiga_ocean",
 "StoneBeach_deep_ocean",
 "IcePlainsSpikes_deep_ocean",
@@ -238,7 +236,6 @@ mcl_mobs:spawn_specific(
 "MesaBryce_deep_ocean",
 "ExtremeHills+_deep_ocean",
 "ExtremeHills_ocean",
-"MushroomIsland_deep_ocean",
 "Forest_ocean",
 "MegaTaiga_deep_ocean",
 "JungleEdge_ocean",
@@ -264,7 +261,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",

mods/ENTITIES/mobs_mc/slime+magma_cube.lua

@@ -169,7 +169,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",
@@ -213,7 +212,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",
@@ -257,7 +255,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",

mods/ENTITIES/mobs_mc/spider.lua

@@ -109,7 +109,6 @@ mcl_mobs:spawn_specific(
 "Plains",
 "Desert",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -136,7 +135,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",
@@ -175,7 +173,6 @@ mcl_mobs:spawn_specific(
 "Forest_deep_ocean",
 "JungleM_deep_ocean",
 "FlowerForest_deep_ocean",
-"MushroomIsland_ocean",
 "MegaTaiga_ocean",
 "StoneBeach_deep_ocean",
 "IcePlainsSpikes_deep_ocean",
@@ -185,7 +182,6 @@ mcl_mobs:spawn_specific(
 "MesaBryce_deep_ocean",
 "ExtremeHills+_deep_ocean",
 "ExtremeHills_ocean",
-"MushroomIsland_deep_ocean",
 "Forest_ocean",
 "MegaTaiga_deep_ocean",
 "JungleEdge_ocean",
@@ -211,7 +207,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",

mods/ENTITIES/mobs_mc/wolf.lua

@@ -236,7 +236,15 @@ mcl_mobs:register_mob("mobs_mc:dog", dog)
 mcl_mobs:spawn_specific(
 "mobs_mc:wolf",
 "overworld",
-"ground",
+{
+"mcl_core:dirt_with_grass",
+"mcl_core:dirt_with_grass_snow",
+"mcl_core:podzol",
+"mcl_core:podzol_snow",
+"mcl_core:dirt",
+"mcl_core:coarse_dirt",
+"mcl_core:snow_block"
+},
 {
 	"Taiga",
 	"MegaSpruceTaiga",

mods/ENTITIES/mobs_mc/zombie.lua

@@ -162,7 +162,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",
@@ -198,7 +197,6 @@ mcl_mobs:spawn_specific(
 "Forest",
 "Plains",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -225,7 +223,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",
@@ -254,7 +251,6 @@ mcl_mobs:spawn_specific(
 "RoofedForest_underground",
 "Jungle_underground",
 "Swampland_underground",
-"MushroomIsland_underground",
 "BirchForest_underground",
 "Plains_underground",
 "MesaPlateauF_underground",
@@ -290,7 +286,6 @@ mcl_mobs:spawn_specific(
 "Forest",
 "Plains",
 "ColdTaiga",
-"MushroomIsland",
 "IcePlainsSpikes",
 "SunflowerPlains",
 "IcePlains",
@@ -317,7 +312,6 @@ mcl_mobs:spawn_specific(
 "ExtremeHills_beach",
 "ColdTaiga_beach",
 "Swampland_shore",
-"MushroomIslandShore",
 "JungleM_shore",
 "Jungle_shore",
 "MesaPlateauFM_sandlevel",