From 932f139fb77bfded151cab093ed006264982fd41 Mon Sep 17 00:00:00 2001 From: lopar Date: Tue, 27 Oct 2020 21:06:07 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=9E=D0=BF=D0=B5=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B.=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=D1=85?= =?UTF-8?q?=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE=D0=BA=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D1=86=D0=B8=D0=B9."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f61794aa --- classes/City.php | 50 +++++++++++++++++++++++----------------------- classes/Travel.php | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/classes/City.php b/classes/City.php index 6534918..ac5cc0e 100644 --- a/classes/City.php +++ b/classes/City.php @@ -22,43 +22,43 @@ class City ''; } elseif ($id === 21) { echo '
background' . - self::showBuilding(3, "spring_cap_arr_right", 255, 708, "Ристалище") . - self::showBuilding(4, "spring_cap_arr_left", 258, 21, "Центральная площадь") . - self::showBuilding(5, "spring_cap_bank", 180, 485, "Банк") . - self::showBuilding(13, "spring_cap_flowershop", 220, 613, "Цветочный магазин") . - self::showBuilding(14, "spring_cap_registratura", 170, 113, "Регистратура кланов") . - self::showBuilding(16, "spring_cap_tower", 5, 315, "Башня смерти") . - self::showBuilding(16555, "spring_cap_tree", 165, 20, "Дерево") . + self::showBuilding(3, "cap_arr_right", 255, 708, "Ристалище") . + self::showBuilding(4, "cap_arr_left", 258, 21, "Центральная площадь") . + self::showBuilding(5, "cap_bank", 180, 485, "Банк") . + self::showBuilding(13, "cap_flowershop", 220, 613, "Цветочный магазин") . + self::showBuilding(14, "cap_registratura", 170, 113, "Регистратура кланов") . + self::showBuilding(16, "cap_tower", 5, 315, "Башня смерти") . + self::showBuilding(16555, "cap_tree", 165, 20, "Дерево") . '
'; } elseif ($id === 26) { echo '
background' . - self::showBuilding(3, "spring_cap_arr_left", 259, 27, "Замковая площадь") . - self::showBuilding(4, "spring_cap_arr_right", 259, 715, "Центральная площадь") . - self::showBuilding(6, "spring_cap_gate", 170, 340, "Городские ворота") . - self::showBuilding(660, "spring_cap_vokzal", 163, 43, "Общежитие") . + self::showBuilding(3, "cap_arr_left", 259, 27, "Замковая площадь") . + self::showBuilding(4, "cap_arr_right", 259, 715, "Центральная площадь") . + self::showBuilding(6, "cap_gate", 170, 340, "Городские ворота") . + self::showBuilding(660, "cap_vokzal", 163, 43, "Общежитие") . '
'; } elseif ($id === 2601) { echo '
background' . - self::showBuilding(1, "spring_cap_ruins", 166, 48, "Руины Старого замка") . - self::showBuilding(4, "spring_cap_arr_right", 260, 710, "Большая парковая улица") . - self::showBuilding(10, "spring_ava_post", 240, 300, "Сувенирный магазинчик") . - self::showBuilding(55, "spring_cap_arr_left", 258, 21, "Арена Богов") . - self::showBuilding(1051, "spring_cap_lab", 130, 327, "Вход в Лабиринт Хаоса") . - self::showBuilding(1052, "spring_cap_lavka", 240, 425, "Храмовая лавка") . + self::showBuilding(1, "cap_ruins", 166, 48, "Руины Старого замка") . + self::showBuilding(4, "cap_arr_right", 260, 710, "Большая парковая улица") . + self::showBuilding(10, "ava_post", 240, 300, "Сувенирный магазинчик") . + self::showBuilding(55, "cap_arr_left", 258, 21, "Арена Богов") . + self::showBuilding(1051, "cap_lab", 130, 327, "Вход в Лабиринт Хаоса") . + self::showBuilding(1052, "cap_lavka", 240, 425, "Храмовая лавка") . '
'; } elseif ($id === 2655) { echo '
background' . - self::showBuilding(10, "spring_arr_right_png", 260, 710, "Замковая площадь") . - self::showBuilding(2055, "spring_cap_altr_g", 230, 340, "Арена Ангелов") . + self::showBuilding(10, "arr_right_png", 260, 710, "Замковая площадь") . + self::showBuilding(2055, "cap_altr_g", 230, 340, "Арена Ангелов") . '
'; } elseif ($id === 2111) { echo '
background' . - self::showBuilding(1, "spring_cap_arr_uleft", 240, 30, "Страшилкина Улица") . - self::showBuilding(2, "spring_cap_arr_right", 245, 708, "Секретный Лабиринт") . - self::showBuilding(14, "spring_cap_rist_solo", 210, 160, "Вход в Одиночные сражения") . - self::showBuilding(14, "spring_cap_rist_group", 243, 340, "Вход в Сражение отрядов") . - self::showBuilding(21, "spring_angelscastle", 131, 628, "Замок Мэра Города") . - self::showBuilding(203, "spring_cap_rist_monstr", 145, 570, "Вход в Груповые сражения") . + self::showBuilding(1, "cap_arr_uleft", 240, 30, "Страшилкина Улица") . + self::showBuilding(2, "cap_arr_right", 245, 708, "Секретный Лабиринт") . + self::showBuilding(14, "cap_rist_solo", 210, 160, "Вход в Одиночные сражения") . + self::showBuilding(14, "cap_rist_group", 243, 340, "Вход в Сражение отрядов") . + self::showBuilding(21, "angelscastle", 131, 628, "Замок Мэра Города") . + self::showBuilding(203, "cap_rist_monstr", 145, 570, "Вход в Груповые сражения") . self::showBuilding(1000, "av_zamk_rud", 80, 310, "Рудник") . '
'; } elseif ($id === 2701) { diff --git a/classes/Travel.php b/classes/Travel.php index bfc325d..c29253f 100644 --- a/classes/Travel.php +++ b/classes/Travel.php @@ -5,7 +5,7 @@ class Travel { public static function toRoom(int $roomId, string $redirectToFile = 'city.php'): 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(); + $itemsWeight = db::c()->query('SELECT SUM(weight) AS all_weight FROM `inventory` WHERE owner_id = ?i AND `setsale` = 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()) {