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

WIP: Info class

Browse Source
This commit is contained in:
Ivor Barhansky
2024-01-06 17:30:34 +02:00
parent a2c658166d
commit 4a7535d67d
44 changed files with 1713 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jx/battle/refresh.php
+6 -6
View File
@@ -158,14 +158,14 @@ if (!$isBattle) {
$btl->testFinish();
}
if ($btl->info['team_win'] == -1) {
if ($btl->i->getTeamwin() == -1) {
$js .= $btl->genTeams($u->info['id']);
} else {
$btl->mainStatus = 3;
$btl->e = $u->btl_txt;
}
if ($btl->info['id'] == $u->info['lider']) {
if ($btl->i->id == $u->info['lider']) {
$js .= '$("#btn_down_img3").show();$("#btn_down_img4").show();';
} else {
$js .= '$("#btn_down_img3").hide();$("#btn_down_img4").hide();';
@@ -186,14 +186,14 @@ if (!$isBattle) {
$btl->mainStatus = 2;
} elseif (
$u->info['enemy'] != 0 &&
$btl->info['team_win'] == -1 &&
$btl->i->getTeamwin() == -1 &&
$u->info['hpNow'] >= 1
) {
$js .= $btl->myInfo($u->info['enemy'], 2);
}
if ($btl->info['izlom'] > 0) {
$js .= 'volna(' . (1 + $btl->info['izlomRoundSee']) . ');';
if ($btl->i->izlom > 0) {
$js .= 'volna(' . (1 + $btl->i->izlomroundsee) . ');';
}
$i = 1;
@@ -218,7 +218,7 @@ if (!$isBattle) {
$atk1 = isset($btl->ga[$u->info['enemy']][$u->info['id']]) ? 1 : 0;
$nabito = floor($btl->users[$btl->uids[$u->info['id']]]['battle_yron']);
$expmaybe = floor($btl->users[$btl->uids[$u->info['id']]]['battle_exp']);
$tmr = round(($btl->info['timeout'] / 60), 2);
$tmr = round(($btl->i->timeout / 60), 2);
$persMagic = $u->btlMagicList();
$za = (int)$btl->stats[$btl->uids[$u->info['id']]]['zona'];
$zb = (int)$btl->testZonbVis();
jx/battle/refresh1.php
+8 -10
View File
@@ -57,11 +57,9 @@ if (!isset($CRON_CORE)) {
}
}
$btl->is = $u->is;
$btl->items = $u->items;
$btl->info = $btl->battleInfo($u->info['battle']);
$isBattle = $btl->initRefresh($u);
if (!isset($btl->info['id'])) {
if (!$isBattle) {
if ($u->info['battle'] == -1) {
//завершаем поединок
$upd = mysql_query(
@@ -142,7 +140,7 @@ if (!isset($btl->info['id'])) {
if (!isset($_POST['usepriem'])) {
$btl->testFinish();
}
if ($btl->info['team_win'] == -1) {
if ($btl->i->getTeamwin() == -1) {
$js .= $btl->genTeams($u->info['id']);
} else {
$btl->mainStatus = 3;
@@ -160,12 +158,12 @@ if (!isset($btl->info['id'])) {
$btl->mainStatus = 2;
}
} else {
if ($u->info['enemy'] != 0 && $btl->info['team_win'] == -1 && $u->info['hpNow'] >= 1) {
if ($u->info['enemy'] != 0 && $btl->i->getTeamwin() == -1 && $u->info['hpNow'] >= 1) {
$js .= $btl->myInfo($u->info['enemy'], 2);
}
}
if ($btl->info['izlom'] > 0) {
$js .= 'volna(' . (1 + $btl->info['izlomRoundSee']) . ');';
if ($btl->i->izlom > 0) {
$js .= 'volna(' . (1 + $btl->i->izlomroundsee) . ');';
}
$i = 1;
while ($i <= 7) {
@@ -200,7 +198,7 @@ if (!isset($btl->info['id'])) {
}
unset($jslog);
//}
$rehtml .= '<script type="text/javascript">var battle = ' . (0 + $btl->info['id']) . ';top.cb_statusTest();eatk=' . $atk1 . ';
$rehtml .= '<script type="text/javascript">var battle = ' . (0 + $btl->i->id) . ';top.cb_statusTest();eatk=' . $atk1 . ';
if(document.getElementById("nabito")!=undefined)
{
document.getElementById("nabito").innerHTML = "' . (floor(
@@ -215,7 +213,7 @@ if (!isset($btl->info['id'])) {
}
if(document.getElementById("timer_out")!=undefined)
{
document.getElementById("timer_out").innerHTML = "' . round(($btl->info['timeout'] / 60), 2) . '";
document.getElementById("timer_out").innerHTML = "' . round(($btl->i->timeout / 60), 2) . '";
}
$(\'#pers_magic\').html("' . $u->btlMagicList() . '");
g_iCount = 30;
jx/battle/refresh2.php
+9 -11
View File
@@ -53,11 +53,9 @@ if (isset($_POST['atack'], $_POST['block']) || (isset($_POST['id']) && $_POST['i
}
}
$btl->is = $u->is;
$btl->items = $u->items;
$btl->info = $btl->battleInfo($u->info['battle']);
$isBattle = $btl->initRefresh($u);
if (!isset($btl->info['id'])) {
if (!$isBattle) {
if ($u->info['battle'] == -1) {
//завершаем поединок
$upd = mysql_query(
@@ -139,13 +137,13 @@ if (isset($_POST['atack'], $_POST['block']) || (isset($_POST['id']) && $_POST['i
//Если бой сыгран - завершаем
if (!isset($_POST['usepriem'])) {
if ($btl->info['team_win'] == -1) {
if ($btl->i->getTeamwin() == -1) {
$btl->testFinish();
} else {
$btl->testFinish();
}
}
if ($btl->info['team_win'] == -1) {
if ($btl->i->getTeamwin() == -1) {
$js .= $btl->genTeams($u->info['id']);
} else {
$btl->mainStatus = 3;
@@ -163,12 +161,12 @@ if (isset($_POST['atack'], $_POST['block']) || (isset($_POST['id']) && $_POST['i
$btl->mainStatus = 2;
}
} else {
if ($u->info['enemy'] != 0 && $btl->info['team_win'] == -1 && $u->info['hpNow'] >= 1) {
if ($u->info['enemy'] != 0 && $btl->i->getTeamwin() == -1 && $u->info['hpNow'] >= 1) {
$js .= $btl->myInfo($u->info['enemy'], 2);
}
}
if ($btl->info['izlom'] > 0) {
$js .= 'volna(' . (1 + $btl->info['izlomRoundSee']) . ');';
if ($btl->i->izlom > 0) {
$js .= 'volna(' . (1 + $btl->i->izlomroundsee) . ');';
}
$i = 1;
while ($i <= 7) {
@@ -203,7 +201,7 @@ if (isset($_POST['atack'], $_POST['block']) || (isset($_POST['id']) && $_POST['i
}
unset($jslog);
//}
$rehtml .= '<script type="text/javascript">var battle = ' . (0 + $btl->info['id']) . ';top.cb_statusTest();eatk=' . $atk1 . ';
$rehtml .= '<script type="text/javascript">var battle = ' . (0 + $btl->i->id) . ';top.cb_statusTest();eatk=' . $atk1 . ';
if(document.getElementById("nabito")!=undefined)
{
document.getElementById("nabito").innerHTML = "' . (floor(
@@ -218,7 +216,7 @@ if (isset($_POST['atack'], $_POST['block']) || (isset($_POST['id']) && $_POST['i
}
if(document.getElementById("timer_out")!=undefined)
{
document.getElementById("timer_out").innerHTML = "' . round(($btl->info['timeout'] / 60), 2) . '";
document.getElementById("timer_out").innerHTML = "' . round(($btl->i->timeout / 60), 2) . '";
}
$(\'#pers_magic\').html("' . $u->btlMagicList() . '");
g_iCount = 30;
jx/battle/refresh_bot.php
+4 -4
View File
@@ -172,7 +172,7 @@ if (isset($CRON_CORE) && (isset($_POST['atack'], $_POST['block']) || (isset($_PO
//Если бой сыгран - завершаем
$btl->testFinish();
if ($btl->info['team_win'] == -1) {
if ($btl->i->getTeamwin() == -1) {
$js .= $btl->genTeams($u->info['id']);
} else {
$btl->mainStatus = 3;
@@ -190,12 +190,12 @@ if (isset($CRON_CORE) && (isset($_POST['atack'], $_POST['block']) || (isset($_PO
$btl->mainStatus = 2;
}
} else {
if ($u->info['enemy'] != 0 && $btl->info['team_win'] == -1 && $u->info['hpNow'] >= 1) {
if ($u->info['enemy'] != 0 && $btl->i->getTeamwin() == -1 && $u->info['hpNow'] >= 1) {
$js .= $btl->myInfo($u->info['enemy'], 2);
}
}
if ($btl->info['izlom'] > 0) {
$js .= 'volna(' . (1 + $btl->info['izlomRoundSee']) . ');';
if ($btl->i->izlom > 0) {
$js .= 'volna(' . (1 + $btl->i->izlomroundsee) . ');';
}
$i = 1;
while ($i <= 7) {