[PATCH] Diplomacy window should show player's defeated/active states.

[javiergodas]

Sometimes while playing in multiplayer, some opponents or allies might disconnect in middle of the battle, and if you get distracted, you may miss the notification saying that they will be back or they surrendered. So you might keep playing thinking that your ally could be alive when he surrendered, or either quit thinking that your ally gave up. Also, when you want to end the game, and you see no enemy units, you always ask your mates who's left. It would be nice to see which ones are dead so you can refinate your search. This is a continuation of ticket #4187.

[Imarok]

subset of #3787?

[javiergodas]

No, it's more an extension of #4187.

[javiergodas]

On it

[elexis]

Didn't test yet, but code looks correct now

[wraitii]

Seems to work correctly. I'm not sure the icons are the most obvious way to do this though.

[Imarok]

The patch looks good, but there are two "style issues":

• You should use jsdoc comments for the new function in gui/commons/gamedescription.js (like how its done for the other functions in this file).
• binaries/data/mods/public/gui/session/menu.js: L340 has a trailing whitespace

Furthermore the patch needs to be rebased.

When those are fixed, I'll commit it ;)

[javiergodas]

Hope this fixes it.

[Imarok]

please rebase your patch (update your svn or git and create a diff again)

[elexis]

• Additionally to the proposed feature, we could display the defeated/won icon in the lobby / replay menu list. In order to accomplish that, we would need a new sprite and style definition, so that we can add the image also for texts. For example, after having added an icon with that name to gui/common/setup.xml, the translateWithContext("playerstate", "defeated") string could be removed and instead [icon="icon_defeated"] would be inserted at the beginning of the string. Unfortunately we wouldn't be able to set a tooltip, so not sure if it's the better choice after all. (Furthermore to avoid duplication of the defeated icon mapping, we wouldn't use an image for the player outcome, but a string as well that would be set to [icon="icon_defeated"]. (I repeat in advance: Don't implement this until we decided on this proposal).

• source/gui/ bug: The tooltip in the diplomacy screen is visible for all players except the first. The first item will always display the tooltip property defined in the XML (here empty string). Weirdly this bug isn't reproducible with the tooltip of the image in the player assignment menu of the gamesetup which also uses repeat.

• The patch passed the long strings test wiki:Implementation_of_Internationalization_and_Localization#LongStringsLocale

• The icon is given 25px width (diplomacyPlayerOutcome), but diplomacyPlayerName starts at 20px.

• Perhaps the icon would look better if the size is increased a bit.

• The tooltip should use the sessionToolTipBold style

• Trailing whitespace in gamedescription.js

• The <script file="gui/common/gamedescription.js"/> call should be near the other gui/common calls, in alphabetical order (unless explicitly needed). Removing proposed comment as we only add the comments if we want to show that a weird loading order is needed, which is the case for layout.js, but not for gamedescription.js.

[elexis]

Moving to the new WIP milestone.

[Vladislav Belov]

Isn't the ghost="true" missed in the diplomacy_window.xml:46?