Merge branch 'master' of https://github.com/MT-CTF/capturetheflag

mods/ctf/ctf_classes/medic.lua

@@ -99,6 +99,7 @@ minetest.override_item("ctf_bandages:bandage", {
 		if ctf.player(pname).team == ctf.player(name).team then
 			local nodename = minetest.get_node(object:get_pos()).name
 			if ctf_classes.dont_heal[pname] or nodename:find("lava") or nodename:find("water") or nodename:find("trap") then
+                                minetest.chat_send_player(name, "You can't heal player in lava, water or spikes!")
 				return -- Can't heal players in lava/water/spikes
 			end
 
@@ -153,11 +154,6 @@ local function remove_pillar(pos, pname)
 	if name:find("default") and isdiggable(name) then
 		local player = minetest.get_player_by_name(pname)
 
-		if minetest.get_modpath("antisabotage") then
-			-- Fix paxel being capable of mining blocks under teammates
-			if antisabotage.is_sabotage(pos, minetest.get_node(pos), player) then return end
-		end
-
 		minetest.dig_node(pos)
 
 		if player and diggers[pname] and type(diggers[pname]) ~= "table" then

mods/ctf/ctf_metrics/init.lua

@@ -2,23 +2,12 @@ if not minetest.create_metric then
 	return
 end
 
-local storage = minetest.get_mod_storage()
-local function counter(name, help)
-	local metric = minetest.create_metric("counter", name, help)
-	metric:increment(tonumber(storage:get(name) or 0))
-	return {
-		get = function()
-			return metric:get()
-		end,
 
-		increment = function(_, value)
-			metric:increment(value)
-			storage:set_string(name, tostring(metric:get()))
-		end,
-	}
+local function counter(...)
+	return minetest.create_metric("counter", ...)
 end
-local function gauge(name, help)
-	return minetest.create_metric("gauge", name, help)
+local function gauge(...)
+	return minetest.create_metric("gauge", ...)
 end
 
 
@@ -54,15 +43,35 @@ minetest.register_on_placenode(function()
 end)
 
 
+--
+-- Gauges
+--
+
+local class_gauges = {}
+for _, class in ipairs(ctf_classes.__classes_ordered) do
+	class_gauges[class.name] = gauge("ctf_class_players", "Player count for class", {
+		class = class.name
+	})
+end
+
 local online_score = gauge("ctf_online_score", "Total score of online players")
 local match_time = gauge("ctf_match_play_time", "Current time in match")
+
 minetest.register_globalstep(function()
 	local sum = 0
+	local class_counts = {}
 	for _, player in pairs(minetest.get_connected_players()) do
 		local total, _ = ctf_stats.player(player:get_player_name())
 		sum = sum + total.score
-	end
-	online_score:set(sum)
 
+		local class = ctf_classes.get(player)
+		class_counts[class.name] = (class_counts[class.name] or 0) + 1
+	end
+
+	online_score:set(sum)
 	match_time:set(ctf_match.get_match_duration() or 0)
+
+	for _, class in ipairs(ctf_classes.__classes_ordered) do
+		class_gauges[class.name]:set(class_counts[class.name] or 0)
+	end
 end)

mods/ctf/ctf_metrics/mod.conf

@@ -1,2 +1,2 @@
 name = ctf_metrics
-depends = ctf, ctf_stats
+depends = ctf, ctf_stats, ctf_classes