Наёмник
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('Банк');
?>
-
+
= $status ?>
На счету: = $bank->getMoney() ?>
- На руках: = $user->money ?>
+ На руках: = $user->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');
?>