Ticket #2749: t2749_ceasefire_v3.2.patch

binaries/data/mods/public/gui/common/global.xml

@@ -24 +24 @@
             hidden="true"
             hotkey="fps.toggle"
             sprite="color: 0 0 0 200"
             font="mono-stroke-10"
             textcolor="white"
-            size="100%-80 70 100%-10 90"
+            size="100%-130 50 100%-60 70"
             z="199"
         >
             <action on="Tick">
                 this.hidden = Engine.ConfigDB_GetValue("user", "overlay.fps") !== "true";
                 updateFPS();
@@ -50 +50 @@
             hidden="true"
             hotkey="realtime.toggle"
             sprite="color: 0 0 0 200"
             font="mono-stroke-10"
             textcolor="white"
-            size="100%-80 100 100%-10 120"
+            size="100%-130 80 100%-60 100"
             z="199"
         >
             <action on="Tick">
                 this.hidden = Engine.ConfigDB_GetValue("user", "overlay.realtime") !== "true";
                 this.caption = (new Date()).toLocaleTimeString();

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

@@ -12 +12 @@
 const POPULATION_CAP_DEFAULTIDX = 5;
 // Translation: Amount of starting resources.
 const STARTING_RESOURCES = [translateWithContext("startingResources", "Very Low"), translateWithContext("startingResources", "Low"), translateWithContext("startingResources", "Medium"), translateWithContext("startingResources", "High"), translateWithContext("startingResources", "Very High"), translateWithContext("startingResources", "Deathmatch")];
 const STARTING_RESOURCES_DATA = [100, 300, 500, 1000, 3000, 50000];
 const STARTING_RESOURCES_DEFAULTIDX = 1;
+// Translation: Ceasefire.
+const CEASEFIRE = [translateWithContext("ceasefire", "No ceasefire"), translateWithContext("ceasefire", "15 seconds"), translateWithContext("ceasefire", "5 minutes"), translateWithContext("ceasefire", "10 minutes"), translateWithContext("ceasefire", "15 minutes"), translateWithContext("ceasefire", "20 minutes"), translateWithContext("ceasefire", "30 minutes"), translateWithContext("ceasefire", "45 minutes"), translateWithContext("ceasefire", "60 minutes")];
+const CEASEFIRE_DATA = [0, 0.25, 5, 10, 15, 20, 30, 45, 60];
+const CEASEFIRE_DEFAULTIDX = 0;
 // Max number of players for any map
 const MAX_PLAYERS = 8;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -203 +207 @@
                 g_GameAttributes.settings.StartingResources = STARTING_RESOURCES_DATA[this.selected];
 
             updateGameAttributes();
         }
 
+        var ceasefireL = Engine.GetGUIObjectByName("ceasefire");
+        ceasefireL.list = CEASEFIRE;
+        ceasefireL.list_data = CEASEFIRE_DATA;
+        ceasefireL.selected = CEASEFIRE_DEFAULTIDX;
+        ceasefireL.onSelectionChange = function() {
+            if (this.selected != -1)
+                g_GameAttributes.settings.Ceasefire = CEASEFIRE_DATA[this.selected];
+
+            updateGameAttributes();
+        }
+
         var victoryConditions = Engine.GetGUIObjectByName("victoryCondition");
         var victories = getVictoryConditions();
         victoryConditions.list = victories.text;
         victoryConditions.list_data = victories.data;
         victoryConditions.onSelectionChange = function() {
@@ -738 +753 @@
     {
         var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
         startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
     }
 
+    if (mapSettings.Ceasefire)
+    {
+        var ceasefireBox = Engine.GetGUIObjectByName("ceasefire");
+        ceasefireBox.selected = ceasefireBox.list_data.indexOf(mapSettings.Ceasefire);
+    }
+
     if (attrs.gameSpeed)
     {
         var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
         gameSpeedBox.selected = g_GameSpeeds.speeds.indexOf(attrs.gameSpeed);
     }
@@ -1141 +1162 @@
         {
             var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
             startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
         }
 
+        if (mapSettings.Ceasefire)
+        {
+            var ceasefireBox = Engine.GetGUIObjectByName("ceasefire");
+            ceasefireBox.selected = ceasefireBox.list_data.indexOf(mapSettings.Ceasefire);
+        }
+
         initMapNameList();
     }
 
     // Controls common to all map types
     var numPlayersSelection = Engine.GetGUIObjectByName("numPlayersSelection");
@@ -1156 +1183 @@
     var mapSize = Engine.GetGUIObjectByName("mapSize");
     var enableCheats = Engine.GetGUIObjectByName("enableCheats");
     var enableRating = Engine.GetGUIObjectByName("enableRating");
     var populationCap = Engine.GetGUIObjectByName("populationCap");
     var startingResources = Engine.GetGUIObjectByName("startingResources");
+    var ceasefire = Engine.GetGUIObjectByName("ceasefire");
 
     var numPlayersText= Engine.GetGUIObjectByName("numPlayersText");
     var mapSizeDesc = Engine.GetGUIObjectByName("mapSizeDesc");
     var mapSizeText = Engine.GetGUIObjectByName("mapSizeText");
     var revealMapText = Engine.GetGUIObjectByName("revealMapText");
@@ -1169 +1197 @@
     var lockTeamsText = Engine.GetGUIObjectByName("lockTeamsText");
     var enableCheatsText = Engine.GetGUIObjectByName("enableCheatsText");
     var enableRatingText = Engine.GetGUIObjectByName("enableRatingText");
     var populationCapText = Engine.GetGUIObjectByName("populationCapText");
     var startingResourcesText = Engine.GetGUIObjectByName("startingResourcesText");
+    var ceasefireText = Engine.GetGUIObjectByName("ceasefireText");
     var gameSpeedText = Engine.GetGUIObjectByName("gameSpeedText");
     var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
 
     // We have to check for undefined on these properties as not all maps define them.
     var sizeIdx = (mapSettings.Size !== undefined && g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes["default"]);
@@ -1195 +1224 @@
     gameSpeedBox.selected = speedIdx;
     populationCap.selected = (mapSettings.PopulationCap !== undefined && POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) != -1 ? POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) : POPULATION_CAP_DEFAULTIDX);
     populationCapText.caption = POPULATION_CAP[populationCap.selected];
     startingResources.selected = (mapSettings.StartingResources !== undefined && STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) != -1 ? STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) : STARTING_RESOURCES_DEFAULTIDX);
     startingResourcesText.caption = STARTING_RESOURCES[startingResources.selected];
+    ceasefire.selected = (mapSettings.Ceasefire !== undefined && CEASEFIRE_DATA.indexOf(mapSettings.Ceasefire) != -1 ? CEASEFIRE_DATA.indexOf(mapSettings.Ceasefire) : CEASEFIRE_DEFAULTIDX);
+    ceasefireText.caption = CEASEFIRE[ceasefire.selected];
 
     // Update map preview
     Engine.GetGUIObjectByName("mapPreview").sprite = "cropped:(0.78125,0.5859375)session/icons/mappreview/" + getMapPreview(mapName);
 
     // Hide/show settings depending on whether we can change them or not
@@ -1220 +1251 @@
         updateDisplay(disableTreasures, disableTreasuresText, g_IsController);
         updateDisplay(victoryCondition, victoryConditionText, g_IsController);
         updateDisplay(lockTeams, lockTeamsText, g_IsController);
         updateDisplay(populationCap, populationCapText, g_IsController);
         updateDisplay(startingResources, startingResourcesText, g_IsController);
+        updateDisplay(ceasefire, ceasefireText, g_IsController);
 
         if (g_IsController)
         {
             //Host
             numPlayersSelection.selected = numPlayers - 1;
@@ -1262 +1294 @@
         updateDisplay(disableTreasures, disableTreasuresText, g_IsController);
         updateDisplay(victoryCondition, victoryConditionText, g_IsController);
         updateDisplay(lockTeams, lockTeamsText, g_IsController);
         updateDisplay(populationCap, populationCapText, g_IsController);
         updateDisplay(startingResources, startingResourcesText, g_IsController);
+        updateDisplay(ceasefire, ceasefireText, g_IsController);
 
         if (g_IsController)
         {
             //Host
             revealMap.checked = (mapSettings.RevealMap ? true : false);
@@ -1288 +1321 @@
 
 
     case "scenario":
         // For scenario just reflect settings for the current map
         numPlayersSelection.hidden = true;
-        mapSize.hidden = true;
-        revealMap.hidden = true;
-        exploreMap.hidden = true;
-        disableTreasures.hidden = true;
-        victoryCondition.hidden = true;
-        lockTeams.hidden = true;
         numPlayersText.hidden = false;
+        mapSize.hidden = true;
         mapSizeText.hidden = true;
         mapSizeDesc.hidden = true;
+        revealMap.hidden = true;
         revealMapText.hidden = false;
+        exploreMap.hidden = true;
         exploreMapText.hidden = false;
+        disableTreasures.hidden = true;
         disableTreasuresText.hidden = false;
+        victoryCondition.hidden = true;
         victoryConditionText.hidden = false;
+        lockTeams.hidden = true;
         lockTeamsText.hidden = false;
-        populationCap.hidden = true;
-        populationCapText.hidden = false;
         startingResources.hidden = true;
         startingResourcesText.hidden = false;
-
+        populationCap.hidden = true;
+        populationCapText.hidden = false;
+        ceasefire.hidden = true;
+        ceasefireText.hidden = false;
+        
         numPlayersText.caption = numPlayers;
         mapSizeText.caption = translate("Default");
         revealMapText.caption = (mapSettings.RevealMap ? translate("Yes") : translate("No"));
         exploreMapText.caption = (mapSettings.ExploreMap ? translate("Yes") : translate("No"));
         disableTreasuresText.caption = translate("No");
         victoryConditionText.caption = victories.text[victoryIdx];
         lockTeamsText.caption = (mapSettings.LockTeams ? translate("Yes") : translate("No"));
-        Engine.GetGUIObjectByName("populationCap").selected = POPULATION_CAP_DEFAULTIDX;
 
+        startingResourcesText.caption = translate("Determined by scenario");
+        populationCapText.caption = translate("Determined by scenario");
+        ceasefireText.caption = translate("Determined by scenario");
         break;
 
     default:
         error(sprintf("onGameAttributesChange: Unexpected map type '%(mapType)s'", { mapType: g_GameAttributes.mapType }));
         return;

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

@@ -268 +268 @@
             <!-- End Options -->
             </object>
 
             <!-- More Options -->
             <object hidden="true" name="moreOptionsFade" type="image" z="60" sprite="ModernFade"/>
-            <object name="moreOptions" type="image" sprite="ModernDialog" size="50%-200 50%-195 50%+200 50%+190" z="70" hidden="true">
+            <object name="moreOptions" type="image" sprite="ModernDialog" size="50%-200 50%-195 50%+200 50%+220" z="70" hidden="true">
                 <object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
                     <translatableAttribute id="caption">More Options</translatableAttribute>
                 </object>
 
                 <object size="14 38 94% 66">
@@ -315 +315 @@
                     </object>
                 </object>
 
                 <object size="14 158 94% 186">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
+                        <translatableAttribute id="caption">Ceasefire:</translatableAttribute>
+                    </object>
+                    <object name="ceasefireText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
+                    <object name="ceasefire" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip">
+                        <translatableAttribute id="tooltip">Set time where no attacks are possible.</translatableAttribute>
+                    </object>
+                </object>
+
+                <object size="14 188 94% 216">
+                    <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption" comment="Make sure to differentiate between the revealed map and explored map options!">Revealed Map:</translatableAttribute>
                     </object>
                     <object name="revealMapText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="revealMap" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
                         <translatableAttribute id="tooltip" comment="Make sure to differentiate between the revealed map and explored map options!">Toggle revealed map (see everything).</translatableAttribute>
                     </object>
                 </object>
 
-                <object size="14 188 94% 216">
+                <object size="14 218 94% 246">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption" comment="Make sure to differentiate between the revealed map and explored map options!">Explored Map:</translatableAttribute>
                     </object>
                     <object name="exploreMapText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="exploreMap" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
                         <translatableAttribute id="tooltip" comment="Make sure to differentiate between the revealed map and explored map options!">Toggle explored map (see initial map).</translatableAttribute>
                     </object>
                 </object>
 
-                <object size="14 218 94% 246">
+                <object size="14 248 94% 276">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Disable Treasures:</translatableAttribute>
                     </object>
                     <object name="disableTreasuresText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="disableTreasures" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
                         <translatableAttribute id="tooltip">Disable all treasures on the map.</translatableAttribute>
                     </object>
                 </object>
 
-                <object size="14 248 94% 276">
+                <object size="14 278 94% 306">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Teams Locked:</translatableAttribute>
                     </object>
                     <object name="lockTeamsText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="lockTeams" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
                         <translatableAttribute id="tooltip">Toggle locked teams.</translatableAttribute>
                     </object>
                 </object>
 
-                <object name="optionCheats" size="14 278 94% 306" hidden="true">
+                <object name="optionCheats" size="14 308 94% 336" hidden="true">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Cheats:</translatableAttribute>
                     </object>
                     <object name="enableCheatsText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="enableCheats" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
                         <translatableAttribute id="tooltip">Toggle the usability of cheats.</translatableAttribute>
                     </object>
                 </object>
 
-                <object name="optionRating" size="14 308 94% 336" hidden="true">
+                <object name="optionRating" size="14 338 94% 366" hidden="true">
                     <object size="0 0 40% 28" hidden="false" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Rated Game:</translatableAttribute>
                     </object>
                     <object name="enableRatingText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
                     <object name="enableRating" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
@@ -378 +388 @@
                 <!-- Hide More Options Button -->
                 <object
                     name="hideMoreOptions"
                     type="button"
                     style="StoneButton"
-                    size="50%-70 340 50%+70 366"
+                    size="50%-70 370 50%+70 396"
                     tooltip_style="onscreenToolTip"
                 >
                     <translatableAttribute id="caption">OK</translatableAttribute>
                     <translatableAttribute id="tooltip">Close more game options window</translatableAttribute>
                     <action on="Press">toggleMoreOptions();</action>

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

@@ -11 +11 @@
         [translate("Disable Welcome Screen"), translate("If you disable this screen completely, you may miss important announcements.\nYou can still launch it using the main menu."), {"config":"splashscreendisable"}, "boolean"],
         [translate("Detailed Tooltips"), translate("Show detailed tooltips for trainable units in unit-producing buildings."), {"config":"showdetailedtooltips"}, "boolean"],
         [translate("FPS Overlay"), translate("Show frames per second in top right corner."), {"config":"overlay.fps"}, "boolean"],
         [translate("Realtime Overlay"), translate("Show current system time in top right corner."), {"config":"overlay.realtime"}, "boolean"],
         [translate("Gametime Overlay"), translate("Show current simulation time in top right corner."), {"config":"gui.session.timeelapsedcounter"}, "boolean"],
+        [translate("Ceasefire Time Overlay"), translate("Always show the remaining ceasefire time."), {"config":"gui.session.ceasefirecounter"}, "boolean"],
         [translate("Persist match settings"), translate("Save and restore match settings for quick reuse when hosting another game"), {"config":"persistmatchsettings"}, "boolean"],
     ],
     "graphicsSetting":
     [
         [translate("Prefer GLSL"), translate("Use OpenGL 2.0 shaders (recommended)"), {"renderer":"PreferGLSL", "config":"preferglsl"}, "boolean"],

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

@@ -70 +70 @@
                     <object name="diplomacyAttackRequestImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/attack-request.png" ghost="true"/>
                 </object>
             </object>
         </repeat>
     </object>
-
+    
+    <object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="chatPanel" ghost="true"></object>
+    
     <object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
         <translatableAttribute id="caption">Close</translatableAttribute>
         <action on="Press">closeDiplomacy();</action>
     </object>
 </object>

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

@@ -341 +341 @@
             button.hidden = false;
             button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
         }
 
         // Attack Request
+        var simState = GetSimState();
         let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
-        button.hidden = !(g_Players[i].isEnemy[we]);
+        button.hidden = simState.ceasefireActive && !(g_Players[i].isEnemy[we]);
         button.tooltip = translate("request for your allies to attack this enemy");
         button.onpress = (function(i, we){ return function() {
             Engine.PostNetworkCommand({"type": "attack-request", "source": we, "target": i});
         } })(i, we);
 
@@ -360 +361 @@
         {
             let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(i-1)+"]");
 
             button.caption = g_Players[we]["is"+setting][i] ? translate("x") : "";
             button.onpress = (function(e){ return function() { setDiplomacy(e) } })({"player": i, "to": setting.toLowerCase()});
-            button.hidden = false;
+            button.hidden = simState.ceasefireActive;
         }
     }
 
     Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }

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

@@ -395 +395 @@
     var now = new Date;
     var tickLength = new Date - lastTickTime;
     lastTickTime = now;
 
     checkPlayerState();
-
     while (true)
     {
         var message = Engine.PollNetworkClient();
         if (!message)
             break;
@@ -537 +536 @@
     updateDebug();
     updatePlayerDisplay();
     updateSelectionDetails();
     updateBuildingPlacementPreview();
     updateTimeElapsedCounter();
+    updateCeasefireCounter();
     updateTimeNotifications();
     if (!g_IsObserver)
         updateResearchDisplay();
 
     if (!g_IsObserver && !g_GameEnded)
@@ -778 +778 @@
     // Hide unused buttons.
     for (var i = numButtons; i < 10; ++i)
         Engine.GetGUIObjectByName("researchStartedButton[" + i + "]").hidden = true;
 }
 
+function updateCeasefireCounter()
+{
+    var simState = GetSimState();
+    var isActive = simState.ceasefireActive; 
+    var remainingTimeString = timeToString(simState.ceasefireTimeRemaining);
+    
+    var ceasefireCounter = Engine.GetGUIObjectByName("ceasefireCounter");
+    var diplomacyCeasefireCounter = Engine.GetGUIObjectByName("diplomacyCeasefireCounter");
+    
+    ceasefireCounter.hidden = !isActive || Engine.ConfigDB_GetValue("user", "gui.session.ceasefirecounter") !== "true";
+    diplomacyCeasefireCounter.hidden = !isActive; 
+    
+    ceasefireCounter.caption = remainingTimeString;
+    diplomacyCeasefireCounter.caption = sprintf(translateWithContext("ceasefire", "Time remaining until ceasefire is over: %(time)s."), {"time": remainingTimeString});
+}
+
 function updateTimeElapsedCounter()
 {
     var simState = GetSimState();
     var timeElapsedCounter = Engine.GetGUIObjectByName("timeElapsedCounter");
     if (g_CurrentSpeed != 1.0)
@@ -1042 +1058 @@
     reportObject.playerID = Engine.GetPlayerID();
     reportObject.matchID = g_MatchID;
     reportObject.civs = playerCivs;
     reportObject.teams = teams;
     reportObject.teamsLocked = String(teamsLocked);
+    reportObject.ceasefireActive = String(extendedSimState.ceasefireActive);
+    reportObject.ceasefireTimeRemaining = String(extendedSimState.ceasefireTimeRemaining);
     reportObject.mapName = mapName;
     reportObject.economyScore = playerStatistics.economyScore;
     reportObject.militaryScore = playerStatistics.militaryScore;
     reportObject.totalScore = playerStatistics.totalScore;
     for each (var rct in resourcesCounterTypes)

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

@@ -145 +145 @@
 
     <!-- ================================  ================================ -->
     <!-- Time elapsed counter -->
     <!-- ================================  ================================ -->
 
-    <object size="100%-120 45 100%-10 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
+    <object size="100%-250 45 100%-140 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
             <action on="Tick">
                 this.hidden = Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") !== "true";
             </action>
             <action on="Press">
                 Engine.ConfigDB_CreateValue("user", "gui.session.timeelapsedcounter", ""+this.hidden);
             </action>
     </object>
+    <object size="100%-250 80 100%-140 100" type="text" name="ceasefireCounter" style="SettingsText" hotkey="ceasefirecounter.toggle" hidden="true">
+            <action on="Press">
+                Engine.ConfigDB_CreateValue("user", "gui.session.ceasefirecounter", ""+this.hidden);
+            </action>
+    </object>
 
     <!-- ================================  ================================ -->
     <!-- Pause Overlay -->
     <!-- ================================  ================================ -->
     <object type="button"

binaries/data/mods/public/gui/session/session_objects/research_progress.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object size="100%-50 85 100%-10 100%-200">
+<object size="100%-50 40 100%-10 100%-200">
     <repeat count="10">
         <object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
             <object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
             <object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
         </object>

binaries/data/mods/public/simulation/ai/petra/defenseManager.js

@@ -121 +121 @@
 
 m.DefenseManager.prototype.checkEnemyUnits = function(gameState)
 {
     var nbPlayers = gameState.sharedScript.playersData.length;
     var i = gameState.ai.playedTurn % nbPlayers;
-    if (i === PlayerID || gameState.isPlayerAlly(i))
+    if (i === PlayerID || !gameState.isPlayerEnemy(i))
         return;
 
     // loop through enemy units
     for (let ent of gameState.getEnemyUnits(i).values())
     {
@@ -212 +212 @@
     for (var i = 0; i < this.armies.length; ++i)
     {
         var army = this.armies[i];
         army.recalculatePosition(gameState);
         var owner = this.territoryMap.getOwner(army.foePosition);
-        if (gameState.isPlayerAlly(owner))
+        if (!gameState.isPlayerEnemy(owner))
             continue;
         else if (owner !== 0)   // enemy army back in its territory
         {
             army.clear(gameState);
             this.armies.splice(i--,1);

binaries/data/mods/public/simulation/components/Capturable.js

@@ -67 +67 @@
     // Before changing the value, activate Fogging if necessary to hide changes
     var cmpFogging = Engine.QueryInterface(this.entity, IID_Fogging);
     if (cmpFogging)
         cmpFogging.Activate();
 
-    var enemiesFilter = function(v, i) { return v > 0 && !cmpPlayerSource.IsAlly(i); };
+    var enemiesFilter = function(v, i) { return v > 0 && cmpPlayerSource.IsEnemy(i); };
     var numberOfEnemies = this.cp.filter(enemiesFilter).length;
 
     if (numberOfEnemies == 0)
         return 0;
 
     // distribute the capture points over all enemies
     var distributedAmount = amount / numberOfEnemies;
     for (let i in this.cp)
     {
-        if (cmpPlayerSource.IsAlly(i))
+        if (!cmpPlayerSource.IsEnemy(i))
             continue;
         if (this.cp[i] > distributedAmount)
             this.cp[i] -= distributedAmount;
         else
             this.cp[i] = 0;
@@ -119 +119 @@
     if (!cmpPlayerSource)
         warn(playerID + " has no player component defined on its id");
     var cp = this.GetCapturePoints()
     var sourceEnemyCp = 0;
     for (let i in this.GetCapturePoints())
-        if (!cmpPlayerSource.IsAlly(i))
+        if (cmpPlayerSource.IsEnemy(i))
             sourceEnemyCp += cp[i];
     return sourceEnemyCp > 0;
 };
 
 //// Private functions ////

binaries/data/mods/public/simulation/components/CeasefireManager.js

@@ +1 @@
+function CeasefireManager() {}
+
+CeasefireManager.prototype.Schema =
+    "<a:help>Lists the sound groups associated with this unit.</a:help>" +
+    "<a:example>" +
+        "<SoundGroups>" +
+            "<ceasefire>interface/alarm/alarm_alert_0.xml</ceasefire>" +
+        "</SoundGroups>" +
+    "</a:example>" +
+    "<element name='SoundGroups'>" +
+        "<zeroOrMore>" + /* TODO: make this more specific, like a list of specific elements */
+            "<element>" +
+                "<anyName/>" +
+                "<text/>" +
+            "</element>" +
+        "</zeroOrMore>" +
+    "</element>";
+
+CeasefireManager.prototype.Init = function()
+{
+    // Weather or not ceasefire is active currently.
+    this.ceasefireIsActive = false;
+    
+    // Ceasefire timeout in milliseconds
+    this.ceasefireTime = 0;
+    
+    // Time elapsed when the ceasefire was started
+    this.ceasefireStartedTime = 0;
+
+    // diplomacy states before the ceasefire started
+    this.diplomacyBeforeCeasefire = [];
+
+    // Message duration for the countdown in milliseconds
+    this.countdownMessageDuration = 10000;
+
+    // Duration for the post ceasefire message in milliseconds
+    this.postCountdownMessageDuration = 5000;
+};
+
+CeasefireManager.prototype.IsCeasefireActive = function()
+{
+    return this.ceasefireIsActive;
+};
+
+CeasefireManager.prototype.GetCeasefireStartedTime = function()
+{
+    return this.ceasefireStartedTime;
+};
+
+CeasefireManager.prototype.GetCeasefireTime = function()
+{
+    return this.ceasefireTime;
+};
+
+CeasefireManager.prototype.GetDiplomacyBeforeCeasefire = function()
+{
+    return this.diplomacyBeforeCeasefire;
+};
+
+CeasefireManager.prototype.StartCeasefire = function(ceasefireTime)
+{
+    // If invalid timeout given, return
+    if (ceasefireTime <= 0)
+        return;
+
+    // Remove existing timers
+    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    if (this.ceasefireCountdownMessageTimer)
+        cmpTimer.CancelTimer(this.ceasefireCountdownMessageTimer);
+
+    if (this.stopCeasefireTimer)
+        cmpTimer.CancelTimer(this.stopCeasefireTimer);
+
+    // Remove existing messages
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    if (this.ceasefireCountdownMessage)
+        cmpGuiInterface.DeleteTimeNotification(this.ceasefireCountdownMessage);
+
+    if (this.ceasefireEndedMessage)
+        cmpGuiInterface.DeleteTimeNotification(this.ceasefireEndedMessage);
+
+
+    // Save diplomacy and set everyone neutral
+    if (!this.ceasefireIsActive)
+    {
+        // Save diplomacy
+        var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
+        for (var i = 1; i < playerEntities.length; i++)
+        {
+            // Copy array with slice(), otherwise it will change
+            var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
+            this.diplomacyBeforeCeasefire.push(cmpPlayer.GetDiplomacy().slice());
+        }
+
+        // Set every enemy (except gaia) to neutral
+        for (var i = 1; i < playerEntities.length; i++)
+        {
+            var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
+            for (var j = 1; j < playerEntities.length; j++)
+            {
+                if (this.diplomacyBeforeCeasefire[i-1][j] < 0)
+                    cmpPlayer.SetNeutral(j);
+            }
+        }
+    }
+    
+    // Save other data
+    this.ceasefireIsActive = true;
+    this.ceasefireTime = ceasefireTime;
+    this.ceasefireStartedTime = cmpTimer.GetTime();
+
+    // Send message
+    Engine.PostMessage(SYSTEM_ENTITY, MT_CeasefireStarted);
+
+    // Add timers for countdown message and reseting diplomacy
+    this.stopCeasefireTimer = cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_CeasefireManager, "StopCeasefire", this.ceasefireTime);
+    this.ceasefireCountdownMessageTimer = cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_CeasefireManager, "ShowCeasefireCountdownMessage",
+            this.ceasefireTime - this.countdownMessageDuration, this.countdownMessageDuration);
+};
+
+CeasefireManager.prototype.ShowCeasefireCountdownMessage = function(duration)
+{
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    this.ceasefireCountdownMessage = cmpGuiInterface.AddTimeNotification({
+        "message": markForTranslation("You can attack in %(time)s"),
+        "translateMessage": true
+    }, duration);
+};
+
+CeasefireManager.prototype.StopCeasefire = function()
+{
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+
+    // Remove previous message
+    if (this.ceasefireCountdownMessage)
+        cmpGuiInterface.DeleteTimeNotification(this.ceasefireCountdownMessage);
+    
+    // Show new message
+    this.ceasefireEndedMessage = cmpGuiInterface.AddTimeNotification({
+        "message": markForTranslation("You can attack now!"),
+        "translateMessage": true
+    }, this.postCountdownMessageDuration);
+    
+    // Reset diplomacies to original settings
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
+    for (var i = 1; i < playerEntities.length; i++)
+    {
+        var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
+        cmpPlayer.SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
+    }       
+
+    // Send chat notifications and update the diplomacy screen
+    for (var i = 1; i < playerEntities.length; i++)
+    {
+        var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
+        for (var j = 1; j < playerEntities.length; j++)
+        {
+            if (i != j && this.diplomacyBeforeCeasefire[i-1][j] == -1)
+                cmpGuiInterface.PushNotification({"type": "diplomacy", "players": [j], "player1": [i], "status": "enemy"});
+        }
+    }   
+    
+    // Reset values
+    this.ceasefireIsActive = false;
+    this.ceasefireTime = 0;
+    this.ceasefireStartedTime = 0;
+    this.diplomacyBeforeCeasefire = [];
+
+    // Send message
+    Engine.PostMessage(SYSTEM_ENTITY, MT_CeasefireEnded);
+};
+
+Engine.RegisterSystemComponentType(IID_CeasefireManager, "CeasefireManager", CeasefireManager);

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -116 +116 @@
             "classCounts": cmpTechnologyManager ? cmpTechnologyManager.GetClassCounts() : null,
             "typeCountsByClass": cmpTechnologyManager ? cmpTechnologyManager.GetTypeCountsByClass() : null
         };
         ret.players.push(playerData);
     }
-
+    
     var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     if (cmpRangeManager)
         ret.circularMap = cmpRangeManager.GetLosCircular();
 
     var cmpTerrain = Engine.QueryInterface(SYSTEM_ENTITY, IID_Terrain);
@@ -128 +128 @@
         ret.mapSize = 4 * cmpTerrain.GetTilesPerSide();
 
     // Add timeElapsed
     var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
     ret.timeElapsed = cmpTimer.GetTime();
-
+    
+    // Add ceasefire info
+    var cmpCeasefireManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_CeasefireManager);
+    if (cmpCeasefireManager)
+    {
+        ret.ceasefireActive = cmpCeasefireManager.IsCeasefireActive();
+        ret.ceasefireTimeRemaining = cmpCeasefireManager.GetCeasefireStartedTime() + cmpCeasefireManager.GetCeasefireTime() - ret.timeElapsed;
+    }
+    
     // Add the game type
     var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
     ret.gameType = cmpEndGameManager.GetGameType();
 
     // Add bartering prices
@@ -685 +693 @@
 GuiInterface.prototype.AddTimeNotification = function(notification, duration = 10000)
 {
     var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
     notification.endTime = duration + cmpTimer.GetTime();
     notification.id = ++this.timeNotificationID;
+
+    // Let all players receive the notification by default
+    if (notification.players == undefined)
+    {
+        var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+        var numPlayers = cmpPlayerManager.GetNumPlayers();
+        notification.players = [];
+        for (var i = 1; i < numPlayers; i++)
+            notification.players.push(i);
+    }
+    
     this.timeNotifications.push(notification);
     this.timeNotifications.sort(function (n1, n2){return n2.endTime - n1.endTime});
 
     cmpTimer.SetTimeout(this.entity, IID_GuiInterface, "DeleteTimeNotification", duration, this.timeNotificationID);
 
@@ -1733 +1752 @@
     var cmpTargetPlayer = QueryOwnerInterface(data.target, IID_Player);
     if (!cmpEntityPlayer || !cmpTargetPlayer)
         return false;
 
     // if the owner is an enemy, it's up to the attack component to decide
-    if (!cmpEntityPlayer.IsAlly(cmpTargetPlayer.GetPlayerID()))
+    if (cmpEntityPlayer.IsEnemy(cmpTargetPlayer.GetPlayerID()))
         return cmpAttack.CanAttack(data.target);
     return false;
 };
 
 /*

binaries/data/mods/public/simulation/components/interfaces/CeasefireManager.js

@@ +1 @@
+Engine.RegisterInterface("CeasefireManager");
+
+Engine.RegisterMessageType("CeasefireStarted");
+Engine.RegisterMessageType("CeasefireEnded");
+ No newline at end of file

binaries/data/mods/public/simulation/helpers/Setup.js

@@ -59 +59 @@
                 warn("Map error in Setup.js: entity " + holder + " can not garrison units");
             else
                 cmpGarrisonHolder.initGarrison = settings.Garrison[holder];
         }
     }
+    
+    var cmpCeasefireManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_CeasefireManager);
+    if (settings.Ceasefire)
+        cmpCeasefireManager.StartCeasefire(settings.Ceasefire * 60 * 1000);
 }
 
 Engine.RegisterGlobal("LoadMapSettings", LoadMapSettings);