Ticket #1649: wonderVictory.5.diff

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

@@ -4 +4 @@
 const DEFAULT_OFFLINE_MAP = "Acropolis 01";
 
 // TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
-const VICTORY_TEXT = ["Conquest", "None"];
-const VICTORY_DATA = ["conquest", "endless"];
+const VICTORY_TEXT = ["Conquest", "Wonder", "None"];
+const VICTORY_DATA = ["conquest", "wonder", "endless"];
 const VICTORY_DEFAULTIDX = 0;
 const POPULATION_CAP = ["50", "100", "150", "200", "250", "300", "Unlimited"];
 const POPULATION_CAP_DATA = [50, 100, 150, 200, 250, 300, 10000];

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

@@ -136 +136 @@
     var messages = [];
     for each (var n in notifications)
         messages.push(n.message);
-    getGUIObjectByName("notificationText").caption = messages.join("\n");
-}
-
-// Returns [username, playercolor] for the given player
-function getUsernameAndColor(player)
-{
+    getGUIObjectByName("notificationText").caption = messages.join("\n");
+}
+
+function updateTimeNotifications()
+{
+    getGUIObjectByName("timeNotificationText").caption = Engine.GuiInterfaceCall("GetTimeNotificationText");
+}
+
+// Returns [username, playercolor] for the given player
+function getUsernameAndColor(player)
+{
     // This case is hit for AIs, whose names don't exist in playerAssignments.
     var color = g_Players[player].color;
     return [

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

@@ -481 +481 @@
     updateResearchDisplay();
     updateBuildingPlacementPreview();
     updateTimeElapsedCounter();
+    updateTimeNotifications();  
 
     // Update music state on basis of battle state.
     var battleState = Engine.GuiInterfaceCall("GetBattleState", Engine.GetPlayerID());

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

@@ -345 +345 @@
     <object name="notificationPanel" type="image" size="50%-300 60 50%+300 120" ghost="true">
         <object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
     </object>
+    <object name="timeNotificationPanel" type="image" size="100%-600 60 100%-20 120" ghost="true">
+        <object name="timeNotificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
+    </object>
 
+
     <!-- ================================  ================================ -->
     <!-- Chat -->
     <!-- ================================  ================================ -->

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

@@ -24 +24 @@
 EndGameManager.prototype.SetGameType = function(newGameType)
 {
     this.gameType = newGameType;
+    Engine.BroadcastMessage(MT_GameTypeChanged, {});
 };
 
+EndGameManager.prototype.CheckGameType = function(type)
+{
+    return this.gameType == type;
+};
+
+EndGameManager.prototype.RegisterWonder = function(entity)
+{
+    if (!this.CheckGameType("wonder"))
+        return;
+
+    var cmpWon = QueryOwnerInterface(entity, IID_Player);
+    cmpWon.SetState("won");
+    
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var numPlayers = cmpPlayerManager.GetNumPlayers();
+    for (var i = 1; i < numPlayers; i++)
+    {
+        var playerEntityId = cmpPlayerManager.GetPlayerByID(i);
+        var cmpPlayer = Engine.QueryInterface(playerEntityId, IID_Player);
+        if (cmpPlayer.GetState() != "active")
+            continue;
+        if (this.alliedVictory && cmpPlayer.IsMutualAlly(cmpWon.GetPlayerID()))
+            cmpPlayer.SetState("won")
+        else
+            Engine.PostMessage(playerEntityId, MT_PlayerDefeated, { "playerId": i } );
+    }
+
+    // Reveal the map to all players
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    cmpRangeManager.SetLosRevealAll(-1, true);
+};
+
 EndGameManager.prototype.SetAlliedVictory = function(flag)
 {
     this.alliedVictory = flag;

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

@@ -22 +22 @@
     this.placementWallLastAngle = 0;
     this.notifications = [];
     this.renamedEntities = [];
+    this.timeNotificationID = 1;
+    this.timeNotifications = [];
 };
 
 /*
@@ -728 +730 @@
     return cmpPlayer.GetNeededResources(amounts);
 };
 
+GuiInterface.prototype.AddTimeNotification = function(notification)
+{
+    var time = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer).GetTime();
+    notification.endTime = notification.time + time;
+    notification.id = ++this.timeNotificationID;
+    this.timeNotifications.push(notification);
+    this.timeNotifications.sort(function (n1, n2){return n2.endTime - n1.endTime});
+    return this.timeNotificationID;
+};
 
+GuiInterface.prototype.DeleteTimeNotification = function(notificationID)
+{
+    for (var i in this.timeNotifications)
+    {
+        if (this.timeNotifications[i].id == notificationID)
+        {
+            this.timeNotifications.splice(i);
+            return;
+        }
+    }
+};
+
+GuiInterface.prototype.GetTimeNotificationText = function(playerID)
+{   
+    var formatTime = function(time)
+        {
+            // add 1000 ms to get ceiled instead of floored millisecons
+            // displaying 00:00 for a full second isn't nice
+            time += 1000;
+            var hours   = Math.floor(time / 1000 / 60 / 60);
+            var minutes = Math.floor(time / 1000 / 60) % 60;
+            var seconds = Math.floor(time / 1000) % 60;
+            return (hours ? hours + ':' : "") + (minutes < 10 ? '0' + minutes : minutes) + ':' + (seconds < 10 ? '0' + seconds : seconds);
+        };
+    var time = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer).GetTime();
+    var text = "";
+    for each (var n in this.timeNotifications)
+    {
+        if (time >= n.endTime)
+        {
+            // delete the notification and start over 
+            this.DeleteTimeNotification(n.id);
+            return this.GetTimeNotificationText(playerID);
+        }
+        if (n.players.indexOf(playerID) >= 0)
+            text += n.message.replace("%T",formatTime(n.endTime - time))+"\n";
+    }
+    return text;
+};
+
 GuiInterface.prototype.PushNotification = function(notification)
 {
     this.notifications.push(notification);
@@ -1837 +1888 @@
     "GetIncomingAttacks": 1,
     "GetNeededResources": 1,
     "GetNextNotification": 1,
+    "GetTimeNotificationText": 1,
 
     "GetAvailableFormations": 1,
     "GetFormationRequirements": 1,

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

@@ +1 @@
+function Wonder() {}
+
+Wonder.prototype.Schema = 
+    "<element name='TimeTillVictory'>" +
+        "<data type='nonNegativeInteger'/>" +
+    "</element>";
+
+Wonder.prototype.Init = function()
+{
+};
+
+Wonder.prototype.OnOwnershipChanged = function(msg)
+{
+    this.ResetTimer(msg.to);
+};
+
+Wonder.prototype.OnGameTypeChanged = function()
+{
+    var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
+    if (!cmpPlayer)
+        return;
+    this.ResetTimer(cmpPlayer.GetPlayerID());
+};
+
+Wonder.prototype.ResetTimer = function(ownerID)
+{
+    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    // remove existing messages if any
+    if (this.timer)
+    {
+        cmpTimer.CancelTimer(this.timer);
+        cmpGuiInterface.DeleteTimeNotification(this.ownMessage);
+        cmpGuiInterface.DeleteTimeNotification(this.otherMessage);
+    }
+    if (ownerID <= 0)
+        return;
+
+    var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
+    if (!cmpEndGameManager.CheckGameType("wonder"))
+        return;
+
+    // create new messages, and start timer to register defeat.
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var numPlayers = cmpPlayerManager.GetNumPlayers();
+    var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
+    var players = [];
+    for (var i = 1; i < numPlayers; i++)
+        if (i != ownerID)
+            players.push(i);
+
+    this.otherMessage = cmpGuiInterface.AddTimeNotification(
+        {
+            "message": cmpPlayer.GetName() + " will have won in %T",
+            "players": players,
+            "time": +this.template.TimeTillVictory*1000
+        });
+    this.ownMessage = cmpGuiInterface.AddTimeNotification(
+        {
+            "message": "You will have won in %T",
+            "players": [ownerID],
+            "time": +this.template.TimeTillVictory*1000
+        });
+    this.timer = cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_EndGameManager, "RegisterWonder", +this.template.TimeTillVictory*1000, this.entity);
+};
+
+Engine.RegisterComponentType(IID_Wonder, "Wonder", Wonder);

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

@@ -1 +1 @@
 Engine.RegisterInterface("EndGameManager");
 Engine.RegisterMessageType("PlayerDefeated");
+Engine.RegisterMessageType("GameTypeChanged");

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

@@ +1 @@
+Engine.RegisterInterface("Wonder");

binaries/data/mods/public/simulation/templates/template_structure_wonder.xml

@@ -76 +76 @@
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
+  <Wonder>
+    <TimeTillVictory>300</TimeTillVictory>
+  </Wonder>
 </Entity>

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

@@ -145 +145 @@
 
     wxArrayString gameTypes;
     gameTypes.Add(_T("conquest"));
+    gameTypes.Add(_T("wonder"));
     gameTypes.Add(_T("endless"));
 
     wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);