new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity

#4 Отображение рун в храме

Browse Source
This commit is contained in:
Ivor Barhansky 2022-06-09 22:17:47 +03:00
parent 4301cb59b6
commit 7bbc3c3358
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_incl_data/class/Insallah/Runes/Runes.php
View File

@ -158,6 +158,5 @@ class Runes
'rune_level' => $runelevel,
'query' => $query
];
}
}

23
_incl_data/class/__user.php
View File

@ -698,7 +698,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
//Òèï óðîíà: 0 - íåò óðîíà, 1 - êîëþùèé, 2 - ðóáÿùèé, 3 - äðîáÿùèé, 4 - ðåæóùèé, 5 - îãîíü, 6 - âîçäóõ, 7 - âîäà, 8 - çåìëÿ, 9 - ñâåò, 10 - òüìà, 11 - ñåðàÿ
if ($item['type'] == 18) {
//êîëþùèé
$sss = ceil($st['s2'] * 1);
$sss = ceil($st['s2'] * 0.75);
} elseif ($item['type'] == 19) {
//ðóáÿùèé
$sss = ceil($st['s1'] * 0.75);
@ -6728,20 +6728,16 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
} elseif ($type == 67 && $pl['gift'] != '') {
$see1 = 0;
} elseif ($type == 11) { // Õðàì Çíàíèé (ïëàâêà ïðåäìåòîâ)
if ($pl['inTransfer'] > 0 || (isset($po['sudba']) && $po['sudba'] != '0' && $po['sudba'] != $this->info['login'])) { // $po['sudba'] != ''&& $po['sudba'] != '0' && $po['sudba'] != '1' && $po['sudba'] != $this->info['id'])
$see1 = 0;
}
if ($pl['type'] != 1 && $pl['type'] != 3 && $pl['type'] != 9 && $pl['type'] != 10 && $pl['type'] != 11 && $pl['type'] != 5 && $pl['type'] != 6 && $pl['type'] != 8 && $pl['type'] != 12 && $pl['type'] != 14 && $pl['type'] != 15 && $pl['type'] != 18 && $pl['type'] != 19 && $pl['type'] != 20 && $pl['type'] != 21 && $pl['type'] != 22 && $pl['type'] != 13 && $pl['type'] != 72 && $pl['item_id'] != 1035) {
$see1 = 0;
}
if ($po['tr_lvl'] < 4 && $pl['item_id'] != 1035) {
if (
$pl['inTransfer'] > 0 ||
(!empty($po['sudba']) && $po['sudba'] != $this->info['login']) ||
!in_array($pl['type'], [1, 3, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 18, 19, 20, 21, 22, 72, 1035]) ||
($po['tr_lvl'] < 4 && $pl['item_id'] != 1035)
) {
$see1 = 0;
}
} elseif ($type == 14) { // Õðàì Çíàíèé (ïëàâêà ðóí)
if ($pl['inTransfer'] > 0) {
$see1 = 0;
}
if ($pl['type'] != 31) {
if ($pl['inTransfer'] > 0 || !in_array($pl['type'], [31, 6001, 6002, 6003]) {
$see1 = 0;
}
} elseif ($type == 12) {
@ -12237,7 +12233,8 @@ LIMIT 1'));
if ($this->info['upexpdate'] == 0) {
$this->info['upexpdate'] = time();
mysql_query('UPDATE `stats` SET `upexpdate` = "' . time() . '" WHERE `id` = "' . $this->info['id'] . '" LIMIT 1');
} elseif (time() >= ($this->info['upexpdate'] + 4 * 60 * 60 * 24)) {
} elseif (time() >= ($this->info['upexpdate'] + 400 * 60 * 60 * 24)) //4*60*60*24
{
$this->info['upexpdate'] = time();
$this->info['expstopu'] = $this->info['expstopu'] + 1;
mysql_query('UPDATE `stats` SET `upexpdate` = "' . time() . '",`expstopu` = `expstopu`+1 WHERE `id` = "' . $this->info['id'] . '" LIMIT 1');

4
modules_data/location/ab/hram.php
View File

@ -32,8 +32,6 @@ if (isset($_GET['itm']) && $qst_hram && $_GET['itm'] > 0) {
$resz = 'Не удалось расплавить одну руну, она не сгорела.';
} elseif (!isset($itm1['id']) || !isset($itm2['id']) || !isset($itm3['id'])) {
$resz = 'Недостаточно компонентов для преобразования.';
} elseif ($itm1['level'] != $itm2['level'] || $itm1['level'] != $itm3['level']) {
$resz = 'Руны должны быть одного уровня.';
}
if (empty($resz)) {
$check = \Insallah\Runes::checkParts($itm1['item_id'], $itm2['item_id'], $itm3['item_id'], $u->rep['rep1']);
@ -358,7 +356,7 @@ if (!isset($_GET['r'])) {
<? } elseif ($_GET['r'] == 2) {
$itmAll = '';
$itmAllSee = '';
$itmAll = $u->genInv(14, '`iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete` = "0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND ((`im`.`type` = 31 AND `im`.`id` != 6001 AND `im`.`id` != 6002 AND `im`.`id` != 6003) OR`im`.`type` = 72) ORDER BY `lastUPD` DESC');
$itmAll = $u->genInv(14, '`iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete` = "0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND (`im`.`type` = 31 OR`im`.`type` = 72) ORDER BY `lastUPD` DESC');
if ($itmAll[0] == 0) {
$itmAllSee = '<tr><td align="center" bgcolor="#e2e0e0">ПУСТО (нет подходящих предметов)</td></tr>';
} else {