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
2023-11-02 15:57:39 +02:00
parent a14232a899
commit def933dca4
51 changed files with 8866 additions and 12429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules_data/btl_.php
+67 -97
View File
@@ -1,22 +1,16 @@
<?php
use Core\Config;
use Core\Db;
/** @var User $u */
if (!defined('GAME')) {
die();
}
$old_battle = true;
if (isset($_COOKIE['newbattle'])) {
$old_battle = false;
include('btl_2.php');
die();
}
include('jx/battle/log_text.php');
if (!$old_battle) {
return;
}
if (isset($btl_last['id']) && $u->info['battle'] == 0) {
$u->info['battle'] = $btl_last['battle'];
}
@@ -25,49 +19,73 @@ if ($u->info['battle'] == 0 || isset($_GET['bend'])) {
die('<script>top.frames[\'main\'].location = "main.php";</script>');
}
$thisBattle = mysql_fetch_array(
mysql_query('SELECT * FROM `battle` WHERE `id` = "' . $u->info['battle'] . '" LIMIT 1')
);
$thisBattle = Db::getRow('select * from battle where id = ?', [$u->info['battle']]);
$allprice = Db::getValue('select sum(price1) from battle_users where battle = ?', [$u->info['battle']]);
$allprice = mysql_fetch_array(
mysql_query(
'SELECT SUM(`price1`) FROM `battle_users` WHERE `battle` = "' . $u->info['battle'] . '" GROUP BY `uid` LIMIT 1'
)
);
$allprice = $allprice[0];
function typeBattle($x)
function typeBattle($x): array
{
$r = [0, 0, 'Поединок', 'Кровавый Поединок'];
if ($x >= 50000 && $x < 100000) {
$r = [25, 50, 'Великая Битва', 'Кровавая Битва'];
} elseif ($x < 500000) {
$r = [50, 75, 'Величайшая Битва', 'Кровавая Резня'];
} elseif ($x < 1000000) {
$r = [75, 100, 'Историческая Битва', 'Кровавая Сеча'];
} elseif ($x < 2500000) {
$r = [100, 125, 'Эпохальная Битва', 'Кровавое Побоище'];
} elseif ($x >= 5000000) {
$r = [150, 150, 'Судный День', 'Судный День'];
return match (true) {
$x >= 5000000 => [150, 150, 'Судный День', 'Судный День'],
$x >= 2500000 => [100, 125, 'Эпохальная Битва', 'Кровавое Побоище'],
$x >= 1000000 => [75, 100, 'Историческая Битва', 'Кровавая Сеча'],
$x >= 500000 => [50, 75, 'Величайшая Битва', 'Кровавая Резня'],
$x >= 100000 => [25, 50, 'Великая Битва', 'Кровавая Битва'],
default => [0, 0, 'Поединок', 'Кровавый Поединок'],
};
}
function finish(User $u): void
{
if (!isset($_GET['finish'])) {
return;
}
return $r;
Db::sql("update stats set battle_text = '', last_b = 0 where id = ?, $u->info['id'");
Db::sql('update battle_users set finish = 1 where uid = ?', [$u->info['id']]);
header('location: main.php');
die();
}
function convert($from, $to, $var)
{
if (is_array($var)) {
$new = [];
foreach ($var as $key => $val) {
$new[convert($from, $to, $key)] = convert($from, $to, $val);
}
$var = $new;
} else {
if (is_string($var)) {
$var = iconv($from, $to, $var);
}
}
return $var;
}
function normJsonStr($str)
{
return preg_replace_callback(
'/\\\u([a-f0-9]{4})/i',
function ($m) {
return chr(hexdec($m[1]) - 1072 + 224);
},
$str
);
}
$allprice = typeBattle($allprice);
if ($thisBattle['smert'] == 1) {
$allprice = [150, 150, 'Жесточайшее Сражение', 'Жесточайшее Сражение'];
}
echo '<script>var server_fight = "";</script>';
?>
<script src="/js/jquery.js" type="text/javascript"></script>
<link href="/btl_1.css" rel="stylesheet" type="text/css">
<script src="/js/jquery.js"></script>
<link href="/btl_1.css" rel="stylesheet">
<script>
var server_fight = "";
<!--
//-->
function maginfo(z, p, m, obj) {
var r = '';
let r = '';
r += '<b>' + $(obj).attr('magelogin') + '</b><br><br>';
r += 'Мощь: ' + m + ', ';
r += 'Защита: ' + z + ', ';
@@ -77,14 +95,7 @@ echo '<script>var server_fight = "";</script>';
<?php
if (isset($btl_last['id']) && ($u->info['battle'] == 0 || $u->info['battle'] == $btl_last['battle'])) {
echo 'var battleFinishData = "' . $u->info['battle_text'] . '";';
if (isset($_GET['finish'])) {
mysql_query(
'UPDATE `stats` SET `battle_text` = "",`last_b`="0" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1'
);
mysql_query('UPDATE `battle_users` SET `finish` = 1 WHERE `uid` = "' . $u->info['id'] . '"');
header('location: main.php');
die();
}
finish($u);
} else {
echo 'var battleFinishData = -1;';
}
@@ -185,7 +196,7 @@ echo '<script>var server_fight = "";</script>';
}
</script>
<div style="background-color:#e8e8e8">
<script type="text/javascript" src="js/btl_info.js"></script>
<script src="/js/btl_info.js"></script>
<script>
$.ajaxSetup({cache: false});
$(window).error(function () {
@@ -193,7 +204,7 @@ echo '<script>var server_fight = "";</script>';
});
</script>
<script src="//img.new-combats.tech/js/jx/jquery.form.js" type="text/javascript"></script>
<script type="text/javascript" src="js/jquery.cookie.js"></script>
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
<script type="text/javascript">
var login = '<?= $u->info['login']; ?>';
var za = <?= 0 + $u->stats['zona']; ?>;
@@ -234,38 +245,6 @@ echo '<script>var server_fight = "";</script>';
return string.toString().split(delimiter.toString());
}
<?php
function convert($from, $to, $var)
{
if (is_array($var)) {
$new = [];
foreach ($var as $key => $val) {
$new[convert($from, $to, $key)] = convert($from, $to, $val);
}
$var = $new;
} else {
if (is_string($var)) {
$var = iconv($from, $to, $var);
}
}
return $var;
}
function normJsonStr($str)
{
return preg_replace_callback(
'/\\\u([a-f0-9]{4})/i',
function ($m) {return chr(hexdec($m[1]) - 1072 + 224);},
$str
);
//deprecaded
// return preg_replace_callback(
// '/\\\u([a-f0-9]{4})/i',
// create_function('$m', 'return chr(hexdec($m[1])-1072+224);'),
// $str
// );
}
?>
var log_text = <?= normJsonStr(json_encode($log_text)); ?>;
var youlogin = "<?=$u->info['login']?>";
@@ -387,7 +366,7 @@ echo '<script>var server_fight = "";</script>';
}
</script>
<script type="text/javascript" src="js/btl_mini.js"></script>
<script src="/js/btl_mini.js"></script>
<div id="hint4" class="ahint"></div>
<style>
html, body {
@@ -932,23 +911,14 @@ echo '<script>var server_fight = "";</script>';
<td height="1"></td>
<td height="1"></td>
<td height="1"></td>
<td height="1"><img style="display:block"
src="https://<?= $c['img']; ?>/1x1.gif"
width="200" height="1"/></td>
<td height="1">
<img style="display:block" src="<?= Config::img() ?>/1x1.gif" width="200" height="1"/></td>
<td height="1"></td>
<td height="1"></td>
<td height="1"></td>
</tr>
</table>
</div>
<?php
if ($u->info['level'] == 0) { ?>
<hr/>
<center><font color="#333333"><small>Просто нажмите <b>Вперёд!!!</b>
чтобы сделать рандомный удар</small></font></center>
<hr/>
<?php
} ?>
</td>
</tr>
</table>
@@ -1075,7 +1045,7 @@ echo '<script>var server_fight = "";</script>';
<td valign="top">
<hr/>
<div align="center">
<font color="green"><b>На данный момент вами нанесено урона: </b></font><b class="private">&nbsp;<span
<b style="color: green;">На данный момент вами нанесено урона: </b><b class="private">&nbsp;<span
id="nabito"><?php
echo floor($u->info['battle_yron']); ?></span> HP&nbsp;</b><b
style="color:blue">.</b><br/>