Убрано дублирование классов. Helpers уехали из Core. Классы во внешних директориях переехали к остальным.

This commit is contained in:
2023-08-14 18:15:05 +03:00
parent 81a8161d32
commit 0d2b4aba63
114 changed files with 12919 additions and 13151 deletions
+8 -8
View File
@@ -6,9 +6,9 @@ elem.parentNode.removeChild(elem);
</script>";
use Core\Config;
use Core\ConversionHelper;
use DarksLight2\Battle\Techniques\TechniqueCategoryEntity;
use DarksLight2\Training\TrainingManager;
use Helper\Conversion;
if (!defined('GAME')) {
die();
@@ -201,7 +201,7 @@ $tma = '';
<TD>
<?php
echo $u->microLogin($u->info['id']);
$st = ConversionHelper::dataStringToArray($u->info['stats']);
$st = Conversion::dataStringToArray($u->info['stats']);
if (
$_GET['dec_transfer'] ||
$_GET['dec_travma'] ||
@@ -261,7 +261,7 @@ $tma = '';
$st['os9'] += (int)$_GET['speed_HP'];
$st['os10'] += (int)$_GET['speed_MP'];
$st['os11'] += (int)$_GET['speed_debuff'];
$u->info['stats'] = ConversionHelper::arrayToDataString($st);
$u->info['stats'] = Conversion::arrayToDataString($st);
}
if ($u->info['sskills'] - (int)$summs < 0) {
echo '&nbsp; &nbsp;<span style="color: red; ">У вас нет свободных особенностей</span><br>';
@@ -466,7 +466,7 @@ $tma = '';
$st['s10'] += (int)$_GET['god'];
}
$u->info['stats'] = ConversionHelper::arrayToDataString($st);
$u->info['stats'] = Conversion::arrayToDataString($st);
if (
$_GET['str'] < 0 ||
@@ -1448,7 +1448,7 @@ $tma = '';
$clr = $clr == 'C7' ? 'D5' : 'C7';
$v1 = '';
$v2 = '';
$v3 = ConversionHelper::dataStringToArray($u->stats['effects'][$i]['data']);
$v3 = Conversion::dataStringToArray($u->stats['effects'][$i]['data']);
$j = 0;
while ($j < count($u->items['add'])) {
if (isset($v3['add_' . $u->items['add'][$j]])) {
@@ -1507,7 +1507,7 @@ $tma = '';
$clr = $clr == 'C7' ? 'D5' : 'C7';
$v1 = '';
$v2 = '';
$v3 = ConversionHelper::dataStringToArray($e['bonus']);
$v3 = Conversion::dataStringToArray($e['bonus']);
$j = 0;
while ($j < count($u->items['add'])) {
@@ -1922,7 +1922,7 @@ $tma = '';
//добавляем действия комплекта
$cmss .= '<small style="color:grey">';
$ij = 0;
$sti = ConversionHelper::dataStringToArray($plc['data']);
$sti = Conversion::dataStringToArray($plc['data']);
while ($ij < count($ia)) {
if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) {
$mad = $sti[$ia[$ij]];
@@ -2343,7 +2343,7 @@ $tma = '';
1
);
if (isset($sf['id'])) {
$sfe = ConversionHelper::dataStringToArray($sf['vals']);
$sfe = Conversion::dataStringToArray($sf['vals']);
$sf[0] = $u->info['exp'] - (int)$sfe['e'];
$sf[1] = $u->info['win'] - (int)$sfe['w'];
$sf[2] = $u->info['lose'] - (int)$sfe['l'];