Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Distinguish resign- and defeat-chatmessage. Patch by dpiquet, fixes #3501.

Browse Source 
For consistency, also colorize the "You" part in the singleplayer
variants.

This was SVN commit r18161.
This commit is contained in:
elexis 2016-05-12 14:02:05 +00:00
parent 366085e037
commit 7c2ff117f3
5 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/public/gui/credits/texts/programming.json
View File

@ -53,6 +53,7 @@
{"nick": "deebee", "name": "Deepak Anthony"},
{"nick": "Deiz"},
{"nick": "Dietger", "name": "Dietger van Antwerpen"},
{"nick": "dpiquet", "name": "Damien Piquet"},
{"nick": "dumbo"},
{"nick": "dvangennip", "name": "Doménique"},
{"nick": "Echelon9", "name": "Rhys Kidd"},

28
binaries/data/mods/public/gui/session/messages.js
View File

@ -188,7 +188,8 @@ var g_NotificationsTypes =
addChatMessage({
"type": "defeat",
"guid": findGuidForPlayerID(player),
"player": player
"player": player,
"resign": !!notification.resign
});
updateDiplomacy();
@ -652,12 +653,31 @@ function colorizePlayernameHelper(username, playerID)
function formatDefeatMessage(msg)
{
let defeatMsg;
let playername;
// In singleplayer, the local player is "You". "You has" is incorrect.
if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
return translate("You have been defeated.");
{
// Translation: String used to colorize the word "You" of that sentence
playername = colorizePlayernameHelper(translateWithContext("You have been defeated", "You"), msg.player);
if (msg.resign)
defeatMsg = translate("%(You)s have resigned.");
else
defeatMsg = translate("%(You)s have been defeated.");
}
else
{
playername = colorizePlayernameByID(msg.player);
if (msg.resign)
defeatMsg = translate("%(player)s has resigned.");
else
defeatMsg = translate("%(player)s has been defeated.");
}
return sprintf(translate("%(player)s has been defeated."), {
"player": colorizePlayernameByID(msg.player)
return sprintf(defeatMsg, {
"player": playername,
"You": playername
});
}

3
binaries/data/mods/public/gui/session/session.js
View File

@ -426,7 +426,8 @@ function resignGame(leaveGameAfterResign)
Engine.PostNetworkCommand({
"type": "defeat-player",
"playerId": Engine.GetPlayerID()
"playerId": Engine.GetPlayerID(),
"resign": true
});
updateTopPanel();

3
binaries/data/mods/public/simulation/components/Player.js
View File

@ -671,7 +671,8 @@ Player.prototype.OnPlayerDefeated = function(msg)
var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
cmpGUIInterface.PushNotification({
"type": "defeat",
"players": [this.playerID]
"players": [this.playerID],
"resign": !!msg.resign
});
};

2
binaries/data/mods/public/simulation/helpers/Commands.js
View File

@ -413,7 +413,7 @@ var g_Commands = {
"defeat-player": function(player, cmd, data)
{
// Send "OnPlayerDefeated" message to player
Engine.PostMessage(data.playerEnt, MT_PlayerDefeated, { "playerId": player } );
Engine.PostMessage(data.playerEnt, MT_PlayerDefeated, { "playerId": player, "resign": !!cmd.resign });
},
"garrison": function(player, cmd, data)