diff --git a/_incl_data/class/Dialog.php b/_incl_data/class/Dialog.php
index f5391e6e..0428d244 100644
--- a/_incl_data/class/Dialog.php
+++ b/_incl_data/class/Dialog.php
@@ -1021,8 +1021,7 @@ class Dialog
}
$this->title = $this->info['text'];
- $this->youInfo = $u->getInfoPers($u->info['id'], 1);
- $this->youInfo = $this->youInfo[0];
+ $this->youInfo = $u->getInfoPers($u->info['id'], 1)[0];
$this->botInfo = $this->infoBot($this->info['bot_id']);
//Диалог
$qpl = mysql_fetch_array(mysql_query('SELECT * FROM `dungeon_dlg` WHERE `type` = "1" AND `qid` = "0" AND `id_dg` = "' . $this->info['id'] . '" AND `page` = "' . ((int)$pg) . '" LIMIT 1'));
diff --git a/_incl_data/class/FightRequest.php b/_incl_data/class/FightRequest.php
index cb35ad1d..2dae33ad 100644
--- a/_incl_data/class/FightRequest.php
+++ b/_incl_data/class/FightRequest.php
@@ -84,21 +84,22 @@ class FightRequest
);
foreach ($sp as $pl) {
$uz = Db::getRow(
- 'select users.id, * from users left join stats on users.id = stats.id where zv = ?',
+ 'select * from users left join stats on users.id = stats.id where zv = ?',
[$pl['id']]
);
$i = [];
$toChat = '';
$toWhere = '';
- foreach ($uz as $t) {
- ${'tm' . $t['team']} ??= [];
- $i[$t['team']] ??= 0;
- ${'tm' . $t['team']}[$i[$t['team']]] = $t;
- $toChat .= '' . $t['login'] . ',';
- $toWhere .= 'OR `id` = "' . $t['id'] . '" ';
- $i[$t['team']]++;
+ if (is_iterable($uz)) {
+ foreach ($uz as $t) {
+ ${'tm' . $t['team']} ??= [];
+ $i[$t['team']] ??= 0;
+ ${'tm' . $t['team']}[$i[$t['team']]] = $t;
+ $toChat .= '' . $t['login'] . ',';
+ $toWhere .= 'OR `id` = "' . $t['id'] . '" ';
+ $i[$t['team']]++;
+ }
}
-
if ($pl['razdel'] == self::BATTLE_RAZDEL_CHAOTIC) {
$cols = $this->countUsersAll($pl['id']);
if ($cols >= $pl['maxplayers']) {
diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php
index aeaa11bb..2bf4b894 100644
--- a/_incl_data/class/User.php
+++ b/_incl_data/class/User.php
@@ -1643,9 +1643,7 @@ class User
);
if (isset($t['id'])) {
if ($this->info['login'] == $t['login']) {
- $this->error = 'Вы не можете передать самому себе, персонаж ' . $this->microLogin(
- $t['id'], 1
- ) . '';
+ $this->error = 'Вы не можете передать самому себе';
} elseif ($t['battle'] > 0) {
$this->error = 'Персонаж находится в бою';
} elseif ($t['align'] == 2 && $this->info['admin'] == 0) {
diff --git a/jx/battle/log_text.php b/jx/battle/log_text.php
index a453ae48..b8be855a 100644
--- a/jx/battle/log_text.php
+++ b/jx/battle/log_text.php
@@ -291,21 +291,6 @@ $log_text[1][7][10] = 'удар тёмной магией';
$log_text[1][7][11] = 'удар серой магией';
$log_text[1][7][12] = 'неизсветный удар';
$log_text[1][7][13] = 'удар';
-/*
-$log_text[1][7][0] = 'тычок';
-$log_text[1][7][1] = 'рубящий удар';
-$log_text[1][7][2] = 'разбивающий удар';
-$log_text[1][7][3] = 'рассекающий удар';
-$log_text[1][7][4] = 'обжигающий удар';
-$log_text[1][7][5] = 'удар электричеством';
-$log_text[1][7][6] = 'обмораживающий удар';
-$log_text[1][7][7] = 'удар магией земли';
-$log_text[1][7][8] = 'удар светлой магией';
-$log_text[1][7][9] = 'удар тёмной магией';
-$log_text[1][7][10] = 'удар серой магией';
-$log_text[1][7][11] = 'неизсветный удар';
-$log_text[1][7][12] = 'удар';
-*/
//R8
$log_text[1][8][0] = 'не контролировала ситуацию';
diff --git a/logs.php b/logs.php
index 4e13d798..c9fa442a 100644
--- a/logs.php
+++ b/logs.php
@@ -15,12 +15,10 @@ if (isset($btl['id'])) {
)
);
$allprice = 0 + $allprice[0];
- function typeBattle($x)
+ function typeBattle($x): array
{
$r = [0, 0, 'Обычный поединок', 'Кровавый Поединок'];
- if ($x < 50000) {
- //Обычный бой
- } elseif ($x >= 50000 && $x < 100000) {
+ if ($x >= 50000 && $x < 100000) {
$r = [25, 50, 'Великая Битва', 'Кровавая Битва'];
} elseif ($x < 500000) {
$r = [50, 75, 'Величайшая Битва', 'Кровавая Резня'];
@@ -39,7 +37,7 @@ if (isset($btl['id'])) {
$allprice = [150, 150, 'Жесточайшее Сражение', 'Жесточайшее Сражение'];
}
if ($btl['type'] == 99) {
- $allprice = '<font color=red>' . str_replace(' ', ' ', $allprice[3]) . '</font>';
+ $allprice = '<span style="color: red;">' . str_replace(' ', ' ', $allprice[3]) . '</span>';
} else {
$allprice = str_replace(' ', ' ', $allprice[2]);
}
@@ -68,7 +66,7 @@ $b .= '</td>
</table>';
if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
- function rzv($v)
+ function rzv($v): string
{
$v = explode('.', $v);
if (!isset($v[1])) {
@@ -85,9 +83,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
if ($btl['invis'] > 0) {
$tbtl .= '<img src="//img.new-combats.tech/i/fighttypehidden0.gif">';
}
- if ($btl['type'] == 0) {
- $tbtl = 'Тип боя: ' . $tbtl . ' (физический поединок) ';
- } elseif ($btl['type'] == 1) {
+ if ($btl['type'] == 1) {
$tbtl = 'Тип боя: ' . $tbtl . ' (кулачный поединок) ';
} else {
$tbtl = 'Тип боя: ' . $tbtl . ' (физический поединок) ';
@@ -99,15 +95,10 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
$tbtl .= 'Продолжительность боя: ' . $tmStart . ' мин.<br>';
- $users = [
+ $users = [];
+ $uids = [];
- ];
-
- $uids = [
-
- ];
-
- function con_login($us)
+ function con_login($us): string
{
$r = '';
if ($us['align'] > 0) {
@@ -124,35 +115,24 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
//Поулчаем инфо
$tpas = [
1 => 'X',
- 2 => '<font color=#AAAAEE>•</font>',
+ 2 => '<span style="color: #AAAAEE; ">•</span>',
3 => '<b>•</b>',
- 4 => '<font color=#FF0000>¤</font>',
- 5 => '<font color=#FF0000>X</font>',
- 6 => '<font color=#AAAAEE>•</font>',
- 7 => '<font color=777777><B>•</B></font>',
- 8 => '<font color=#AAAAEE>•</font>',
+ 4 => '<span style="color: #FF0000; ">¤</span>',
+ 5 => '<span style="color: #FF0000; ">X</span>',
+ 6 => '<span style="color: #AAAAEE; ">•</span>',
+ 7 => '<span style="color:#777777; "><B>•</B></span>',
+ 8 => '<span style="color: #AAAAEE; ">•</span>',
];
- /*$tpbs = array(
- 0 => 'X',
- 1 => 'X',
- 2 => '<font color=#AAAAAA><B>•</B></font>',
- 3 => '<font color=#AAAAEE><B>•</B></font>',
- 4 => 'X',
- 5 => '<font color=#FF0000><B>•</B></font>',
- 6 => '<font color=#AAAAEE><B>•</B></font>',
- 7 => '<font color=#777777><B>•</B></font>',
- 8 => '<font color=#AAAAAA><B>•</B></font>'
- );*/
$tpbs = [
0 => '',
1 => '<B>•</B>',
- 2 => '<font color=#AAAAAA><B>•</B></font>',
+ 2 => '<span style="color: #AAAAAA; "><B>•</B></span>',
3 => 'X',
- 4 => '<font color=#FFEEEE><B>X</B></font>',
- 5 => '<font color=#FFEEEE><B>•</B></font>',
- 6 => '<font color=#AAAAEE><B>•</B></font>',
- 7 => '<font color=#777777><B>•</B></font>',
- 8 => '<font color=#AAAAAA><B>•</B></font>',
+ 4 => '<span style="color: #FFEEEE; "><B>X</B></span>',
+ 5 => '<span style="color: #FFEEEE; "><B>•</B></span>',
+ 6 => '<span style="color: #AAAAEE; "><B>•</B></span>',
+ 7 => '<span style="color: #777777; "><B>•</B></span>',
+ 8 => '<span style="color: #AAAAAA; "><B>•</B></span>',
];
$sp = mysql_query('SELECT * FROM `battle_users` WHERE `battle` = "' . $btl['id'] . '"');
while ($pl = mysql_fetch_array($sp)) {
@@ -214,7 +194,6 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
$users[$i]['value']['sa'][$k] .= $tpas[$tpa];
} else {
$zag[$k] = false;
- //$users[$i]['value']['sa'][$za] .= '.';
}
$k++;
}
@@ -235,7 +214,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
//
$k = 1;
while ($k <= 5) {
- if ($zag[$k] == false) {
+ if (!$zag[$k]) {
$users[$i]['value']['sa'][$k] .= ' ';
}
$k++;
@@ -284,9 +263,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
} else {
$d = 1;
while ($d <= 5) {
- if ($bjj[$d] == true) {
-
- } else {
+ if (!$bjj[$d]) {
$users[$i]['value']['sb'][$d] .= ' ';
}
$d++;
@@ -391,9 +368,9 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
}
$r .= '</TABLE>';
$r .= '(<b>X</b> - удачный блок, <b><FONT COLOR=red>X</FONT></b> - пробили блок критом, <B>•</B> - пропустил удар,
-<font color=#AAAAAA><B>•</B></font> - увернулся,
-<font color=#AAAAEE><B>•</B></font> - парировал,
-<font color=#777777><B>•</B></font> - отбил щитом)';
+<span style="color: #AAAAAA; "><B>•</B></span> - увернулся,
+<span style="color: #AAAAEE; "><B>•</B></span> - парировал,
+<span style="color: #777777; "><B>•</B></span> - отбил щитом)';
//
$r .= '<H4>Суммарно</H4>';
$r .= '<TABLE border=1 cellspacing=0 cellpadding=4>
@@ -441,7 +418,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
$team_data['heal'] += $us['heal'];
$winw = '';
if ($us['hp'] < 1) {
- $us['hp'] = '<font color=red>0</font>';
+ $us['hp'] = '<span style="color: red; ">0</span>';
$winw = '<img title="Погиб" width="7" height="7" src="//img.new-combats.tech/i/ico/looses.gif">';
} else {
$winw = '<img title="Выжил" width="7" height="7" src="//img.new-combats.tech/i/ico/wins.gif">';
@@ -681,11 +658,8 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
$clr = 'f2e5e0';
}
$cclr = 'border-top:1px solid #b1b1b1;';
- #$r .= '<table cellspacing="1" width="100%"><tbody><tr><td height="1" bgcolor="#b0b0b0"></td></tr></tbody></table>';
}
$h = $pl['id_hod'];
- } else {
- //$r .= '<br>';
}
$r .= '<div class="logs_php_line" style="background-color:#' . $clr . ';' . $cclr . 'padding:1px;">' . $pl['text'] . '</div>';
$cclr = '';
@@ -762,9 +736,9 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
}
?>
<!DOCTYPE html>
-<html>
+<html lang="ru">
<head>
-
+
<title>Архив: Поединки</title>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jqueryrotate.js"></script>
@@ -776,7 +750,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
hi_no_fm = 1;
function maginfo(z, p, m, obj) {
- var r = '';
+ let r = '';
r += '<b>' + $(obj).attr('magelogin') + '</b><br><br>';
r += 'Мощь: ' + m + ', ';
r += 'Защита: ' + z + ', ';
@@ -794,8 +768,6 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
#f2e5e0;
min-height: 100vh;
min-width: 400px;
-
-
}
h3 {
@@ -804,10 +776,7 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
.ttl_css {
position: absolute;
- padding-left: 3px;
- padding-right: 3px;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding: 2px 3px;
background-color: #ffffcc;
border: 1px solid #6F6B5E;
}
@@ -885,17 +854,17 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
<body> <!--#E2E0E0 -->
<div style="max-width:95%; min-height: 100%; margin:0 auto;">
<br><br>
- <div id="ttl" class="ttl_css" style="display:none;z-index:1111;"/>
+ <div id="ttl" class="ttl_css" style="display:none;z-index:1111;"></div>
</div>
<div id="gi" class="gifin" style="display:none;z-index:1110;"></div>
-<H3><IMG SRC="//img.new-combats.tech/i/fighttype2.gif" WIDTH=20 HEIGHT=20> Бойцовский
+<H3><IMG SRC="//img.new-combats.tech/i/fighttype2.gif" WIDTH=20 HEIGHT=20 alt=""> Бойцовский
Клуб<?php if ($based != 'battle_logs') {
echo ' (Архив поединков)';
- } ?> <IMG SRC="//img.new-combats.tech/i/fighttype2.gif" WIDTH=20 HEIGHT=20></H3>
+ } ?> <IMG SRC="//img.new-combats.tech/i/fighttype2.gif" WIDTH=20 HEIGHT=20 alt=""></H3>
<?= $r; ?>
<br><br><br>
</div>
-<script language="JavaScript">
+<script>
$('#line_filter').submit(function () {
$('#line_filter_input_submit').trigger('click');
});
@@ -938,4 +907,4 @@ if (isset($btl['id']) && $btl['team_win'] != -1 && isset($_GET['analiz'])) {
}
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/modules_data/_umenie.php b/modules_data/_umenie.php
index eb94cdec..bee84c0b 100644
--- a/modules_data/_umenie.php
+++ b/modules_data/_umenie.php
@@ -6,7 +6,6 @@ elem.parentNode.removeChild(elem);
</script>";
use Core\Config;
-use DarksLight2\Battle\Techniques\TechniqueCategoryEntity;
use DarksLight2\Training\TrainingManager;
if (!defined('GAME')) {
@@ -317,7 +316,7 @@ $tma = '';
$u->info['sskills'] -= $summs;
}
}
- if (@$_GET['upr']) {
+ if ($_GET['upr']) {
/*-----Проверяем сумму статов и умений-----*/
if (!isset($_GET['energy']) || $_GET['energy'] < 0) {
$_GET['energy'] = 0;
@@ -468,7 +467,28 @@ $tma = '';
$u->info['stats'] = \Core\ConversionHelper::arrayToDataString($st);
if (
- $_GET['str'] < 0 || $_GET['dex'] < 0 || $_GET['intel'] < 0 || $_GET['wis'] < 0 || $_GET['spirit'] < 0 || $_GET['will'] < 0 || $_GET['freedom'] < 0 || $_GET['god'] < 0 || $_GET['inst'] < 0 || $_GET['power'] < 0 || $_GET['m_sword'] < 0 || $_GET['m_tohand'] < 0 || $_GET['m_molot'] < 0 || $_GET['m_staff'] < 0 || $_GET['m_magic1'] < 0 || $_GET['m_magic2'] < 0 || $_GET['m_magic3'] < 0 || $_GET['m_magic4'] < 0 || $_GET['m_magic5'] < 0 || $_GET['m_magic6'] < 0 || $_GET['m_magic7'] < 0) {
+ $_GET['str'] < 0 ||
+ $_GET['dex'] < 0 ||
+ $_GET['intel'] < 0 ||
+ $_GET['wis'] < 0 ||
+ $_GET['spirit'] < 0 ||
+ $_GET['will'] < 0 ||
+ $_GET['freedom'] < 0 ||
+ $_GET['god'] < 0 ||
+ $_GET['inst'] < 0 ||
+ $_GET['power'] < 0 ||
+ $_GET['m_sword'] < 0 ||
+ $_GET['m_tohand'] < 0 ||
+ $_GET['m_molot'] < 0 ||
+ $_GET['m_staff'] < 0 ||
+ $_GET['m_magic1'] < 0 ||
+ $_GET['m_magic2'] < 0 ||
+ $_GET['m_magic3'] < 0 ||
+ $_GET['m_magic4'] < 0 ||
+ $_GET['m_magic5'] < 0 ||
+ $_GET['m_magic6'] < 0 ||
+ $_GET['m_magic7'] < 0
+ ) {
echo ' <span style="color: red; ">1) Что-то здесь не так...</span><br>';
} elseif ($u->info['ability'] - (int)$summ < 0 || $u->info['skills'] - (int)$summu < 0) {
echo ' <span style="color: red; ">Что-то здесь не так... (Способности: ' . ($u->info['ability'] - (int)$summ) . ', Умения: ' . ($u->info['skills'] - (int)$summu) . ')</span><br>';
@@ -764,232 +784,233 @@ $tma = '';
<TABLE border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
<TD width=30% valign=top>
- <TABLE border=0 cellspacing=1 cellpadding=0 width=100%>
- <TR>
- <TD height="10" class=tzS>Характеристики персонажа</TD>
- </TR>
- <TR>
- <TD style='padding-left: 5'>
- <STYLE>
- IMG.skill {
- width: 9px;
- height: 9px;
- cursor: pointer
- }
+ <TABLE border=0 cellspacing=1 cellpadding=0 width=100%>
+ <TR>
+ <TD height="10" class=tzS>Характеристики персонажа</TD>
+ </TR>
+ <TR>
+ <TD style='padding-left: 5'>
+ <STYLE>
+ IMG.skill {
+ width: 9px;
+ height: 9px;
+ cursor: pointer
+ }
- TD.skill {
- font-weight: bold
- }
+ TD.skill {
+ font-weight: bold
+ }
- TD.skills {
- font-weight: bold;
- color: #600000
- }
+ TD.skills {
+ font-weight: bold;
+ color: #600000
+ }
- TD.skillb {
- font-weight: bold;
- color: #006000
- }
+ TD.skillb {
+ font-weight: bold;
+ color: #006000
+ }
- .linestl1 {
- background-color: #E2E0E0;
- font-size: 10px;
- font-weight: bold;
- }
- </STYLE>
- <TABLE cellSpacing=0>
- <TR id="str" onMouseDown="ChangeSkill(event,this)" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Сила:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s1'] ?><BR></small></TD>
- <TD width=60 noWrap><?= $dex ?></TD> <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
- ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
- class=skill
- ALT="увеличить" id="plus_dex"></TD><?php } ?>
- </TR>
- <TR id="dex" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Ловкость:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s2'] ?><BR></small></TD>
- <TD width=60 noWrap><?= $dex ?></TD>
+ .linestl1 {
+ background-color: #E2E0E0;
+ font-size: 10px;
+ font-weight: bold;
+ }
+ </STYLE>
+
+ <TABLE cellSpacing=0>
+ <TR id="str" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()" onclick="OnClick(event,this);">
+ <TD>• Сила:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s1'] ?><BR></small></TD>
+ <TD width=60 noWrap><?= $str ?></TD>
+ <?php if ($u->info['ability'] > 0): ?>
+ <TD>
+ <IMG id="minus_str" src=<?= Config::img() ?>/i/minus.gif class="nonactive" ALT="уменьшить">
+ <IMG id="plus_str" src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"></TD>
+ <?php endif; ?>
+ </TR>
+ <TR id="dex" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Ловкость:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s2'] ?><BR></small></TD>
+ <TD width=60 noWrap><?= $dex ?></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
+ ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
+ class=skill ALT="увеличить" id="plus_dex"></TD><?php
+ } ?>
+ </TR>
+ <TR id="inst" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Интуиция:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s3'] ?><BR></small></TD>
+ <TD width=60 noWrap><?= $inst ?></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_inst" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
+ ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
+ class=skill
+ ALT="увеличить" id="plus_inst"></TD><?php } ?>
+ </TR>
+ <TR id="power" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Выносливость:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s4'] ?><BR></small></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_power" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
+ ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
+ class=skill
+ ALT="увеличить" id="plus_power"></TD><?php } ?>
+ </TR>
<?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
- ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
- class=skill ALT="увеличить" id="plus_dex"></TD><?php
+ if ($u->info['level'] > 3) { ?>
+ <TR id="intel" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Интеллект:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s5'] ?></TD>
+ <TD width=60 noWrap><?= $intel ?></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_intel" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_intel"></TD><?php
+ } ?>
+ </TR>
+ <?php
+ }
+ if ($u->info['level'] > 6) { ?>
+ <TR id="wis" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Мудрость:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s6'] ?></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_wis" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_wis"></TD><?php
+ } ?>
+ </TR>
+ <?php
+ }
+ if ($u->info['level'] > 9) { ?>
+ <TR id="spirit" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Духовность:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s7'] ?></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_spirit" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_spirit"></TD><?php
+ } ?>
+ </TR>
+ <?php
+ }
+ if ($u->info['level'] > 12) { ?>
+ <TR id="will" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Воля:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s8'] ?></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_will" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_will"></TD><?php
+ } ?>
+ </TR>
+ <?php
+ }
+ if ($u->info['level'] > 15) { ?>
+ <TR id="freedom" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Свобода духа:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s9'] ?></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_freedom" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_freedom"></TD><?php
+ } ?>
+ </TR>
+ <?php
+ }
+ if ($u->info['level'] > 18) { ?>
+ <TR id="god" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
+ onclick="OnClick(event,this);">
+ <TD>• Божественность:</TD>
+ <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s10'] ?></TD>
+ <TD width=60 noWrap></TD>
+ <?php
+ if ($u->info['ability'] > 0) { ?>
+ <TD><IMG id="minus_god" src=<?= Config::img() ?>/i/minus.gif
+ class="nonactive" ALT="уменьшить"> <IMG
+ src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
+ id="plus_god"></TD><?php
+ } ?>
+ </TR>
+ <?php
} ?>
- </TR>
- <TR id="inst" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Интуиция:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s3'] ?><BR></small></TD>
- <TD width=60 noWrap><?= $inst ?></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
- ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
- class=skill
- ALT="увеличить" id="plus_dex"></TD><?php } ?>
- </TR>
- <TR id="power" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Выносливость:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s4'] ?><BR></small></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_dex" src=<?= Config::img() ?>/i/minus.gif class="nonactive"
- ALT="уменьшить"> <IMG src=<?= Config::img() ?>/i/plus.gif
- class=skill
- ALT="увеличить" id="plus_dex"></TD><?php } ?>
- </TR>
- <?php
- if ($u->info['level'] > 3) { ?>
- <TR id="intel" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Интеллект:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s5'] ?></TD>
- <TD width=60 noWrap><?= $intel ?></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_intel" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_intel"></TD><?php
- } ?>
- </TR>
- <?php
- }
- if ($u->info['level'] > 6) { ?>
- <TR id="wis" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Мудрость:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s6'] ?></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_wis" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_wis"></TD><?php
- } ?>
- </TR>
- <?php
- }
- if ($u->info['level'] > 9) { ?>
- <TR id="spirit" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Духовность:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s7'] ?></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_spirit" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_spirit"></TD><?php
- } ?>
- </TR>
- <?php
- }
- if ($u->info['level'] > 12) { ?>
- <TR id="will" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Воля:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s8'] ?></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_will" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_will"></TD><?php
- } ?>
- </TR>
- <?php
- }
- if ($u->info['level'] > 15) { ?>
- <TR id="freedom" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Свобода духа:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s9'] ?></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_freedom" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_freedom"></TD><?php
- } ?>
- </TR>
- <?php
- }
- if ($u->info['level'] > 18) { ?>
- <TR id="god" onMouseDown="ChangeSkill( event, this )" onMouseUp="DropTimer()"
- onclick="OnClick(event,this);">
- <TD>• Божественность:</TD>
- <TD width=40 class="skill" align="right" wdth=30><?= $u->stats['s10'] ?></TD>
- <TD width=60 noWrap></TD>
- <?php
- if ($u->info['ability'] > 0) { ?>
- <TD><IMG id="minus_god" src=<?= Config::img() ?>/i/minus.gif
- class="nonactive" ALT="уменьшить"> <IMG
- src=<?= Config::img() ?>/i/plus.gif class=skill ALT="увеличить"
- id="plus_god"></TD><?php
- } ?>
- </TR>
- <?php
- } ?>
- </TABLE>
- </TD>
- </TR>
- </TABLE>
- <INPUT class="btn btn-success" type="button" value="Сохранить" disabled id="save_button0"
- onClick="SaveSkill()">
- <INPUT type="checkbox" onClick="ChangeButtonState(0)">
- <div style="color: green; margin: 16px 0;" id="ups">
- <?php
- if ($u->info['ability']) {
- echo "Возможных увеличений: <span id='UP'>{$u->info['ability']}</span><br>";
- }
- if ($u->info['skills']) {
- echo "Свободных умений: <span id='m_UP'>{$u->info['skills']}</span><br>";
- }
- if ($u->info['sskills']) {
- echo "Свободных особенностей: <span id='m_UP'>{$u->info['sskills']}</span><br>";
- }
- ?>
- </div>
- <style>
- ul {
- padding-left: 10px;
- }
+ </TABLE>
- ul li {
- font-size: x-small;
- }
+ </TD>
+ </TR>
+ </TABLE>
+ <INPUT class="btn btn-success" type="button" value="Сохранить" disabled id="save_button0"
+ onClick="SaveSkill()">
+ <INPUT type="checkbox" onClick="ChangeButtonState(0)">
+ <div style="color: green; margin: 16px 0;" id="ups">
+ <?php
+ if ($u->info['ability']) {
+ echo "Возможных увеличений: <span id='UP'>{$u->info['ability']}</span><br>";
+ }
+ if ($u->info['skills']) {
+ echo "Свободных умений: <span id='m_UP'>{$u->info['skills']}</span><br>";
+ }
+ if ($u->info['sskills']) {
+ echo "Свободных особенностей: <span id='m_UP'>{$u->info['sskills']}</span><br>";
+ }
+ ?>
+ </div>
+ <style>
+ ul {
+ padding-left: 10px;
+ }
- ul li b {
- color: green;
- }
- </style>
- <div>
- <INPUT TYPE=button class="btn btn-danger"
- onClick="window.open('/stats_bonus.php/', 'stats_bonus', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"
- value="Статовые Бонусы">
- <br><br>
- <b style="font-size: x-small;">Зависимость максимального профильного урона оружием у основных воинских
- классов:</b>
- <ul>
- <li><b>Дробящий</b> (дубины): 1 сила = 0,5 к урону и 1 выносливость = +1 к урону.</li>
- <li><b>Режущий</b> (мечи): 1 интуиция = 1 к урону.</li>
- <li><b>Колющий</b> (кинжалы): 1 сила = 0,25 к урону и 1 ловкость = 0,75 к урону.</li>
- <li><b>Рубящий</b> (топоры): 1 сила = 1,2 к урону.</li>
- </ul>
- </div>
- </TD>
+ ul li {
+ font-size: x-small;
+ }
+
+ ul li b {
+ color: green;
+ }
+ </style>
+ <div>
+ <INPUT TYPE=button class="btn btn-danger"
+ onClick="window.open('/stats_bonus.php/', 'stats_bonus', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"
+ value="Статовые Бонусы">
+ <br><br>
+ <b style="font-size: x-small;">Зависимость максимального профильного урона оружием у основных воинских
+ классов:</b>
+ <ul>
+ <li><b>Дробящий</b> (дубины): 1 сила = 0,5 к урону и 1 выносливость = +1 к урону.</li>
+ <li><b>Режущий</b> (мечи): 1 интуиция = 1 к урону.</li>
+ <li><b>Колющий</b> (кинжалы): 1 сила = 0,25 к урону и 1 ловкость = 0,75 к урону.</li>
+ <li><b>Рубящий</b> (топоры): 1 сила = 1,2 к урону.</li>
+ </ul>
+ </div>
+ </TD>
<TD width=1 bgcolor=#A0A0A0></TD>
<TD valign=top>
<TABLE border=0 cellspacing=1 cellpadding=0 width=100%>
@@ -1382,14 +1403,14 @@ $tma = '';
<div style="display: flex; width: 100%">
<fieldset style="width: 50%">
<legend><b>Категории</b></legend>
- <div
- style="display: flex; flex-wrap: wrap; flex-direction: column; justify-content: center;">
+ <div style="display: flex; flex-wrap: wrap; flex-direction: column; justify-content: center;">
<?php
+ // недописанный огрызок неизвестно чего
$categories = TechniqueCategoryEntity::getInstance()->findAll();
foreach ($categories as $category) {
?>
<div style='margin-right: 10px;height: 20px'>
- <a onclick='show_div("<?= $category->id ?>")' href='#'>
+ <a onclick='show_div("--><?php //= $category->id ?>//")' href='#'>
<?= $category->name ?>
</a>
</div>
@@ -1560,8 +1581,7 @@ $tma = '';
}
$psh = mysql_fetch_array(
mysql_query(
- 'SELECT * FROM `actions` WHERE `uid` = "' . $u->info['id'] . '" AND `vars` = "psh0" AND `time` > ' . (time(
- ) - 7200) . ' LIMIT 1'
+ 'SELECT * FROM `actions` WHERE `uid` = "' . $u->info['id'] . '" AND `vars` = "psh0" AND `time` > ' . (time() - 7200) . ' LIMIT 1'
)
);
if (isset($psh['id'])) {
@@ -1573,7 +1593,7 @@ $tma = '';
<?php
/* Бонусы статов */
$b = [];
- $st = [];
+ //$st = [];
//Бонусы статов
//Бонусы статов
@@ -2253,8 +2273,7 @@ $tma = '';
}
$sp = mysql_query(
- 'SELECT * FROM `actions` WHERE `uid` = "' . $u->info['id'] . '" AND `vars` LIKE "psh_qt_%" AND `time` > ' . (time(
- ) - 86400) . ' '
+ 'SELECT * FROM `actions` WHERE `uid` = "' . $u->info['id'] . '" AND `vars` LIKE "psh_qt_%" AND `time` > ' . (time() - 86400) . ' '
);
while ($pl = mysql_fetch_array($sp)) {
$ic1 = str_replace('psh_qt_', '', $pl['vars']);
@@ -2262,8 +2281,7 @@ $tma = '';
}
//Пещеры
$dungeon_timeout = $u->testAction(
- '`uid` = "' . $u->info['id'] . '" AND `vars` = "psh0" AND `time` > ' . (time(
- ) - 60 * 60 * 3) . ' LIMIT 1',
+ '`uid` = "' . $u->info['id'] . '" AND `vars` = "psh0" AND `time` > ' . (time() - 60 * 60 * 3) . ' LIMIT 1',
1
);
if ($dungeon_timeout['vars'] == "psh0") {
@@ -2369,5 +2387,5 @@ $tma = '';
</tr>
</TABLE>
- <!--рейтинг тут-->
+<!--рейтинг тут-->
</BODY>
diff --git a/modules_data/location/dungeon.php b/modules_data/location/dungeon.php
index 0a32c327..acb9588f 100644
--- a/modules_data/location/dungeon.php
+++ b/modules_data/location/dungeon.php
@@ -323,14 +323,14 @@ if ($u->room['file'] == 'dungeon') {
$u->info['s'] = 3(назад)
$u->info['s'] = 4(право)
*/
- stor =<?echo $u->info['s'];?>;
+ stor =<?= $u->info['s'];?>;
bott = 0;
if (stor == 1) {
<?php
$bottem = mysql_fetch_assoc(mysql_query('SELECT `id2` FROM `dungeon_bots` WHERE `dn` = "' . $u->info['dnow'] . '" AND `delete` = "0" AND `x` = "' . ($u->info['x']) . '" AND `y` = "' . ($u->info['y'] + 1) . '" LIMIT 1'));
if (isset($bottem['id2']))
{
- ?> bott = <?echo $bottem['id2'];?>;<?php
+ ?> bott = <?= $bottem['id2'];?>;<?php
}
?>
} else if (stor == 2) {
@@ -338,7 +338,7 @@ if ($u->room['file'] == 'dungeon') {
$bottem = mysql_fetch_assoc(mysql_query('SELECT `id2` FROM `dungeon_bots` WHERE `dn` = "' . $u->info['dnow'] . '" AND `delete` = "0" AND `x` = "' . ($u->info['x'] - 1) . '" AND `y` = "' . ($u->info['y']) . '" LIMIT 1'));
if (isset($bottem['id2']))
{
- ?> bott = <?echo $bottem['id2'];?>;<?php
+ ?> bott = <?= $bottem['id2'];?>;<?php
}
?>
} else if (stor == 3) {
@@ -346,7 +346,7 @@ if ($u->room['file'] == 'dungeon') {
$bottem = mysql_fetch_assoc(mysql_query('SELECT `id2` FROM `dungeon_bots` WHERE `dn` = "' . $u->info['dnow'] . '" AND `delete` = "0" AND `x` = "' . ($u->info['x']) . '" AND `y` = "' . ($u->info['y'] - 1) . '" LIMIT 1'));
if (isset($bottem['id2']))
{
- ?> bott = <?echo $bottem['id2'];?>;<?php
+ ?> bott = <?= $bottem['id2'];?>;<?php
}
?>
} else if (stor == 4) {
@@ -354,7 +354,7 @@ if ($u->room['file'] == 'dungeon') {
$bottem = mysql_fetch_assoc(mysql_query('SELECT `id2` FROM `dungeon_bots` WHERE `dn` = "' . $u->info['dnow'] . '" AND `delete` = "0" AND `x` = "' . ($u->info['x'] + 1) . '" AND `y` = "' . ($u->info['y']) . '" LIMIT 1'));
if (isset($bottem['id2']))
{
- ?> bott = <?echo $bottem['id2'];?>;<?php
+ ?> bott = <?= $bottem['id2'];?>;<?php
}
?>
}
@@ -366,9 +366,9 @@ if ($u->room['file'] == 'dungeon') {
itemtake = 0;
<?php $sp = mysql_fetch_assoc(mysql_query('SELECT `ish`.* FROM `dungeon_items` AS `ish` WHERE `ish`.`dn` = "' . $u->info['dnow'] . '" AND `ish`.`take` = "0" AND `ish`.`delete` = "0" AND ( `ish`.`onlyfor` = "0" OR `ish`.`onlyfor` = "' . $u->info['id'] . '" ) AND `ish`.`x` = "' . $u->info['x'] . '" AND `ish`.`y` = "' . $u->info['y'] . '" LIMIT 1'));
if (isset($sp['id']))
- {?>
- itemtake = <?echo $sp['id'];?>;
- <?}?>
+ { ?>
+ itemtake = <?= $sp['id'];?>;
+ <?php }?>
if (itemtake != 0) {
takeItem(itemtake);
}