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

Меньше условий. Теперь метод всегда возвращает array во избежание ошибок.

Browse Source
This commit is contained in:
Ivor Barhansky 2023-07-11 02:24:59 +03:00
parent 49a7f3a273
commit 6eca7863ce
1 changed files with 90 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
_incl_data/class/User.php
View File

@ -852,36 +852,28 @@ class User
}
//Расчет урона от оружия
private function weaponAtc($item, $st, $x)
private function weaponAtc($item, $st, $x): array
{
$tp = 0;
if (isset($item['id'])) {
if (empty($item['id'])) {
return [0,0,0,0];
}
$stDefault = [
'minAtack' => 0,
'maxAtack' => 0,
'yron_min' => 0,
'yron_max' => 0,
];
$itmDefault = [
'yron_min' => 0,
'yron_max' => 0,
'sv_yron_min' => 0,
'sv_yron_max' => 0,
];
$itm = ConversionHelper::dataStringToArray($item['data']);
//начинаем расчет урона
if (!isset($st['minAtack'])) {
$st['minAtack'] = 0;
}
if (!isset($st['maxAtack'])) {
$st['maxAtack'] = 0;
}
if (!isset($st['yron_min'])) {
$st['yron_min'] = 0;
}
if (!isset($st['yron_max'])) {
$st['yron_max'] = 0;
}
if (!isset($itm['yron_min'])) {
$itm['yron_min'] = 0;
}
if (!isset($itm['yron_max'])) {
$itm['yron_max'] = 0;
}
if (!isset($itm['sv_yron_min'])) {
$itm['sv_yron_min'] = 0;
}
if (!isset($itm['sv_yron_max'])) {
$itm['sv_yron_max'] = 0;
}
$st = array_merge($stDefault, $st);
$itm = array_merge($itmDefault, $itm);
$min = $itm['sv_yron_min'] + $st['minAtack'] + $itm['yron_min'] + $st['yron_min'];
$max = $itm['sv_yron_max'] + $st['maxAtack'] + $itm['yron_max'] + $st['yron_max'];
@ -951,9 +943,7 @@ class User
$kmin = ceil((2 * (1 + $st['m3'] / 100)) * $min);
$kmax = ceil((2 * (1 + $st['m3'] / 100)) * $max);
$tp = [0 => ceil($min), 1 => ceil($max), 2 => ceil($kmin), 3 => ceil($kmax)];
}
return $tp;
return [0 => ceil($min), 1 => ceil($max), 2 => ceil($kmin), 3 => ceil($kmax)];
}
//Расчет защиты