Ticket #2474: alert_raise_03122014.patch

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

@@ -853 +853 @@
     "increase-alert-level": {
         "getInfo": function(entState)
         {
-            if(!entState.alertRaiser || !entState.alertRaiser.canIncreaseLevel)
+            if(!entState.alertRaiser)
                 return false;
-
-            if(entState.alertRaiser.hasRaisedAlert)
+            if (!entState.alertRaiser.canIncreaseLevel)
+            {
+                var tooltip = translate("Maximum alert level reached");
+                var icon = "bell_level_max.png";
+                return {
+                    "tooltip": tooltip,
+                    "icon": icon
+                };
+            }
+            else if(entState.alertRaiser.hasRaisedAlert)
+            {
                 var tooltip = translate("Increase the alert level to protect more units");
+                var icon = "bell_level2.png";
+            }
             else
+            {
                 var tooltip = translate("Raise an alert!");
+                var icon = "bell_level1.png";
+            }
             return {
                 "tooltip": tooltip,
-                "icon": "bell_level1.png"
+                "icon": icon
             };
         },
         "execute": function(entState)
@@ -874 +888 @@
     "alert-end": {
         "getInfo": function(entState)
         {
-            if(!entState.alertRaiser || !entState.alertRaiser.hasRaisedAlert)
-                return false
+            if(!entState.alertRaiser)
+                return false;
+            if(!entState.alertRaiser.hasRaisedAlert)
+            {
+                return {
+                    "tooltip": translate("Minimum alert reached"),
+                    "icon": "bell_level_min.png"
+                };
+            }
             return {
                 "tooltip": translate("End of alert."),
                 "icon": "bell_level0.png"