From 01b504e6775518b0e227880c9643181f11434f9f Mon Sep 17 00:00:00 2001 From: Ivor Barhansky Date: Fri, 31 Mar 2023 21:30:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=20=D0=BE=D1=82?= =?UTF-8?q?=20=D0=B0=D0=B1=D1=81=D0=BE=D0=BB=D1=8E=D1=82=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA=20https://new-combats.c?= =?UTF-8?q?om/*=20=D0=BA=20=D0=BE=D1=82=D0=BD=D0=BE=D1=81=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=20/*.=20=D0=97=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20https://img.new-combats.com=20=D0=BD=D0=B0?= =?UTF-8?q?=20//img.new-combats.tech.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .htaccess | 9 +- AI.php | 2 +- _incl_data/class/Battle.php | 64 ++-- _incl_data/class/BotLogic.php | 6 +- _incl_data/class/ComissionShop.php | 14 +- _incl_data/class/Core/Config.php | 1 + _incl_data/class/Core/Database.php | 4 +- _incl_data/class/Dialog.php | 48 +-- _incl_data/class/Dungeon.php | 44 +-- _incl_data/class/FightRequest.php | 72 ++--- _incl_data/class/GameDealer.php | 2 +- _incl_data/class/Insallah/Achievements.php | 2 +- _incl_data/class/Magic.php | 40 +-- _incl_data/class/Priems.php | 14 +- _incl_data/class/Quests.php | 16 +- _incl_data/class/Telegram.php | 20 +- _incl_data/class/Tournir.php | 2 +- _incl_data/class/User.php | 256 +++++++-------- .../class/dnaction/_dungeon_replace.php | 108 +++---- _incl_data/class/magic/arhmoney.php | 6 +- _incl_data/class/priems/bloodring.php | 2 +- _incl_data/class/priems/bloodring2.php | 2 +- _incl_data/crons/bot_calls.php | 2 +- _incl_data/crons/undone/cron_tower.php | 24 +- adminion/balance.php | 2 +- adminion/dn_editor.php | 26 +- adminion/dn_editor_bots.php | 2 +- adminion/dn_editor_botsAll.php | 2 +- adminion/dn_editor_bots_itms.php | 2 +- adminion/editor_shop.php | 6 +- adminion/index.php | 4 - adminion/item_edit_data.php | 2 +- adminion/items_editor.php | 4 +- adminion/mod/dungeon_bots.php | 4 +- adminion/mult.php | 2 +- adminion/recovery.php | 2 +- adminion/shop_editor.php | 6 +- adminion/testing.php | 14 +- ajax.php | 2 +- blago.php | 81 ++--- bonuss.php | 4 +- breakchaos.php | 2 +- buttons.php | 114 +++---- clans_inf.php | 32 +- css/2/design2.css | 2 +- css/2/dungeon_gy0.css | 60 ++-- css/2/dungeon_kn4.css | 60 ++-- css/2/dungeon_ppk1.css | 60 ++-- css/2/dungeon_sn.css | 60 ++-- css/2/dungeon_sun.css | 60 ++-- css/2/dungeon_uq.css | 60 ++-- css/buttons.php.css | 2 +- css/clu0b.css | 40 +-- css/fightclub.css | 60 ++-- css/loc_bk.css | 36 +-- css/obraz.css | 10 +- css/windows.css | 106 +++---- dn_grabber.php | 2 +- dng/head/dungeon.all.js | 2 +- dng/head/dungeon.constructor.js | 2 +- dng/head/dungeon.offlinedata.js | 82 ++--- dng/head/dungeonengine.js | 14 +- dng/i/css/dungeon.css | 2 +- ekr.php | 10 +- encicl/law.html | 41 ++- encicl/law2.html | 39 ++- encicl/law3.html | 39 ++- encicl/law4.html | 51 ++- enter.php | 2 +- exp.php | 39 ++- forum_script/_forum.class.php | 26 +- forum_script/index.php | 78 ++--- gate.php | 4 - goodpay.html | 2 +- head/dungeon.all.js | 2 +- head/dungeon.constructor.js | 2 +- head/dungeon.offlinedata.js | 82 ++--- head/dungeonengine.js | 14 +- hmonitor.php | 28 +- i/css/dungeon.css | 2 +- img.new-combats.com/chars/0/ekr.php | 25 +- img.new-combats.com/i/zones/1/index.html | 4 +- img.new-combats.com/i/zones/3/index.html | 2 +- inf.php | 120 +++---- items_info.php | 88 +++--- js/btl_info.js | 2 +- js/btl_mini.js | 4 +- js/gameEngine.js | 22 +- js/interface.js | 8 +- js/jquery.locations.js | 2 +- js/onlineList.js | 37 +-- jx/dungeon.php | 2 +- logs.php | 49 ++- mail.php | 2 +- mailconf.php | 2 +- main.php | 4 +- modules_data/1_panel.php | 2 +- modules_data/3_panel.php | 2 +- modules_data/7_panel.php | 2 +- modules_data/_NewLocations.php | 14 +- modules_data/_alh.php | 24 +- modules_data/_alhp.php | 10 +- modules_data/_animal.php | 2 +- modules_data/_bagreport.php | 39 ++- modules_data/_bukmeker.php | 2 +- modules_data/_clan-OLD.php | 12 +- modules_data/_clan.php | 118 +++---- modules_data/_clan1.php | 22 +- modules_data/_clan2.php | 12 +- modules_data/_clan_oldversion.php | 120 +++---- modules_data/_dialog.php | 4 +- modules_data/_friends.php | 60 ++-- modules_data/_friends_.php | 54 ++-- modules_data/_galery.php | 2 +- modules_data/_inv-new.php | 4 +- modules_data/_inv-old.php | 2 +- modules_data/_inv.php | 2 +- modules_data/_inv_moder.php | 4 +- modules_data/_light.php | 4 +- modules_data/_locations.php | 14 +- modules_data/_mod.php | 106 +++---- modules_data/_mod2.php | 4 +- modules_data/_mods.php | 22 +- modules_data/_newanimal.bac.php | 12 +- modules_data/_newanimal.php | 12 +- modules_data/_obraz.php | 4 +- modules_data/_quests.php | 2 +- modules_data/_ref.php | 2 +- modules_data/_relikt.php | 60 ++-- modules_data/_transfers.php | 6 +- modules_data/_umenie.php | 177 ++++------- modules_data/_zv.php | 2 +- modules_data/add_eff.php | 46 ++- modules_data/btl_.php | 116 ++++--- modules_data/btl_bac.php | 117 ++++--- modules_data/location/_shop_referal_.php | 2 +- modules_data/location/a_clanreg.php | 14 +- modules_data/location/a_fontan.php | 4 +- modules_data/location/a_hram.php | 2 +- modules_data/location/ab/cp.php | 21 +- modules_data/location/ab/cp2.php | 12 +- modules_data/location/ab/goral.php | 6 +- modules_data/location/ab/hram.php | 20 +- modules_data/location/ab/hramOLD.php | 20 +- modules_data/location/ab/izlom16.php | 12 +- modules_data/location/ab/izlom2.php | 6 +- modules_data/location/ab/izlomshop.php | 2 +- modules_data/location/ab/kareta.php | 8 +- modules_data/location/ab/legion.php | 6 +- modules_data/location/ab/quest.php | 12 +- modules_data/location/ab/vokzal.php | 2 +- modules_data/location/altar_cat.php | 14 +- modules_data/location/an/bank.php | 6 +- modules_data/location/an/bk.php | 26 +- modules_data/location/an/bk2.php | 22 +- modules_data/location/an/cp1.php | 55 ++-- modules_data/location/an/cp2.php | 37 +-- modules_data/location/an/flower.php | 14 +- modules_data/location/an/kinght.php | 22 +- modules_data/location/an/post.php | 10 +- modules_data/location/an/remont.php | 6 +- modules_data/location/an/room_hostel.php | 26 +- modules_data/location/an/shop_.php | 10 +- modules_data/location/an/taverna.php | 4 +- modules_data/location/an/torg.php | 22 +- modules_data/location/an/vokzal.php | 2 +- modules_data/location/an/zalu.php | 16 +- modules_data/location/an/zalu_pal.php | 16 +- modules_data/location/an/znahar.php | 12 +- modules_data/location/an/zv1.php | 24 +- modules_data/location/an/zv2.php | 24 +- modules_data/location/an/zv3.php | 24 +- modules_data/location/an/zv4.php | 24 +- modules_data/location/arena.php | 6 +- modules_data/location/artshop.php | 4 +- modules_data/location/bank.php | 4 +- modules_data/location/berezka.php | 15 +- modules_data/location/bk.php | 22 +- modules_data/location/bk2.php | 18 +- modules_data/location/bk_rm1.php | 48 +-- modules_data/location/bookshop.php | 2 +- modules_data/location/bsenter.php | 34 +- modules_data/location/btl_.php | 116 ++++--- modules_data/location/commision.php | 2 +- modules_data/location/commision2.php | 2 +- modules_data/location/cp1.php | 110 ++----- modules_data/location/cp2.php | 44 ++- modules_data/location/cp3.php | 24 +- modules_data/location/cp4.php | 22 +- modules_data/location/dragopsh.php | 92 +++--- modules_data/location/dungeon.php | 64 ++-- modules_data/location/dungeon_css.css | 58 ++-- modules_data/location/dungeon_enter.php | 16 +- modules_data/location/dungeon_enter_all.php | 44 +-- modules_data/location/dungeon_shop.php | 2 +- modules_data/location/dungeon_shop_all.php | 18 +- modules_data/location/dungeons/building.php | 4 +- modules_data/location/elka.php | 22 +- modules_data/location/em/casino.php1 | 299 ------------------ modules_data/location/em/cp.php | 40 +-- modules_data/location/em/cp2.php | 40 +-- modules_data/location/em/ruletka.php | 2 +- modules_data/location/em/ruletka11.php | 2 +- modules_data/location/em/vokzal.php | 2 +- modules_data/location/enterbezdna.php | 10 +- modules_data/location/enterbezdna_shop.php | 2 +- modules_data/location/entercat.php | 8 +- modules_data/location/enterdrago.php | 26 +- modules_data/location/entergrib.php | 8 +- modules_data/location/enternekro.php | 6 +- modules_data/location/enternizin.php | 8 +- modules_data/location/enterptp.php | 10 +- modules_data/location/enterptp_shop.php | 2 +- modules_data/location/entersnow.php | 6 +- modules_data/location/fe/bk.php | 22 +- modules_data/location/fe/cp.php | 22 +- modules_data/location/fe/magportal.php | 26 +- modules_data/location/fe/sclep.php | 8 +- modules_data/location/fe/shop_.php | 2 +- modules_data/location/fe/vokzal.php | 2 +- modules_data/location/fe/zv1.php | 22 +- modules_data/location/fe/zv2.php | 22 +- modules_data/location/fe/zv3.php | 22 +- modules_data/location/fe/zv4.php | 22 +- modules_data/location/flower.php | 14 +- modules_data/location/griboed.php | 2 +- modules_data/location/house_belaun.php | 42 +-- modules_data/location/hram.php | 4 +- modules_data/location/hramrep.php | 4 +- modules_data/location/hrump_shop.php | 2 +- modules_data/location/izlom2.php | 4 +- modules_data/location/izlomshop.php | 2 +- modules_data/location/karcer.php | 2 +- modules_data/location/kareta.php | 8 +- modules_data/location/katok.php | 4 +- modules_data/location/kinght.php | 24 +- modules_data/location/komorka.php | 2 +- modules_data/location/loto.php | 126 ++++---- modules_data/location/loto2.php | 126 ++++---- modules_data/location/magportal.php | 32 +- modules_data/location/magportal_podval.php | 2 +- modules_data/location/miloserdie.php | 6 +- modules_data/location/monwar.php | 4 +- modules_data/location/nakova2.php | 2 +- modules_data/location/nc/bk.php | 24 +- modules_data/location/nc/cp.php | 18 +- modules_data/location/nc/shop_.php | 2 +- modules_data/location/nc/vokzal.php | 2 +- modules_data/location/nc/zv1.php | 22 +- modules_data/location/nc/zv2.php | 22 +- modules_data/location/nc/zv3.php | 22 +- modules_data/location/nc/zv4.php | 22 +- modules_data/location/noobshop106.php | 2 +- modules_data/location/novich.php | 10 +- modules_data/location/objaga.php | 121 ++----- modules_data/location/padalshik.php | 6 +- modules_data/location/penter.php | 6 +- modules_data/location/perehod.php | 10 +- modules_data/location/poklon.php | 18 +- modules_data/location/post.php | 8 +- modules_data/location/remont.php | 6 +- modules_data/location/ric_zv.php | 28 +- modules_data/location/room_hostel.php | 26 +- modules_data/location/room_xot.php | 2 +- modules_data/location/ruine.php | 26 +- modules_data/location/ruine_enter.php | 10 +- modules_data/location/secret.php | 2 +- modules_data/location/shop2_.php | 2 +- modules_data/location/shop_.php | 12 +- modules_data/location/shop_kat.php | 2 +- modules_data/location/shop_priz.php | 8 +- modules_data/location/spavedlivost.php | 6 +- modules_data/location/taverna.php | 4 +- modules_data/location/test/cp.php | 20 +- modules_data/location/torg.php | 24 +- modules_data/location/trade_zv.php | 28 +- modules_data/location/vokzal.php | 2 +- modules_data/location/zalu.php | 20 +- modules_data/location/zalu_pal.php | 20 +- modules_data/location/zalu_pal2.php | 16 +- modules_data/location/zalu_pal3.php | 20 +- modules_data/location/zalu_pal4.php | 20 +- modules_data/location/znahar.php | 12 +- modules_data/location/znahar1.php | 12 +- modules_data/location/zooshop.php | 2 +- modules_data/location/zv1.php | 20 +- modules_data/location/zv2.php | 20 +- modules_data/location/zv3.php | 20 +- modules_data/location/zv4.php | 20 +- modules_data/location/zv_svet.php | 26 +- modules_data/moder/new/editalign.php | 2 +- modules_data/stats_2.php | 2 +- modules_data/stats_inv.php | 42 +-- modules_data/stats_inv2.php | 4 +- modules_data/stats_loc.php | 8 +- modules_data/vip1.php | 6 +- mp3.php | 2 +- news_script/css/style1.css | 8 +- news_script/index.php | 84 ++--- news_script/lib/achivki.html | 6 +- news_script/lib/boevie_sumki.html | 20 +- news_script/lib/bonusi_statov.html | 6 +- news_script/lib/bs.html | 6 +- news_script/lib/charki.html | 6 +- news_script/lib/class_balance.html | 6 +- news_script/lib/daily_quest.html | 6 +- news_script/lib/ekri.html | 6 +- news_script/lib/gs.html | 6 +- news_script/lib/hz.html | 6 +- news_script/lib/jori.html | 6 +- news_script/lib/kredi.html | 6 +- news_script/lib/magicheskie_priemi.html | 6 +- news_script/lib/pisheri.html | 6 +- news_script/lib/pisherniy_drop.html | 6 +- news_script/lib/pmk.html | 6 +- news_script/lib/podava.html | 6 +- news_script/lib/profilnie_ataki.html | 6 +- news_script/lib/reliki.html | 6 +- news_script/lib/runi.html | 6 +- news_script/lib/svitki_zatochki.html | 6 +- news_script/lib/voinka.html | 6 +- news_script/lib/voinskie_priemi.html | 6 +- news_script/lib/zouzom.html | 6 +- news_script/lib/zveri.html | 6 +- news_script/style.css | 6 +- notgoodpay.html | 2 +- obraz.php | 20 +- online.php | 6 +- rating_ref.php | 39 ++- rating_script/index.php | 52 +-- register.php | 2 +- reting_clans.php | 44 +-- reting_pers.php | 58 ++-- robots.txt | 2 +- ruin_characteristics.php | 10 +- ruins.php | 4 +- scripts/psi.js | 2 +- settings.php | 26 +- sitemap.xml | 58 ++-- social.php | 2 +- spam.php | 2 +- stats_bonus.php | 45 ++- telegraf.php | 4 +- towerlog.php | 6 +- transfer.php | 6 +- vk/FB.php | 2 +- 346 files changed, 3507 insertions(+), 4221 deletions(-) delete mode 100644 modules_data/location/em/casino.php1 diff --git a/.htaccess b/.htaccess index c5bdef18..88f4d734 100644 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,7 @@ DefaultLanguage ru -#Options +FollowSymLinks -MultiViews + Options -Indexes Options -MultiViews RewriteEngine On @@ -14,10 +14,7 @@ RewriteCond %{HTTP:PROXY_CONNECTION} !^$ [OR] RewriteCond %{HTTP:XPROXY_CONNECTION} !^$ [OR] RewriteCond %{HTTP:HTTP_PC_REMOTE_ADDR} !^$ [OR] RewriteCond %{HTTP:HTTP_CLIENT_IP} !^$ -RewriteRule (.+) https://new-combats.com/proxy/ - -RewriteCond %{SERVER_PORT} 80 -RewriteRule ^(.*)$ https://new-combats.com/$1 [R,L] +RewriteRule (.+) https://new-combats.tech/proxy/ RewriteBase / RewriteCond %{ENV:REDIRECT} !^yes$ @@ -79,7 +76,7 @@ RewriteRule ^repass/?$ /repass.php [L] RewriteRule ^mail/(.*)/?$ /mailconf.php?$1 [L] RewriteRule ^register/?$ /register.php [L] -#RewriteRule ^register1/?$ /register1.php [L] + RewriteRule ^reg/?$ /register.php [L] RewriteRule ^enter/?$ /enter.php [L] diff --git a/AI.php b/AI.php index 83ab1d3b..c9cb6ea5 100644 --- a/AI.php +++ b/AI.php @@ -160,7 +160,7 @@ function inuser_go_btl($id) { if (isset($id['id'])) { file_get_contents( - 'https://new-combats.com/jx/battle/refresh.php?uid=' . $id['id'] . '&cron_core=' . md5( + '/jx/battle/refresh.php?uid=' . $id['id'] . '&cron_core=' . md5( $id['id'] . '_brfCOreW@!_' . $id['pass'] ) . '&pass=' . $id['pass'] ); diff --git a/_incl_data/class/Battle.php b/_incl_data/class/Battle.php index d6328021..33a2a45a 100644 --- a/_incl_data/class/Battle.php +++ b/_incl_data/class/Battle.php @@ -786,7 +786,7 @@ class Battle $ef = ''; $i = 0; if ($u->info['seff'] < 1) { - $ef .= '
Свернуть\',event,3,1,1,1,\'\');\" onmouseout=\"top.hic();\" onmousedown=\"top.hic();\">
'; + $ef .= '
Свернуть\',event,3,1,1,1,\'\');\" onmouseout=\"top.hic();\" onmousedown=\"top.hic();\">
'; while ($i != -1) { $nseef = 0; @@ -938,7 +938,7 @@ class Battle $ei .= '
Информация:
' . $eff[$i]['info']; } - $ef .= '
'; + $ef .= '
'; unset($efix); } } elseif ($eff[$i] != 'delete') { @@ -947,17 +947,17 @@ class Battle $i++; } } else { - $ef .= '
Развернуть\',event,3,1,1,1,\'\');\" onmouseout=\"top.hic();\" onmousedown=\"top.hic();\">
'; + $ef .= '
Развернуть\',event,3,1,1,1,\'\');\" onmouseout=\"top.hic();\" onmousedown=\"top.hic();\">
'; } $ca = ''; if ($ur['clan'] > 0) { $cl = Db::getRow('select * from clan where id = ?', [$ur['clan']]); if (isset($cl['id'])) { - $ca = ''; + $ca = ''; } } if ($ur['align'] > 0) { - $ca = '' . $ca; + $ca = '' . $ca; } if ($ur['login2'] == '') { $ur['login2'] = $ur['login']; @@ -1001,7 +1001,7 @@ class Battle 11 => 17, //кольцо 2 12 => 18, //кольцо 3 ]; - $info = 'info_reflesh(' . $t . ',' . $ur['id'] . ',"' . $ca . '' . $ur['login2'] . ' [' . $ur['level'] . '] ","' . $ur['obraz'] . '",' . floor( + $info = 'info_reflesh(' . $t . ',' . $ur['id'] . ',"' . $ca . '' . $ur['login2'] . ' [' . $ur['level'] . '] ","' . $ur['obraz'] . '",' . floor( $st['hpNow'] ) . ',' . floor($st['hpAll']) . ',' . floor( $st['mpNow'] @@ -1346,12 +1346,12 @@ class Battle // $btxt = ''; if ($id['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($id['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $id['level'] . ']'; + $btxt = $btxt . '{u1}[' . $id['level'] . ']'; if ($id['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -1405,12 +1405,12 @@ class Battle // $btxt = ''; if ($id['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($id['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $id['level'] . ']'; + $btxt = $btxt . '{u1}[' . $id['level'] . ']'; if ($id['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -1446,12 +1446,12 @@ class Battle // $btxt = ''; if ($id['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($id['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $id['level'] . ']'; + $btxt = $btxt . '{u1}[' . $id['level'] . ']'; if ($id['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -1491,12 +1491,12 @@ class Battle // $btxt = ''; if ($id['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($id['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $id['level'] . ']'; + $btxt = $btxt . '{u1}[' . $id['level'] . ']'; if ($id['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -1540,12 +1540,12 @@ class Battle // $btxt = ''; if ($id['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($id['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $id['level'] . ']'; + $btxt = $btxt . '{u1}[' . $id['level'] . ']'; if ($id['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -2008,12 +2008,12 @@ class Battle } if (isset($usr_real['id'])) { if ($usr_real['align'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } if ($usr_real['clan'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } - $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; + $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } @@ -2087,7 +2087,7 @@ class Battle $cmsg->setText( str_replace( '{b}', - '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', + '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', $mon['nich_text'] ) ); @@ -2101,12 +2101,12 @@ class Battle if ($this->stats[$j]['hpNow'] > 0) { $usrwin .= ', '; if ($this->users[$j]['align'] > 0) { - $usrwin .= 'users[$j]['align'] . '.gif >'; + $usrwin .= 'users[$j]['align'] . '.gif >'; } if ($this->users[$j]['clan'] > 0) { - $usrwin .= 'users[$j]['clan'] . '.gif >'; + $usrwin .= 'users[$j]['clan'] . '.gif >'; } - $usrwin .= '' . $this->users[$j]['login'] . ' [' . $this->users[$j]['level'] . ']users[$j]['id'] . ' >'; + $usrwin .= '' . $this->users[$j]['login'] . ' [' . $this->users[$j]['level'] . ']users[$j]['id'] . ' >'; } } $j++; @@ -2129,7 +2129,7 @@ class Battle $cmsg->setText( str_replace( '{b}', - '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', + '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', str_replace('{u}', $usrwin, $mon['win_text']) ) ); @@ -2148,7 +2148,7 @@ class Battle $cmsg->setText( str_replace( '{b}', - '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', + '' . $this->users[$i]['login'] . ' [' . $this->users[$i]['level'] . ']users[$i]['id'] . ' >', $mon['lose_text'] ) ); @@ -9666,7 +9666,7 @@ class Battle } $ldr = ''; if ($this->users[$i]['lider'] == $this->info['id']) { - $ldr = 'users[$i]['team'] . '.gif \>'; + $ldr = 'users[$i]['team'] . '.gif \>'; } $teams[$this->users[$i]['team']] .= ', ' . $ldr . 'users[$i]['team'] . '\" onClick=\"top.chat.addto(\'' . $this->users[$i]['login2'] . '\',\'to\'); return false;\" oncontextmenu=\"top.infoMenu(\'' . $this->users[$i]['login2'] . '\',event,\'main\'); return false;\">' . $this->users[$i]['login2'] . ' [' . floor( $this->stats[$i]['hpNow'] @@ -9680,7 +9680,7 @@ class Battle while ($i < count($tms)) { $teams[$tms[$i]] = ltrim($teams[$tms[$i]], ', '); if ($teams[$tms[$i]] != '') { - $teams[$tms[$i]] = ' ' . $teams[$tms[$i]]; + $teams[$tms[$i]] = ' ' . $teams[$tms[$i]]; $ret .= $teams[$tms[$i]]; if (count($tms) > $i + 1) { $ret .= '   против   '; diff --git a/_incl_data/class/BotLogic.php b/_incl_data/class/BotLogic.php index 94c860fc..df41510c 100644 --- a/_incl_data/class/BotLogic.php +++ b/_incl_data/class/BotLogic.php @@ -13,7 +13,7 @@ class BotLogic { if (isset($id['id'])) { $ctx = stream_context_create(['https' => ['timeout' => 30]]); - $val = file_get_contents('https://new-combats.com/jx/battle/refresh_bot.php?uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); + $val = file_get_contents('/jx/battle/refresh_bot.php?uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); echo '[' . $val . ']
'; unset($val); } @@ -68,7 +68,7 @@ class BotLogic { if (isset($id['id'])) { $ctx = stream_context_create(['https' => ['timeout' => 1]]); - file_get_contents('https://new-combats.com/main_bot.php?uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); + file_get_contents('/main_bot.php?uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); } } @@ -76,7 +76,7 @@ class BotLogic { if (isset($id['id'])) { $ctx = stream_context_create(['https' => ['timeout' => 1]]); - file_get_contents('https://new-combats.com/main_bot.php?zayvka=1&r=4&uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); + file_get_contents('/main_bot.php?zayvka=1&r=4&uid=' . $id['id'] . '&cron_core=' . md5($id['id'] . '_brfCOreW@!_' . $id['pass']) . '&pass=' . $id['pass'] . '&' . $txt, false, $ctx); } } diff --git a/_incl_data/class/ComissionShop.php b/_incl_data/class/ComissionShop.php index ac23704c..f7694896 100644 --- a/_incl_data/class/ComissionShop.php +++ b/_incl_data/class/ComissionShop.php @@ -169,7 +169,7 @@ ORDER BY `1price`ASC , inGroupCount DESC' } } $is2 = ''; - $is1 = '
'; + $is1 = '
'; if ($preview == "full") { $is1 .= 'купить '; } elseif ($preview == "preview") { @@ -182,7 +182,7 @@ ORDER BY `1price`ASC , inGroupCount DESC' $pl['kolvo'] = $col; $pl['name'] .= ' (x' . $col . ')'; } - $is2 .= '' . $pl['name'] . '    '; + $is2 .= '' . $pl['name'] . '    '; if ($pl['massa'] > 0 && $preview == "full") { $is2 .= '(Масса: ' . round($pl['massa'], 2) . ')'; if ($pl['gift'] != '') { @@ -192,18 +192,18 @@ ORDER BY `1price`ASC , inGroupCount DESC' } else { $ttl = 'Этот предмет подарил ' . $pl['gift'] . '. Вы не сможете передать этот предмет кому-либо еще'; } - $is2 .= ' '; + $is2 .= ' '; } if (isset($po['art'])) { - $is2 .= ' '; + $is2 .= ' '; } if (isset($po['sudba'])) { if ($po['sudba'] == '0') { - $is2 .= ' '; + $is2 .= ' '; } elseif ($po['sudba'] == '1') { - $is2 .= ' '; + $is2 .= ' '; } else { - $is2 .= ' '; + $is2 .= ' '; } } } diff --git a/_incl_data/class/Core/Config.php b/_incl_data/class/Core/Config.php index 513655bb..24640ce4 100644 --- a/_incl_data/class/Core/Config.php +++ b/_incl_data/class/Core/Config.php @@ -84,6 +84,7 @@ class Config $c['securetime'] = 0; //Время последнего возможного взлома персов (подбор пароля по базам данных других игр) $c['copyright'] = 'Copyright © ' . date('Y') . ' « Новый Бойцовский Клуб »'; + $c['db_host'] = 'db'; $c['db_user'] = 'prod1'; $c['db_name'] = 'game_production'; $c['db_password'] = 'Bz@fGaZjFU2206Ua'; diff --git a/_incl_data/class/Core/Database.php b/_incl_data/class/Core/Database.php index b40f228d..4602c612 100644 --- a/_incl_data/class/Core/Database.php +++ b/_incl_data/class/Core/Database.php @@ -13,7 +13,7 @@ class Database * Singleton. */ private function __construct() { - mysql_select_db(Config::get('db_name'), mysql_connect('localhost', Config::get('db_user'), Config::get('db_password'))); + mysql_select_db(Config::get('db_name'), mysql_connect(Config::get('db_host'), Config::get('db_user'), Config::get('db_password'))); mysql_query('SET NAMES utf8mb4'); } @@ -36,7 +36,7 @@ class Database public static function pdoinit(): PDO { return new PDO( - 'mysql:host=localhost;dbname=' . Config::get('db_name'), + 'mysql:host=' . Config::get('db_host') . ';dbname=' . Config::get('db_name'), Config::get('db_user'), Config::get('db_password'), [ diff --git a/_incl_data/class/Dialog.php b/_incl_data/class/Dialog.php index 9867a380..4e3a3d19 100644 --- a/_incl_data/class/Dialog.php +++ b/_incl_data/class/Dialog.php @@ -1135,7 +1135,7 @@ class Dialog } } if ($u->info['admin'] > 0) { - $a .= '(ред.)   '; + $a .= '(ред.)   '; } if ($go1 == '') { $a .= '• ' . $pl['text'] . '
'; @@ -1274,41 +1274,41 @@ class Dialog if (isset($bot['id'])) { //Характеристики от предметов и их изображение $witm = []; - $witm[1] = ''; - $witm[2] = ''; - $witm[3] = ''; - $witm[4] = ''; - $witm[7] = ''; - $witm[8] = ''; - $witm[9] = ''; - $witm[10] = ''; - $witm[11] = ''; - $witm[12] = ''; - $witm[13] = ''; - $witm[14] = ''; - $witm[16] = ''; - $witm[17] = ''; + $witm[1] = ''; + $witm[2] = ''; + $witm[3] = ''; + $witm[4] = ''; + $witm[7] = ''; + $witm[8] = ''; + $witm[9] = ''; + $witm[10] = ''; + $witm[11] = ''; + $witm[12] = ''; + $witm[13] = ''; + $witm[14] = ''; + $witm[16] = ''; + $witm[17] = ''; //40-52 слот под магию - $witm[53] = ''; - $witm[54] = ''; - $witm[55] = ''; - $witm[56] = ''; - $witm[57] = ''; - $witm[58] = ''; + $witm[53] = ''; + $witm[54] = ''; + $witm[55] = ''; + $witm[56] = ''; + $witm[57] = ''; + $witm[58] = ''; $pb = ''; $hpmp = '?? '; $eff = ''; $anml = ''; $oi = ''; - $msl = ''; + $msl = ''; $witmg = ''; if ($bot['level'] < 0) { $bot['level'] = '??'; } - $r = '
' . $bot['login'] . ' [' . $bot['level'] . ']
+ $r = '
' . $bot['login'] . ' [' . $bot['level'] . ']
' . $pb . '
@@ -1345,7 +1345,7 @@ class Dialog diff --git a/_incl_data/class/Dungeon.php b/_incl_data/class/Dungeon.php index a3ac220a..baa6a17a 100644 --- a/_incl_data/class/Dungeon.php +++ b/_incl_data/class/Dungeon.php @@ -312,29 +312,29 @@ class Dungeon
' . floor( $stt['hpNow'] ) . '/' . $stt['hpAll'] . '
-
+
-
+ ) . 'px; position:absolute; top:-10px; z-index:11;" id="lhp' . ($pl['id'] + 1000000000000) . '">
+
'; if ($stt['mpAll'] > 0) { $r .= '
' . floor( $stt['mpNow'] ) . '/' . $stt['mpAll'] . '
-
+
+ ) . 'px; z-index:11;" id="lmp' . ($pl['id'] + 1000000000000) . '">
'; } $r .= '
-
+
' . $eff . '
' . $anml . '
'; if ($this->info['uid'] == $pl['id']) { - $r .= ''; + $r .= ''; } if ($this->info['uid'] == $u->info['id'] && $pl['id'] == $u->info['id'] && $this->info['id2'] != 15) { - $r .= ' '; - $r .= ' '; + $r .= ' '; + $r .= ' '; } $r .= '

'; $r .= ''; @@ -509,24 +509,24 @@ class Dungeon if (isset($usr_real['id'])) { $usrreal = ''; if ($usr_real['align'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } if ($usr_real['clan'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } - $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; + $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } if (isset($me_real['id'])) { $mereal = ''; if ($me_real['align'] > 0) { - $mereal .= ''; + $mereal .= ''; } if ($me_real['clan'] > 0) { - $mereal .= ''; + $mereal .= ''; } - $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; + $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } @@ -639,24 +639,24 @@ class Dungeon if (isset($usr_real['id'])) { $usrreal = ''; if ($usr_real['align'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } if ($usr_real['clan'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } - $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; + $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } if (isset($me_real['id'])) { $mereal = ''; if ($me_real['align'] > 0) { - $mereal .= ''; + $mereal .= ''; } if ($me_real['clan'] > 0) { - $mereal .= ''; + $mereal .= ''; } - $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; + $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } @@ -1561,9 +1561,9 @@ class Dungeon } } if ($tk == 0) { - $r .= ''; + $r .= ''; } elseif ($tk == 1) { - $r .= ''; + $r .= ''; } } if ($r != '') { diff --git a/_incl_data/class/FightRequest.php b/_incl_data/class/FightRequest.php index f7f0a891..eab38012 100644 --- a/_incl_data/class/FightRequest.php +++ b/_incl_data/class/FightRequest.php @@ -456,21 +456,21 @@ class FightRequest
' . floor( $this->u->stats['hpNow'] ) . '/' . $this->u->stats['hpAll'] . '
-
+
-
+ ) . 'px; position:absolute; top:-10px; z-index:11;" id="lhp' . ($this->u->info['id']) . '">
+
'; if ($this->u->stats['mpAll'] > 0) { $r .= '
' . floor( $this->u->stats['mpNow'] ) . '/' . $this->u->stats['mpAll'] . '
-
+
+ ) . 'px; z-index:11;" id="lmp' . ($this->u->info['id']) . '">
'; } $r .= ''; @@ -1814,10 +1814,10 @@ class FightRequest $trnmz = [4 => 'Физический', 5 => 'Магический', 6 => 'Физ.\Маг.']; while ($i <= 6) { if ($_GET['tlvl'] == $i) { - $trse .= ''; + $trse .= ''; $tlvl = $i; } else { - $trse .= ''; + $trse .= ''; } $i++; } @@ -2098,7 +2098,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 Запрет на использование свитков восстановления НР и Маны
'; if (!$this->u->info['no_zv_key']) { - echo ' Код подтверждения: '; } $tstw = $this->u->info['level'] < 9 ? ' для 8 левелов недоступны' : ''; @@ -2163,7 +2163,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 if ($tm != '') { $html .= ($p + $x) . '. ' . date( 'd.m.y H:i', $pl['time_start'] - ) . ' ' . $tm . ' Физический бой »»
'; + ) . ' ' . $tm . ' Физический бой »»
'; } $x++; } @@ -2264,9 +2264,9 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 while ($h < count($tms[$g])) { if ($tms[$g][$h]['uid'] > 0) { if ($tms[$g][$h]['align'] > 0) { - $tm2 .= ''; + $tm2 .= ''; } - $tm2 .= '' . $tms[$g][$h]['login'] . ' [' . $tms[$g][$h]['lvl'] . '], '; + $tm2 .= '' . $tms[$g][$h]['login'] . ' [' . $tms[$g][$h]['lvl'] . '], '; } $h++; } @@ -2277,7 +2277,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 ) ); if (isset($btlg['id']) && $g == $btlg['team_win']) { - $tm2 .= ' '; + $tm2 .= ' '; } $tm .= $tm2; if ($k + 1 < count($ts) && $tm2 != '' && $ts[$k + 1] > 0) { @@ -2409,34 +2409,34 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 ) . '' . $usrszv . ' - ' . $tm; $unvs = ' Участников: ' . (1 + $unvs) . ' чел. '; - $n1tv = ' '; + $n1tv = ' '; } if ($pl['kingfight'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['travmaChance'] == 100) { - $n1tv .= ''; + $n1tv .= ''; } if ($pl['noatack'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['nobot'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['fastfight'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['noeff'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['arand'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['noart'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['otmorozok'] == 1) { - $n1tv .= ' '; + $n1tv .= ' '; } if ($pl['comment'] != '') { $dl = ''; @@ -2470,10 +2470,10 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 if ($pl['min_lvl_1'] == 10) { $imn .= ' им. Jora Kardan'; } - $zv_comm = ' (Героическое Сражение' . $imn . ')'; + $zv_comm = ' (Героическое Сражение' . $imn . ')'; } if ($r == 5 && ($pl['creator'] == $this->u->info['id']) && $cols < 2 && $pl['priz'] == 0) { - $del_q = '  '; + $del_q = '  '; } else { $del_q = ''; } @@ -2486,7 +2486,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 $lvldt .= (0 + $cols) . '/' . $pl['maxplayers'] . ''; $zvb .= $rad . '' . date( 'H:i', $pl['time'] - ) . ' (' . $lvldt . ') тип боя: ' . $n1tv . ' (таймаут ' . ($pl['timeout'] / 60) . ' мин.) ' . $zv_comm . ' (' . $unvs . 'Бой начнется через ' . $tmStart . ' мин.) ' . $mon . ' Участники: ' . $tm . ' ' . $del_q . '
'; + ) . ' (' . $lvldt . ') тип боя: ' . $n1tv . ' (таймаут ' . ($pl['timeout'] / 60) . ' мин.) ' . $zv_comm . ' (' . $unvs . 'Бой начнется через ' . $tmStart . ' мин.) ' . $mon . ' Участники: ' . $tm . ' ' . $del_q . '
'; } elseif ($pl['razdel'] == 4) { if ($pl['min_lvl_1'] < 2) { $pl['min_lvl_1'] = 2; @@ -2586,9 +2586,9 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 $ttl3 = 'Свет'; } - $tm1 = ' ' . $ttl1 . ': ' . $tm1; - $tm2 = ' ' . $ttl2 . ': ' . $tm2; - $tm3 = ' ' . $ttl3 . ': ' . $tm3; + $tm1 = ' ' . $ttl1 . ': ' . $tm1; + $tm2 = ' ' . $ttl2 . ': ' . $tm2; + $tm3 = ' ' . $ttl3 . ': ' . $tm3; } // @@ -2624,7 +2624,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 $zv_comm = ''; } if ($pl['teams'] == 3) { - $zv_comm .= ' (Турнир трех склонностей)'; + $zv_comm .= ' (Турнир трех склонностей)'; } $zvb .= $rad . '' . date('H:i', $pl['time']) . ' '; @@ -2647,7 +2647,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 $zvb .= $pl['min_lvl_2'] . '-' . $pl['max_lvl_2']; } $zvb .= ' ур.)'; - $zvb .= ' тип боя: (таймаут: ' . ($pl['timeout'] / 60) . ' мин.) '; + $zvb .= ' тип боя: (таймаут: ' . ($pl['timeout'] / 60) . ' мин.) '; $zvb .= ' ' . $zv_comm . ' '; $zvb .= ' (Бой начнется через ' . $tmStart . ') ' . $mon . '
'; } elseif ($pl['razdel'] >= 1 && $pl['razdel'] <= 3) { @@ -2691,7 +2691,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 'H:i', $pl['time'] ) . ' ' . $this->u->microLogin( $uz['id'], 1 - ) . ' ' . $enm . ' тип боя: ( таймаут ' . round( + ) . ' ' . $enm . ' тип боя: ( таймаут ' . round( $pl['timeout'] / 60 ) . ' мин.' . $dp1 . ' ' . $mon . ')' . $mbcom . '
'; if ($uz['banned'] > 0) { @@ -2712,8 +2712,8 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 if ($_GET['r'] == 5) { if (!$this->u->info['no_zv_key']) { echo '

- Код подтверждения: -
' . $zvb . ' Код подтверждения: +
' . $zvb . ' Код подтверждения:
'; @@ -2800,13 +2800,13 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0 ); if (isset($pc['id'])) { $pc['img'] = $pc['name_mini'] . '.gif'; - $ca = ''; + $ca = ''; } } if ($uz1['align'] != 0) { - $ca = '' . $ca; + $ca = '' . $ca; } - $this->error = 'Ожидаем подтверждения боя от ' . $ca . ' ' . $uz1['login'] . ' [' . $uz1['level'] . ']'; + $this->error = 'Ожидаем подтверждения боя от ' . $ca . ' ' . $uz1['login'] . ' [' . $uz1['level'] . ']'; $sa = ''; if ($this->u->info['sex'] == 2) { $sa = 'а'; diff --git a/_incl_data/class/GameDealer.php b/_incl_data/class/GameDealer.php index b1363db6..476ce411 100644 --- a/_incl_data/class/GameDealer.php +++ b/_incl_data/class/GameDealer.php @@ -195,7 +195,7 @@ class GameDealer mysql_query('UPDATE `users` SET `catch` = `catch` + ' . mysql_real_escape_string(floor($xml->amount)) . ' WHERE `id` = "' . mysql_real_escape_string($xml->nick) . '" LIMIT 1'); - $r = '' . date('d.m.Y H:i') . ' Алхимик Enchanter / Автоматическая оплата сообщает: '; + $r = '' . date('d.m.Y H:i') . ' Алхимик Enchanter / Автоматическая оплата сообщает: '; if ($user['sex'] == 1) { $r .= 'Уважаемая'; diff --git a/_incl_data/class/Insallah/Achievements.php b/_incl_data/class/Insallah/Achievements.php index 37d8d9b7..da4fb2fc 100644 --- a/_incl_data/class/Insallah/Achievements.php +++ b/_incl_data/class/Insallah/Achievements.php @@ -117,7 +117,7 @@ class Achievements "top.hi(this, 'Сундук $tier ранга
Содержит:
$whatInside', event, 2, 0, 1, 1, 'max-width:307px')", "top.hic();", "top.hic();", - "https://img.new-combats.com/i/titul/nagr$tier.gif" + "//img.new-combats.tech/i/titul/nagr$tier.gif" ] ); } diff --git a/_incl_data/class/Magic.php b/_incl_data/class/Magic.php index f619a885..763f0a51 100644 --- a/_incl_data/class/Magic.php +++ b/_incl_data/class/Magic.php @@ -2303,9 +2303,9 @@ class Magic ) ); if ($u->info['sex'] == 0) { - $text = ' {u1} напал на {u2} завязался бой »»'; + $text = ' {u1} напал на {u2} завязался бой »»'; } else { - $text = ' {u1} напала на {u2} завязался бой »»'; + $text = ' {u1} напала на {u2} завязался бой »»'; } $usr_real = mysql_fetch_array( mysql_query( @@ -2318,12 +2318,12 @@ class Magic if (isset($usr_real['id'])) { $usrreal = ''; if ($usr_real['align'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } if ($usr_real['clan'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } - $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; + $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; } else { $usrreal = 'Невидимка[??]'; } @@ -2335,12 +2335,12 @@ class Magic if (isset($me_real['id'])) { $mereal = ''; if ($me_real['align'] > 0) { - $mereal .= ''; + $mereal .= ''; } if ($me_real['clan'] > 0) { - $mereal .= ''; + $mereal .= ''; } - $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; + $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } @@ -2419,15 +2419,15 @@ class Magic $btxt = ''; if ($uid1u['align'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($uid1u['align2'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } if ($uid1u['clan'] > 0) { - $btxt = $btxt . ''; + $btxt = $btxt . ''; } - $btxt = $btxt . '{u1}[' . $uid1u['level'] . ']'; + $btxt = $btxt . '{u1}[' . $uid1u['level'] . ']'; if ($uid1u['sex'] == 1) { $btxt = $btxt . ' вмешалась в поединок.'; } else { @@ -2528,9 +2528,9 @@ class Magic mysql_query('SELECT * FROM `bs_turnirs` WHERE `id` = "' . $u->info['inTurnir'] . '" LIMIT 1') ); if ($u->info['sex'] == 0) { - $text = ' {u1} вмешался в поединок против {u2} »»'; + $text = ' {u1} вмешался в поединок против {u2} »»'; } else { - $text = ' {u1} вмешалась в поединок против {u2} »»'; + $text = ' {u1} вмешалась в поединок против {u2} »»'; } $usr_real = mysql_fetch_array( mysql_query( @@ -2543,12 +2543,12 @@ class Magic if (isset($usr_real['id'])) { $usrreal = ''; if ($usr_real['align'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } if ($usr_real['clan'] > 0) { - $usrreal .= ''; + $usrreal .= ''; } - $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; + $usrreal .= '' . $usr_real['login'] . '[' . $usr_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } @@ -2560,12 +2560,12 @@ class Magic if (isset($me_real['id'])) { $mereal = ''; if ($me_real['align'] > 0) { - $mereal .= ''; + $mereal .= ''; } if ($me_real['clan'] > 0) { - $mereal .= ''; + $mereal .= ''; } - $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; + $mereal .= '' . $me_real['login'] . '[' . $me_real['level'] . ']'; } else { $mereal = 'Невидимка[??]'; } diff --git a/_incl_data/class/Priems.php b/_incl_data/class/Priems.php index 1ceef95e..d7d4ded1 100644 --- a/_incl_data/class/Priems.php +++ b/_incl_data/class/Priems.php @@ -2132,13 +2132,13 @@ class Priems $cli2 = ' class="nopriemuse" '; } - $pr .= ''; + $pr .= ''; } else { if (isset($_GET['inv'])) { - $pr .= ''; + $pr .= ''; } else { - $pr .= ''; + $pr .= ''; } } @@ -2151,10 +2151,10 @@ class Priems ); if (!isset($use_lst['id'])) { $cl2 = ''; - $pr .= ''; + $pr .= ''; } else { $cl2 = '" class="nopriemuse'; - $pr .= ''; + $pr .= ''; } } if ($t == 1) { @@ -2368,7 +2368,7 @@ class Priems $nm = [1 => 'hit', 2 => 'krit', 3 => 'counter', 4 => 'block', 5 => 'parry', 6 => 'hp', 7 => 'spirit']; while ($j <= 6) { if ($pl['tt' . $j] > 0) { - $lvar .= ' ' . round( + $lvar .= ' ' . round( $pl['tt' . $j], 2 ) . '   '; @@ -2546,7 +2546,7 @@ class Priems echo <<< HTML - + HTML; } diff --git a/_incl_data/class/Quests.php b/_incl_data/class/Quests.php index a101fcb2..1c4cd2b2 100644 --- a/_incl_data/class/Quests.php +++ b/_incl_data/class/Quests.php @@ -264,9 +264,9 @@ class Quests } $r = '
' . $xrz . '/' . $r . '
-
-
-
+
+
+

'; } return $r; @@ -320,7 +320,7 @@ class Quests $e4 = explode('=', $e3[$j]); //$e4[0] - предмет , $e4[1] - шанс $qi = mysql_fetch_array(mysql_query('SELECT `id`,`name`,`img` FROM `items_main` WHERE `id` = "' . $e4[0] . '" LIMIT 1')); - $t .= ' ' . $qi['name'] . ', '; + $t .= ' ' . $qi['name'] . ', '; $j++; } $t = trim($t, ', '); @@ -350,7 +350,7 @@ class Quests $e4 = explode('=', $e3[$j]); //$e4[0] - предмет , $e4[1] - шанс $qi = mysql_fetch_array(mysql_query('SELECT `id`,`name`,`img` FROM `items_main` WHERE `id` = "' . $e4[0] . '" LIMIT 1')); - $t .= ' ' . $qi['name'] . ', '; + $t .= ' ' . $qi['name'] . ', '; $j++; } $t = trim($t, ', '); @@ -414,7 +414,7 @@ class Quests $x7 = explode('=', $x3[$x4]); $x6 = mysql_fetch_array(mysql_query('SELECT `id2`,`mname`,`img` FROM `eff_main` WHERE `id2` = "' . $x7[0] . '" LIMIT 1')); if (isset($x6['id2'])) { - $x5 .= ' '; } $x4++; @@ -533,7 +533,7 @@ class Quests $x2[0] = ($ex2[1] + round($ex2[1] * 0.15)); } $bot2 = mysql_fetch_array(mysql_query('SELECT `id`,`name`,`img` FROM `items_main` WHERE `id` = "' . mysql_real_escape_string($ex2[0]) . '" LIMIT 1')); - $x .= '    • ' . $bot2['name'] . ' [' . $x2[0] . '/' . $ex2[1] . ']
'; + $x .= '    • ' . $bot2['name'] . ' [' . $x2[0] . '/' . $ex2[1] . ']
'; $i++; } if ($x != '') { @@ -554,7 +554,7 @@ class Quests $x2[0] = ($ex2[1] + round($ex2[1] * 0.15)); } $bot2 = mysql_fetch_array(mysql_query('SELECT `id`,`name`,`img` FROM `items_main` WHERE `id` = "' . mysql_real_escape_string($ex2[0]) . '" LIMIT 1')); - $x .= '    • ' . $bot2['name'] . ' [' . $x2[0] . '/' . $ex2[1] . ']
'; + $x .= '    • ' . $bot2['name'] . ' [' . $x2[0] . '/' . $ex2[1] . ']
'; $i++; } if ($x != '') { diff --git a/_incl_data/class/Telegram.php b/_incl_data/class/Telegram.php index 0b7d0acd..b0209d07 100644 --- a/_incl_data/class/Telegram.php +++ b/_incl_data/class/Telegram.php @@ -31,7 +31,7 @@ class Telegram $upd = mysql_query('UPDATE `telegram` SET `read`="1" WHERE `id` = "' . $id . '" AND `uid`="' . $uid . '" LIMIT 1'); mysql_query('COMMIT'); if ($upd && $msg['lock'] == 0) { - echo ''; + echo ''; } } } @@ -46,9 +46,9 @@ class Telegram mysql_query('COMMIT'); if ($upd) { if ($lock[$msg['lock']] == 1) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } } } @@ -79,13 +79,13 @@ class Telegram private function addMsgTable($id, $from, $fromType, $ttl, $time, $lock, $read, $pg) { - $i1 = ''; + $i1 = ''; if ($read == 1) { - $i1 = ''; + $i1 = ''; } if ($lock == 1) { - $i1 = ''; + $i1 = ''; } if ($fromType == 1) { @@ -100,8 +100,8 @@ class Telegram ' . $from . ' ' . substr($ttl, 0, 30) . '... ' . date('d.m.y H:i', $time) . ' -
-
+
+
'; @@ -117,8 +117,8 @@ class Telegram От кого Заголовок сообщения Когда -
Блокировка сообщений
-
Удалить все прочитанные сообщения
+
Блокировка сообщений
+
Удалить все прочитанные сообщения
'; diff --git a/_incl_data/class/Tournir.php b/_incl_data/class/Tournir.php index 265607d9..bc43a575 100644 --- a/_incl_data/class/Tournir.php +++ b/_incl_data/class/Tournir.php @@ -530,7 +530,7 @@ class Tournir if (count($ia[$i]) > 0) { $j = 0; while ($j < count($ia[$i])) { - $r .= ''; + $r .= ''; $j++; } $r .= '
'; diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php index 45fcb7f5..d3e5131e 100644 --- a/_incl_data/class/User.php +++ b/_incl_data/class/User.php @@ -742,9 +742,9 @@ class User if (isset($v['id']) && $v['time'] + 60 * 60 > time()) { $r .= ' '; + ) . '\');" src="//img.new-combats.tech/i/items/healvortex_' . $vid . '.png" width="40" height="25" title="Клодец HP (Задержка)"> '; } else { - $r .= ' '; + $r .= ' '; } $v = mysql_fetch_array( mysql_query( @@ -754,9 +754,9 @@ class User if (isset($v['id']) && $v['time'] + 60 * 60 > time()) { $r .= ' '; + ) . '\');" src="//img.new-combats.tech/i/items/manavortex_' . $vid . '.png" width="40" height="25" title="Клодец MP (Задержка)"> '; } else { - $r .= ' '; + $r .= ' '; } } // @@ -1713,15 +1713,15 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` { $bus['login_BIG'] = ''; if ($bus['align'] > 0) { - $bus['login_BIG'] .= ''; + $bus['login_BIG'] .= ''; } if ($bus['align2'] > 0) { - $bus['login_BIG'] .= ''; + $bus['login_BIG'] .= ''; } if ($bus['clan'] > 0) { - $bus['login_BIG'] .= ''; + $bus['login_BIG'] .= ''; } - $bus['login_BIG'] .= $bus['login'] . '[' . $bus['level'] . ']'; + $bus['login_BIG'] .= $bus['login'] . '[' . $bus['level'] . ']'; return $bus['login_BIG']; } @@ -2554,15 +2554,15 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $v = 0; } if ($t == 0) { - $names[] = ' '; - $names[] = ' '; - $names[] = ' '; - $names[] = ' '; + $names[] = ' '; + $names[] = ' '; + $names[] = ' '; + $names[] = ' '; } else { - $names[] = ' '; - $names[] = ' '; - $names[] = ' '; - $names[] = ' '; + $names[] = ' '; + $names[] = ' '; + $names[] = ' '; + $names[] = ' '; } $int = $v; do { @@ -4179,7 +4179,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $r = 'Вы приобрели предмет "' . $i1['name'] . ($col > 1 ? ' (x' . $col . ')' : '') . '" за ' . $price . ' кр.
Предмет успешно добавлен в инвентарь.'; $ld = $this->addDelo( 1, $this->info['id'], - '"ComissShop.' . $this->info['city'] . '": Приобрел предмет "' . $i1['name'] . ($col > 1 ? ' (x' . $col . ')' : '') . '" [item:' . $iid . '] в коммисионном магазине за ' . $price . ' кр. [Продавец: ' . ($i2['login'] != '' ? '' . $i2['login'] . '' : '(' . $i2['uid'] . ')') . ']', + '"ComissShop.' . $this->info['city'] . '": Приобрел предмет "' . $i1['name'] . ($col > 1 ? ' (x' . $col . ')' : '') . '" [item:' . $iid . '] в коммисионном магазине за ' . $price . ' кр. [Продавец: ' . ($i2['login'] != '' ? '' . $i2['login'] . '' : '(' . $i2['uid'] . ')') . ']', time(), $this->info['city'], 'Shop.' . $this->info['city'] . '', $price, 0 ); $u2s = mysql_fetch_array( @@ -4187,7 +4187,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); $ld = $this->addDelo( 1, $u2s['id'], - '"ComissShop.' . $this->info['city'] . '": Продал предмет "' . $i1['name'] . ($col > 1 ? ' (x' . $col . ')' : '') . '" [item:' . $iid . '] через коммисионный магазине за ' . $price . ' кр. [Покупатель: ' . $this->info['login'] . ']', + '"ComissShop.' . $this->info['city'] . '": Продал предмет "' . $i1['name'] . ($col > 1 ? ' (x' . $col . ')' : '') . '" [item:' . $iid . '] через коммисионный магазине за ' . $price . ' кр. [Покупатель: ' . $this->info['login'] . ']', time(), $this->info['city'], 'Shop.' . $this->info['city'] . '', 0, $price ); } else { @@ -4375,9 +4375,9 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $is2 = ''; if ($pl['type'] == 71) { - $is1 = '
'; + $is1 = '
'; } else { - $is1 = '
'; + $is1 = '
'; } if ($sid == 609) { $is1 .= 'купить'; @@ -4385,9 +4385,9 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //if($this->info['money']>$pl['price']) //{ if ($sid == 2 || $sid == 777) { - $is1 .= 'купить '; + $is1 .= 'купить '; } else { - $is1 .= 'купить '; + $is1 .= 'купить '; } //} @@ -4401,12 +4401,12 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //название if (isset($po['tr_align']) && !isset($po['tr_align_bs'])) { - $pl['name'] .= ''; + $pl['name'] .= ''; } elseif (isset($po['tr_align_bs'])) { if ($po['tr_align_bs'] == '1') { - $pl['name'] .= ''; + $pl['name'] .= ''; } elseif ($po['tr_align_bs'] == '3') { - $pl['name'] .= ''; + $pl['name'] .= ''; } } @@ -4416,7 +4416,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($po['icos'])) { $pl['name'] = '' . $pl['name'] . '  ' . $po['icos'] . ' '; } - $is2 .= '' . $pl['name'] . '    '; + $is2 .= '' . $pl['name'] . '    '; if ($pl['massa'] > 0) { @@ -4424,16 +4424,16 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } if (isset($po['art'])) { - $is2 .= ' '; + $is2 .= ' '; } if (isset($po['sudba'])) { if ($po['sudba'] == '0') { - $is2 .= ' '; + $is2 .= ' '; } elseif ($po['sudba'] == '1') { - $is2 .= ' '; + $is2 .= ' '; } else { - $is2 .= ' '; + $is2 .= ' '; } } @@ -4781,7 +4781,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); if (isset($mgi['id2'])) { - $is2 .= '
Встроено заклятие ' . $mgi['minfo'] . '
'; + $is2 .= '
Встроено заклятие ' . $mgi['minfo'] . '
'; } } @@ -4896,7 +4896,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $crd = ''; if ($this->info['admin'] > 0) { - $crd = 'Редактировать предмет   Редактировать предмет   обновить
'; @@ -5372,7 +5372,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); } while ($pl = mysql_fetch_array($sp)) { - $vibor .= '
'; + $vibor .= '
'; if (!isset($id['id'])) { $dt = $this->lookStats($pl['data']); $id = []; @@ -6436,12 +6436,12 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $mx .= ' (x' . $col . ')'; } if (isset($po['tr_align']) && !isset($po['tr_align_bs'])) { - $pl['name'] .= ''; + $pl['name'] .= ''; } elseif (isset($po['tr_align_bs'])) { if ($po['tr_align_bs'] == '1') { - $pl['name'] .= ''; + $pl['name'] .= ''; } elseif ($po['tr_align_bs'] == '3') { - $pl['name'] .= ''; + $pl['name'] .= ''; } } if (isset($po['renameadd']) && $po['renameadd'] != '') { @@ -6450,7 +6450,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($po['icos'])) { $pl['name'] = '' . $pl['name'] . '  ' . $po['icos'] . ' '; } - $is2 = '' . $pl['name'] . '' . $mx . ''; + $is2 = '' . $pl['name'] . '' . $mx . ''; $is2 .= '  '; if ($pl['massa'] > 0) { $is2 .= ' (Масса: ' . ($pl['massa'] * $col) . ')'; @@ -6462,20 +6462,20 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } else { $ttl = 'Этот предмет вам подарил ' . $pl['gift'] . '. Вы не сможете передать этот предмет кому-либо еще'; } - $is2 .= ' '; + $is2 .= ' '; } if (isset($po['art'])) { - $is2 .= ' '; + $is2 .= ' '; } if (isset($po['sudba'])) { if ($po['sudba'] == '0') { - $is2 .= ' '; + $is2 .= ' '; } elseif ($po['sudba'] == '1') { - $is2 .= ' '; + $is2 .= ' '; } else { - $is2 .= ' '; + $is2 .= ' '; } } if ($pl['price1'] > 0) { //цена @@ -6634,10 +6634,10 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } $tr .= '
• ' . $this->is[$n] . ': ' . $z . '' . $po['add_' . $n]; if (isset($po['mf_stats']) && $po['mf_stats'] > 0 && ($n == 's1' || $n == 's2' || $n == 's3' || $n == 's5')) { - $tr .= ' '; + $tr .= ' '; } if (isset($po['mf_mod']) && $po['mf_mod'] > 0 && ($n == 'm1' || $n == 'm2' || $n == 'm4' || $n == 'm5')) { - $tr .= ' '; + $tr .= ' '; } } $x++; @@ -6657,7 +6657,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tr .= '
• Броня ' . $bn[$i] . ': ' . $po['add_mib' . $i] . '-' . $po['add_mab' . $i]; } if (isset($po['mf_mib']) && $po['mf_mib'] > 0) { - $tr .= ' '; + $tr .= ' '; } } $i++; @@ -6733,7 +6733,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); if (isset($mgi['id2'])) { - $is2 .= '
Встроено заклятие ' . $mgi['minfo'] . '
'; + $is2 .= '
Встроено заклятие ' . $mgi['minfo'] . '
'; } } @@ -6801,7 +6801,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($po['free_stats']) && $po['free_stats'] > 0) { $is2 .= '
Распределение статов:'; - $is2 .= '
Сила: ' . $po['add_s1'] . '
Ловкость: ' . $po['add_s2'] . '
Интуиция: ' . $po['add_s3'] . '
Интеллект: ' . $po['add_s5'] . '
'; + $is2 .= '
Сила: ' . $po['add_s1'] . '
Ловкость: ' . $po['add_s2'] . '
Интуиция: ' . $po['add_s3'] . '
Интеллект: ' . $po['add_s5'] . '
'; $is2 .= '• Осталось распределений: ' . $po['free_stats'] . ''; } @@ -6822,12 +6822,12 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $is2 .= '
• Распределение характеристик будет доступно после первого одевания
'; } else { $is2 .= '
- Сила: ' . (0 + $po['add_s1']) . '
- Ловкость: ' . (0 + $po['add_s2']) . '
- Интуиция: ' . (0 + $po['add_s3']) . '
- Выносливость: ' . (0 + $po['add_s4']) . '
- Интеллект: ' . (0 + $po['add_s5']) . '
- Мудрость: ' . (0 + $po['add_s6']) . '
+ Сила: ' . (0 + $po['add_s1']) . '
+ Ловкость: ' . (0 + $po['add_s2']) . '
+ Интуиция: ' . (0 + $po['add_s3']) . '
+ Выносливость: ' . (0 + $po['add_s4']) . '
+ Интеллект: ' . (0 + $po['add_s5']) . '
+ Мудрость: ' . (0 + $po['add_s6']) . '
'; $is2 .= 'Осталось распределений: ' . $mx1; } @@ -6852,18 +6852,18 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $is2 .= '
• Распределение владений будет доступно после первого одевания
'; } else { $is2 .= '
- Мастерство владения мечами: ' . (0 + $po['add_a1']) . '
- Мастерство владения дубинами, булавами: ' . (0 + $po['add_a2']) . '
- Мастерство владения ножами, кастетами: ' . (0 + $po['add_a3']) . '
- Мастерство владения топорами, секирами: ' . (0 + $po['add_a4']) . '
- Мастерство владения магическими посохами: ' . (0 + $po['add_a5']) . '
- Мастерство владения стихией Огня: ' . (0 + $po['add_mg1']) . '
- Мастерство владения стихией Воздуха: ' . (0 + $po['add_mg2']) . '
- Мастерство владения стихией Воды: ' . (0 + $po['add_mg3']) . '
- Мастерство владения стихией Земли: ' . (0 + $po['add_mg4']) . '
- Мастерство владения магией Света: ' . (0 + $po['add_mg5']) . '
- Мастерство владения магией Тьмы: ' . (0 + $po['add_mg6']) . '
- Мастерство владения серой магией: ' . (0 + $po['add_mg7']) . '
+ Мастерство владения мечами: ' . (0 + $po['add_a1']) . '
+ Мастерство владения дубинами, булавами: ' . (0 + $po['add_a2']) . '
+ Мастерство владения ножами, кастетами: ' . (0 + $po['add_a3']) . '
+ Мастерство владения топорами, секирами: ' . (0 + $po['add_a4']) . '
+ Мастерство владения магическими посохами: ' . (0 + $po['add_a5']) . '
+ Мастерство владения стихией Огня: ' . (0 + $po['add_mg1']) . '
+ Мастерство владения стихией Воздуха: ' . (0 + $po['add_mg2']) . '
+ Мастерство владения стихией Воды: ' . (0 + $po['add_mg3']) . '
+ Мастерство владения стихией Земли: ' . (0 + $po['add_mg4']) . '
+ Мастерство владения магией Света: ' . (0 + $po['add_mg5']) . '
+ Мастерство владения магией Тьмы: ' . (0 + $po['add_mg6']) . '
+ Мастерство владения серой магией: ' . (0 + $po['add_mg7']) . '
'; $is2 .= 'Осталось распределений: ' . $mx1; } @@ -6978,7 +6978,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` - +
' . $smt . '
'; @@ -7014,14 +7014,14 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` mysql_query('SELECT * FROM `clan` WHERE `id` = "' . $po['toclan1'][0] . '" LIMIT 1') ); if (isset($clpo['id'])) { - $is2 .= '
Предмет принадлежит клану ' . $clpo['name'] . ''; + $is2 .= '
Предмет принадлежит клану ' . $clpo['name'] . ''; $plpo = mysql_fetch_array( mysql_query( 'SELECT `id`,`login`,`cityreg` FROM `users` WHERE `id` = "' . $po['toclan1'][1] . '" LIMIT 1' ) ); if (isset($plpo['id'])) { - $is2 .= ' (Дар игрока ' . $plpo['login'] . ')'; + $is2 .= ' (Дар игрока ' . $plpo['login'] . ')'; if ($plpo['login'] == $this->info['login']) { if (isset($_GET['backmyitm'])) { $pl['inOdet'] = 0; @@ -7103,14 +7103,14 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if ($col > 1000) { $is1 .= ' - +
x' . $col . '
'; } else { - $is1 .= ''; + $is1 .= ''; } $is1 .= '
'; @@ -7167,7 +7167,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) . '" LIMIT 1' ) ); - $is1 .= 'Предмет у игрока
' . $yui['login'] . ''; + $is1 .= 'Предмет у игрока
' . $yui['login'] . ''; if ($this->info['tt'][14][0] == 1 || ($this->info['id'] == $us_1)) { $is1 .= '
Изъять предмет'; } @@ -7529,13 +7529,13 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } if ($pl['magic_inc'] && $pl['type'] == 30) { //используем эликсир - $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; + $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; $useUrl = 'top.useiteminv(\'' . (0 + $pl['id']) . '\',\'' . $pl['img'] . '\',\'' . $pl['img'] . '\',1,\'' . $pldate . '\',\'' . (0 + $_GET['otdel']) . '\');'; } elseif ($pl['magic_inc'] && $pl['type'] == 29) { //используем заклятие if (isset($po['useOnLogin']) && !isset($po['zazuby'])) { //на персонажа $useUrl = 'top.useMagic(\'' . $pl['name'] . '\',' . (0 + $pl['id']) . ',\'' . $pl['img'] . '\',1,\'main.php?' . $inv1 . 'otdel=' . ((int)$_GET['otdel']) . '&use_pid=' . $pl['id'] . '&rnd=' . $code . '\');'; } else { //просто использование (на себя, либо без указания предмета\логина) - $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; + $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; $useUrl = 'top.useiteminv(\'' . (0 + $pl['id']) . '\',\'' . $pl['img'] . '\',\'' . $pl['img'] . '\',1,\'' . $pldate . '\',\'' . (0 + $_GET['otdel']) . '\',' . (0 + $_GET['otdel']) . ');'; } //на предмет @@ -7582,14 +7582,14 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if ($pl['group'] > 0) { $is1 .= '
'; if ($this->itemsX($pl['id']) < $pl['group_max']) { - $is1 .= ''; + $is1 .= ''; } if ($this->itemsX($pl['id']) > 1) { $is1 .= ' Разделить предмет ' . $pl['name'] . '?\',\'' . intval( $_GET['otdel'] ) . '\'); return false;" - href="main.php?inv=1&otdel=' . ((int)$_GET['otdel']) . '&unstack=' . $pl['id'] . '&rnd=' . $code . '" title="Разделить">' . $script; + href="main.php?inv=1&otdel=' . ((int)$_GET['otdel']) . '&unstack=' . $pl['id'] . '&rnd=' . $code . '" title="Разделить">' . $script; } } if (isset($po['toclan'])) { @@ -7602,13 +7602,13 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $is1 .= ' '; + ) . '\',\'' . $d[0] . '\',\'' . $d[2] . '\',\'0\');" title="Добавить в избранное"> '; if ($d[1] == 1) { //можно выкинуть if (!isset($po['nodelete'])) { - $is1 .= ' Предмет ' . $pl['name'] . ' будет утерян, вы уверены ?\',\'' . intval( $_GET['otdel'] - ) . '\'); return false;" href="javascript:void(0);" title="Выкинуть предмет">'; + ) . '\'); return false;" href="javascript:void(0);" title="Выкинуть предмет">'; } } } @@ -8058,7 +8058,7 @@ LIMIT 1' $i = 1; $sv = []; while ($i <= 10) { - $sv[$i] = ''; + $sv[$i] = ''; $i++; } $i = 0; @@ -8079,7 +8079,7 @@ LIMIT 1' $this->stats['items'][$i]['iznosNOW'] ) . '/' . floor( $this->stats['items'][$i]['iznosMAX'] - ) . '" src="https://img.new-combats.com/i/items/' . $this->stats['items'][$i]['img'] . '" />'; + ) . '" src="//img.new-combats.tech/i/items/' . $this->stats['items'][$i]['img'] . '" />'; } $i++; } @@ -8313,27 +8313,27 @@ LIMIT 1' //Характеристики от предметов и их изображение $witm = []; - $witm[1] = ''; - $witm[2] = ''; - $witm[3] = ''; - $witm[4] = ''; - $witm[7] = ''; - $witm[8] = ''; - $witm[9] = ''; - $witm[10] = ''; - $witm[11] = ''; - $witm[12] = ''; - $witm[13] = ''; - $witm[14] = ''; - $witm[16] = ''; - $witm[17] = ''; + $witm[1] = ''; + $witm[2] = ''; + $witm[3] = ''; + $witm[4] = ''; + $witm[7] = ''; + $witm[8] = ''; + $witm[9] = ''; + $witm[10] = ''; + $witm[11] = ''; + $witm[12] = ''; + $witm[13] = ''; + $witm[14] = ''; + $witm[16] = ''; + $witm[17] = ''; //40-52 слот под магию - $witm[53] = ''; - $witm[54] = ''; - $witm[55] = ''; - $witm[56] = ''; - $witm[57] = ''; - $witm[58] = ''; + $witm[53] = ''; + $witm[54] = ''; + $witm[55] = ''; + $witm[56] = ''; + $witm[57] = ''; + $witm[58] = ''; $cl = mysql_query( 'SELECT `im`.`id`,`im`.`name`,`im`.`img`,`im`.`type`,`im`.`inslot`,`im`.`2h`,`im`.`2too`,`im`.`iznosMAXi`,`im`.`inRazdel`,`im`.`price1`,`im`.`price2`,`im`.`pricerep`,`im`.`magic_chance`,`im`.`info`,`im`.`massa`,`im`.`level`,`im`.`magic_inci`,`im`.`overTypei`,`im`.`group`,`im`.`group_max`,`im`.`geni`,`im`.`ts`,`im`.`srok`,`im`.`class`,`im`.`class_point`,`im`.`anti_class`,`im`.`anti_class_point`,`im`.`max_text`,`im`.`useInBattle`,`im`.`lbtl`,`im`.`lvl_itm`,`im`.`lvl_exp`,`im`.`lvl_aexp`, @@ -8372,10 +8372,10 @@ LIMIT 1' $uimg = 'i/items/' . $pl['img'] . ''; } - $witm[$pl['inOdet']] = ''; + $witm[$pl['inOdet']] = ''; if ($i1 == 1) { - $witm[$pl['inOdet']] = '' . $witm[$pl['inOdet']] . ''; + $witm[$pl['inOdet']] = '' . $witm[$pl['inOdet']] . ''; } else { if ($pl['inOdet'] >= 40 && $pl['inOdet'] <= 52 && !isset($_GET['inv'])) { $useUrl = ''; @@ -8384,7 +8384,7 @@ LIMIT 1' } if ($pl['magic_inc'] && $pl['type'] == 30) { //используем эликсир - $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; + $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; $useUrl = 'top.useiteminv(\'' . (0 + $pl['id']) . '\',\'' . $pl['img'] . '\',\'' . $pl['img'] . '\',1,\'' . $pldate . '\',\'' . (0 + $_GET['otdel']) . '\');'; } elseif ($pl['magic_inc'] && $pl['type'] == 29) { //используем заклятие @@ -8397,7 +8397,7 @@ LIMIT 1' $useUrl = 'top.useMagic(\'' . $pl['name'] . '\',' . (0 + $pl['id']) . ',\'' . $pl['img'] . '\',1,\'main.php?' . $inv1 . 'use_pid=' . $pl['id'] . '&rnd=' . $code . '\');'; } else { //просто использование (на селя, либо без указания предмета\логина) - $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; + $pldate = '
"' . $pl['name'] . '"
Использовать сейчас?
'; $useUrl = 'top.useiteminv(\'' . (0 + $pl['id']) . '\',\'' . $pl['img'] . '\',\'' . $pl['img'] . '\',1,\'' . $pldate . '\',\'' . (0 + $_GET['otdel']) . '\');'; } } @@ -8412,7 +8412,7 @@ LIMIT 1' } //Шлем,Венок $wj1i = ''; - $br = '
'; + $br = '
'; if ($wj[1]) { if ($wj[52]) { $wj1i .= $br; @@ -8491,9 +8491,9 @@ LIMIT 1' } else { $uimg = 'i/items/' . $wj[1]['img'] . ''; } - $witm[1] = ''; + $witm[1] = ''; if ($i1 == 1) { - $witm[1] = '' . $witm[1] . ''; + $witm[1] = '' . $witm[1] . ''; } else { $witm[1] = '' . $witm[1] . ''; } @@ -8504,12 +8504,12 @@ LIMIT 1' } else { $uimg = 'i/items/' . $wj[4]['img'] . ''; } - $witm[4] = ''; + $witm[4] = ''; if ($i1 == 1) { if ($wj4idd > 0) { $wj[4]['item_id'] = $wj4idd; } - $witm[4] = '' . $witm[4] . ''; + $witm[4] = '' . $witm[4] . ''; } else { $witm[4] = '' . $witm[4] . ''; } @@ -8573,10 +8573,10 @@ LIMIT 1' unset($anan); if (isset($sn['items_img'][2])) { - $msl = ''; + $msl = ''; } else { if ($anml == '') { - $msl = ''; + $msl = ''; } else { $msl = $anml; } @@ -8727,7 +8727,7 @@ LIMIT 1' if ($e['type1'] == 18 || $e['type1'] == 19) { $e['img'] = $e['img2']; } - $eff .= ''; + $eff .= ''; } elseif ($e['timeUse'] + $e['timeAce'] + $e['actionTime'] < time() && $e['timeUse'] != 77) { //удаляем эффект $ed = $this->lookStats($e['data']); @@ -8761,8 +8761,8 @@ LIMIT 1' $hpmp .= '
' . floor( $sn['mpNow'] ) . '/' . (0 + $sn['mpAll']) . '
-
-
+
+
'; } else { $hptop = 5; @@ -8770,14 +8770,14 @@ LIMIT 1' $hpmp = '
' . floor( $sn['hpNow'] ) . '/' . (0 + $sn['hpAll']) . '
-
-
-
' . $hpmp; +
+
+
' . $hpmp; //Собираем НР и МР $hpmp = '
' . $hpmp . '
'; - $lgn = '' . $u['login'] . ' [' . $u['level'] . ']'; + $lgn = '' . $u['login'] . ' [' . $u['level'] . ']'; if ($u['clan'] != 0) { $pc = mysql_fetch_array( mysql_query( @@ -8785,17 +8785,17 @@ LIMIT 1' ) ); $pc['img'] = $pc['name_mini'] . '.gif'; - $lgn = '' . $lgn; + $lgn = '' . $lgn; } if ($u['align2'] > 0) { $lgn = '' . $lgn; + )][$u['align2']] . '" src="//img.new-combats.tech/i/align/align' . $u['align2'] . '.gif">' . $lgn; } if ($u['align'] > 0) { $lgn = '' . $lgn; + )][$u['align']] . '" src="//img.new-combats.tech/i/align/align' . $u['align'] . '.gif">' . $lgn; } $pb = ''; if ($u['banned'] > 0) { @@ -8811,7 +8811,7 @@ LIMIT 1' if (isset($witm[$l])) { $swm++; } else { - $witm[$l] = ''; + $witm[$l] = ''; } $l++; } @@ -8822,7 +8822,7 @@ LIMIT 1' if (isset($witm[$l])) { $ssm++; } else { - $witm[$l] = ''; + $witm[$l] = ''; } $l++; } @@ -8865,7 +8865,7 @@ LIMIT 1' if ($u['zag'] != '' && $i1 == 1) { $rt[0] .= ''; - $zag = ''; + $zag = ''; $j2 = 0; while ($j2 <= 17) { @@ -8926,7 +8926,7 @@ LIMIT 1' ) . '" AND `sex` = "' . $this->info['sex'] . '" LIMIT 1' ) ); - $invg = [0 => 'https://new-combats.com/shadow/' . $o['id'] . '" target="_blank', 1 => 'Галерея образов']; + $invg = [0 => '/shadow/' . $o['id'] . '" target="_blank', 1 => 'Галерея образов']; } $uobr = 'i/obraz/' . $u['sex'] . '/' . $u['obraz'] . ''; if (isset($sn['items_img'][1])) { @@ -8934,7 +8934,7 @@ LIMIT 1' } $rt[0] .= '
-
+
' . $eff . '
' . $anml . '
'; } else { @@ -8949,7 +8949,7 @@ LIMIT 1' } $rt[0] .= '
-
+
' . $eff . '
' . $anml . '
'; } diff --git a/_incl_data/class/dnaction/_dungeon_replace.php b/_incl_data/class/dnaction/_dungeon_replace.php index f83d1964..f4162ca3 100644 --- a/_incl_data/class/dnaction/_dungeon_replace.php +++ b/_incl_data/class/dnaction/_dungeon_replace.php @@ -301,7 +301,7 @@ function getImg($id, $num) { ?> - + @@ -330,7 +330,7 @@ function OpenDiv(vr) { } } - +
@@ -358,116 +358,116 @@ function OpenDiv(vr) {
-• Черная метка
+• Черная метка
-• Клаустрофобия
+• Клаустрофобия
-• Проклятье Умирающей Земли
+• Проклятье Умирающей Земли
-• Проклятье Стихающего Ветра
+• Проклятье Стихающего Ветра
-• Проклятье Замерзающей Воды
+• Проклятье Замерзающей Воды
-• Проклятье Угасающего Огня
+• Проклятье Угасающего Огня
-• Проклятье Легкого Отупления
+• Проклятье Легкого Отупления
-• Проклятье Уязвимости
+• Проклятье Уязвимости
-• Зачаровать кольцо: Вытягивание души [1]
+• Зачаровать кольцо: Вытягивание души [1]
-• Зачаровать кольцо: Вытягивание души [2]
+• Зачаровать кольцо: Вытягивание души [2]
@@ -519,7 +519,7 @@ echo ''; href="#">
@@ -529,7 +529,7 @@ echo ''; href="#">
@@ -545,7 +545,7 @@ echo ''; href="#">
@@ -564,7 +564,7 @@ echo ''; href="#"> @@ -574,7 +574,7 @@ echo ''; href="#"> @@ -584,7 +584,7 @@ echo ''; href="#"> @@ -594,7 +594,7 @@ echo ''; href="#"> @@ -604,7 +604,7 @@ echo ''; href="#"> @@ -620,7 +620,7 @@ echo ''; href="#"> @@ -638,7 +638,7 @@ echo ''; href="#"> @@ -648,7 +648,7 @@ echo ''; href="#"> @@ -658,7 +658,7 @@ echo ''; href="#"> @@ -667,7 +667,7 @@ echo ''; onclick="change_radio(4,3,'atack',0);return false;" href="#"> @@ -677,7 +677,7 @@ echo ''; href="#"> @@ -693,7 +693,7 @@ echo ''; href="#"> @@ -711,7 +711,7 @@ echo ''; href="#"> @@ -721,7 +721,7 @@ echo ''; href="#"> @@ -731,7 +731,7 @@ echo ''; href="#"> @@ -741,7 +741,7 @@ echo ''; href="#"> @@ -751,7 +751,7 @@ echo ''; href="#"> @@ -767,7 +767,7 @@ echo ''; href="#"> @@ -785,7 +785,7 @@ echo ''; href="#"> @@ -795,7 +795,7 @@ echo ''; href="#"> @@ -805,7 +805,7 @@ echo ''; href="#"> @@ -815,7 +815,7 @@ echo ''; href="#"> @@ -825,7 +825,7 @@ echo ''; href="#"> @@ -841,7 +841,7 @@ echo ''; href="#"> @@ -910,21 +910,17 @@ echo ''; } ?> onclick="top.leaderFight();" id="btn_down_img3" style="cursor:pointer;" title="Передать флаг" - src="https://img.new-combats.com/i/ico_change_leader1.gif" + src="//img.new-combats.tech/i/ico_change_leader1.gif" width="16" height="19"/> -
  @@ -973,7 +969,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/hit.gif"/> info['tactic1']; ?> @@ -983,7 +979,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/krit.gif"/> info['tactic2']; ?> @@ -993,7 +989,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/counter.gif"/> info['tactic3']; ?> @@ -1003,7 +999,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/block.gif"/> info['tactic4']; ?> @@ -1013,7 +1009,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/parry.gif"/> info['tactic5']; ?> @@ -1023,7 +1019,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/hp.gif"/> info['tactic6']); ?> @@ -1033,7 +1029,7 @@ echo ''; + src="//img.new-combats.tech/i/micro/spirit.gif"/> info['tactic7'] < 0) { @@ -1091,7 +1087,7 @@ echo '';
-
Лог боя »»
(Бой идет с таймаутом NaN мин.)
@@ -1105,7 +1101,7 @@ echo '';
Полную версию лога боя смотрите info['battle']; ?>" target="blank_">здесь »»

  diff --git a/modules_data/btl_bac.php b/modules_data/btl_bac.php index 493e3159..993026b0 100644 --- a/modules_data/btl_bac.php +++ b/modules_data/btl_bac.php @@ -59,8 +59,8 @@ $allprice = typeBattle($allprice); echo ''; //} ?> - - + + - + -
src="https://img.new-combats.com/i/images/300x225/dungeon/ap_tower1.gif" width="48" height="68" class="aFilter" />
- -
src="https://img.new-combats.com/i/images/300x225/dungeon/dm_left1.gif" width="21" height="30" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/ap_port.gif" width="84" height="87" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/ap_tower3.gif" width="122" height="140" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/dm_right.gif" width="21" height="30" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/dungeon/ap_tower1.gif" width="48" height="68" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/dungeon/dm_left1.gif" width="21" height="30" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/ap_port.gif" width="84" height="87" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/ap_tower3.gif" width="122" height="140" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/dm_right.gif" width="21" height="30" class="aFilter" />
@@ -73,15 +72,13 @@ if($u->room['file']=='ab/cp')
«» приветствует Вас, info['login']; ?>. Вы находить на центральной площади Abandoned Plain.
- - - +
testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/ab/cp2.php b/modules_data/location/ab/cp2.php index e6501f50..358dd24c 100644 --- a/modules_data/location/ab/cp2.php +++ b/modules_data/location/ab/cp2.php @@ -39,11 +39,11 @@ if($u->room['file']=='ab/cp2')
- +
  - Форум   + Форум  
-
src="https://img.new-combats.com/i/images/300x225/dm_left.gif" width="29" height="25" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/ab_107_tower1.gif" width="45" height="63" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/dungeon/ab_107_tower2.gif" width="34" height="63" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/dm_left.gif" width="29" height="25" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/ab_107_tower1.gif" width="45" height="63" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/dungeon/ab_107_tower2.gif" width="34" height="63" class="aFilter" />
@@ -78,7 +78,7 @@ if($u->room['file']=='ab/cp2')
testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/ab/goral.php b/modules_data/location/ab/goral.php index 9b9e638a..28106dd9 100644 --- a/modules_data/location/ab/goral.php +++ b/modules_data/location/ab/goral.php @@ -220,7 +220,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -267,7 +267,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -289,7 +289,7 @@ body - +
Вход в подземелье
diff --git a/modules_data/location/ab/hram.php b/modules_data/location/ab/hram.php index c15d3ca3..2aef05c3 100644 --- a/modules_data/location/ab/hram.php +++ b/modules_data/location/ab/hram.php @@ -164,7 +164,7 @@ if (isset($_GET['itm']) && $qst_hram && $_GET['itm'] > 0) { bgcolor="#DEDEDE">
  Форум + onclick="window.open('/forum', 'forum', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')">Форум  
- src="https://img.new-combats.com/city/ap_exit.gif" + src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter"/>
@@ -257,18 +257,18 @@ if (!isset($_GET['r'])) { echo 'onclick="alert(\'Арквиерро: Вы не допущены к котлам! (Выполните задание)\');"'; } else { ?> onclick="location.href='main.php?r=1'" title="Алтарь Предметов" - src="https://img.new-combats.com/city/ap_altar1.gif" + src="//img.new-combats.tech/city/ap_altar1.gif" width="147" height="93" class="aFilter"/>
onclick="location.href='main.php?r=2'" title="Алтарь Рун" - src="https://img.new-combats.com/city/ap_altar2.gif" + src="//img.new-combats.tech/city/ap_altar2.gif" width="147" height="93" class="aFilter"/>
- src="https://img.new-combats.com/city/ap_exit.gif" + src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter"/>
@@ -356,7 +356,7 @@ if (!isset($_GET['r'])) { info['invBlock'] == 0) { echo $itmAllSee; } else { - echo '
Рюкзак закрыт.
Введите пароль:
'; + echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> @@ -477,7 +477,7 @@ if (!isset($_GET['r'])) { info['invBlock'] == 0) { echo $itmAllSee; } else { - echo '
Рюкзак закрыт.
Введите пароль:
'; + echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> diff --git a/modules_data/location/ab/hramOLD.php b/modules_data/location/ab/hramOLD.php index 9bf3f364..e7edd959 100644 --- a/modules_data/location/ab/hramOLD.php +++ b/modules_data/location/ab/hramOLD.php @@ -145,7 +145,7 @@ if($u->room['file']=='ab/hram') - +
Центральная площадь
@@ -177,8 +177,8 @@ if($u->room['file']=='ab/hram') '.$re.''; } ?> - @@ -384,7 +384,7 @@ if($u->room['file']=='ab/hram') diff --git a/modules_data/location/ab/izlom16.php b/modules_data/location/ab/izlom16.php index 62b9a324..d8a97180 100644 --- a/modules_data/location/ab/izlom16.php +++ b/modules_data/location/ab/izlom16.php @@ -39,9 +39,9 @@ if($u->room['file']=='ab/izlom16') diff --git a/modules_data/location/ab/quest.php b/modules_data/location/ab/quest.php index 3896cded..945f91b9 100644 --- a/modules_data/location/ab/quest.php +++ b/modules_data/location/ab/quest.php @@ -68,7 +68,7 @@ if($u->room['file']=='ab/quest') @@ -100,8 +100,8 @@ if($u->room['file']=='ab/quest') @@ -497,7 +497,7 @@ echo ''; href="#"> @@ -507,7 +507,7 @@ echo ''; href="#"> @@ -517,7 +517,7 @@ echo ''; href="#"> @@ -527,7 +527,7 @@ echo ''; href="#"> @@ -543,7 +543,7 @@ echo ''; href="#"> @@ -563,7 +563,7 @@ echo ''; href="#"> @@ -573,7 +573,7 @@ echo ''; href="#"> @@ -583,7 +583,7 @@ echo ''; href="#"> @@ -593,7 +593,7 @@ echo ''; href="#"> @@ -603,7 +603,7 @@ echo ''; href="#"> @@ -619,7 +619,7 @@ echo ''; href="#"> @@ -638,7 +638,7 @@ echo ''; href="#"> @@ -648,7 +648,7 @@ echo ''; href="#"> @@ -658,7 +658,7 @@ echo ''; href="#"> @@ -667,7 +667,7 @@ echo ''; onclick="change_radio(4,3,'atack',0);return false;" href="#"> @@ -677,7 +677,7 @@ echo ''; href="#"> @@ -693,7 +693,7 @@ echo ''; href="#"> @@ -712,7 +712,7 @@ echo ''; href="#"> @@ -722,7 +722,7 @@ echo ''; href="#"> @@ -732,7 +732,7 @@ echo ''; href="#"> @@ -742,7 +742,7 @@ echo ''; href="#"> @@ -752,7 +752,7 @@ echo ''; href="#"> @@ -768,7 +768,7 @@ echo ''; href="#"> @@ -787,7 +787,7 @@ echo ''; href="#"> @@ -797,7 +797,7 @@ echo ''; href="#"> @@ -807,7 +807,7 @@ echo ''; href="#"> @@ -817,7 +817,7 @@ echo ''; href="#"> @@ -827,7 +827,7 @@ echo ''; href="#"> @@ -843,7 +843,7 @@ echo ''; href="#"> @@ -916,20 +916,16 @@ echo ''; } ?> onclick="top.leaderFight();" id="btn_down_img3" style="cursor:pointer;" title="Передать флаг" - src="https://img.new-combats.com/i/ico_change_leader1.gif" + src="//img.new-combats.tech/i/ico_change_leader1.gif" width="16" height="19"/> - diff --git a/modules_data/location/commision.php b/modules_data/location/commision.php index 5c478d4f..7297e63f 100644 --- a/modules_data/location/commision.php +++ b/modules_data/location/commision.php @@ -210,7 +210,7 @@ if($u->room['file']=='commision') - +
-
  Форум  
+
+
  Форум  
-
src="https://img.new-combats.com/city/ap_exit.gif" width="57" height="26" class="aFilter" />
-
-
onclick="location.href='main.php?r=1'" title="Алтарь Предметов" src="https://img.new-combats.com/city/ap_altar1.gif" width="147" height="93" class="aFilter" />
-
onclick="location.href='main.php?r=2'" title="Алтарь Рун" src="https://img.new-combats.com/city/ap_altar2.gif" width="147" height="93" class="aFilter" />
-
src="https://img.new-combats.com/city/ap_exit.gif" width="57" height="26" class="aFilter" />
+
src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter" />
+
+
onclick="location.href='main.php?r=1'" title="Алтарь Предметов" src="//img.new-combats.tech/city/ap_altar1.gif" width="147" height="93" class="aFilter" />
+
onclick="location.href='main.php?r=2'" title="Алтарь Рун" src="//img.new-combats.tech/city/ap_altar2.gif" width="147" height="93" class="aFilter" />
+
src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter" />
@@ -271,7 +271,7 @@ if($u->room['file']=='ab/hram')
- info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> + info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?>
- info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> + info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?>
- +
  - Форум   + Форум  
-
src="https://img.new-combats.com/i/images/300x225/ab_iz_exit.gif" width="48" height="33" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/ab_iz_gate.gif" width="167" height="94" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/ab_iz_shop.gif" width="75" height="68" class="aFilter" />
-
+
src="//img.new-combats.tech/i/images/300x225/ab_iz_exit.gif" width="48" height="33" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/ab_iz_gate.gif" width="167" height="94" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/ab_iz_shop.gif" width="75" height="68" class="aFilter" />
+
diff --git a/modules_data/location/ab/izlom2.php b/modules_data/location/ab/izlom2.php index f2dc02a6..d969b467 100644 --- a/modules_data/location/ab/izlom2.php +++ b/modules_data/location/ab/izlom2.php @@ -22,7 +22,7 @@ if (isset($_POST['level'])) { ?> @@ -289,7 +289,7 @@ body
- +
Вход в подземелье
- +
Центральная площадь
'.$re.''; } ?> - - + '; + $is2.=''; } $treb = explode(',', $pl['itm_2']); foreach($treb as $tr){ if( isset($tr) && $tr!=''){ $itm_treb = mysql_fetch_array(mysql_query('SELECT id, name, img, srok, price1,iznosMAXi FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($tr).'"')); - $is2.=''; + $is2.=''; } } $is2.=' @@ -235,11 +235,11 @@ if(isset($file) && $file[0]=='altar_cat.php') $resAdd = ''; $sp = mysql_query('SELECT `u`.*,`m`.`name`,`m`.`type`,`m`.`img` FROM `items_users` AS `u` LEFT JOIN `items_main` AS `m` ON `u`.`item_id` = `m`.`id` WHERE `u`.`uid` = "'.$u->info['id'].'" AND `u`.`inShop` = "'.$sid.'" AND `u`.`delete` = "0" AND `u`.`data` LIKE "%alt_cat=1%"'); while($pl = mysql_fetch_array($sp)) { - $res_Add .= '

 
'; + $res_Add .= '

 
'; } $sp = mysql_query('SELECT `u`.*,`m`.`name`,`m`.`type`,`m`.`img` FROM `items_users` AS `u` LEFT JOIN `items_main` AS `m` ON `u`.`item_id` = `m`.`id` WHERE `u`.`uid` = "'.$u->info['id'].'" AND `u`.`inShop` = "'.$sid.'" AND `u`.`delete` = "0" AND `u`.`data` LIKE "%alt_cat=2%"'); while($pl = mysql_fetch_array($sp)) { - $itemsAdd .= '

 
'; + $itemsAdd .= '

 
'; } ?>
-
  Форум  
+
+
  Форум  
-
src="https://img.new-combats.com/city/ap_exit.gif" width="57" height="26" class="aFilter" />
-
-
src="https://img.new-combats.com/city/ap_exit.gif" width="57" height="26" class="aFilter" />
+
src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter" />
+
+
src="//img.new-combats.tech/city/ap_exit.gif" width="57" height="26" class="aFilter" />
diff --git a/modules_data/location/ab/vokzal.php b/modules_data/location/ab/vokzal.php index 488a7b19..3a724c2b 100644 --- a/modules_data/location/ab/vokzal.php +++ b/modules_data/location/ab/vokzal.php @@ -305,7 +305,7 @@ if($u->room['file']=='ab/vokzal')
- +
Центральная Площадь
diff --git a/modules_data/location/altar_cat.php b/modules_data/location/altar_cat.php index 8d34ef00..6e41b286 100644 --- a/modules_data/location/altar_cat.php +++ b/modules_data/location/altar_cat.php @@ -192,11 +192,11 @@ if(isset($file) && $file[0]=='altar_cat.php') $itm = mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($pl['itm_add']).'"'); $itm = mysql_fetch_array($itm); $is2.='
'; $itm['srok'] = ($itm['srok']/60/60/24); - $is2.=''.$itm['name'].'
+ $is2.=''.$itm['name'].'
Масса: '.$itm['massa'].'
Цена: '.$itm['price1'].' кр.
Долговечность: 0/'.$itm['iznosMAXi'].'
@@ -206,13 +206,13 @@ if(isset($file) && $file[0]=='altar_cat.php') $treb = explode(',', $pl['itm_1']); foreach($treb as $tr){ $itm_treb = mysql_fetch_array(mysql_query('SELECT id, name, img, srok, price1,iznosMAXi FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($tr).'"')); - $is2.='		'.$itm_treb['name'].'
'.$itm_treb['name'].'
'.$itm_treb['name'].'
'.$itm_treb['name'].'
@@ -291,7 +291,7 @@ if(isset($file) && $file[0]=='altar_cat.php') @@ -382,12 +382,12 @@ if(!isset($log['id'])) { if( isset($pl['id']) ) { $alc = ''; if( $pl['align'] > 0 ) { - $alc .= ''; + $alc .= ''; } if( $pl['clan'] > 0 ) { - $alc .= ''; + $alc .= ''; } - $liveusers .= ', '.$alc.$pl['login'].' ['.$pl['level'].']'; + $liveusers .= ', '.$alc.$pl['login'].' ['.$pl['level'].']'; } } $r .= '

Всего живых участников на данный момент: '.$t['users'].' ('.ltrim($liveusers,', ').')'; @@ -405,12 +405,12 @@ if( $notowerlog == false ) {?> $sp = mysql_query('SELECT * FROM `users` WHERE `win_bs`>0 ORDER BY `win_bs` DESC LIMIT 10'); $i = 1; while ($pl = mysql_fetch_array($sp)) { - $wuser = ''.$pl['login'].' ['.$pl['level'].']'; + $wuser = ''.$pl['login'].' ['.$pl['level'].']'; if( $pl['clan'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } if( $pl['align'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } echo ''.$i.'. Место: '.$wuser.' побед: '.$pl['win_bs'].'
'; $i++; @@ -421,12 +421,12 @@ while ($pl = mysql_fetch_array($sp)) { $sp = mysql_query('SELECT * FROM `bs_statistic` WHERE `wuid` > 0 ORDER BY `id` DESC LIMIT 10'); $i = 1; while ($pl = mysql_fetch_array($sp)) { - $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; + $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; if( $pl['wclan'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } if( $pl['walign'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } echo $i.'. Победитель: '.$wuser.' Начало турнира '.date('d.m.Y H:i',($pl['time_start']+60)).' продолжительность '.$u->timeOut( $pl['time_sf'] ).' приз: '.$pl['money'].'История турнира »»
'; $i++; @@ -437,12 +437,12 @@ while ($pl = mysql_fetch_array($sp)) { $sp = mysql_query('SELECT * FROM `bs_statistic` WHERE `wuid` > 0 ORDER BY `money` DESC LIMIT 1'); $i = 1; while ($pl = mysql_fetch_array($sp)) { - $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; + $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; if( $pl['wclan'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } if( $pl['walign'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } echo 'Победитель: '.$wuser.' Начало турнира '.date('d.m.Y H:i',($pl['time_start']+60)).' продолжительность '.$u->timeOut( $pl['time_sf'] ).' приз: '.$pl['money'].'История турнира »»
'; $i++; @@ -453,12 +453,12 @@ while ($pl = mysql_fetch_array($sp)) { $sp = mysql_query('SELECT * FROM `bs_statistic` WHERE `wuid` > 0 ORDER BY `time_sf` DESC LIMIT 1'); $i = 1; while ($pl = mysql_fetch_array($sp)) { - $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; + $wuser = ''.$pl['wlogin'].' ['.$pl['wlevel'].']'; if( $pl['wclan'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } if( $pl['walign'] > 0 ) { - $wuser = ''.$wuser; + $wuser = ''.$wuser; } echo 'Победитель: '.$wuser.' Начало турнира'.date('d.m.Y H:i',($pl['time_start']+60)).' продолжительность '.$u->timeOut( $pl['time_sf'] ).' приз: '.$pl['money'].'История турнира »»
'; $i++; diff --git a/modules_data/location/btl_.php b/modules_data/location/btl_.php index 508e3506..e6a92ea5 100644 --- a/modules_data/location/btl_.php +++ b/modules_data/location/btl_.php @@ -63,8 +63,8 @@ if ($thisBattle['smert'] == 1) { echo ''; ?> - - + +'; return true; }); - + '; } else { zab += '0'; //b } - rej += ''; + rej += ''; j++; } text = replaceAll('{zn2_' + i + '}', rej, text); @@ -433,25 +433,25 @@ echo '';
- +
Вернуться назад
diff --git a/modules_data/location/an/bank.php b/modules_data/location/an/bank.php index 47cd340d..1bf1a284 100644 --- a/modules_data/location/an/bank.php +++ b/modules_data/location/an/bank.php @@ -273,7 +273,7 @@ if ($u->room['file'] == 'an/bank') { if ($ut['id'] != $u->info['id']) { $alg = ''; if ($u->info['align'] == 50) { - $alg = ''; + $alg = ''; } $text = '"' . $alg . '[login:' . $u->info['login'] . ']" перевел' . ($u->info['sex'] == 0 ? "" : "а") . ' вам ' . ($mn - $prc) . ' екр. со своего банковского счета №' . getNum( $u->bank['id'] @@ -747,7 +747,7 @@ if ($u->room['file'] == 'an/bank') { bgcolor="#DEDEDE">
room['file'] == 'an/bank') {
- Приобретение Екр. онлайн @@ -296,7 +296,7 @@ if($re != '') {
- +
Страшилкина ул.
+ src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/> + src="//img.new-combats.tech/i/items/w/w101.gif"/>
@@ -487,7 +487,7 @@ echo ''; href="#">
 var server_fight = "";'; style="margin-right:11px; font-size:9px;"> info['tactic1']; ?>
 info['tactic2']; ?> info['tactic3']; ?> info['tactic4']; ?> info['tactic5']; ?> info['tactic6']); ?> info['tactic7'] < 0) { $u->info['tactic7'] = 0; @@ -1069,7 +1065,7 @@ echo '';
-
Лог боя »»
(Бой идет с таймаутом NaN мин.)
@@ -1083,7 +1079,7 @@ echo '';
Полную версию лога боя смотрите info['battle']; ?>" target="blank_">здесь »»

   - +
Центральная Площадь
diff --git a/modules_data/location/commision2.php b/modules_data/location/commision2.php index 5cedc589..76fbb95a 100644 --- a/modules_data/location/commision2.php +++ b/modules_data/location/commision2.php @@ -264,7 +264,7 @@ if ($u->room['file'] == 'commision2') { bgcolor="#DEDEDE">
- - - - ".$pl['login']."
"; - //echo "info
"; // - if (timeOut($btc['res_x']-time()) =='0 сек.'){ - echo "Монстр атакует защити город!"; - } - else{ - if ($btc['res_x']-time()<20*60) - { - echo "Атака через: ".timeOut($btc['res_x']-time()).""; - }elseif ($btc['res_x']-time()<45*60) - { - echo "Атака: Очень скоро "; - }elseif ($btc['res_x']-time()<1.2*60*60) - { - echo "Атака: Скоро "; - }elseif ($btc['res_x']-time()<2.2*60*60) - { - echo "Атака: Не скоро "; - }elseif ($btc['res_x']-time()<3*60*60) - { - echo "Атака: Совсем не скоро "; - }else - {echo "Атака: Невозможна! ";} - - //echo "До атаки осталось: ".timeOut($btc['res_x']-time()).""; - - - } - echo "
"; - - //echo ''.$pl['login'].' ['.$pl['level'].'] появится через '.timeOut($btc['res_x']-time()).''.date('d.m.Y H:i',$btc['res_x']).'
'; - } - } - */?>
@@ -154,11 +105,11 @@ function AtackNoWindow()
- +
  - Форум проекта   + Форум проекта  
-
src="https://img.new-combats.com/i/images/300x225/capital/2klub.gif" width="236" height="157" class="aFilter" />
- -
src="https://img.new-combats.com/city/capitalcity/day/loto.gif" class="aFilter" width="86" height="63" />
- -
src="https://img.new-combats.com/i/images/300x225/capital/2shop.gif" width="73" height="47" class="aFilter" />
- - - -
src="https://img.new-combats.com/i/images/300x225/capital/2remont.gif" width="71" height="45" class="aFilter" />
- - - - +
src="//img.new-combats.tech/i/images/300x225/capital/2klub.gif" width="236" height="157" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/loto.gif" class="aFilter" width="86" height="63" />
+
src="//img.new-combats.tech/i/images/300x225/capital/2shop.gif" width="73" height="47" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/2remont.gif" width="71" height="45" class="aFilter" />
-
+
-
+
-
+
-
src="https://img.new-combats.com/newyear2014.png" width="60" height="90" title="" class="aFilter" />
+
src="//img.new-combats.tech/newyear2014.png" width="60" height="90" title="" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/2pochta.gif" width="111" height="72" class="aFilter" />
- -
onclick="alert('Не работает. Находится на реконструкции.')" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/city/capitalcity/day/2vokzal.gif" width="92" height="62" class="aFilter" />
- - - - - -
src="https://img.new-combats.com/i/images/300x225/capital/2strelka.gif" width="30" height="54" class="aFilter" />
-
class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/2pochta.gif" width="111" height="72" class="aFilter" />
+
onclick="alert('Не работает. Находится на реконструкции.')" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="//img.new-combats.tech/city/capitalcity/day/2vokzal.gif" width="92" height="62" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/2strelka.gif" width="30" height="54" class="aFilter" />
+
class="aFilter" />
@@ -247,20 +183,18 @@ if(date("H")<6 || date("H")>=22) ?> 		- -
diff --git a/modules_data/location/cp2.php b/modules_data/location/cp2.php index bddcf906..20a79487 100644 --- a/modules_data/location/cp2.php +++ b/modules_data/location/cp2.php @@ -119,7 +119,7 @@ function WeatherBegin() { // IE main animation function
- +
@@ -136,20 +136,14 @@ function WeatherBegin() { // IE main animation function } --> -
src="https://img.new-combats.com/city/capitalcity/day/euroshop.gif" width="78" height="63" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/bank.gif" width="106" height="73" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/1ubkill.gif" width="116" height="186" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/1ureg.gif" width="106" height="73" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/cp_hostel.gif" width="86" height="90" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/flower_shop.gif" width="74" height="68" class="aFilter" />
- - - - - -
src="https://img.new-combats.com/i/images/300x225/capital/2strelka.gif" width="30" height="54" class="aFilter" />
- -
src="https://img.new-combats.com/i/images/300x225/capital/3strelka.gif" width="30" height="53" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/euroshop.gif" width="78" height="63" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/bank.gif" width="106" height="73" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/1ubkill.gif" width="116" height="186" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/1ureg.gif" width="106" height="73" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/cp_hostel.gif" width="86" height="90" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/flower_shop.gif" width="74" height="68" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/2strelka.gif" width="30" height="54" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/3strelka.gif" width="30" height="53" class="aFilter" />
@@ -178,21 +172,19 @@ if(date("H")<6 || date("H")>=22) - - - + diff --git a/modules_data/location/cp3.php b/modules_data/location/cp3.php index a2fd4246..ce47d7a0 100644 --- a/modules_data/location/cp3.php +++ b/modules_data/location/cp3.php @@ -116,7 +116,7 @@ function WeatherBegin() { // IE main animation function
- +
@@ -133,14 +133,14 @@ function WeatherBegin() { // IE main animation function } --> -
src="https://img.new-combats.com/city/capitalcity/day/cp_libshop.gif" width="53" height="48" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/auction.gif" width="154" height="90" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/cp_zooshop.gif" width="56" height="61" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/cp_portal.gif" width="75" height="90" class="aFilter" />
-
src="https://img.new-combats.com/city/capitalcity/day/cp_deathroom.gif" width="94" height="91" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/capital/2stop.gif" width="29" height="54" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/cp_libshop.gif" width="53" height="48" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/auction.gif" width="154" height="90" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/cp_zooshop.gif" width="56" height="61" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/cp_portal.gif" width="75" height="90" class="aFilter" />
+
src="//img.new-combats.tech/city/capitalcity/day/cp_deathroom.gif" width="94" height="91" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/2stop.gif" width="29" height="54" class="aFilter" />
-
src="https://img.new-combats.com/i/images/300x225/capital/3strelka.gif" width="30" height="53" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/capital/3strelka.gif" width="30" height="53" class="aFilter" />
@@ -169,10 +169,10 @@ if(date("H")<6 || date("H")>=22) diff --git a/modules_data/location/cp4.php b/modules_data/location/cp4.php index 9d8b01c6..0cf67caf 100644 --- a/modules_data/location/cp4.php +++ b/modules_data/location/cp4.php @@ -27,33 +27,33 @@ if($u->room['file']=='cp4') {
-
+
- + Домик Бабушки - + Храм Поклона - + Центральная площадь - + Излом Хаоса
- src="https://img.new-combats.com/loca/cp11/znah_png.png" width="78" height="44" title="" class="aFilter" /> + src="//img.new-combats.tech/loca/cp11/znah_png.png" width="78" height="44" title="" class="aFilter" />
- src="https://img.new-combats.com/loca/leg_loc/big_park/hram.png" width="84" height="116" title="" class="aFilter" /> + src="//img.new-combats.tech/loca/leg_loc/big_park/hram.png" width="84" height="116" title="" class="aFilter" />
- src="https://img.new-combats.com/loca/leg_loc/big_park/ruine.png" width="175" height="157px" title="" class="aFilter" /> + src="//img.new-combats.tech/loca/leg_loc/big_park/ruine.png" width="175" height="157px" title="" class="aFilter" />
-
- src="https://img.new-combats.com/loca/cp11/arr_left.png" width="29" height="41" title="" class="aFilter" /> +
+ src="//img.new-combats.tech/loca/cp11/arr_left.png" width="29" height="41" title="" class="aFilter" />
-
src="https://img.new-combats.com/loca/cp11/arr_right.png" width="29" height="41" title="" class="aFilter" />
+
src="//img.new-combats.tech/loca/cp11/arr_right.png" width="29" height="41" title="" class="aFilter" />
diff --git a/modules_data/location/dragopsh.php b/modules_data/location/dragopsh.php index 91781b1b..e50238d9 100644 --- a/modules_data/location/dragopsh.php +++ b/modules_data/location/dragopsh.php @@ -118,9 +118,9 @@ if (isset($_GET['takeitm'])) { } else { $var['itm']['name'] = 'Предмет рассыпался на глазах...'; } - $var['text'] = ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' сундук...и забрал "' . $var['itm']['name'] . '"'; + $var['text'] = ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' сундук...и забрал "' . $var['itm']['name'] . '"'; sendSysChat($var['text'], true); - $errors .= ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' сундук...и забрал "' . $var['itm']['name'] . '"'; + $errors .= ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' сундук...и забрал "' . $var['itm']['name'] . '"'; $var['obj']['use'] = $u->info['id']; } elseif ($var['obj']['type'] == 5) { //Пандору @@ -153,9 +153,9 @@ if (isset($_GET['takeitm'])) { } else { $var['itm']['name'] = 'Предмет рассыпался на глазах...'; } - $var['text'] = ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' Ящик Пандоры...'; + $var['text'] = ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' Ящик Пандоры...'; sendSysChat($var['text'], true); - $errors .= ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' Ящик Пандоры...'; + $errors .= ' ' . $u->info['login'] . ' открыл' . $var['sex'] . ' Ящик Пандоры...'; $var['obj']['use'] = $u->info['id']; } elseif ($var['obj']['type'] == 3) { //Хилка @@ -169,10 +169,10 @@ if (isset($_GET['takeitm'])) { if ($u->stats['hpNow'] > $u->stats['hpAll']) { $u->stats['hpNow'] = $u->stats['hpAll']; } - $var['text'] = ' ' . $u->info['login'] . ' пополнил' . $var['sex'] . ' здоровье, Уровень Жизни +' . $var['hpp'] . '% (+' . $var['hp'] . 'HP)'; + $var['text'] = ' ' . $u->info['login'] . ' пополнил' . $var['sex'] . ' здоровье, Уровень Жизни +' . $var['hpp'] . '% (+' . $var['hp'] . 'HP)'; mysql_query('UPDATE `stats` SET `hpNow` = "' . $u->stats['hpNow'] . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1'); sendSysChat($var['text'], true); - $errors .= ' ' . $u->info['login'] . ' пополнил' . $var['sex'] . ' здоровье, Уровень Жизни +' . $var['hpp'] . '% (+' . $var['hp'] . 'HP)'; + $errors .= ' ' . $u->info['login'] . ' пополнил' . $var['sex'] . ' здоровье, Уровень Жизни +' . $var['hpp'] . '% (+' . $var['hp'] . 'HP)'; $var['obj']['use'] = $u->info['id']; } if ($var['obj']['use'] > 0) { @@ -431,16 +431,16 @@ if (isset($objs[$u->info['x']][$u->info['y']]['id'])) { } elseif ($mitm['type'] == 1) { //Сундук if ($mitm['use'] == 0) { - $itms .= ''; + $itms .= ''; } else { - $itms .= ''; + $itms .= ''; } } elseif ($mitm['type'] == 3) { //хилка if ($mitm['use'] == 0) { - $itms .= ''; + $itms .= ''; } else { - $itms .= ''; + $itms .= ''; } } elseif ($mitm['type'] == 4) { if ($mitm['use'] == 0) { @@ -460,18 +460,18 @@ if (isset($objs[$u->info['x']][$u->info['y']]['id'])) { if ($u->info['sex'] == 1) { $var['sex'] = 'а'; } - $var['text'] = ' ' . $u->info['login'] . ' угодил' . $var['sex'] . ' в ловушку...'; + $var['text'] = ' ' . $u->info['login'] . ' угодил' . $var['sex'] . ' в ловушку...'; $varos['trap1'] = mysql_fetch_array(mysql_query('SELECT `vals`,`time` FROM `laba_act` WHERE `uid` = "' . $u->info['id'] . '" AND `lib` = "' . $lab['id'] . '" AND `time` > "' . time() . '" AND `vars` = "trap1" ORDER BY `time` DESC LIMIT 1')); sendSysChat($var['text'], true); - $errors .= ' ' . $u->info['login'] . ' угодил' . $var['sex'] . ' в ловушку... Время перехода +3 секунды (Длительность: +' . $var['time'] . ' мин.)'; + $errors .= ' ' . $u->info['login'] . ' угодил' . $var['sex'] . ' в ловушку... Время перехода +3 секунды (Длительность: +' . $var['time'] . ' мин.)'; } } elseif ($mitm['type'] == 5) { //Пандора if ($mitm['use'] == 0) { - $itms .= ''; + $itms .= ''; } else { - $itms .= ''; + $itms .= ''; } } unset($var); @@ -479,7 +479,7 @@ if (isset($objs[$u->info['x']][$u->info['y']]['id'])) { $sp = mysql_query('SELECT `i`.*,`m`.`name`,`m`.`img` FROM `laba_itm` AS `i` LEFT JOIN `items_main` AS `m` ON `m`.`id` = `i`.`itm` WHERE `i`.`lib` = "' . $lab['id'] . '" AND `i`.`x` = "' . $u->info['x'] . '" AND `i`.`y` = "' . $u->info['y'] . '" AND `i`.`take` = "0"'); while ($pl = mysql_fetch_array($sp)) { - $itms .= ' '; + $itms .= ' '; } if ($itms != '') { @@ -503,9 +503,9 @@ if ($itms != '') { mysql_query('UPDATE `users` SET `room` = "369" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1'); mysql_query('UPDATE `stats` SET `dnow` = "0",`x`="0",`y`="0" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1'); - $r = ' Вы получили награду "Чек на предъявителя (50кр.)"'; + $r = ' Вы получили награду "Чек на предъявителя (50кр.)"'; sendSysChat($r, false, true); - $r = ' Вы прошли лабиринт "Подземелья Драконов" и сохранили предметы из лабиринта!'; + $r = ' Вы прошли лабиринт "Подземелья Драконов" и сохранили предметы из лабиринта!'; sendSysChat($r, false, true); //Выбрасываем предметы которые из подземелья die(''); @@ -557,7 +557,7 @@ $mapsee = '
' . $mapsee . ' 0) { - $effed .= '
- Время перехода +3 секунды (Осталось: ' . $u->timeOut($varos['trap1']['time'] - time()) . ')
'; + $effed .= '
- Время перехода +3 секунды (Осталось: ' . $u->timeOut($varos['trap1']['time'] - time()) . ')
'; } unset($varos); ?> @@ -566,105 +566,105 @@ unset($varos); display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/o.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/o.gif"); } .ddp1 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/m.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/m.gif"); } .ddpStart { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/os.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/os.gif"); } .ddpExit { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/of.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/of.gif"); } .ddp1s { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/s.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/s.gif"); } .ddp1m { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/r.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/r.gif"); } .ddp1h { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/h.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/h.gif"); } .ddp1l { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/b.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/b.gif"); } .ddp1p { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/p.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/p.gif"); } .ddp1me { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/u.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/u.gif"); } .ddp1ee1 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/e1.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/e1.gif"); } .ddp1ee2 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/e2.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/e2.gif"); } .ddp1ee3 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/e3.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/e3.gif"); } .ddp1ee4 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/e4.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/e4.gif"); } .ddp1ee5 { display: inline-block; width: 15px; height: 15px; - background-image: url("https://img.new-combats.com/drgn/bg/e5.gif"); + background-image: url("//img.new-combats.tech/drgn/bg/e5.gif"); } @@ -748,12 +748,12 @@ unset($varos);
  + style="background-position: top right; background-repeat: no-repeat; width: 300px; height: 410px; background: url('//img.new-combats.tech/drgn/navbg_big.gif'); ">
+ style="background:url(//img.new-combats.tech/drgn/bg/ramka_s2.gif); background-repeat:no-repeat; background-position:left;"> @@ -855,15 +855,15 @@ unset($varos);
     
+ style="background:url(//img.new-combats.tech/drgn/in_nav_bg.gif); width:103px; height:102px; background-repeat: no-repeat;"> @@ -877,18 +877,18 @@ unset($varos); @@ -909,8 +909,8 @@ unset($varos); diff --git a/modules_data/location/dungeon.php b/modules_data/location/dungeon.php index c1bbb3a5..5c3bc70a 100644 --- a/modules_data/location/dungeon.php +++ b/modules_data/location/dungeon.php @@ -177,7 +177,7 @@ if ($u->room['file'] == 'dungeon') { mysql_query('DELETE FROM `katok_now` WHERE `id` = "' . $pl['id'] . '" LIMIT 1'); // } - header('location: https://new-combats.com/main.php'); + header('location: /main.php'); die('Матч закончился! Победила команда №' . $tmwin . ''); } } @@ -666,11 +666,11 @@ if ($u->room['file'] == 'dungeon') { } } - zfloor0[rz] = '' + zfloor0[rz]; + zfloor0[rz] = '' + zfloor0[rz]; } else { - zfloor0[rz] = '' + zfloor0[rz]; + zfloor0[rz] = '' + zfloor0[rz]; } - r = ''; + r = ''; } return r; } @@ -730,11 +730,11 @@ if ($u->room['file'] == 'dungeon') { if (v[5] == 'bot' || info['bsid'];?> > 0) { action = 'dialogMenu(' + v[0] + ',' + v[8] + ',' + v[7] + ',0,0,event,' + v[9] + ');'; } - zfloor0[rz] += ''; + zfloor0[rz] += ''; } else { - zfloor0[rz] += ''; + zfloor0[rz] += ''; } - r = ''; + r = ''; } return r; } @@ -841,7 +841,7 @@ if ($u->room['file'] == 'dungeon') { $tmGol = $u->info['timeGo'] - $u->info['timeGoL']; //сколько секунд идти всего echo 'var tgo = ' . ($tmGo * 10) . '; var tgol = ' . ($tmGol * 10) . ';'; ?> -
Вверх
Влево Обновить Вправо
Вниз
@@ -1068,7 +1068,7 @@ if ($u->room['file'] == 'dungeon') { $sb1 = mysql_fetch_array(mysql_query('SELECT * FROM `dungeon_obj` WHERE `name` LIKE "%Шайба%" AND `dn` = "' . $d->info['id'] . '" LIMIT 1')); while($pl = mysql_fetch_array($sp)) { - $css = '"background-image":"url(https://img.new-combats.com/fon555.png)",'; + $css = '"background-image":"url(//img.new-combats.tech/fon555.png)",'; $j = 0; while ($j <= 4) { @@ -1081,7 +1081,7 @@ if ($u->room['file'] == 'dungeon') { } if( $sb1['x'] == $pl['x'] && $sb1['y'] == $pl['y'] ) { - echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Шайба!\" style=\"margin:2px 3px 3px 2px;background-image:url(https://img.new-combats.com/i/move/shb.gif)\" src=\"https://img.new-combats.com/1x1.gif\" width=\"7\" height=\"7\">");'; + echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Шайба!\" style=\"margin:2px 3px 3px 2px;background-image:url(//img.new-combats.tech/i/move/shb.gif)\" src=\"//img.new-combats.tech/1x1.gif\" width=\"7\" height=\"7\">");'; }elseif ($u->info['x'] == $pl['x'] && $u->info['y'] == $pl['y']) { if ($d->info['id2'] == 15) { $tmbth = 4; @@ -1091,9 +1091,9 @@ if ($u->room['file'] == 'dungeon') { } elseif ($tm['team'] == 2) { $tmbth = 2; } - echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Это Вы\" style=\"margin:2px 3px 3px 2px;background-image:url(https://img.new-combats.com/i/move/p' . $tmbth . '/d0.gif)\" src=\"https://img.new-combats.com/1x1.gif\" width=\"7\" height=\"7\">");'; + echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Это Вы\" style=\"margin:2px 3px 3px 2px;background-image:url(//img.new-combats.tech/i/move/p' . $tmbth . '/d0.gif)\" src=\"//img.new-combats.tech/1x1.gif\" width=\"7\" height=\"7\">");'; } else { - echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Это Вы\" style=\"margin:2px 3px 3px 2px;background-image:url(https://img.new-combats.com/i/move/p1/d0.gif)\" src=\"https://img.new-combats.com/1x1.gif\" width=\"7\" height=\"7\">");'; + echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Это Вы\" style=\"margin:2px 3px 3px 2px;background-image:url(//img.new-combats.tech/i/move/p1/d0.gif)\" src=\"//img.new-combats.tech/1x1.gif\" width=\"7\" height=\"7\">");'; } } elseif ($d->info['id2'] == 15) { $tmbth = 4; @@ -1105,12 +1105,12 @@ if ($u->room['file'] == 'dungeon') { } $tbshin = mysql_fetch_array(mysql_query('SELECT `id` FROM `items_users` WHERE `uid` = "' . $uxy[$pl['x'] . '_' . $pl['y']]['id'] . '" AND `item_id` = 4910 AND `delete` = 0 LIMIT 1')); if (isset($tbshin['id'])) { - echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Шайба!\" style=\"margin:2px 3px 3px 2px;background-image:url(https://img.new-combats.com/i/move/shb.gif)\" src=\"https://img.new-combats.com/1x1.gif\" width=\"7\" height=\"7\">");'; + echo '$("#min_' . $pl['x'] . '_' . $pl['y'] . '").html("info['s'] . '\" title=\"Шайба!\" style=\"margin:2px 3px 3px 2px;background-image:url(//img.new-combats.tech/i/move/shb.gif)\" src=\"//img.new-combats.tech/1x1.gif\" width=\"7\" height=\"7\">");'; } else { - echo '$("#min_' . $uxy[$pl['x'] . '_' . $pl['y']]['x'] . '_' . $uxy[$pl['x'] . '_' . $pl['y']]['y'] . '").html("");'; + echo '$("#min_' . $uxy[$pl['x'] . '_' . $pl['y']]['x'] . '_' . $uxy[$pl['x'] . '_' . $pl['y']]['y'] . '").html("");'; } }elseif (isset($uxy[$pl['x'] . '_' . $pl['y']])) { - echo '$("#min_' . $uxy[$pl['x'] . '_' . $pl['y']]['x'] . '_' . $uxy[$pl['x'] . '_' . $pl['y']]['y'] . '").html("");'; + echo '$("#min_' . $uxy[$pl['x'] . '_' . $pl['y']]['x'] . '_' . $uxy[$pl['x'] . '_' . $pl['y']]['y'] . '").html("");'; } elseif( isset($bxy[$pl['x'] . '_' . $pl['y']]) ) { $bobrz = $bxy[$pl['x'] . '_' . $pl['y']]['obraz']; @@ -1122,7 +1122,7 @@ if ($u->room['file'] == 'dungeon') { } ?> - $("#min__").html("
' src='https://img.new-combats.com/chars//'>
"); + $("#min__").html("
' src='//img.new-combats.tech/chars//'>
"); room['file'] == 'dungeon') {
- +
- testGone(3) > 0) { ?> - testGone(4) > 0) { ?> - testGone(2) > 0) { ?> - testGone(1) > 0) { ?> - - -
room['file'] == 'dungeon') { } ?>"> info['admin'] == 0){ ?>
-
diff --git a/modules_data/location/dungeon_css.css b/modules_data/location/dungeon_css.css index 697a23ca..c062556c 100644 --- a/modules_data/location/dungeon_css.css +++ b/modules_data/location/dungeon_css.css @@ -29,34 +29,34 @@ DIV.Dungeon{ } DIV.Life{position:absolute;background:#008000;height:2px;} DIV.Life2{position:absolute;background:#00FF00;height:2px;} -.Dungeon .Floor0{ background: url( https://img.new-combats.com/i/sprites/noob/bg0.gif ) black } -.Dungeon .Floor1{ background: url( https://img.new-combats.com/i/sprites/noob/bg1.gif ) black } +.Dungeon .Floor0{ background: url( //img.new-combats.tech/i/sprites/noob/bg0.gif ) black } +.Dungeon .Floor1{ background: url( //img.new-combats.tech/i/sprites/noob/bg1.gif ) black } -.Dungeon .LeftSide4_1 { background: url( https://new-combats.com/i/sprites/noob/Left/4_1.gif ) } -.Dungeon .RightSide4_1 { background: url( https://new-combats.com/i/sprites/noob/Right/4_1.gif ) } -.Dungeon .LeftSide4_0 { background: url( https://new-combats.com/i/sprites/noob/Left/4_0.gif ) } +.Dungeon .LeftSide4_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/4_1.gif ) } +.Dungeon .RightSide4_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/4_1.gif ) } +.Dungeon .LeftSide4_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/4_0.gif ) } .Dungeon .RightSide4_0 { background: url( https://img.combats-world.com/i/sprites/noob/Right/4_0.gif ) } -.Dungeon .LeftFront3_2 { background: url( https://new-combats.com/i/sprites/noob/Left/Front/4_2.gif ) } -.Dungeon .RightFront3_2 { background: url( https://img.new-combats.com/i/sprites/noob/Right/Front/4_2.gif ) } -.Dungeon .LeftFront3_1 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/4_1.gif ) } -.Dungeon .RightFront3_1 { background: url( https://img.new-combats.com/i/sprites/noob/Right/Front/4_1.gif ) } -.Dungeon .LeftFront3_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/4_0.gif ) } -.Dungeon .LeftSide3_1 { background: url( https://img.new-combats.com/i/sprites/noob/Left/3_1.gif ) } -.Dungeon .RightSide3_1 { background: url( https://img.new-combats.com/i/sprites/noob/Right/3_1.gif ) } -.Dungeon .LeftSide3_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/3_0.gif ) } -.Dungeon .RightSide3_0 { background: url( https://img.new-combats.com/i/sprites/noob/Right/3_0.gif ) } -.Dungeon .LeftFront2_1 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/3_1.gif ) } -.Dungeon .RightFront2_1 { background: url( https://img.new-combats.com/i/sprites/noob/Right/Front/3_1.gif ) } -.Dungeon .LeftFront2_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/3_0.gif ) } -.Dungeon .LeftSide2_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/2_0.gif ) } -.Dungeon .RightSide2_0 { background: url( https://img.new-combats.com/i/sprites/noob/Right/2_0.gif ) } -.Dungeon .LeftFront1_1 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/2_1.gif ) } -.Dungeon .RightFront1_1 { background: url( https://img.new-combats.com/i/sprites/noob/Right/Front/2_1.gif ) } -.Dungeon .LeftFront1_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/2_0.gif ) } -.Dungeon .LeftSide1_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/1_0.gif ) } -.Dungeon .RightSide1_0 { background: url( https://img.new-combats.com/i/sprites/noob/Right/1_0.gif ) } -.Dungeon .LeftFront0_1 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/1_1.gif ) } -.Dungeon .RightFront0_1 { background: url( https://img.new-combats.com/i/sprites/noob/Right/Front/1_1.gif ) } -.Dungeon .LeftFront0_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/Front/1_0.gif ) } -.Dungeon .LeftSide0_0 { background: url( https://img.new-combats.com/i/sprites/noob/Left/0_0.gif ) } -.Dungeon .RightSide0_0 { background: url( https://img.new-combats.com/i/sprites/noob/Right/0_0.gif ) } \ No newline at end of file +.Dungeon .LeftFront3_2 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/4_2.gif ) } +.Dungeon .RightFront3_2 { background: url( //img.new-combats.tech/i/sprites/noob/Right/Front/4_2.gif ) } +.Dungeon .LeftFront3_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/4_1.gif ) } +.Dungeon .RightFront3_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/Front/4_1.gif ) } +.Dungeon .LeftFront3_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/4_0.gif ) } +.Dungeon .LeftSide3_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/3_1.gif ) } +.Dungeon .RightSide3_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/3_1.gif ) } +.Dungeon .LeftSide3_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/3_0.gif ) } +.Dungeon .RightSide3_0 { background: url( //img.new-combats.tech/i/sprites/noob/Right/3_0.gif ) } +.Dungeon .LeftFront2_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/3_1.gif ) } +.Dungeon .RightFront2_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/Front/3_1.gif ) } +.Dungeon .LeftFront2_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/3_0.gif ) } +.Dungeon .LeftSide2_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/2_0.gif ) } +.Dungeon .RightSide2_0 { background: url( //img.new-combats.tech/i/sprites/noob/Right/2_0.gif ) } +.Dungeon .LeftFront1_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/2_1.gif ) } +.Dungeon .RightFront1_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/Front/2_1.gif ) } +.Dungeon .LeftFront1_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/2_0.gif ) } +.Dungeon .LeftSide1_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/1_0.gif ) } +.Dungeon .RightSide1_0 { background: url( //img.new-combats.tech/i/sprites/noob/Right/1_0.gif ) } +.Dungeon .LeftFront0_1 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/1_1.gif ) } +.Dungeon .RightFront0_1 { background: url( //img.new-combats.tech/i/sprites/noob/Right/Front/1_1.gif ) } +.Dungeon .LeftFront0_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/Front/1_0.gif ) } +.Dungeon .LeftSide0_0 { background: url( //img.new-combats.tech/i/sprites/noob/Left/0_0.gif ) } +.Dungeon .RightSide0_0 { background: url( //img.new-combats.tech/i/sprites/noob/Right/0_0.gif ) } \ No newline at end of file diff --git a/modules_data/location/dungeon_enter.php b/modules_data/location/dungeon_enter.php index 55e3d576..efeddde4 100644 --- a/modules_data/location/dungeon_enter.php +++ b/modules_data/location/dungeon_enter.php @@ -442,7 +442,7 @@ while( $pl = mysql_fetch_array( $sp ) ){ $pus = ''; //группа $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while( $pu = mysql_fetch_array( $su ) ) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim( $pus, ', ' ); @@ -478,13 +478,7 @@ while( $pl = mysql_fetch_array( $sp ) ){ $dungeonGroupList .= '
'; } ?> - +
@@ -505,7 +499,7 @@ while( $pl = mysql_fetch_array( $sp ) ){
- + - + questCheckEnd($pq)==1 ) $qsee2 = ''; else $qsee2 = ''; $qsee .= ' - + '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).''.$qsee2.'

'; diff --git a/modules_data/location/dungeon_enter_all.php b/modules_data/location/dungeon_enter_all.php index 642a4f68..5d645776 100644 --- a/modules_data/location/dungeon_enter_all.php +++ b/modules_data/location/dungeon_enter_all.php @@ -506,12 +506,12 @@ while( $pl = mysql_fetch_array( $sp ) ){ if( $u->info['dn'] == 0 ) $dungeonGroupList .= ''; $dungeonGroupList .= ''.date('H:i',$pl['time']).' '; - $dungeonGroupList .= ' '; + $dungeonGroupList .= ' '; $pus = ''; //группа $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while( $pu = mysql_fetch_array( $su ) ) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim( $pus, ', ' ); @@ -547,14 +547,6 @@ while( $pl = mysql_fetch_array( $sp ) ){ $dungeonGroupList .= ''; } ?> -
Рыцарский магазин
@@ -577,7 +569,7 @@ body { - +
- + - +
+ '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).''.$qsee2.'

'; @@ -1159,45 +1151,37 @@ onclick="if (confirm('Сдать все чеки ( шт.) наход Выберите пещеру:

+ Водосток [8]

+ Пещера Тысячи Проклятий[9]

+ Бездна[8]
+ Грибница[8]

+ Катакомбы[10]

+ Гора Легиона[10]

+ Пещера Мглы[10]
info['level'] == 12){?>
+ Потерянный вход[11-12]
- - info['admin']> 0){?>
+ Туманные Низины v.2.0
- - - +
Пароль diff --git a/modules_data/location/dungeon_shop.php b/modules_data/location/dungeon_shop.php index 8e75f91a..5d08e1b0 100644 --- a/modules_data/location/dungeon_shop.php +++ b/modules_data/location/dungeon_shop.php @@ -176,7 +176,7 @@ if( $u->room['file'] == 'dungeon_shop' ) { 		- +
- + Пещера Тысячи Проклятий', - 2=>' Бездна', - 3=>' Пещеры Мглы', - 4=>' Катакомбы', - 5=>' Потеряный вход', - 6=>' Грибница', - 7=>' Туманные Низины', - 8=>' Другое ...' + 1=>' Пещера Тысячи Проклятий', + 2=>' Бездна', + 3=>' Пещеры Мглы', + 4=>' Катакомбы', + 5=>' Потеряный вход', + 6=>' Грибница', + 7=>' Туманные Низины', + 8=>' Другое ...' ); if($u->rep['rep'.$dungeon['city']] >= 10000){ if($sid==802) $otdels_array[8] = 'Плащи'; diff --git a/modules_data/location/dungeons/building.php b/modules_data/location/dungeons/building.php index 343ea17a..1562302f 100644 --- a/modules_data/location/dungeons/building.php +++ b/modules_data/location/dungeons/building.php @@ -130,7 +130,7 @@ if (isset($file) && $file[0] == 'dungeons/building.php' /* && $u->info['admin'] '; @@ -183,7 +183,7 @@ if (isset($file) && $file[0] == 'dungeons/building.php' /* && $u->info['admin'] $r .= ''; diff --git a/modules_data/location/elka.php b/modules_data/location/elka.php index 6a0acf6f..61fd1ab0 100644 --- a/modules_data/location/elka.php +++ b/modules_data/location/elka.php @@ -189,12 +189,12 @@ if($u->room['file']=='elka') testAction('`uid` = "'.$u->info['id'].'" AND `time` > '.(time()-600).' AND `vars` = "use_cupNewYear" LIMIT 1',1); ?> - /> + />testAction('`uid` = "'.$u->info['id'].'" AND `time` > '.(time()-600).' AND `vars` = "take_gift'.$dt.'" LIMIT 1',1); ?> - /> + /> @@ -214,7 +214,7 @@ if($u->room['file']=='elka') { $itt = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.$it['item_id'].'" LIMIT 1')); ?> - /> + /> @@ -325,14 +325,14 @@ if(isset($_GET['page'])) $prs = explode('|',$pl['pers']); $pers = ''; if($prs[0]!=0) { - $pers .= ''; + $pers .= ''; } if($prs[1]!=0) { $clanPrs = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id`="'.$prs[1].'" LIMIT 1')); - $pers .= ''; + $pers .= ''; } - $pers .= ''.$prs[2].'['.$prs[3].']'; + $pers .= ''.$prs[2].'['.$prs[3].']'; if($pl['delete']!='0') { if($pl['delete']=='1') @@ -347,14 +347,14 @@ if(isset($_GET['page'])) $prs = explode('|',$pl['delete']); $pers2 = ''; if($prs[0]!=0) { - $pers2 .= ''; + $pers2 .= ''; } if($prs[1]!=0) { $clanPrs = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id`="'.$prs[1].'" LIMIT 1')); - $pers2 .= ''; + $pers2 .= ''; } - $pers2 .= ''.$prs[2].'['.$prs[3].']'; + $pers2 .= ''.$prs[2].'['.$prs[3].']'; if($u->info['admin']>0 || ($u->info['align']>1 && $u->info['align']<2) || ($u->info['align']>3 && $u->info['align']<4)) { @@ -390,14 +390,14 @@ if(isset($_GET['page'])) diff --git a/modules_data/location/em/casino.php1 b/modules_data/location/em/casino.php1 deleted file mode 100644 index 3a3e88da..00000000 --- a/modules_data/location/em/casino.php1 +++ /dev/null @@ -1,299 +0,0 @@ -room['file']=='em/casino') -{ - $rz = 0; - - if( $u->room['id'] == 388 ) { - $rz = 0; - }elseif( $u->room['id'] == 389 ) { - $rz = 1; - }elseif( $u->room['id'] == 390 ) { - $rz = 2; - }elseif( $u->room['id'] == 391 ) { - $rz = 3; - }elseif( $u->room['id'] == 392 ) { - $rz = 4; - } - - - if($re!=''){ echo '
'.$re.'
'; } ?> - - -
Прогресс строительства %
' . round( $count / ($need_count / 100) - ) . '/' . (100) . '

'; $r .= '
' . $input . ''; $r .= '
' . round( $row['current'] / ($row['count'] / 100) - ) . '/' . (100) . '

'; $r .= '
- +
Центральная Площадь
- +
- -
room['name']; - if( $rz == 1 ) { - echo ' "Рулетка"'; - } - ?>
-
- -
- - - - - - -
Залы:Рулетка
-
- bank['id']) ) { - ?> -

- Банковский счет для игры: №bank['id']?> -
- bank['id']) ) { - ?> -
-

-
- Перед началом игры выберите счет в банке:
- Счет:    
- Пароль:
- -
-

-
- -
- Выберите игровой зал -
-

- -

- info['admin'] > 0 ) { - $bnk1 = 0; - $sm = $u->testAction('`city` = "'.$u->info['city'].'" AND `vars` = "casino_balance" LIMIT 1',1); - $bnk1 += $sm['vals']; - if( $bnk1 <= 0 ) { - echo 'За все время выиграли '.(-$bnk1).'.00 екр.

'; - }else{ - echo 'За все время проиграли '.($bnk1).'.00 екр.

'; - } - $sp = mysql_query('SELECT * FROM `ruletka_coin` ORDER BY `id`'); - $bag1d = array(); - while( $pl = mysql_fetch_array($sp)) { - $bag1d[$pl['game_id']][$pl['uid']] += $pl['money']; - if( $bag1d[$pl['game_id']][$pl['uid']] > 100 ) { - echo '
'.date('d.m.Y H:i',$pl['time']).' '.$u->microLogin($pl['uid'],1).' сделал баговую ставку '.$bag1d[$pl['game_id']][$pl['uid']].' екр.'; - } - } - //} - ?> - - - - - - - - - - - - - - - - - - -
-

Для содержимого этой страницы требуется более новая версия Adobe Flash Player.

-

Получить проигрыватель Adobe Flash Player

-
- - - -

- -
- -

- - - - - - - - - - - - - - - - - - -
-

Для содержимого этой страницы требуется более новая версия Adobe Flash Player.

-

Получить проигрыватель Adobe Flash Player

-
- - - -

-
-

Игровой стол временно закрыт

'; - }elseif( $rz == 3 ) { - $min_s = 1; - $max_s = 10; - ?> -

- - - - - - - - - - - - - - - - - - -
-

Для содержимого этой страницы требуется более новая версия Adobe Flash Player.

-

Получить проигрыватель Adobe Flash Player

-
- - - -

-
- -
-
- Внимание! Все игры проводятся на екр. и Администрация не несет ответственности за возможные исходы игры, включая сбои и т.д. -
- 		-
  - - -
- - - - - - - -
- - - - - -
Бойцовский Клуб
-
-
-
-
-
- bank['id'])) { ?> -
У вас в наличии: bank['money2'],2); ?> екр.   - -
-
-
-
-
-
- - diff --git a/modules_data/location/em/cp.php b/modules_data/location/em/cp.php index 0eb3c6ea..bfde6a3a 100644 --- a/modules_data/location/em/cp.php +++ b/modules_data/location/em/cp.php @@ -28,40 +28,14 @@ if($u->room['file']=='em/cp') { @@ -78,9 +52,7 @@ if($u->room['file']=='em/cp') {
-
+
- - - -
/>
- -
/>
- -
/>
- +
/>
+
/>
+
/>
- - - info['admin'] > 0 ) { - //Хэллоуин - /* if( (date('m') == 11 && date('d') <= 6) || (date('m') == 10 && date('d') == 31) ) { - ?> -
- -
src="https://img.new-combats.com/newyear2014.png" width="60" height="90" title="" class="aFilter" />
- - -
@@ -70,7 +44,7 @@ if($u->room['file']=='em/cp') { echo 'Напасть   '; } ?> - Форум + Форум
- -
diff --git a/modules_data/location/em/cp2.php b/modules_data/location/em/cp2.php index eeba2bce..e3a04cdf 100644 --- a/modules_data/location/em/cp2.php +++ b/modules_data/location/em/cp2.php @@ -28,40 +28,14 @@ if($u->room['file']=='em/cp2') { @@ -78,9 +52,7 @@ if($u->room['file']=='em/cp2') {
-
+
- - - -
/>
- -
/>
- -
/>
- +
/>
+
/>
+
/>
- - - info['admin'] > 0 ) { - //Хэллоуин - /* if( (date('m') == 11 && date('d') <= 6) || (date('m') == 10 && date('d') == 31) ) { - ?> -
- -
src="https://img.new-combats.com/newyear2014.png" width="60" height="90" title="" class="aFilter" />
- - -
@@ -70,7 +44,7 @@ if($u->room['file']=='em/cp2') { echo 'Напасть   '; } ?> - Форум + Форум
- -
diff --git a/modules_data/location/em/ruletka.php b/modules_data/location/em/ruletka.php index 53a3c096..2199ac7e 100644 --- a/modules_data/location/em/ruletka.php +++ b/modules_data/location/em/ruletka.php @@ -97,7 +97,7 @@ if($u->room['file']=='ruletka') 		- +
Бойцовский клуб
diff --git a/modules_data/location/em/ruletka11.php b/modules_data/location/em/ruletka11.php index 52d6d7db..9de12b2b 100644 --- a/modules_data/location/em/ruletka11.php +++ b/modules_data/location/em/ruletka11.php @@ -97,7 +97,7 @@ if($u->room['file']=='ruletka') 		- +
Бойцовский клуб
diff --git a/modules_data/location/em/vokzal.php b/modules_data/location/em/vokzal.php index 369d0f73..c6ccc1a9 100644 --- a/modules_data/location/em/vokzal.php +++ b/modules_data/location/em/vokzal.php @@ -384,7 +384,7 @@ if ($re != '') { bgcolor="#DEDEDE">
['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -330,7 +330,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -354,7 +354,7 @@ body
- + +
Рыцарский магазин
@@ -487,7 +487,7 @@ $sp = mysql_query('SELECT * FROM `actions` WHERE `vars` LIKE "%start_quest%" AND while($pl = mysql_fetch_array($sp)) { $pq = mysql_fetch_array(mysql_query('SELECT * FROM `quests` WHERE `id` = "'.str_replace('start_quest','',$pl['vars']).'" LIMIT 1')); - $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qx++; } diff --git a/modules_data/location/enterbezdna_shop.php b/modules_data/location/enterbezdna_shop.php index 0c3c73bf..472e63d5 100644 --- a/modules_data/location/enterbezdna_shop.php +++ b/modules_data/location/enterbezdna_shop.php @@ -143,7 +143,7 @@ if($u->room['file']=='enterbezdna_shop') 		- +
Вход в Бездну
diff --git a/modules_data/location/entercat.php b/modules_data/location/entercat.php index daf55186..b4c4b73b 100644 --- a/modules_data/location/entercat.php +++ b/modules_data/location/entercat.php @@ -209,7 +209,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -256,7 +256,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -280,7 +280,7 @@ body
- +
'.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qx++; } diff --git a/modules_data/location/enterdrago.php b/modules_data/location/enterdrago.php index 37466c88..1bd82f44 100644 --- a/modules_data/location/enterdrago.php +++ b/modules_data/location/enterdrago.php @@ -146,55 +146,55 @@ if( isset($_GET['start']) && $zv['uid']==$u->info['id'] && $dungeonGo == 1 ) { / display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/o.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/o.gif"); } .ddp1 { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/m.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/m.gif"); } .ddpStart { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/os.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/os.gif"); } .ddpExit { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/of.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/of.gif"); } .ddp1s { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/s.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/s.gif"); } .ddp1m { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/r.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/r.gif"); } .ddp1h { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/h.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/h.gif"); } .ddp1l { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/b.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/b.gif"); } .ddp1p { display:inline-block; width:15px; height:15px; - background-image:url("https://img.new-combats.com/drgn/bg/p.gif"); + background-image:url("//img.new-combats.tech/drgn/bg/p.gif"); } '.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim( $pus, ', ' ); @@ -467,7 +467,7 @@ while( $pl = mysql_fetch_array( $sp ) ) { body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/drgn/bg/1.jpg); + background-image: url(//img.new-combats.tech/drgn/bg/1.jpg); background-repeat:no-repeat;background-position:top right; } @@ -501,7 +501,7 @@ body
- + diff --git a/modules_data/location/enternizin.php b/modules_data/location/enternizin.php index cf33db49..26d19531 100644 --- a/modules_data/location/enternizin.php +++ b/modules_data/location/enternizin.php @@ -279,7 +279,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -330,7 +330,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -354,7 +354,7 @@ body
'.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qc++; } } diff --git a/modules_data/location/entergrib.php b/modules_data/location/entergrib.php index 04afc811..6778e172 100644 --- a/modules_data/location/entergrib.php +++ b/modules_data/location/entergrib.php @@ -210,7 +210,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -257,7 +257,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -281,7 +281,7 @@ body
- +
Центральная площадь
@@ -376,7 +376,7 @@ $sp = mysql_query('SELECT * FROM `actions` WHERE `vars` LIKE "%start_quest%" AND while($pl = mysql_fetch_array($sp)) { $pq = mysql_fetch_array(mysql_query('SELECT * FROM `quests` WHERE `id` = "'.str_replace('start_quest','',$pl['vars']).'" LIMIT 1')); - $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qx++; } diff --git a/modules_data/location/enternekro.php b/modules_data/location/enternekro.php index 60f305f6..69274346 100644 --- a/modules_data/location/enternekro.php +++ b/modules_data/location/enternekro.php @@ -210,7 +210,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -257,7 +257,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -279,7 +279,7 @@ body
- +
Вход в подземелье
- + diff --git a/modules_data/location/fe/bk.php b/modules_data/location/fe/bk.php index 903580ea..0a6b1c84 100644 --- a/modules_data/location/fe/bk.php +++ b/modules_data/location/fe/bk.php @@ -21,18 +21,10 @@ if($u->room['file']=='fe/bk')
'.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qx++; } diff --git a/modules_data/location/enterptp.php b/modules_data/location/enterptp.php index a5bb1668..904bafbf 100644 --- a/modules_data/location/enterptp.php +++ b/modules_data/location/enterptp.php @@ -264,7 +264,7 @@ while($pl = mysql_fetch_array($sp)){ $pus = ''; //группа $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)){ - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -315,7 +315,7 @@ while($pl = mysql_fetch_array($sp)){ body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -339,7 +339,7 @@ body
- + +
Рыцарский магазин
@@ -477,7 +477,7 @@ $sp = mysql_query('SELECT * FROM `actions` WHERE `vars` LIKE "%start_quest%" AND while($pl = mysql_fetch_array($sp)) { $pq = mysql_fetch_array(mysql_query('SELECT * FROM `quests` WHERE `id` = "'.str_replace('start_quest','',$pl['vars']).'" LIMIT 1')); - $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; + $qsee .= ' '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).'

'; $qx++; } diff --git a/modules_data/location/enterptp_shop.php b/modules_data/location/enterptp_shop.php index cddd08a2..8a7167b3 100644 --- a/modules_data/location/enterptp_shop.php +++ b/modules_data/location/enterptp_shop.php @@ -143,7 +143,7 @@ if($u->room['file']=='enterptp_shop') 		- +
Вход в Пещеру Тысячи Проклятий
diff --git a/modules_data/location/entersnow.php b/modules_data/location/entersnow.php index 91578142..8c138b1e 100644 --- a/modules_data/location/entersnow.php +++ b/modules_data/location/entersnow.php @@ -211,7 +211,7 @@ while($pl = mysql_fetch_array($sp)) $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while($pu = mysql_fetch_array($su)) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim($pus,', '); @@ -258,7 +258,7 @@ while($pl = mysql_fetch_array($sp)) body { background-color:#E2E2E2; - background-image: url(https://img.new-combats.com/i/misc/showitems/dungeon.jpg); + background-image: url(//img.new-combats.tech/i/misc/showitems/dungeon.jpg); background-repeat:no-repeat;background-position:top right; } @@ -280,7 +280,7 @@ body
- +
Елка
- +
-
-
-
- onClick="location='main.php?loc=1.180.0.7';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_klub6.gif" width="123" height="30" class="aFilter" />
-
onClick="location='main.php?loc=5.180.0.309';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_klub4.gif" width="123" height="31" class="aFilter" />
-
onClick="location='main.php?loc=5.180.0.310';" src="https://img.new-combats.com/i/images/300x225/map_klub3.gif" width="123" height="31" title="" />
-
onClick="location='main.php?loc=5.180.0.311';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_klub5.gif" width="123" height="30" class="aFilter" />
-
onClick="location='main.php?loc=1.180.0.220';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_klub2.gif" width="58" height="49" class="aFilter" />
-
onClick="location='main.php?loc=1.180.0.15';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_klub1.gif" width="56" height="13" class="aFilter" />
-
onClick="location='main.php?loc=1.180.0.17';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_demon2.gif" width="107" height="15" class="aFilter" />
-*/?> -
onClick="location='main.php?loc=6.180.0.100';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/fallenearth/map_cp.gif" width="103" height="47" class="aFilter" />
+
+
+
+
onClick="location='main.php?loc=6.180.0.100';" onMouseOver="this.className='aFilterhover';" onMouseOut="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/fallenearth/map_cp.gif" width="103" height="47" class="aFilter" />
@@ -51,16 +43,14 @@ if($u->room['file']=='fe/bk') echo 'Возможно, вы ошиблись этажом - настоящие сражения проходят этажом выше.'; } ?> 		- -
testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/fe/cp.php b/modules_data/location/fe/cp.php index 1ab28e2c..4927ed45 100644 --- a/modules_data/location/fe/cp.php +++ b/modules_data/location/fe/cp.php @@ -39,11 +39,11 @@ if($u->room['file']=='fe/cp')
- +
  - Форум   + Форум  
-
src="https://img.new-combats.com/i/images/300x225/fallenearth/move-left.gif" width="29" height="25" class="aFilter" />
+
src="//img.new-combats.tech/i/images/300x225/fallenearth/move-left.gif" width="29" height="25" class="aFilter" />
@@ -76,7 +76,7 @@ if($u->room['file']=='fe/sclep')
testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/fe/shop_.php b/modules_data/location/fe/shop_.php index 4bc2027f..ef104d89 100644 --- a/modules_data/location/fe/shop_.php +++ b/modules_data/location/fe/shop_.php @@ -347,7 +347,7 @@ if($u->room['file']=='fe/shop_') 		- +
Центральная Площадь
diff --git a/modules_data/location/fe/vokzal.php b/modules_data/location/fe/vokzal.php index 66dab4c8..50200551 100644 --- a/modules_data/location/fe/vokzal.php +++ b/modules_data/location/fe/vokzal.php @@ -301,7 +301,7 @@ if($u->room['file']=='nc/vokzal') 		- +
Центральная Площадь
diff --git a/modules_data/location/fe/zv1.php b/modules_data/location/fe/zv1.php index a81c78bc..a3e342b9 100644 --- a/modules_data/location/fe/zv1.php +++ b/modules_data/location/fe/zv1.php @@ -21,16 +21,16 @@ if($u->room['file']=='nc/zv1')
-
-
-
src="https://img.new-combats.com/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
-
-
-
-
-
-
-
+
+
+
src="//img.new-combats.tech/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
+
+
+
+
+
+
+
@@ -59,7 +59,7 @@ if($u->room['file']=='nc/zv1') testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/fe/zv2.php b/modules_data/location/fe/zv2.php index af217579..63d71b7b 100644 --- a/modules_data/location/fe/zv2.php +++ b/modules_data/location/fe/zv2.php @@ -21,16 +21,16 @@ if($u->room['file']=='nc/zv2')
-
-
-
src="https://img.new-combats.com/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
-
-
-
-
-
-
-
+
+
+
src="//img.new-combats.tech/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
+
+
+
+
+
+
+
@@ -59,7 +59,7 @@ if($u->room['file']=='nc/zv2') testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/fe/zv3.php b/modules_data/location/fe/zv3.php index c84b2bf9..bc350883 100644 --- a/modules_data/location/fe/zv3.php +++ b/modules_data/location/fe/zv3.php @@ -21,16 +21,16 @@ if($u->room['file']=='nc/zv3') - + diff --git a/modules_data/location/magportal.php b/modules_data/location/magportal.php index e9c213ec..f21e155b 100644 --- a/modules_data/location/magportal.php +++ b/modules_data/location/magportal.php @@ -38,7 +38,7 @@ if( $u->room['file'] == 'magportal' ) { @@ -289,7 +289,7 @@ body - + @@ -700,8 +700,8 @@ jQuery.expr[":"].contains = function (elem, i, match, array){ return (elem.textC var sd4 = "info['id'];?>"; - -
+ +
-
-
-
src="https://img.new-combats.com/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
-
-
-
-
-
-
-
+
+
+
src="//img.new-combats.tech/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
+
+
+
+
+
+
+
@@ -59,7 +59,7 @@ if($u->room['file']=='nc/zv3') testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/fe/zv4.php b/modules_data/location/fe/zv4.php index d9f44c57..915cbcd8 100644 --- a/modules_data/location/fe/zv4.php +++ b/modules_data/location/fe/zv4.php @@ -21,16 +21,16 @@ if($u->room['file']=='nc/zv4') - + @@ -266,11 +266,11 @@ if($u->room['file']=='flower') $flowerAdd = ''; //выставленные ингридиенты $sp = mysql_query('SELECT `u`.*,`m`.`name`,`m`.`type`,`m`.`img` FROM `items_users` AS `u` LEFT JOIN `items_main` AS `m` ON `u`.`item_id` = `m`.`id` WHERE `u`.`uid` = "'.$u->info['id'].'" AND `u`.`inShop` = "'.$sid.'" AND `u`.`delete` = "0" AND `u`.`data` LIKE "%fshop=1%"'); while($pl = mysql_fetch_array($sp)) { - $flowerAdd .= '

 
'; + $flowerAdd .= '

 
'; } $sp = mysql_query('SELECT `u`.*,`m`.`name`,`m`.`type`,`m`.`img` FROM `items_users` AS `u` LEFT JOIN `items_main` AS `m` ON `u`.`item_id` = `m`.`id` WHERE `u`.`uid` = "'.$u->info['id'].'" AND `u`.`inShop` = "'.$sid.'" AND `u`.`delete` = "0" AND `u`.`data` LIKE "%fshop=2%"'); while($pl = mysql_fetch_array($sp)) { - $itemsAdd .= '

 
'; + $itemsAdd .= '

 
'; } ?>
-
-
-
src="https://img.new-combats.com/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
-
-
-
-
-
-
-
+
+
+
src="//img.new-combats.tech/i/images/300x225/map_bk.gif" width="120" height="35" title="" class="aFilter" />
+
+
+
+
+
+
+
@@ -59,7 +59,7 @@ if($u->room['file']=='nc/zv4') testHome(); if(!isset($hgo['id'])){ ?> - +
diff --git a/modules_data/location/flower.php b/modules_data/location/flower.php index 67b28ad4..a6ee39a7 100644 --- a/modules_data/location/flower.php +++ b/modules_data/location/flower.php @@ -223,10 +223,10 @@ if($u->room['file']=='flower') $itm = mysql_fetch_array($itm); if(isset($itm) && $itm['type']!='62' ){ $is2.='
'; $itm['srok'] = ($itm['srok']/60/60/24); - $is2.=''.$itm['name'].'
+ $is2.=''.$itm['name'].'
(Масса: 0.01)
Цена: '.$itm['price1'].' кр.
Долговечность: 0/'.$itm['iznosMAXi'].'
@@ -236,13 +236,13 @@ if($u->room['file']=='flower') $treb = explode(',', $pl['itm_1']); foreach($treb as $tr){ $itm_treb = mysql_fetch_array(mysql_query('SELECT id, name, img, srok, price1,iznosMAXi FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($tr).'"')); - $is2.=''; + $is2.=''; } $treb = explode(',', $pl['itm_2']); foreach($treb as $tr){ if( isset($tr) && $tr!=''){ $itm_treb = mysql_fetch_array(mysql_query('SELECT id, name, img, srok, price1,iznosMAXi FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($tr).'"')); - $is2.=''; + $is2.=''; } } $is2.='
@@ -322,7 +322,7 @@ if($u->room['file']=='flower') - + - + diff --git a/modules_data/location/loto2.php b/modules_data/location/loto2.php index ffb7193c..94c07cb2 100644 --- a/modules_data/location/loto2.php +++ b/modules_data/location/loto2.php @@ -38,152 +38,152 @@ if($u->room['file']=='loto2') - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - +
- +
Страшилкина улица
diff --git a/modules_data/location/griboed.php b/modules_data/location/griboed.php index 3a3a33fa..5435f7a6 100644 --- a/modules_data/location/griboed.php +++ b/modules_data/location/griboed.php @@ -286,7 +286,7 @@ if(isset($file) && $file[0]=='griboed.php') 		- +
Вернуться назад
diff --git a/modules_data/location/house_belaun.php b/modules_data/location/house_belaun.php index 0265bba0..25ab9cae 100644 --- a/modules_data/location/house_belaun.php +++ b/modules_data/location/house_belaun.php @@ -116,7 +116,7 @@ if( $u->room['file'] == 'house_belaun' ) { display: table; } .select.in .arrow { - background-image: url('https://img.new-combats.com/i/select-arrow-up.png'); + background-image: url('//img.new-combats.tech/i/select-arrow-up.png'); } .selected .opt1 { @@ -169,12 +169,12 @@ if( $u->room['file'] == 'house_belaun' ) { vertical-align: middle; transition:all 0.3s ease; cursor: pointer; - background-image: url('https://img.new-combats.com/i/select-arrow-down.png'); + background-image: url('//img.new-combats.tech/i/select-arrow-down.png'); background-repeat: no-repeat; background-position: center; } .selected .key:hover { - background-image: url('https://img.new-combats.com/i/key-hover.gif'); + background-image: url('//img.new-combats.tech/i/key-hover.gif'); } .selected .key { border-left: 1px solid #a6a6a6; @@ -186,7 +186,7 @@ if( $u->room['file'] == 'house_belaun' ) { vertical-align: middle; transition:all 0.2s ease; cursor: pointer; - background-image: url('https://img.new-combats.com/i/key.gif'); + background-image: url('//img.new-combats.tech/i/key.gif'); background-repeat: no-repeat; background-position: center; } @@ -274,12 +274,12 @@ if( $u->room['file'] == 'house_belaun' ) { $dungeonGroupList .= '
'; if( $u->info['dn'] == 0 ) $dungeonGroupList .= ''; $dungeonGroupList .= ''.date('H:i',$pl['time']).' '; - $dungeonGroupList .= ' '; + $dungeonGroupList .= ' '; $pus = ''; //группа $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while( $pu = mysql_fetch_array( $su ) ) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim( $pus, ', ' ); @@ -324,8 +324,8 @@ if( $u->room['file'] == 'house_belaun' ) {
-
Пещера Тысячи Проклятий
-
Пещера Тысячи Проклятий
Бездна
Катакомбы
+
Пещера Тысячи Проклятий
+
Пещера Тысячи Проклятий
Бездна
Катакомбы
@@ -810,12 +810,12 @@ while( $pl = mysql_fetch_array( $sp ) ){ if( $u->info['dn'] == 0 ) $dungeonGroupList .= ''; $dungeonGroupList .= ''.date('H:i',$pl['time']).' '; - $dungeonGroupList .= ' '; + $dungeonGroupList .= ' '; $pus = ''; //группа $su = mysql_query('SELECT `u`.`id`,`u`.`login`,`u`.`level`,`u`.`align`,`u`.`clan`,`st`.`dn`,`u`.`city`,`u`.`room` FROM `stats` AS `st` LEFT JOIN `users` AS `u` ON (`st`.`id` = `u`.`id`) WHERE `st`.`dn`="'.$pl['id'].'" LIMIT '.($pl['team_max']+1).''); while( $pu = mysql_fetch_array( $su ) ) { - $pus .= ''.$pu['login'].' ['.$pu['level'].']'; + $pus .= ''.$pu['login'].' ['.$pu['level'].']'; $pus .= ', '; } $pus = trim( $pus, ', ' ); @@ -854,7 +854,7 @@ while( $pl = mysql_fetch_array( $sp ) ){ @@ -878,7 +878,7 @@ body {
- + - + questCheckEnd($pq)==1 ) $qsee2 = ''; else $qsee2 = ''; $qsee .= ' - + '.$pq['name'].'
'.$pq['info'].'
'.$q->info($pq).''.$qsee2.'

'; @@ -1306,32 +1306,32 @@ onclick="if (confirm('Сдать все чеки ( шт.) наход Выберите пещеру:

(Ведутся работы)





diff --git a/modules_data/location/hram.php b/modules_data/location/hram.php index 8e5b8338..2134924f 100644 --- a/modules_data/location/hram.php +++ b/modules_data/location/hram.php @@ -80,7 +80,7 @@ if($u->room['file']=='hram') @@ -142,7 +142,7 @@ if($u->room['file']=='hram') diff --git a/modules_data/location/hramrep.php b/modules_data/location/hramrep.php index b7654b06..6cd2f1bf 100644 --- a/modules_data/location/hramrep.php +++ b/modules_data/location/hramrep.php @@ -84,7 +84,7 @@ if($u->room['file']=='hramrep') @@ -149,7 +149,7 @@ if($u->room['file']=='hramrep') diff --git a/modules_data/location/hrump_shop.php b/modules_data/location/hrump_shop.php index 69a3b973..ba6d1899 100644 --- a/modules_data/location/hrump_shop.php +++ b/modules_data/location/hrump_shop.php @@ -139,7 +139,7 @@ if(isset($file) && $file[0]=='hrump_shop.php') diff --git a/modules_data/location/katok.php b/modules_data/location/katok.php index 1c0fc409..8ae4e332 100644 --- a/modules_data/location/katok.php +++ b/modules_data/location/katok.php @@ -164,7 +164,7 @@ if($tcount >= 6 ) { @@ -213,7 +213,7 @@ body { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - +
Рыцарский магазин
- +
Центральная площадь
- info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> + info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?>
- +
Большая торговая улица
- info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> + info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?>
- +
Вернуться назад
diff --git a/modules_data/location/izlom2.php b/modules_data/location/izlom2.php index ab3ac104..d28c222c 100644 --- a/modules_data/location/izlom2.php +++ b/modules_data/location/izlom2.php @@ -113,7 +113,7 @@ if (empty($text)) { bgcolor="#DEDEDE">
room['file']=='izlomshop') - +
Излом Хаоса
diff --git a/modules_data/location/karcer.php b/modules_data/location/karcer.php index 82d075d4..8adbfa66 100644 --- a/modules_data/location/karcer.php +++ b/modules_data/location/karcer.php @@ -137,7 +137,7 @@ if($u->room['file']=='karcer')
- +
Выйти из карцера
diff --git a/modules_data/location/kareta.php b/modules_data/location/kareta.php index 6e09796a..6a2a1081 100644 --- a/modules_data/location/kareta.php +++ b/modules_data/location/kareta.php @@ -193,18 +193,18 @@ if($u->room['file']=='kareta') } ?> - + - +

 

- + - +
- +
Выход с катка
diff --git a/modules_data/location/kinght.php b/modules_data/location/kinght.php index c930ff90..6215dea3 100644 --- a/modules_data/location/kinght.php +++ b/modules_data/location/kinght.php @@ -25,20 +25,20 @@ if($u->room['file']=='kinght')
-
+
-
+
-
-
-
onclick="location='main.php?loc=1.180.0.220';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_2stair.gif" width="120" height="35" class="aFilter" />
+
+
+
onclick="location='main.php?loc=1.180.0.220';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_2stair.gif" width="120" height="35" class="aFilter" />
-
+
-
-
onclick="location='main.php?loc=1.180.0.XX';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_sec7.gif" width="123" height="39" class="aFilter" />
-
-
onclick="location='main.php?loc=1.180.0.223';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_sec4.gif" width="89" height="32" class="aFilter" />
+
+
onclick="location='main.php?loc=1.180.0.XX';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_sec7.gif" width="123" height="39" class="aFilter" />
+
+
onclick="location='main.php?loc=1.180.0.223';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_sec4.gif" width="89" height="32" class="aFilter" />
@@ -63,10 +63,10 @@ if($u->room['file']=='kinght')
- + testHome(); if(!isset($hgo['id'])){ ?> - +
Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
Администрация.
diff --git a/modules_data/location/komorka.php b/modules_data/location/komorka.php index 470e39a1..f428bdc0 100644 --- a/modules_data/location/komorka.php +++ b/modules_data/location/komorka.php @@ -139,7 +139,7 @@ if(isset($file) && $file[0]=='komorka.php') 		- +
Вернуться назад
diff --git a/modules_data/location/loto.php b/modules_data/location/loto.php index ff786d67..a6185521 100644 --- a/modules_data/location/loto.php +++ b/modules_data/location/loto.php @@ -52,152 +52,152 @@ $titm = mysql_fetch_array(mysql_query('SELECT * FROM `actions` WHERE `uid` = "'. 		Шанс выпадения
Зелье Каменной Стойкости Частое выпадение
Зелье Стража Магии Частое выпадение
Топливо для Големов Частое выпадение
Смазка для Големов Частое выпадение
Ускоритель для Големов Частое выпадение
Живая Вода Частое выпадение
Отвар Когтей ПГ Частое выпадение
Сушеный Мухомор Частое выпадение
Жёсткая Рыба Нормальное выпадение
Яблоко Раздора Нормальное выпадение
Бутерброд -The Best Friend- Нормальное выпадение
Амброзия Скучающих Владык Нормальное выпадение
Плохое Железо Нормальное выпадение
Нормальное Железо Нормальное выпадение
Хорошее Железо Нормальное выпадение
+ Защита от Нападения [30] Нормальное выпадение
Жетон Успеха Не частое выпадение
Амброзия подмастерья Владык Не частое выпадение
Сумка Копателя Катакомб Редкое выпадение
Сумка Копателя Горы Легиона Редкое выпадение
Сумка Копателя Бездны Редкое выпадение
Свиток Репутации Горы Легиона Редкое выпадение
Яйцо Дракона Очень редкое выпадение
Сумка Защиты Очень редкое выпадение
Свиток Репутации Потерянного Входа Очень редкое выпадение
Чек на 50 Еврокредитов Невероятно редкое выпадение
Чек на 100 Еврокредитов Невероятно редкое выпадение
Сумка Валлуара Великого Невероятно редкое выпадение
Улучшенная Сумка Короля Невероятно редкое выпадение
Туманная Сумка Невероятно редкое выпадение
@@ -210,36 +210,36 @@ $titm = mysql_fetch_array(mysql_query('SELECT * FROM `actions` WHERE `uid` = "'. var usedID = info['id'];?> var $arrLiImg = [ - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ' + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ' ] function shuffle (array) { @@ -296,7 +296,7 @@ $titm = mysql_fetch_array(mysql_query('SELECT * FROM `actions` WHERE `uid` = "'. $button.textContent = "Ожидание..." $button.disabled = true - var response = await fetch("https://new-combats.com/lotowork.php", { + var response = await fetch("/lotowork.php", { method: "POST", body: usedID }) @@ -518,13 +518,13 @@ $titm = mysql_fetch_array(mysql_query('SELECT * FROM `actions` WHERE `uid` = "'.
    Центральная площадь
    Платная Комната
    Шанс выпадения
    Зелье Каменной Стойкости Частое выпадение
    Зелье Стража Магии Частое выпадение
    Топливо для Големов Частое выпадение
    Смазка для Големов Частое выпадение
    Ускоритель для Големов Частое выпадение
    Живая Вода Частое выпадение
    Отвар Когтей ПГ Частое выпадение
    Сушеный Мухомор Частое выпадение
    Жёсткая Рыба Нормальное выпадение
    Яблоко Раздора Нормальное выпадение
    Бутерброд -The Best Friend- Нормальное выпадение
    Амброзия Скучающих Владык Нормальное выпадение
    Плохое Железо Нормальное выпадение
    Нормальное Железо Нормальное выпадение
    Хорошее Железо Нормальное выпадение
    + Защита от Нападения [30] Нормальное выпадение
    Жетон Успеха Не частое выпадение
    Амброзия подмастерья Владык Не частое выпадение
    Сумка Копателя Катакомб Редкое выпадение
    Сумка Копателя Горы Легиона Редкое выпадение
    Сумка Копателя Бездны Редкое выпадение
    Свиток Репутации Горы Легиона Редкое выпадение
    Яйцо Дракона Очень редкое выпадение
    Сумка Защиты Очень редкое выпадение
    Свиток Репутации Потерянного Входа Очень редкое выпадение
    Чек на 50 Еврокредитов Невероятно редкое выпадение
    Чек на 100 Еврокредитов Невероятно редкое выпадение
    Сумка Валлуара Великого Невероятно редкое выпадение
    Улучшенная Сумка Короля Невероятно редкое выпадение
    Туманная Сумка Невероятно редкое выпадение
    @@ -201,7 +201,7 @@ if($u->room['file']=='loto2') run() async function run () { - var response = await fetch("https://new-combats.com/lotoworkekr.php", { + var response = await fetch("/lotoworkekr.php", { method: "POST", body: "ekr" }) @@ -210,36 +210,36 @@ if($u->room['file']=='loto2') } var $arrLiImg = [ - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ', - '
    • ' + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ', + '
    • ' ] function shuffle (array) { @@ -302,7 +302,7 @@ if($u->room['file']=='loto2') }) - var response = await fetch("https://new-combats.com/lotoworkekr.php", { + var response = await fetch("/lotoworkekr.php", { method: "POST", body: usedID }) @@ -524,7 +524,7 @@ if($u->room['file']=='loto2')
    Бесплатное Лото
    - +
    -
    -
    src="https://img.new-combats.com/i/images/subimages/map_zal2.gif" id="mo_1.180.0.0" width="175" height="37" />
    -
    -
    src="https://img.new-combats.com/i/images/subimages/map_zal1.gif" width="88" height="15" class="aFilter" id="mo_1.180.0.2" />
    -
    +
    +
    src="//img.new-combats.tech/i/images/subimages/map_zal2.gif" id="mo_1.180.0.0" width="175" height="37" />
    +
    +
    src="//img.new-combats.tech/i/images/subimages/map_zal1.gif" width="88" height="15" class="aFilter" id="mo_1.180.0.2" />
    +
    diff --git a/modules_data/location/poklon.php b/modules_data/location/poklon.php index 47c2ed0c..f58a219d 100644 --- a/modules_data/location/poklon.php +++ b/modules_data/location/poklon.php @@ -27,23 +27,23 @@ if($u->room['file']=='poklon') {
    -
    +
    - + Памятник Справедливости - + Памятник Милосердию - + Памятник Падальщика
    - + Парковая улица
    -
    src="https://img.new-combats.com/city/cap_160_stat2d.gif" width="48" height="94" title="" class="aFilter" />
    -
    src="https://img.new-combats.com/city/miloserdie.gif" width="77" height="165" title="" class="aFilter" />
    -
    src="https://img.new-combats.com/city/spravedlivost.gif" width="127" height="170" title="" class="aFilter" />
    -
    src="https://img.new-combats.com/city/arr_right_png2.png" width="38" height="55" title="" class="aFilter" />
    +
    src="//img.new-combats.tech/city/cap_160_stat2d.gif" width="48" height="94" title="" class="aFilter" />
    +
    src="//img.new-combats.tech/city/miloserdie.gif" width="77" height="165" title="" class="aFilter" />
    +
    src="//img.new-combats.tech/city/spravedlivost.gif" width="127" height="170" title="" class="aFilter" />
    +
    src="//img.new-combats.tech/city/arr_right_png2.png" width="38" height="55" title="" class="aFilter" />
    diff --git a/modules_data/location/post.php b/modules_data/location/post.php index 0dd3d4dc..d5793890 100644 --- a/modules_data/location/post.php +++ b/modules_data/location/post.php @@ -442,7 +442,7 @@ if ($r == 1) { info['invBlock'] == 0) { echo $itmAllSee; } else { - echo '
    Рюкзак закрыт.
    Введите пароль:
    '; + echo '
    Рюкзак закрыт.
    Введите пароль:
    '; } ?>
    info['invBlock'] == 0) { echo $itmAllSee; } else { - echo '
    Рюкзак закрыт.
    Введите пароль:
    '; + echo '
    Рюкзак закрыт.
    Введите пароль:
    '; } ?>
    - @@ -757,7 +757,7 @@ if ($r == 1) { ?>
    - room['file']=='remont') ?>
    @@ -1064,7 +1064,7 @@ if($u->room['file']=='remont') } echo $html; ?>

    Тип работ:
    -
    +

    @@ -1101,7 +1101,7 @@ if($u->room['file']=='remont')
    		- +
    Центральная Площадь
    diff --git a/modules_data/location/ric_zv.php b/modules_data/location/ric_zv.php index 178accf4..861f90f4 100644 --- a/modules_data/location/ric_zv.php +++ b/modules_data/location/ric_zv.php @@ -7,7 +7,7 @@ if(!defined('GAME')) if($u->room['file']=='ric_zv') { ?> - +
    @@ -26,19 +26,19 @@ if($u->room['file']=='ric_zv') error; ?> -
    - - - - - - - - - +
    + + + + + + + + + room['id']==224) { - ?>
    + ?>
    @@ -64,10 +64,10 @@ if($u->room['file']=='ric_zv')
    - + testHome(); if(!isset($hgo['id'])){ ?> - +
    Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
    Администрация.
    diff --git a/modules_data/location/room_hostel.php b/modules_data/location/room_hostel.php index 6f259501..943afe0e 100644 --- a/modules_data/location/room_hostel.php +++ b/modules_data/location/room_hostel.php @@ -257,10 +257,10 @@ function hostel($id){ $content = '
    Койка в общежитии
    Цена: 1 кр. + 1 кр. в неделю.

    • Размер сундука: 25 вещей
    • Сувениры: 50 шт.
    • Койка

    Арендовать'.$azuby[0].'
    Койка с тумбочкой
    Цена: 3 кр. + 3 кр. в неделю.

    • Размер сундука: 40 вещей
    • Сувениры: 150 шт.
    • Койка

    Арендовать'.$azuby[1].'
    Койка со шкафом
    Цена: 10 кр. + 10 кр. в неделю.

    • Размер сундука: 70 вещей
    • Сувениры: 200 шт.
    • Койка

    Арендовать'.$azuby[2].'
    '; } else { # текущее состояние аренды $content = "Вы арендовали «".$hostel_option[$hostel['type']]['t_name']."» ".$hostel_option[$hostel['type']]['stage']."
    Начало аренды: ".date('d.m.y H:i',$hostel['starttime'])."
    Оплачено до: ".date("d.m.y H:i",$hostel['endtime']).' (баланс '.$hostel['balance'].' кр.)'." - ',0, '')\" style=\"cursor:pointer\">"; + ',0, '')\" style=\"cursor:pointer\">"; if( $u->info['level'] < 8 ) { - $content .= "   Оплатить за зубы (Цена в неделю: ".$u->zuby($hostel['weekcost']*5,1)."): ',0, '')\" style=\"cursor:pointer\">"; + $content .= "   Оплатить за зубы (Цена в неделю: ".$u->zuby($hostel['weekcost']*5,1)."): ',0, '')\" style=\"cursor:pointer\">"; } $content .= "
    Цена в неделю: ".$hostel['weekcost']." кр.
     • Размер сундука: ".$hostel_option[$hostel['type']]['tariff']['items']." вещей
     • Сувениры: ".$hostel_option[$hostel['type']]['tariff']['souvenirs']." шт.
    ".($hostel_option[$hostel['type']]['tariff']['animal']>0 ? ' • Мест для животных: '.$hostel_option[$hostel['type']]['tariff']['animal'].'
    ' : '' )."  • Койка

    info['id']."\" onClick=\"return confirm('Вы уверены, что хотите прекратить аренду?')\">Прекратить аренду
    При отмене аренды, все вещи из сундука переносятся в ваш инвентарь.
    Ваши животные передаются вам. Если у вас уже есть другое животное, то выпускаются на волю.
    Остаток средств не возвращается.
    Если вы должны оплатить аренду, то ваш долг удваивается и вы не сможете воспользоваться арендой, пока не оплатите долг.

    info['id']."\">Сменить аренду"; @@ -325,7 +325,7 @@ function partition($pid){ Поиск:

    @@ -342,7 +342,7 @@ function partition($pid){ Поиск:
    - +
    @@ -373,23 +373,23 @@ function partition($pid){     		"; if( $cage1['pet_in_cage'] == 1 ) { - $content .= ''; + $content .= ''; } else { - $content .= ''; + $content .= ''; } if( $cage2['pet_in_cage'] == 2 ) { - $content .= ''; + $content .= ''; } else { - $content .= ''; + $content .= ''; } $content .= "
    '.$cage1['name'].' ['.$cage1['level'].']
    '.$cage1['name'].' ['.$cage1['level'].']
    свободно

    свободно

    '.$cage2['name'].' ['.$cage2['level'].']
    '.$cage2['name'].' ['.$cage2['level'].']
    свободно

    свободно

    		   "; if(!$pet) { - $content .= '
    свободно
    '; + $content .= '
    свободно
    '; } else { - $content .= '
    '.$pet['name'].' ['.$pet['level'].']
    '; + $content .= '
    '.$pet['name'].' ['.$pet['level'].']
    '; } $content .= "
    '; } diff --git a/modules_data/location/room_xot.php b/modules_data/location/room_xot.php index 3eb23ed4..e36eb638 100644 --- a/modules_data/location/room_xot.php +++ b/modules_data/location/room_xot.php @@ -27,7 +27,7 @@ if($u->room['file']=='room_xot') {
    @@ -732,7 +732,7 @@ var sd4 = "info['id'];?>"; foreach($roomGo as $val) { $temp = $u->roomInfo($val, true); if( isset($temp['id']) ){ // Перемещение по комнатам. - echo '
    '.''.''.$temp['name'].'
    -
    +
    diff --git a/modules_data/location/ruine.php b/modules_data/location/ruine.php index 4b9bd766..fe96f85a 100644 --- a/modules_data/location/ruine.php +++ b/modules_data/location/ruine.php @@ -109,7 +109,7 @@ if($u->room['file']=='ruine') { ?> @@ -157,15 +157,15 @@ function ruin_exit() { } $hpmp = '
    '.floor($plst['hpNow']).'/'.$plst['hpAll'].'
    -
    -
    -
    +
    +
    +
    '; if( $plst['mpAll'] >= 1 ) { $hpmp .= '
    '.floor($plst['mpNow']).'/'.$plst['mpAll'].'
    -
    -
    +
    +
    '; } @@ -190,15 +190,15 @@ function ruin_exit() { } $hpmp = '
    '.floor($plst['hpNow']).'/'.$plst['hpAll'].'
    -
    -
    -
    +
    +
    +
    '; if( $plst['mpAll'] >= 1 ) { $hpmp .= '
    '.floor($plst['mpNow']).'/'.$plst['mpAll'].'
    -
    -
    +
    +
    '; } @@ -212,8 +212,8 @@ function ruin_exit() { ?>
    diff --git a/modules_data/location/ruine_enter.php b/modules_data/location/ruine_enter.php index c3ce08d1..06e76549 100644 --- a/modules_data/location/ruine_enter.php +++ b/modules_data/location/ruine_enter.php @@ -70,7 +70,7 @@ if($u->room['file']=='ruine_enter') { diff --git a/modules_data/location/secret.php b/modules_data/location/secret.php index 911e0cae..e56a3c33 100644 --- a/modules_data/location/secret.php +++ b/modules_data/location/secret.php @@ -26,7 +26,7 @@ if($u->room['file']=='secret') diff --git a/modules_data/location/shop2_.php b/modules_data/location/shop2_.php index c081d472..cd4f2eca 100644 --- a/modules_data/location/shop2_.php +++ b/modules_data/location/shop2_.php @@ -292,7 +292,7 @@ if($u->room['file']=='shop2_')
    - - + + Логи турнира
    - +
    Большая парковая улица
    @@ -194,15 +194,15 @@ if($u->room['file']=='ruine_enter') { $rz = mysql_fetch_array(mysql_query('SELECT * FROM `ruine_zv` WHERE `uid` = "'.$u->info['id'].'" LIMIT 1')); echo 'Группа с хаотичным распределением. Набрано '.$i.'/'.$loc_c['users'].' чел. '; if( isset($rz['id']) ) { - echo ''; + echo ''; }else{ - echo ''; + echo ''; } ?>     		- - + +
    - +
    Бойцовский клуб
    		- +
    Государственный магазин
    diff --git a/modules_data/location/shop_.php b/modules_data/location/shop_.php index 5235bc4e..ab7c463e 100644 --- a/modules_data/location/shop_.php +++ b/modules_data/location/shop_.php @@ -58,7 +58,7 @@ if(isset($_POST['itemgift'])) //От клана $cln = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id` = "'.$u->info['clan'].'" LIMIT 1')); if(isset($cln['id'])) { - $giftlogin = 'клана '.$cln['name'].''; + $giftlogin = 'клана '.$cln['name'].''; } } @@ -133,7 +133,7 @@ if(isset($_POST['itemgift'])) //От клана $cln = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id` = "'.$u->info['clan'].'" LIMIT 1')); if(isset($cln['id'])) { - $giftlogin = 'клана '.$cln['name'].''; + $giftlogin = 'клана '.$cln['name'].''; } } $items = $u->lookStats($itm['data']); @@ -519,12 +519,12 @@ Hint3Name=''; while( $pl = mysql_fetch_array($sp) ) { $itmg2 = '
    '. // - '
    '. + '
    '. ''. // '    		'. // - ''.$pl['name'].'   (Масса: 1)
    Долговечность: 0/1
    '. + ''.$pl['name'].'   (Масса: 1)
    Долговечность: 0/1
    '. 'Описание:
    Это именной подарок, его можете подарить только Вы.
    Сделано в Capital city    '. // '
    '; @@ -577,11 +577,11 @@ Hint3Name='';     		- + - +
    Центральная Площадь
    Подпольная лавка
    diff --git a/modules_data/location/shop_kat.php b/modules_data/location/shop_kat.php index 64c92b1b..44821525 100644 --- a/modules_data/location/shop_kat.php +++ b/modules_data/location/shop_kat.php @@ -284,7 +284,7 @@ if(isset($file) && $file[0]=='shop_kat.php')     		- +
    Вернуться назад
    diff --git a/modules_data/location/shop_priz.php b/modules_data/location/shop_priz.php index af0ebcb9..04fb4d78 100644 --- a/modules_data/location/shop_priz.php +++ b/modules_data/location/shop_priz.php @@ -221,12 +221,12 @@ if($u->room['file']=='shop_priz') while( $pl = mysql_fetch_array($sp) ) { $itmg2 = '
    '. // - '
    '. + '
    '. ''. // '    		'. // - ''.$pl['name'].'   (Масса: 1)
    Долговечность: 0/1
    '. + ''.$pl['name'].'   (Масса: 1)
    Долговечность: 0/1
    '. 'Описание:
    Это именной подарок, его можете подарить только Вы.
    Сделано в Capital city    '. // '
    '; @@ -279,11 +279,11 @@ if($u->room['file']=='shop_priz')     		- + - + ?>
    Большая Парковая Улица
    Подпольная лавка
    diff --git a/modules_data/location/spavedlivost.php b/modules_data/location/spavedlivost.php index 2fa3554f..92c55046 100644 --- a/modules_data/location/spavedlivost.php +++ b/modules_data/location/spavedlivost.php @@ -65,7 +65,7 @@ elseif($_GET['get']=='10' && $is_eff[0]>0){ ?> - + @@ -116,7 +116,7 @@ elseif($_GET['get']=='10' && $is_eff[0]>0){ while($i < count($arr)) { $itm = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($arr[$i]).'" LIMIT 1')); if(isset($itm['id'])) { - $items .= '   '; + $items .= '   '; } $i++; } @@ -129,7 +129,7 @@ elseif($_GET['get']=='10' && $is_eff[0]>0){ }*/ ?> -
    +

    		- +
      diff --git a/modules_data/location/taverna.php b/modules_data/location/taverna.php index 0b953d09..4184c96b 100644 --- a/modules_data/location/taverna.php +++ b/modules_data/location/taverna.php @@ -139,11 +139,11 @@ if($u->room['file'] == 'taverna') - + - +
    Рыцарский зал
    Торговый зал
    diff --git a/modules_data/location/test/cp.php b/modules_data/location/test/cp.php index ec72aeb6..d6a7929f 100644 --- a/modules_data/location/test/cp.php +++ b/modules_data/location/test/cp.php @@ -39,11 +39,11 @@ if($u->room['file']=='nc/cp')
    - +
      - Форум   + Форум  
    -
    />
    - -
    />
    - -
    />
    + +
    />
    +
    />
    +
    />
    @@ -72,15 +70,13 @@ if($u->room['file']=='nc/cp')
    «» приветствует Вас, info['login']; ?>.
    		 - -
    testHome(); if(!isset($hgo['id'])){ ?> - +
    diff --git a/modules_data/location/torg.php b/modules_data/location/torg.php index 9772cd78..e2a04a7c 100644 --- a/modules_data/location/torg.php +++ b/modules_data/location/torg.php @@ -25,20 +25,20 @@ if($u->room['file']=='torg')
    -
    +
    -
    onclick="location='main.php?loc=1.180.0.222';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_sec3.gif" width="101" height="37" class="aFilter" />
    +
    onclick="location='main.php?loc=1.180.0.222';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_sec3.gif" width="101" height="37" class="aFilter" />
    -
    -
    -
    onclick="location='main.php?loc=1.180.0.220';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_2stair.gif" width="120" height="35" class="aFilter" />
    +
    +
    +
    onclick="location='main.php?loc=1.180.0.220';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_2stair.gif" width="120" height="35" class="aFilter" />
    -
    +
    -
    -
    -
    -
    onclick="location='main.php?loc=1.180.0.223';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="https://img.new-combats.com/i/images/300x225/map_sec4.gif" width="89" height="32" class="aFilter" />
    +
    +
    +
    +
    onclick="location='main.php?loc=1.180.0.223';" onmouseover="this.className='aFilterhover';" onmouseout="this.className='aFilter';" src="//img.new-combats.tech/i/images/300x225/map_sec4.gif" width="89" height="32" class="aFilter" />
    @@ -63,10 +63,10 @@ if($u->room['file']=='torg')
    - + testHome(); if(!isset($hgo['id'])){ ?> - +
    Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
    Администрация.
    diff --git a/modules_data/location/trade_zv.php b/modules_data/location/trade_zv.php index 4b88f48b..d1193a59 100644 --- a/modules_data/location/trade_zv.php +++ b/modules_data/location/trade_zv.php @@ -7,7 +7,7 @@ if(!defined('GAME')) if($u->room['file']=='trade_zv') { ?> - +
    @@ -26,19 +26,19 @@ if($u->room['file']=='trade_zv') error; ?> -
    - - - - - - - - - +
    + + + + + + + + + room['id']==221) { - ?>
    + ?>
    @@ -64,10 +64,10 @@ if($u->room['file']=='trade_zv')
    - + testHome(); if(!isset($hgo['id'])){ ?> - +
    Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
    Администрация.
    diff --git a/modules_data/location/vokzal.php b/modules_data/location/vokzal.php index 0683d2f5..063ac4df 100644 --- a/modules_data/location/vokzal.php +++ b/modules_data/location/vokzal.php @@ -306,7 +306,7 @@ if($u->room['file']=='vokzal')     		- +
    Центральная Площадь
    diff --git a/modules_data/location/zalu.php b/modules_data/location/zalu.php index cc441dc4..0edcd414 100644 --- a/modules_data/location/zalu.php +++ b/modules_data/location/zalu.php @@ -22,17 +22,17 @@ if($u->room['file']=='zalu')
    - -
    -
    -
    onClick="location='main.php?loc=1.180.0.16';" src="https://img.new-combats.com/i/images/300x225/map_klub5-1.gif" width="123" height="30" class="aFilter" />
    + +
    +
    +
    onClick="location='main.php?loc=1.180.0.16';" src="//img.new-combats.tech/i/images/300x225/map_klub5-1.gif" width="123" height="30" class="aFilter" />
    -
    onClick="location='main.php?loc=1.180.0.376';" src="https://img.new-combats.com/i/images/300x225/map_zalu2.gif" width="122" height="31" class="aFilter" />
    -
    onClick="location='main.php?loc=1.180.0.375';" src="https://img.new-combats.com/i/images/300x225/map_zalu1.gif" width="122" height="31" class="aFilter" />
    +
    onClick="location='main.php?loc=1.180.0.376';" src="//img.new-combats.tech/i/images/300x225/map_zalu2.gif" width="122" height="31" class="aFilter" />
    +
    onClick="location='main.php?loc=1.180.0.375';" src="//img.new-combats.tech/i/images/300x225/map_zalu1.gif" width="122" height="31" class="aFilter" />
    -
    -
    -
    onClick="location='main.php?loc=1.180.0.3';" src="https://img.new-combats.com/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    +
    +
    +
    onClick="location='main.php?loc=1.180.0.3';" src="//img.new-combats.tech/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    @@ -59,7 +59,7 @@ if($u->room['file']=='zalu')
    testHome(); if(!isset($hgo['id'])){ ?> - +
    diff --git a/modules_data/location/zalu_pal.php b/modules_data/location/zalu_pal.php index 4a99facf..438d3020 100644 --- a/modules_data/location/zalu_pal.php +++ b/modules_data/location/zalu_pal.php @@ -22,17 +22,17 @@ if($u->room['file']=='zalu_pal')
    - -
    -
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    -
    + +
    +
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    +
    -
    onClick="location='main.php?loc=1.180.0.16';" src="https://img.new-combats.com/i/images/300x225/map_zalu2.gif" width="122" height="31" class="aFilter" />
    -
    onClick="location='main.php?loc=1.180.0.16';" src="https://img.new-combats.com/i/images/300x225/map_zalu1.gif" width="122" height="31" class="aFilter" />
    +
    onClick="location='main.php?loc=1.180.0.16';" src="//img.new-combats.tech/i/images/300x225/map_zalu2.gif" width="122" height="31" class="aFilter" />
    +
    onClick="location='main.php?loc=1.180.0.16';" src="//img.new-combats.tech/i/images/300x225/map_zalu1.gif" width="122" height="31" class="aFilter" />
    -
    onClick="location='main.php?loc=1.180.0.0';" width="76" height="18" class="aFilter" />
    -
    -
    onClick="location='main.php?loc=1.180.0.3';" src="https://img.new-combats.com/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    +
    onClick="location='main.php?loc=1.180.0.0';" width="76" height="18" class="aFilter" />
    +
    +
    onClick="location='main.php?loc=1.180.0.3';" src="//img.new-combats.tech/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    @@ -60,7 +60,7 @@ if($u->room['file']=='zalu_pal') testHome(); if(!isset($hgo['id'])){ ?> - +
    Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
    diff --git a/modules_data/location/zalu_pal2.php b/modules_data/location/zalu_pal2.php index 87a33cb3..db6d676f 100644 --- a/modules_data/location/zalu_pal2.php +++ b/modules_data/location/zalu_pal2.php @@ -22,13 +22,13 @@ if($u->room['file']=='zalu_pal2')
    - -
    -
    onClick="location='main.php?loc=1.180.0.16';" src="https://img.new-combats.com/i/images/300x225/map_demon3.gif" width="123" height="32" class="aFilter" />
    -
    -
    -
    -
    + +
    +
    onClick="location='main.php?loc=1.180.0.16';" src="//img.new-combats.tech/i/images/300x225/map_demon3.gif" width="123" height="32" class="aFilter" />
    +
    +
    +
    +
    @@ -55,7 +55,7 @@ if($u->room['file']=='zalu_pal2')
    testHome(); if(!isset($hgo['id'])){ ?> - +
    diff --git a/modules_data/location/zalu_pal3.php b/modules_data/location/zalu_pal3.php index 3f1b65c3..1bc85377 100644 --- a/modules_data/location/zalu_pal3.php +++ b/modules_data/location/zalu_pal3.php @@ -22,17 +22,17 @@ if($u->room['file']=='zalu_pal3')
    - -
    -
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    -
    + +
    +
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    +
    -
    -
    +
    +
    -
    -
    -
    onClick="location='main.php?loc=1.180.0.3';" src="https://img.new-combats.com/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    +
    +
    +
    onClick="location='main.php?loc=1.180.0.3';" src="//img.new-combats.tech/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    @@ -59,7 +59,7 @@ if($u->room['file']=='zalu_pal3')
    testHome(); if(!isset($hgo['id'])){ ?> - +
    diff --git a/modules_data/location/zalu_pal4.php b/modules_data/location/zalu_pal4.php index ad846ad1..af2ebbff 100644 --- a/modules_data/location/zalu_pal4.php +++ b/modules_data/location/zalu_pal4.php @@ -22,17 +22,17 @@ if($u->room['file']=='zalu_pal4')
    - -
    -
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    -
    + +
    +
    onClick="location='main.php?loc=1.180.0.16';" class="aFilter" width="120" height="35" />
    +
    -
    -
    +
    +
    -
    -
    -
    onClick="location='main.php?loc=1.180.0.3';" src="https://img.new-combats.com/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    +
    +
    +
    onClick="location='main.php?loc=1.180.0.3';" src="//img.new-combats.tech/i/images/300x225/map_zalu7.gif" width="100" height="35" class="aFilter" />
    @@ -59,7 +59,7 @@ if($u->room['file']=='zalu_pal4')
    testHome(); if(!isset($hgo['id'])){ ?> - +
    diff --git a/modules_data/location/znahar.php b/modules_data/location/znahar.php index ebf05406..08d153a0 100644 --- a/modules_data/location/znahar.php +++ b/modules_data/location/znahar.php @@ -413,7 +413,7 @@ function ghideshow() { top.fullhideshow(mmoves3); } - +
    Комната Знахаря
    error != '') {     		- +
    Бойцовский Клуб
    @@ -458,9 +458,9 @@ if($u->error != '') {
    - - - + + + - + - @@ -270,7 +270,7 @@ if (isset($_POST['name'], $_POST['hobby'], $_POST['ChatColor'], $_POST['saveanke diff --git a/sitemap.xml b/sitemap.xml index dde75864..f9674726 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,175 +1,175 @@ - https://new-combats.com/ + / 2022-05-22 weekly 1.0 - https://new-combats.com/n + /n 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/daily_quest.html + /news_script/lib/daily_quest.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/achivki.html + /news_script/lib/achivki.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/jori.html + /news_script/lib/jori.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/kredi.html + /news_script/lib/kredi.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/ekri.html + /news_script/lib/ekri.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/reliki.html + /news_script/lib/reliki.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/voinka.html + /news_script/lib/voinka.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/zveri.html + /news_script/lib/zveri.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/runi.html + /news_script/lib/runi.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/charki.html + /news_script/lib/charki.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/hz.html + /news_script/lib/hz.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/class_balance.html + /news_script/lib/class_balance.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/pisheri.html + /news_script/lib/pisheri.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/pisherniy_drop.html + /news_script/lib/pisherniy_drop.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/bonusi_statov.html + /news_script/lib/bonusi_statov.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/gs.html + /news_script/lib/gs.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/bs.html + /news_script/lib/bs.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/boevie_sumki.html + /news_script/lib/boevie_sumki.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/profilnie_ataki.html + /news_script/lib/profilnie_ataki.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/podava.html + /news_script/lib/podava.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/zouzom.html + /news_script/lib/zouzom.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/pmk.html + /news_script/lib/pmk.html 2022-05-22 daily 1.0 - https://new-combats.com/news_script/lib/svitki_zatochki.html + /news_script/lib/svitki_zatochki.html 2022-05-22 daily 1.0 - https://new-combats.com/register + /register 2022-05-22 daily 1.0 - https://new-combats.com/forum + /forum 2022-05-22 daily 1.0 - https://new-combats.com/rating_pers + /rating_pers 2022-05-22 daily 1.0 - https://new-combats.com/rating_clans + /rating_clans 2022-05-22 daily 1.0 diff --git a/social.php b/social.php index df79c65d..5a30b936 100644 --- a/social.php +++ b/social.php @@ -23,7 +23,7 @@ if(!isset($u->info['id'])) { $vk_config = array( 'app_id' => '5145826', 'api_secret' => 'V90yIzlgSglfgrnHw7Ny', - 'callback_url' => 'https://new-combats.com/social.php?vkconnect', + 'callback_url' => '/social.php?vkconnect', 'api_settings' => 'offline,friends,email' ); $vk = new VK\VK($vk_config['app_id'], $vk_config['api_secret']); diff --git a/spam.php b/spam.php index 3973c120..f8a6f244 100644 --- a/spam.php +++ b/spam.php @@ -31,7 +31,7 @@ if (!$u->info['admin']) { Редактирование фильтра от спама - + Список запрещенных слов\ссылок:   diff --git a/stats_bonus.php b/stats_bonus.php index 268ede40..615eba07 100644 --- a/stats_bonus.php +++ b/stats_bonus.php @@ -6,8 +6,8 @@ - - + + - + - + +
    Характеристики Пристрастия Прочее Характеристики Пристрастия Прочее
    +
    Комната Знахаря

    @@ -61,13 +61,13 @@ $vinos = array( - + - +
    Этаж 2
    Торговый Зал
    @@ -85,9 +85,9 @@ $vinos = array(
    - - - + + +
    Характеристики Пристрастия Прочее Характеристики Пристрастия Прочее
    - + - + -
    Обновить
    +
    Обновить

                          # Руинный турнир в Старом Замке

    		 +
    -     		- + @@ -173,8 +173,8 @@ if (isset($_POST['name'], $_POST['hobby'], $_POST['ChatColor'], $_POST['saveanke
    - +
    @@ -255,14 +255,14 @@ if (isset($_POST['name'], $_POST['hobby'], $_POST['ChatColor'], $_POST['saveanke
    @@ -240,13 +240,13 @@ if (isset($_POST['name'], $_POST['hobby'], $_POST['ChatColor'], $_POST['saveanke -
    -
    		-
    - +     		+
    +     		- +
      
      - +