diff --git a/classes/Battles/Item.php b/classes/Battles/Item.php
index d59a859..c9a1ccb 100644
--- a/classes/Battles/Item.php
+++ b/classes/Battles/Item.php
@@ -1,31 +1,33 @@
0) {
return ": " . $number . "";
@@ -114,11 +116,11 @@ class Item
{
$needsLines = [
"сила" => $this->need_strength,
- "ловкость" =>$this->need_dexterity,
- "интуиция" =>$this->need_intuition,
- "выносливость" =>$this->need_endurance,
- "интеллект" =>$this->need_intelligence,
- "мудрость" =>$this->need_wisdom,
+ "ловкость" => $this->need_dexterity,
+ "интуиция" => $this->need_intuition,
+ "выносливость" => $this->need_endurance,
+ "интеллект" => $this->need_intelligence,
+ "мудрость" => $this->need_wisdom,
];
$addsLines = [
"Сила" => $this->add_strength,
diff --git a/classes/Battles/ShopItem.php b/classes/Battles/ShopItem.php
index f9ee210..fc28076 100644
--- a/classes/Battles/ShopItem.php
+++ b/classes/Battles/ShopItem.php
@@ -92,12 +92,12 @@ class ShopItem extends Item
}
}
- public function printImage(): string
+ public function printImage()
{
if (!$this->image) {
$this->image = 'noitem.png';
}
- return "";
+ echo "";
}
public static function buyItem($id, User $buyer): string
@@ -142,15 +142,6 @@ class ShopItem extends Item
return "Предмет " . $boughtItemName . " куплен за " . $boughtItemPrice . " банкнот.";
}
- //TODO не пишутся логи продажи!
-
- /** TODO
- * Notice: Undefined index: shopsell in /volume2/web/battles/classes/Battles/Bank.php on line 199 Call Stack: 0.0003 430192
- * 1. {main}() /volume2/web/battles/shop.php:0 0.0051 966928
- * 2. Battles\ShopItem::sellItem() /volume2/web/battles/shop.php:21 0.1067 998536
- * 3. Battles\Bank::setBankMoney() /volume2/web/battles/classes/Battles/ShopItem.php:162
- * Не отработал запрос в БД в файле /volume2/web/battles/classes/Battles/GameLogs.php(20)
- */
public static function sellItem($id, User $seller, $bankTrade = 0): string
{
$db = new DBPDO();
@@ -162,7 +153,7 @@ class ShopItem extends Item
if ($bankTrade) {
$bank = new Bank($seller->getId());
$bank->setMoney($bank->getMoney() + $sellingPrice);
- Bank::setBankMoney($bank->getMoney(), $seller->getId(), 'shopsell');
+ Bank::setBankMoney($bank->getMoney(), $seller->getId(), 'sellShop');
} else {
$db->execute('update users set money = money - ? where id = ?', [$sellingPrice, $_SESSION['uid']]);
}
@@ -183,7 +174,7 @@ class ShopItem extends Item
{
if ($this->price) {
$arr = range(0, $this->price / 2);
- return array_sum($arr) / sizeof($arr);
+ return array_sum($arr) / count($arr);
}
return null;
}
diff --git a/classes/Battles/UserStats.php b/classes/Battles/UserStats.php
index f514869..76a3767 100644
--- a/classes/Battles/UserStats.php
+++ b/classes/Battles/UserStats.php
@@ -55,7 +55,7 @@ class UserStats extends User
*
* @return string
*/
- public function getStat($stat_name, $isMainWindow = 0): string
+ public function getStat($stat_name, int $isMainWindow = 0): string
{
if (!in_array($stat_name, ['strength', 'dexterity', 'intuition', 'endurance', 'intelligence', 'wisdom'])) {
return self::ERROR_STAT_UNKNOWN;