From fdaadf69e60a21210c93aa91dc5bafee73511908 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Sun, 13 Feb 2022 01:46:59 +0200
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D1=8F=D0=B2=D0=BA=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B5=D0=B4=D0=B8=D0=BD=D0=BA=D0=B8.=20?=
 =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arena.php                       | 43 +++++++++++++++++++++++++++++++--
 classes/Battles/Database/Db.php | 17 +++----------
 classes/Battles/User.php        |  4 +--
 functions.php                   |  2 +-
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/arena.php b/arena.php
index 4b3312a..1af0ca1 100644
--- a/arena.php
+++ b/arena.php
@@ -6,7 +6,46 @@
 use Battles\Arena;
 use Battles\Template;
 
+if (isset($_POST['startTime']) && isset($_POST['teamMembersQuantity'])) {
+    Arena::fight()->addNew((int)$_POST['teamMembersQuantity'], 2, (int)$_POST['startTime']);
+}
+if (isset($_POST['fight_id']) && isset($_POST['team_id'])) {
+    Arena::fight()->join((int)$_POST['fight_id'], (int)$_POST['team_id']);
+}
 Template::header('Арена');
+?>
 
-$dbname = new SQLite3('name.db');
-Arena::$current = new Arena($dbname);
\ No newline at end of file
+<?php if(Arena::fight()->hasNoPendingFights()): ?>
+<form method='post' id='newbattle'></form>
+<H3>Подать заявку на поединок</H3>
+<label for='startTime'>Начало боя</label>
+<select name='startTime' id='startTime' form='newbattle'>
+    <option value=1 selected>через 1 минуту</option>
+    <option value=3>через 3 минуты</option>
+    <option value=5>через 5 минут</option>
+    <option value=10>через 10 минут</option>
+</select>
+<br><br>
+<label>Размер команды (1-20)
+    <input type='number' min='1' max='20' name='teamMembersQuantity' form='newbattle' value='5'>
+</label>
+<br><br>
+<input type='submit' value='Подать заявку' form='newbattle'>
+<?php endif; ?>
+<?= Arena::fight()->getPendingList() ?>
+<?php foreach (Arena::fight()->getPendingList() as $row): ?>
+<!-- !!PLACEHOLDER!! -->
+<div>
+    User1, User2, User3
+    <form method='post' style='display:inline'>
+        <input type='hidden' name='teamId' value='1'>
+        <input type='submit' value='Я за этих'>
+    </form>
+    <em>против</em>
+    User4, User5, User6
+    <form method='post' style='display:inline'>
+        <input type='hidden' name='teamId' value='2'>
+        <input type='submit' value='Я за этих'>
+    </form>
+    <? endforeach; ?>
+</div>
\ No newline at end of file
diff --git a/classes/Battles/Database/Db.php b/classes/Battles/Database/Db.php
index a6c6a4d..ec183d4 100644
--- a/classes/Battles/Database/Db.php
+++ b/classes/Battles/Database/Db.php
@@ -74,7 +74,7 @@ class Db
         // Allows the user to retrieve results using a
         // column from the results as a key for the array
         if (!is_null($key) && $results[0][$key]) {
-            $keyed_results = array();
+            $keyed_results = [];
             foreach ($results as $result) {
                 $keyed_results[$result[$key]] = $result;
             }
@@ -94,7 +94,7 @@ class Db
         return $stmt->fetch(PDO::FETCH_OBJ);
     }
 
-    public function ofetchAll($query, $values = null, $key = null): object
+    public function ofetchAll($query, $values = null)
     {
         if (is_null($values)) {
             $values = [];
@@ -102,18 +102,7 @@ class Db
             $values = [$values];
         }
         $stmt = $this->execute($query, $values);
-        $results = $stmt->fetchAll(PDO::FETCH_OBJ);
-
-        // Allows the user to retrieve results using a
-        // column from the results as a key for the array
-        if (!is_null($key) && $results[0][$key]) {
-            $keyed_results = (object)[];
-            foreach ($results as $result) {
-                $keyed_results->$result[$key] = $result;
-            }
-            $results = $keyed_results;
-        }
-        return $results;
+        return $stmt->fetchAll(PDO::FETCH_OBJ);
     }
 
     public function lastInsertId()
diff --git a/classes/Battles/User.php b/classes/Battles/User.php
index 5440af0..d3236a5 100644
--- a/classes/Battles/User.php
+++ b/classes/Battles/User.php
@@ -28,7 +28,6 @@ class User
 
     // Пока несуществующие, для совместимости.
     protected int $experience = 0;
-    protected int $battle = 0;
     protected int $in_tower = 0; // Скорее башню похороним чем запустим...
     protected int $zayavka = 0;
 
@@ -77,6 +76,7 @@ class User
     {
         if (Db::getInstance()->fetchColumn('SELECT 1 FROM users_effects WHERE owner_id = ? AND type = ?', [$userId, $type])) {
             Db::getInstance()->execute('DELETE FROM users_effects WHERE owner_id = ? AND type = ?', [$userId, $type]);
+            return true;
         }
         return false;
     }
@@ -218,7 +218,7 @@ class User
 
     public function getBattle(): int
     {
-        return $this->battle;
+        return Arena::fight()->hasNoActiveFights();
     }
 
     public function getInTower(): int
diff --git a/functions.php b/functions.php
index 7057804..f329793 100644
--- a/functions.php
+++ b/functions.php
@@ -24,7 +24,7 @@ if (User::getInstance()->getBlock()) {
 }
 
 //Проверки на соответствие скрипта и комнаты, которые были натыканы по всем файлам.
-Travel::roomRedirects(User::$current->getRoom(), User::$current->getBattle(), User::$current->getInTower());
+Travel::roomRedirects(User::getInstance()->getRoom(), User::getInstance()->getBattle(), User::getInstance()->getInTower());
 
 ///*
 // * Проверки на соответствие скрипта и комнаты, которые были натыканы по всем файлам.