diff --git a/admin/NewItem.php b/admin/NewItem.php new file mode 100644 index 0000000..98cd34e --- /dev/null +++ b/admin/NewItem.php @@ -0,0 +1,143 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Добавление вещей в магазин
Основное +
+
+
+
+
+
+
+
+
Требования +
+
+
+
+
+
+
+
Характеристики +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ + * Project name: Battles-Game */ - session_start(); -//require_once '../functions.php'; -$user = new \Battles\User($_SESSION['uid']); -if (!$user->admin) { +require_once '../functions.php'; + +use Battles\Bank; +use Battles\Database\DBPDO; +use Battles\Moderation; +use Battles\Nick; +use Battles\Template; +use Battles\User; + +$user = $user ?? new User($_SESSION['uid']); +if (!$user->getAdmin()) { header("HTTP/1.0 404 Not Found"); exit; } -$al = db::c()->query('SELECT * FROM `aligns` WHERE `align` = "?s" LIMIT 1', $user['align'])->fetch_assoc(); +if (isset($_GET['sleep'])) { + Moderation::muteChat($user->getId(), strtotime('15min')); +} -function statsat($nu) -{ /*in admin.php*/ - $stats = 0; - $master = 0; - $vinos = 0; - $money = 0; +if (isset($_POST['ldnick']) && isset($_POST['ldtext'])) { + Moderation::addToUserLog($_POST['ldnick'], $_POST['ldtext'], $user->getId()); +} - foreach (Config::$exptable as $k => $v) { - if ($k == $nu) { - break; +if (isset($_POST['syschatmsg'])) { + Moderation::addChatSysMsg($_POST['syschatmsg']); +} + +//clans to reg +$unregisteredClans = new class { + public $db; + + public function getList() + { + $row = $this->db->ofetchAll('SELECT * FROM clans WHERE status = 0'); + $i = 0; + while ($i < count($row)) { + $id = $row[$i]->owner_id; + $login = Nick::id($row[$i]->owner_id)->short(1); + $fullName = $row[$i]->full_name; + $shortName = $row[$i]->short_name; + $info = nl2br($row[$i]->info); + $i++; + echo << +
+ $fullName [$shortName] + Глава клана: $login
+ Описание:
$info
+
+ + +
+ +UNREGCLANLIST; } - $stats += $v[0]; - $master += $v[1]; - $vinos += $v[2]; - $money += $v[3]; + unset($i); } - return ["stats" => $stats + 12, "master" => $master + 1, "vinos" => $vinos + 3, "money" => $money]; + + public function allowRegister($id) + { + $this->db->execute('UPDATE clans SET status = 1 WHERE status = 0 AND owner_id = ?', $id); + } + + public function disallowRegister($id) + { + $bank = new Bank($id); + $this->db->execute('DELETE FROM clans WHERE status = 0 AND owner_id = ?', $id); + $bank::setBankMoney($bank->getMoney() + Config::$clan_register_cost, $id); + } +}; +$unregisteredClans->db = new DBPDO(); +$unregisteredClans->getList(); + +if (isset($_GET['regclan'])) { + $unregisteredClans->allowRegister($_GET['regclan']); + header('Location:/admin/admin.php'); + exit; +} +if (isset($_GET['remclan'])) { + $unregisteredClans->disallowRegister($_GET['remclan']); + header('Location:/admin/admin.php'); + exit; } -function imp($array) -{ - $str = ''; - foreach ($array as $k => $v) { - $str .= $k . ";" . $v . ";"; - } - return $str; +# Телеграф. +if (!empty($_POST['receiver']) && !empty($_POST['tgmsg'])) { + $receiver = DBPDO::INIT()->ofetch('SELECT id FROM users WHERE login= ?', $_POST['receiver']); + telegraph($receiver->id, $_POST['tgmsg']); + echo "Успешно."; } - -function expa($str) -{ - $array = explode(";", $str); - for ($i = 0; $i <= count($array) - 2; $i = $i + 2) { - $rarray[$array[$i]] = $array[$i + 1]; - } - if (isset($rarray)) { - return $rarray; - } else { - return []; - } +# Показывает невидимок. +$row = DBPDO::INIT()->ofetchAll('SELECT id,login FROM users LEFT JOIN users_effects ue on users.id = ue.owner_id WHERE type = 1022 ORDER BY `id` DESC'); +$i = 0; +$invisList = ''; +while ($i < count($row)) { + $invisList .= '[id] = ' . $row[$i]->id . ', ' . $row[$i]->login . '
'; + $i++; } +unset($i); -if ($_POST['ali']) { //Что делает эта штука? - $accs = $_POST; - array_shift($accs); - array_shift($accs); - array_shift($accs); - db::c()->query('INSERT INTO `aligns` (`align`,`img`,`name`,`accses`) VALUES ("?s","?s","?s","?s") ON DUPLICATE KEY UPDATE `img` = "?s", `name` = "?s", `accses` = "?s"', $_POST['ali'], $_POST['im'], $_POST['txt'], imp($accs), $_POST['im'], $_POST['txt'], imp($accs)); -} -$aligns = db::c()->query('SELECT `img`,`align`,`name` FROM `aligns` ORDER BY `align`'); -\Battles\Template::header('ᐰdminка'); +Template::header('ᐰdminка'); ?> -
-
- Склонности - -
-
-
-
- Кланы - -
-
-
- Добавить вещь - -
- -"; -#################################################### -$moj = expa($al['accses']); - -switch ($_POST['use']) { /* Подключаем строго тот свиток который используем. 36 Свитков править. Мама дорогая! */ - case "healing": - include("../magic/Healing.php"); - break; - case "al_neut_power": - include("../magic/al_neut_power.php"); - break; - case "ct1": - //Заменён на CureInjury.php class. Придумать вызов. - //include("../magic/ct1.php"); - break; - case "ct2": - //Заменён на CureInjury.php class. Придумать вызов. - //include("../magic/ct2.php"); - break; - case "ct3": - //Заменён на CureInjury.php class. Придумать вызов. - //include("../magic/ct3.php"); - break; - case "sleep": - include("../magic/sleep.php"); - break; - case "sleepf": - include("../magic/sleepf.php"); - break; - case "sleep_off": - include("../magic/sleep_off.php"); - break; - case "sleepf_off": - include("../magic/sleepf_off.php"); - break; - case "haos": - include("../magic/haos.php"); - break; - case "haos_off": - include("../magic/haos_off.php"); - break; - case "obezl": - include("../magic/obezl.php"); - break; - case "obezl_off": - include("../magic/obezl_off.php"); - break; - case "death": - include("../magic/death.php"); - break; - case "death_off": - include("../magic/death_off.php"); - break; - case "ldadd": - include("../magic/ldadd.php"); - break; - case "attack": - include("../magic/eattack.php"); - break; - case "attack_t": - include("../magic/attack_t.php"); - break; - case "battack": - include("../magic/ebattack.php"); - break; - case "attackk_close": - include("../magic/attackk_close.php"); - break; - case "attackk_open": - include("../magic/attackk_open.php"); - break; - case "pal_off": - include("../magic/pal_off.php"); - break; - case "marry": - include("../magic/marry.php"); - break; - case "unmarry": - include("../magic/unmarry.php"); - break; - case "ct_all": - //Заменён на CureInjury.php class. Придумать вызов. - //include("../magic/ct_all.php"); - break; - case "check": - include("../magic/check.php"); - break; - case "brat": - include("../magic/brat.php"); - break; - case "vampir": - include("../magic/vampir.php"); - break; - case "crush": - include("../magic/devastate.php"); - break; - case "def": - include("../magic/defence.php"); - break; - case "bexit": - include("../magic/bexit.php"); - break; - case "vip": - include("../magic/vips.php"); - break; - case "dlight": - include("../magic/dlight.php"); - break; - case "ddark": - include("../magic/ddark.php"); - break; - case "dneit": - include("../magic/dneit.php"); - break; - case "un_align": - include("../magic/un_align.php"); - break; -} - -echo "
Абилки:Пока что привязаны к общей системе. Работают выборочно.
"; -$script_name = $magic_name = ''; -foreach ($moj as $k => $v) { - switch ($k) { /* 45 скриптов на 36 умелок? Неплохо… */ - case "vip": - $script_name = "vipad"; - $magic_name = "Вип"; - break; - case "sleep": - $script_name = "runmagic"; - $magic_name = "Наложить заклятие молчания"; - break; - case "sleepf": - $script_name = "runmagicf"; - $magic_name = "Наложить заклятие форумного молчания"; - break; - case "healing": - $script_name = "runmagic1"; - $magic_name = "Лечение"; - break; - case "al_neut_power": - $script_name = "RunmagicSelf"; - $magic_name = "Сила нейтралитета"; - break; - case "ct1": - $script_name = "runmagic1"; - $magic_name = "Исцелить легкую травму"; - break; - case "ct2": - $script_name = "runmagic1"; - $magic_name = "Исцелить среднюю травму"; - break; - case "ct3": - $script_name = "runmagic1"; - $magic_name = "Исцелить тяжелую травму"; - break; - case "sleep_off": - $script_name = "runmagic1"; - $magic_name = "Снять заклятие молчания"; - break; - case "sleepf_off": - $script_name = "runmagic1"; - $magic_name = "Снять заклятие форумного молчания"; - break; - case "haos": - $script_name = "runmagic2"; - $magic_name = "Наложить заклятие хаоса"; - break; - case "haos_off": - $script_name = "runmagic1"; - $magic_name = "Снять заклятие хаоса"; - break; - case "death": - $script_name = "runmagic1"; - $magic_name = "Наложить заклятие смерти"; - break; - case "death_off": - $script_name = "runmagic1"; - $magic_name = "Снять заклятие смерти"; - break; - case "obezl": - $script_name = "runmagic2"; - $magic_name = "Наложить заклятие обезличивания"; - break; - case "obezl_off": - $script_name = "runmagic1"; - $magic_name = "Снять заклятие обезличивания"; - break; - case "pal_off": - $script_name = "runmagic1"; - $magic_name = "Лишить звания Паладин"; - break; - case "attack": - $script_name = "runmagic1"; - $magic_name = "Нападение"; - break; - case "attack_t": - $script_name = "runmagic1"; - $magic_name = "Нападение на Темного"; - break; - case "battack": - $script_name = "runmagic1"; - $magic_name = "Кровавое нападение"; - break; - case "attackk_close": - $script_name = "runmagic1"; - $magic_name = "Кулачное закрытое кровавое нападение"; - break; - case "attackk_open": - $script_name = "runmagic1"; - $magic_name = "Кулачное закрытое нападение"; - break; - case "marry": - $script_name = "runmagic4"; - $magic_name = "Зарегистрировать брак"; - break; - case "unmarry": - $script_name = "runmagic4"; - $magic_name = "Расторгнуть брак"; - break; - case "hidden": - $script_name = "runmagic1"; - $magic_name = "Заклятие невидимости"; - break; - case "teleport": - $script_name = "runmagic"; - $magic_name = "Телепортация"; - break; - case "check": - $script_name = "runmagic1"; - $magic_name = "Поставить проверку"; - break; - case "ct_all": - $script_name = "runmagic1"; - $magic_name = "Вылечить от травм"; - break; - case "pal_buttons": - $script_name = "runmagic"; - $magic_name = "Отметить о прохождении проверки"; - break; - case "vampir": - $script_name = "runmagic1"; - $magic_name = "Вампиризм (выпить энергию другого игрока)"; - break; - case "brat": - $script_name = "runmagic1"; - $magic_name = "Помочь темному собрату (вмешаться в поединок)"; - break; - case "dneit": - $script_name = "runmagic1"; - $magic_name = "Присвоить склонность (Нейтральное Братство)"; - break; - case "dpal": - $script_name = "runmagic"; - $magic_name = "Присвоить склонность (Паладин)"; - break; - case "ddark": - $script_name = "runmagic1"; - $magic_name = "Присвоить склонность (Темное Братство)"; - break; - case "dlight": - $script_name = "runmagic1"; - $magic_name = "Присвоить склонность (Светлое Братство)"; - break; - case "un_align": - $script_name = "runmagic1"; - $magic_name = "Лишить склонности"; - break; - case "note": - $script_name = "runmagic"; - $magic_name = "Редактировать личное дело"; - break; - case "sys": - $script_name = "runmagic"; - $magic_name = "Отправить в чат системное сообщение"; - break; - case "scanner": - $script_name = "runmagic"; - $magic_name = "Показать лог действий модератора"; - break; - case "rep": - $script_name = "runmagic"; - $magic_name = "Отчет о переводах"; - break; - case "rost": - $script_name = "runmagic"; - $magic_name = "Присвоить статус"; - break; - case "ldadd": - $script_name = ""; - $magic_name = "Записать причину отправки в Хаос"; - break; - case "crush": - $script_name = "runmagic1"; - $magic_name = "Сокрушение"; - break; - case "def": - $script_name = "runmagic1"; - $magic_name = "Защита от оружия"; - break; - case "bexit": - $script_name = "runmagic1"; - $magic_name = "Выйти из боя"; - break; - } - # Эта строка генерирует свитки с навыком. Но нам нужен просто перечень всего… - if ($script_name) { - print " "; - } -} -echo "
"; -?> -Всплывашки: - - - - - - - - - - +Абилки. Работают только на себя. Надо дописать цель.
+ + + + + +
+ + + + +
+ + + + +
+ + + + +
Добавить в «дело» игрока заметку о нарушении правил, прокрутке и пр. -
- Записать, как причину блокировки +
Отправить системное сообщение в чат - +
@@ -761,333 +156,5 @@ echo "";
-
- Выдыча склонностей - -
-query('SELECT `id` FROM `users` WHERE `login`= "?s"', $_POST['receiver'])->fetch_row(); - telegraph($receiverId[0], $_POST['tgmsg']); - echo "Успешно."; -} -# Показывает невидимок. -echo 'Невидимки:'; -$prs = db::c()->query('SELECT `id`, `login` FROM `users` WHERE `invis` = 1 ORDER BY `id` DESC'); -while ($row = $prs->fetch_assoc()) { - echo '[id] = ' . $row['id'] . ', ' . $row['login'] . '
'; -} -# Системное сообщение. -if (!empty($_POST['newsmsg'])) { - AddChatSystem($_POST['newsmsg']); - echo "Системное сообщение отправлено."; -} -# Меняем статусы -if ($_POST['login'] && $_POST['status']) { - $dd = db::c()->query('SELECT `ip`, `login` FROM `users` WHERE `login` = "?s"', $_POST['login'])->fetch_assoc(); - if ($dd) { - db::c()->query('UPDATE `users` SET `status` = "?s" WHERE `login` = "?s"', $_POST['status'] . $_POST['login']); - echo "Статус " . $dd['login'] . " изменен на " . $_POST['status'] . "
"; - } -} -# Меняем склонности -if ($_POST['login'] && $_POST['krest']) { - switch ($_POST['krest']) { - case 1: - $rang = 'Паладин Поднебесья'; - break; - case 1.1: - $rang = 'Паладин Солнечной Улыбки'; - break; - case 1.2: - $rang = 'Паладин Огненной Зари'; - break; - case 1.3: - $rang = 'Паладин Неба'; - break; - case 1.4: - $rang = 'Старший Паладин Неба'; - break; - case 1.5: - $rang = 'Верховный Паладин'; - break; - default: - $rang = ''; - break; - } - if ($_POST['krest'] == -1) { - db::c()->query('UPDATE `users` SET `align`="?s", `status`="?s" WHERE `login` = "?s" LIMIT 1;', '0', '', $_POST['login']); - } else { - db::c()->query('UPDATE `users` SET `align` = "?s", `status` = "?s" WHERE `login` = "?s"', $_POST['krest'], $rang, $_POST['login']); - } -} - - -################################################ -################ ВСЕ ЯВАСКРИПТЫ ################ -################################################ -?> - - \ No newline at end of file +Невидимки
+
\ No newline at end of file diff --git a/admin/edit_user.php b/admin/edit_user.php index 7439908..280e8eb 100644 --- a/admin/edit_user.php +++ b/admin/edit_user.php @@ -7,8 +7,8 @@ session_start(); require_once "../functions.php"; - -if (!$user->admin) { +$user = $user ?? new User($_SESSION['uid']); +if (!$user->getAdmin()) { header("HTTP/1.0 404 Not Found"); exit; } diff --git a/akadem.php b/akadem.php index de879be..90a224f 100644 --- a/akadem.php +++ b/akadem.php @@ -45,9 +45,9 @@ function setProfession($name, $type, $needMoney, $needLevel) $profId = 22; } if (!empty($profId)) { - $user->money -= $needMoney; - Bank::setWalletMoney($user->money, $user->id); - db::c()->query('UPDATE `users` SET ?f = ?i WHERE `id` = ?i', 'prof' . $type, $profId, $user->id); + $user->setMoney($user->getMoney() - $needMoney); + Bank::setWalletMoney($user->getMoney(), $user->getId()); + db::c()->query('UPDATE `users` SET ?f = ?i WHERE `id` = ?i', 'prof' . $type, $profId, $user->getId()); $deloText = "{$user['login']} купил профессию «{$name}» в академии за {$needMoney} кр."; GameLogs::addUserLog($_SESSION['uid'], $deloText); $user['prof' . $type] = true; @@ -69,7 +69,7 @@ if ($get == 'medic') { } 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); + db::c()->query('UPDATE `users`,`online` SET `users`.`room` = 2702, `online`.`room` = 2702 WHERE `users`.`id` = ?i AND `online`.`id` = ?i', $user->getId(), $user->getId()); header('Location: city.php'); } Template::header('Академия'); @@ -82,8 +82,8 @@ Template::header('Академия');
Информация - Кредитыmoney ?> - Уровень персонажаlevel ?> + КредитыgetMoney() ?> + Уровень персонажаgetLevel() ?>
Наёмник diff --git a/bank.php b/bank.php index ce0eda0..b68583a 100644 --- a/bank.php +++ b/bank.php @@ -1,11 +1,18 @@ id); +$bank = new Bank($user->getId()); $status = ''; $toid = $_POST['to_id'] ?? 0; @@ -15,37 +22,37 @@ try { // Зачисление кредитов на счёт. if ($submit === 'depositMoney' && $summa) { $operation = $bank->depositMoney($summa); - $user->money = $operation['walletMoney']; + $user->setMoney($operation['walletMoney']); $bank->setMoney($operation['bankMoney']); $status = SUCCESS; } // Снятие кредитов со счёта. if ($submit === 'withdrawMoney' && $summa) { $operation = $bank->withdrawMoney($summa); - $user->money = $operation['walletMoney']; + $user->setMoney($operation['walletMoney']); $bank->setMoney($operation['bankMoney']); $status = SUCCESS; } // Перевод кредитов на другой счёт. if ($submit === 'sendMoney' && $summa && $toid) { - $user->money = $bank->sendMoney($toid, $summa); + $user->setMoney($bank->sendMoney($toid, $summa)); $status = SUCCESS; } -} catch (\Exceptions\GameException $e) { +} catch (GameException $e) { echo 'Банковская ошибка!'; } finally { unset($submit, $summa, $toid); } -\Battles\Template::header('Банк'); +Template::header('Банк'); ?> - +
На счету: getMoney() ?>
- На руках: money ?> + На руках: getMoney() ?>
Работа со счётом diff --git a/buy_klan.php b/buy_klan.php index b33c4e0..5e57cd8 100644 --- a/buy_klan.php +++ b/buy_klan.php @@ -5,7 +5,7 @@ if (empty($_SESSION['uid'])) { } require_once "functions.php"; -if (empty($user->clan)) { +if (empty($user->getClan())) { exit; } $is_now = db::c()->query('SELECT `id` FROM `abils_klan` WHERE `klan` = ?i', $user['klan'])->fetch_assoc(); diff --git a/c_forest.php b/c_forest.php index 495126f..2025bf2 100644 --- a/c_forest.php +++ b/c_forest.php @@ -1,7 +1,7 @@ room == 51) { +if ($user->getRoom() == 51) { header('location: city.php'); exit; } diff --git a/canalizaciya.php b/canalizaciya.php index 923c3f9..59078c8 100644 --- a/canalizaciya.php +++ b/canalizaciya.php @@ -1,8 +1,12 @@ room == 403) { +$user = $user ?? new User($_SESSION['uid']); +if ($user->getRoom() == 403) { include "startpodzemel.php"; if ($_GET['act'] == "cexit") { $das = mysql_query("select glava,glav_id from `labirint` where user_id='" . $user['id'] . "'"); @@ -37,7 +41,7 @@ if ($user->room == 403) { 'Ключик №9', 'Ключик №10' ]; - db::c()->query('DELETE FROM inventory WHERE name IN ("?s") AND owner_id = ?i', implode(",", $items_to_delete), $user->id); + db::c()->query('DELETE FROM inventory WHERE name IN ("?s") AND owner_id = ?i', implode(",", $items_to_delete), $user->getId()); } } $e = mysql_query("DELETE FROM labirint WHERE user_id='" . $user['id'] . "'"); @@ -50,11 +54,11 @@ if ($user->room == 403) { { $frt = mysql_query("select user_id from `labirint` where glava='" . $glava . "'"); while ($rbb = mysql_fetch_array($frt)) { - addchp('' . $user->login . ' поднял предмет "' . $mis . '". ', '{[]}' . Nick::id($rbb["user_id"])->short() . '{[]}'); + addchp('' . $user->getLogin() . ' поднял предмет "' . $mis . '". ', '{[]}' . Nick::id($rbb["user_id"])->short() . '{[]}'); } } } -\Battles\Template::header('canalizaciya'); +Template::header('canalizaciya'); $ros = mysql_query("SELECT * FROM `labirint` WHERE `user_id`='{$_SESSION['uid']}'"); $mir = mysql_fetch_array($ros); diff --git a/canalization_mod.php b/canalization_mod.php index 9919160..d7d310f 100644 --- a/canalization_mod.php +++ b/canalization_mod.php @@ -1,5 +1,5 @@ room == 403) { +if ($user->getRoom() == 403) { $s = db::c()->query('SELECT * FROM podzem2 WHERE name= "?s"', $mir['name'])->fetch_assoc(); $rooms[0] = ""; diff --git a/cave.php b/cave.php index 56f7e81..f9c5986 100644 --- a/cave.php +++ b/cave.php @@ -1,4 +1,7 @@ room]['x' . $floor])) { + if (!isset($cavedata[$user->getRoom()]['x' . $floor])) { $floor = 1; loadmap(); } - mysql_query("UPDATE `caveparties` SET `floor` = $floor, `x` = '" . $cavedata[$user->room]['x' . $floor] . "', `y` = '" . $cavedata[$user->room]['y' . $floor] . "', `dir` = '" . $cavedata[$user->room]['dir' . $floor] . "', `loses` = (`loses`+1) WHERE `user` = '$user[id]' LIMIT 1"); + mysql_query("UPDATE `caveparties` SET `floor` = $floor, `x` = '" . $cavedata[$user->getRoom()]['x' . $floor] . "', `y` = '" . $cavedata[$user->getRoom()]['y' . $floor] . "', `dir` = '" . $cavedata[$user->getRoom()]['dir' . $floor] . "', `loses` = (`loses`+1) WHERE `user` = '$user[id]' LIMIT 1"); mysql_query('UPDATE `users` SET `hp` = 1 WHERE `id` = "' . $user['id'] . '" LIMIT 1'); - $x = $cavedata[$user->room]['x' . $floor]; - $y = $cavedata[$user->room]['y' . $floor]; - $dir = $cavedata[$user->room]['dir' . $floor]; + $x = $cavedata[$user->getRoom()]['x' . $floor]; + $y = $cavedata[$user->getRoom()]['y' . $floor]; + $dir = $cavedata[$user->getRoom()]['dir' . $floor]; updparties(); $loses++; } @@ -463,7 +466,7 @@ while ($rec = mysql_fetch_assoc($r)) { $party[] = $rec; } -if ($user->room == 621) { +if ($user->getRoom() == 621) { $base = "/underdesigns/alchcave"; } @@ -544,8 +547,8 @@ if ($_GET['useitem']) { $ty = $y + 1; } if (@$_GET['useitem']) { - if (file_exists("underground/objects/$user->room.php")) { - include "underground/objects/$user->room.php"; + if (file_exists("underground/objects/$user->getRoom().php")) { + include "underground/objects/$user->getRoom().php"; } } @@ -641,7 +644,7 @@ if ($wander && !isset($_GET['attack'])) { $ty = $v['y'] + 2; } - if ($user->room == 74 || $user->room == 76) { + if ($user->getRoom() == 74 || $user->getRoom() == 76) { if (strpos($map[$ty][$tx], 's/') !== false && !@$mapbots[$ty][$tx]) { break; } @@ -709,8 +712,8 @@ if ($moved && (substr($map[$y * 2][$x * 2], 0, 1) === "e" || substr($map[$y * 2] $tx = $x; $ty = $y; $tmp = explode("/", $map[$y * 2][$x * 2]); - if (file_exists("underground/events/$user->room.php")) { - include("underground/events/$user->room.php"); + if (file_exists("underground/events/$user->getRoom().php")) { + include("underground/events/$user->getRoom().php"); } } @@ -735,7 +738,7 @@ if ($ambushes[$y * 2][$x * 2 - 2] && $map[$y * 2][$x * 2 - 1] == 0) { if ($ax && $ay && $user['hp'] > 0) { $cavedata = Config::$cavedata ?? []; - if (!($cavedata[$user->room]['x' . $floor] == $x && $cavedata[$user->room]['y' . $floor] == $y)) { + if (!($cavedata[$user->getRoom()]['x' . $floor] == $x && $cavedata[$user->getRoom()]['y' . $floor] == $y)) { if ($ax < $x) { $dir1 = 0; } elseif ($ax > $x) { @@ -899,14 +902,14 @@ if (@$_GET['exit']) { } } mysql_query("DELETE FROM `inventory` WHERE `owner` = '$user[id]' AND `foronetrip` = 1"); - gotoroom($user->room - 1); + gotoroom($user->getRoom() - 1); } $standingon = $map[$y * 2][$x * 2]; foreach ($party as $k => $v) { $map[$v['y'] * 2][$v['x'] * 2] = "u/" . $v['user']; } -\Battles\Template::header('cave'); +Template::header('cave'); ?>