diff --git a/games/default/files/mobs_animal/bear.lua b/games/default/files/mobs_animal/bear.lua index 3b3dc0ce7..25dc926f3 100644 --- a/games/default/files/mobs_animal/bear.lua +++ b/games/default/files/mobs_animal/bear.lua @@ -92,8 +92,9 @@ mobs:spawn({ name = "mobs_animal:bear", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 0, + interval = 30, chance = 15000, min_height = 0, max_height = 31000, diff --git a/games/default/files/mobs_animal/bunny.lua b/games/default/files/mobs_animal/bunny.lua index 4def303e1..74a3baeb8 100644 --- a/games/default/files/mobs_animal/bunny.lua +++ b/games/default/files/mobs_animal/bunny.lua @@ -100,12 +100,9 @@ mobs:register_mob("mobs_animal:bunny", { damage = 5, }) - -local spawn_on = {"default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, - mobs:spawn({ name = "mobs_animal:bunny", - nodes = {spawn_on}, + nodes = {"default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 10, interval = 30, chance = 8000, diff --git a/games/default/files/mobs_animal/chicken.lua b/games/default/files/mobs_animal/chicken.lua index 8aceb8961..45805c6da 100644 --- a/games/default/files/mobs_animal/chicken.lua +++ b/games/default/files/mobs_animal/chicken.lua @@ -80,15 +80,14 @@ mobs:register_mob("mobs_animal:chicken", { end, }) -local spawn_on = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, - mobs:spawn({ name = "mobs_animal:chicken", - nodes = {spawn_on}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, chance = 8000, min_height = 0, + max_height = 31000, day_toggle = true, }) diff --git a/games/default/files/mobs_animal/cow.lua b/games/default/files/mobs_animal/cow.lua index cdff39dec..29f1f61f6 100644 --- a/games/default/files/mobs_animal/cow.lua +++ b/games/default/files/mobs_animal/cow.lua @@ -109,10 +109,10 @@ mobs:register_mob("mobs_animal:cow", { mobs:spawn({ name = "mobs_animal:cow", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, - chance = 8000, + chance = 10000, min_height = 0, max_height = 31000, day_toggle = true, diff --git a/games/default/files/mobs_animal/dog.lua b/games/default/files/mobs_animal/dog.lua index 2d116ce04..e2ac5e5c6 100644 --- a/games/default/files/mobs_animal/dog.lua +++ b/games/default/files/mobs_animal/dog.lua @@ -59,8 +59,9 @@ mobs:spawn({ name = "mobs_animal:wolf", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 0, + interval = 30, chance = 15000, min_height = 0, max_height = 31000, diff --git a/games/default/files/mobs_animal/kitten.lua b/games/default/files/mobs_animal/kitten.lua index b540d8b2a..a347ee18a 100644 --- a/games/default/files/mobs_animal/kitten.lua +++ b/games/default/files/mobs_animal/kitten.lua @@ -48,13 +48,10 @@ mobs:register_mob("mobs_animal:kitten", { end }) - -local spawn_on = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, - mobs:spawn({ name = "mobs_animal:kitten", - nodes = {spawn_on}, - min_light = 12, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + min_light = 10, interval = 30, chance = 10000, min_height = 0, diff --git a/games/default/files/mobs_animal/pig.lua b/games/default/files/mobs_animal/pig.lua index 85da18eea..73e9b29ed 100644 --- a/games/default/files/mobs_animal/pig.lua +++ b/games/default/files/mobs_animal/pig.lua @@ -56,8 +56,9 @@ mobs:register_mob("mobs_animal:pig", { mobs:spawn({ name = "mobs_animal:pig", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, + interval = 30, chance = 15000, min_height = 0, max_height = 31000, diff --git a/games/default/files/mobs_animal/sheep.lua b/games/default/files/mobs_animal/sheep.lua index 0470ab78c..11c161786 100644 --- a/games/default/files/mobs_animal/sheep.lua +++ b/games/default/files/mobs_animal/sheep.lua @@ -185,10 +185,10 @@ end mobs:spawn({ name = "mobs_animal:sheep_white", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, - chance = 8000, + chance = 20000, min_height = 0, max_height = 31000, day_toggle = true, @@ -196,10 +196,10 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_grey", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, - chance = 8000, + chance = 20000, min_height = 0, max_height = 31000, day_toggle = true, @@ -207,9 +207,9 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_dark_grey", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, interval = 30, - chance = 8000, + chance = 20000, min_height = 0, max_height = 31000, day_toggle = true, @@ -217,10 +217,10 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_black", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, - chance = 8000, + chance = 20000, min_height = 0, max_height = 31000, day_toggle = true, @@ -228,10 +228,10 @@ mobs:spawn({ mobs:spawn({ name = "mobs_animal:sheep_brown", - nodes = {"default:dirt", "default:sand", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, + nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass"}, min_light = 5, interval = 30, - chance = 8000, + chance = 20000, min_height = 0, max_height = 31000, day_toggle = true, diff --git a/games/default/files/mobs_monster/skeleton.lua b/games/default/files/mobs_monster/skeleton.lua index be77d2ff8..25ee05422 100644 --- a/games/default/files/mobs_monster/skeleton.lua +++ b/games/default/files/mobs_monster/skeleton.lua @@ -53,7 +53,7 @@ mobs:register_mob("mobs_monster:skeleton", { mobs:spawn({ name = "mobs_monster:skeleton", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 10, chance = 7000, diff --git a/games/default/files/mobs_monster/spider.lua b/games/default/files/mobs_monster/spider.lua index 5ef526ec7..88e02f399 100644 --- a/games/default/files/mobs_monster/spider.lua +++ b/games/default/files/mobs_monster/spider.lua @@ -60,10 +60,11 @@ mobs:register_mob("mobs_monster:spider", { mobs:spawn({ name = "mobs_monster:spider", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 12, - chance = 7000, + interval = 30, + chance = 10000, min_height = -50, max_height = 31000, }) @@ -134,11 +135,11 @@ mobs:register_mob("mobs_monster:small_spider", { mobs:spawn({ name = "mobs_monster:small_spider", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:redsand", "default:stone", "default:snow", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 15, interval = 30, - chance = 8000, + chance = 10000, min_height = -50, max_height = 31000, }) diff --git a/games/default/files/mobs_monster/zombie.lua b/games/default/files/mobs_monster/zombie.lua index 6a5ce35f7..ad76e10b9 100644 --- a/games/default/files/mobs_monster/zombie.lua +++ b/games/default/files/mobs_monster/zombie.lua @@ -54,7 +54,7 @@ mobs:register_mob("mobs_monster:zombie", { mobs:spawn({ name = "mobs_monster:zombie", - nodes = {"default:dirt", "default:sandstone", "default:sand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, + nodes = {"default:dirt", "default:sandstone", "default:sand", "default:redsand", "default:stone", "default:snowblock", "default:dirt_with_snow", "default:dirt_with_grass", "default:cobble", "default:mossycobble"}, min_light = 0, max_light = 10, chance = 7000, diff --git a/games/default/files/mobs_redo/api.lua b/games/default/files/mobs_redo/api.lua index f6476dd2e..20b6f1bfb 100644 --- a/games/default/files/mobs_redo/api.lua +++ b/games/default/files/mobs_redo/api.lua @@ -2991,7 +2991,7 @@ minetest.register_entity(name, { jump_height = def.jump_height or 4, -- was 6 drawtype = def.drawtype, -- DEPRECATED, use rotate instead rotate = math.rad(def.rotate or 0), -- 0=front, 90=side, 180=back, 270=side2 - lifetimer = def.lifetimer or 180, -- 3 minutes + lifetimer = def.lifetimer or 1800, -- 30 min hp_min = max(1, (def.hp_min or 5) * difficulty), hp_max = max(1, (def.hp_max or 10) * difficulty), physical = true,