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

Removing User::class public array $items for Stat()::class.

Browse Source
This commit is contained in:
Ivor Barhansky
2024-01-16 07:18:06 +02:00
parent b0d1388cda
commit 68ef35d14a
3 changed files with 28 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules_data/_umenie.php
View File

@@ -1436,6 +1436,9 @@ $tma = '';
<div class="dtz" ID='dL5'>
<div style="margin:5px;">
<?php
$statnames = new \Model\Constant\Stat();
$statnames->getBonus();
//D5D5D5 , C7C7C7
//задержка в пещерах
$clr = 'D5';
@@ -1450,10 +1453,10 @@ $tma = '';
$v2 = '';
$v3 = Conversion::dataStringToArray($u->stats['effects'][$i]['data']);
$j = 0;
while ($j < count($u->items['add'])) {
if (isset($v3['add_' . $u->items['add'][$j]])) {
$v1 .= '&nbsp;&bull; ' . $u->is[$u->items['add'][$j]] . '<br>';
$v4 = $v3['add_' . $u->items['add'][$j]];
while ($j < count($statnames->sysBonusNames)) {
if (isset($v3['add_' . $statnames->sysBonusNames[$j]])) {
$v1 .= '&nbsp;&bull; ' . $statnames->bonusNames[$statnames->sysBonusNames[$j]] . '<br>';
$v4 = $v3['add_' . $statnames->sysBonusNames[$j]];
if ($v4 > 0) {
$v4 = '+' . $v4;
} elseif ($v4 < 0) {
@@ -1510,10 +1513,10 @@ $tma = '';
$v3 = Conversion::dataStringToArray($e['bonus']);
$j = 0;
while ($j < count($u->items['add'])) {
if (isset($v3['add_' . $u->items['add'][$j]])) {
$v1 .= '&nbsp;&bull; ' . $u->is[$u->items['add'][$j]] . '<br>';
$v4 = $v3['add_' . $u->items['add'][$j]];
while ($j < count($statnames->sysBonusNames)) {
if (isset($v3['add_' . $statnames->sysBonusNames[$j]])) {
$v1 .= '&nbsp;&bull; ' . $statnames->bonusNames[$statnames->sysBonusNames[$j]] . '<br>';
$v4 = $v3['add_' . $statnames->sysBonusNames[$j]];
if ($v4 > 0) {
$v4 = '+' . $v4;
} elseif ($v4 < 0) {
@@ -1845,13 +1848,13 @@ $tma = '';
while ($i <= 8) {
if (isset($st[$i])) {
$j = 0;
while ($j < count($u->items['add'])) {
if (isset($st[$i][$u->items['add'][$j]])) {
$vr = $st[$i][$u->items['add'][$j]];
while ($j < count($statnames->sysBonusNames)) {
if (isset($st[$i][$statnames->sysBonusNames[$j]])) {
$vr = $st[$i][$statnames->sysBonusNames[$j]];
if ($vr > 0) {
$vr = '+' . $vr;
}
$b[$i] .= '&nbsp;&nbsp;&nbsp;&bull; ' . $u->is[$u->items['add'][$j]] . ': ' . $vr . '<br>';
$b[$i] .= '&nbsp;&nbsp;&nbsp;&bull; ' . $statnames->bonusNames[$statnames->sysBonusNames[$j]] . ': ' . $vr . '<br>';
}
$j++;
}
@@ -1917,19 +1920,17 @@ $tma = '';
}
$cmss .= '<br>';
$ia = $u->items['add'];
//добавляем действия комплекта
$cmss .= '<small style="color:grey">';
$ij = 0;
$sti = Conversion::dataStringToArray($plc['data']);
while ($ij < count($ia)) {
if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) {
$mad = $sti[$ia[$ij]];
while ($ij < count($statnames->sysBonusNames)) {
if (isset($statnames->sysBonusNames[$ij]) && isset($sti[$statnames->sysBonusNames[$ij]])) {
$mad = $sti[$statnames->sysBonusNames[$ij]];
if ($mad > 0) {
$mad = '+' . $mad;
}
$cmss .= '&nbsp; &nbsp; &nbsp; &nbsp; &bull; ' . $u->is[$ia[$ij]] . ': ' . $mad . '<br>';
$cmss .= '&nbsp; &nbsp; &nbsp; &nbsp; &bull; ' . $statnames->bonusNames[$statnames->sysBonusNames[$ij]] . ': ' . $mad . '<br>';
}
$ij++;
}

19
modules_data/location/remont.php
View File

@@ -433,17 +433,14 @@ if (isset($_GET['upgrade']) && true == false) {
$restat = [];
$i = 0;
while ($i < count($u->items['add'])) {
if (isset($ro['add_' . $u->items['add'][$i]])) {
$po['add_' . $u->items['add'][$i]] -= $ro['add_' . $u->items['add'][$i]];
if ($po['add_' . $u->items['add'][$i]] == 0) {
unset($po['add_' . $u->items['add'][$i]]);
}
}
if (isset($ro['sv_' . $u->items['add'][$i]])) {
$po['sv_' . $u->items['add'][$i]] -= $ro['sv_' . $u->items['add'][$i]];
if ($po['sv_' . $u->items['add'][$i]] == 0) {
unset($po['sv_' . $u->items['add'][$i]]);
$statnames = new \Model\Constant\Stat();
$statnames->getBonus();
while ($i < count($statnames->sysBonusNames)) {
if (isset($ro['add_' . $statnames->sysBonusNames[$i]])) {
$po['add_' . $statnames->sysBonusNames[$i]] -= $ro['add_' . $statnames->sysBonusNames[$i]];
if ($po['add_' . $statnames->sysBonusNames[$i]] == 0) {
unset($po['add_' . $statnames->sysBonusNames[$i]]);
}
}
$i++;