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

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

Browse Source
This commit is contained in:
Ivor Barhansky
2023-08-14 18:15:05 +03:00
parent 81a8161d32
commit 0d2b4aba63
114 changed files with 12919 additions and 13151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules_data/location/remont.php
View File

@@ -1,7 +1,6 @@
<?php
use Core\ConversionHelper;
use Insallah\Runes;
use Helper\Conversion;
use User\ItemsModel;
if (!defined('GAME')) {
@@ -46,7 +45,7 @@ if (isset($_GET['upgrade']) && true == false) {
$ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%modif%" AND `iu`.`data` NOT LIKE "%upgrade=5%" AND `iu`.`id` = "' . mysql_real_escape_string((int)$_GET['upgrade']) . '" LIMIT 1'));
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if ($ir['price1'] > $ir['1price']) {
$ir['1price'] = $ir['price1'];
}
@@ -117,7 +116,7 @@ if (isset($_GET['upgrade']) && true == false) {
$u->addDelo(2, $u->info['id'], '&quot;<font color="#4863A0">System.remont.itemUpgrade</font>&quot;: Предмет &quot;' . $ir['name'] . '&quot; [itm:' . $ir['id'] . '] был успешно улучшен (' . $po['upgrade'] . '/5) за ' . $pcena . ' кр..', time(), $u->info['city'], 'System.remont.itemUpgrade', 0, 0);
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '",`1price` = "' . $ir['1price'] . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
$u->info['money'] -= $pcena;
@@ -138,7 +137,7 @@ if (isset($_GET['upgrade']) && true == false) {
AND `iu`.`id` = "' . mysql_real_escape_string((int)$_GET['modif']) . '" LIMIT 1'));
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if ($ir['price1'] > $ir['1price']) {
$ir['1price'] = $ir['price1'];
}
@@ -248,7 +247,7 @@ if (isset($_GET['upgrade']) && true == false) {
$po['mf_mib'] += $fadd[2];
}
$po['modif'] = 1;
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '",`1price` = "' . $ir['1price'] . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
@@ -272,7 +271,7 @@ if (isset($_GET['upgrade']) && true == false) {
// Предмет существует.
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']); // Тут мы храним характеристики предмета.
$po = Conversion::dataStringToArray($ir['data']); // Тут мы храним характеристики предмета.
if ($po['tr_lvl'] > $ir['level']) {
$pl['level'] = $po['tr_lvl']; // Если уровень предмета, меньше чем уровень требований с характеристик, то идет обновление уровня предмета.
}
@@ -309,8 +308,8 @@ if (isset($_GET['upgrade']) && true == false) {
// Обнуляем инфу к стандартным данным - $ir['item_id']
$item_default = mysql_fetch_array(mysql_query('SELECT `data` FROM `items_main_data` WHERE `items_id` = "' . mysql_real_escape_string((int)$ir['item_id']) . '" LIMIT 1'));
$item_default = ConversionHelper::dataStringToArray($item_default['data']);
$upattack = ConversionHelper::dataStringToArray($upattack['data']);
$item_default = Conversion::dataStringToArray($item_default['data']);
$upattack = Conversion::dataStringToArray($upattack['data']);
if ($upattack['uptype'] == 22) {
$po['add_m11'] -= $upattack['upatack'] * 2;
$po['tr_lvl'] = $item_default['tr_lvl'];
@@ -326,7 +325,7 @@ if (isset($_GET['upgrade']) && true == false) {
unset($po["upatack_lvl"]);
unset($item_default);
unset($upattack);
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
var_info($po);
@@ -343,7 +342,7 @@ if (isset($_GET['upgrade']) && true == false) {
$ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%rune_id%" AND `iu`.`id` = "' . mysql_real_escape_string((int)$_GET['unrune']) . '" LIMIT 1'));
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if ($po['tr_lvl'] > $ir['level']) {
$ir['level'] = $po['tr_lvl'];
}
@@ -378,7 +377,7 @@ if (isset($_GET['upgrade']) && true == false) {
$ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%upatack_id%" AND `iu`.`id` = "' . mysql_real_escape_string((int)$_GET['ubeff']) . '" LIMIT 1'));
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if ($po['tr_lvl'] > $ir['level']) {
$ir['level'] = $po['tr_lvl'];
}
@@ -389,7 +388,7 @@ if (isset($_GET['upgrade']) && true == false) {
$pcena = 0;
}
$iro = mysql_fetch_array(mysql_query('SELECT * FROM `items_main_data` WHERE `items_id` = "' . $po['upatack_id'] . '" LIMIT 1'));
$ro = ConversionHelper::dataStringToArray($iro['data']);
$ro = Conversion::dataStringToArray($iro['data']);
$restat = [];
$i = 0;
@@ -414,7 +413,7 @@ if (isset($_GET['upgrade']) && true == false) {
$u->addDelo(2, $u->info['id'], '&quot;<font color="#4863A0">System.remont.ubeff</font>&quot;: Руна &quot;' . $po['upatack_name'] . '&quot; была успешно извлечена из предмета &quot;' . $ir['name'] . '&quot; [itm:' . $ir['id'] . '] за ' . $pcena . ' кр.', time(), $u->info['city'], 'System.remont.ubeff', 0, 0);
unset($po['upatack'], $po['upatack_id'], $po['upatack_name'], $po['upatack_lvl']);
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
$u->info['money'] -= $pcena;
@@ -436,7 +435,7 @@ if (isset($_GET['upgrade']) && true == false) {
}
if ($pcena <= $u->info['money']) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
$po['gravi'] = substr($_GET['grav_text'], 0, 20);
$po['gravic'] = $u->info['city'];
$po['gravi'] = str_replace('=', '', $po['gravi']);
@@ -445,7 +444,7 @@ if (isset($_GET['upgrade']) && true == false) {
$tst = str_replace(' ', '', $po['gravi']);
$po['gravi'] = preg_replace("/[^a-zA-ZА-Яа-я0-9\s]/", "", $po['gravi']);
if ($po['gravi'] != '' && $tst != '') {
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
$re = '<div align="left">На предмете &quot;' . $ir['name'] . '&quot; был успешно выгровирован текст за ' . $pcena . ' кр.</div>';
@@ -469,7 +468,7 @@ if (isset($_GET['upgrade']) && true == false) {
}
if ($pcena <= $u->info['money']) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
$po['gravi'] = substr($_GET['grav_text'], 0, 20);
$po['gravic'] = $u->info['city'];
$po['gravi'] = str_replace('=', '', $po['gravi']);
@@ -478,7 +477,7 @@ if (isset($_GET['upgrade']) && true == false) {
$tst = str_replace(' ', '', $po['gravi']);
$po['gravi'] = preg_replace("/[^a-zA-ZА-Яа-я0-9\s]/", "", $po['gravi']);
if ($po['gravi'] != '' && $tst != '') {
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
$re = '<div align="left">На предмете &quot;' . $ir['name'] . '&quot; был успешно выгровирован текст за ' . $pcena . ' кр.</div>';
@@ -495,7 +494,7 @@ if (isset($_GET['upgrade']) && true == false) {
$ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `im`.`inslot` = 5 AND `iu`.`id` = "' . mysql_real_escape_string((int)$_GET['podgon']) . '" LIMIT 1'));
if (isset($ir['id'])) {
$po = [];
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if (!isset($po['podgon'])) {
if ($po['tr_lvl'] > $ir['level']) {
$ir['level'] = $po['tr_lvl'];
@@ -506,7 +505,7 @@ if (isset($_GET['upgrade']) && true == false) {
$po['podgon'] = 1;
$po['add_hpAll'] += $prhp;
$po['sudba'] = $u->info['login'];
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `users` SET `money` = `money` - "' . $pcena . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
$re = '<div align="left">Предмет &quot;' . $ir['name'] . '&quot; был успешно подогнан за ' . $pcena . ' кр. (Добавлено +' . $prhp . 'HP)</div>';
@@ -544,7 +543,7 @@ if (isset($_GET['upgrade']) && true == false) {
} //кэп поможет
if (isset($ir['id'])) {
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if (isset($po['noremont'])) {
$re2 = 'Предмет не подлежит ремонту в этой мастерской.';
} else {
@@ -616,7 +615,7 @@ if (isset($_GET['upgrade']) && true == false) {
} //кэп поможет
if (isset($ir['id'])) {
$po = ConversionHelper::dataStringToArray($ir['data']);
$po = Conversion::dataStringToArray($ir['data']);
if (isset($po['noremont'])) {
$re2 = 'Предмет не подлежит ремонту в этой мастерской.';
} else {
@@ -664,7 +663,7 @@ if (isset($_GET['upgrade']) && true == false) {
if ($ir['iznosMAX'] < 1) {
$ir['iznosMAX'] = 1;
}
$po = ConversionHelper::arrayToDataString($po);
$po = Conversion::arrayToDataString($po);
mysql_query('UPDATE `items_users` SET `data` = "' . $po . '",`iznosNOW` = "' . $ir['iznosNOW'] . '",`iznosMAX` = "' . $ir['iznosMAX'] . '" WHERE `id` = "' . $ir['id'] . '" LIMIT 1');
$re2 = 'Удачно произведен ремонт ' . $re2 . ' предмета &quot;' . $ir['name'] . '&quot; за ' . $u->zuby($rem_cell, 1) . '.';
$dop = 0;
@@ -977,7 +976,7 @@ if ($re != '') {
if ($wrk == 1 && ($sti['sudba'] == '0' || !isset($sti['sudba']))) {
$sti['sudba'] = $u->info['login'];
}
$sti_imp = ConversionHelper::arrayToDataString($sti);
$sti_imp = Conversion::arrayToDataString($sti);
$u->addEkr(-$epr);
mysql_query('UPDATE `items_users` SET `data` = "' . mysql_real_escape_string($sti_imp) . '" WHERE `id` = "' . $itmu['id'] . '" LIMIT 1');
$er2 = 'Предмет &quot;' . $itmm['name'] . '&quot; успешно подогнан под &quot;' . $com2['name'] . '&quot; за ' . $epr . ' екр.';