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

refactor

Browse Source
This commit is contained in:
Ivor Barhansky 2024-02-10 03:12:05 +02:00
parent 7986d33ab6
commit 7c15294688
13 changed files with 389 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.htaccess
View File

@ -1,7 +1,10 @@
DefaultLanguage ru
<IfModule mod_rewrite.c>
<IfModule mod_headers.c>
Header always set X-Content-Type-Options nosniff
</IfModule>
<IfModule mod_rewrite.c>
Options -Indexes
Options -MultiViews
RewriteEngine On

55
_incl_data/class/Battle.php
View File

@ -462,6 +462,7 @@ class Battle
$st = $this->stats[$this->uids[$id]];
$itm = $this->stats[$this->uids[$id]]['items'];
$eff = $this->stats[$this->uids[$id]]['effects'];
$i = 0;
$img = Config::img();
@ -470,6 +471,9 @@ class Battle
$armor3 = '<br>Броня пояса: ';
$armor4 = '<br>Броня ног: ';
if (empty($eff)) {
$ef = '';
} else {
if ($u->info['seff'] < 1) {
# Передаётся в js, переносы строк всё ломают!
$ef = <<<HTML
@ -633,6 +637,7 @@ class Battle
}
$i++;
}
} else {
$ef = <<<HTML
<div class="pimg" pog="0" col="0" stl="0" stt="Развернуть">
@ -644,7 +649,7 @@ class Battle
</div>
HTML;
}
}
$ca = '';
if ($ur['clan'] > 0) {
@ -712,9 +717,9 @@ JS;
$i = 0;
if (is_array($itm)) {
while ($i < count($itm)) {
//
if (isset($st['items_img'][$tpImg[$itm[$i]['inOdet']]])) {
if (isset($tpImg[$itm[$i]['inOdet']], $st['items_img'][$tpImg[$itm[$i]['inOdet']]])) {
$itm[$i]['img'] = $st['items_img'][$tpImg[$itm[$i]['inOdet']]];
}
//генерируем предметы
@ -782,7 +787,7 @@ JS;
}
$var1 = (int)$t;
$var2 = (int)$itm[$i]['uid'];
$var2 = (int)$id;
$var3 = (int)$itm[$i]['id'];
$var4 = (int)$itm[$i]['inOdet'];
$var5 = $itm[$i]['name'];
@ -808,7 +813,6 @@ JS;
public function testUsersLive(): bool
{
$tl = 0;
for ($i = 0; $i < count($this->uids); $i++) {
if (empty($this->stats[$i]['id'])) {
continue;
@ -1455,7 +1459,7 @@ JS;
*/
private function testExp($y, $s2): int
{
if ($s2['levels'] == 'undefined' || $this->users[$this->uids[$s2['id']]]['pass'] == 'saintlucia') {
if ($s2['levels'] == 'undefined' || $this->users[$this->uids[$s2['id']]]['bot'] > 0) {
return 0;
}
@ -1860,7 +1864,7 @@ JS;
mysql_query('DELETE FROM `battle_act` WHERE `id` = "' . $pl['id'] . '"');
}
}
}
//тест удара
if ($this->uAtc['id'] > 0) {
if ($pl['out1'] == 0 && $pl['out2'] == 0) {
@ -1872,6 +1876,7 @@ JS;
$this->addNewAtack($u);
}
}
}
//тест, бот делает удары
while ($i < count($this->bots)) {
@ -1879,10 +1884,9 @@ JS;
if (
isset($bot) &&
$this->stats[$this->uids[$bot]]['hpNow'] >= 1 &&
$this->stats[$this->uids[$bot]]['pass'] != 'saintlucia'
$this->users[$this->uids[$bot]]['bot'] != 1
) { //Тут проверка на бота saintlucia
$j = 0;
while ($j < count($this->users)) {
if ($this->i->razdel == 0) {
$tnbot = time() + rand(1, 1);
@ -1955,25 +1959,28 @@ JS;
$this->users[$j]['hpnow'] >= 1 &&
$this->users[$this->uids[$bot]]['hpnow'] >= 1
) {
if (isset($this->ga[$bot][$this->users[$j]['id']])) {
$this->atacks[$this->ga[$bot][$this->users[$j]['id']]]['a1'] =
rand(1, 5) . '' . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
$this->atacks[$this->ga[$bot][$this->users[$j]['id']]]['b1'] = rand(1, 5);
$this->atacks[$this->ga[$bot][$this->users[$j]['id']]]['a2'] =
rand(1, 5) . '' . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
$this->atacks[$this->ga[$bot][$this->users[$j]['id']]]['b2'] = rand(1, 5);
}
if (isset($this->ag[$bot][$this->users[$j]['id']])) {
$this->atacks[$this->ag[$bot][$this->users[$j]['id']]]['a1'] =
rand(1, 5) . '' . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
$this->atacks[$this->ag[$bot][$this->users[$j]['id']]]['b1'] = rand(1, 5);
$this->atacks[$this->ag[$bot][$this->users[$j]['id']]]['a2'] =
rand(1, 5) . '' . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5) . rand(1, 5);
$this->atacks[$this->ag[$bot][$this->users[$j]['id']]]['b2'] = rand(1, 5);
}
if (
isset($this->ga[$bot][$this->users[$j]['id']]) &&
@ -2022,7 +2029,16 @@ JS;
}
}
//Приемы которые используются моментально (в конце хода)
/**
* Массово встречается в подключаемых файлах приёмов.
* @param array $arr
* @return void
* @deprecated
*/
public function add_log(array $arr): void
{
Log::add($arr);
}
private function botAtack($uid, $pl, $tp): void
{
@ -2217,7 +2233,7 @@ JS;
// Заносим в логи + записываем статистику боя
$this->addlogRazmen($id, $at);
var_dump($at);
//Запускаем магию предметов
$this->magicItems($this->atacks[$id]['uid1'], $this->atacks[$id]['uid2'], $id);
$this->magicItems($this->atacks[$id]['uid2'], $this->atacks[$id]['uid1'], $id);
@ -3867,7 +3883,7 @@ JS;
Log::add($mas);
$j++;
}
var_dump($at);
}
//Добавляем статистику + записываем в баттл_юзерс НР игроков
@ -4414,6 +4430,8 @@ JS;
return;
}
var_dump($_POST);
//atack: '3_2_0_0_0' (length=9)
//block: '5' (length=1)
@ -4441,6 +4459,7 @@ JS;
}
$this->uAtc = $na;
$js .= 'testClearZone();';
var_dump($this->uAtc);
}
public function teamsTake(User $u): void
@ -4769,6 +4788,7 @@ JS;
while ($i < count($this->uids)) {
if ($this->stats[$i]['hpNow'] > 0) {
if (!isset($teams[$this->users[$i]['team']])) {
$teams[$this->users[$i]['team']] = '';
$tms[$j] = $this->users[$i]['team'];
$j++;
}
@ -4821,6 +4841,7 @@ JS;
$i++;
}
//генерируем команды
$i = 0;
while ($i < count($tms)) {

16
_incl_data/class/Priems.php
View File

@ -2243,13 +2243,17 @@ class Priems
return [0 => $lvar, 1 => $pz];
}
/**
* Генерирует html строку для вставки в JS $("#priems").html(" сюда ");
* @return string
*/
public function seeMy(): string
{
global $btl;
$i = 0;
$p = explode('|', $this->u->info['priems']);
$pr = '';
$all = (int)$_GET['all'];
$all = $_GET['all'] ??= '0';
while ($i < $this->u->info['priemslot']) {
if ($p[$i] > 0) {
$pl = Db::getRow('select * from priems where level <= ? and activ > 0 and id = ?', [$this->u->info['level'], $p[$i]]);
@ -2289,14 +2293,20 @@ class Priems
$notr = $this->testpriem($pl, 2);
$cli2 = '';
if (($pz[$i] > 0 || $notr > 0) || (isset($this->u->stats['nopriems']) && $pl['nosh'] == 0) || $this->u->stats['notuse_last_pr'] == $pl['id']) {
if (($pz[$i] > 0 || $notr > 0) || (isset($this->u->stats['nopriems']) && $pl['nosh'] == 0) || isset($this->u->stats['notuse_last_pr']) && $this->u->stats['notuse_last_pr'] == $pl['id']) {
$cli2 = ' class="nopriemuse" ';
}
/// ТУТ!
$priemName = $pl['name'];
$priemImg = $pl['img'];
// Слава StackOverflow! https://stackoverflow.com/a/43631576
$var = json_encode("<b>$priemName</b><br>$lvar");
$jsOnmouseover = "top.hi(this,$var,event,3,0,1,1,'width: 240px;')";
$htmlJs = htmlspecialchars($jsOnmouseover, ENT_QUOTES);
$pr .= <<<HTML
<a onmouseover="let a = `<b>$priemName</b><br>$lvar`; top.hi(this,a,event,3,0,1,1,'width: 240px;')" onmouseout="top.hic();" onmousedown="top.hic();" $cl>
<a onmouseover="$htmlJs" onmouseout="top.hic();" onmousedown="top.hic();" $cl>
<img $cli2 style="margin-top: 3px; margin-left: 4px;" src="//img.new-combats.tech/i/eff/$priemImg.gif" alt=""></a>
</a>
HTML;

6
_incl_data/class/User/Stats.php
View File

@ -171,9 +171,9 @@ class Stats
$st['items'] = [];
$st['effects'] = [];
if (!empty($u['vip'])) {
$st['vip'] = $u['vip'];
}
foreach (Conversion::dataStringToArray($u['stats']) as $stat => $value) {
//fixme несуществующие статы mg5 mg6 a6 s8-s15
@ -297,7 +297,7 @@ class Stats
//Бонусы комплектов
if (is_iterable($coms['new'])) {
if (isset($coms['new']) && is_iterable($coms['new'])) {
foreach ($coms['new'] as $complect) {
$com = Db::getValue(
'select data from complects where com = ? and x <= ? order by x desc limit 1',

2
_incl_data/class/User/WearedScrolls.php
View File

@ -15,7 +15,7 @@ class WearedScrolls
public static function ScrollsChange(array &$u): void
{
//Замена свитков
if ($u['autospell'] == 0 || $u['battle'] != 0) {
if (empty($u['autospell']) || !empty($u['battle'])) {
return;
}
//проверяем свитки

6
buttons.php
View File

@ -76,7 +76,7 @@ if (!isset($_COOKIE['d1c'])) {
<meta name="keywords" content="<?= Config::get('keys') ?>"/>
<meta name="msapplication-config" content="browserconfig.xml"/>
<link rel="stylesheet" href="i/main.css">
<link rel="stylesheet" href="css/clu0b.css"/>
<link rel="stylesheet" href="css/club.css"/>
<link rel="stylesheet" href="css/windows.css"/>
<link rel="stylesheet" href="css/hack.css"/>
<script>
@ -642,7 +642,7 @@ if (!isset($_COOKIE['d1c'])) {
<div id="wupbox" onmouseup="win.WstopDrag()" onmousemove="win.WmoveDrag(event)" onselectstart="return false"></div>
<div id="chconfig">
<div style="font-weight: bold; text-align: center;">Настройки чата</div>
<img title="Эпическая линия (o_O)" src="<?= Config::img() ?>/1x1.gif" class="eLine" alt="hr"><br>
<img title="Эпическая линия (o_O)" src="<?= Config::img() ?>/1x1.gif" alt="hr"><br>
Скорость обновления: <SELECT id="chcf0">
<OPTION value='-1'>никогда</OPTION>
<OPTION value='1'>15 сек.</OPTION>
@ -666,7 +666,7 @@ if (!isset($_COOKIE['d1c'])) {
} ?>"><input name="chcf7" type="checkbox" id="chcf7" value="1"> <span
title="Получать сообщения от персонажей на которых наложено заклятие молчания">Сообщения с молчанкой</span>
</div>
<img title="Эпическая линия (o_O)" src="<?= Config::img() ?>/1x1.gif" class="eLine" alt="hr">
<img title="Эпическая линия (o_O)" src="<?= Config::img() ?>/1x1.gif" alt="hr">
<div>&nbsp; &nbsp;&nbsp; <span><a href="javascript:void(0)" onclick="chat.ignorListOpen();chconf();">Список игнорируемых</a></span>
</div>
</div>

153
css/clu0b.css → css/club.css
View File

@ -1,3 +1,5 @@
/* Главный css */
html, body {
width: 100%;
height: 100%;
@ -10,7 +12,7 @@ html, body {
.m0c1 {
display: block;
margin-top: 0px;
margin-top: 0;
}
.m0c2 {
@ -25,20 +27,15 @@ html, body {
FONT-FAMILY: Verdana, Arial, Helvetica, Tahoma, sans-serif;
}
.prmimgyn {
}
.prmimgyn:hover {
filter: alpha(opacity=50);
opacity: 0.5;
-moz-opacity: 0.5;
-khtml-opacity: 0.5;
opacity: 0.5;
}
.h4 {
COLOR: #8f0000;
FONT-FAMILY: Arial;
FONT-FAMILY: Arial, sans-serif;
FONT-SIZE: 11pt;
FONT-WEIGHT: bold;
MARGIN-BOTTOM: 5px;
@ -46,7 +43,7 @@ html, body {
H3 {
COLOR: #8f0000;
FONT-FAMILY: Arial;
FONT-FAMILY: Arial, sans-serif;
FONT-SIZE: 12pt;
FONT-WEIGHT: bold;
TEXT-ALIGN: center
@ -54,7 +51,7 @@ H3 {
H4 {
COLOR: #8f0000;
FONT-FAMILY: Arial;
FONT-FAMILY: Arial, sans-serif;
FONT-SIZE: 11pt;
FONT-WEIGHT: bold;
MARGIN-BOTTOM: 5px;
@ -62,11 +59,11 @@ H4 {
H5 {
COLOR: #4f0000;
FONT-FAMILY: Arial;
FONT-FAMILY: Arial, sans-serif;
FONT-SIZE: 11pt;
FONT-WEIGHT: bold;
MARGIN-BOTTOM: 0px;
MARGIN-TOP: 0px;
MARGIN-BOTTOM: 0;
MARGIN-TOP: 0;
}
a, a:visited {
@ -84,7 +81,7 @@ a:hover {
}
.date {
font-family: Courier;
font-family: Courier, monospace;
font-size: 8pt;
text-decoration: none;
font-weight: normal;
@ -92,7 +89,7 @@ a:hover {
}
.date2 {
font-family: Courier;
font-family: Courier, monospace;
font-size: 8pt;
text-decoration: none;
font-weight: normal;
@ -101,7 +98,7 @@ a:hover {
}
.sysdate {
font-family: Courier;
font-family: Courier, monospace;
font-size: 8pt;
text-decoration: none;
font-weight: normal;
@ -127,7 +124,7 @@ a:hover {
select, textarea, input {
border: solid 1pt #B0B0B0;
font-family: MS Sans Serif;
font-family: MS Sans Serif, sans-serif;
font-size: 10px;
color: #191970;
MARGIN-BOTTOM: 2px;
@ -135,7 +132,7 @@ select, textarea, input {
}
.ahint {
font-family: MS Sans Serif;
font-family: MS Sans Serif, sans-serif;
font-size: 8px;
text-decoration: none;
color: #000080;
@ -144,23 +141,21 @@ select, textarea, input {
#hint2 {
position: absolute;
width: 140;
width: 140px;
background-color: #FFF6DD;
layer-background-color: #FFF6DD;
visibility: hidden
}
#hint3 {
position: absolute;
width: 240;
width: 240px;
background-color: #FFF6DD;
layer-background-color: #FFF6DD;
visibility: hidden
}
#hint4 {
position: absolute;
width: 240;
width: 240px;
visibility: hidden
}
@ -170,17 +165,16 @@ select, textarea, input {
padding: 4px 8px;
border: 1px solid rgba(255, 255, 255, 0.25);
background-color: #cfcfcf;
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
box-shadow: 0 0 3px #000000;
border-radius: 3px;
-webkit-box-shadow: 0 0 3px #000000;
-moz-box-shadow: 0 0 3px #000000;
box-shadow: 0 0 3px #000000;
}
.foryou1 .date {
font-family: Courier;
font-family: Courier, monospace;
font-size: 8pt;
text-decoration: none;
font-weight: normal;
@ -189,7 +183,7 @@ select, textarea, input {
}
.foryou2 .date {
font-family: Courier;
font-family: Courier, monospace;
font-size: 8pt;
text-decoration: none;
font-weight: normal;
@ -259,8 +253,6 @@ img, table {
*[onselectstart="return false"] {
-moz-user-select: none;
-o-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
@ -270,7 +262,7 @@ img, table {
overflow: auto;
white-space: nowrap;
height: 100%;
padding: 5px 0px 0px 0px;
padding: 5px 0 0 0;
}
#chat_list {
@ -295,17 +287,15 @@ img, table {
height: 235px;
border: 2px solid #000;
filter: alpha(opacity=57);
opacity: 0.57;
-moz-opacity: 0.57;
-khtml-opacity: 0.57;
opacity: 0.57;
background-color: #dedede;
}
#ttSmiles:hover {
filter: alpha(opacity=90);
opacity: 0.90;
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
}
#smilesDiv {
@ -321,7 +311,6 @@ img, table {
}
#reline1 {
position: absolute;
width: 100%;
height: 2px;
@ -330,7 +319,6 @@ img, table {
cursor: n-resize;
top: 60%;
z-index: 1001;
}
#reline1:hover {
@ -348,10 +336,6 @@ img, table {
width: 100%;
height: 1px;
background-color: #758999;
/*
background-color:#CCCCCC;
border-bottom:1px solid #797779;
*/
border-top: 1px solid #aaaaaa;
border-bottom: 1px solid #010101;
cursor: default;
@ -386,8 +370,8 @@ img, table {
height: 100%;
display: none;
cursor: default;
top: 0px;
left: 0px;
top: 0;
left: 0;
}
#wupbox {
@ -397,8 +381,8 @@ img, table {
height: 100%;
display: none;
cursor: default;
top: 0px;
left: 0px;
top: 0;
left: 0;
}
#chconfig {
@ -418,13 +402,6 @@ img, table {
width: 100%;
}
.eLine {
background-image: url(../expicLine.gif);
background-repeat: repeat-x;
height: 7px;
width: 100%;
}
#counters {
position: absolute;
bottom: 52px;
@ -432,9 +409,8 @@ img, table {
width: 88px;
height: 31px;
filter: alpha(opacity=35);
opacity: 0.35;
-moz-opacity: 0.35;
-khtml-opacity: 0.35;
opacity: 0.35;
z-index: 1006;
}
@ -443,11 +419,9 @@ img, table {
}
#counters:hover {
filter: Glow(strength=2, color=#DDDDDD);
filter: alpha(opacity=100);
opacity: 1.0;
-moz-opacity: 1.0;
-khtml-opacity: 1.0;
-moz-opacity: 1;
opacity: 1;
}
.cp {
@ -466,7 +440,6 @@ img, table {
display: block;
}
/* часы */
#tdDate {
text-align: center;
@ -501,7 +474,7 @@ img, table {
/* ссылки чата */
.URL-a:hover {
text-decoration: underline
text-decoration: underline;
}
@ -531,169 +504,155 @@ a.menutop:hover {
.chatBtn1_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn1.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn1.gif') 0 0 repeat-x;
}
.chatBtn1_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn1.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn1.gif') 0 -30px repeat-x;
}
.chatBtn18_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn18.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn18.gif') 0 0 repeat-x;
}
.chatBtn18_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn18.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn18.gif') 0 -30px repeat-x;
}
.chatBtn2_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn2.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn2.gif') 0 0 repeat-x;
}
.chatBtn2_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn2.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn2.gif') 0 -30px repeat-x;
}
.chatBtn4_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn4.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn4.gif') 0 0 repeat-x;
}
.chatBtn4_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn4.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn4.gif') 0 -30px repeat-x;
}
.chatBtn5_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0 0 repeat-x;
}
.chatBtn5_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0 -30px repeat-x;
}
.chatBtn5_3 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0px -59px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn5.gif') 0 -59px repeat-x;
}
.chatBtn6_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn6.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn6.gif') 0 0 repeat-x;
}
.chatBtn6_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn6.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn6.gif') 0 -30px repeat-x;
}
.chatBtn7_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0 0 repeat-x;
}
.chatBtn7_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0 -30px repeat-x;
}
.chatBtn7_3 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0px -60px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn7.gif') 0 -60px repeat-x;
}
.chatBtn8_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn8.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn8.gif') 0 0 repeat-x;
}
.chatBtn8_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn8.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn8.gif') 0 -30px repeat-x;
}
.chatBtn21_1 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn21.gif') 0px 0px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn21.gif') 0 0 repeat-x;
}
.chatBtn21_2 {
width: 30px;
height: 30px;
background: url('//img.new-combats.tech/i/buttons/chatBtn21.gif') 0px -30px repeat-x;
background: url('//img.new-combats.tech/i/buttons/chatBtn21.gif') 0 -30px repeat-x;
}
.topusermenu {
font-family: Verdana, Helvetica, Arial, Tahoma, sans-serif;
z-index: 1000;
position: absolute;
background-color: #d2d0d0;
font-size: 13px;
border-top-width: 1px;
border-right-width: 1px;
border-bottom-width: 1px;
border-left-width: 1px;
border-top-style: solid;
border-right-style: solid;
border-bottom-style: solid;
border-left-style: solid;
border-top-color: #929090;
border: 1px solid #929090;
border-right-color: #626060;
border-bottom-color: #626060;
border-left-color: #929090;
}
.inviseMen1 {
filter: alpha(opacity=90);
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
}
.inviseMen2 {
filter: alpha(opacity=60);
-moz-opacity: 0.60;
-khtml-opacity: 0.60;
opacity: 0.60;
}
.inviseMen3 {
filter: alpha(opacity=30);
-moz-opacity: 0.30;
-khtml-opacity: 0.30;
opacity: 0.30;
}
.inviseMen4 {
filter: alpha(opacity=10);
-moz-opacity: 0.10;
-khtml-opacity: 0.10;
opacity: 0.10;
}
@ -740,7 +699,7 @@ a.menutop:hover {
}
.check_gloff {
margin-left: 0px;
margin-left: 0;
}
.check_glon {
@ -748,7 +707,7 @@ a.menutop:hover {
}
.radio_gloff {
margin-left: 0px;
margin-left: 0;
}
.radio_glon {

20
js/btl_mini.js
View File

@ -35,7 +35,7 @@ function testClearZone() {
async function usepriem(id, t, img) {
if (t == 1) {
irn++;
await $.post(`jx/battle/refresh${server_fight}.php?rnd=${ggcode}&irn=${irn}`, {
await $.post(`jx/battle/refresh.php?rnd=${ggcode}&irn=${irn}`, {
idlog: top.id_log,
usepriem: id,
useon: use_on_pers
@ -56,7 +56,7 @@ async function useitem(id, t, use_item_on) {
top.c.noEr = 1;
clearTimeout(top.c.noErTmr);
top.c.noErTmr = setTimeout('top.c.noEr = 0;', 1000);
await $.post(`jx/battle/refresh${server_fight}.php?rnd=${ggcode}&irn=${irn}`, {
await $.post(`jx/battle/refresh.php?rnd=${ggcode}&irn=${irn}`, {
idlog: top.id_log,
useitem: id,
useitemon: use_item_on
@ -276,7 +276,7 @@ async function reflesh(bl) {
top.c.noEr = 1;
clearTimeout(top.c.noErTmr);
top.c.noErTmr = setTimeout('top.c.noEr = 0;', 1000);
await $.post(`jx/battle/refresh${server_fight}.php?irn=${irn}&rnd=${ggcode}`, {
await $.post(`jx/battle/refresh.php?irn=${irn}&rnd=${ggcode}`, {
id: 'reflesh',
idlog: top.id_log,
idpr: priem_use,
@ -296,13 +296,13 @@ async function reflesh(bl) {
function autobattle() {
var i = 1;
while (i <= za) {
if (zas[i] == 0 || top.slcbrc[4] == 1) {
if (zas[i] == 0 || top.slcbrc[4] === 1) {
zas[i] = Math.floor(Math.random(5) * 5 + 1);
change_radio(i, zas[i], 'atack', 1);
}
i++;
}
if (zbs[1] == 0 || top.slcbrc[4] == 1) {
if (zbs[1] == 0 || top.slcbrc[4] === 1) {
zbs[1] = Math.floor(Math.random(5) * 5 + 1);
change_radio(1, zbs[1], 'block', 1);
}
@ -316,17 +316,17 @@ function sleep(time) {
// Действите при выставлении хода и нажатии на Вперёд!
async function atack() {
if (top.slcbrc[3] == 1) autobattle();
if (top.slcbrc[3] === 1) autobattle();
var ago = `${zas[1]}_${zas[2]}_${zas[3]}_${zas[4]}_${zas[5]}`;
var bgo = zbs[1];
const ago = `${zas[1]}_${zas[2]}_${zas[3]}_${zas[4]}_${zas[5]}`;
const bgo = zbs[1];
irn++;
if (top.c.noEr == 0) {
if (top.c.noEr === 0) {
top.c.noEr = 1;
clearTimeout(top.c.noErTmr);
top.c.noErTmr = setTimeout('top.c.noEr = 0;', 1000);
await $.post(`jx/battle/refresh${server_fight}.php?irn=${irn}&rnd=${ggcode}`, {
await $.post(`jx/battle/refresh.php?irn=${irn}&rnd=${ggcode}`, {
atack: ago,
block: bgo,
idlog: top.id_log,

7
js/onlineList.js
View File

@ -87,7 +87,6 @@ const chat = {
}
if (frc.name) {
this.sendSound(frc.sound);
const obj = top.frames.main.document.getElementById('frvrks');
if (obj !== undefined) {
let newhtml = '';
@ -276,14 +275,13 @@ const chat = {
clearTimeout(this.t);
if ($.cookie('btl') !== this.btl) {
if ($.cookie('btl') > 0) {
this.sendSound(2);
if (top.frames['main'].smnpty === undefined) {
if (!top.frames['main'].smnpty) {
top.frames['main'].location.href = "main.php";
}
}
this.btl = $.cookie('btl');
}
if (this.rtime !== this.ct[$.cookie('chatCfg0')] && this.ct[$.cookie('chatCfg0')] !== undefined) {
if (this.rtime !== this.ct[$.cookie('chatCfg0')] && this.ct[$.cookie('chatCfg0')]) {
this.rtime = this.ct[$.cookie('chatCfg0')];
if (this.time > this.rtime) this.time = this.rtime;
}
@ -720,7 +718,6 @@ const chat = {
if (msg_see === 1) {
if (this.trim(data[3].toLowerCase()) === c.login.toLowerCase() || forYou === 1) {
if (data[9] > 0) this.sendSound(data[9]);
if (data[15]) {
this.feerverk(data[15]);
this.feerverk(data[15]);

7
jx/battle/refresh.php
View File

@ -207,8 +207,6 @@ if (!$isBattle) {
$i++;
}
$js .= '$("#priems").html("' . $priem->seeMy() . '");';
$jslog = $btl->lookmLog() . $btl->lookLog();
if ($jslog != '') {
$js = $jslog . $js;
@ -232,6 +230,7 @@ if (!$isBattle) {
$smnpty = (int)$u->info['smena'];
$mainstatus = $btl->mainStatus;
$ggcode = PassGen::new();
$mypriems = $priem->seeMy();
echo <<<HTML
<script>
@ -240,6 +239,7 @@ if (!$isBattle) {
$('#expmaybe').html('$expmaybe');
$('#timer_out').html('$tmr');
$('#pers_magic').html('$persMagic');
$('#priems').html(`$mypriems`);
g_iCount = 30;
noconnect = 15;
connect = 1;
@ -259,7 +259,10 @@ if (!$isBattle) {
tactic(7,'$tactic7');
smena_alls = '0';
ggcode='$ggcode';
$js
</script>
HTML;

15
main.php
View File

@ -271,6 +271,8 @@ if (in_array(
$q->testquest();
}
echo "<!DOCTYPE html>";
$iloc = '';
$iloce = '';
$img = Config::img();
@ -403,8 +405,7 @@ $spl = Db::getValue('select exp from levels where nextlevel = ? order by exp lim
<?php
if (!isset($_GET['mAjax']) && !isset($_GET['ajaxHostel'])) {
echo '<!DOCTYPE html>
<div style="padding-top:0; margin-top:17px; /*height:100%;*/ background-color:#e2e0e1;">';
echo '<div style="padding-top:0; margin-top:17px; background-color:#e2e0e1;">';
}
if (isset($btl_last['id']) && $u->info['battle'] == 0) {
require_once('modules_data/btl_.php');
@ -449,9 +450,7 @@ if (isset($btl_last['id']) && $u->info['battle'] == 0) {
if ($u->info['allLock'] < time()) {
$u->deleteItem(intval($_GET['delete']), $u->info['id']);
} else {
echo '<script>setTimeout(function(){alert("Вам запрещено удалять предметы до ' . date(
'd.m.y H:i', $u->info['allLock']
) . '")},250);</script>';
echo '<script>setTimeout(function(){alert("Вам запрещено удалять предметы до ' . date('d.m.y H:i', $u->info['allLock']) . '")},250);</script>';
}
} elseif (isset($_GET['unstack']) && isset($_GET['inv']) && $u->newAct($_GET['sd4'])) {
$u->unstack(intval($_GET['unstack']), intval($_GET['unstackCount']));
@ -508,7 +507,7 @@ if (isset($_GET['security']) && !isset($u->tfer['id']) && $trololo == 1) {
//поединок
if ((!isset($btl_last['id']) || $u->info['battle'] > 0) && !isset($u->info['battle_lsto'])) {
require_once('modules_data/btl_.php');
echo '<script type="text/javascript" src="js/onlineList.js"></script>';
echo '<script src="js/onlineList.js"></script>';
}
} else {
@ -533,9 +532,7 @@ if (isset($_GET['security']) && !isset($u->tfer['id']) && $trololo == 1) {
) && $trololo == 1 && $u->info['inTurnir'] == 0 && $u->info['inTurnirnew'] == 0) {
if ($u->info['allLock'] > time()) {
require_once('modules_data/_locations.php');
echo '<script>setTimeout(function(){alert("Вам запрещены передачи до ' . date(
'd.m.y H:i', $u->info['allLock']
) . '")},250);</script>';
echo '<script>setTimeout(function(){alert("Вам запрещены передачи до ' . date('d.m.y H:i', $u->info['allLock']) . '")},250);</script>';
} else {
require_once('modules_data/_transfers.php');
}

2
modules_data/alignPanel.php
View File

@ -71,7 +71,7 @@ foreach ($bonus[(int)$u->info['align']]['items'] as $bonusItem) {
?>
<link href="<?= Config::img() ?>/css/main.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="/css/clu0b.css"/>
<link rel="stylesheet" type="text/css" href="../css/club.css"/>
<link rel="stylesheet" type="text/css" href="/css/windows.css"/>
<script>
let elem = document.getElementById('se-pre-con');

12
modules_data/btl_.php
View File

@ -61,15 +61,11 @@ function normJsonStr($str)
}
$allprice = Battle::getType($allprice, $thisBattle['smert'] == 1);
?>
<script src="/js/jquery.js"></script>
<link href="/btl_1.css" rel="stylesheet">
<script>
var server_fight = "";
function maginfo(z, p, m, obj) {
let r = '';
r += '<b>' + $(obj).attr('magelogin') + '</b><br><br>';
@ -91,11 +87,11 @@ $allprice = Battle::getType($allprice, $thisBattle['smert'] == 1);
setInterval('top.c.noEr = 0;', 1000);
function mbsum(event) {
if (document.getElementById('back_menu_down').style.display != 'none') {
if (document.getElementById('back_menu_down').style.display !== 'none') {
setTimeout("document.getElementById('back_menu_down').click()", 1000);
}
if ((event.keyCode == 13 || event.keyCode == 70) && top.c.noEr == 0) {
if (document.getElementById('mainpanel').style.display == 'none') {
if ((event.code === 'Enter' || event.code === 'KeyF') && top.c.noEr === 0) {
if (document.getElementById('mainpanel').style.display === 'none') {
reflesht();
} else {
if (document.getElementById('go_btn').disabled) {
@ -109,7 +105,7 @@ $allprice = Battle::getType($allprice, $thisBattle['smert'] == 1);
}
}
//space
if (event.keyCode == 32 && top.c.noEr == 0) {
if (event.code === 'Enter' && top.c.noEr === 0) {
document.getElementById('reflesh_btn').setAttribute("class", "buttons btnnew btnnew2");
document.getElementById('reflesh_btn').setAttribute("onclick", "");