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

Переезд lookstats отовсюду в 1 класс.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-04-16 01:54:07 +03:00
parent 2d63efd915
commit 3dc4cf7284
76 changed files with 1112 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_incl_data/class/Battle.php
+17 -31
View File
@@ -1,6 +1,7 @@
<?php
use Core\Config;
use Core\ConversionHelper;
use Core\Db;
use User\StatsModel;
@@ -863,7 +864,7 @@ class Battle
$tr = '';
$ti = $u->items['add'];
$x = 0;
$ed = $u->lookStats($eff[$i]['data']);
$ed = ConversionHelper::dataStringToArray($eff[$i]['data']);
while ($x < count($ti)) {
$n = $ti[$x];
if (isset($ed['add_' . $n], $u->is[$n]) && $n != 'pog') {
@@ -1018,7 +1019,7 @@ class Battle
}
//генерируем предметы
$ttl = '<strong>' . $itm[$i]['name'] . '</strong>';
$td = $u->lookStats($itm[$i]['data']);
$td = ConversionHelper::dataStringToArray($itm[$i]['data']);
$lvar = '';
if ($td['add_hpAll'] > 0) {
$td['add_hpAll'] = '+' . $td['add_hpAll'];
@@ -4246,7 +4247,7 @@ class Battle
while ($i < count($this->stats[$this->uids[$uid1]]['items'])) {
$itm = $this->stats[$this->uids[$uid1]]['items'][$i];
if (isset($itm['id'])) {
$e = $u->lookStats($itm['data']);
$e = ConversionHelper::dataStringToArray($itm['data']);
if (isset($e['bm_a1'])) {
if ($end > 0) {
if (file_exists('../../_incl_data/class/priems/' . $e['bm_a1'] . '.end.php')) {
@@ -4279,7 +4280,7 @@ class Battle
'add_pog2=' . $j['y'],
'add_pog2=$', $this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']
);
$dt3 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
$dt3 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
if (isset($dt3['add_pog2mp'])) {
$priem->minMana($uid, round(round($yr2 / 100 * (100 - $dt3['add_pog2p'])) * $dt3['add_pog2mp']));
}
@@ -4289,7 +4290,7 @@ class Battle
}
unset($dt3);
if ($j['y'] < 0 || ($this->stats[$this->uids[$uid]]['mpNow'] <= 0 && $dt3['add_pog2mp'] > 0)) {
$dt2 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
$dt2 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
if (isset($dt2['endPog']) && $dt2['endPog'] == 1) {
//удаляем прием
$this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['priem'] = mysql_fetch_array(
@@ -4349,7 +4350,7 @@ class Battle
'add_pog2=' . $j['y'],
'add_pog2=$', $this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']
);
$dt3 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
$dt3 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
$dt30 = 0;
$dt30 = floor($j['y'] / $yr2 * 100);
if ($dt30 < $dt3['add_pog2p']) {
@@ -4387,7 +4388,7 @@ class Battle
$yr2 = round($yr2 / 100 * (100 - $dt3['add_pog2p']));
}
if ($j['y'] < 0 || ($this->stats[$this->uids[$uid]]['mpNow'] <= 0 && $dt3['add_pog2mp'] > 0)) {
$dt2 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
$dt2 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
if (isset($dt2['endPog']) && $dt2['endPog'] == 1) {
//удаляем прием
//Добавляем в лог
@@ -4676,7 +4677,7 @@ class Battle
$witm01 = 0;
$witm_type01 = 0;
$witm01 = $this->stats[$this->uids[$u1]]['items'][$this->stats[$this->uids[$u1]]['wp' . $wp01 . 'id']];
$witm_data01 = $u->lookStats($witm01['data']);
$witm_data01 = ConversionHelper::dataStringToArray($witm01['data']);
if ($at[$a]['atack'][$j][2] == $v) {
$tyv = $this->mfs(
2, [
@@ -4782,7 +4783,7 @@ class Battle
$witm01 = 0;
$witm_type01 = 0;
$witm01 = $this->stats[$this->uids[$u1]]['items'][$this->stats[$this->uids[$u1]]['wp' . $wp01 . 'id']];
$witm_data01 = $u->lookStats($witm01['data']);
$witm_data01 = ConversionHelper::dataStringToArray($witm01['data']);
if ($this->mfs(
1, [
'u1' => $u1,
@@ -5721,7 +5722,7 @@ class Battle
$ii = 0;
while ($ii < count($s['items'])) {
if (isset($s['items'][$ii]) && $s['items'][$ii]['inOdet'] == $zi[$i]) {
$po = $u->lookStats($s['items'][$ii]['data']);
$po = ConversionHelper::dataStringToArray($s['items'][$ii]['data']);
$x = 0;
while ($x < count($t)) {
$n = $t[$x];
@@ -5778,7 +5779,7 @@ class Battle
if ($wp > 0) {
$witm = $this->stats[$this->uids[$uid1]]['items'][$this->stats[$this->uids[$uid1]]['wp' . $wp . 'id']];
$witm_data = $u->lookStats($witm['data']);
$witm_data = ConversionHelper::dataStringToArray($witm['data']);
$witm_type = $this->weaponTx($witm);
}
if ($witm_type == 0 || $witm_type == 12) {
@@ -8133,7 +8134,7 @@ class Battle
$i++;
}
}
$itm = $u->lookStats($item['data']);
$itm = ConversionHelper::dataStringToArray($item['data']);
$t[0]['z'] = 0;
$t[0]['t'] = 0;
//колящий урон
@@ -8213,7 +8214,7 @@ class Battle
$tp = 0;
$tp20 = 0;
if (isset($item['id'])) {
$itm = $this->lookStats($item['data']);
$itm = \Core\ConversionHelper::dataStringToArray($item['data']);
//начинаем расчет урона
$min = $itm['sv_yron_min'] + $itm['yron_min'] + $st['minAtack'];
$max = $itm['sv_yron_max'] + $itm['yron_max'] + $st['maxAtack'];
@@ -8274,7 +8275,7 @@ class Battle
$min = 0;
$max = 0;
if (isset($item['id'])) {
$itm = $this->lookStats($item['data']);
$itm = \Core\ConversionHelper::dataStringToArray($item['data']);
//начинаем расчет урона
$min = $itm['sv_yron_min'] + $itm['yron_min'] + $st['minAtack'];
$max = $itm['sv_yron_max'] + $itm['yron_max'] + $st['maxAtack'];
@@ -8368,7 +8369,7 @@ class Battle
*/
];
$witmdata = $this->lookStats($witm['data']);
$witmdata = \Core\ConversionHelper::dataStringToArray($witm['data']);
//Расчет типа урона
@@ -8606,21 +8607,6 @@ class Battle
$this->stats[$this->uids[$pl['uid']]] = $u->getStats($pl['uid'], 0, 0, false, false, true);
}
//Разбираем массив со статами
public function lookStats($m): array
{
$ist = [];
$di = explode('|', $m);
$i = 0;
$de = false;
while ($i < count($di)) {
$de = explode('=', $di[$i]);
$ist[$de[0]] = $de[1];
$i++;
}
return $ist;
}
//Расчет мф. (новая)
public function form_mf($u, $au): float
{
@@ -9349,7 +9335,7 @@ class Battle
}
}
//
$anl = $u->lookStats($anl);
$anl = ConversionHelper::dataStringToArray($anl);
$vLog = 'time1=' . time(
) . '||s1=' . $this->users[$i]['sex'] . '||t1=' . $this->users[$i]['team'] . '||login1=' . $this->users[$i]['login'] . '';