Ticket #3743: t3743_automatic_camera_controls.patch

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

@@ -221 +221 @@
     "attack": function(notification, player)
     {
         if (player != g_ViewedPlayer)
             return;
 
+        // Focus camera on attacks
+        if (g_FollowPlayer)
+        {
+            setCameraFollow(notification.target);
+
+            g_Selection.reset();
+            if (notification.target)
+                g_Selection.addList([notification.target]);
+        }
+
         if (Engine.ConfigDB_GetValue("user", "gui.session.attacknotificationmessage") !== "true")
             return;
 
         addChatMessage({
             "type": "attack",
+            "target": notification.target,
             "player": player,
             "attacker": notification.attacker,
             "targetIsDomesticAnimal": notification.targetIsDomesticAnimal
         });
     },
@@ -241 +252 @@
     "resetselectionpannel": function(notification, player)
     {
         if (player != Engine.GetPlayerID())
             return;
         g_Selection.rebuildSelection({});
+    },
+    "playercommand": function(notification, player)
+    {
+        if (!g_FollowPlayer || player != g_ViewedPlayer)
+            return;
+
+        let cmd = notification.cmd;
+
+        // Ignore boring animals
+        let entState = cmd.entities && cmd.entities[0] && GetEntityState(cmd.entities[0]);
+        if (entState && entState.identity && entState.identity.classes.indexOf("Animal") != -1)
+            return;
+
+        // Focus the building to construct
+        if (cmd.type == "repair")
+        {
+            let targetState = GetEntityState(cmd.target);
+            if (targetState)
+                Engine.CameraMoveTo(targetState.position.x, targetState.position.z);
+        }
+        // Focus commanded entities, but don't lose previous focus when training units
+        else if (cmd.type != "train" && cmd.type != "research" && entState)
+            setCameraFollow(cmd.entities[0]);
+
+        // Select units affected by that command
+        let selection = [];
+        if (cmd.entities)
+            selection = cmd.entities;
+        if (cmd.target)
+            selection.push(cmd.target);
+
+        // Allow gaia in selection when gathering
+        g_Selection.reset();
+        g_Selection.addList(selection, false, cmd.type == "gather");
     }
 };
 
 /**
  * Loads all known cheat commands.

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

@@ -286 +286 @@
 };
 
 /**
  * Add entities to selection. Play selection sound unless quiet is true
  */
-EntitySelection.prototype.addList = function(ents, quiet)
+EntitySelection.prototype.addList = function(ents, quiet, force = false)
 {
     let selection = this.toList();
 
     // If someone else's player is the sole selected unit, don't allow adding to the selection
     let firstEntState = selection.length == 1 && GetEntityState(selection[0]);
-    if (firstEntState && firstEntState.player != g_ViewedPlayer)
+    if (firstEntState && firstEntState.player != g_ViewedPlayer && !force)
         return;
 
     let i = 1;
     let added = [];
 
@@ -314 +314 @@
 
         let isUnowned = g_ViewedPlayer != -1 && entState.player != g_ViewedPlayer ||
                         g_ViewedPlayer == -1 && entState.player == 0;
 
         // Don't add unowned entities to the list, unless a single entity was selected
-        if (isUnowned && (ents.length > 1 || selection.length))
+        if (isUnowned && (ents.length > 1 || selection.length) && !force)
             continue;
 
         added.push(ent);
         this.selected[ent] = ent;
         ++i;

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

@@ -36 +36 @@
  * The playerID selected in the change perspective tool.
  */
 var g_ViewedPlayer = Engine.GetPlayerID();
 
 /**
+ * True if the camera should focus on attacks and player commands
+ * and select the affected units.
+ */
+var g_FollowPlayer = false;
+
+/**
  * Unique ID for lobby reports.
  */
 var g_MatchID;
 
 /**
@@ -326 +332 @@
 
     let alphaLabel = Engine.GetGUIObjectByName("alphaLabel");
     alphaLabel.hidden = g_ViewedPlayer > 0 && !viewPlayer.hidden;
     alphaLabel.size = g_ViewedPlayer > 0 ? "50%+20 0 100%-226 100%" : "200 0 100%-475 100%";
 
+    Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver || g_ViewedPlayer < 1;
+
     if (g_IsDiplomacyOpen)
         openDiplomacy();
 
     if (g_IsTradeOpen)
         openTrade();

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

@@ -5 +5 @@
     size="-3 0 100%+3 36"
 >
     <!-- most elements are defined in this directory -->
     <include directory="gui/session/top_panel/"/>
 
+    <!-- Follow Player Option -->
+    <object name="optionFollowPlayer" size="50%+64 4 50%+256 100%" hidden="true">
+
+        <!-- Checkbox -->
+        <object name="followPlayer" type="checkbox" checked="false" style="ModernTickBox" size="0 4 20 100%" font="sans-bold-13">
+            <action on="Press">g_FollowPlayer = !g_FollowPlayer;</action>
+        </object>
+
+        <!-- Label -->
+        <object type="text" size="20 2 100% 100%" text_align="left" textcolor="white">
+            <translatableAttribute id="caption">Follow Player</translatableAttribute>
+        </object>
+    </object>
+
     <!-- ================================  ================================ -->
     <!-- Some development features -->
     <!-- ================================  ================================ -->
 
     <!-- ================================  ================================ -->

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

@@ -118 +118 @@
         this.AddSuppression(event);
 
     Engine.PostMessage(this.entity, MT_AttackDetected, { "player": cmpPlayer.GetPlayerID(), "event": event });
     Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface).PushNotification({
         "type": "attack",
+        "target": target,
         "players": [cmpPlayer.GetPlayerID()],
         "attacker": cmpAttackerOwnership.GetOwner(),
         "targetIsDomesticAnimal": targetIsDomesticAnimal
     });
     PlaySound("attacked", target);

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

@@ -21 +21 @@
     data.controlAllUnits = data.cmpPlayer.CanControlAllUnits();
 
     if (cmd.entities)
         data.entities = FilterEntityList(cmd.entities, player, data.controlAllUnits);
 
+    let cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    cmpGuiInterface.PushNotification({
+        "type": "playercommand",
+        "players": [player],
+        "cmd": cmd
+    });
+
     // Note: checks of UnitAI targets are not robust enough here, as ownership
     //  can change after the order is issued, they should be checked by UnitAI
     //  when the specific behavior (e.g. attack, garrison) is performed.
     // (Also it's not ideal if a command silently fails, it's nicer if UnitAI
     //  moves the entities closer to the target before giving up.)