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

Убрано дублирование кода.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-08-14 16:37:37 +03:00
parent 63be6c94b3
commit 81a8161d32
6 changed files with 55 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_incl_data/class/Magic.php
+10 -49
View File
@@ -3,6 +3,7 @@
use Core\ConversionHelper;
use Core\Db;
use Magic\Attack;
use User\Effects;
use User\ItemsModel;
class Magic
@@ -291,7 +292,7 @@ class Magic
}
}
if ($goodUse == 1) {
$us = $this->add_eff($u->info['id'], $itm['magic_inc']);
$us = $this->addEffect($u->info['id'], $itm['magic_inc']);
if ($us[0] == 1) {
$itm['iznosNOW']++;
if ($itm['inGroup'] > 0 && $itm['delete'] == 0) {
@@ -1404,7 +1405,7 @@ class Magic
$u->error = 'Вы не можете переманивать данного персонажа...';
}
} elseif ($goodUse == 1) {
$us = $this->add_eff($usr['id'], $itm['magic_inc']);
$us = $this->addEffect($usr['id'], $itm['magic_inc']);
if ($us[0] == 1) {
$mmmid = mysql_insert_id();
$itm['iznosNOW']++;
@@ -1509,7 +1510,7 @@ class Magic
mysql_query(
'DELETE FROM `eff_users` WHERE `uid` = "' . $u->info['id'] . '" AND `id_eff` = 290 AND `delete` =0'
);
$this->add_eff($u->info['id'], 290);
$this->addEffect($u->info['id'], 290);
$echotext = 'Настойка на жучьей требухе!';
$u->error = 'Вы получили эфект от ' . $echotext . '';
} elseif ($slech == 2) {
@@ -1521,7 +1522,7 @@ class Magic
mysql_query(
'DELETE FROM `eff_users` WHERE `uid` = "' . $u->info['id'] . '" AND `id_eff` = 470 AND `delete` =0'
);
$this->add_eff($u->info['id'], 472);
$this->addEffect($u->info['id'], 472);
$echotext = 'Амброзия подмастерья Владык!';
$u->error = 'Вы получили эфект от ' . $echotext . '';
} elseif ($slech == 3) {
@@ -1533,7 +1534,7 @@ class Magic
mysql_query(
'DELETE FROM `eff_users` WHERE `uid` = "' . $u->info['id'] . '" AND `id_eff` = 470 AND `delete` =0'
);
$this->add_eff($u->info['id'], 470);
$this->addEffect($u->info['id'], 470);
$echotext = 'Амброзия Скучающих Владык!';
$u->error = 'Вы получили эфект от ' . $echotext . '';
} elseif ($slech == 4) {
@@ -1542,7 +1543,7 @@ class Magic
mysql_query(
'DELETE FROM `eff_users` WHERE `uid` = "' . $u->info['id'] . '" AND `id_eff` = 35 AND `delete` =0'
);
$this->add_eff($u->info['id'], 35);
$this->addEffect($u->info['id'], 35);
$echotext = 'Звездное Сияние!';
$u->error = 'Вы получили эфект от ' . $echotext . '';
} else {
@@ -1962,7 +1963,7 @@ class Magic
if ($itm['magic_inc'] == '') {
$itm['magic_inc'] = $itm['magic_inci'];
}
$us = $this->add_eff($u->info['id'], $itm['magic_inc']);
$us = $this->addEffect($u->info['id'], $itm['magic_inc']);
if ($us[0] == 1) {
$itm['iznosNOW']++;
mysql_query(
@@ -2020,49 +2021,9 @@ class Magic
//Использование предмета
public function add_eff($uid, $id, $is_no = null)
public function addEffect($uid, $id, $isNo = null): array
{
$g = [0 => 0, 1 => ''];
$eff = mysql_fetch_array(mysql_query('SELECT * FROM `eff_main` WHERE `id2` = "' . $id . '" LIMIT 1'));
if ($is_no != null) {
//добавляем эффект персонажу
if ($eff['onlyOne'] > 0) {
//убираем прошлые эффекты
$goodUse = 0;
$upd1 = mysql_query(
'UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `uid` = "' . $uid . '" AND `delete` = "0" AND `id_eff` = "' . $eff['id2'] . '"'
);
if ($upd1) {
$goodUse = 1;
}
}
if ($st['oneType'] > 0) {
//убираем прошлые эффекты
$goodUse = 0;
$upd2 = mysql_query(
'UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `uid` = "' . $uid . '" AND `delete` = "0" AND `overType` = "' . $eff['overType'] . '"'
);
if ($upd2) {
$goodUse = 1;
}
}
}
if ($goodUse == 1 || $is_no == null) {
if (isset($eff['id2'])) {
//$eff = $this->paguba($eff);
$n = $eff['mname'];
$d = $eff['mdata'];
$ins = mysql_query(
'INSERT INTO `eff_users` (`overType`,`id_eff`,`uid`,`name`,`timeUse`,`data`,`no_Ace`) VALUES ("' . $eff['oneType'] . '","' . $eff['id2'] . '","' . $uid . '","' . $n . '","' . time() . '","' . $d . '","' . $eff['noAce'] . '")'
);
if ($ins) {
$g[0] = 1;
$g[1] = '...';
}
}
}
return $g;
return Effects::addById($uid, $id, (bool)$isNo) ? [1, '...'] : [0, ''];
}
public function atackUser($uid1, $uid2, $tm, $btl, $addExp = 0, $type = 0)