From b2b88bf2e8e2f01690036fbdc2dfde198d91a342 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sun, 7 Feb 2021 23:11:35 +0400
Subject: [PATCH] Improved card icons (fix ambiguous interpretation of
 vigilance, first and double strikes, #7471);

---
 .../icons/original/pixabay/swords-310788.svg  |  5 +++++
 .../resources/card/icons/prepared/eye.svg     | 22 +++++++++++++++++++
 .../card/icons/prepared/swords-one.svg        |  7 ++++++
 .../card/icons/prepared/swords-two.svg        | 10 +++++++++
 .../resources/card/icons/readme-icons.txt     |  3 ++-
 .../mage/abilities/icon/CardIconType.java     |  6 ++---
 6 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 Mage.Client/src/main/resources/card/icons/original/pixabay/swords-310788.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/prepared/eye.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/prepared/swords-one.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/prepared/swords-two.svg

diff --git a/Mage.Client/src/main/resources/card/icons/original/pixabay/swords-310788.svg b/Mage.Client/src/main/resources/card/icons/original/pixabay/swords-310788.svg
new file mode 100644
index 00000000000..52d4d043fd0
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/original/pixabay/swords-310788.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 320.66 320.66" xmlns="http://www.w3.org/2000/svg">
+ <text x="0.00977" y="13.42981" font-family="Times New Roman" font-size="14.993px" xml:space="preserve"/>
+ <path d="m43.125 27.594c-3.9731 0-7.9374 1.5311-10.969 4.5625-6.0627 6.0627-6.0627 15.875 0 21.938 3.2523 3.2524 7.5864 4.7683 11.844 4.5312l39.375 39.406-39.188 39.188 34.75-11.781 9.6562-9.6562 44.531 44.5-95.375 95.375-5.5 32.625 32.656-5.4688 95.344-95.344 95.438 95.406 32.656 5.4688-5.4688-32.688-95.406-95.406 44.5-44.5 9.6875 9.6875 34.75 11.781-39.25-39.25 39.375-39.344c4.2574 0.23706 8.5914-1.2789 11.844-4.5312 6.0627-6.0627 6.0627-15.875 0-21.938-3.0314-3.0314-6.9956-4.5625-10.969-4.5625-3.9731 0-7.9374 1.5311-10.969 4.5625-3.2524 3.2524-4.7683 7.5864-4.5312 11.844l-39.375 39.344-39.188-39.219 11.781 34.781 9.6875 9.6875-44.5 44.5-44.5-44.5 9.625-9.6562 11.781-34.75-39.156 39.156-39.438-39.438c0.21019-4.2275-1.2713-8.5213-4.5-11.75-3.0314-3.0314-7.0269-4.5625-11-4.5625z" fill-rule="evenodd"/>
+</svg>
diff --git a/Mage.Client/src/main/resources/card/icons/prepared/eye.svg b/Mage.Client/src/main/resources/card/icons/prepared/eye.svg
new file mode 100644
index 00000000000..4d52cfa6466
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/prepared/eye.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 15.9 16" style="enable-background:new 0 0 15.9 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="XMLID_1_">
+	<g>
+		<path d="M15.5,7.2c0.1,0.2,0.1,0.5,0,0.8c-1.4,2.8-4.3,4.7-7.5,4.7c-3.3,0-6.1-1.9-7.5-4.7c-0.1-0.2-0.1-0.5,0-0.8
+			C1.9,4.4,4.7,2.5,8,2.5C11.2,2.5,14.1,4.4,15.5,7.2z M11.8,7.6c0-2.1-1.7-3.8-3.8-3.8c-2.1,0-3.8,1.7-3.8,3.8
+			c0,2.1,1.7,3.8,3.8,3.8c0,0,0,0,0,0C10.1,11.4,11.8,9.7,11.8,7.6z"/>
+		<path class="st0" d="M8,3.8c2.1,0,3.8,1.7,3.8,3.8c0,2.1-1.7,3.8-3.8,3.8c0,0,0,0,0,0c-2.1,0-3.8-1.7-3.8-3.8
+			C4.1,5.5,5.9,3.8,8,3.8z M10.4,8.3c0.4-1.3-0.4-2.7-1.8-3.1C8.4,5.1,8.2,5.1,8,5.1c-0.2,0-0.4,0-0.7,0.1C7.7,5.7,7.6,6.5,7,6.9
+			c-0.4,0.3-1,0.3-1.5,0C5.2,8.3,5.9,9.7,7.3,10C8.7,10.4,10,9.6,10.4,8.3z"/>
+		<path d="M8.6,5.1c1.4,0.4,2.2,1.8,1.8,3.1C10,9.6,8.7,10.4,7.3,10C5.9,9.7,5.2,8.3,5.5,6.9C6,7.3,6.6,7.3,7,6.9
+			c0.6-0.4,0.7-1.2,0.3-1.8C7.5,5.1,7.7,5.1,8,5.1C8.2,5.1,8.4,5.1,8.6,5.1z"/>
+	</g>
+	<g>
+	</g>
+</g>
+</svg>
diff --git a/Mage.Client/src/main/resources/card/icons/prepared/swords-one.svg b/Mage.Client/src/main/resources/card/icons/prepared/swords-one.svg
new file mode 100644
index 00000000000..4049e4bb4a7
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/prepared/swords-one.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16.2 16.2" style="enable-background:new 0 0 16.2 16.2;" xml:space="preserve">
+<path d="M6.5,7.9l-2.6,2.6L3.3,10l-2-0.7l2.3,2.3l-2.3,2.3c-0.2,0-0.5,0.1-0.7,0.3c-0.4,0.4-0.4,0.9,0,1.3c0.2,0.2,0.4,0.3,0.6,0.3
+	l0,0c0.2,0,0.5-0.1,0.6-0.3c0.2-0.2,0.3-0.4,0.3-0.7l2.3-2.3l2.3,2.3l-0.7-2l-0.6-0.6L9.6,8l5.6-5.6l0.3-1.9l-1.9,0.3L6.5,7.9"/>
+</svg>
diff --git a/Mage.Client/src/main/resources/card/icons/prepared/swords-two.svg b/Mage.Client/src/main/resources/card/icons/prepared/swords-two.svg
new file mode 100644
index 00000000000..a0aa1e184d5
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/prepared/swords-two.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16.2 16.2" style="enable-background:new 0 0 16.2 16.2;" xml:space="preserve">
+<path d="M1.2,15.7c0.2,0,0.5-0.1,0.6-0.3c0.2-0.2,0.3-0.4,0.3-0.7l2.3-2.3l2.3,2.3l-0.7-2l-0.6-0.6l2.6-2.6l2.6,2.6l-0.6,0.6l-0.7,2
+	l2.3-2.3l2.3,2.3c0,0.2,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.6,0.3c0.2,0,0.5-0.1,0.6-0.3c0.4-0.4,0.4-0.9,0-1.3
+	c-0.2-0.2-0.4-0.3-0.7-0.3l-2.3-2.3l2.3-2.3l-2,0.7l-0.6,0.6L9.7,7.9l5.6-5.6l0.3-1.9l-1.9,0.3L8.1,6.4L2.5,0.8L0.6,0.5l0.3,1.9
+	l5.6,5.6l-2.6,2.6L3.3,10l-2-0.7l2.3,2.3l-2.3,2.3c-0.2,0-0.5,0.1-0.7,0.3c-0.4,0.4-0.4,0.9,0,1.3C0.8,15.6,1,15.7,1.2,15.7
+	L1.2,15.7z"/>
+</svg>
diff --git a/Mage.Client/src/main/resources/card/icons/readme-icons.txt b/Mage.Client/src/main/resources/card/icons/readme-icons.txt
index fe20a859de5..621d466107c 100644
--- a/Mage.Client/src/main/resources/card/icons/readme-icons.txt
+++ b/Mage.Client/src/main/resources/card/icons/readme-icons.txt
@@ -16,4 +16,5 @@ Folder structure:
 
 Icons sources:
   * bootstrap icons: https://github.com/twbs/icons
-  * font awesome: https://github.com/FortAwesome/Font-Awesome
\ No newline at end of file
+  * font awesome: https://github.com/FortAwesome/Font-Awesome
+  * pixabay: https://pixabay.com/
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/abilities/icon/CardIconType.java b/Mage/src/main/java/mage/abilities/icon/CardIconType.java
index 3e8d3f783a9..c4e8c1111ab 100644
--- a/Mage/src/main/java/mage/abilities/icon/CardIconType.java
+++ b/Mage/src/main/java/mage/abilities/icon/CardIconType.java
@@ -21,14 +21,14 @@ public enum CardIconType {
     ABILITY_DEFENDER("prepared/chess-rook.svg", CardIconCategory.ABILITY, 100),
     ABILITY_DEATHTOUCH("prepared/skull-crossbones.svg", CardIconCategory.ABILITY, 100),
     ABILITY_LIFELINK("prepared/link.svg", CardIconCategory.ABILITY, 100),
-    ABILITY_DOUBLE_STRIKE("prepared/mars-double.svg", CardIconCategory.ABILITY, 100),
-    ABILITY_FIRST_STRIKE("prepared/mars.svg", CardIconCategory.ABILITY, 100),
+    ABILITY_DOUBLE_STRIKE("prepared/swords-two.svg", CardIconCategory.ABILITY, 100),
+    ABILITY_FIRST_STRIKE("prepared/swords-one.svg", CardIconCategory.ABILITY, 100),
     ABILITY_CREW("prepared/truck-monster.svg", CardIconCategory.ABILITY, 100),
     ABILITY_TRAMPLE("prepared/grimace.svg", CardIconCategory.ABILITY, 100),
     ABILITY_HEXPROOF("prepared/expand-arrows-alt.svg", CardIconCategory.ABILITY, 100),
     ABILITY_INFECT("prepared/flask.svg", CardIconCategory.ABILITY, 100),
     ABILITY_INDESTRUCTIBLE("prepared/ankh.svg", CardIconCategory.ABILITY, 100),
-    ABILITY_VIGILANCE("prepared/khanda.svg", CardIconCategory.ABILITY, 100),
+    ABILITY_VIGILANCE("prepared/eye.svg", CardIconCategory.ABILITY, 100),
     //
     SYSTEM_COMBINED("prepared/square-fill.svg", CardIconCategory.SYSTEM, 1000), // inner usage, must use last order
     SYSTEM_DEBUG("prepared/link.svg", CardIconCategory.SYSTEM, 1000); // used for test render dialog