From d38d62c5b539778fc8937e457c01ec120e0b407d Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Wed, 28 Oct 2020 22:21:08 +0200
Subject: [PATCH] =?UTF-8?q?=D0=91=D1=83=D0=B4=D1=8C=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8F=D1=82=20=D1=82=D0=BE=D1=82=20=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8C,=20=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B8=D0=BB=20=D0=B2=D0=B2=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=D0=B9=D0=BC=D1=81=D0=BF=D0=B5=D0=B9=D1=81?=
 =?UTF-8?q?=D1=8B...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/admin.php                               | 10 +-
 admin/edit_user.php                           |  2 +-
 akadem.php                                    |  2 +-
 aren_of_angels.php                            |  2 +-
 bank.php                                      | 44 +++++----
 buttons.php                                   |  4 +-
 c_forest.php                                  |  2 +-
 c_haos.php                                    |  2 +-
 c_haos_in.php                                 |  2 +-
 c_park.php                                    |  2 +-
 canalizaciya.php                              |  2 +-
 cave.php                                      |  2 +-
 ch.php                                        |  2 +-
 chat.php                                      |  2 +-
 city.php                                      | 92 +++++++++----------
 clan.php                                      |  2 +-
 clan_castle.php                               |  2 +-
 clan_create.php                               |  6 +-
 clans.php                                     |  2 +-
 classes/{ => Battles}/Bank.php                | 73 +++++++++------
 classes/{ => Battles}/City.php                |  1 +
 classes/{ => Battles}/DressedItems.php        |  2 +-
 classes/{ => Battles}/InventoryItem.php       |  2 +-
 classes/{ => Battles}/Item.php                |  2 +-
 .../Battles/Magic}/CureInjury.php             | 11 ++-
 classes/{ => Battles/Magic}/Magic.php         |  2 +-
 classes/{magic => Battles/Magic}/attack.php   |  2 +-
 .../Battles/Models}/EffectsModel.php          |  6 +-
 .../Battles/Models}/PresentsModel.php         | 10 +-
 .../Battles/Models}/UserLogModel.php          |  4 +-
 classes/{ => Battles}/Nick.php                |  2 +-
 classes/{ => Battles}/Rooms.php               |  1 +
 classes/{ => Battles}/ShopItem.php            |  2 +-
 classes/{ => Battles}/Template.php            |  2 +-
 classes/{ => Battles}/Travel.php              |  8 +-
 classes/{ => Battles}/User.php                | 16 ++--
 classes/{ => Battles}/UserEffects.php         |  2 +-
 classes/{ => Battles}/UserInfo.php            | 10 +-
 classes/{cave => Cave}/CaveBots.php           |  0
 classes/{cave => Cave}/CaveItems.php          |  0
 classes/{cave => Cave}/lose.php               |  0
 classes/{cave => Cave}/win.php                |  0
 {Database => classes/Database}/Exception.php  |  0
 {Database => classes/Database}/Mysql.php      |  0
 {Database => classes/Database}/Statement.php  |  0
 {Database => classes/Database}/battles.sql    |  0
 {Database => classes/Database}/db.php         |  0
 comission.php                                 |  4 +-
 config.php                                    | 27 +++---
 enter.php                                     |  2 +-
 enter_cave.php                                |  2 +-
 fbattle.php                                   |  6 +-
 fight.php                                     |  4 +-
 forest.php                                    |  2 +-
 forum.php                                     |  4 +-
 functions.php                                 |  4 +-
 game.php                                      |  2 +-
 game2.php                                     |  2 +-
 gotzamok.php                                  |  2 +-
 group_arena.php                               |  2 +-
 hell.php                                      |  2 +-
 hostel.php                                    |  4 +-
 hostel_room.php                               |  2 +-
 index.php                                     |  4 +-
 inf.php                                       |  6 +-
 lab.php                                       |  2 +-
 lab2.php                                      |  2 +-
 lab_enter.php                                 |  2 +-
 labirint.php                                  |  2 +-
 library.php                                   |  2 +-
 logs.php                                      |  2 +-
 magic/Healing.php                             |  4 +-
 magic/elem_ally_air.php                       |  2 +-
 magic/elem_ally_earth.php                     |  2 +-
 magic/elem_ally_fire.php                      |  2 +-
 magic/elem_ally_water.php                     |  2 +-
 magic/elem_foe_air.php                        |  2 +-
 magic/elem_foe_fire.php                       |  2 +-
 magic/elem_foe_water.php                      |  2 +-
 magic/elikbroni.php                           |  2 +-
 magic/elikurona.php                           |  2 +-
 magic/ident.php                               |  2 +-
 magic/incmagic.php                            |  4 +-
 magic/luck.php                                |  2 +-
 magic/sleep15.php                             |  2 +-
 magic/sleep30.php                             |  2 +-
 magic/stop.php                                |  2 +-
 magic/stop_200.php                            |  2 +-
 magic/wis_air_def1.php                        |  2 +-
 magic/wis_air_def2.php                        |  2 +-
 magic/wis_air_def3.php                        |  2 +-
 magic/wis_air_h1.php                          |  2 +-
 magic/wis_air_m1.php                          |  2 +-
 magic/wis_air_m2.php                          |  2 +-
 magic/wis_air_m3.php                          |  2 +-
 magic/wis_air_o1.php                          |  2 +-
 magic/wis_air_o2.php                          |  2 +-
 magic/wis_air_o3.php                          |  2 +-
 magic/wis_air_t1.php                          |  2 +-
 magic/wis_air_t2.php                          |  2 +-
 magic/wis_air_t3.php                          |  2 +-
 magic/wis_earth_def1.php                      |  2 +-
 magic/wis_earth_def2.php                      |  2 +-
 magic/wis_earth_def3.php                      |  2 +-
 magic/wis_earth_g1.php                        |  2 +-
 magic/wis_earth_g2.php                        |  2 +-
 magic/wis_earth_g3.php                        |  2 +-
 magic/wis_earth_k1.php                        |  2 +-
 magic/wis_earth_k2.php                        |  2 +-
 magic/wis_earth_k3.php                        |  2 +-
 magic/wis_earth_m1.php                        |  2 +-
 magic/wis_earth_m2.php                        |  2 +-
 magic/wis_earth_m3.php                        |  2 +-
 magic/wis_fire_def1.php                       |  2 +-
 magic/wis_fire_def2.php                       |  2 +-
 magic/wis_fire_def3.php                       |  2 +-
 magic/wis_fire_i1.php                         |  2 +-
 magic/wis_fire_i2.php                         |  2 +-
 magic/wis_fire_i3.php                         |  2 +-
 magic/wis_fire_p1.php                         |  2 +-
 magic/wis_fire_p2.php                         |  2 +-
 magic/wis_fire_p3.php                         |  2 +-
 magic/wis_fire_v1.php                         |  2 +-
 magic/wis_fire_v2.php                         |  2 +-
 magic/wis_fire_v3.php                         |  2 +-
 magic/wis_water_ch1.php                       |  2 +-
 magic/wis_water_ch2.php                       |  2 +-
 magic/wis_water_ch3.php                       |  2 +-
 magic/wis_water_def1.php                      |  2 +-
 magic/wis_water_def2.php                      |  2 +-
 magic/wis_water_def3.php                      |  2 +-
 magic/wis_water_o1.php                        |  2 +-
 magic/wis_water_o2.php                        |  2 +-
 magic/wis_water_o3.php                        |  2 +-
 magic/wis_water_tr1.php                       |  2 +-
 magic/wis_water_tr2.php                       |  2 +-
 magic/wis_water_tr3.php                       |  2 +-
 magic/zz.php                                  |  2 +-
 main.php                                      | 12 +--
 module_quest.php                              |  2 +-
 podzem_dialog.php                             |  6 +-
 post.php                                      |  4 +-
 presents.php                                  |  4 +-
 quest_room.php                                |  2 +-
 register.php                                  |  2 +-
 rememberpassword.php                          |  2 +-
 repair.php                                    |  2 +-
 shop.php                                      |  6 +-
 top_menu.php                                  |  4 +-
 tournament.php                                |  2 +-
 tower.php                                     |  2 +-
 towerin.php                                   |  2 +-
 towerlog.php                                  |  2 +-
 towerstamp.php                                |  2 +-
 ul_clans.php                                  |  4 +-
 user_abilities.php                            |  4 +-
 user_anketa.php                               |  2 +-
 vxod.php                                      |  2 +-
 zayavka.php                                   |  2 +-
 159 files changed, 339 insertions(+), 304 deletions(-)
 rename classes/{ => Battles}/Bank.php (72%)
 rename classes/{ => Battles}/City.php (99%)
 rename classes/{ => Battles}/DressedItems.php (99%)
 rename classes/{ => Battles}/InventoryItem.php (98%)
 rename classes/{ => Battles}/Item.php (99%)
 rename {magic => classes/Battles/Magic}/CureInjury.php (79%)
 rename classes/{ => Battles/Magic}/Magic.php (97%)
 rename classes/{magic => Battles/Magic}/attack.php (96%)
 rename {models => classes/Battles/Models}/EffectsModel.php (72%)
 rename {models => classes/Battles/Models}/PresentsModel.php (51%)
 rename {models => classes/Battles/Models}/UserLogModel.php (63%)
 rename classes/{ => Battles}/Nick.php (99%)
 rename classes/{ => Battles}/Rooms.php (99%)
 rename classes/{ => Battles}/ShopItem.php (99%)
 rename classes/{ => Battles}/Template.php (98%)
 rename classes/{ => Battles}/Travel.php (88%)
 rename classes/{ => Battles}/User.php (91%)
 rename classes/{ => Battles}/UserEffects.php (99%)
 rename classes/{ => Battles}/UserInfo.php (95%)
 rename classes/{cave => Cave}/CaveBots.php (100%)
 rename classes/{cave => Cave}/CaveItems.php (100%)
 rename classes/{cave => Cave}/lose.php (100%)
 rename classes/{cave => Cave}/win.php (100%)
 rename {Database => classes/Database}/Exception.php (100%)
 rename {Database => classes/Database}/Mysql.php (100%)
 rename {Database => classes/Database}/Statement.php (100%)
 rename {Database => classes/Database}/battles.sql (100%)
 rename {Database => classes/Database}/db.php (100%)

diff --git a/admin/admin.php b/admin/admin.php
index 1dd3b24..60d88ee 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -7,7 +7,7 @@
 
 session_start();
 //require_once '../functions.php';
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 if (!$user->admin) {
     header("HTTP/1.0 404 Not Found");
     exit;
@@ -65,7 +65,7 @@ if ($_POST['ali']) { //Что делает эта штука?
 }
 
 $aligns = db::c()->query('SELECT `img`,`align`,`name` FROM `aligns` ORDER BY `align`');
-Template::header('ᐰdminка');
+\Battles\Template::header('ᐰdminка');
 ?>
 <link rel=stylesheet href="/css/admin.css">
 <form method='post'>
@@ -554,7 +554,7 @@ foreach ($moj as $k => $v) {
             $magic_name = "Лечение";
             break;
         case "al_neut_power":
-            $script_name = "RunMagicSelf";
+            $script_name = "RunmagicSelf";
             $magic_name = "Сила нейтралитета";
             break;
         case "ct1":
@@ -733,7 +733,7 @@ echo "</div>";
 <button onclick="runmagic3('Test','0','0','0')">runmagic3</button>
 <button onclick="runmagic4('Test','0','0','0')">runmagic4</button>
 <button onclick="runmagicf('Test','0','0','0')">runmagicf</button>
-<button onclick="RunMagicSelf('Test','0','0','0')">RunMagicSelf</button>
+<button onclick="RunmagicSelf('Test','0','0','0')">RunmagicSelf</button>
 <button onclick="vipad('Test','0','0','0')">vipad</button>
 <button onclick="runmagicgold('Test','0','0','0')">new window test</button>
 
@@ -960,7 +960,7 @@ if ($_POST['login'] && $_POST['krest']) {
         Hint3Closed = false;
     }
 
-    function RunMagicSelf(title, magic, name) {
+    function RunmagicSelf(title, magic, name) {
         document.all("hint3").innerHTML = '<table width=100% cellspacing=1 cellpadding=0 bgcolor=CCC3AA><tr><td align=center><B>' + title + '</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint3();"><BIG><B>x</b></BIG></td></tr><tr><td colspan=2>' +
             '<form action="admin.php" method=POST><table width=100% cellspacing=0 cellpadding=2 bgcolor=FFF6DD><tr><td colspan=2><INPUT TYPE=hidden name=sd4 value="<?php echo @$user['id']; ?>"> <INPUT TYPE=hidden NAME="use" value="' + magic + '">' +
             'Использовать возможность "Сила Нейтралитета?"</TD></TR><TR><TD align=left><INPUT TYPE=hidden NAME="' + name + '" VALUE="<?php echo @$user['login']; ?>">' +
diff --git a/admin/edit_user.php b/admin/edit_user.php
index 01cce2b..7439908 100644
--- a/admin/edit_user.php
+++ b/admin/edit_user.php
@@ -45,7 +45,7 @@ if ($del) {
     }
     db::c()->query('DELETE FROM `inventory` WHERE `id` = ?i', $del);
 }
-Template::header('ᐰdminка инвентаря');
+\Battles\Template::header('ᐰdminка инвентаря');
 ?>
 <h1>Администрирование инвентаря <?php if (isset($_SESSION['player_name'])) echo $_SESSION['player_name']; ?></h1>
 <table class='adm'>
diff --git a/akadem.php b/akadem.php
index 6854393..5621241 100644
--- a/akadem.php
+++ b/akadem.php
@@ -79,7 +79,7 @@ if ($get == 'exit') {
     db::c()->query('UPDATE `users`,`online` SET `users`.`room` = 2702, `online`.`room` = 2702 WHERE `users`.`id` = ?i AND `online`.`id` = ?i', $user->id, $user->id);
     header('Location: city.php');
 }
-Template::header('Академия');
+\Battles\Template::header('Академия');
 ?>
 <link href="css/secondary.css" rel="stylesheet"/>
 <div style="float: right;">
diff --git a/aren_of_angels.php b/aren_of_angels.php
index d174cda..5bb5531 100644
--- a/aren_of_angels.php
+++ b/aren_of_angels.php
@@ -126,7 +126,7 @@ if (isset($_GET['append'])) {
         }
     }
 }
-Template::header('Арена Ангелов');
+\Battles\Template::header('Арена Ангелов');
 ?>
 <link href="css/fight.css" rel="stylesheet"/>
 <style>
diff --git a/bank.php b/bank.php
index ec6afa2..25e4306 100644
--- a/bank.php
+++ b/bank.php
@@ -18,34 +18,42 @@ if ($user->battle != 0) {
 }
 const SUCCESS = "Успешная операция!";
 
-$bank = new Bank($user->id);
+$bank = new \Battles\Bank($user->id);
 $status = '';
 
-$toid = (int)$_POST['to_id'] ?? 0;
-$summa = (int)$_POST['summa'] ?? 0;
+$toid = $_POST['to_id'] ?? 0;
+$summa = $_POST['summa'] ?? 0;
 $submit = $_POST['action'] ?? '';
+try {
 // Зачисление кредитов на счёт.
-if ($submit === 'depositMoney' && $summa) {
-    $bank->depositMoney($summa);
-    $status = SUCCESS;
-}
+    if ($submit === 'depositMoney' && $summa) {
+        $operation = $bank->depositMoney($summa);
+        $user->money = $operation['walletMoney'];
+        $bank->setMoney($operation['bankMoney']);
+        $status = SUCCESS;
+    }
 // Снятие кредитов со счёта.
-if ($submit === 'withdrawMoney' && $summa) {
-    $bank->withdrawMoney($summa);
-    $status = SUCCESS;
-}
+    if ($submit === 'withdrawMoney' && $summa) {
+        $operation = $bank->withdrawMoney($summa);
+        $user->money = $operation['walletMoney'];
+        $bank->setMoney($operation['bankMoney']);
+        $status = SUCCESS;
+    }
 // Перевод кредитов на другой счёт.
-if ($submit === 'sendMoney' && $summa && $toid) {
-    $bank->sendMoney($toid, $summa);
-    $status = SUCCESS;
+    if ($submit === 'sendMoney' && $summa && $toid) {
+        $user->money = $bank->sendMoney($toid, $summa);
+        $status = SUCCESS;
+    }
+} catch (\Exceptions\GameException $e) {
+    echo 'Банковская ошибка!';
+} finally {
+    unset($submit, $summa, $toid);
 }
-unset($submit, $summa, $toid);
-
-Template::header('Банк');
+\Battles\Template::header('Банк');
 ?>
 <link href="css/secondary.css" rel="stylesheet"/>
 <script src="js/main.js"></script>
-<?php Template::buildingTop(Rooms::$roomNames[29], 'strah') ?>
+<?php \Battles\Template::buildingTop(\Battles\Rooms::$roomNames[29], 'strah') ?>
 <div><?= $status ?></div>
 <div class="appblock appblock-main">
     <span class="wrap">На счету: <span class="num"><?= $bank->getMoney() ?></span></span>
diff --git a/buttons.php b/buttons.php
index dbc8d1a..e6d892a 100644
--- a/buttons.php
+++ b/buttons.php
@@ -11,7 +11,7 @@ $ch = $_GET['ch'] ?? null;
 if ($header) {
     exit;
 } elseif ($ch != null) {
-    Template::header('buttons');
+    \Battles\Template::header('buttons');
 ?>
     <script language="JavaScript" src="js/ch.js"></script>
     <script language="JavaScript" src="js/sl2.js"></script>
@@ -235,7 +235,7 @@ if ($header) {
 <div id="oMenu" style="position: absolute; border:1px solid #666; background-color:#CCC; display:none; "></div>
 <div id="ClearMenu" style="position: absolute; border:1px solid #666; background-color: #e2e0e0; display: none;"></div>
 
-<? } else { Template::header(buttons); ?>
+<? } else { \Battles\Template::header('buttons'); ?>
     <script language="JavaScript" src="js/chat.js"></script>
     <script language="JavaScript">
 
diff --git a/c_forest.php b/c_forest.php
index 6a73254..282a121 100644
--- a/c_forest.php
+++ b/c_forest.php
@@ -104,7 +104,7 @@ if ($map_user['Up'] == 1) {
                  onclick="location.href='?move=true&Dir=Up';" alt="Вверх">
 MAP;
 }
-Template::header('forest');
+\Battles\Template::header('forest');
 ?>
     <link rel="stylesheet" type="text/css" href="css/hostel.css"/>
     <style>
diff --git a/c_haos.php b/c_haos.php
index 3fcdf76..a4bda16 100644
--- a/c_haos.php
+++ b/c_haos.php
@@ -103,7 +103,7 @@ if ($in_haos['status'] == 2) {
     }
 }
 $in_haos = mysql_fetch_array(mysql_query("SELECT * FROM `cit_haos_status` WHERE `id` = '{$user['id']}' LIMIT 1;"));
-Template::header('Цитадель Хаоса');
+\Battles\Template::header('Цитадель Хаоса');
 ?>
 <!-- JS -->
 <script>
diff --git a/c_haos_in.php b/c_haos_in.php
index 54923a5..f405c50 100644
--- a/c_haos_in.php
+++ b/c_haos_in.php
@@ -130,7 +130,7 @@ if (!$ch_rooms[$in_haos['room']]) {
     mysql_query("UPDATE `cit_haos_var` SET bots='',players='' WHERE group='" . $in_haos['group'] . "'; ");
     header('location: c_haos.php');
 }
-Template::header('c_haos_in');
+\Battles\Template::header('c_haos_in');
 ?>
 <script>
     function refreshPeriodic() {
diff --git a/c_park.php b/c_park.php
index a58bd03..891cbc5 100644
--- a/c_park.php
+++ b/c_park.php
@@ -121,7 +121,7 @@ if ($_POST['attack']) {
 
 
 //старт боя - конец
-Template::header('Городской Парк');
+\Battles\Template::header('Городской Парк');
 ?>
     <script>
         function refreshPeriodic() {
diff --git a/canalizaciya.php b/canalizaciya.php
index a3ba215..d5d4cbd 100644
--- a/canalizaciya.php
+++ b/canalizaciya.php
@@ -63,7 +63,7 @@ if ($user->room == 403) {
         }
     }
 }
-Template::header('canalizaciya');
+\Battles\Template::header('canalizaciya');
 
 $ros = mysql_query("SELECT * FROM `labirint` WHERE `user_id`='{$_SESSION['uid']}'");
 $mir = mysql_fetch_array($ros);
diff --git a/cave.php b/cave.php
index ef0d855..366f9c4 100644
--- a/cave.php
+++ b/cave.php
@@ -915,7 +915,7 @@ $standingon = $map[$y * 2][$x * 2];
 foreach ($party as $k => $v) {
     $map[$v['y'] * 2][$v['x'] * 2] = "u/" . $v['user'];
 }
-Template::header('cave');
+\Battles\Template::header('cave');
 ?>
         <style>
             body {
diff --git a/ch.php b/ch.php
index 1eccaa8..e1c57f2 100644
--- a/ch.php
+++ b/ch.php
@@ -112,7 +112,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
         $ch4 = '_passive';
         $ch5 = '_passive';
     }
-    Template::header(sprintf('%s (%s)', $rooms[$user->room], mysql_num_rows($data)));
+    \Battles\Template::header(sprintf('%s (%s)', $rooms[$user->room], mysql_num_rows($data)));
     ?>
         <script>
             function fastshow(content) {
diff --git a/chat.php b/chat.php
index 746983f..3664401 100644
--- a/chat.php
+++ b/chat.php
@@ -50,7 +50,7 @@ function show_messages()
 
 
 show_messages();
-Template::header('chat');
+\Battles\Template::header('chat');
 ?>
 <style>
     form {
diff --git a/city.php b/city.php
index 25997f3..86193ec 100644
--- a/city.php
+++ b/city.php
@@ -30,28 +30,28 @@ switch ($location[0]) {
     default:
         break;
     case 'cp':
-        Travel::toRoom(20,$user->room);
+        Battles\Travel::toRoom(20,$user->room);
         break;
     case 'strah':
-        Travel::toRoom(21,$user->room);
+        Battles\Travel::toRoom(21,$user->room);
         break;
     case 'bps':
-        Travel::toRoom(26,$user->room);
+        Battles\Travel::toRoom(26,$user->room);
         break;
     case 'ps':
-        Travel::toRoom(51,$user->room);
+        Battles\Travel::toRoom(51,$user->room);
         break;
     case 'zaliv':
-        Travel::toRoom(2111,$user->room);
+        Battles\Travel::toRoom(2111,$user->room);
         break;
     case 'zamk':
-        Travel::toRoom(2601,$user->room);
+        Battles\Travel::toRoom(2601,$user->room);
         break;
     case 'abog':
-        Travel::toRoom(2655,$user->room);
+        Battles\Travel::toRoom(2655,$user->room);
         break;
     case 'torg':
-        Travel::toRoom(2702,$user->room);
+        Battles\Travel::toRoom(2702,$user->room);
         break;
     case 'got':
         if ($user->room == 20) {
@@ -59,34 +59,34 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level1':
-                    Travel::toRoom(1,$user->room);
+                    Battles\Travel::toRoom(1,$user->room);
                     break;
                 case 'level7':
-                    Travel::toRoom(21,$user->room);
+                    Battles\Travel::toRoom(21,$user->room);
                     break;
                 case 'level8':
-                    Travel::toRoom(26,$user->room);
+                    Battles\Travel::toRoom(26,$user->room);
                     break;
                 case 'level13':
                     header('location: quest_room.php');
                     break;
                 case 'level222':
-                    Travel::toRoom(2702,$user->room);
+                    Battles\Travel::toRoom(2702,$user->room);
                     break;
                 case 'level17':
-                    Travel::toRoom(50,$user->room);
+                    Battles\Travel::toRoom(50,$user->room);
                     break;
                 case 'level2':
-                    Travel::toRoom(22,$user->room);
+                    Battles\Travel::toRoom(22,$user->room);
                     break;
                 case 'level4':
-                    Travel::toRoom(23,$user->room);
+                    Battles\Travel::toRoom(23,$user->room);
                     break;
                 case 'level6':
-                    Travel::toRoom(27,$user->room);
+                    Battles\Travel::toRoom(27,$user->room);
                     break;
                 case 'level3':
-                    Travel::toRoom(25,$user->room);
+                    Battles\Travel::toRoom(25,$user->room);
                     break;
             }
         } elseif ($user->room == 21) {
@@ -94,25 +94,25 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level4':
-                    Travel::toRoom(20,$user->room);
+                    Battles\Travel::toRoom(20,$user->room);
                     break;
                 case 'level3':
-                    Travel::toRoom(2111,$user->room);
+                    Battles\Travel::toRoom(2111,$user->room);
                     break;
                 case 'level13':
-                    Travel::toRoom(34,$user->room);
+                    Battles\Travel::toRoom(34,$user->room);
                     break;
                 case 'level5':
-                    Travel::toRoom(29,$user->room);
+                    Battles\Travel::toRoom(29,$user->room);
                     break;
                 case 'level16':
-                    Travel::toRoom(31,$user->room);
+                    Battles\Travel::toRoom(31,$user->room);
                     break;
                 case 'level14':
-                    Travel::toRoom(30,$user->room);
+                    Battles\Travel::toRoom(30,$user->room);
                     break;
                 case 'level650':
-                    Travel::toRoom(650,$user->room);
+                    Battles\Travel::toRoom(650,$user->room);
                     break;
             }
         } elseif ($user->room == 2111) {
@@ -120,17 +120,17 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level1':
-                    Travel::toRoom(21,$user->room);
+                    Battles\Travel::toRoom(21,$user->room);
                     break;
                 case 'level203':
-                    Travel::toRoom(1055,$user->room);
+                    Battles\Travel::toRoom(1055,$user->room);
                     break;
                 case 'level1000':
-                    Travel::toRoom(620,$user->room);
+                    Battles\Travel::toRoom(620,$user->room);
                     break;
                 case 'room666':
                     //Нет на карте
-                    //Travel::toRoom(666,$user->room);
+                    //Battles\Travel::toRoom(666,$user->room);
                     break;
             }
         } elseif ($user->room == 2601) {
@@ -138,19 +138,19 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level4':
-                    Travel::toRoom(26,$user->room);
+                    Battles\Travel::toRoom(26,$user->room);
                     break;
                 case 'level55':
-                    Travel::toRoom(2655,$user->room);
+                    Battles\Travel::toRoom(2655,$user->room);
                     break;
                 case 'level1':
-                    Travel::toRoom(37,$user->room);
+                    Battles\Travel::toRoom(37,$user->room);
                     break;
                 case 'level1051':
-                    Travel::toRoom(1051,$user->room);
+                    Battles\Travel::toRoom(1051,$user->room);
                     break;
                 case 'level5':
-                    Travel::toRoom(404,$user->room);
+                    Battles\Travel::toRoom(404,$user->room);
                     break;
             }
         } elseif ($user->room == 2701) {
@@ -158,10 +158,10 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level1':
-                    Travel::toRoom(2111,$user->room);
+                    Battles\Travel::toRoom(2111,$user->room);
                     break;
                 case 'level2':
-                    Travel::toRoom(402,$user->room);
+                    Battles\Travel::toRoom(402,$user->room);
                     break;
             }
         } elseif ($user->room == 2702) {
@@ -169,10 +169,10 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level10':
-                    Travel::toRoom(20,$user->room);
+                    Battles\Travel::toRoom(20,$user->room);
                     break;
                 case 'level6':
-                    Travel::toRoom(61,$user->room);
+                    Battles\Travel::toRoom(61,$user->room);
                     break;
             }
         } elseif ($user->room == 2655) {
@@ -180,10 +180,10 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level10':
-                    Travel::toRoom(2601,$user->room);
+                    Battles\Travel::toRoom(2601,$user->room);
                     break;
                 case 'level2055':
-                    Travel::toRoom(603,$user->room);
+                    Battles\Travel::toRoom(603,$user->room);
                     break;
             }
         } elseif ($user->room == 26) {
@@ -191,25 +191,25 @@ switch ($location[0]) {
                 default:
                     break;
                 case 'level4':
-                    Travel::toRoom(20,$user->room);
+                    Battles\Travel::toRoom(20,$user->room);
                     break;
                 case 'level3':
-                    Travel::toRoom(2601,$user->room);
+                    Battles\Travel::toRoom(2601,$user->room);
                     break;
                 case 'level660':
-                    Travel::toRoom(660,$user->room);
+                    Battles\Travel::toRoom(660,$user->room);
                     break;
                 case 'level7':
-                    Travel::toRoom(777,$user->room);
+                    Battles\Travel::toRoom(777,$user->room);
                     break;
                 case 'level56':
-                    Travel::toRoom(401,$user->room);
+                    Battles\Travel::toRoom(401,$user->room);
                     break;
             }
         }
 }
 
-Template::header('city');
+\Battles\Template::header('city');
 echo sprintf('<div style="text-align: right;">Сейчас в игре: %s игроков.></div>', $online->getNumRows());
 if (in_array($user->room, [20, 21, 26, 2601, 2655, 2111, 2701, 2702])) {
     /* Улицы:
@@ -222,5 +222,5 @@ if (in_array($user->room, [20, 21, 26, 2601, 2655, 2111, 2701, 2702])) {
      * 2701 С ещё одним ристалищем?
      * 2702 Торговая
      */
-    City::showStreet($user->room);
+    Battles\City::showStreet($user->room);
 }
\ No newline at end of file
diff --git a/clan.php b/clan.php
index c3deed4..6ebabfc 100644
--- a/clan.php
+++ b/clan.php
@@ -100,7 +100,7 @@ if ($login && $action == 'edit_status') {
 }
 
 $clan_memberlist = db::c()->query('SELECT `id`, `login`, `status`, `level`, `room`, `align`, (select `id` from `online` WHERE `date` >= ?i AND `id` = users.`id`) AS `online` FROM `users` WHERE `klan` = ?i ORDER BY `online` DESC , `login` ASC', (time() - 60), $clanRow['id']);
-Template::header('clan');
+\Battles\Template::header('clan');
 ?>
 <div>
     <button onclick="location.href='main.php'">Вернуться</button>
diff --git a/clan_castle.php b/clan_castle.php
index 68fb8c7..e6d6b20 100644
--- a/clan_castle.php
+++ b/clan_castle.php
@@ -37,7 +37,7 @@ if ($_POST['add_zay']) {
     mysql_query("INSERT INTO `clan_castle` VALUES ('{$user['id']}','{$user['klan']}');");
     exit("<script>location.href='clan_castle.php';</script>");
 }
-Template::header('Замок Мэра');
+\Battles\Template::header('Замок Мэра');
 ?>
 <script>
     function refreshPeriodic() {
diff --git a/clan_create.php b/clan_create.php
index 2ad6aad..52d1c4a 100644
--- a/clan_create.php
+++ b/clan_create.php
@@ -14,7 +14,7 @@ $userClan = db::c()->query('SELECT short_name, full_name, info FROM clans where
 $clanFullName = $_POST['clan_full_name'] ?? '';
 $clanShortName = $_POST['clan_short_name'] ?? '';
 $clanInfo = $_POST['clan_info'] ?? '';
-$userBank = new Bank($user->id);
+$userBank = new \Battles\Bank($user->id);
 if ($clanFullName && $clanShortName && $clanInfo && !$userClan) {
 
     $eff = db::c()->query('SELECT 1 FROM users_effects WHERE type = 20 AND owner_id = ?i', $user->id);
@@ -59,8 +59,8 @@ if ($clanFullName && $clanShortName && $clanInfo && !$userClan) {
         }
     }
 }
-Template::header(Rooms::$roomNames[30]);
-Template::buildingTop(Rooms::$roomNames[30], 'strah');
+\Battles\Template::header(Rooms::$roomNames[30]);
+\Battles\Template::buildingTop(Rooms::$roomNames[30], 'strah');
 if ($userClan): ?>
     <div>
         <fieldset style="display: inline;">
diff --git a/clans.php b/clans.php
index 03501b8..63dc050 100644
--- a/clans.php
+++ b/clans.php
@@ -4,7 +4,7 @@
  * Author: Igor Barkov <lopar.4ever@gmail.com>
  * Project name: Battles-Game
  */
-Template::header('Список кланов');
+\Battles\Template::header('Список кланов');
 include_once "config.php";
 $claninf = urldecode(filter_input(INPUT_SERVER,'QUERY_STRING'));
 
diff --git a/classes/Bank.php b/classes/Battles/Bank.php
similarity index 72%
rename from classes/Bank.php
rename to classes/Battles/Bank.php
index 81a1a42..83f3a4b 100644
--- a/classes/Bank.php
+++ b/classes/Battles/Bank.php
@@ -4,6 +4,7 @@
  * Date: 03.07.2020
  * Time: 07:24
  */
+namespace Battles;
 
 class Bank
 {
@@ -25,8 +26,8 @@ class Bank
 
     public function __construct($row)
     {
-        $bank_row = db::c()->query('SELECT user_id, money FROM bank WHERE user_id = ?i', $row)->fetch_assoc();
-        $this->user = db::c()->query('SELECT money FROM users WHERE id = ?i', $row)->fetch_object();
+        $bank_row = \db::c()->query('SELECT user_id, money FROM bank WHERE user_id = ?i', $row)->fetch_assoc();
+        $this->user = \db::c()->query('SELECT money FROM users WHERE id = ?i', $row)->fetch_object();
         foreach ($this as $key => $value) {
             if (isset($bank_row[$key])) {
                 $this->$key = $bank_row[$key];
@@ -34,7 +35,7 @@ class Bank
         }
         // Если ВДРУГ у человека нет счёта в банке - создаём.
         if (empty($this->user_id)) {
-            db::c()->query('INSERT INTO bank (user_id) VALUES (?i)', $row);
+            \db::c()->query('INSERT INTO bank (user_id) VALUES (?i)', $row);
             $this->user_id = $row;
         }
     }
@@ -48,7 +49,7 @@ class Bank
      */
     private function bankCommission(int $amount): int
     {
-        $bankCommission = round($amount * Config::$bank_commission);
+        $bankCommission = round($amount * \Config::$bank_commission);
         if ($bankCommission < 1) {
             return 1;
         } else {
@@ -82,7 +83,7 @@ class Bank
             $text .= " Комиссия: " . $this->bankCommission($amount);
         }
 
-        db::c()->query('INSERT INTO `bank_logs` (sender_id, receiver_id, amount_result, type, text) 
+        \db::c()->query('INSERT INTO `bank_logs` (sender_id, receiver_id, amount_result, type, text) 
                             VALUES (?i, ?i, ?i, "?s", "?s")', $senderId, $receiverId, $amount, $operationType, $text);
     }
 
@@ -92,21 +93,21 @@ class Bank
      * @param int $receiver ID получателя.
      * @param int $amount   сумма.
      *
-     * @return void
+     * @return int
      * @throws \Krugozor\Database\Mysql\Exception
      */
-    public function sendMoney(int $receiver, int $amount): void
+    public function sendMoney(int $receiver, int $amount): int
     {
-        $receiverWallet = db::c()->query('SELECT money FROM bank WHERE user_id = ?i', $receiver)->fetch_object();
+        $receiverWallet = \db::c()->query('SELECT money FROM bank WHERE user_id = ?i', $receiver)->fetch_object();
         if ($amount <= 0) {
-            throw new Exception(self::ERROR_WRONG_AMOUNT);
+            throw new \Exceptions\GameException(self::ERROR_WRONG_AMOUNT);
         }
         if (!$receiverWallet) {
-            throw new Exception(self::ERROR_NO_BANK_ACCOUNT);
+            throw new \Exceptions\GameException(self::ERROR_NO_BANK_ACCOUNT);
         }
         $amountWithComission = $amount + $this->bankCommission($amount);
         if ($amountWithComission > $this->money) {
-            throw new Exception(self::ERROR_NO_MONEY_IN_BANK_ACCOUNT);
+            throw new \Exceptions\GameException(self::ERROR_NO_MONEY_IN_BANK_ACCOUNT);
         }
         // Снимаем сумму с комиссией у отправителя
         $this->money -= $amountWithComission;
@@ -116,6 +117,8 @@ class Bank
         $receiverWallet->money += $amount;
         self::setBankMoney($receiverWallet->money, $receiver);
         $this->bankLogs($receiver, $receiverWallet->money, "receiveMoney");
+        // Возвращаем изменившиеся значения
+        return $this->money;
     }
 
     /**
@@ -123,26 +126,30 @@ class Bank
      *
      * @param int $amount сумма.
      *
-     * @return void
+     * @return array
      * @throws \Krugozor\Database\Mysql\Exception
      */
-    public function depositMoney(int $amount): void
+    public function depositMoney(int $amount): array
     {
         if ($amount <= 0) {
-            throw new Exception(self::ERROR_WRONG_AMOUNT);
+            throw new \Exceptions\GameException(self::ERROR_WRONG_AMOUNT);
         }
-        $wallet = db::c()->query('SELECT money FROM users WHERE id = ?i', $this->user_id)->fetch_object();
+        $wallet = \db::c()->query('SELECT money FROM users WHERE id = ?i', $this->user_id)->fetch_object();
         if ($wallet->money < $amount) {
-            throw new Exception(self::ERROR_NO_MONEY_IN_WALLET);
+            throw new \Exceptions\GameException(self::ERROR_NO_MONEY_IN_WALLET);
         }
         // Забираем деньги из кошелька получателя
-        //todo check it!
         $this->user->money -= $amount;
         self::setWalletMoney($this->user->money, $this->user_id);
         // Отдаём сумму на счёт получателю
         $this->money += $amount;
         self::setBankMoney($this->money, $this->user_id);
         $this->bankLogs(0, $this->money, "depositMoney");
+        // Возвращаем изменившиеся значения
+        return [
+            'walletMoney' => $this->user->money,
+            'bankMoney' => $this->money
+        ];
     }
 
     /**
@@ -150,26 +157,30 @@ class Bank
      *
      * @param int $amount сумма.
      *
-     * @return void
+     * @return array
      * @throws \Krugozor\Database\Mysql\Exception
      */
-    public function withdrawMoney(int $amount): void
+    public function withdrawMoney(int $amount):array
     {
         if ($amount <= 0) {
-            throw new Exception(self::ERROR_WRONG_AMOUNT);
+            throw new \Exceptions\GameException(self::ERROR_WRONG_AMOUNT);
         }
         $amountWithComission = $amount + $this->bankCommission($amount);
         if ($this->money < $amountWithComission) {
-            throw new Exception(self::ERROR_NO_MONEY_IN_BANK_ACCOUNT);
+            throw new \Exceptions\GameException(self::ERROR_NO_MONEY_IN_BANK_ACCOUNT);
         }
         // Снимаем сумму с комиссией у отправителя
         $this->money -= $amountWithComission;
         self::setBankMoney($this->money, $this->user_id);
         $this->bankLogs(0, $this->money, "withdrawMoney");
         // Отдаём сумму в кошелёк получателя
-        //todo check it!
         $this->user->money += $amount;
         self::setWalletMoney($this->user->money, $this->user_id);
+        // Возвращаем изменившиеся значения
+        return [
+            'walletMoney' => $this->user->money,
+            'bankMoney' => $this->money
+        ];
     }
 
     /**
@@ -184,10 +195,15 @@ class Bank
      */
     public static function setBankMoney(int $amount, int $user_id, string $operationType = ''): void
     {
-        db::c()->query('UPDATE bank SET money = ?i WHERE user_id = ?i', $amount, $user_id);
-        if ($operationType) {
-            (new Bank($user_id))->bankLogs(0, $amount, $operationType);
+        try {
+            \db::c()->query('UPDATE bank SET money = ?i WHERE user_id = ?i', $amount, $user_id);
+            if ($operationType) {
+                (new Bank($user_id))->bankLogs(0, $amount, $operationType);
+            }
+        } catch (\Throwable $e) {
+            echo "Не отработал запрос в БД в файле {$e->getFile()}({$e->getLine()})";
         }
+
     }
 
     /**
@@ -201,7 +217,12 @@ class Bank
      */
     public static function setWalletMoney(int $amount, int $user_id): void
     {
-        db::c()->query('UPDATE users SET money = ?i WHERE `id` = ?i', $amount, $user_id);
+        try {
+            \db::c()->query('UPDATE users SET money = ?i WHERE `id` = ?i', $amount, $user_id);
+        } catch (\Throwable $e) {
+            echo "Не отработал запрос в БД в файле {$e->getFile()}({$e->getLine()})";
+        }
+
     }
 
     public function getMoney()
diff --git a/classes/City.php b/classes/Battles/City.php
similarity index 99%
rename from classes/City.php
rename to classes/Battles/City.php
index db25c92..d851f48 100644
--- a/classes/City.php
+++ b/classes/Battles/City.php
@@ -1,5 +1,6 @@
 <?php
 # Date: 26.10.2020 (17:56)
+namespace Battles;
 // todo: #10
 class City
 {
diff --git a/classes/DressedItems.php b/classes/Battles/DressedItems.php
similarity index 99%
rename from classes/DressedItems.php
rename to classes/Battles/DressedItems.php
index 2668bc6..25d01ad 100644
--- a/classes/DressedItems.php
+++ b/classes/Battles/DressedItems.php
@@ -4,7 +4,7 @@
  * Date: 06.07.2020
  * Time: 22:41
  */
-
+namespace Battles;
 class DressedItems
 {
     private $DB;
diff --git a/classes/InventoryItem.php b/classes/Battles/InventoryItem.php
similarity index 98%
rename from classes/InventoryItem.php
rename to classes/Battles/InventoryItem.php
index b042dba..73f063e 100644
--- a/classes/InventoryItem.php
+++ b/classes/Battles/InventoryItem.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Battles;
 class InventoryItem extends Item
 {
     private $present;
diff --git a/classes/Item.php b/classes/Battles/Item.php
similarity index 99%
rename from classes/Item.php
rename to classes/Battles/Item.php
index b6fc999..a7c3f17 100644
--- a/classes/Item.php
+++ b/classes/Battles/Item.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Battles;
 abstract class Item
 {
     protected $item_id;
diff --git a/magic/CureInjury.php b/classes/Battles/Magic/CureInjury.php
similarity index 79%
rename from magic/CureInjury.php
rename to classes/Battles/Magic/CureInjury.php
index 3c7aaa5..b31f34d 100644
--- a/magic/CureInjury.php
+++ b/classes/Battles/Magic/CureInjury.php
@@ -1,8 +1,11 @@
 <?php
 # Date: 16.09.2020 (08:23)
 // Магия лечения травм
+namespace Battles\Magic;
+use Battles\UserEffects;
+use Battles\User;
 
-class CureInjury extends Magic
+class CureInjury extends magic
 {
     private $target;
     use UserEffects;
@@ -17,10 +20,10 @@ class CureInjury extends Magic
     {
         $this->target = $target;
         if ($target && $this->isUsable()) {
-            $injury = db::c()->query('SELECT effect_id, type, name FROM users_effects WHERE type IN (11,12,13,14) AND owner_id = ?i ORDER BY type DESC LIMIT 1', $target)->fetch_object();
+            $injury = \db::c()->query('SELECT effect_id, type, name FROM users_effects WHERE type IN (11,12,13,14) AND owner_id = ?i ORDER BY type DESC LIMIT 1', $target)->fetch_object();
             $targetName = $this->target->login;
             if (in_array($injury->effect_id, [11, 12, 13, 14]) && $injuryType >= $injury->type) {
-                db::c()->query('DELETE FROM users_effects WHERE effect_id = ?i', $injury->effect_id);
+                \db::c()->query('DELETE FROM users_effects WHERE effect_id = ?i', $injury->effect_id);
                 if (empty($injury->name) || $injury->name == 'Неизвестный эффект') {
                     $injuryName = self::$effectName[$injury->type];
                 } else {
@@ -28,7 +31,7 @@ class CureInjury extends Magic
                 }
                 return "Вы вылечили повреждение ${injuryName} персонажу ${targetName}.";
             } elseif ($injury->effect_id && $injuryType == 15) {
-                db::c()->query('DELETE FROM users_effects WHERE type IN (11,12,13,14) AND owner_id = ?i', $target);
+                \db::c()->query('DELETE FROM users_effects WHERE type IN (11,12,13,14) AND owner_id = ?i', $target);
                 return "Вы вылечили все повреждения персонажу ${targetName}.";
             } else {
                 return false;
diff --git a/classes/Magic.php b/classes/Battles/Magic/Magic.php
similarity index 97%
rename from classes/Magic.php
rename to classes/Battles/Magic/Magic.php
index 3feaeda..c7477de 100644
--- a/classes/Magic.php
+++ b/classes/Battles/Magic/Magic.php
@@ -1,6 +1,6 @@
 <?php
 # Date: 16.09.2020 (08:45)
-
+namespace Battles\Magic;
 class Magic
 {
     protected $status;
diff --git a/classes/magic/attack.php b/classes/Battles/Magic/attack.php
similarity index 96%
rename from classes/magic/attack.php
rename to classes/Battles/Magic/attack.php
index 3479ed2..e4ec816 100644
--- a/classes/magic/attack.php
+++ b/classes/Battles/Magic/attack.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace magic\attack;
+namespace Battles\Magic;
 
 use db;
 
diff --git a/models/EffectsModel.php b/classes/Battles/Models/EffectsModel.php
similarity index 72%
rename from models/EffectsModel.php
rename to classes/Battles/Models/EffectsModel.php
index 976ba65..be677c1 100644
--- a/models/EffectsModel.php
+++ b/classes/Battles/Models/EffectsModel.php
@@ -4,15 +4,15 @@
  * Date: 05.07.2020
  * Time: 23:32
  */
-
+namespace Battles\Models;
 class EffectsModel
 {
     protected $DB;
     const EFFECT_HIDEUSERINFO = 5; // Обезлик
     public function __construct(int $user_id) {
         try {
-            $this->DB = db::c()->query('SELECT * FROM users_effects WHERE owner_id = ?i', $user_id);
-        } catch (Exception $e) {echo '<div class="debug">class EffectsModel: Не могу подключиться к таблице effects!</div>';}
+            $this->DB = \db::c()->query('SELECT * FROM users_effects WHERE owner_id = ?i', $user_id);
+        } catch (\Throwable $e) {echo '<div class="debug">class EffectsModel: Не могу подключиться к таблице effects!</div>';}
     }
 
     private function getEffects($user_id)
diff --git a/models/PresentsModel.php b/classes/Battles/Models/PresentsModel.php
similarity index 51%
rename from models/PresentsModel.php
rename to classes/Battles/Models/PresentsModel.php
index c0c40c0..db04367 100644
--- a/models/PresentsModel.php
+++ b/classes/Battles/Models/PresentsModel.php
@@ -4,6 +4,8 @@
  * Date: 04.07.2020
  * Time: 13:17
  */
+namespace Battles\Models;
+use Exceptions\GameException;
 
 class PresentsModel
 {
@@ -12,12 +14,10 @@ class PresentsModel
     public function __construct(int $user_id)
     {
         if (!$this->DB) {
-            try {
-                $this->DB = db::c()->query('SELECT sender_id, image FROM `users_presents` WHERE owner_id = ?i', $user_id);
-            } catch (Exception $e) {
-                echo "<div class='debug'>class PresentsModel: Не прогрузилась база!</div>";
+            $this->DB = \db::c()->query('SELECT sender_id, image FROM `users_presents` WHERE owner_id = ?i', $user_id);
+            if ($this->DB->getNumRows() == 0) {
+                throw new GameException("<div class='debug'>class PresentsModel: Не прогрузилась база!</div>");
             }
-
         }
     }
 
diff --git a/models/UserLogModel.php b/classes/Battles/Models/UserLogModel.php
similarity index 63%
rename from models/UserLogModel.php
rename to classes/Battles/Models/UserLogModel.php
index 522f56d..7c3c1a7 100644
--- a/models/UserLogModel.php
+++ b/classes/Battles/Models/UserLogModel.php
@@ -4,14 +4,14 @@
  * Date: 05.07.2020
  * Time: 22:38
  */
-
+namespace Battles\Models;
 class UserLogModel
 {
     protected $DB;
 
     public function __construct(int $user_id)
     {
-        $this->DB = db::c()->query('SELECT * FROM users_logs WHERE user_id = ?i ORDER BY `id` ASC', $user_id);
+        $this->DB = \db::c()->query('SELECT * FROM users_logs WHERE user_id = ?i ORDER BY `id` ASC', $user_id);
 
     }
 
diff --git a/classes/Nick.php b/classes/Battles/Nick.php
similarity index 99%
rename from classes/Nick.php
rename to classes/Battles/Nick.php
index df4ad10..31f1c38 100644
--- a/classes/Nick.php
+++ b/classes/Battles/Nick.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Battles;
 /**
  * Разные способы отображения строки с логином персонажа.
  */
diff --git a/classes/Rooms.php b/classes/Battles/Rooms.php
similarity index 99%
rename from classes/Rooms.php
rename to classes/Battles/Rooms.php
index 4f6b5d5..9864a26 100644
--- a/classes/Rooms.php
+++ b/classes/Battles/Rooms.php
@@ -1,4 +1,5 @@
 <?php
+namespace Battles;
 /*
  * Список наименований игровых комнат.
  */
diff --git a/classes/ShopItem.php b/classes/Battles/ShopItem.php
similarity index 99%
rename from classes/ShopItem.php
rename to classes/Battles/ShopItem.php
index 51011e8..5c9b059 100644
--- a/classes/ShopItem.php
+++ b/classes/Battles/ShopItem.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Battles;
 class ShopItem extends Item
 {
     public function printInfo()
diff --git a/classes/Template.php b/classes/Battles/Template.php
similarity index 98%
rename from classes/Template.php
rename to classes/Battles/Template.php
index 2d9b418..1a79d8a 100644
--- a/classes/Template.php
+++ b/classes/Battles/Template.php
@@ -1,6 +1,6 @@
 <?php
 # Date: 30.09.2020 (09:42)
-
+namespace Battles;
 class Template
 {
     /**
diff --git a/classes/Travel.php b/classes/Battles/Travel.php
similarity index 88%
rename from classes/Travel.php
rename to classes/Battles/Travel.php
index b6a56f6..db72e9d 100644
--- a/classes/Travel.php
+++ b/classes/Battles/Travel.php
@@ -1,6 +1,6 @@
 <?php
 # Date: 26.10.2020 (16:08)
-
+namespace Battles;
 class Travel
 {
     /**
@@ -48,8 +48,8 @@ class Travel
      */
     public static function toRoom(int $roomId, int $roomIdCurrent): void
     {
-        $itemsWeight = db::c()->query('SELECT SUM(weight) AS all_weight FROM `inventory` WHERE owner_id = ?i AND on_sale = 0', $_SESSION['uid'])->fetch_assoc();
-        $eff = db::c()->query('SELECT type FROM users_effects WHERE owner_id = ?i AND (`type` = 10 OR `type` = 13 OR `type` = 14)', $_SESSION['uid'])->fetch_assoc();
+        $itemsWeight = \db::c()->query('SELECT SUM(weight) AS all_weight FROM `inventory` WHERE owner_id = ?i AND on_sale = 0', $_SESSION['uid'])->fetch_assoc();
+        $eff = \db::c()->query('SELECT type FROM users_effects WHERE owner_id = ?i AND (`type` = 10 OR `type` = 13 OR `type` = 14)', $_SESSION['uid'])->fetch_assoc();
         $errors = [];
         if ($itemsWeight['all_weight'] > get_meshok()) {
             $errors[0] = 'У вас переполнен рюкзак, вы не можете передвигаться...';
@@ -65,7 +65,7 @@ class Travel
                 echo sprintf('<span class="error">%s</span>', $error);
             }
         } elseif (in_array($roomId, self::allowedRoomMoves($roomIdCurrent))) {
-            db::c()->query('UPDATE users, online SET users.room = ?i, online.room = ?i WHERE `online`.`user_id` = `users`.`id` AND `online`.`user_id` = ?i', $roomId, $roomId, $_SESSION['uid']);
+            \db::c()->query('UPDATE users, online SET users.room = ?i, online.room = ?i WHERE `online`.`user_id` = `users`.`id` AND `online`.`user_id` = ?i', $roomId, $roomId, $_SESSION['uid']);
             header('location: ' . self::$roomFileName[$roomId]);
             exit;
         }
diff --git a/classes/User.php b/classes/Battles/User.php
similarity index 91%
rename from classes/User.php
rename to classes/Battles/User.php
index dbd1208..be7afbe 100644
--- a/classes/User.php
+++ b/classes/Battles/User.php
@@ -1,4 +1,6 @@
 <?php
+namespace Battles;
+use Exceptions\GameException;
 
 class User
 {
@@ -51,7 +53,7 @@ class User
 
     public function __construct($user)
     {
-        $user_query = db::c()->query('SELECT * FROM users WHERE id = "?s" OR login = "?s"', $user, $user)->fetch_assoc();
+        $user_query = \db::c()->query('SELECT * FROM users WHERE id = "?s" OR login = "?s"', $user, $user)->fetch_assoc();
         foreach ($this as $key => $value) {
             if (isset($user_query[$key])) {
                 $this->$key = $user_query[$key];
@@ -66,7 +68,7 @@ class User
      * @param     $stat_name    - имя стата. Может принимать значения 'strength', 'dexterity', 'intuition', 'endurance', 'intelligence', 'wisdom'.
      * @param int $isMainWindow - переключатель "главного окна". Если включить, дополнительно будет показывать ссылку на повышение стата на 1, при условии наличия свободных очков статов.
      * @return string
-     * @throws Exception
+     * @throws GameException
      */
     public function getStat($stat_name, $isMainWindow = 0)
     {
@@ -78,14 +80,14 @@ class User
                 return $this->$stat_name;
             }
         } else {
-            throw new Exception(self::ERROR_STAT_UNKNOWN);
+            throw new \Exceptions\GameException(self::ERROR_STAT_UNKNOWN);
         }
     }
 
     /**
      * Повышает один из выбранных статов на 1, но не выше self::STAT_MAXIMUM_AMOUNT при условии наличия свободных очков статов.
      * @param $stat_name - имя стата. Может принимать значения 'strength', 'dexterity', 'intuition', 'endurance', 'intelligence', 'wisdom'.
-     * @throws \Krugozor\Database\Mysql\Exception
+     * @throws GameException
      */
     public function addOnePointToStat($stat_name)
     {
@@ -93,12 +95,12 @@ class User
         if (in_array($stat_name, $allowed)) {
             if ($this->free_stat_points > 0 && $this->$stat_name <= self::STAT_MAXIMUM_AMOUNT) {
                 $query = 'UPDATE users SET ?f = ?f + 1, free_stat_points = free_stat_points - 1 WHERE id = ?i';
-                db::c()->query($query, $stat_name, $stat_name, $this->id);
+                \db::c()->query($query, $stat_name, $stat_name, $this->id);
             } else {
-                throw new Exception(self::ERROR_STAT_IS_MAXIMUM);
+                throw new \Exceptions\GameException(self::ERROR_STAT_IS_MAXIMUM);
             }
         } else {
-            throw new Exception(self::ERROR_STAT_UNKNOWN);
+            throw new \Exceptions\GameException(self::ERROR_STAT_UNKNOWN);
         }
 
     }
diff --git a/classes/UserEffects.php b/classes/Battles/UserEffects.php
similarity index 99%
rename from classes/UserEffects.php
rename to classes/Battles/UserEffects.php
index 7ebef81..37563ae 100644
--- a/classes/UserEffects.php
+++ b/classes/Battles/UserEffects.php
@@ -1,7 +1,7 @@
 <?php
 # Date: 16.09.2020 (08:28)
 # Названия эффектов, налагаемых на персонажа.
-
+namespace Battles;
 trait UserEffects
 {
     public static $effectName = [
diff --git a/classes/UserInfo.php b/classes/Battles/UserInfo.php
similarity index 95%
rename from classes/UserInfo.php
rename to classes/Battles/UserInfo.php
index abef12e..88ce6ec 100644
--- a/classes/UserInfo.php
+++ b/classes/Battles/UserInfo.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Battles;
 class UserInfo extends User
 {
     use Rooms;
@@ -141,7 +141,7 @@ class UserInfo extends User
                 $infoString = '<br><span>ИД Игрока: %s<br> ИД Комнаты: %s<br> Деньги: %s<br> Деньги в банке: %s<br> Опыт: %s<br> Нераспределённые очки: %s<br> Текущая сессия: %s</span>';
                 echo sprintf($infoString, $this->id, $this->room, $this->money, $this->Bank->getMoney(), $this->experience, $this->free_stat_points, $this->session_id);
             }
-            $this->UserLogs = new UserLogModel($this->id);
+            $this->UserLogs = new \Battles\Models\UserLogModel($this->id);
             echo '<div class="secret-info-user-log"><b>Личное дело</b><br>';
             while ($userLogRow = $this->UserLogs->getUserLog()->fetch_object()) {
                 echo sprintf('<code>%s</code><br>', date("d.m.Y H:i ", strtotime($userLogRow->date)) . $userLogRow->text);
@@ -153,18 +153,18 @@ class UserInfo extends User
 
     public function showUserInfo()
     {
-        $this->effects = new EffectsModel($this->id);
+        $this->effects = new \Battles\Models\EffectsModel($this->id);
         $this->WatcherStatus();
 
         if ($this->block && (!$this->watcherIsAdmin || !$this->watcherIsModerator)) {
-            throw new Exception('<span class="error">Персонаж ' . $this->login . ' заблокирован!</span>');
+            throw new \Exceptions\GameException('<span class="error">Персонаж ' . $this->login . ' заблокирован!</span>');
         } elseif ($this->effects->getHideUserInfoStatus() && (!$this->watcherIsAdmin || !$this->watcherIsModerator)) {
             if ($this->effects->getHideUserInfoStatus() == -1) {
                 $date = 'навсегда';
             } else {
                 $date = 'до' . date('d.m.Y', strtotime($this->effects->getHideUserInfoStatus()));
             }
-            throw new Exception('<span class="error">Персонаж ' . $this->login . ' обезличен ' . $date . '.</span>');
+            throw new \Exceptions\GameException('<span class="error">Персонаж ' . $this->login . ' обезличен ' . $date . '.</span>');
         } else {
             $this->Info();
         }
diff --git a/classes/cave/CaveBots.php b/classes/Cave/CaveBots.php
similarity index 100%
rename from classes/cave/CaveBots.php
rename to classes/Cave/CaveBots.php
diff --git a/classes/cave/CaveItems.php b/classes/Cave/CaveItems.php
similarity index 100%
rename from classes/cave/CaveItems.php
rename to classes/Cave/CaveItems.php
diff --git a/classes/cave/lose.php b/classes/Cave/lose.php
similarity index 100%
rename from classes/cave/lose.php
rename to classes/Cave/lose.php
diff --git a/classes/cave/win.php b/classes/Cave/win.php
similarity index 100%
rename from classes/cave/win.php
rename to classes/Cave/win.php
diff --git a/Database/Exception.php b/classes/Database/Exception.php
similarity index 100%
rename from Database/Exception.php
rename to classes/Database/Exception.php
diff --git a/Database/Mysql.php b/classes/Database/Mysql.php
similarity index 100%
rename from Database/Mysql.php
rename to classes/Database/Mysql.php
diff --git a/Database/Statement.php b/classes/Database/Statement.php
similarity index 100%
rename from Database/Statement.php
rename to classes/Database/Statement.php
diff --git a/Database/battles.sql b/classes/Database/battles.sql
similarity index 100%
rename from Database/battles.sql
rename to classes/Database/battles.sql
diff --git a/Database/db.php b/classes/Database/db.php
similarity index 100%
rename from Database/db.php
rename to classes/Database/db.php
diff --git a/comission.php b/comission.php
index bcc02c7..3cb60ed 100644
--- a/comission.php
+++ b/comission.php
@@ -141,10 +141,10 @@ FROM `inventory` LEFT JOIN `magic` ON `magic` = `magic`.`id` WHERE `dressed` = 0
 
 $iteminfo = [];
 while ($row = $data->fetch_assoc()) {
-    $iteminfo[] = new ShopItem($row);
+    $iteminfo[] = new \Battles\ShopItem($row);
 }
 
-Template::header('Рынок');
+\Battles\Template::header('Рынок');
 ?>
 <script src="js/main.js"></script>
 <h1>Рынок</h1>
diff --git a/config.php b/config.php
index 830caaa..8552de3 100644
--- a/config.php
+++ b/config.php
@@ -18,24 +18,21 @@ header("Pragma: no-cache");
 /**
  * Классы для работы с базой данных.
  */
-require_once('Database/Mysql.php');
-require_once('Database/Exception.php');
-require_once('Database/Statement.php');
-require_once('Database/db.php');
+
+require_once 'classes/Database/Mysql.php';
+require_once 'classes/Database/Exception.php';
+require_once 'classes/Database/Statement.php';
+require_once 'classes/Database/db.php';
 
 /**
- * Автозагрузка классов.
+ * Автозагрузка классов с учётом неймспейсов.
  */
-spl_autoload_register(function ($class_name) {
-    $class_name .= '.php';
-    if (file_exists('classes/' . $class_name)) {
-        require_once 'classes/' . $class_name;
-    } elseif (file_exists('models/' . $class_name)) {
-        require_once 'models/' . $class_name;
-    } else {
-        throw new Exception(sprintf('Невозможно загрузить класс %s', $class_name));
-    }
 
+spl_autoload_register(function ($className){
+    $fileName = __DIR__ . '/classes/' . str_replace('\\', '/', $className . '.php');
+    if (file_exists($fileName)) {
+        require_once $fileName;
+    }
 });
 
 trait Config
@@ -206,5 +203,5 @@ trait Config
         1250000000 => [1, 0, 0, 450, 0, 1500000000],
         1500000000 => [10, 1, 5, 8000, 1, 9999999999], # Это тринадцатый уровень
     ];
-public static $cavedata = [621 => ['x1' => 6, 'y1' => 11, 'dir1' => 1, 'x2' => 10, 'y2' => 8, 'dir2' => 1, 'x3' => 20, 'y3' => 4, 'dir3' => 1, 'x4' => 10, 'y4' => 10, 'dir4' => 1, 'delay' => 360, 'name1' => 'Проклятый Рудник', 'name2' => 'Проклятого Рудника']];
+    public static $cavedata = [621 => ['x1' => 6, 'y1' => 11, 'dir1' => 1, 'x2' => 10, 'y2' => 8, 'dir2' => 1, 'x3' => 20, 'y3' => 4, 'dir3' => 1, 'x4' => 10, 'y4' => 10, 'dir4' => 1, 'delay' => 360, 'name1' => 'Проклятый Рудник', 'name2' => 'Проклятого Рудника']];
 }
\ No newline at end of file
diff --git a/enter.php b/enter.php
index be2622a..496652f 100644
--- a/enter.php
+++ b/enter.php
@@ -52,7 +52,7 @@ if ($username && $password) {
     $error = ERROR_EMPTY_CREDENTIALS;
 }
 
-Template::header('Входим...');
+\Battles\Template::header('Входим...');
 
 if ($error) {
     echo sprintf('<a href="/"> ← на главную</a><h1>%s</h1>', $error);
diff --git a/enter_cave.php b/enter_cave.php
index 06d1cd7..575490d 100644
--- a/enter_cave.php
+++ b/enter_cave.php
@@ -75,7 +75,7 @@ if (in_array($user->room, Config::$canalenters)) {
     $cavedata = [620 => ['x1' => 3, 'y1' => 2, 'dir1' => 2]];
     $podzemdata = [621 => ['name1' => 'Проклятый Рудник', 'name2' => 'Проклятого Рудника']];
     $warning = $_GET["warning"] ?? '';
-    Template::header('enter_cave');
+    \Battles\Template::header('enter_cave');
     if ($warning) {
         echo sprintf('<b style="color: #f80000">%s</b>', $warning);
     }
diff --git a/fbattle.php b/fbattle.php
index b8aee38..7d27ae4 100644
--- a/fbattle.php
+++ b/fbattle.php
@@ -21,7 +21,7 @@ if (isset($user['id'])) {
 include('./classes/battle_new.class.php');
 
 $fbattle = new fbattle($user['battle']);
-Template::header('fbattle');
+\Battles\Template::header('fbattle');
 ?>
     <script type="text/javascript" src="js/sl2.js"></script>
     <script type="text/javascript" src="js/ch.js"></script>
@@ -139,7 +139,7 @@ Template::header('fbattle');
                         <tr>
                             <td valign=top width=250 nowrap>
                                 <?php
-                                $myinfo = new User($_SESSION['uid']);
+                                $myinfo = new \Battles\User($_SESSION['uid']);
                                 $myinfo->showUserDoll(1);
                                 ?>
                             </td>
@@ -476,7 +476,7 @@ Template::header('fbattle');
                                     <?php
 
                                     if ($fbattle->return == 1) {
-                                        $enemyInfo = new User($fbattle->enemy);
+                                        $enemyInfo = new \Battles\User($fbattle->enemy);
                                         $enemyInfo->showUserDoll(1);
                                     } else {
                                         if ($fbattle->battle_data['type'] == 4 || $fbattle->battle_data['type'] == 5) {
diff --git a/fight.php b/fight.php
index 0dbf5b7..c0c94a0 100644
--- a/fight.php
+++ b/fight.php
@@ -4,6 +4,7 @@ if (empty($_SESSION['uid'])) {
     header("Location: index.php");
     exit;
 }
+
 require_once 'config.php';
 $userLoginStatus = db::c()->query('SELECT enter_game FROM users WHERE id = ?i', $_SESSION['uid'])->getNumRows() ?? 0;
 if (empty($userLoginStatus)) {
@@ -11,7 +12,8 @@ if (empty($userLoginStatus)) {
 } else {
     db::c()->query('UPDATE `users` SET `enter_game` = 0 WHERE `enter_game` = 1 AND `id` = ?i', $_SESSION['uid']);
 }
-Template::header('Окно игры');
+
+\Battles\Template::header('Окно игры');
 ?>
     <script>
         if (!navigator.cookieEnabled) {
diff --git a/forest.php b/forest.php
index 981846f..eb22d9e 100644
--- a/forest.php
+++ b/forest.php
@@ -118,7 +118,7 @@ if ($_GET['res']) {
         echo "&nbsp;<font style='font-size:12px; color:cc0000;'>Кто-то оказался быстрее!</font>";
     }
 }
-Template::header('Лес');
+\Battles\Template::header('Лес');
 ?>
 <script src="i/forest/char1.32.js"></script>
 <script src="i/forest/funcs1.6.js"></script>
diff --git a/forum.php b/forum.php
index 4caaa64..0045fe1 100644
--- a/forum.php
+++ b/forum.php
@@ -5,7 +5,7 @@ if (empty($_SESSION['uid'])) {
     header("Location: index.php");
     exit;
 }
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 $sleep = db::c()->query('SELECT `id` FROM `effects` WHERE `owner` = ?i AND `time` > ?i AND `type` = 3', $user['id'], time())->fetch_assoc();
 $ps = $_GET['page'] ?? 0;
 $isModerator = false;
@@ -206,7 +206,7 @@ if (isset($_GET['do']) && $isModerator == true) {
         exit();
     }
 }
-Template::header('Форум');
+\Battles\Template::header('Форум');
 ?>
     <link rel="stylesheet" href="css/wysibb/theme/default/wbbtheme.css"/>
     <script type="text/javascript" language="JavaScript" src='js/forum.js'></script>
diff --git a/functions.php b/functions.php
index b971ed2..18c307d 100644
--- a/functions.php
+++ b/functions.php
@@ -7,9 +7,9 @@
  */
 require_once 'config.php';
 if (empty($_SESSION['uid'])) {
-    throw new Exception('Не могу проинициализировать игрока!');
+    throw new \Exceptions\GameException('Не могу проинициализировать игрока!');
 }
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 if ($user->id && $user->block) {
     exit('user blocked!');
 }
diff --git a/game.php b/game.php
index b89515f..cd9efc3 100644
--- a/game.php
+++ b/game.php
@@ -12,7 +12,7 @@ if (empty($_SESSION['uid'])) header("Location: index.php");
 //$msg = filter_input(INPUT_POST,'msg');
 //$uid = $_SESSION['uid'];
 //if ($msg) db::c()->query('INSERT INTO `chat` (`cid`, `uid`, `msg`) VALUES (?i, ?i, "?s")', 1, $uid, $msg);
-Template::header('Окно игры');
+\Battles\Template::header('Окно игры');
 ?>
 <style>
     form {
diff --git a/game2.php b/game2.php
index dea6153..db47a98 100644
--- a/game2.php
+++ b/game2.php
@@ -12,7 +12,7 @@ if (empty($_SESSION['uid'])) header("Location: index.php");
 //$msg = filter_input(INPUT_POST,'msg');
 //$uid = $_SESSION['uid'];
 //if ($msg) db::c()->query('INSERT INTO `chat` (`cid`, `uid`, `msg`) VALUES (?i, ?i, "?s")', 1, $uid, $msg);
-Template::header('Окно игры');
+\Battles\Template::header('Окно игры');
 ?>
 <style>
     form {
diff --git a/gotzamok.php b/gotzamok.php
index 6b7b48b..9988cfd 100644
--- a/gotzamok.php
+++ b/gotzamok.php
@@ -96,7 +96,7 @@ if ($user->room == 40) {
         } else $status = 'Не хватает денег!';
     }
 }
-Template::header('Клановый замок');
+\Battles\Template::header('Клановый замок');
 ?>
     <script src="js/main.js"></script>
     <style>
diff --git a/group_arena.php b/group_arena.php
index 9726cd2..48547f3 100644
--- a/group_arena.php
+++ b/group_arena.php
@@ -204,7 +204,7 @@ if ($_GET['exit'] == 1) {
     header('Location: city.php');
 }
 
-Template::header('group_arena');
+\Battles\Template::header('group_arena');
 ?>
 <script>
     function growl(title, color, message, stycky) {
diff --git a/hell.php b/hell.php
index c05d7da..d75952e 100644
--- a/hell.php
+++ b/hell.php
@@ -42,7 +42,7 @@ $hr = new hellround;
 
 $mytrip = $hr->is_in_trip($user['id']);
 $tr = $hr->get_par($mytrip);
-Template::header('hell');
+\Battles\Template::header('hell');
 if ($mytrip > 0) {
 
     ?>
diff --git a/hostel.php b/hostel.php
index a34ae99..19d1cab 100644
--- a/hostel.php
+++ b/hostel.php
@@ -5,7 +5,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 include('config.php');
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 $hostel = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `type`, `time` FROM `hostel` WHERE `uid` = "' . $user['id'] . '" LIMIT 1'));
 #include('functions.php');
 $error = '';
@@ -154,7 +154,7 @@ if ($_GET['unsleep'] && $user['sleep'] > 0) {
     }
     header('Location: hostel.php');
 }
-Template::header('Хостел');
+\Battles\Template::header('Хостел');
 ?>
 <script src="js/ajaxLoad.js"></script>
 <? if (isset($hostel['id'])) { ?>
diff --git a/hostel_room.php b/hostel_room.php
index 14cbea6..a528844 100644
--- a/hostel_room.php
+++ b/hostel_room.php
@@ -334,7 +334,7 @@ if ($_GET['go_back'] == 1) {
     header('Location: hostel.php');
 }
 
-Template::header('hostel_room');
+\Battles\Template::header('hostel_room');
 ?>
     <script src="js/ajaxLoad.js"></script>
     <link rel="stylesheet" type="text/css" href="css/hostel.css"/>
diff --git a/index.php b/index.php
index 4e98413..e64a564 100644
--- a/index.php
+++ b/index.php
@@ -4,8 +4,8 @@ if ($_SESSION['uid']) {
     header('Location: fight.php');
     exit;
 }
-require_once './classes/Template.php';
-Template::header('Вход');
+require_once './classes/Battles/Template.php';
+\Battles\Template::header('Вход');
 ?>
 <h1>Демонстрационная версия</h1>
 <div>
diff --git a/inf.php b/inf.php
index 4fceade..05509f6 100644
--- a/inf.php
+++ b/inf.php
@@ -2,11 +2,11 @@
 session_start();
 include_once 'config.php';
 $login = urldecode($_SERVER['QUERY_STRING']) ?? '';
-$userInfo = new UserInfo($login);
-$presentsModel = new PresentsModel($userInfo->id);
+$userInfo = new \Battles\UserInfo($login);
+$presentsModel = new \Battles\Models\PresentsModel($userInfo->id);
 $presentsList = $presentsModel->getAllPresents();
 $userInfo->watcher_id = $_SESSION['uid'] ?? null;
-Template::header('Информация о ' . $userInfo->login);
+\Battles\Template::header('Информация о ' . $userInfo->login);
 if (!$userInfo->id) {
     echo sprintf('Ошибка: персонаж <em>%s</em> не найден...<p><a style="color: #99f;" href="javascript:window.history.go(-1);">←назад</a></p>', $login);
     exit;
diff --git a/lab.php b/lab.php
index 11cf772..0cbf190 100644
--- a/lab.php
+++ b/lab.php
@@ -371,7 +371,7 @@ if ((time() - $_SESSION['time']) > 3) {
 } else {
     $tt = (time() - $_SESSION['time']);
 }
-Template::header('lab');
+\Battles\Template::header('lab');
 
 echo Nick::id($user)->battle();
 echo " <a href=\"#\" onclick=\"javascript:if (confirm('Желаете выбраться из квестового лабиринта? Теряете все, что здесь нашли.')){ location.href='lab.php?eexit=1';}\">Выйти?</a>";
diff --git a/lab2.php b/lab2.php
index e02534c..720a02d 100644
--- a/lab2.php
+++ b/lab2.php
@@ -369,7 +369,7 @@ if ((time() - $_SESSION['time']) > 3) {
 } else {
     $tt = (time() - $_SESSION['time']);
 }
-Template::header('lab2');
+\Battles\Template::header('lab2');
 
 echo Nick::id($user)->battle();
 echo " <a href=\"#\" onclick=\"javascript:if (confirm('Желаете выбраться из лабиринта? Теряете все что здесь нашли.')){ location.href='lab.php?eexit=1';}\">Выйти?</a>";
diff --git a/lab_enter.php b/lab_enter.php
index ae45275..210f730 100644
--- a/lab_enter.php
+++ b/lab_enter.php
@@ -299,7 +299,7 @@ if ($user->room == 1051) {
             header('Location: labirint.php');
         }
     }
-    Template::header('Вход в Лабиринты');
+    \Battles\Template::header('Вход в Лабиринты');
     ?>
     <div style="float: right;">
         <input type="button" onclick="location.href='lab_enter.php';" value="Обновить">
diff --git a/labirint.php b/labirint.php
index a3c543b..c74b7b3 100644
--- a/labirint.php
+++ b/labirint.php
@@ -469,7 +469,7 @@ if ($user->room == 1052) {
         $effed .= '<div><img width="40" height="25" src="/i/sh/event_timer_trap.gif" /> - Время перехода +3 секунды (Осталось : ' . timeOut($varos['trap1']['time'] - time()) . ')</div>';
     }
     unset($varos);
-    Template::header('labirint');
+    \Battles\Template::header('labirint');
     ?>
     <script type="text/javascript" src="js/jquery.js"></script>
     <script>
diff --git a/library.php b/library.php
index 437af60..faab5d3 100644
--- a/library.php
+++ b/library.php
@@ -14,7 +14,7 @@ if ($user->battle) {
     header('location: fbattle.php');
     exit;
 }
-Template::header('Библиотека Просвещения');
+\Battles\Template::header('Библиотека Просвещения');
 ?>
     <TABLE border=0 width=600 cellspacing="0" cellpadding="0" align=left>
 
diff --git a/logs.php b/logs.php
index acb32d7..6d26da6 100644
--- a/logs.php
+++ b/logs.php
@@ -4,7 +4,7 @@ $_REQUEST['log'] = $_REQUEST['log'] ?? 0;
 require_once "functions.php";
 $data = mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id` = '" . $_REQUEST['log'] . "'"));
 $log = file("backup/logs/battle" . $_REQUEST['log'] . ".txt");
-Template::header('Лог поединка');
+\Battles\Template::header('Лог поединка');
 ?>
 <H3>Лог поединка</H3>
 <FORM>
diff --git a/magic/Healing.php b/magic/Healing.php
index d4f91ad..9b7c56b 100644
--- a/magic/Healing.php
+++ b/magic/Healing.php
@@ -1,7 +1,7 @@
 <?php
 // Магия восстагновления здоровья
-
-class Healing extends Magic
+use Battles\User;
+class Healing extends magic
 {
     private $target;
     private $magicPower;
diff --git a/magic/elem_ally_air.php b/magic/elem_ally_air.php
index 3453c8b..7dd65f5 100644
--- a/magic/elem_ally_air.php
+++ b/magic/elem_ally_air.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_ally_earth.php b/magic/elem_ally_earth.php
index 0cc99a4..5516be3 100644
--- a/magic/elem_ally_earth.php
+++ b/magic/elem_ally_earth.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_ally_fire.php b/magic/elem_ally_fire.php
index a3eb0d7..1566573 100644
--- a/magic/elem_ally_fire.php
+++ b/magic/elem_ally_fire.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_ally_water.php b/magic/elem_ally_water.php
index c76c808..e39bade 100644
--- a/magic/elem_ally_water.php
+++ b/magic/elem_ally_water.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_foe_air.php b/magic/elem_foe_air.php
index 28f7183..5d0f339 100644
--- a/magic/elem_foe_air.php
+++ b/magic/elem_foe_air.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_foe_fire.php b/magic/elem_foe_fire.php
index 471aca7..ba98348 100644
--- a/magic/elem_foe_fire.php
+++ b/magic/elem_foe_fire.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elem_foe_water.php b/magic/elem_foe_water.php
index d6c135e..c44fec9 100644
--- a/magic/elem_foe_water.php
+++ b/magic/elem_foe_water.php
@@ -9,7 +9,7 @@ if (empty($_SESSION['uid'])) {
 if ($user['battle'] == 0) {
 	echo "Это боевая магия...";
 } else {
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '16' ;"));
 	if ($user['intel'] >= 8) {
 		$int=$magic['chanse'] + ($user['intel'] - 8)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/elikbroni.php b/magic/elikbroni.php
index ed4f6f1..fa5f26b 100644
--- a/magic/elikbroni.php
+++ b/magic/elikbroni.php
@@ -1,6 +1,6 @@
 <?php
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '76' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '76' ;"));
 $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '205' LIMIT 1;")); 
       
 if ($user['intel'] >= 0) {
diff --git a/magic/elikurona.php b/magic/elikurona.php
index 4534774..086e31e 100644
--- a/magic/elikurona.php
+++ b/magic/elikurona.php
@@ -1,7 +1,7 @@
 <?php
 
     $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_escape_string($_POST['target'])."' LIMIT 1;"));    
-    $magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '77' ;"));  
+    $magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '77' ;"));
     $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '204' LIMIT 1;")); 
 
     if ($user['intel'] >= 0) {
diff --git a/magic/ident.php b/magic/ident.php
index 94c4ec4..7bf74a9 100644
--- a/magic/ident.php
+++ b/magic/ident.php
@@ -4,7 +4,7 @@ if ($user['battle'] > 0) {
 	echo "Не в бою...";
 } else {
 
-	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '3' ;"));			
+	$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '3' ;"));
 	if ($user['intel'] >= 2) {
 		$int=$magic['chanse'] + ($user['intel'] - 2)*3;
 		if ($int>98){$int=99;}
diff --git a/magic/incmagic.php b/magic/incmagic.php
index b5773ba..b94ac1a 100644
--- a/magic/incmagic.php
+++ b/magic/incmagic.php
@@ -9,7 +9,7 @@ $forbidden=array("1","2","3","7","6","8","18","19","20","21","22","43","46","47"
  "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", 
  "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120", "121",
   "122", "123", "124", "125", "126", "127", "128", "129", "130", "131", "132", "133", "134", "135", "136", "137", "138","139",);
-// magic 
+// magic
 // встраивание магии
 if ($user['battle'] > 0) {
 	echo "Не в бою...";
@@ -47,7 +47,7 @@ if ($user['battle'] > 0) {
 						".($dress['ngray']<$svitok['ngray']?"`ngray`='".$svitok['ngray']."',":"")."
 						".($dress['ndark']<$svitok['ndark']?"`ndark`='".$svitok['ndark']."',":"")."
 						".($dress['nlight']<$svitok['nlight']?"`nlevel`='".$svitok['nlight']."',":"")."						
-						`massa`=`massa`+1,`cost`=`cost`+'".$svitok['cost']."', `includemagic` = '".$svitok['magic']."', `includemagicdex` = '".$svitok['maxdur']."', `includemagicmax` = '".$svitok['maxdur']."', `includemagicname` = '".$svitok['name']."', `includemagicuses` = '100+".$user['intel']."', `includemagiccost` = '".($svitok['cost']/2)."' WHERE `id` = '{$dress['id']}' LIMIT 1;");	
+						`massa`=`massa`+1,`cost`=`cost`+'".$svitok['cost']."', `includemagic` = '".$svitok['magic']."', `includemagicdex` = '".$svitok['maxdur']."', `includemagicmax` = '".$svitok['maxdur']."', `includemagicname` = '".$svitok['name']."', `includemagicuses` = '100+".$user['intel']."', `includemagiccost` = '".($svitok['cost']/2)."' WHERE `id` = '{$dress['id']}' LIMIT 1;");
 					$bet=1;
 				}
 			}
diff --git a/magic/luck.php b/magic/luck.php
index e85e61a..49ba4ea 100644
--- a/magic/luck.php
+++ b/magic/luck.php
@@ -19,7 +19,7 @@ $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `
 <?php*/
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '22' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '22' ;"));
 $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '203' LIMIT 1;")); 
    if($user['invis'] == 1) { $user['login'] = '<b><i>невидимка</i></b>'; }
 
diff --git a/magic/sleep15.php b/magic/sleep15.php
index 0ae9f98..ea78da3 100644
--- a/magic/sleep15.php
+++ b/magic/sleep15.php
@@ -1,7 +1,7 @@
 <?php
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));		
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '14' ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '14' ;"));
 $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '2' LIMIT 1;")); 
 			
 if ($user['intel'] >= 1) {
diff --git a/magic/sleep30.php b/magic/sleep30.php
index 263ab31..7296ffd 100644
--- a/magic/sleep30.php
+++ b/magic/sleep30.php
@@ -1,7 +1,7 @@
 <?php
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));		
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '15' ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '15' ;"));
 $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '2' LIMIT 1;")); 
 
 if ($user['intel'] >= 1) {
diff --git a/magic/stop.php b/magic/stop.php
index c5c4469..b4c1b2c 100644
--- a/magic/stop.php
+++ b/magic/stop.php
@@ -28,7 +28,7 @@ if (($user->room > 2000) && ($user->room < 2100)) {echo "Не в Проходе.
 						
 						$messch="Персонаж &quot;{$user['login']}&quot; $action путы на &quot;$target&quot;";
 						
-						addch("<img src=i/magic/chains.gif> $messch");						
+						addch("<img src=i/magic/chains.gif> $messch");
 						echo "<font color=red><b>Вы наложили путы на персонажа \"$target\"</b></font>";	
 						$bet=1;
 					} 
diff --git a/magic/stop_200.php b/magic/stop_200.php
index f8fdd58..7f13bd1 100644
--- a/magic/stop_200.php
+++ b/magic/stop_200.php
@@ -28,7 +28,7 @@ if (($user->room > 2000) && ($user->room < 2100)) {echo "Не в Проходе.
 						
 						$messch="Персонаж &quot;{$user['login']}&quot; $action &quot;$target&quot;";
 						
-						addch("<img src=i/magic/chains.gif> $messch");						
+						addch("<img src=i/magic/chains.gif> $messch");
 						echo "<font color=red><b>Вы парализовали персонажа \"$target\"</b></font>";	
 						$bet=1;
 					} 
diff --git a/magic/wis_air_def1.php b/magic/wis_air_def1.php
index e39a585..fc292c2 100644
--- a/magic/wis_air_def1.php
+++ b/magic/wis_air_def1.php
@@ -10,7 +10,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_air_def2.php b/magic/wis_air_def2.php
index 4e8c0e5..f94afef 100644
--- a/magic/wis_air_def2.php
+++ b/magic/wis_air_def2.php
@@ -10,7 +10,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_air_def3.php b/magic/wis_air_def3.php
index 575652f..dec01ed 100644
--- a/magic/wis_air_def3.php
+++ b/magic/wis_air_def3.php
@@ -10,7 +10,7 @@ $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_air_h1.php b/magic/wis_air_h1.php
index 1acafba..988d7f5 100644
--- a/magic/wis_air_h1.php
+++ b/magic/wis_air_h1.php
@@ -17,7 +17,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_air_m1.php b/magic/wis_air_m1.php
index 51ca856..4614535 100644
--- a/magic/wis_air_m1.php
+++ b/magic/wis_air_m1.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_air_m2.php b/magic/wis_air_m2.php
index 97ddf97..5dad328 100644
--- a/magic/wis_air_m2.php
+++ b/magic/wis_air_m2.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_air_m3.php b/magic/wis_air_m3.php
index b511f6f..336fe7a 100644
--- a/magic/wis_air_m3.php
+++ b/magic/wis_air_m3.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_air_o1.php b/magic/wis_air_o1.php
index 98c57f4..ff92f04 100644
--- a/magic/wis_air_o1.php
+++ b/magic/wis_air_o1.php
@@ -11,7 +11,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205","206","207","208","209","210","211","212","213","214");
diff --git a/magic/wis_air_o2.php b/magic/wis_air_o2.php
index d6be159..a916dce 100644
--- a/magic/wis_air_o2.php
+++ b/magic/wis_air_o2.php
@@ -12,7 +12,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205","206","207","208","209","210","211","212","213","214");
diff --git a/magic/wis_air_o3.php b/magic/wis_air_o3.php
index 6f154a6..49076e5 100644
--- a/magic/wis_air_o3.php
+++ b/magic/wis_air_o3.php
@@ -12,7 +12,7 @@ $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205","206","207","208","209","210","211","212","213","214");
diff --git a/magic/wis_air_t1.php b/magic/wis_air_t1.php
index 27c2d1d..43c3314 100644
--- a/magic/wis_air_t1.php
+++ b/magic/wis_air_t1.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_air_t2.php b/magic/wis_air_t2.php
index 55a8444..97f2446 100644
--- a/magic/wis_air_t2.php
+++ b/magic/wis_air_t2.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_air_t3.php b/magic/wis_air_t3.php
index 88ea6fe..d6ea827 100644
--- a/magic/wis_air_t3.php
+++ b/magic/wis_air_t3.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_earth_def1.php b/magic/wis_earth_def1.php
index 49967d2..0d757be 100644
--- a/magic/wis_earth_def1.php
+++ b/magic/wis_earth_def1.php
@@ -10,7 +10,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_earth_def2.php b/magic/wis_earth_def2.php
index 2d76f8b..eb695d2 100644
--- a/magic/wis_earth_def2.php
+++ b/magic/wis_earth_def2.php
@@ -10,7 +10,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_earth_def3.php b/magic/wis_earth_def3.php
index f2d2d90..35324b0 100644
--- a/magic/wis_earth_def3.php
+++ b/magic/wis_earth_def3.php
@@ -9,7 +9,7 @@ $mag_id=131;
 $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;")); 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_earth_g1.php b/magic/wis_earth_g1.php
index 34c8901..544c356 100644
--- a/magic/wis_earth_g1.php
+++ b/magic/wis_earth_g1.php
@@ -12,7 +12,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_earth_g2.php b/magic/wis_earth_g2.php
index a8de35f..aaa70b0 100644
--- a/magic/wis_earth_g2.php
+++ b/magic/wis_earth_g2.php
@@ -11,7 +11,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_earth_g3.php b/magic/wis_earth_g3.php
index a9202a8..73fc022 100644
--- a/magic/wis_earth_g3.php
+++ b/magic/wis_earth_g3.php
@@ -10,7 +10,7 @@ $mag_id=83;
 $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;")); 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_earth_k1.php b/magic/wis_earth_k1.php
index d9b9cbd..16e946a 100644
--- a/magic/wis_earth_k1.php
+++ b/magic/wis_earth_k1.php
@@ -17,7 +17,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_earth_k2.php b/magic/wis_earth_k2.php
index e4aa718..b6d1ada 100644
--- a/magic/wis_earth_k2.php
+++ b/magic/wis_earth_k2.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_earth_k3.php b/magic/wis_earth_k3.php
index dc04aad..404497a 100644
--- a/magic/wis_earth_k3.php
+++ b/magic/wis_earth_k3.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_earth_m1.php b/magic/wis_earth_m1.php
index 2bc640c..dbf7a69 100644
--- a/magic/wis_earth_m1.php
+++ b/magic/wis_earth_m1.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_earth_m2.php b/magic/wis_earth_m2.php
index 663c3cf..df6fbb3 100644
--- a/magic/wis_earth_m2.php
+++ b/magic/wis_earth_m2.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_earth_m3.php b/magic/wis_earth_m3.php
index a2a2af3..99a17ab 100644
--- a/magic/wis_earth_m3.php
+++ b/magic/wis_earth_m3.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_fire_def1.php b/magic/wis_fire_def1.php
index b5f4d15..55c3339 100644
--- a/magic/wis_fire_def1.php
+++ b/magic/wis_fire_def1.php
@@ -9,7 +9,7 @@ $mag_id=132;
 $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;")); 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_fire_def2.php b/magic/wis_fire_def2.php
index 2ab939c..9c181a5 100644
--- a/magic/wis_fire_def2.php
+++ b/magic/wis_fire_def2.php
@@ -9,7 +9,7 @@ $mag_id=133;
 $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;")); 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_fire_def3.php b/magic/wis_fire_def3.php
index 71fff96..f39eb0e 100644
--- a/magic/wis_fire_def3.php
+++ b/magic/wis_fire_def3.php
@@ -9,7 +9,7 @@ $mag_id=134;
 $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;"));$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;"));
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_fire_i1.php b/magic/wis_fire_i1.php
index 809969e..2576bca 100644
--- a/magic/wis_fire_i1.php
+++ b/magic/wis_fire_i1.php
@@ -10,7 +10,7 @@ $mag_id=84;
 $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;")); 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_fire_i2.php b/magic/wis_fire_i2.php
index d1c0163..a82bd2f 100644
--- a/magic/wis_fire_i2.php
+++ b/magic/wis_fire_i2.php
@@ -11,7 +11,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_fire_i3.php b/magic/wis_fire_i3.php
index a06f349..812f96a 100644
--- a/magic/wis_fire_i3.php
+++ b/magic/wis_fire_i3.php
@@ -10,7 +10,7 @@ $mag_id=86;
 $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;"));$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory` WHERE `prototype`='{$book}' AND `owner`='{$user['id']}' LIMIT 1;"));
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_fire_p1.php b/magic/wis_fire_p1.php
index 4540002..7dbf68f 100644
--- a/magic/wis_fire_p1.php
+++ b/magic/wis_fire_p1.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_fire_p2.php b/magic/wis_fire_p2.php
index ec32389..37bbb24 100644
--- a/magic/wis_fire_p2.php
+++ b/magic/wis_fire_p2.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_fire_p3.php b/magic/wis_fire_p3.php
index bd4b6e8..b3ae75d 100644
--- a/magic/wis_fire_p3.php
+++ b/magic/wis_fire_p3.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_fire_v1.php b/magic/wis_fire_v1.php
index ca0716c..5a578e0 100644
--- a/magic/wis_fire_v1.php
+++ b/magic/wis_fire_v1.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_fire_v2.php b/magic/wis_fire_v2.php
index 1534ddf..731d348 100644
--- a/magic/wis_fire_v2.php
+++ b/magic/wis_fire_v2.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_fire_v3.php b/magic/wis_fire_v3.php
index d14a67c..e217df0 100644
--- a/magic/wis_fire_v3.php
+++ b/magic/wis_fire_v3.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_water_ch1.php b/magic/wis_water_ch1.php
index a6fa825..f371f24 100644
--- a/magic/wis_water_ch1.php
+++ b/magic/wis_water_ch1.php
@@ -11,7 +11,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_water_ch2.php b/magic/wis_water_ch2.php
index d282803..1db0516 100644
--- a/magic/wis_water_ch2.php
+++ b/magic/wis_water_ch2.php
@@ -11,7 +11,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_water_ch3.php b/magic/wis_water_ch3.php
index d07e66a..69a889b 100644
--- a/magic/wis_water_ch3.php
+++ b/magic/wis_water_ch3.php
@@ -11,7 +11,7 @@ $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));
 $mag_def="`type` = '203'";
 $md_arr=array("204","205",
diff --git a/magic/wis_water_def1.php b/magic/wis_water_def1.php
index 6247ec3..5666e17 100644
--- a/magic/wis_water_def1.php
+++ b/magic/wis_water_def1.php
@@ -10,7 +10,7 @@ $book=866;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_water_def2.php b/magic/wis_water_def2.php
index c6c4d9c..81ae1a5 100644
--- a/magic/wis_water_def2.php
+++ b/magic/wis_water_def2.php
@@ -10,7 +10,7 @@ $book=908;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_water_def3.php b/magic/wis_water_def3.php
index 354255f..6578f17 100644
--- a/magic/wis_water_def3.php
+++ b/magic/wis_water_def3.php
@@ -10,7 +10,7 @@ $book=909;$have_book=mysql_fetch_array(mysql_query("SELECT `id` FROM `inventory`
 
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' ;"));
 
 $mag_def="`type` = '215'";
 $md_arr=array("216","217","218","219","220","221","222","223","224","225","226");
diff --git a/magic/wis_water_o1.php b/magic/wis_water_o1.php
index 6f149d1..6c4573c 100644
--- a/magic/wis_water_o1.php
+++ b/magic/wis_water_o1.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_water_o2.php b/magic/wis_water_o2.php
index a7748b4..1bd5000 100644
--- a/magic/wis_water_o2.php
+++ b/magic/wis_water_o2.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_water_o3.php b/magic/wis_water_o3.php
index 8ad5fb1..6632c25 100644
--- a/magic/wis_water_o3.php
+++ b/magic/wis_water_o3.php
@@ -15,7 +15,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `real_time` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));		
 if(!$us) $bot= mysql_fetch_array(mysql_query ("SELECT * FROM `bots` WHERE `name` = '".$_POST['target']."' LIMIT 1;"));
 //mana needed
diff --git a/magic/wis_water_tr1.php b/magic/wis_water_tr1.php
index 5591da3..8099bdd 100644
--- a/magic/wis_water_tr1.php
+++ b/magic/wis_water_tr1.php
@@ -17,7 +17,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_water_tr2.php b/magic/wis_water_tr2.php
index c40ede6..5e6cd62 100644
--- a/magic/wis_water_tr2.php
+++ b/magic/wis_water_tr2.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/wis_water_tr3.php b/magic/wis_water_tr3.php
index cc10208..a7b376b 100644
--- a/magic/wis_water_tr3.php
+++ b/magic/wis_water_tr3.php
@@ -16,7 +16,7 @@ if (empty($_SESSION['uid'])) {
     exit;
 }
 
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));	
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '{$mag_id}' LIMIT 1 ;"));
 $bat=mysql_fetch_array(mysql_query("SELECT * FROM `battle` WHERE `id`='{$user['battle']}';"));	
 //mana needed
 $t1 = explode(";",$bat['t1']);
diff --git a/magic/zz.php b/magic/zz.php
index 47df315..379ce1f 100644
--- a/magic/zz.php
+++ b/magic/zz.php
@@ -1,6 +1,6 @@
 <?php
 $us = mysql_fetch_array(mysql_query("SELECT *,(select `id` from `online` WHERE `date` >= ".(time()-60)." AND `id` = users.`id`) as `online`  FROM `users` WHERE `login` = '".$_POST['target']."' LIMIT 1;"));    
-$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '405' ;"));  
+$magic = mysql_fetch_array(mysql_query("SELECT `chanse` FROM `magic` WHERE `id` = '405' ;"));
 $magic_need = mysql_fetch_array(mysql_query("SELECT `nintel`,`nlevel`,`ngray`,`name`,`img` FROM `inventory` WHERE `id` = '".$_GET['use']."' ;"));  
 $effect = mysql_fetch_array(mysql_query("SELECT `time` FROM `effects` WHERE `owner` = '{$us['id']}' and `type` = '405' LIMIT 1;")); 
       
diff --git a/main.php b/main.php
index 3a996bc..c2da4e8 100644
--- a/main.php
+++ b/main.php
@@ -40,13 +40,13 @@ $ids = $_GET['ids'] ?? null;
 $setShadow = $_POST['setshadow'] ?? null;
 $edit = $_GET['edit'] ?? null;
 // Подготавливаем отображение инфы и предметов.
-$userInfo = new UserInfo($user->id);
-$getItemsBonuses = new DressedItems($_SESSION['uid']);
+$userInfo = new \Battles\UserInfo($user->id);
+$getItemsBonuses = new \Battles\DressedItems($_SESSION['uid']);
 $data_query = 'SELECT * FROM inventory WHERE owner_id = ?i AND dressed_slot = 0 AND on_sale = 0';
 $data = db::c()->query($data_query, $_SESSION['uid']);
 $iteminfo = [];
 while ($row = $data->fetch_assoc()) {
-    $iteminfo[] = new InventoryItem($row);
+    $iteminfo[] = new \Battles\InventoryItem($row);
 }
 
 //Обработчики нажатий на кнопки.
@@ -378,7 +378,7 @@ if ($mfs && $ids) {
     }
 }
 if ($setShadow) {
-    Template::header('Образ персонажа');
+    \Battles\Template::header('Образ персонажа');
     ?>
     <div style="text-align: right;">
         <input type=button value="Вернуться" onClick="location.href='main.php?edit=<?= mt_rand() ?>';" class="button">
@@ -429,7 +429,7 @@ if ($edit) {
         addOnePoint($upm, 'mastery');
     }
     if ($drop) {
-        $items = new DressedItems($_SESSION['uid']);
+        $items = new \Battles\DressedItems($_SESSION['uid']);
         $items->undressItem($drop);
     }
     //Пока что одеваем предмет отсюда.
@@ -458,7 +458,7 @@ if ($edit) {
         undressall($_SESSION['uid']);
     }
 }
-Template::header('Игра');
+\Battles\Template::header('Игра');
 ?>
 <script src="js/funcs.js"></script>
 <script>
diff --git a/module_quest.php b/module_quest.php
index 1b21b04..a28a080 100644
--- a/module_quest.php
+++ b/module_quest.php
@@ -23,7 +23,7 @@ $qsee = '';
 $qx = 0;
 $error = '';
 
-Template::header('module_quest');
+\Battles\Template::header('module_quest');
 ?>
 <link rel="stylesheet" href="css/hostel.css"/>
 <?php
diff --git a/podzem_dialog.php b/podzem_dialog.php
index 112ce6d..fc662d3 100644
--- a/podzem_dialog.php
+++ b/podzem_dialog.php
@@ -16,7 +16,7 @@ $fd = mysql_fetch_array($df);
 $cd = mysql_query("select `n18` from `podzem3` where `glava`='" . $fd['glava'] . "' and `name`='Канализация 1 этаж'");
 $vb = mysql_fetch_array($cd);
 if ($fd['location'] == '28' and $fd['name'] == 'Канализация 1 этаж' and $vb['n18'] == '8') {
-    Template::header('Подземелье Луки');
+    \Battles\Template::header('Подземелье Луки');
     ?>
     <div id=hint3 class=ahint></div>
     <TABLE width=100% cellspacing=0 cellpadding=0 border=0>
@@ -24,7 +24,7 @@ if ($fd['location'] == '28' and $fd['name'] == 'Канализация 1 эта
             <TD valign=top>
                 <div style="width: 250px; text-align: center;">
                     <?php
-                    $userInfo = new User($_SESSION['uid']);
+                    $userInfo = new \Battles\User($_SESSION['uid']);
                     $userInfo->showUserDoll();
                     ?>
                 </div>
@@ -791,7 +791,7 @@ if ($fd['location'] == '28' and $fd['name'] == 'Канализация 1 эта
                 $bot = "Лука";
                 $buser = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '$bot' LIMIT 1;"));
                 //FIXME Этот класс не умеет работать с ботами! Этот вызов - заглушка!
-                $botInfo = new User('Лука');
+                $botInfo = new \Battles\User('Лука');
                 $botInfo->showUserDoll();
                 ?>
             </TD>
diff --git a/post.php b/post.php
index d8e5c5b..d38b3f4 100644
--- a/post.php
+++ b/post.php
@@ -62,11 +62,11 @@ if ($_SESSION['receiverName']) {
 
         $queryItems = db::c()->query('SELECT * FROM inventory WHERE dressed_slot = 0 AND on_sale = 0 AND owner_id = ?i', $user->id);
         while ($row = $queryItems->fetch_assoc()) {
-            $iteminfo[] = new InventoryItem($row);
+            $iteminfo[] = new \Battles\InventoryItem($row);
         }
     }
 }
-Template::header('Почта');
+\Battles\Template::header('Почта');
 ?>
 <div style="float: right">
     <button onclick="top.frames['gameframe'].location = 'city.php?cp'">Вернуться</button>
diff --git a/presents.php b/presents.php
index e16a5fe..1df19cf 100644
--- a/presents.php
+++ b/presents.php
@@ -17,7 +17,7 @@ session_start();
 if ($_SESSION['uid'] != 2) header("Location: index.php");
 require_once 'config.php';
 
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 $status = '';
 $dirname = "i/presents/";
 $images = glob($dirname . "*.png");
@@ -62,7 +62,7 @@ if (!empty($_POST['sendAction'])) {
     db::c()->query('INSERT INTO `telegraph` (receiver, text) VALUES (?i,"?s")', $receiver['id'], $telegraphText);
     $status = "Подарок удачно доставлен к {$_POST['receiver']}! Вы потратили <b>{$cost}</b> кр.";
 }
-Template::header('Дарильня');
+\Battles\Template::header('Дарильня');
 ?>
 <script src="js/main.js"></script>
 <style>
diff --git a/quest_room.php b/quest_room.php
index c6ce1cb..369f3a6 100644
--- a/quest_room.php
+++ b/quest_room.php
@@ -54,7 +54,7 @@ function info_quest($id)
 if (!empty($q->error)) {
     $status = $q->error;
 }
-Template::header('Памятник');
+\Battles\Template::header('Памятник');
 ?>
 <div style="float: right;">
     <?php if (($user->level < 5 || $user->admin) && $user->health < $user->maxHealth): ?>
diff --git a/register.php b/register.php
index b427880..0aabe52 100644
--- a/register.php
+++ b/register.php
@@ -33,7 +33,7 @@ if ($_COOKIE[GAMEDOMAIN] ?? null) {
         }
     }
 }
-Template::header('Регистрация персонажа');
+\Battles\Template::header('Регистрация персонажа');
 ?>
     <a href="/"> ← на главную</a>
 <?php if ($error ?? null): ?>
diff --git a/rememberpassword.php b/rememberpassword.php
index ec0ca42..4b63c21 100644
--- a/rememberpassword.php
+++ b/rememberpassword.php
@@ -72,7 +72,7 @@ if ($newPassword && $hashCheck) {
         $statusMessage = ERROR_WRONG_HASH;
     }
 }
-Template::header('Восстановление пароля');
+\Battles\Template::header('Восстановление пароля');
 ?>
     <a href="/"> ← на главную</a>
 <?php if (!empty($statusMessage)): ?>
diff --git a/repair.php b/repair.php
index 91a9c61..35b5185 100644
--- a/repair.php
+++ b/repair.php
@@ -74,7 +74,7 @@ if ($goto == 'remont') {
 if ($goto == 'gravirovka') {
     $gravirovka_query = db::c()->query('SELECT `id`,`name`,`img`,`text` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 0 AND `type` = 3  AND `name` NOT LIKE "?S" AND `setsale` = 0 OR `text` <> "?s" AND `owner` = ?i AND `dressed` = 0 AND `setsale` = 0 ORDER by `update` DESC', $_SESSION['uid'], '%Букет%', '', $_SESSION['uid']);
 }
-Template::header('Кузня');
+\Battles\Template::header('Кузня');
 ?>
     <link href="css/secondary.css" rel="stylesheet"/>
     <script src="js/main.js"></script>
diff --git a/shop.php b/shop.php
index 58ef91a..2d94636 100644
--- a/shop.php
+++ b/shop.php
@@ -105,7 +105,7 @@ FROM `shop` LEFT JOIN `magic` ON `magic` = `magic`.`id` WHERE `count` > 0 AND `c
 
     $iteminfo = [];
     while ($row = $shopItems->fetch_assoc()) {
-        $iteminfo[] = new ShopItem($row);
+        $iteminfo[] = new \Battles\ShopItem($row);
     }
 } else {
     $inventoryItems = db::c()->query('SELECT `inventory`.*,
@@ -125,7 +125,7 @@ ORDER BY `update` DESC', null, $_SESSION['uid']);
 
     $iteminfo = [];
     while ($row = $inventoryItems->fetch_assoc()) {
-        $iteminfo[] = new ShopItem($row);
+        $iteminfo[] = new \Battles\ShopItem($row);
     }
 
 }
@@ -248,7 +248,7 @@ if (!empty($_GET['buy'])) {
         $status = "Недостаточно денег или нет вещей в наличии.";
     }
 }
-Template::header('Магазин');
+\Battles\Template::header('Магазин');
 ?>
     <script src="js/main.js"></script>
 <h1>Государственный магазин</h1>
diff --git a/top_menu.php b/top_menu.php
index f0e7c8a..60a3d1c 100644
--- a/top_menu.php
+++ b/top_menu.php
@@ -1,6 +1,6 @@
 <?php
-require_once 'classes/Template.php';
-Template::header('top_menu') ?>
+require_once 'classes/Battles/Template.php';
+\Battles\Template::header('top_menu') ?>
 <style>
     * {
         margin: 0;
diff --git a/tournament.php b/tournament.php
index 0976337..f173613 100644
--- a/tournament.php
+++ b/tournament.php
@@ -12,7 +12,7 @@ if ($user->battle) {
     exit;
 }
 $Tournament = new Tournament();
-Template::header('Турниры');
+\Battles\Template::header('Турниры');
 ?>
 <META HTTP-EQUIV="REFRESH" CONTENT="10">
 <div style='color:#8F0000; font-weight:bold; font-size:16px; text-align:center; float:left;'>Турнирная</div>
diff --git a/tower.php b/tower.php
index bf7d526..90da4d2 100644
--- a/tower.php
+++ b/tower.php
@@ -98,7 +98,7 @@ if ($_GET['st'] == 'startmegaturnirnow') {
 }
 $tr = $bania->get_turnir();
 $bania->get_fond();
-Template::header('Башня смерти')
+\Battles\Template::header('Башня смерти')
 ?>
 <table border=0 width=100% cellspacing="0" cellpadding="0">
     <td align=right>
diff --git a/towerin.php b/towerin.php
index 4e70d71..ad140e2 100644
--- a/towerin.php
+++ b/towerin.php
@@ -275,7 +275,7 @@ if ($user['hp'] <= 0) {
     header('Location: tower.php');
     exit;
 }
-Template::header('towerin');
+\Battles\Template::header('towerin');
 ?>
 <script>
     let Hint3Name = '';
diff --git a/towerlog.php b/towerlog.php
index d6372ef..f87e12a 100644
--- a/towerlog.php
+++ b/towerlog.php
@@ -1,5 +1,5 @@
 <?php
 require_once "config.php";
 $tr = mysql_fetch_array(mysql_query("SELECT `id`, `coin`, `log` FROM `deztow_turnir` WHERE `id` = '" . mysql_real_escape_string($_GET['id']) . "' LIMIT 1"));
-Template::header('Башня смерти. Отчет о турнире #'. $tr['id']);
+\Battles\Template::header('Башня смерти. Отчет о турнире #'. $tr['id']);
 echo sprintf('<h3>Башня смерти. Отчет о турнире.</h3><b>%s</b> кр.<br>%s', $tr['coin'], $tr['log']);
\ No newline at end of file
diff --git a/towerstamp.php b/towerstamp.php
index 3ad4108..4dbe162 100644
--- a/towerstamp.php
+++ b/towerstamp.php
@@ -41,7 +41,7 @@ if($_GET['setdef']){
   echo "<font color=red><b>Сохранено.</b></font>".mysql_error();
 }
 
-Template::header('towerstamp');
+\Battles\Template::header('towerstamp');
 ?>
   <h3>Профили характеристик</h3>
   Статы не позволяют сходить в БС? Раскиньте ваши статы так, как вы хотите, и участвуйте в турнире! Выбранный по умолчанию профиль, загрузится сам. Вы можете создавать неограниченное число профилей, и менять их за секунды до турнира!
diff --git a/ul_clans.php b/ul_clans.php
index 4a02254..58a7335 100644
--- a/ul_clans.php
+++ b/ul_clans.php
@@ -6,7 +6,7 @@ if (empty($_SESSION['uid'])) {
 }
 
 require_once "config.php";
-$user = new User($_SESSION['uid']);
+$user = new \Battles\User($_SESSION['uid']);
 
 if ($user->room != 650) {
     header("Location: main.php");
@@ -26,7 +26,7 @@ if ($_GET['id'] && $user->admin) {
     header("location: city.php");
     exit;
 }
-Template::header('Клановый перекрёсток');
+\Battles\Template::header('Клановый перекрёсток');
 ?>
     <a href="/city.php?strah=1">← назад</a>
     <h1>Переход к клановым улицам</h1>
diff --git a/user_abilities.php b/user_abilities.php
index a4578c6..e417335 100644
--- a/user_abilities.php
+++ b/user_abilities.php
@@ -543,7 +543,7 @@ if (empty($user->clan)) {
 $bank = db::c()->query('SELECT `ekr` FROM `bank` WHERE `id` = ?i ', $_SESSION['uid'])->fetch_assoc();
 
 
-Template::header('user_abilities');
+\Battles\Template::header('user_abilities');
 ?>
 <div style="float: right;">
     <?php if ($user->admin == 1): ?>
@@ -570,7 +570,7 @@ Template::header('user_abilities');
                 $magic_name = "Лечение";
                 break;
             case "al_neut_power":
-                $script_name = "RunMagicSelf";
+                $script_name = "RunmagicSelf";
                 $magic_name = "Сила нейтралитета";
                 break;
             case "ct1":
diff --git a/user_anketa.php b/user_anketa.php
index 039939b..6cdfc05 100644
--- a/user_anketa.php
+++ b/user_anketa.php
@@ -48,7 +48,7 @@ if ($oldpsw && $newpsw) {
         err('Неверный текущий пароль!');
     }
 }
-Template::header('Анкета');
+\Battles\Template::header('Анкета');
 ?>
 <a href="main.php">← на главную</a>
 <h1>Анкета персонажа <?= $user->login ?></h1>
diff --git a/vxod.php b/vxod.php
index 4562fc5..e99db4c 100644
--- a/vxod.php
+++ b/vxod.php
@@ -24,7 +24,7 @@ if ($user->room != 402) {
     exit;
 }
 
-Template::header('Вход в водосток');
+\Battles\Template::header('Вход в водосток');
 ?>
 <style>
     legend {
diff --git a/zayavka.php b/zayavka.php
index 08918cc..15a726d 100644
--- a/zayavka.php
+++ b/zayavka.php
@@ -601,7 +601,7 @@ if (!empty($_POST['open'])) {
     fputs($f, time());
     fclose($f);
 }
-Template::header('zayavka');
+\Battles\Template::header('zayavka');
 ?>
     <style>
         .m {