Remove "double drop" mechanics for bamboo (fixes #4514) (#4642)

Reviewed-on: VoxeLibre/VoxeLibre#4642
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-committed-by: Mikita Wiśniewski <rudzik8@protonmail.com>

mods/ENTITIES/mcl_burning/api.lua

@@ -14,8 +14,7 @@ function mcl_burning.is_burning(obj)
 end
 
 function mcl_burning.is_affected_by_rain(obj)
-	local pos = obj:get_pos()
-	return mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) and mcl_weather.has_rain(pos)
+	return mcl_weather.get_weather() == "rain" and mcl_weather.is_outdoor(obj:get_pos())
 end
 
 function mcl_burning.get_collisionbox(obj, smaller, storage)

mods/ENTITIES/mcl_mobs/breeding.lua

@@ -105,7 +105,7 @@ end
 
 -- Spawn a child
 function mcl_mobs.spawn_child(pos, mob_type)
-	local child = mcl_mobs.spawn(pos, mob_type)
+	local child = minetest.add_entity(pos, mob_type)
 	if not child then
 		return
 	end

mods/ENTITIES/mcl_mobs/physics.lua

@@ -653,10 +653,8 @@ function mob_class:do_env_damage()
 		local _, dim = mcl_worlds.y_to_layer(pos.y)
 		if (self.sunlight_damage ~= 0 or self.ignited_by_sunlight) and (sunlight or 0) >= minetest.LIGHT_MAX and dim == "overworld" then
 			if self.armor_list and not self.armor_list.helmet or not self.armor_list or self.armor_list and self.armor_list.helmet and self.armor_list.helmet == "" then
-				if self.ignited_by_sunlight and (not mcl_weather.rain.raining or not mcl_weather.has_rain(pos)) then
-					if (#mcl_burning.get_touching_nodes(self.object, "group:puts_out_fire", self) == 0) then
+				if self.ignited_by_sunlight then
 					mcl_burning.set_on_fire(self.object, 10)
-					end
 				else
 					self:deal_light_damage(pos, self.sunlight_damage)
 					return true
@@ -694,11 +692,9 @@ function mob_class:do_env_damage()
 	local nodef3 = minetest.registered_nodes[self.standing_under]
 
 	-- rain
-	if self.rain_damage > 0 and mcl_burning.is_affected_by_rain(self.object) then
+	if self.rain_damage > 0 and mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
 		self.health = self.health - self.rain_damage
-
-		if self:check_for_death("rain", {type = "environment",
-				pos = pos, node = self.standing_in}) then
+		if self:check_for_death("rain", {type = "environment", pos = pos, node = self.standing_in}) then
 			return true
 		end
 	end
@@ -932,8 +928,6 @@ end
 -- falling and fall damage
 -- returns true if mob died
 function mob_class:falling(pos, moveresult)
-	if moveresult and moveresult.touching_ground then return false end
-
 	if self.fly and self.state ~= "die" then
 		return
 	end
@@ -956,7 +950,13 @@ function mob_class:falling(pos, moveresult)
 			new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
 		elseif v.y <= 0 and v.y > self.fall_speed then
 			-- fall downwards at set speed
+			if moveresult and moveresult.touching_ground then
+				-- when touching ground, retain a minimal gravity to keep the touching_ground flag
+				-- but also to not get upwards acceleration with large dtime when on bouncy ground
+				new_acceleration = vector.new(0, self.fall_speed * 0.01, 0)
+			else
 				new_acceleration = vector.new(0, self.fall_speed, 0)
+			end
 		else
 			-- stop accelerating once max fall speed hit
 			new_acceleration =vector.zero()

mods/ENTITIES/mobs_mc/axolotl.lua

@@ -72,17 +72,23 @@ local axolotl = {
 	fly = true,
 	fly_in = { "mcl_core:water_source", "mclx_core:river_water_source" },
 	breathes_in_water = true,
-	jump = true,
+	jump = false, -- would get them out of the water too often
 	damage = 2,
 	reach = 2,
 	attack_type = "dogfight",
 	attack_animals = true,
 	specific_attack = {
-		"extra_mobs_cod",
-		"extra_mobs_glow_squid",
-		"extra_mobs_salmon",
-		"extra_mobs_tropical_fish",
-		"mobs_mc_squid"
+		"mobs_mc:cod",
+		"mobs_mc:glow_squid",
+		"mobs_mc:salmon",
+		"mobs_mc:tropical_fish",
+		"mobs_mc:squid",
+		"mobs_mc:zombie", -- todo: only drowned?
+		"mobs_mc:baby_zombie",
+		"mobs_mc:husk",
+		"mobs_mc:baby_husk",
+		"mobs_mc:guardian_elder",
+		"mobs_mc:guardian",
 	},
 	runaway = true,
 }

mods/ENTITIES/mobs_mc/rover.lua

@@ -156,7 +156,27 @@ mcl_mobs.register_mob("mobs_mc:rover", {
 		-- RAIN DAMAGE / EVASIVE WARP BEHAVIOUR HERE.
 		local enderpos = self.object:get_pos()
 		local dim = mcl_worlds.pos_to_dimension(enderpos)
-		if dim == "overworld" and mcl_burning.is_affected_by_rain(self.object) then
+		if dim == "overworld" then
+			if mcl_weather.state == "rain" or mcl_weather.state == "lightning" then
+				local damage = true
+				local enderpos = self.object:get_pos()
+				enderpos.y = enderpos.y+2.89
+				local height = {x=enderpos.x, y=enderpos.y+512,z=enderpos.z}
+				local ray = minetest.raycast(enderpos, height, true)
+				-- Check for blocks above enderman.
+				for pointed_thing in ray do
+					if pointed_thing.type == "node" then
+						local nn = minetest.get_node(minetest.get_pointed_thing_position(pointed_thing)).name
+						local def = minetest.registered_nodes[nn]
+						if (not def) or def.walkable then
+							-- There's a node in the way. Delete arrow without damage
+							damage = false
+							break
+						end
+					end
+				end
+
+				if damage == true then
 					self.state = ""
 					--rain hurts enderman
 					self.object:punch(self.object, 1.0, {
@@ -166,6 +186,8 @@ mcl_mobs.register_mob("mobs_mc:rover", {
 					--randomly teleport hopefully under something.
 					self:teleport(nil)
 				end
+			end
+		end
 
 		-- AGRESSIVELY WARP/CHASE PLAYER BEHAVIOUR HERE.
 		if self.state == "attack" then

mods/ENVIRONMENT/mcl_weather/rain.lua

@@ -157,6 +157,7 @@ function mcl_weather.rain.clear()
 		mcl_weather.rain.remove_sound(player)
 		mcl_weather.rain.remove_player(player)
 		mcl_weather.remove_spawners_player(player)
+		player:set_clouds({color="#FFF0EF"})
 	end
 end
 

mods/ENVIRONMENT/mcl_weather/skycolor.lua

@@ -2,6 +2,7 @@
 local modname = minetest.get_current_modname()
 local modpath = minetest.get_modpath(modname)
 local NIGHT_VISION_RATIO = 0.45
+local DEBUG = false
 
 -- Settings
 local minimum_update_interval = { 250e3 }
@@ -190,8 +191,8 @@ end
 
 function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	-- Clamp current_val to valid range
-	current_val = math.min(minval, current_val)
-	current_val = math.max(maxval, current_val)
+	current_val = math.max(minval, current_val)
+	current_val = math.min(maxval, current_val)
 
 	-- Rescale current_val from a number between minval and maxval to a number between 1 and #colors
 	local scaled_value = (current_val - minval) / (maxval - minval) * (#colors - 1) + 1.0
@@ -199,7 +200,7 @@ function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	-- Get the first color's values
 	local index1 = math.floor(scaled_value)
 	local color1 = colors[index1]
-	local frac1 = scaled_value - index1
+	local frac1 = 1.0 - (scaled_value - index1)
 
 	-- Get the second color's values
 	local index2 = math.min(index1 + 1, #colors) -- clamp to maximum color index (will occur if index1 == #colors)
@@ -207,11 +208,32 @@ function skycolor_utils.convert_to_rgb(minval, maxval, current_val, colors)
 	local color2 = colors[index2]
 
 	-- Interpolate between color1 and color2
-	return {
+	local res = {
 		r = math.floor(frac1 * color1.r + frac2 * color2.r),
 		g = math.floor(frac1 * color1.g + frac2 * color2.g),
 		b = math.floor(frac1 * color1.b + frac2 * color2.b),
 	}
+
+	if DEBUG then
+		minetest.log(dump({
+			minval = minval,
+			maxval = maxval,
+			current_val = current_val,
+			colors = colors,
+			res = res,
+			scaled_value = scaled_value,
+
+			frac1 = frac1,
+			index1 = index1,
+			color1 = color1,
+
+			frac2 = frac2,
+			index2 = index2,
+			color2 = color2,
+		}))
+	end
+
+	return res
 end
 
 -- Simple getter. Either returns user given players list or get all connected players if none provided

mods/ENVIRONMENT/mcl_weather/skycolor/dimensions.lua

@@ -40,18 +40,21 @@ function dimension_handlers.overworld(player, sky_data)
 	end
 
 	-- Use overworld defaults
-	local day_color = mcl_weather.skycolor.get_sky_layer_color(0.15)
+	local day_color = mcl_weather.skycolor.get_sky_layer_color(0.5)
 	local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.27)
 	local night_color = mcl_weather.skycolor.get_sky_layer_color(0.1)
 	sky_data.sky = {
 		type = "regular",
 		sky_color = {
-			day_sky = day_color,
-			day_horizon = day_color,
-			dawn_sky = dawn_color,
-			dawn_horizon = dawn_color,
-			night_sky = night_color,
-			night_horizon = night_color,
+			day_sky = day_color or "#7BA4FF",
+			day_horizon = day_color or "#C0D8FF",
+			dawn_sky = dawn_color or "7BA4FF",
+			dawn_horizon = dawn_color or "#C0D8FF",
+			night_sky = night_color or "000000",
+			night_horizon = night_color or "4A6790",
+			fog_sun_tint = "#ff5f33",
+			fog_moon_tint = nil,
+			fog_tint_type = "custom",
 		},
 		clouds = true,
 	}
@@ -75,18 +78,15 @@ function dimension_handlers.overworld(player, sky_data)
 		local day_color = mcl_weather.skycolor.get_sky_layer_color(0.5)
 		local dawn_color = mcl_weather.skycolor.get_sky_layer_color(0.75)
 		local night_color = mcl_weather.skycolor.get_sky_layer_color(0)
-		sky_data.sky = {
-			type = "regular",
-			sky_color = {
-				day_sky = day_color,
-				day_horizon = day_color,
-				dawn_sky = dawn_color,
-				dawn_horizon = dawn_color,
-				night_sky = night_color,
-				night_horizon = night_color,
-			},
-			clouds = true,
-		}
+		table.update(sky_data.sky.sky_color,{
+			day_sky = day_color or "#7BA4FF",
+			day_horizon = day_color or "#C0D8FF",
+			dawn_sky = dawn_color or "7BA4FF",
+			dawn_horizon = dawn_color or "#C0D8FF",
+			night_sky = night_color or "000000",
+			night_horizon = night_color or "4A6790",
+			fog_tint_type = "default",
+		})
 		sky_data.sun = {visible = false, sunrise_visible = false}
 		sky_data.moon = {visible = false}
 		sky_data.stars = {visible = false}
@@ -164,7 +164,8 @@ function dimension_handlers.nether(player, sky_data)
 end
 
 function dimension_handlers.void(player, sky_data)
-	sky_data.sky = { type = "plain",
+	sky_data.sky = {
+		type = "plain",
 		base_color = "#000000",
 		clouds = false,
 	}

mods/ENVIRONMENT/mcl_weather/snow.lua

@@ -75,6 +75,7 @@ function mcl_weather.has_snow(pos)
 end
 
 function mcl_weather.snow.set_sky_box()
+	if mcl_weather.skycolor.current_layer_name() ~= "weather-pack-snow-sky" then
 		mcl_weather.skycolor.add_layer(
 			"weather-pack-snow-sky",
 			{{r=0, g=0, b=0},
@@ -82,6 +83,7 @@ function mcl_weather.snow.set_sky_box()
 			{r=135, g=135, b=135},
 			{r=85, g=86, b=86},
 			{r=0, g=0, b=0}})
+	end
 	mcl_weather.skycolor.active = true
 	for _, player in pairs(get_connected_players()) do
 		player:set_clouds({color="#ADADADE8"})

mods/ENVIRONMENT/mcl_weather/thunder.lua

@@ -23,6 +23,7 @@ minetest.register_globalstep(function(dtime)
 	mcl_weather.rain.make_weather()
 
 	if mcl_weather.thunder.init_done == false then
+		if mcl_weather.skycolor.current_layer_name() ~= "weather-pack-thunder-sky" then
 			mcl_weather.skycolor.add_layer("weather-pack-thunder-sky", {
 				{r=0, g=0, b=0},
 				{r=40, g=40, b=40},
@@ -30,6 +31,7 @@ minetest.register_globalstep(function(dtime)
 				{r=40, g=40, b=40},
 				{r=0, g=0, b=0},
 			})
+		end
 		mcl_weather.skycolor.active = true
 		for _, player in pairs(get_connected_players()) do
 			player:set_clouds({color="#3D3D3FE8"})

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -5,9 +5,6 @@
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
 -- CONSTS
-local DOUBLE_DROP_CHANCE = 8
--- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
--- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_ENDCAP_NAME = "mcl_bamboo:bamboo_endcap"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
@@ -16,7 +13,7 @@ local BAMBOO_PLANK = BAMBOO .. "_plank"
 local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 local node_sound = mcl_sounds.node_sound_wood_defaults()
-local pr = PseudoRandom((os.time() + 15766) * 12) -- switched from math.random() to PseudoRandom because the random wasn't very random.
+local pr = PseudoRandom((os.time() + 15766) * 12)
 
 local on_rotate
 if minetest.get_modpath("screwdriver") then
@@ -31,33 +28,7 @@ local bamboo_def = {
 	paramtype = "light",
 	groups = {handy = 1, axey = 1, choppy = 1, dig_by_piston = 1, plant = 1, non_mycelium_plant = 1, flammable = 3},
 	sounds = node_sound,
-
-	drop = {
-		max_items = 1,
-		-- From the API:
-		-- max_items: Maximum number of item lists to drop.
-		-- The entries in 'items' are processed in order. For each:
-		-- Item filtering is applied, chance of drop is applied, if both are
-		-- successful the entire item list is dropped.
-		-- Entry processing continues until the number of dropped item lists
-		-- equals 'max_items'.
-		-- Therefore, entries should progress from low to high drop chance.
-		items = {
-			-- Examples:
-			{
-				-- 1 in DOUBLE_DROP_CHANCE chance of dropping.
-				-- Default rarity is '1'.
-				rarity = DOUBLE_DROP_CHANCE,
-				items = {BAMBOO .. " 2"},
-			},
-			{
-				-- 1 in 1 chance of dropping. (Note: this means that it will drop 100% of the time.)
-				-- Default rarity is '1'.
-				rarity = 1,
-				items = {BAMBOO},
-			},
-		},
-	},
+	drop = BAMBOO,
 
 	inventory_image = "mcl_bamboo_bamboo_shoot.png",
 	wield_image = "mcl_bamboo_bamboo_shoot.png",
@@ -86,7 +57,6 @@ local bamboo_def = {
 	on_rotate = on_rotate,
 
 	on_place = function(itemstack, placer, pointed_thing)
-
 		if not pointed_thing then
 			return itemstack
 		end
@@ -241,9 +211,6 @@ local bamboo_def = {
 		if node_above and ((bamboo_node and bamboo_node > 0) or node_above.name == BAMBOO_ENDCAP_NAME) then
 			minetest.remove_node(new_pos)
 			minetest.sound_play(node_sound.dug, sound_params, true)
-			if pr:next(1, DOUBLE_DROP_CHANCE) == 1 then
-				minetest.add_item(new_pos, istack)
-			end
 			minetest.add_item(new_pos, istack)
 		end
 	end,

mods/ITEMS/mcl_bamboo/bamboo_items.lua

@@ -9,8 +9,6 @@ local SIDE_SCAFFOLDING = false
 local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal"
 -- ---------------------------------------------------------------------------
 local SCAFFOLDING_NAME = "mcl_bamboo:scaffolding"
--- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
--- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 

mods/ITEMS/mcl_bamboo/init.lua

@@ -7,8 +7,6 @@
 
 -- LOCALS
 local modname = minetest.get_current_modname()
--- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
--- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 
 mcl_bamboo = {}

mods/ITEMS/mcl_bamboo/recipes.lua

@@ -5,8 +5,6 @@
 --- These are all of the fuel recipes and all of the crafting recipes, consolidated into one place.
 --- Copyright (C) 2022 - 2023, Michieal. See License.txt
 
--- Used everywhere. Often this is just the name, but it makes sense to me as BAMBOO, because that's how I think of it...
--- "BAMBOO" goes here.
 local BAMBOO = "mcl_bamboo:bamboo"
 local BAMBOO_PLANK = BAMBOO .. "_plank"
 -- Craftings