Merge bug fix PR (#2) by IonicCheese

* Refactor some of the code, multiple bug fixes

* Fix something stupid

* More bug fixes

mods/main/init.lua

@@ -1,9 +1,126 @@
-player_data = {}
-alive_players = {}
+local player_data = {}
+local alive_players = {}
+
+local function save_player_data(player)
+	local name = player:get_player_name()
+	player_data[name] = {
+		size = player:get_properties().visual_size,
+		skin = player:get_properties().textures,
+	}
+end
+
+local function load_player_data(player)
+	local name = player:get_player_name()
+	player:set_properties({
+		visual = "mesh",
+		textures = player_data[name].skin,
+		visual_size = player_data[name].size,
+	})
+end
+
+function set_player_mode(player, mode)
+	local name = player:get_player_name()
+    local privs = core.get_player_privs(name)
+	local meta = player:get_meta()
+	local current_mode = meta:get_string("mode")
+
+	if current_mode == mode then
+		return
+	end
+
+    if mode == "normal" then
+        privs.fly = false
+        privs.fast = false
+        privs.noclip = false
+        privs.shout = true
+        privs.interact = true
+
+		load_player_data(player)
+
+		player:set_properties({pointable = true})
+
+		meta:set_string("mode", "normal")
+ 
+	-- add pre_match mode?
+    elseif mode == "spectator" then
+        privs.fly = true
+        privs.fast = true
+        privs.noclip = true
+        privs.shout = false
+        privs.interact = false
+
+		save_player_data(player)
+
+		player:set_properties({
+			pointable = false,
+			visual = "mesh",
+			textures = {"blank.png"},
+			visual_size = {x=0, y=0},
+		})
+
+		player:set_nametag_attributes({color = {a = 0}})
+
+		core.chat_send_player(name, core.colorize("cyan", "You are now a spectator."))
+
+		meta:set_string("mode", "spectator")
+    end
+ 
+    core.change_player_privs(name, privs)
+end
+
+local function get_alive_players()
+	local alive_players_names = {}
+
+	for player_name, _ in pairs(alive_players) do
+		if alive_players[player_name] == "alive" then
+			table.insert(alive_players_names, player_name)
+		end
+	end
+
+	return alive_players_names
+end
+
+local function kill_player(player, reason)
+	local player_name = player:get_player_name()
+
+	if alive_players[player_name] ~= "alive" then
+		return
+	end
+
+	alive_players[player_name] = "dead"
+
+	local alive_player_names = get_alive_players()
+
+	local message = string.format("%s has been eliminated! (%s) %d player%s left!", player_name, reason, #alive_player_names, #alive_player_names == 1 and "" or "s")
+	core.chat_send_all(core.colorize("red", message))
+	if #alive_player_names == 1 then
+		local winner_name = alive_player_names[1]
+		core.chat_send_all(core.colorize("green", winner_name .. " is the winner!"))
+	end
+end
+
+local diggable_groups = {
+	"snappy",
+	"cracky",
+	"choppy",
+	"crumbly",
+	"oddly_breakable_by_hand",
+}
 
 core.register_on_mods_loaded(function()
 	for itemname, _ in pairs(core.registered_nodes) do
-		core.override_item(itemname, {groups = {fall_damage_add_percent = -100}})
+		local node = core.registered_nodes[itemname]
+		local groups = node.groups
+
+		groups.fall_damage_add_percent = -100
+
+		groups.immortal = 1
+
+		for _, group in pairs(diggable_groups) do
+			groups[group] = nil
+		end
+
+		core.override_item(itemname, {groups = groups})
 	end
 end)
 
@@ -11,41 +128,49 @@ core.register_on_joinplayer(function(player)
 	core.place_schematic({x = 0, y = 0, z = 0}, core.get_modpath("main") .. "/schematics/map1.mts", 0, nil, false)
 	player:set_pos({x = 20, y = 26.5, z = 17})
 	player:get_inventory():set_list("main", {})
-	core.change_player_privs(player:get_player_name(), {["fly"] = false, ["fast"] = false, ["noclip"] = false, ["shout"] = true, ["interact"] = true})
+
+	local player_name = player:get_player_name()
+	player_data[player_name] = {
+		size = player:get_properties().visual_size,
+		skin = player:get_properties().textures,
+	}
+
+	player:set_properties({pointable = false})
+
+	set_player_mode(player, "normal")
 end)
 
 core.register_on_leaveplayer(function(player)
-	alive_players[player:get_player_name()] = "alive"
-	core.chat_send_all(core.colorize("red", player:get_player_name() .. " left the game! " .. tostring(#alive_players) .. " players left!"))
-	if #alive_players == 1 then
-		core.chat_send_all(core.colorize("green", alive_players[1] .. " wins!"))
-	end
+	local player_name = player:get_player_name()
+	
+	kill_player(player, "left the game")
 end)
 
 core.register_on_dieplayer(function(player)
-	alive_players[player:get_player_name()] = "dead"
-	core.chat_send_all(core.colorize("red", player:get_player_name() .. " died! " .. tostring(#alive_players) .. " players left!"))
-	if #alive_players == 1 then
-		core.chat_send_all(core.colorize("green", tostring(alive_players[1]) .. " wins!"))
-	end
+	local player_name = player:get_player_name()
+	
+	kill_player(player, "died")
 end)
 
 core.register_on_respawnplayer(function(player) 
-	core.change_player_privs(player:get_player_name(), {["fly"] = true, ["fast"] = true, ["noclip"] = true, ["shout"] = false, ["interact"] = false})
+	set_player_mode(player, "spectator")
+
+	local player_name = player:get_player_name()
+
+	player:set_pos({x = 20, y = 26.5, z = 17})
+
 	player:get_inventory():set_list("main", {})
-	player_data[player] = {}
-	player_data[player].size = player:get_properties().visual_size
-	player_data[player].skin = player:get_properties().textures
-	player:set_properties({
-		visual = "mesh",
-		textures={"invisible_skin.png"},
-		visual_size = {x=0, y=0},
-		pointable=false,
-	})
+	
+	player:set_properties({pointable = false})
+
+	return true
 end)
 
+core.register_privilege("match_manager", {description = "Can manage the match", give_to_singleplayer = true})
+
 core.register_chatcommand("start", {
 	params = "",
+	privs = {match_manager = true},
 	description = "Start the match",
 	func = function()
 		for x = 1, 39 do
@@ -56,12 +181,21 @@ core.register_chatcommand("start", {
 		core.chat_send_all(core.colorize("green", "Match started!"))
 		alive_players = {}
 		for _, player in pairs(core.get_connected_players()) do
+			local player_name = player:get_player_name()
+
+			set_player_mode(player, "normal")
+
 			player:set_nametag_attributes({color = {a = 0}})
 			player:set_hp(20)
+
+			player:set_properties({
+				pointable = true, -- allow players to be killable after the match starts
+			})
+
 			inv = player:get_inventory()
 			inv:add_item("main", "ctf_ranged:ak47_loaded")
 			inv:add_item("main", "ctf_ranged:ammo 3")
-			alive_players[player:get_player_name()] = "alive"
+			alive_players[player_name] = "alive"
 		end
 		return ""
 	end
@@ -69,21 +203,24 @@ core.register_chatcommand("start", {
 
 core.register_chatcommand("reset", {
 	params = "",
+	privs = {match_manager = true},
 	description = "Reset map",
 	func = function()
 		core.place_schematic({x = 0, y = 0, z = 0}, core.get_modpath("main") .. "/schematics/map1.mts", 0, nil, false)
 		for _, player in pairs(core.get_connected_players()) do
+			local player_name = player:get_player_name()
+
 			player:set_nametag_attributes({color = {a = 255, r = 255, g = 255, b = 255}})
 			player:set_pos({x = 20, y = 26.5, z = 17})
-			core.change_player_privs(player:get_player_name(), {["fly"] = false, ["fast"] = false, ["noclip"] = false, ["shout"] = true, ["interact"] = true})
+			set_player_mode(player, "normal")
 			player:get_inventory():set_list("main", {})
 			player:set_properties({
 				visual = "mesh",
-				textures = player_data[player].skin,
-				visual_size = player_data[player].size,
-				pointable=true,
+				textures = player_data[player_name].skin,
+				visual_size = player_data[player_name].size,
+				pointable=false,
 			})
-			player_data[player] = {}
+			player_data[player_name] = {}
 		end
 		core.chat_send_all(core.colorize("red", "Match terminated."))
 		return ""