From edd03ad55773f46d71330b403f3b51bd72be7680 Mon Sep 17 00:00:00 2001 From: mimo Date: Wed, 22 Jul 2015 17:06:06 +0000 Subject: [PATCH] disable the delete button when less than 50% cp, fixes #3300, patch by bb This was SVN commit r16877. --- .../textures/ui/session/icons/kill_small_disabled.png | 3 +++ binaries/data/mods/public/gui/session/unit_actions.js | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 binaries/data/mods/public/art/textures/ui/session/icons/kill_small_disabled.png diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/kill_small_disabled.png b/binaries/data/mods/public/art/textures/ui/session/icons/kill_small_disabled.png new file mode 100644 index 0000000000..adae70b99d --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/icons/kill_small_disabled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82ac45c44095c3e8a19f22a28c8550b8baada3556a632f7c1cac0d606c9b87c2 +size 759 diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js index 3e824a4150..b07d76a0c2 100644 --- a/binaries/data/mods/public/gui/session/unit_actions.js +++ b/binaries/data/mods/public/gui/session/unit_actions.js @@ -660,7 +660,7 @@ var unitActions = /** * Info and actions for the entity commands - * Currently displayed in the bottom of the central pane + * Currently displayed in the bottom of the central panel */ var g_EntityCommands = { @@ -696,13 +696,13 @@ var g_EntityCommands = if (entState.mirage) return { "tooltip": translate("You cannot destroy this entity because it is in the fog-of-war"), - "icon": "kill_small.png" + "icon": "kill_small_disabled.png" }; if (entState.capturePoints && entState.capturePoints[entState.player] < entState.maxCapturePoints / 2) return { "tooltip": translate("You cannot destroy this entity as you own less than half the capture points"), - "icon": "kill_small.png" + "icon": "kill_small_disabled.png" }; @@ -716,6 +716,9 @@ var g_EntityCommands = if (entState.mirage) return; + if (entState.capturePoints && entState.capturePoints[entState.player] < entState.maxCapturePoints / 2) + return; + var selection = g_Selection.toList(); if (selection.length < 1) return;