diff --git a/city.php b/city.php index 6d4ebd1..4cedabc 100644 --- a/city.php +++ b/city.php @@ -35,53 +35,29 @@ function can_i_move() $eff = db::c()->query('SELECT `type` FROM `effects` WHERE `owner` = ?i AND (`type` = 10 OR `type` = 13 OR `type` = 14)', $user['id'])->fetch_assoc(); if ($d['mass'] > get_meshok()) { err('У вас переполнен рюкзак, вы не можете передвигаться...'); - $location[0] = NULL; + return false; } if ($eff['type'] == 10) { err('Вы парализованы и не можете передвигаться...'); - $location[0] = NULL; + return false; } if ($eff['type'] == 13 OR $eff['type'] == 14) { err('У вас тяжелая травма, вы не можете передвигаться...'); - $location[0] = NULL; + return false; } + return true; } -/** - * Перемещаемся по заданным параметрам в пределах страницы - * @param int $room - номер локации - * @param string $roomname - название локации - */ -function move_to_inside($room = 0, $roomname = 'неизвестное место') +function move($room, $redirect = false) { -db::c()->query('UPDATE `users`,`online` SET `users`.`room` = ?i,`online`.`room` = ?i WHERE `online`.`id` = `users`.`id` AND `online`.`id` = ?i', $room, $room, $_SESSION['uid']); -?> - - - - - - -setTimeout(function(){location.href='city.php'} , 5000); -
-
Переходим на $roomname... -
- "); -} - -/** - * Перемещаемся по заданным параметрам за пределами страницы - * @param int $room - номер локации - * @param string $redirect - имя скрипта на который идёт редирект - */ -function move_to_outside($room = 0, $redirect = 'city') -{ - db::c()->query('UPDATE `users`,`online` SET `users`.`room` = ?i,`online`.`room` = ?i WHERE `online`.`id` = `users`.`id` AND `online`.`id` = ?i', $room, $room, $_SESSION['uid']); - header('location: ' . $redirect); + if (can_i_move()) { + db::c()->query('UPDATE `users`,`online` SET `users`.`room` = ?i,`online`.`room` = ?i WHERE `online`.`id` = `users`.`id` AND `online`.`id` = ?i', $room, $room, $_SESSION['uid']); + if ($redirect) { + header('location: ' . $redirect);} + die(); + } } $dig_raw = db::c()->query('SELECT `finish_dig`, `finish_guard` FROM `digger` WHERE `id` = ?i', $user['id'])->fetch_assoc(); @@ -95,28 +71,28 @@ $location = explode('/', filter_input(INPUT_SERVER, 'QUERY_STRING')); can_i_move(); switch ($location[0]) { case 'cp': - move_to_inside(20, 'Центральную площадь'); + move(20); break; case 'strah': - move_to_inside(21, 'Страшилкину Улицу'); + move(21); break; case 'bps': - move_to_inside(26, 'Большую Парковую улицу'); + move(26); break; case 'ps': - move_to_inside(51, 'Парковую улицу'); + move(51); break; case 'zaliv': - move_to_inside(2111, 'Ристалище'); + move(2111); break; case 'zamk': - move_to_inside(2601, 'Замковую площадь'); + move(2601); break; case 'abog': - move_to_inside(2655, 'Арену Богов'); + move(2655); break; case 'torg': - move_to_inside(2702, 'Торговую улицу'); + move(2702); break; case 'got': if ($user['room'] == 20) { @@ -138,25 +114,25 @@ switch ($location[0]) { header('location: city.php?torg'); break; case 'level17': - move_to_outside(50, 'ashop.php'); + move(50, 'ashop.php'); break; case 'level2': - move_to_outside(22, 'shop.php'); + move(22, 'shop.php'); break; case 'level4': - move_to_outside(23, 'repair.php'); + move(23, 'repair.php'); break; case 'level10': - move_to_outside(35, 'krshop.php'); + move(35, 'krshop.php'); break; case 'level9': - move_to_outside(24, 'new_year.php'); + move(24, 'new_year.php'); break; case 'level6': - move_to_outside(27, 'post.php'); + move(27, 'post.php'); break; case 'level3': - move_to_outside(26, 'comission.php'); + move(25, 'comission.php'); break; } } elseif ($user['room'] == 21) { @@ -168,19 +144,19 @@ switch ($location[0]) { header('location: city.php?zaliv'); break; case 'level13': - move_to_outside(34, 'fshop.php'); + move(34, 'fshop.php'); break; case 'level5': - move_to_outside(29, 'bank.php'); + move(29, 'bank.php'); break; case 'level16': - move_to_outside(31, 'tower.php'); + move(31, 'tower.php'); break; case 'level14': - move_to_outside(30, 'klanedit.php'); + move(30, 'klanedit.php'); break; case 'level650': - move_to_outside(650, 'ul_clans.php'); + move(650, 'ul_clans.php'); break; } } elseif ($user['room'] == 2111) { @@ -192,16 +168,16 @@ switch ($location[0]) { header('location: city.php?haos'); break; case 'level203': - move_to_outside(1055, 'group_arena.php'); + move(1055, 'group_arena.php'); break; case 'level1000': - move_to_outside(620, 'enter_cave.php'); + move(620, 'enter_cave.php'); break; case 'room666': - move_to_outside(666, 'jail.php'); + move(666, 'jail.php'); break; case 'level5': - move_to_outside(203, 'church.php'); + move(203, 'church.php'); break; } } elseif ($user['room'] == 2601) { @@ -213,25 +189,25 @@ switch ($location[0]) { header('location: city.php?abog'); break; case 'level21': - move_to_outside(87, 'dshop.php'); + move(87, 'dshop.php'); break; case 'level10': - move_to_outside(35, 'krshop.php'); + move(35, 'krshop.php'); break; case 'level44': - move_to_outside(203, 'church.php'); + move(203, 'church.php'); break; /*FIXME Второй вход в церковь?*/ case 'level1': - move_to_outside(37, 'gotzamok.php'); + move(37, 'gotzamok.php'); break; case 'level1052': - move_to_outside(1053, 'repshop.php'); + move(1053, 'repshop.php'); break; case 'level1051': - move_to_outside(1051, 'lab_enter.php'); + move(1051, 'lab_enter.php'); break; case 'level5': - move_to_outside(404, 'vxod.php'); + move(404, 'vxod.php'); break; } } elseif ($user['room'] == 2701) { @@ -240,7 +216,7 @@ switch ($location[0]) { header('location: city.php?zaliv'); break; case 'level2': - move_to_outside(402, 'lab_chaos_enter.php'); + move(402, 'lab_chaos_enter.php'); break; } } elseif ($user['room'] == 2702) { @@ -249,13 +225,13 @@ switch ($location[0]) { header('location: city.php?cp'); break; case 'level5': - move_to_outside(1054, 'fontan_luck.php'); + move(1054, 'fontan_luck.php'); break; case 'level202': - move_to_outside(1054, 'fontan_luck.php'); + move(1054, 'fontan_luck.php'); break; case 'level6': - move_to_outside(61, 'akadem.php'); + move(61, 'akadem.php'); break; } } elseif ($user['room'] == 2655) { @@ -264,7 +240,7 @@ switch ($location[0]) { header('location: city.php?zamk'); break; case 'level2055': - move_to_outside(603, 'aren_of_angels.php'); + move(603, 'aren_of_angels.php'); break; } } elseif ($user['room'] == 26) { @@ -276,47 +252,73 @@ switch ($location[0]) { header('location: city.php?zamk'); break; case 'level5': - move_to_outside(43, 'znahar.php'); + move(43, 'znahar.php'); break; case 'level660': - move_to_outside(660, 'hostel.php'); + move(660, 'hostel.php'); break; case 'level20': - move_to_outside(223, 'bench.php'); + move(223, 'bench.php'); break; case 'level21': - move_to_outside(222, 'bench_s.php'); + move(222, 'bench_s.php'); break; case 'level22': - move_to_outside(224, 'bench_m.php'); + move(224, 'bench_m.php'); break; case 'level7': - move_to_outside(777, 'obshaga.php'); + move(777, 'obshaga.php'); break; case 'level11': - move_to_outside(42, 'lotery.php'); + move(42, 'lotery.php'); + break; + case 'level56': + move(401, 'hell.php'); break; -// case 'level5': -// move_to_outside(401, 'hell.php'); -// break; -// case 'level6': -// move_to_outside(110, 'jackill.php'); -// break; } } break; } +function getSeason() +{ + $todayMonth = date('n'); + if ($todayMonth >= 3 && $todayMonth <= 5) return 'spring_'; + if ($todayMonth >= 6 && $todayMonth <= 8) return 'summer_'; + if ($todayMonth >= 9 && $todayMonth <= 11) return 'autumn_'; + return 'winter_'; +} + +function buildset($id, $img, $top, $left, $des, $noSeason = 0) +{ + if (!$noSeason) $img = getSeason() . $img; + ?> +
+ <?= $des ?> +
+ = 6 && $daytime <= 21) $background = getSeason() . $img . '_day'; + else $background = getSeason() . $img . '_night'; + echo sprintf('
', $background); +} + $online = db::c()->query('SELECT 1 FROM `online` WHERE `real_time` >= ?i', (time() - 60)); ?> - + + + + + + - - + +
+ + + +
- - + - - - -
+
+ + + + + + + -
+ Отдел "" +
+ + 0 ORDER by `setsale` ASC"); + while ($row = mysql_fetch_array($data)) { + $row['cost'] = $row['setsale']; + echo " + +
Ваш товар + "; + showitem($row); + echo ""; + } + } elseif ($_REQUEST['sale']) { + echo ""; + $data = mysql_query("SELECT * FROM `inventory` WHERE `setsale` = 0 AND `owner` = '{$_SESSION['uid']}' AND `dressed` = 0 AND `present` = '' ORDER by `update` DESC; "); + while ($row = mysql_fetch_array($data)) { + echo " + "; + showitem($row); + echo ""; + } + } elseif ($_REQUEST['unsale']) { + $data = mysql_query("SELECT * FROM `inventory` WHERE `setsale` > 0 AND `owner` = '{$_SESSION['uid']}' AND `dressed` = 0 ORDER by `update` DESC; "); + while ($row = mysql_fetch_array($data)) { + echo " + "; + showitem($row); + echo ""; + } + } else { + $data = mysql_query("SELECT DISTINCT `img`, `name`, `nalign`,`massa` FROM `inventory` WHERE `dressed`=0 AND `setsale` > 0 AND `present` = '' AND `otdel` = '" . $_GET['otdel'] . "' GROUP BY `img` ORDER by `cost` ASC"); + while ($row = mysql_fetch_array($data)) { + $item_name1 = str_replace("+1", "", $row[1]); + $item_name1 = str_replace("+2", "", $item_name1); + $item_name1 = str_replace("+3", "", $item_name1); + $item_name1 = str_replace("+4", "", $item_name1); + $item_name1 = str_replace("+5", "", $item_name1); + $item_name = str_replace(" (мф)", "", $item_name1); + $item = mysql_fetch_array(mysql_query("SELECT count(`id`), min(duration), min(maxdur), max(duration), max(maxdur), min(setsale), max(setsale) FROM `inventory` WHERE `dressed`=0 AND `setsale` > 0 AND `present` = '' AND name LIKE '" . $item_name . "%';")); - + ?> + > + + + +
"; + if ($row['owner'] != $user['id']) { + ?> +
+ купить
Комиссия за услуги магазина составляет 10% от цены, по которой вы предлагаете предмет.
"; + ?> +
+ cдать в магазин +
"; + ?> +
забрать за 1 кр. +
+ сменить цену
за 0.1 кр. +

подробнее		 + + (Масса: )
+ Цена: - кр. + (количество: ) +
- - - - - + +
Отдел "-/ + -
-} - - - ?>" - -
- - 0 ORDER by `setsale` ASC"); - while($row = mysql_fetch_array($data)) { - $row['count'] = 1; - $row['cost'] = $row['setsale']; - if ($i==0) { $i = 1; $color = '#C7C7C7';} else { $i = 0; $color = '#D5D5D5'; } - echo " - -
Ваш товар - "; - showitem ($row); - echo ""; - } -} -elseif ($_REQUEST['sale']) { - echo ""; - $data = mysql_query("SELECT * FROM `inventory` WHERE `setsale` = 0 AND `owner` = '{$_SESSION['uid']}' AND `dressed` = 0 AND `present` = '' ORDER by `update` DESC; "); - while($row = mysql_fetch_array($data)) { - $row['count'] = 1; - if ($i==0) { $i = 1; $color = '#C7C7C7';} else { $i = 0; $color = '#D5D5D5'; } - echo " - "; - showitem ($row); - echo ""; - } -} elseif ($_REQUEST['unsale']) { - $data = mysql_query("SELECT * FROM `inventory` WHERE `setsale` > 0 AND `owner` = '{$_SESSION['uid']}' AND `dressed` = 0 ORDER by `update` DESC; "); - while($row = mysql_fetch_array($data)) { - $row['count'] = 1; - if ($i==0) { $i = 1; $color = '#C7C7C7';} else { $i = 0; $color = '#D5D5D5'; } - echo " - "; - showitem ($row); - echo ""; - } -} else -{ - $data = mysql_query("SELECT DISTINCT `img`, `name`, `nalign`,`massa` FROM `inventory` WHERE `dressed`=0 AND `setsale` > 0 AND `present` = '' AND `otdel` = '".$_GET['otdel']."' GROUP BY `img` ORDER by `cost` ASC"); - while($row = mysql_fetch_array($data)) { - $item_name1=str_replace("+1","",$row[1]); - $item_name1=str_replace("+2","",$item_name1); - $item_name1=str_replace("+3","",$item_name1); - $item_name1=str_replace("+4","",$item_name1); - $item_name1=str_replace("+5","",$item_name1); - $item_name=str_replace(" (мф)","",$item_name1); - $item = mysql_fetch_array(mysql_query("SELECT count(`id`), min(duration), min(maxdur), max(duration), max(maxdur), min(setsale), max(setsale) FROM `inventory` WHERE `dressed`=0 AND `setsale` > 0 AND `present` = '' AND name LIKE '".$item_name."%';")); - //$row['count']=1; - if ($i==0) { $i = 1; $color = '#C7C7C7';} else { $i = 0; $color = '#D5D5D5'; } - ?> - > - - - - + + + +
"; - if($row['owner'] != $user['id']){ - ?> -
купить
Комиссия за услуги магазина составляет 10% от цены, по которой вы предлагаете предмет.
"; - ?> -
cдать в магазин -
"; - ?> -
забрать за 1 кр. -
сменить цену
за 0.1 кр. -

подробнее		 - (Масса: )
- Цена: - кр. (количество: )
- - Долговечность: -/-
- -
+
+ 		+
+
+
+
+
+
+ Масса всех ваших вещей: +
У вас в наличии: кр. +
+
Отделы магазина
+
+
Оружие:
+
кинжалы
+
топоры
+
дубины
+
мечи
+
Одежда:
+
шлемы
+
тяжелая броня
+
легкая броня
+
щиты
+
перчатки
+
сапоги
+
Ювелирные товары:
+
серьги
+
ожерелья
+
кольца
+
Магия:
+
боевые
+
разные
+
Разное:
+
амуниция
+
+
+
+
-
- - 		- -
-
- - - -
- -

-
Масса всех ваших вещей:
- У вас в наличии: кр.
-
- -
- \ No newline at end of file diff --git a/locations/style.css b/locations/style.css deleted file mode 100644 index a5767c8..0000000 --- a/locations/style.css +++ /dev/null @@ -1,62 +0,0 @@ -.city-location-container { - width: 950px; - margin: 0 auto; -} - -.city-location-container .fireworks { - position: absolute; - left: 4px; - right: 0; - z-index: 1500; - top: 5px; -} - -.city-location-container .fireworks #frvrks { - position:relative; -} - -.city-location-container .location-map { - position:relative; - cursor: pointer; - width: 950px; -} - -.city-location-container .location { - position: absolute; - z-index: 90; -} - -.city-location-container .location img:not([title]), -.city-location-container .location img[title=""] { - /*border: dashed 1px yellow;*/ -} - -.city-location-container .location img:not([onclick]) { - border: dashed 1px red; -} - -.city-location-container .location img:hover { - -webkit-filter: drop-shadow(0px 0px 2px rgba(255,255,255,1)); - filter: url(#drop-shadow); - -ms-filter: "progid:DXImageTransform.Microsoft.Dropshadow(OffX=0, OffY=0, Color='#FFF')"; - filter: drop-shadow(0px 0px 2px rgba(255,255,255,1)); -} - -.city-location-container .footnote { - border-top: solid 1px #aaa; -} - -.city-location-container .footnote * { - font-size: 80%; -} - -.error-msg { - background-color: #f2dede; - border: solid 1px red; - text-align: center; - color: red; - font-weight: bold; - padding: .5em; - margin-bottom: .5em; - border-radius: 3px; -} diff --git a/shop.php b/shop.php index 24b8508..44f3b17 100644 --- a/shop.php +++ b/shop.php @@ -69,9 +69,6 @@ switch ($shopCategoryTypeNumber) { case 6: $shopCategoryType = "Амуниция"; break; - case 52: - $shopCategoryType = "Руны"; - break; } if (false == $saleItems) { @@ -299,7 +296,6 @@ if (!empty($_GET['buy'])) {
разные
Разное:
амуниция
-
руны
diff --git a/user_abilities.php b/user_abilities.php index f66b8fa..b29f8f3 100644 --- a/user_abilities.php +++ b/user_abilities.php @@ -10,6 +10,12 @@ session_start(); if (!isset($_SESSION['uid'])) header("Location: index.php"); require_once 'functions.php'; +if (!empty($_GET['teeleport']) AND $user['admin'] == 1) { + db::c()->query('UPDATE `users`,`online` SET `users`.`room` = 20,`online`.`room` = 20 WHERE `online`.`id` = `users`.`id` AND `online`.`id` = ?i', $_SESSION['uid']); + header('location: city.php?cp'); + die(); +} + ?> @@ -18,7 +24,12 @@ require_once 'functions.php'; -
+
+ + + + +

Особые умения