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

Рефакторинг яваскриптов.

Browse Source
This commit is contained in:
Ivor Barhansky
2024-05-10 14:32:06 +03:00
parent 2026029bf5
commit 023d9856ea
9 changed files with 205 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/btl_mini.js
+104 -137
View File
@@ -27,94 +27,90 @@ function magic_div(id, name, img, title) {
}
function testClearZone() {
if (top.slcbrc[4] == 0) {
if (top.slcbrc[4] === 0) {
all_radio_off();
}
}
async function usepriem(id, t, img) {
if (t == 1) {
irn++;
async function usepriem(id) {
irn++;
await $.post(`jx/battle/refresh.php?rnd=${ggcode}&irn=${irn}`, {
idlog: top.id_log,
usepriem: id,
useon: use_on_pers
}, function (data) {
$("#ref").html(data);
});
use_on_pers = 'none';
top.goSit(1);
}
async function useitem(id, use_item_on) {
irn++;
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.php?rnd=${ggcode}&irn=${irn}`, {
idlog: top.id_log,
usepriem: id,
useon: use_on_pers
useitem: id,
useitemon: use_item_on
}, function (data) {
$("#ref").html(data);
});
use_on_pers = 'none';
top.goSit(1);
return
}
return alert('Not found');
}
async function useitem(id, t, use_item_on) {
if (t == 1) {
irn++;
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.php?rnd=${ggcode}&irn=${irn}`, {
idlog: top.id_log,
useitem: id,
useitemon: use_item_on
}, function (data) {
$("#ref").html(data);
});
}
return top.goSit(1);
}
return alert('Not found');
return top.goSit(1);
}
function volna(id) {
document.getElementById('volna').innerHTML = `Волна: ${id}`;
}
function change_radioKeys(id, cper) {
var z = 0, t = 0, k = 0;
var i = 1, j = 1;
function change_radioKeys(id = 0) {
let jo;
let radio;
let z = 0, t = '';
let i = 1, j = 1;
while (i <= za) {
j = 1;
jo = 0;
while (j <= 5) {
var radio = document.getElementById(`atack_${i}_${j}`);
if (radio != undefined) {
if (radio.className != null && radio.className == "radio_on") jo++;
radio = document.getElementById(`atack_${i}_${j}`);
if (radio) {
if (radio.className != null && radio.className === "radio_on") jo++;
}
j++;
}
if (jo == 0 && z == 0) {
if (jo === 0 && z === 0) {
z = i;
t = 'atack';
}
i++;
}
if (z == 0) {
var i = 1, jo = 0;
if (z === 0) {
i = 1;
jo = 0;
while (i <= 5) {
var radio = document.getElementById(`block_1_${i}`);
if (radio != undefined) {
if (radio.className != null && radio.className == "radio_on") jo++;
radio = document.getElementById(`block_1_${i}`);
if (radio) {
if (radio.className != null && radio.className === "radio_on") jo++;
}
i++;
}
if (jo == 0 && z == 0) {
if (jo === 0 && z === 0) {
z = 1;
t = 'block';
}
}
if ((z == 0 || id == 0) && cper == false) {
if (z === 0 || id === 0) {
all_radio_off();
refleshPoints();
}
if (z > 0) {
if (id == 0) {
if (id === 0) {
//автовыставление
} else change_radio(z, id, t, 1)
}
@@ -122,15 +118,15 @@ function change_radioKeys(id, cper) {
function change_radio(id, zone, type, r) {
radio_off(id, zone, type);
var radio = document.getElementById(`${type}_${id}_${zone}`);
const radio = document.getElementById(`${type}_${id}_${zone}`);
if (radio.className == "radio_on" && r == 0) {
if (radio.className === "radio_on" && r === 0) {
radio.className = "radio_off";
if (type == 'atack') zas[id] = 0;
if (type === 'atack') zas[id] = 0;
else zbs[id] = 0;
} else {
radio.className = "radio_on";
if (type == 'atack') zas[id] = zone;
if (type === 'atack') zas[id] = zone;
else zbs[id] = zone;
}
refleshPoints();
@@ -142,17 +138,17 @@ function tactic(id, value) {
function refleshPoints() {
clearZone();
var i = 5;
let i = 5;
while (i >= 1) {
if (zas[i] == 0) lineAtack(i);
if (zas[i] === 0) lineAtack(i);
i--;
}
if (zbs[1] == 0) lineBlock();
if (zbs[1] === 0) lineBlock();
}
function lineAtack(id) {
nos++;
var j = 1;
let j = 1;
while (j <= 5) {
document.getElementById(`zatack${id}_${j}`).className = 'zoneCh_yes';
j++;
@@ -161,7 +157,7 @@ function lineAtack(id) {
function lineBlock() {
nos++;
var j = 1;
let j = 1;
while (j <= 5) {
document.getElementById(`zblock1_${j}`).className = 'zoneCh_yes';
j++;
@@ -170,16 +166,16 @@ function lineBlock() {
function clearZone() {
nos = 0;
var i = 1;
let i = 1;
while (i <= 5) {
var j = 1;
let j = 1;
while (j <= 5) {
document.getElementById(`zatack${i}_${j}`).className = 'zoneCh_no';
j++;
}
i++;
}
var i = 1;
i = 1;
while (i <= 5) {
document.getElementById(`zblock1_${i}`).className = 'zoneCh_no';
i++;
@@ -187,9 +183,9 @@ function clearZone() {
}
function select_atack(id, r) {
var i = 5;
let i = 5;
while (i >= 1) {
if (zas[i] == 0) {
if (zas[i] === 0) {
if (i <= za) sel_atack = i
}
i--;
@@ -201,11 +197,11 @@ function select_atack(id, r) {
}
function radio_off(id, zone, type) {
var i = 1;
let i = 1;
while (i <= 5) {
if (document.getElementById(`${type}_${id}_${i}`) != undefined && i != zone) {
if (document.getElementById(`${type}_${id}_${i}`) && i !== zone) {
document.getElementById(`${type}_${id}_${i}`).className = "radio_off";
if (type == 'atack') zas[id] = 0;
if (type === 'atack') zas[id] = 0;
else zbs[id] = 0;
}
i++;
@@ -213,9 +209,9 @@ function radio_off(id, zone, type) {
}
function all_radio_off() {
var i = 1;
let i = 1;
while (i <= 5) {
var j = 1;
let j = 1;
while (j <= 5) {
document.getElementById(`atack_${j}_${i}`).className = "radio_off";
j++;
@@ -228,11 +224,11 @@ function all_radio_off() {
}
function genZoneBlock() {
var i = 1;
let i = 1;
while (i <= 5) {
var j = 1;
let j = 1;
while (j <= 3) {
if (j == zb) {
if (j === zb) {
document.getElementById(`txtb${i}_${j}`).style.display = '';
} else {
document.getElementById(`txtb${i}_${j}`).style.display = 'none';
@@ -244,9 +240,9 @@ function genZoneBlock() {
}
function genZoneAtack() {
var i = 1;
let i = 1;
while (i <= 5) {
var j = 1;
let j = 1;
while (j <= 5) {
if (i <= za) {
document.getElementById(`zatack${i}_${j}`).style.display = '';
@@ -263,16 +259,13 @@ function genteam(team) {
document.getElementById('teams').innerHTML = team;
}
var t057 = null;
var battle_end = 0;
async function reflesh(bl) {
async function reflesh() {
irn++;
if (battleFinishData != -1) mainstatus(0);
if ((battle_end == 0 || bl != null) && battleFinishData == -1) {
if (top.c.noEr == 0) {
if (battleFinishData == -1) {
if (top.c.noEr === 0) {
top.c.noEr = 1;
clearTimeout(top.c.noErTmr);
top.c.noErTmr = setTimeout('top.c.noEr = 0;', 1000);
@@ -289,21 +282,21 @@ async function reflesh(bl) {
$("#ref").html(data);
});
}
if (g_iCount != 45) g_iCount = 45;
if (g_iCount !== 45) g_iCount = 45;
}
}
function autobattle() {
var i = 1;
let i = 1;
while (i <= za) {
if (zas[i] == 0 || top.slcbrc[4] === 1) {
zas[i] = Math.floor(Math.random(5) * 5 + 1);
if (zas[i] === 0 || top.slcbrc[4] === 1) {
zas[i] = Math.floor(Math.random() * 5 + 1);
change_radio(i, zas[i], 'atack', 1);
}
i++;
}
if (zbs[1] == 0 || top.slcbrc[4] === 1) {
zbs[1] = Math.floor(Math.random(5) * 5 + 1);
if (zbs[1] === 0 || top.slcbrc[4] === 1) {
zbs[1] = Math.floor(Math.random() * 5 + 1);
change_radio(1, zbs[1], 'block', 1);
}
}
@@ -343,25 +336,27 @@ async function atack() {
}
var g_iCount = Number();
var g_iCount = 45;
var tmr0057 = null;
let tmr0057 = null;
// 1.1
function startCountdown() {
if (tmr0057 != null) clearTimeout(tmr0057);
if (tmr0057 !== null) clearTimeout(tmr0057);
if ((g_iCount - 1) >= 0) {
g_iCount -= 1;
return tmr0057 = setTimeout('startCountdown()', 1000);
return tmr0057 = setTimeout(startCountdown, 1000);
}
reflesh();
return tmr0057 = setTimeout('startCountdown()', 1000);
return tmr0057 = setTimeout(startCountdown, 1000);
}
var img_battle = `<img src='https://${top.c.img}/i/battle/1.jpg'>`;
let img_battle = `<img alt="" src='https://${top.c.img}/i/battle/1.jpg'>`;
function mainstatus(id) {
id = +id;
if (isNaN(id)) id = 0;
if (smnpty <= 0) {
$('#btn_down_img2').css({'display': 'none'});
} else {
@@ -383,7 +378,7 @@ function mainstatus(id) {
rand_img();
document.getElementById("player2").innerHTML = `<div style='margin-top:18px;' align='right'>${img_battle}</div>`;
document.getElementById('player2_login').style.display = 'none';
} else if (id == 1) //Можно ударить противника ( доступный удар )
} else if (id === 1) //Можно ударить противника ( доступный удар )
{
document.getElementById('mainpanel').style.display = ''; // 4
document.getElementById('player2_login').style.display = '';
@@ -394,10 +389,10 @@ function mainstatus(id) {
document.getElementById('go_btn').setAttribute("class", "buttons btnnew btnnew2");
document.getElementById('go_btn').setAttribute("onclick", "atackt();");
if (document.getElementById('reflesh_btn') != undefined) {
if (document.getElementById('reflesh_btn')) {
document.getElementById('reflesh_btn').style.display = 'none';
}
} else if (id == 2) //Ожидаем хода противника ( обновить )
} else if (id === 2) //Ожидаем хода противника ( обновить )
{
document.getElementById('mainpanel').style.display = 'none'; // 4
document.getElementById('mainpanel222').style.display = 'none'; // 4
@@ -410,7 +405,7 @@ function mainstatus(id) {
document.getElementById('btn_down_img1').setAttribute("onclick", "reflesht();");
document.getElementById('reflesh_btn').setAttribute("class", "buttons btnnew btnnew2");
document.getElementById('reflesh_btn').setAttribute("onclick", "reflesht();");
} else if (id == 3) // Проиграли. Ожидаем завершения поединка ( кнопка вернутся с поединка )
} else if (id === 3) // Проиграли. Ожидаем завершения поединка ( кнопка вернутся с поединка )
{
document.getElementById('mainpanel2').style.display = ''; // 4
document.getElementById('go_btn').style.display = 'none'; // 4
@@ -430,18 +425,14 @@ function mainstatus(id) {
document.getElementById("player2").innerHTML = `<div style='margin-top:18px;' align='right'>${img_battle}</div>`;
document.getElementById('player2_login').style.display = 'none';
}
if (document.getElementById('mainpanel').style.display == '') {
if (!document.getElementById('mainpanel').style.display) {
document.getElementById('mainpanel2').style.display = 'none';
}
top.goSit(1);
}
function rand_img() {
if (level < 4) {
img_battle = `<img src='//img.new-combats.tech/i/battle/${(Math.floor(Math.random(2) * 2))}.gif'>`;
return
}
img_battle = `<img src='//img.new-combats.tech/i/battle/${(Math.floor(Math.random(29) * 29))}.jpg'>`;
img_battle = `<img alt="" src='//img.new-combats.tech/i/battle/${(Math.floor(Math.random() * 29))}.jpg'>`;
}
var fstlh = 0;
@@ -451,13 +442,13 @@ var id_log_ar = [];
var id_log;
var type_log = top.type_log;
function add_log(id, foryou, text, hod_id, my, last_hod, vars) {
if (top.des == 1) type_log = 0
function add_log(id, text, hod_id, vars) {
if (top.des === 1) type_log = 0
else type_log = 1;
if (type_log == 1) {
if (type_log === 1) {
chsee = 'chsee2';
if (my == 1) chsee = 'chsee3'
//if(id_log_ar[id]!=id)
//{
text = looklogrep(text, vars);
@@ -465,7 +456,7 @@ function add_log(id, foryou, text, hod_id, my, last_hod, vars) {
id_log = id;
// if (top.frames['main'].document.getElementById("battle_log_" + hod_id + "") == undefined && hod_id != 1) {
if (!top.frames['main'].document.getElementById(`battle_log_${hod_id}`) && hod_id != 1) {
if (fstlh == 0) fstlh = hod_id
if (fstlh === 0) fstlh = hod_id
lsthd[lsti] = hod_id;
lsti++;
$(top.frames['main'].document.getElementById('battle_logg')).prepend(`<div style="padding-top:2px;padding-bottom:2px;" id="battle_log_'${hod_id}" class="battle_hod_style"></div>`);
@@ -474,40 +465,40 @@ function add_log(id, foryou, text, hod_id, my, last_hod, vars) {
}
if (!top.frames['main'].document.getElementById(`log_id_${id}`)) {
$(top.frames['main'].document.getElementById(`battle_log_${hod_id}`)).prepend(`<span id="log_id_${id}" class="foryou${foryou}">${text}</span><br>`);
$(top.frames['main'].document.getElementById(`battle_log_${hod_id}`)).prepend(`<span id="log_id_${id}" class="foryou0">${text}</span><br>`);
}
//}
if (top.frames['main'].document.getElementById(`battle_log_${hod_id - 25}`) != undefined) {
if (top.frames['main'].document.getElementById(`battle_log_${hod_id - 25}`)) {
top.rmve(`#battle_log_${hod_id - 25}`);
}
return
}
chsee = 'chsee2';
if (my == 1) chsee = 'chsee3'
text = looklogrep(text, vars);
id_log_ar[id] = id;
id_log = id;
if (!top.document.getElementById(`battle_log_${hod_id}`) && hod_id != 1) {
if (fstlh == 0) {
if (fstlh === 0) {
fstlh = hod_id;
}
lsthd[lsti] = hod_id;
lsti++;
$(top.document.getElementById('battle_logg')).prepend(`<div style="padding-top:2px;padding-bottom:2px;" id="battle_log_${hod_id}" tabindex="${0 - hod_id}" class="battle_hod_style"></div>`);
} else if (top.document.getElementById("battle_log_" + hod_id + "") == undefined) {
} else if (!top.document.getElementById("battle_log_" + hod_id + "")) {
top.document.getElementById('battle_logg').innerHTML = top.document.getElementById('battle_logg').innerHTML + `<div style="padding-top:2px;padding-bottom:2px;" id="battle_log_${hod_id}"></div>`;
}
if (!top.document.getElementById(`log_id_${id}`)) {
$(top.document.getElementById(`battle_log_${hod_id}`)).prepend(`<span id="log_id_${id}" class="foryou${foryou}">${text}</span><br>`);
$(top.document.getElementById(`battle_log_${hod_id}`)).prepend(`<span id="log_id_${id}" class="foryou0">${text}</span><br>`);
}
if (top.document.getElementById(`battle_log_${hod_id - 7}`) != undefined) {
if (top.document.getElementById(`battle_log_${hod_id - 7}`)) {
top.rmve(`#battle_log_${hod_id - 7}`);
}
}
//-- Мой лог--------------------------------
//-------------------------------------------
function add_mlog(id, foryou, text, hod_id, my, last_hod, vars) {
function add_mlog(id, text, hod_id, vars) {
chsee = 'chsee7';
text = looklogrep(text, vars);
id_log_ar[id] = id;
@@ -520,10 +511,10 @@ function add_mlog(id, foryou, text, hod_id, my, last_hod, vars) {
}
if (!top.document.getElementById(`mlog_id_${id}`)) {
$(top.document.getElementById(`battle_mlog_${hod_id}`)).prepend(`<span id="mlog_id_${id}" class="foryou${foryou}">${text}</span><br>`);
$(top.document.getElementById(`battle_mlog_${hod_id}`)).prepend(`<span id="mlog_id_${id}" class="foryou0">${text}</span><br>`);
}
if (top.document.getElementById(`battle_mlog_${hod_id - 14}`) != undefined) {
if (top.document.getElementById(`battle_mlog_${hod_id - 14}`)) {
top.rmve(`#battle_mlog_${hod_id - 14}`);
}
}
@@ -551,36 +542,12 @@ function defPosition(event) {
return {x: x, y: y};
}
function initMove(div, event) {
var event = event || window.event;
x0 = defPosition(event).x;
y0 = defPosition(event).y;
divX0 = parseInt(div.style.left);
divY0 = parseInt(div.style.top);
moveState = true;
}
document.onmouseup = function () {
moveState = false;
}
// И последнее
// Функция обработки движения:
function moveHandler(div, event) {
var event = event || window.event;
if (moveState) {
div.style.left = divX0 + defPosition(event).x - x0;
div.style.top = divY0 + defPosition(event).y - y0;
}
}
function usePriem(id) {
priem_use = id;
if (id != 0) reflesh()
if (id) reflesh();
}
//document.onkeydown=key;
function key() {
//window.status=event.keyCode;
//if(event.keyCode==13){ atack(); }
}
js/gameEngine.js
+2 -2
View File
@@ -950,7 +950,7 @@ function useMagicBattle(name, id, img, type, type_use, text, team) {
// 4.26
function useMagicGoGoBattle(id) {
top.frames['main'].useitem(id, 1, $(`#useMagicLoginBtl${id}`).val());
top.frames['main'].useitem(id, $(`#useMagicLoginBtl${id}`).val());
}
/* Использовать предмет на */
@@ -1028,7 +1028,7 @@ function priemOnUser(pr, id, nm, onInUser, img) {
// 4.32
function usePriemNow(id) {
top.frames['main'].use_on_pers = $(`#usePriemLogin${id}`).val();
top.frames['main'].usepriem(id, 1, '');
top.frames['main'].usepriem(id);
}
var datas = '';