From 4c8f6327f2ace34a056b8e627b10927ef9019c4b Mon Sep 17 00:00:00 2001 From: "Igor Barkov [iwork]" Date: Wed, 16 Jan 2019 17:53:23 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B8=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5,=20=D1=87=D1=82=D0=BE=20=D0=BE=D0=BD=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=B5=D1=82=3F=20=D0=B7=D0=B0=D1=87=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BE=D0=BD=D0=BE=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/quests_class.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/classes/quests_class.php b/classes/quests_class.php index 78667e1..7dc9eda 100644 --- a/classes/quests_class.php +++ b/classes/quests_class.php @@ -10,8 +10,8 @@ class Quests $r = 1; - $qlst = db::c()->query('SELECT `vals` FROM `actions` WHERE `uid` = ?i AND `vars` = "?s"', $uid, 'start_quest'. $pl['id'])->fetch_assoc(); - if (db::c()->getAffectedRows() AND !in_array($qlst['vals'],['win','end','vals'])) $r = 2; + $qlst = db::c()->query('SELECT `vals` FROM `actions` WHERE `uid` = ?i AND `vars` = "?s"', $uid, 'start_quest' . $pl['id'])->fetch_assoc(); + if (db::c()->getAffectedRows() AND !in_array($qlst['vals'], ['win', 'end', 'vals'])) $r = 2; unset($qlst, $qlst2); @@ -76,7 +76,7 @@ class Quests if (db::c()->getAffectedRows()) { $tms = (time() + 60 * 60 * $pl['time']); db::c()->query('INSERT INTO `actions` (`uid`, `time`, `city`, `room`, `vars`, `ip`, `vals`, `val`) VALUES (?i,?i,"?s",?i,"?s","?s","?s","?s")', - $uid, time(), 'capitalcity', 0, 'start_quest'. $id, $_SERVER['HTTP_X_REAL_IP'], 'go', $tms); + $uid, time(), 'capitalcity', 0, 'start_quest' . $id, $_SERVER['HTTP_X_REAL_IP'], 'go', $tms); return 'Вы успешно получили задание "' . $pl['name'] . '"'; } else { return 'Не удалось получить данное задание ...'; @@ -91,7 +91,7 @@ class Quests $tr = ''; $za = ''; - $qlst = db::c()->query('SELECT `vals`, `time` FROM `actions` WHERE `uid` = ?i AND `vars` = "?s" ORDER BY `time` DESC', $u, 'start_quest'. $pl['id'])->fetch_assoc(); + $qlst = db::c()->query('SELECT `vals`, `time` FROM `actions` WHERE `uid` = ?i AND `vars` = "?s" ORDER BY `time` DESC', $u, 'start_quest' . $pl['id'])->fetch_assoc(); $ds = $this->expl($pl['win_date']); if (isset($ds['add_cr'])) $nagr .= "Деньги: {$ds['add_cr']} кр. "; if (isset($ds['add_point'])) $nagr .= "Репутация: {$ds['add_point']} ед. "; @@ -102,7 +102,7 @@ class Quests if (isset($d['heal'])) $tr .= "Вылечить {$d['heal']} игроков от травм.
"; if (isset($d['tr_win_haot'])) $tr .= "Выиграть {$d['tr_win_haot']} хаотических поединков.
"; if (isset($d['kill_clone'])) $tr .= "Выиграть {$d['kill_clone']} поединков против своего клона.
"; - if(isset($d['tr_win'])) $tr .= "Выйграть {$d['tr_win']} физических поединков против игроков.
"; + if (isset($d['tr_win'])) $tr .= "Выйграть {$d['tr_win']} физических поединков против игроков.
"; if (isset($d['kill_bot'])) { $x = ''; @@ -127,13 +127,18 @@ class Quests } $d = $this->expl($pl['tr_date']); - $r .= "
я берусь за задание {$pl['name']}
"; - $r .= "
{$pl['info']}
Награда: {$nagr}
-
Время на выполнение: {$pl['time']} ч.

{$ts}{$za} -
Задание для [{$pl['min_lvl']}-{$pl['max_lvl']}] уровней, с задержкой {$pl['heal']} ч.
"; - - $r .= ''; - + $r .= <<

{$pl['name']}

+
Я берусь за задание!
+
{$pl['info']}
+
+Награда: {$nagr}
+Время на выполнение: {$pl['time']} ч.
+{$ts}{$za}
+Задание для [{$pl['min_lvl']}-{$pl['max_lvl']}] уровней, с задержкой {$pl['heal']} ч. +
+ +TASK; return $r; } @@ -457,7 +462,6 @@ class Quests } - public function expl($d) { $i = 0;