Ticket #3979: t3979_no_you_dont_v1.patch

binaries/data/mods/public/gui/common/functions_utility.js

@@ -139 +139 @@
         sanitizedName = sanitizedName.replace(/\s/g, "");
     // Limit the length to 20 characters
     return sanitizedName.substr(0,20);
 }
 
+function singleplayerName()
+{
+    return Engine.ConfigDB_GetValue("user", "playername.singleplayer") || Engine.GetSystemUsername();
+}
+
+function multiplayerName()
+{
+    return Engine.ConfigDB_GetValue("user", "playername.multiplayer") || Engine.GetSystemUsername();
+}
+
 function tryAutoComplete(text, autoCompleteList)
 {
     if (!text.length)
         return text;
 

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -219 +219 @@
 
     g_IsNetworked = attribs.type != "offline";
     g_IsController = attribs.type != "client";
     g_ServerName = attribs.serverName || undefined;
 
+    // Replace empty playername when entering a singleplayermatch for the first time
+    if (!g_IsNetworked)
+    {
+        Engine.ConfigDB_CreateValue("user", "playername.singleplayer", singleplayerName());
+        Engine.ConfigDB_WriteValueToFile("user", "playername.singleplayer", singleplayerName(), "config/user.cfg");
+    }
+
     // Get default player data - remove gaia
     g_DefaultPlayerData = g_Settings.PlayerDefaults;
     g_DefaultPlayerData.shift();
     for (let i in g_DefaultPlayerData)
         g_DefaultPlayerData[i].Civ = "random";
@@ -1162 +1169 @@
             g_GameAttributes.settings.PlayerData[i].AIDiff = g_DefaultPlayerData[i].AIDiff;
     }
 
     // Reset player assignments on map change
     if (!g_IsNetworked)
-        g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1, "civ": "", "team": -1, "ready": 0 } };
+        g_PlayerAssignments = { "local": { "name": singleplayerName(), "player": 1, "civ": "", "team": -1, "ready": 0 } };
+
     else
     {
         let numPlayers = mapSettings.PlayerData ? mapSettings.PlayerData.length : g_GameAttributes.settings.PlayerData.length;
 
         for (let guid in g_PlayerAssignments)

binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js

@@ -192 +192 @@
 }
 
 function startHost(playername, servername)
 {
     // Save player name
-    Engine.ConfigDB_CreateValue("user", "playername", playername);
-    Engine.ConfigDB_WriteValueToFile("user", "playername", playername, "config/user.cfg");
+    Engine.ConfigDB_CreateValue("user", "playername.multiplayer", playername);
+    Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", playername, "config/user.cfg");
 
     // Disallow identically named games in the multiplayer lobby
     if (Engine.HasXmppClient())
     {
         for (let g of Engine.GetGameList())
@@ -257 +257 @@
     if (Engine.HasXmppClient())
         Engine.LobbySetPlayerPresence("playing");
     else
     {
         // Only save the player name and host address if they're valid and we're not in the lobby
-        Engine.ConfigDB_CreateValue("user", "playername", playername);
-        Engine.ConfigDB_WriteValueToFile("user", "playername", playername, "config/user.cfg");
+        Engine.ConfigDB_CreateValue("user", "playername.multiplayer", playername);
+        Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", playername, "config/user.cfg");
         Engine.ConfigDB_CreateValue("user", "multiplayerserver", ip);
         Engine.ConfigDB_WriteValueToFile("user", "multiplayerserver", ip, "config/user.cfg");
     }
     return true;
 }
 
 function getDefaultGameName()
 {
     return sprintf(translate("%(playername)s's game"), {
-        "playername": Engine.ConfigDB_GetValue("user", "playername")
+        "playername": multiplayerName()
     });
 }

binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml

@@ -2 +2 @@
 
 <objects>
 
     <script file="gui/common/network.js"/>
     <script file="gui/common/functions_global_object.js"/>
+    <script file="gui/common/functions_utility.js"/>
     <script file="gui/gamesetup/gamesetup_mp.js"/>
 
     <!-- Add a translucent black background to fade out the menu page -->
     <object type="image" sprite="ModernFade"/>
 
@@ -29 +30 @@
                 <translatableAttribute id="caption">Player name:</translatableAttribute>
             </object>
 
             <object name="joinPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
                 <action on="Load">
-                    this.caption = Engine.ConfigDB_GetValue("user", "playername");
+                    Engine.GetGUIObjectByName("joinPlayerName").caption = multiplayerName();
                 </action>
             </object>
 
             <object type="text" size="20 80 50% 110" style="ModernLabelText" text_align="right">
                 <translatableAttribute id="caption">Server Hostname or IP:</translatableAttribute>
             </object>
 
             <object name="joinServer" type="input" size="50%+10 80 100%-20 104" style="ModernInput">
                 <action on="Load">
-                    this.caption = Engine.ConfigDB_GetValue("user", "multiplayerserver")
+                    this.caption = Engine.ConfigDB_GetValue("user", "multiplayerserver");
                 </action>
             </object>
 
             <object hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed">
                 <translatableAttribute id="caption">Continue</translatableAttribute>
@@ -67 +68 @@
                 <translatableAttribute id="caption">Player name:</translatableAttribute>
             </object>
 
             <object name="hostPlayerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
                 <action on="Load">
-                    this.caption = Engine.ConfigDB_GetValue("user", "playername");
+                    this.caption = multiplayerName();
                 </action>
             </object>
             </object>
 
             <!-- Host server name is only used on games started through the lobby. -->

binaries/data/mods/public/gui/lobby/prelobby.js

@@ -177 +177 @@
             break;
         case "connected":
         {
             Engine.PopGuiPage();
             Engine.SwitchGuiPage("page_lobby.xml");
-            Engine.ConfigDB_CreateValue("user", "playername", sanitizePlayerName(username, true, true));
-            Engine.ConfigDB_WriteValueToFile("user", "playername", sanitizePlayerName(username, true, true), "config/user.cfg");
+            Engine.ConfigDB_CreateValue("user", "playername.multiplayer", sanitizePlayerName(username, true, true));
+            Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", sanitizePlayerName(username, true, true), "config/user.cfg");
             Engine.ConfigDB_CreateValue("user", "lobby.login", username);
             Engine.ConfigDB_WriteValueToFile("user", "lobby.login", username, "config/user.cfg");
             // We only store the encrypted password, so make sure to re-encrypt it if changed before saving.
             if (password != g_EncrytedPassword.substring(0, 10))
                 g_EncrytedPassword = Engine.EncryptPassword(password, username);

binaries/data/mods/public/gui/options/options.json

@@ -1 +1 @@
 {
     "generalSetting":
     [
         {
+            "type": "string",
+            "label": "Playername (Single Player)",
+            "tooltip": "How you want to be addressed in Single Player matches).",
+            "parameters": { "config": "playername.singleplayer" }
+        },
+        {
+            "type": "string",
+            "label": "Playername (Multiplayer)",
+            "tooltip": "How you want to be addressed in Multiplayer matches (except lobby).",
+            "parameters": { "config": "playername.multiplayer" }
+        },
+        {
             "type": "boolean",
             "label": "Windowed Mode",
             "tooltip": "Start 0 A.D. in a window",
             "parameters": { "config": "windowed" }
         },

binaries/data/mods/public/gui/replaymenu/replay_actions.js

@@ -62 +62 @@
     Engine.SwitchGuiPage("page_loading.xml", {
         "attribs": Engine.GetReplayAttributes(replayDirectory),
         "isNetworked": false,
         "playerAssignments": {
             "local":{
-                "name": translate("You"),
+                "name": singleplayerName(),
                 "player": -1
             }
         },
         "savedGUIData": "",
         "isReplay": true,

binaries/data/mods/public/gui/session/messages.js

@@ -650 +650 @@
     return '[color="' + playerColor + '"]' + (username || translate("Unknown Player")) + "[/color]";
 }
 
 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())
-    {
-        // 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(defeatMsg, {
-        "player": playername,
-        "You": playername
-    });
+    return sprintf(
+        msg.resign ?
+            translate("%(player)s has resigned.") :
+            translate("%(player)s has been defeated."),
+        { "player": colorizePlayernameByID(msg.player) }
+    );
 }
 
 function formatDiplomacyMessage(msg)
 {
     let messageType;

binaries/data/mods/public/gui/session/session.js

@@ -72 +72 @@
 /**
  * For restoring selection, order and filters when returning to the replay menu
  */
 var g_ReplaySelectionData;
 
-var g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1 } };
+var g_PlayerAssignments = {
+    "local": {
+        "name": singleplayerName(),
+        "player": 1
+    }
+};
 
 /**
  * Cache dev-mode settings that are frequently or widely used.
  */
 var g_DevSettings = {

binaries/data/mods/public/gui/session/utility_functions.js

@@ -85 +85 @@
         gainString += translate("+") + gain.market1Gain;
     if (gain.market2Gain && gain.market2Owner == gain.traderOwner)
         gainString += translate("+") + gain.market2Gain;
 
     var tooltip = sprintf(translate("%(gain)s (%(player)s)"), {
-        gain: gainString,
-        player: (!g_IsNetworked && gain.traderOwner == playerID) ? translate("You") : simState.players[gain.traderOwner].name
+        "gain": gainString,
+        "player": simState.players[gain.traderOwner].name
     });
     
     if (gain.market1Gain && gain.market1Owner != gain.traderOwner)
         tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
-            gain: gain.market1Gain,
-            player: (!g_IsNetworked && gain.market1Owner == playerID) ? translate("You") : simState.players[gain.market1Owner].name
+            "gain": gain.market1Gain,
+            "player": simState.players[gain.market1Owner].name
         });
     if (gain.market2Gain && gain.market2Owner != gain.traderOwner)
         tooltip += translateWithContext("Separation mark in an enumeration", ", ") + sprintf(translate("%(gain)s (%(player)s)"), {
-            gain: gain.market2Gain,
-            player: (!g_IsNetworked && gain.market2Owner == playerID) ? translate("You") : simState.players[gain.market2Owner].name
+            "gain": gain.market2Gain,
+            "player": simState.players[gain.market2Owner].name
         });
 
     return tooltip;
 }
 

binaries/data/mods/public/gui/summary/summary.js

@@ -138 +138 @@
     Engine.SwitchGuiPage("page_loading.xml", {
         "attribs": Engine.GetReplayAttributes(g_GameData.replayDirectory),
         "isNetworked": false,
         "playerAssignments": {
             "local": {
-                "name": translate("You"),
+                "name": singleplayerName(),
                 "player": -1
             }
         },
         "savedGUIData": "",
         "isReplay": true,

source/gui/scripting/ScriptFunctions.cpp

@@ -746 +746 @@
 void Script_EndGame(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
     EndGame();
 }
 
+CStrW GetSystemUsername(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
+{
+    return sys_get_user_name();
+}
+
+
 // Cause the game to exit gracefully.
 // params:
 // returns:
 // notes:
 // - Exit happens after the current main loop iteration ends
@@ -1115 +1121 @@
     scriptInterface.RegisterFunction<void, &DumpSimState>("DumpSimState");
     scriptInterface.RegisterFunction<void, &DumpTerrainMipmap>("DumpTerrainMipmap");
     scriptInterface.RegisterFunction<void, unsigned int, &EnableTimeWarpRecording>("EnableTimeWarpRecording");
     scriptInterface.RegisterFunction<void, &RewindTimeWarp>("RewindTimeWarp");
     scriptInterface.RegisterFunction<void, bool, &SetBoundingBoxDebugOverlay>("SetBoundingBoxDebugOverlay");
+    scriptInterface.RegisterFunction<CStrW, &GetSystemUsername>("GetSystemUsername");
 }