From 4ad04b9571716e78645ce67a78a9e045924efde8 Mon Sep 17 00:00:00 2001
From: "Igor Barkov [iwork]" <lopar.4ever@gmail.com>
Date: Fri, 15 Feb 2019 13:38:30 +0200
Subject: [PATCH] magic IS a bonus

---
 classes/InventoryItem.php | 1 -
 classes/Item.php          | 5 +----
 classes/ShopItem.php      | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/classes/InventoryItem.php b/classes/InventoryItem.php
index 04f126f..a3958e9 100644
--- a/classes/InventoryItem.php
+++ b/classes/InventoryItem.php
@@ -19,7 +19,6 @@ NAME;
         parent::printBaseInfo();
         parent::printRequirements();
         parent::printBonuses();
-        parent::printMagic();
         if ($this->present) echo "<p style='color: maroon; font-style: italic'>Это подарок от {$this->present}. Вы не можете передать его кому-либо ещё.</p>";
     }
 
diff --git a/classes/Item.php b/classes/Item.php
index 26afae7..39d191c 100644
--- a/classes/Item.php
+++ b/classes/Item.php
@@ -88,6 +88,7 @@ abstract class Item
 
     /**
      * Item constructor.
+     *
      * @param $row
      */
     public function __construct($row)
@@ -209,10 +210,6 @@ IMG;
         if ($this->bron2) echo "<br>Броня корпуса" . $this->wrap($this->bron2);
         if ($this->bron3) echo "<br>Броня пояса" . $this->wrap($this->bron3);
         if ($this->bron4) echo "<br>Броня ног" . $this->wrap($this->bron4);
-    }
-
-    protected function printMagic()
-    {
         if ($this->magic AND $this->type != 12) {
             echo "<br>Магические свойства:";
             if ($this->magic_name) echo "<br><i style='color: dimgray;'>{$this->magic_name}</i>";
diff --git a/classes/ShopItem.php b/classes/ShopItem.php
index 28d2104..973a570 100644
--- a/classes/ShopItem.php
+++ b/classes/ShopItem.php
@@ -7,7 +7,6 @@ class ShopItem extends Item
         parent::printBaseInfo();
         parent::printRequirements();
         parent::printBonuses();
-        parent::printMagic();
     }
 
     public function buyItem($owner)