diff --git a/mods/hyrule_mapgen/mapgen.lua b/mods/hyrule_mapgen/mapgen.lua index 279e78e..8214339 100644 --- a/mods/hyrule_mapgen/mapgen.lua +++ b/mods/hyrule_mapgen/mapgen.lua @@ -1096,6 +1096,29 @@ minetest.register_decoration({ height_max = 5, }) + +--bomb flower + +minetest.register_decoration({ + deco_type = "simple", + place_on = {"hyrule_mapgen:swamp_mud",}, + sidelen = 36, + noise_params = { + offset = 0.001, + scale = 0.005, + spread = {x = 200, y = 200, z = 200}, + seed = 230, + octaves = 3, + persist = 0.6 + }, + biomes = {"swamp"}, + y_min = 5, + y_max = 31000, + decoration = "hyruletools:bomb_flower", + height = 1, + height_max = 1, +}) + --icicle minetest.register_decoration({ @@ -1103,8 +1126,8 @@ minetest.register_decoration({ place_on = {"default:snowblock", "default:ice"}, sidelen = 16, noise_params = { - offset = 0.002, - scale = 0.02, + offset = 0.006, + scale = 0.04, spread = {x = 200, y = 200, z = 200}, seed = 230, octaves = 3, @@ -1459,11 +1482,11 @@ minetest.register_on_generated(function(minp, maxp) return end local grass = minetest.find_nodes_in_area(minp, maxp, - {"hyrule_mapgen:dirt_with_grass2"}) + {"default:dirt_with_grass2"}) for n = 1, #grass do if math.random(1, village_rarity) == 1 then local pos = {x = grass[n].x, y = grass[n].y, z = grass[n].z } - if minetest.get_node({x=pos.x+2, y=pos.y, z=pos.z+2}).name == "hyrule_mapgen:dirt_with_grass2" then + if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == "air" then minetest.place_schematic(pos, minetest.get_modpath("hyrule_mapgen").."/schematics/pine_village.mts", random, {}, true) end end diff --git a/mods/mobs_animal/sheep.lua b/mods/mobs_animal/sheep.lua index 3fbe164..9191680 100644 --- a/mods/mobs_animal/sheep.lua +++ b/mods/mobs_animal/sheep.lua @@ -51,12 +51,14 @@ for _, col in pairs(all_colours) do lava_damage = 5, light_damage = 0, animation = { - speed_normal = 15, - speed_run = 15, - stand_start = 0, - stand_end = 80, - walk_start = 81, - walk_end = 100, + speed_normal = 16, + speed_run = 20, + stand_start = 1, + stand_end = 25, + walk_start = 27, + walk_end = 46, + run_start = 27, + run_end = 46, }, follow = {"farming:wheat", "default:grass_5"}, view_range = 8, diff --git a/mods/mobs_animal/textures/mobs_sheep_base.png b/mods/mobs_animal/textures/mobs_sheep_base.png index cf6ef79..9f35d47 100644 Binary files a/mods/mobs_animal/textures/mobs_sheep_base.png and b/mods/mobs_animal/textures/mobs_sheep_base.png differ diff --git a/mods/mobs_animal/textures/mobs_sheep_shaved.png b/mods/mobs_animal/textures/mobs_sheep_shaved.png index 39be031..6a667be 100644 Binary files a/mods/mobs_animal/textures/mobs_sheep_shaved.png and b/mods/mobs_animal/textures/mobs_sheep_shaved.png differ diff --git a/mods/mobs_animal/textures/mobs_sheep_wool.png b/mods/mobs_animal/textures/mobs_sheep_wool.png index 2a41696..c36f9c5 100644 Binary files a/mods/mobs_animal/textures/mobs_sheep_wool.png and b/mods/mobs_animal/textures/mobs_sheep_wool.png differ diff --git a/testing map seeds.txt b/testing map seeds.txt index ebb21c9..f79c1cb 100644 --- a/testing map seeds.txt +++ b/testing map seeds.txt @@ -1,4 +1,5 @@ 234 - coniferous forest with weird patchy ground 221 - good flat spot for a village, also a weird patch of treeless conifer biome 1/2 - savannah -444- icesheet \ No newline at end of file +444- icesheet +80323674480348055 - swamp \ No newline at end of file