share/hedgewars/Data/Maps/Control/map.lua
changeset 14989 5188ecbf726f
parent 14988 0ebecd424fc7
child 14990 c52aa7ba2e16
--- a/share/hedgewars/Data/Maps/Control/map.lua	Fri May 17 02:08:44 2019 +0200
+++ b/share/hedgewars/Data/Maps/Control/map.lua	Fri May 17 14:15:40 2019 +0200
@@ -348,6 +348,41 @@
 
 end
 
+local RankTeams = function(teamList)
+	local teamRank = function(a, b)
+		if a.score ~= b.score then
+			return a.score > b.score
+		else
+			return a.clan > b.clan
+		end
+	end
+	table.sort(teamList, teamRank)
+	local rank, plusRank, score, clan
+	for i=1, #teamList do
+		if i == 1 then
+			rank = 1
+			plusRank = 1
+			score = teamList[i].score
+			clan = teamList[i].clan
+		end
+		if (teamList[i].score < score) then
+			rank = rank + plusRank
+			plusRank = 1
+		end
+		if (teamList[i].score == score and teamList[i].clan ~= clan) then
+			plusRank = plusRank + 1
+		end
+		teamList[i].rank = rank
+		score = teamList[i].score
+		clan = teamList[i].clan
+	end
+
+	for i=1, #teamList do
+		SendStat(siPointType, "!POINTS")
+		SendStat(siTeamRank, tostring(teamList[i].rank))
+		SendStat(siPlayerKills, tostring(teamList[i].score), teamList[i].name)
+	end
+end
 
 function onNewTurn()
 
@@ -385,15 +420,7 @@
 				local clan = GetTeamClan(name)
 				table.insert(teamList, { score = teamScore[teamClan[i]], name = name, clan = clan })
 			end
-			local teamRank = function(a, b)
-				return a.score > b.score
-			end
-			table.sort(teamList, teamRank)
-
-			for i=1, #teamList do
-				SendStat(siPointType, "!POINTS")
-				SendStat(siPlayerKills, tostring(teamList[i].score), teamList[i].name)
-			end
+			RankTeams(teamList)
 			SendStat(siGraphTitle, loc("Score graph"))
 
 		end