lopar/battles
lopar
/
battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

Revert "Опечатка в имени базы. Ошибки в названиях картинок локаций." 

This reverts commit f61794aa
This commit is contained in:
lopar 2020-10-27 21:06:07 +02:00
parent f61794aad5
commit 932f139fb7
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
classes/City.php
View File

@ -22,43 +22,43 @@ class City
'</div>';
} elseif ($id === 21) {
echo '<div style="position:relative; display: inline-block;" id="ione"><img alt="background" src="/i/city/spring_cap_strash_day.jpg">' .
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, "Дерево") .
'</div>';
} elseif ($id === 26) {
echo '<div style="position:relative; display: inline-block;" id="ione"><img alt="background" src="/i/city/spring_cap_park_day.jpg">' .
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, "Общежитие") .
'</div>';
} elseif ($id === 2601) {
echo '<div style="position:relative; display: inline-block;" id="ione"><img alt="background" src="/i/city/sub/cap_zamk_day.jpg">' .
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, "Храмовая лавка") .
'</div>';
} elseif ($id === 2655) {
echo '<div style="position:relative; display: inline-block;" id="ione"><img alt="background" src="/i/city/ar_e_d.jpg">' .
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, "Арена Ангелов") .
'</div>';
} elseif ($id === 2111) {
echo '<div style="position:relative; display: inline-block;" id="ione"><img alt="background" src="/i/city/av_rist_day.jpg.jpg">' .
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, "Рудник") .
'</div>';
} elseif ($id === 2701) {

2
classes/Travel.php
View File

@ -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()) {