From 591e896968781b4ac749f55a85e3c6adc150a502 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Thu, 11 Mar 2021 21:47:52 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=8D=D1=84=D1=84=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=83=D0=B5=D1=85=D0=B0=D0=BB=D0=BE=20=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20UserInfo.=20#1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Battles/UserEffects.php | 36 +++++++++++++++++++++++++++++++++
 classes/Battles/UserInfo.php    | 19 +++++++++++++++++
 functions.php                   | 34 -------------------------------
 main.php                        |  2 +-
 4 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/classes/Battles/UserEffects.php b/classes/Battles/UserEffects.php
index 41ee6fc..1b864d3 100644
--- a/classes/Battles/UserEffects.php
+++ b/classes/Battles/UserEffects.php
@@ -49,4 +49,40 @@ trait UserEffects
         1022 => 'невидимость',
         9994 => 'Антидот/Путы (Эликсир?)',
     ];
+
+    public static $effectImage = [
+        1 => 'travma.gif',
+        2 => 'magic/sleep.gif',
+        3 => 'magic/sleepf.gif',
+        4 => 'magic/haos.gif',
+        5 => 'magic/obezl.gif',
+        6 => 'expx15.gif',
+        7 => 'euphoria.png',
+        8 => 'sleep_obj.gif',
+        10 => 'magic/chains.gif',
+        11 => 'travma.gif',
+        12 => 'travma.gif',
+        13 => 'travma.gif',
+        14 => 'travma.gif',
+        20 => 'check.gif',
+        21 => 'magic/al_neut_power.gif',
+        22 => 'magic/fist_def.gif',
+        201 => 'magic/defence.gif',
+        202 => 'magic/devastate.gif',
+        203 => 'magic/spell_luck.gif',
+        215 => 'magic/wis_air_def1.gif',
+        216 => 'magic/wis_air_def2.gif',
+        217 => 'magic/wis_air_def3.gif',
+        218 => 'magic/wis_earth_def1.gif',
+        219 => 'magic/wis_earth_def2.gif',
+        220 => 'magic/wis_earth_def3.gif',
+        221 => 'magic/wis_fire_def1.gif',
+        222 => 'magic/wis_fire_def2.gif',
+        223 => 'magic/wis_fire_def3.gif',
+        224 => 'magic/wis_water_def1.gif',
+        225 => 'magic/wis_water_def2.gif',
+        226 => 'magic/wis_water_def3.gif',
+        227 => 'magic/attack_defence.gif',
+        1022 => 'sh/hidden.gif',
+    ];
 }
\ No newline at end of file
diff --git a/classes/Battles/UserInfo.php b/classes/Battles/UserInfo.php
index 0794276..d097bce 100644
--- a/classes/Battles/UserInfo.php
+++ b/classes/Battles/UserInfo.php
@@ -1,5 +1,6 @@
 <?php
 namespace Battles;
+use Battles\Database\DBPDO;
 use Battles\Models\EffectsModel;
 
 class UserInfo extends UserStats
@@ -206,4 +207,22 @@ INFO;
         echo '</div><!-- user-info-container -->';
     }
 
+    public function showUserEffects(): string
+    {
+        $effs = DBPDO::INIT()->ofetchAll('SELECT * FROM users_effects WHERE owner_id = ?', $this->id);
+        $img = UserEffects::$effectImage;
+        $r = '';
+        foreach ($effs as $effect) {
+            $timeleft = timeOut($effect->remaining_time - time());
+            $r .= "
+            <div>
+                <img class='image' src='/i/{$img[$effect->type]}' alt='{$effect->name}'>
+                <span class='title'>{$effect->name}</span>
+                <div class='timeleft'>$timeleft</div>
+            </div>
+        ";
+        }
+        return $r;
+    }
+
 }
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 6ae36aa..1692a61 100644
--- a/functions.php
+++ b/functions.php
@@ -399,40 +399,6 @@ function timeOut($ttm)
     return $out;
 }
 
-function show_eff_inf(int $u): string
-{
-    $img = [
-        1 => "travma.gif", 2 => "magic/sleep.gif", 3 => "magic/sleepf.gif", 4 => "magic/haos.gif",
-        5 => "magic/obezl.gif", 6 => "expx15.gif", 7 => "euphoria.png", 8 => "sleep_obj.gif",
-        10 => "magic/chains.gif", 11 => "travma.gif", 12 => "travma.gif", 13 => "travma.gif",
-        14 => "travma.gif", 20 => "check.gif", 21 => "magic/al_neut_power.gif", 22 => "magic/fist_def.gif",
-        201 => "magic/defence.gif", 202 => "magic/devastate.gif", 203 => "magic/spell_luck.gif", 215 => "magic/wis_air_def1.gif",
-        216 => "magic/wis_air_def2.gif", 217 => "magic/wis_air_def3.gif", 218 => "magic/wis_earth_def1.gif", 219 => "magic/wis_earth_def2.gif",
-        220 => "magic/wis_earth_def3.gif", 221 => "magic/wis_fire_def1.gif", 222 => "magic/wis_fire_def2.gif", 223 => "magic/wis_fire_def3.gif",
-        224 => "magic/wis_water_def1.gif", 225 => "magic/wis_water_def2.gif", 226 => "magic/wis_water_def3.gif", 227 => "magic/attack_defence.gif",
-        1022 => "sh/hidden.gif",
-    ];
-    $r = '';
-
-
-    $effs = DBPDO::INIT()->ofetchAll('SELECT * FROM users_effects WHERE owner_id = ?', $u);
-
-    $i = 0;
-    while ($i < count($effs)) {
-        $timeleft = timeOut($effs[$i]->remaining_time - time());
-        $r .= <<<HTML
-<div>
-    <img class="image" src="/i/{$img[$effs[$i]->type]}">
-    <span class="title">{$effs[$i]->name}</span>
-    <div class="timeleft">$timeleft</div>
-</div>
-HTML;
-        $i++;
-    }
-    unset($i);
-    return $r;
-}
-
 /**
  * @param $time
  * @param $vars
diff --git a/main.php b/main.php
index 157033f..f74d294 100644
--- a/main.php
+++ b/main.php
@@ -362,7 +362,7 @@ Template::header('Игра');
             <div style="text-align: center;">
                 <a href='main.php?edit=1&undress=all' class="button">Снять все</a><BR>
                 <div class="effectList" style="padding-top: 15px; max-height: 150px; width: 220px;">
-                    <?= show_eff_inf($user->getId()) ?>
+                    <?= $userInfo->showUserEffects() ?>
                 </div>
             </div>
             <br>