Ticket #1657: 1657_AINameAddedToAIPlayerName.patch

File 1657_AINameAddedToAIPlayerName.patch, 6.4 KB (added by Luis Román, 11 years ago)

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

     
    848848       
    849849        if (g_GameAttributes.settings.PlayerData[i].Civ == "random")
    850850            g_GameAttributes.settings.PlayerData[i].Civ = civs[Math.floor(Math.random()*civs.length)];
    851         // Setting names for AI players. Check if the player is AI and the match is not a scenario
    852         if ((g_GameAttributes.mapType !== "scenario")&&(g_GameAttributes.settings.PlayerData[i].AI))
    853         {
    854             // Get the civ specific names
    855             if (g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames !== undefined)
     851        // Setting names for AI players.
     852        if((g_GameAttributes.settings.PlayerData[i].AI)) {
     853            // If the match is not a scenario we use civ specific names.
     854            if ((g_GameAttributes.mapType !== "scenario"))
    856855            {
    857                 var civAINames = shuffleArray(g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames);
     856                // Get the civ specific names
     857                if (g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames !== undefined)
     858                {
     859                    var civAINames = shuffleArray(g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames);
     860                }
     861                else
     862                {
     863                    var civAINames = [g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].Name];
     864                }
     865                // Choose the name
     866                var usedName = 0;
     867                if (i < civAINames.length)
     868                    var chosenName = civAINames[i];
     869                else
     870                    var chosenName = civAINames[Math.floor(Math.random() * civAINames.length)];
     871                for (var j = 0; j < numPlayers; ++j)
     872                    if (g_GameAttributes.settings.PlayerData[j].Name.indexOf(chosenName) !== -1)
     873                        usedName++;
     874               
     875                // Assign civ specific names to AI players
     876                if (usedName)
     877                    g_GameAttributes.settings.PlayerData[i].Name = chosenName + " " + romanNumbers[usedName+1];
     878                else
     879                    g_GameAttributes.settings.PlayerData[i].Name = chosenName;
    858880            }
    859             else
    860             {
    861                 var civAINames = [g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].Name];
    862             }
    863             // Choose the name
    864             var usedName = 0;
    865             if (i < civAINames.length)
    866                 var chosenName = civAINames[i];
    867             else
    868                 var chosenName = civAINames[Math.floor(Math.random() * civAINames.length)];
    869             for (var j = 0; j < numPlayers; ++j)
    870                 if (g_GameAttributes.settings.PlayerData[j].Name.indexOf(chosenName) !== -1)
    871                     usedName++;
    872            
    873             // Assign civ specific names to AI players
    874             if (usedName)
    875                 g_GameAttributes.settings.PlayerData[i].Name = chosenName + " " + romanNumbers[usedName+1];
    876             else
    877                 g_GameAttributes.settings.PlayerData[i].Name = chosenName;
     881
     882            // We add the name of the AI to the player data.
     883            var playerAIId = g_GameAttributes.settings.PlayerData[i].AI;
     884            var playerAI = g_AIs.filter(function(ai){
     885                return ai.id==playerAIId;
     886            })[0];
     887
     888            g_GameAttributes.settings.PlayerData[i].Name =
     889                g_GameAttributes.settings.PlayerData[i].Name + " (" + playerAI.data.name + ")";
    878890        }
     891       
    879892    }
    880893   
    881894    if (g_IsNetworked)

  • binaries/data/mods/public/gui/session/session.xml

     
    281281    <!-- Diplomacy Window -->
    282282    <!-- ================================  ================================ -->
    283283    <object name="diplomacyDialogPanel"
    284         size="50%-300 50%-200 50%+300 50%+150"
     284        size="50%-350 50%-200 50%+350 50%+150"
    285285        type="image"
    286286        hidden="true"
    287287        sprite="StoneDialog"
    … …  
    289289        <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Diplomacy</object>
    290290
    291291        <object name="diplomacyHeader" size="32 32 100%-32 64">
    292             <object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="chatPanel" ghost="true" caption="Name"/>
    293             <object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="chatPanel" ghost="true" caption="Civilization"/>
    294             <object name="diplomacyHeaderTeam" size="250 0 300 100%" type="text" style="chatPanel" ghost="true" caption="Team"/>
    295             <object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="chatPanel" ghost="true" caption="Theirs"/>
     292            <object name="diplomacyHeaderName" size="0 0 250 100%" type="text" style="chatPanel" ghost="true" caption="Name"/>
     293            <object name="diplomacyHeaderCiv" size="250 0 350 100%" type="text" style="chatPanel" ghost="true" caption="Civilization"/>
     294            <object name="diplomacyHeaderTeam" size="350 0 400 100%" type="text" style="chatPanel" ghost="true" caption="Team"/>
     295            <object name="diplomacyHeaderTheirs" size="400 0 460 100%" type="text" style="chatPanel" ghost="true" caption="Theirs"/>
    296296            <object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="chatPanel" caption="A" tooltip="Ally" tooltip_style="sessionToolTipBold"/>
    297297            <object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="chatPanel" caption="N" tooltip="Neutral" tooltip_style="sessionToolTipBold"/>
    298298            <object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="chatPanel" caption="E" tooltip="Enemy" tooltip_style="sessionToolTipBold"/>
    … …  
    302302        <object size="32 64 100%-32 384">
    303303            <repeat count="16">
    304304                <object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="false">
    305                     <object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="chatPanel" ghost="true"/>
    306                     <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="chatPanel" ghost="true"/>
    307                     <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="chatPanel" ghost="true"/>
    308                     <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="chatPanel" ghost="true"/>
     305                    <object name="diplomacyPlayerName[n]" size="0 0 250 100%" type="text" style="chatPanel" ghost="true"/>
     306                    <object name="diplomacyPlayerCiv[n]" size="250 0 350 100%" type="text" style="chatPanel" ghost="true"/>
     307                    <object name="diplomacyPlayerTeam[n]" size="350 0 400 100%" type="text" style="chatPanel" ghost="true"/>
     308                    <object name="diplomacyPlayerTheirs[n]" size="400 0 460 100%" type="text" style="chatPanel" ghost="true"/>
    309309
    310310                    <!-- Diplomatic stance - selection -->
    311311                    <object name="diplomacyPlayerAlly[n]" size="100%-180 0 100%-160 100%" type="button" style="StoneButton" hidden="true"/>