diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index bb2fd5d..9a822cd 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -44,7 +44,7 @@ beds.register_bed("beds:fancy_bed", { selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { {"", "", "group:stick"}, - {"wool:red", "wool:red", "wool:white"}, + {"wool:green", "wool:green", "wool:white"}, {"group:wood", "group:wood", "group:wood"}, }, }) @@ -79,7 +79,7 @@ beds.register_bed("beds:bed", { }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { - {"wool:red", "wool:red", "wool:white"}, + {"wool:green", "wool:green", "wool:white"}, {"group:wood", "group:wood", "group:wood"} }, }) diff --git a/mods/default/textures/default_coal_lump.png b/mods/default/textures/default_coal_lump.png index f4eefcf..0583fcc 100644 Binary files a/mods/default/textures/default_coal_lump.png and b/mods/default/textures/default_coal_lump.png differ diff --git a/mods/default/textures/default_gravel.png b/mods/default/textures/default_gravel.png index 8852d38..4bfe715 100644 Binary files a/mods/default/textures/default_gravel.png and b/mods/default/textures/default_gravel.png differ diff --git a/mods/hell/init.lua b/mods/hell/init.lua index 00587e9..d611e03 100644 --- a/mods/hell/init.lua +++ b/mods/hell/init.lua @@ -8,6 +8,7 @@ hell.player_teleporting = {} -- 0 for huge caves -- 0.5 for smaller caves local TCAVE = 0 +local regular_sky = false local BLEND = 128 -- Cave blend distance near YMIN, YMAX @@ -138,11 +139,17 @@ minetest.register_globalstep(function(dtime) for i, player in pairs(minetest.get_connected_players()) do local pos = player:getpos().y if pos < YMAX and pos > YMIN then + if regular_sky then print("set player to hell color") player:set_sky({r=66, g=0, b=0},"plain",{}) + regular_sky = false + end else --if not in hell, change back to default sky + if not regular_sky then player:set_sky({r=0, g=0, b=0},"regular",{}) + regular_sky = true + end end end hell.sky_color_timer = 0 diff --git a/mods/hyrule_mapgen/schematics/big_tree.mts b/mods/hyrule_mapgen/schematics/big_tree.mts index f4113ce..07c8d9b 100644 Binary files a/mods/hyrule_mapgen/schematics/big_tree.mts and b/mods/hyrule_mapgen/schematics/big_tree.mts differ diff --git a/mods/hyrule_mapgen/schematics/big_tree2.mts b/mods/hyrule_mapgen/schematics/big_tree2.mts new file mode 100644 index 0000000..f4113ce Binary files /dev/null and b/mods/hyrule_mapgen/schematics/big_tree2.mts differ diff --git a/mods/hyruletools/init.lua b/mods/hyruletools/init.lua index 1b48b5b..a90c346 100644 --- a/mods/hyruletools/init.lua +++ b/mods/hyruletools/init.lua @@ -837,7 +837,7 @@ minetest.register_craftitem("hyruletools:ocarina2", { local dir = placer:get_look_dir(); local player = placer:get_player_name() if minetest.setting_getbool("enable_weather") then - weather.state = "rain" + weather.state = "thunder" else minetest.chat_send_player(player, "weather not enabled!") end @@ -916,7 +916,7 @@ minetest.register_craftitem("hyruletools:ocarina4", { ) local playerpos = placer:getpos(); local dir = placer:get_look_dir(); - local obj = minetest.env:add_entity({x=playerpos.x+1+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+1+dir.z}, "mobs:deku") + local obj = minetest.env:add_entity({x=playerpos.x+1+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+1+dir.z}, "mobs_loz:business_scrub_passive") end }) @@ -2234,7 +2234,7 @@ minetest.register_node("hyruletools:bomb_plant", { "hyruletools_bombflower_plant.png", }, paramtype = "light", - groups = {cracky=1}, + groups = {snappy=1, oddly_breakable_by_hand=1}, collision_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.5, 0.5 } diff --git a/mods/lightning/init.lua b/mods/lightning/init.lua index cc77de9..eede71f 100644 --- a/mods/lightning/init.lua +++ b/mods/lightning/init.lua @@ -24,6 +24,7 @@ local rng = PcgRandom(32321123312123) local ps = {} local ttl = 1 +local sky_set = false local revertsky = function() if ttl == 0 then @@ -35,8 +36,11 @@ local revertsky = function() end for key, entry in pairs(ps) do + if not sky_set then local sky = entry.sky entry.p:set_sky(sky.bgcolor, sky.type, sky.textures) + sky_set = true + end end ps = {} @@ -135,7 +139,7 @@ lightning.strike = function(pos) local sky = {} sky.bgcolor, sky.type, sky.textures = player:get_sky() - + sky_set = false local name = player:get_player_name() if ps[name] == nil then ps[name] = {p = player, sky = sky} diff --git a/mods/mobs_animal/textures/mobs_cucco2.png b/mods/mobs_animal/textures/mobs_cucco2.png new file mode 100644 index 0000000..96051fd Binary files /dev/null and b/mods/mobs_animal/textures/mobs_cucco2.png differ