Merge lp:~widelands-dev/widelands/bug-1815283-nil-value-territorial into lp:widelands

[Toni Förster]

add player name to rank_players()

[kaputtnik (franku)]

I looked also into this issue and stumbled over player.number and the description of players: https://wl.widelands.org/documentation/autogen_wl_bases/#wl.bases.EditorGameBase.players

So, assuming the second slot of a three players map is deactivated, the result will be:

for idx, player in ipairs(wl.Game().players) do
  print(idx, player.name, player.number)
end

Output:

1 Player 1 1
2 Player 3 3

So i am not sure if we should get rid of player.number at all? Don't know if it is feasible.

[GunChleoc (gunchleoc)]

I had the same bug when I did my refactoring of the territorial win conditions last year... which led me to my new forum sig :P

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4464. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/492316621.
Appveyor build 4252. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1815283_nil_value_territorial-4252.

=== modified file 'data/scripting/win_conditions/territorial_functions.lua'
--- data/scripting/win_conditions/territorial_functions.lua	2019-01-02 13:47:23 +0000
+++ data/scripting/win_conditions/territorial_functions.lua	2019-02-12 17:47:26 +0000
@@ -153,13 +153,13 @@
             territory_was_kept = winning_players[playerinfo.number] ~= nil
             winning_players[playerinfo.number] = true
             territory_points.last_winning_player = playerinfo.number
-            territory_points.last_winning_player_name = players[playerinfo.number].name
+            territory_points.last_winning_player_name = playerinfo.name
             territory_points.last_winning_team = -1
          else
             winning_players[playerinfo.number] = nil
          end
          if teaminfo.team == 0 then
-            points[#points + 1] = { players[playerinfo.number].name, playerinfo.points }
+            points[#points + 1] = { playerinfo.name, playerinfo.points }
          end
       end
    end
 
=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua	2019-02-10 11:36:10 +0000
+++ data/scripting/win_conditions/win_condition_functions.lua	2019-02-12 17:47:26 +0000
@@ -200,7 +200,7 @@
             team = 0,
             points = player_points,
             players = {
-               { number = player.number, points = player_points }
+               { number = player.number, name = player.name, points = player_points }
             }
          }
          table.insert(ranked_players_and_teams, team_table)
@@ -222,7 +222,7 @@
       }
       for idx, player in ipairs(plrs) do
          if player.team == team then
-            table.insert(team_table.players, { number = player.number, points = all_player_points[player.number] })
+            table.insert(team_table.players, { number = player.number, name = player.name, points = all_player_points[player.number] })
          end
       end
       table.insert(ranked_players_and_teams, team_table)