From 18687fe19746418dd63bdb40361e1e6131bdbfc9 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sat, 24 Jul 2021 04:55:44 +0400
Subject: [PATCH] Merge fix

---
 .../src/main/java/org/mage/card/arcane/MageLayer.java  |  2 +-
 .../card/icons/original/bootstrap/binoculars-fill.svg  |  3 +++
 .../card/icons/original/fontawesome/crown.svg          |  1 +
 .../resources/card/icons/prepared/binoculars-fill.svg  | 10 ++++++++++
 .../src/main/resources/card/icons/prepared/crown.svg   | 10 ++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 Mage.Client/src/main/resources/card/icons/original/bootstrap/binoculars-fill.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/original/fontawesome/crown.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/prepared/binoculars-fill.svg
 create mode 100644 Mage.Client/src/main/resources/card/icons/prepared/crown.svg

diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java b/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java
index 3c1fd2acd9..2929df43c3 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/MageLayer.java
@@ -319,7 +319,7 @@ public class MageLayer extends MageCard {
         // create panels
         allIcons.forEach(cardIcon -> {
             CardIconCategory category = cardIcon.getIconType().getCategory();
-            // debug panel must take all icons (position depens on render settings)
+            // debug panel must take all icons (position depends on render settings)
             if (iconsDebugPanel != null) {
                 newIcons.get(iconsDebugPanel).add(cardIcon);
             }
diff --git a/Mage.Client/src/main/resources/card/icons/original/bootstrap/binoculars-fill.svg b/Mage.Client/src/main/resources/card/icons/original/bootstrap/binoculars-fill.svg
new file mode 100644
index 0000000000..de09c7353e
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/original/bootstrap/binoculars-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-binoculars-fill" viewBox="0 0 16 16">
+  <path d="M4.5 1A1.5 1.5 0 0 0 3 2.5V3h4v-.5A1.5 1.5 0 0 0 5.5 1h-1zM7 4v1h2V4h4v.882a.5.5 0 0 0 .276.447l.895.447A1.5 1.5 0 0 1 15 7.118V13H9v-1.5a.5.5 0 0 1 .146-.354l.854-.853V9.5a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5v.793l.854.853A.5.5 0 0 1 7 11.5V13H1V7.118a1.5 1.5 0 0 1 .83-1.342l.894-.447A.5.5 0 0 0 3 4.882V4h4zM1 14v.5A1.5 1.5 0 0 0 2.5 16h3A1.5 1.5 0 0 0 7 14.5V14H1zm8 0v.5a1.5 1.5 0 0 0 1.5 1.5h3a1.5 1.5 0 0 0 1.5-1.5V14H9zm4-11H9v-.5A1.5 1.5 0 0 1 10.5 1h1A1.5 1.5 0 0 1 13 2.5V3z"/>
+</svg>
\ No newline at end of file
diff --git a/Mage.Client/src/main/resources/card/icons/original/fontawesome/crown.svg b/Mage.Client/src/main/resources/card/icons/original/fontawesome/crown.svg
new file mode 100644
index 0000000000..3a3571a75a
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/original/fontawesome/crown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M528 448H112c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h416c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm64-320c-26.5 0-48 21.5-48 48 0 7.1 1.6 13.7 4.4 19.8L476 239.2c-15.4 9.2-35.3 4-44.2-11.6L350.3 85C361 76.2 368 63 368 48c0-26.5-21.5-48-48-48s-48 21.5-48 48c0 15 7 28.2 17.7 37l-81.5 142.6c-8.9 15.6-28.9 20.8-44.2 11.6l-72.3-43.4c2.7-6 4.4-12.7 4.4-19.8 0-26.5-21.5-48-48-48S0 149.5 0 176s21.5 48 48 48c2.6 0 5.2-.4 7.7-.8L128 416h384l72.3-192.8c2.5.4 5.1.8 7.7.8 26.5 0 48-21.5 48-48s-21.5-48-48-48z"/></svg>
\ No newline at end of file
diff --git a/Mage.Client/src/main/resources/card/icons/prepared/binoculars-fill.svg b/Mage.Client/src/main/resources/card/icons/prepared/binoculars-fill.svg
new file mode 100644
index 0000000000..1032820b04
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/prepared/binoculars-fill.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 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<path d="M4.5,0.5C3.7,0.5,3,1.2,3,2v0.5h4V2c0-0.8-0.7-1.5-1.5-1.5H4.5z M7,3.5v1h2v-1h4v0.9c0,0.2,0.1,0.4,0.3,0.4l0.9,0.4
+	C14.7,5.5,15,6,15,6.6v5.9H9V11c0-0.1,0.1-0.3,0.1-0.4L10,9.8V9c0-0.3-0.2-0.5-0.5-0.5h-3C6.2,8.5,6,8.7,6,9v0.8l0.9,0.9
+	C6.9,10.7,7,10.9,7,11v1.5H1V6.6C1,6,1.3,5.5,1.8,5.3l0.9-0.4C2.9,4.7,3,4.6,3,4.4V3.5H7z M1,13.5V14c0,0.8,0.7,1.5,1.5,1.5l0,0h3
+	C6.3,15.5,7,14.8,7,14l0,0v-0.5H1z M9,13.5V14c0,0.8,0.7,1.5,1.5,1.5l0,0h3c0.8,0,1.5-0.7,1.5-1.5l0,0v-0.5H9z M13,2.5H9V2
+	c0-0.8,0.7-1.5,1.5-1.5h1C12.3,0.5,13,1.2,13,2V2.5z"/>
+</svg>
diff --git a/Mage.Client/src/main/resources/card/icons/prepared/crown.svg b/Mage.Client/src/main/resources/card/icons/prepared/crown.svg
new file mode 100644
index 0000000000..ea6c8b61e1
--- /dev/null
+++ b/Mage.Client/src/main/resources/card/icons/prepared/crown.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.4 16.2" style="enable-background:new 0 0 16.4 16.2;" xml:space="preserve">
+<path d="M13.3,13.5H3.1c-0.2,0-0.4,0.2-0.4,0.4v0.8c0,0.2,0.2,0.4,0.4,0.4h10.2c0.2,0,0.4-0.2,0.4-0.4v-0.8
+	C13.7,13.7,13.5,13.5,13.3,13.5z M14.8,4.2c-0.6,0-1.2,0.6-1.2,1.4c0,0.2,0,0.4,0.1,0.6L12,7.4c-0.4,0.3-0.9,0.1-1.1-0.3L8.9,3
+	c0.3-0.3,0.4-0.6,0.4-1.1c0-0.8-0.5-1.4-1.2-1.4S7,1.1,7,1.9C7,2.3,7.2,2.7,7.4,3L5.5,7C5.2,7.5,4.7,7.6,4.4,7.4L2.6,6.1
+	C2.7,6,2.7,5.8,2.7,5.6c0-0.8-0.5-1.4-1.2-1.4S0.4,4.8,0.4,5.6s0.5,1.4,1.2,1.4c0.1,0,0.1,0,0.2,0l1.8,5.5h9.4l1.8-5.5
+	c0.1,0,0.1,0,0.2,0c0.6,0,1.2-0.6,1.2-1.4S15.5,4.2,14.8,4.2z"/>
+</svg>