Убрано дублирование классов. Helpers уехали из Core. Классы во внешних директориях переехали к остальным.

_incl_data/class/Magic/Attack.php

@@ -6,7 +6,7 @@ use Chat;
 use ChatMessage;
 use Core\Config;
 use Core\Db;
-use Insallah\Math;
+use Helper\Math;
 use Magic;
 use User;
 

_incl_data/class/Magic/Elemental/Fire.php

@@ -3,14 +3,13 @@
 namespace Magic\Elemental;
 
 use Battle;
-use Insallah\Math;
+use DTO\BattleSpell;
+use Helper\Math;
 
 class Fire
 {
-    private $btl;
-    private $color = '#a00';
-    private $colorCrit = '#f00';
-    private $colorMiss = '#909090';
+    private static string $magicElement = 'fire';
+    private Battle $btl;
 
     public function __construct(Battle $btl)
     {
@@ -18,11 +17,11 @@ class Fire
     }
 
     /** Вспышка. Приёмы: 34(8), 67(9), 68 (10), 69(11)
-     * @param $level
-     * @param $fireTargetMultiplier
-     * @return array
+     * @param int $level
+     * @param int $fireTargetMultiplier
+     * @return BattleSpell
      */
-    public function Flash($level, $fireTargetMultiplier = 0)
+    public function flash(int $level, int $fireTargetMultiplier = 0): BattleSpell
     {
         $baseDamage = [
             8 => [40, 40],
@@ -30,17 +29,16 @@ class Fire
             10 => [50, 50],
             11 => [60, 60],
         ];
+
         if (!is_numeric($fireTargetMultiplier)) {
             $fireTargetMultiplier = 0;
         }
         $rawDamage = mt_rand($baseDamage[$level][0], $baseDamage[$level][1]);
         $rawDamage = Math::addPercent($rawDamage, $fireTargetMultiplier);
-        return [
-            'name' => "Вспышка [$level]",
-            'damage' => $rawDamage,
-            'color' => $this->color,
-            'colorCrit' => $this->colorCrit,
-            'colorMiss' => $this->colorMiss,
-        ];
+
+        $spell = new BattleSpell(self::$magicElement);
+        $spell->name = "Вспышка [$level]";
+        $spell->damage = $rawDamage;
+        return $spell;
     }
-}
+}

_incl_data/class/Magic/feerverks.php

@@ -1,6 +1,6 @@
 <?php
 //Феерверк
-use Core\ConversionHelper;
+use Helper\Conversion;
 
 if (!defined('GAME')) {
     die();
@@ -20,7 +20,7 @@ if ($u->room['id'] != '9') {
     $cmsg->setType(6);
     $cmsg->setTypeTime(2);
 
-    $po = ConversionHelper::dataStringToArray($itm['data']);
+    $po = Conversion::dataStringToArray($itm['data']);
     $fid = 'fw04';
     if (isset($po['feerverk_eff'])) {
         $fid = $po['feerverk_eff'];