Merge pull request 'Fix most deaths not producing a death message.' (#3332) from CyberMango/MineClone2:dev/mango/fix_mt_deaths_messages into master

Reviewed-on: MineClone2/MineClone2#3332
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>

CREDITS.md

@@ -36,6 +36,7 @@
 * MrRar
 * talamh
 * Faerraven / Michieal
+* FossFanatic
 
 ## Contributors
 * Laurent Rocher
@@ -96,6 +97,8 @@
 * TheOnlyJoeEnderman
 * Ranko Saotome
 * Gregor Parzefall
+* Wbjitscool
+* b3nderman
 
 ## MineClone5
 * kay27
@@ -186,6 +189,8 @@
 
 ## Funders
 * 40W
+* bauknecht
+* Cora
 
 ## Special thanks
 * celeron55 for creating Minetest

HOW_TO_PLAY.md

@@ -0,0 +1,21 @@
+Survive, farm, build, explore, play with friends, and do much more. Inspired by a well known block game, pushing beyond.
+
+How to play:
+
+#### Download Minetest
+- Navigate to https://www.minetest.net/ to download the client.
+- Once installed, open and select the "Content" tab
+
+#### Install MineClone2 from ContentDB
+- Click "Browse Online Content" and filter by Games (select "Games" from the dropdown box)
+- Find "MineClone2" (should be first on the list or on the first page)
+- Click the [+] button next to MineClone2 and wait for download to finish
+- Click "Back to Main Menu"
+
+#### Create new world and play
+- Click "Start Game" tab
+- At the bottom click the MineClone2 icon (the 2 dirt with grass blocks)
+- Click "New", give your world a name
+- You can leave seed blank or put in a word of your choice
+- Select your new world
+- Click "Play Game" and enjoy!

README.md

@@ -2,8 +2,6 @@
 An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
 Developed by many people. Not developed or endorsed by Mojang AB.
 
-Version: 0.82 (in development)
-
 ### Gameplay
 You start in a randomly-generated world made entirely of cubes. You can explore
 the world and dig and build almost every block in the world to create new

RELEASE.md

@@ -1,19 +1,22 @@
 #File to document release steps with a view to evolving into a script
 
 #Update CREDITS.md
-#Update version in README.md (soon to be game.conf from of 0.82.0)
+#Update version in game.conf
 
 lua tools/generate_ingame_credits.lua
 
 git add CREDITS.md
 git add mods/HUD/mcl_credits/people.lua
+git add game.conf
 
-git add README.md
-# To uncomment when applicable
-#git add game.conf
+#git add RELEASE.md
 
-git commit -m "Pre-release update credits and set version 0.81.1"
+git commit -m "Pre-release update credits and set version 0.82.0"
 
-git tag 0.81.1
+git tag 0.82.0
 
-git push origin 0.81.1
+git push origin 0.82.0
+
+#Update version in game.conf to -SNAPSHOT
+
+git commit -m "Post-release set version 0.82.0-SNAPSHOT"

game.conf

@@ -1,4 +1,4 @@
 title = MineClone 2
 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
 disallowed_mapgens = v6
-version=MCL2-0.82-indev
+version=0.82.0-SNAPSHOT

mods/CORE/mcl_damage/init.lua

@@ -155,7 +155,6 @@ end, true)
 minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
 	if not damage_enabled then return 0 end
 	if player:get_hp() > 0 then
-		mt_reason.approved = true
 		if hp_change < 0 then
 			mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason))
 		end
@@ -163,9 +162,7 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
 end, false)
 
 minetest.register_on_dieplayer(function(player, mt_reason)
-	if mt_reason.approved then
-		mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
-	end
+	mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
 	minetest.log("action","Player "..player:get_player_name().." died at "..minetest.pos_to_string(vector.round(player:get_pos())))
 end)
 

mods/HUD/mcl_credits/people.lua

@@ -37,6 +37,7 @@ return {
 		"MrRar",
 		"talamh",
 		"Faerraven / Michieal",
+		"FossFanatic",
 	}},
 	{S("Contributors"), 0x52FF00, {
 		"Laurent Rocher",
@@ -96,6 +97,9 @@ return {
 		"anarquimico",
 		"TheOnlyJoeEnderman",
 		"Ranko Saotome",
+		"Gregor Parzefall",
+		"Wbjitscool",
+		"b3nderman",
 	}},
 	{S("MineClone5"), 0xA60014, {
 		"kay27",
@@ -168,6 +172,7 @@ return {
 		"RandomLegoBrick",
 		"cora",
 		"Faerraven / Michieal",
+		"Nicu",
 	}},
 	{S("Translations"), 0x00FF60, {
 		"Wuzzy",
@@ -181,9 +186,12 @@ return {
 		"Emojigit",
 		"snowyu",
 		"3raven",
+		"SakuraRiu",
 	}},
 	{S("Funders"), 0xF7FF00, {
 		"40W",
+		"bauknecht",
+		"Cora",
 	}},
 	{S("Special thanks"), 0x00E9FF, {
 		"celeron55 for creating Minetest",
@@ -191,5 +199,6 @@ return {
 		"wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.",
 		"The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game",
 		"Notch and Jeb for being the major forces behind Minecraft",
+		"Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/",
 	}},
 }

mods/ITEMS/mcl_bamboo/README.md

@@ -3,16 +3,13 @@ mcl_bamboo
 
 This mod adds working, familiar bamboo nodes to your Mineclone 2 world.
 
-Code: Michieal. Original (basic) bamboo code by: Small Joker.
+Code: MineClone2 dev team. Original (basic) bamboo code by: Small Joker.
 
 License for code: GPLv3.
 License for images / textures: CC-BY-SA except where noted.
-Images Created by Michieal, except for:
+Images Created by Nicu, except for:
 
 * Inventory / wield image for Bamboo Stalk: created by RandomLegoBrick#8692 and is CC0.
-* The Bamboo door image, which is a variant of this image: https://www.flickr.com/photos/basheertome/5179849901/ which
-  is CC-BY 2.0,
-  Basheer Tome (2015).
 
 Dependencies: mcl_core, mcl_sounds, mcl_tools
 

mods/ITEMS/mcl_bamboo/bamboo_base.lua

@@ -301,7 +301,7 @@ minetest.register_node("mcl_bamboo:bamboo_block", bamboo_block_def)
 local bamboo_stripped_block = table.copy(bamboo_block_def)
 bamboo_stripped_block.on_rightclick = nil
 bamboo_stripped_block.description = S("Stripped Bamboo Block")
-bamboo_stripped_block.tiles = {"mcl_bamboo_bamboo_bottom.png", "mcl_bamboo_bamboo_bottom.png",
+bamboo_stripped_block.tiles = {"mcl_bamboo_bamboo_bottom_stripped.png", "mcl_bamboo_bamboo_bottom_stripped.png",
 							   "mcl_bamboo_bamboo_block_stripped.png"}
 minetest.register_node("mcl_bamboo:bamboo_block_stripped", bamboo_stripped_block)
 minetest.register_node("mcl_bamboo:bamboo_plank", {

mods/MAPGEN/mcl_biomes/init.lua

@@ -3545,7 +3545,7 @@ local function register_decorations()
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
 		fill_ratio = 0.004,
-		biomes = {"Jungle", "JungleM","BambooJungle", "BambooJungleM"},
+		biomes = {"Jungle", "JungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_oak_classic.mts",
@@ -4459,7 +4459,7 @@ local function register_decorations()
 	end
 
 	register_double_fern(0.01, 0.03, {"Jungle", "JungleM", "JungleEdge", "JungleEdgeM", "Taiga", "ColdTaiga", "MegaTaiga", "MegaSpruceTaiga", "BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", })
-	register_double_fern(0.15, 0.1, {"JungleM", "BambooJungleM"})
+	register_double_fern(0.15, 0.1, {"JungleM", "BambooJungleM", "BambooJungle"})
 
 	-- Large flowers
 	local function register_large_flower(name, biomes, seed, offset, flower_forest_offset)
@@ -4545,7 +4545,7 @@ local function register_decorations()
 			octaves = 4,
 			persist = 0.6,
 		},
-		biomes = {"Jungle", "BambooJungle"},
+		biomes = {"Jungle", },
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves_2.mts",
@@ -4581,7 +4581,7 @@ local function register_decorations()
 			octaves = 4,
 			persist = 0.6,
 		},
-		biomes = {"JungleEdge", "JungleEdgeM","BambooJungleEdge", "BambooJungleEdgeM"},
+		biomes = {"JungleEdge", "JungleEdgeM", "BambooJungleEdgeM"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves.mts",
@@ -4614,26 +4614,10 @@ local function register_decorations()
 		y_max = mcl_vars.mg_overworld_max,
 		decoration = "mcl_bamboo:bamboo",
 		height = 9,
-		max_height = 12,
+		max_height = 10,
 		flags = "place_center_x, place_center_z",
 		rotation = "random",
 	})
-	--[[
-	-- commenting out this section because with the new grow code, bamboo creates its own height, and therefore places it's own top.
-		minetest.register_decoration({
-			deco_type = "simple",
-			place_on = {"mcl_bamboo:bamboo"},
-			sidelen = 80,
-			fill_ratio = 1,
-			biomes = {"BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", "Jungle", "JungleM", "JungleEdge", "JungleEdgeM"},
-			y_min = 1,
-			y_max = mcl_vars.mg_overworld_max,
-			decoration = "mcl_bamboo:bamboo_endcap",
-			height = 1,
-			max_height = 4,
-			flags = "all_floors",
-		})
-	]]
 
 	minetest.register_decoration({
 		deco_type = "simple",