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

Дозаливка

Browse Source
This commit is contained in:
Ivor Barhansky
2022-12-19 22:16:24 +02:00
parent a53eab9795
commit 73d69cb0ae
71 changed files with 397 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_incl_data/__config.php
+3 -1
View File
@@ -33,7 +33,9 @@ spl_autoload_register(function ($className) {
});
$code = '1';
$c = (new \Core\Config())->get();
\Core\Config::init();
$c = \Core\Config::get();
if (isset($_GET['version'])) {
die('Version: ' . $c['ver']);
}
_incl_data/autoload.php
+1
View File
@@ -5,6 +5,7 @@ const GAME_VERSION = 'alpha-7.4';
// ВНИМАНИЕ! Не введено в эксплуатацию!
require_once 'mysql_override.php';
require_once 'class/Insallah/Config.php';
spl_autoload_register(function (string $className) {
# 1 with namespaces
_incl_data/class/CalculateFromString.php
-63
View File
@@ -1,63 +0,0 @@
<?php
/** Ïîëó÷àåì íà âõîä ñòðîêó, à íà âûõîä ðåçóëüòàò ìàòåìàòè÷åñêîé îïåðàöèè â ñòðîêå. */
class CalculateFromString
{
const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';
const PARENTHESIS_DEPTH = 10;
public function calculate($input){
if(strpos($input, '+') != null || strpos($input, '-') != null || strpos($input, '/') != null || strpos($input, '*') != null){
// Remove white spaces and invalid math chars
$input = str_replace(',', '.', $input);
$input = str_replace(' ', '', $input);
$input = preg_replace('[^0-9\.\+\-\*\/\(\)]', '', $input);
// Calculate each of the parenthesis from the top
$i = 0;
while(strpos($input, '(') || strpos($input, ')')){
$input = preg_replace_callback('/\(([^\(\)]+)\)/', 'self::callback', $input);
$i++;
if($i > self::PARENTHESIS_DEPTH){
break;
}
}
// Calculate the result
if(preg_match(self::PATTERN, $input, $match)){
return $this->compute($match[0]);
}
// To handle the special case of expressions surrounded by global parenthesis like "(1+1)"
if(is_numeric($input)){
return $input;
}
return 0;
}
return $input;
}
private function compute($input){
$compute = create_function('', 'return '.$input.';');
return 0 + $compute();
}
private function callback($input){
if(is_numeric($input[1])){
return $input[1];
}
elseif(preg_match(self::PATTERN, $input[1], $match)){
return $this->compute($match[0]);
}
return 0;
}
}
$Cal = new CalculateFromString();
$xyz='(100 * 25000) + (250 * 25000) + ((500/100) * 25000)';
$result = $Cal->calculate($xyz);
echo $result;
_incl_data/class/Chat.php
+28
View File
File diff suppressed because one or more lines are too long
_incl_data/class/Insallah/Core/Db.php
-7
View File
@@ -118,7 +118,6 @@ class Db
* @param $query
* @param array $args
* @return mixed
* @throws Exception
*/
public static function getRow($query, $args = [])
{
@@ -129,7 +128,6 @@ class Db
* @param $query
* @param array $args
* @return array
* @throws Exception
*/
public static function getRows($query, $args = [])
{
@@ -140,7 +138,6 @@ class Db
* @param $query
* @param array $args
* @return mixed
* @throws Exception
*/
public static function getValue($query, $args = [])
{
@@ -155,16 +152,12 @@ class Db
* @param $query
* @param array $args
* @return array
* @throws Exception
*/
public static function getColumn($query, $args = [])
{
return self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN);
}
/**
* @throws Exception
*/
public static function sql($query, $args = [])
{
self::run($query, $args);
_incl_data/class/Uploader.php
+17 -14
View File
@@ -3,8 +3,8 @@
/**
* Åäèíàÿ ôóíêöèÿ äëÿ çàëèâêè ôàéëîâ íà ñåðâåð.
*
* @version 1
* @author Ivor Barhansky <me@lopar.space>
* @version 1
*/
class Uploader
@@ -16,15 +16,15 @@ class Uploader
private $extensions = 'jpg|png|jpeg|gif';
private $extMatches = [];
private $FILE;
private $cnm = null;
private $cnm;
public static $error;
public function __construct($name, $cnm = null)
{
$this->FILE = $_FILES;
if (!$this->FILE[$name]) {
if (!isset($_FILES[$name])) {
return;
}
$this->FILE = $_FILES[$name];
$this->cnm = $cnm;
}
@@ -56,7 +56,7 @@ class Uploader
*/
public function setMaxFileSize($megabytes)
{
$this->maxFileSizeMb = $megabytes * (1024 * 1024);
$this->maxFileSizeMb = $megabytes;
}
/**
@@ -65,7 +65,7 @@ class Uploader
*/
public function setSavePath($path)
{
$this->savePath = __DIR__ . '/' . $path;
$this->savePath = $_SERVER['DOCUMENT_ROOT'] . '/' . $path;
}
/**
@@ -99,17 +99,20 @@ class Uploader
private function hasNormalDimensions()
{
list($width, $height) = getimagesize($this->FILE['tmp_name']);
if (!$width || !$height) {
self::$error = 'Íå ïîäòÿíóëèñü ðàçìåðû ôàéëà.';
return false;
}
if (
$width < $this->width['min'] ||
$width > $this->width['max'] ||
$height < $this->height['min'] ||
$height > $this->height['max']
($width < $this->width['min'] || $width > $this->width['max']) ||
($height < $this->height['min'] || $height > $this->height['max'])
) {
self::$error = "Òðåáîâàíèÿ ê ðàçìåðó [{$this->width['max']}x{$this->height['max']}] íå ñîáëþäåíû.";
self::$error = 'Òðåáîâàíèÿ ê ðàçìåðó: ';
if ($this->width['min'] !== $this->width['max'] || $this->height['min'] !== $this->height['max']) {
self::$error .= " Ìèíèìóì [{$this->width['min']}x{$this->height['min']}].";
self::$error .= "îò [{$this->width['min']} x {$this->height['min']}] äî ";
}
self::$error .= " <span style='color:red;'>[{$width}x$height]</span>";
self::$error .= "[{$this->width['max']} x {$this->height['max']}].";
self::$error .= " Òåêóùèé ðàçìåð [$width x $height]";
return false;
}
return true;
@@ -120,7 +123,7 @@ class Uploader
if (!$this->maxFileSizeMb) {
$this->setMaxFileSize(2);
}
if ($this->FILE['size'] > $this->maxFileSizeMb || $this->FILE['size'] <=0) {
if ($this->FILE['size'] > $this->maxFileSizeMb * (1024 * 1024) || $this->FILE['size'] <= 0) {
self::$error = 'Íåâåðíûé ðàçìåð ôàéëà. Ìàêñèìàëüíûé ðàçìåð ôàéëà ' . $this->maxFileSizeMb . ' ÌÁ';
return false;
}
_incl_data/class/magic/__magic.php
+1 -1
View File
@@ -4,7 +4,7 @@ if(!defined('GAME'))
die();
}
class Magic2
class Magic
{
public $youuse = 0;
_incl_data/class/priem/121.php
+5 -1
View File
@@ -60,7 +60,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/122.php
+5 -1
View File
@@ -60,7 +60,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/123.php
+5 -1
View File
@@ -60,7 +60,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/124.php
+5 -1
View File
@@ -60,7 +60,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/21.php
+2
View File
@@ -59,9 +59,11 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
//$pvr['hp'] = $pvr['hp'][0];
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/22.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/23.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/243.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
/**@var $this Priems*/
/**@var $this priems*/
if(!defined('GAME')) {
die();
}
_incl_data/class/priem/244.php
+1
View File
@@ -108,4 +108,5 @@ if (
$this->mintr($pl);
}
unset($pvr);
?>
?>
_incl_data/class/priem/25.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Öåëü {ñòèõèÿ}
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
* @var $pl
*/
_incl_data/class/priem/252.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['mp'] = floor($pvr['mp']*$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['x']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['mpSee'] = '--';
$pvr['mpNow'] = floor($btl->stats[$btl->uids[$u1]]['mpNow']);
$pvr['mpAll'] = $btl->stats[$btl->uids[$u1]]['mpAll'];
_incl_data/class/priem/260.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
<?
if (!defined('GAME')) {
die();
@@ -16,7 +16,7 @@ if ($pvr['x5']['x'] > 0) {
$this->addEffPr($pl, $id);
$prv['color2'] = '0af';
$prv['text'] = $btl->addlt(1, 19, $btl->users[$btl->uids[$this->u->info['id']]]['sex'], null);
$prv['text'] = $btl->addlt(1, 19, $btl->users[$btl->uids[$u->info['id']]]['sex'], null);
$prv['text2'] = '{tm1} ' . $prv['text'];
$btl->priemAddLog($id, 1, 2, $u->info['id'], $this->ue['id'],
'<font color^^^^#' . $prv['color2'] . '>Ñòàòèêà</font>',
_incl_data/class/priem/261.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
/**
* Прием: Заряд: Поражение
* @var Battle $btl
* @var battleClass $btl
* @var $id
* @var $pl
*/
_incl_data/class/priem/27.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Öåëü {ñòèõèÿ}
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
* @var $pl
*/
_incl_data/class/priem/276.php
+2
View File
@@ -101,9 +101,11 @@ if( isset($pr_momental_this)) {
//
//
//$priem->addPriem($u1,278,'|add_yzm3=-'.($btl->users[$btl->uids[$u2]]['level']).'',2,77,2,$u2,100,'èíåéêàñàíèå',0,0,1);
$pvr['x55'] = mysql_fetch_array(mysql_query('SELECT `id`,`x` FROM `eff_users` WHERE `uid` = "'.$u1.'" AND `v2` = 25 AND `delete` = 0 LIMIT 1'));
if( $pvr['x55']['x'] <1 ) {
$priem->addPriem($u1,25,-1,2,77,-1,$u2,5,'öåëüâîäû',0,0,1);
//$priem->addPriem($u1,25,'|add_zm3=-20',2,77,-1,$u2,100,'öåëüâîäû',0,0,1);
if( $pvr['used'] == 0 ) {
$at['p'][$a]['atack'][$j]['yron']['plog'][] = '$this->priemAddLog( '.$id.', '.$b.', '.$a.', '.$u2.', '.$u1.',
"<font color^^^^#'.$prv['color2'].'>Öåëü Âîäû</font>",
_incl_data/class/priem/277.php
+2
View File
@@ -145,6 +145,8 @@ if( isset($pr_momental_this)) {
}*/
//}
//
//$priem->addPriem($u1,279,'|add_yzm3=-'.floor($btl->users[$btl->uids[$u2]]['level']*1.25).'',2,77,2,$u2,100,'číĺéęŕńŕíčĺ',0,0,1);
//$priem->addPriem($u1,278,'|add_yzm3=-'.($btl->users[$btl->uids[$u2]]['level']).'',2,77,2,$u2,100,'číĺéęŕńŕíčĺ',0,0,1);
$pvr['x5'] = mysql_fetch_array(mysql_query('SELECT `id`,`x` FROM `eff_users` WHERE `uid` = "'.$u1.'" AND `v2` = 25 AND `delete` = 0 LIMIT 1'));
if( $pvr['x5']['x'] < 5 ) {
$priem->addPriem($u1,25,'|add_zm3=-20',2,77,-1,$u2,100,'öåëüâîäû',0,0,1);
_incl_data/class/priem/28.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Öåëü {ñòèõèÿ}
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
* @var $pl
*/
_incl_data/class/priem/294.php
+24 -2
View File
@@ -39,12 +39,34 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
if( $pvr['hp'] < 1 ) {
$pvr['hp'] = 1;
}
//
/*
$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
$pvr['di'] = 0;
$pvr['dc'] = count($pvr['data']['atgm']);
$pvr['rd'] = 0;
$pvr['redata'] = '';
while( $pvr['di'] < 4 ) {
if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) {
if( $pvr['rd'] < 3 ) {
$pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])];
$pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata'];
$pvr['rd']++;
}
}
$pvr['di']++;
}
*/
//
$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata'];
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/295.php
+24 -2
View File
@@ -39,12 +39,34 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
if( $pvr['hp'] < 1 ) {
$pvr['hp'] = 1;
}
//
/*
$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
$pvr['di'] = 0;
$pvr['dc'] = count($pvr['data']['atgm']);
$pvr['rd'] = 0;
$pvr['redata'] = '';
while( $pvr['di'] < 4 ) {
if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) {
if( $pvr['rd'] < 3 ) {
$pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])];
$pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata'];
$pvr['rd']++;
}
}
$pvr['di']++;
}
*/
//
$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata'];
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/296.php
+24 -2
View File
@@ -39,12 +39,34 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
if( $pvr['hp'] < 1 ) {
$pvr['hp'] = 1;
}
//
/*
$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
$pvr['di'] = 0;
$pvr['dc'] = count($pvr['data']['atgm']);
$pvr['rd'] = 0;
$pvr['redata'] = '';
while( $pvr['di'] < 4 ) {
if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) {
if( $pvr['rd'] < 3 ) {
$pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])];
$pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata'];
$pvr['rd']++;
}
}
$pvr['di']++;
}
*/
//
$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata'];
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/300.php
+22 -2
View File
@@ -40,7 +40,23 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
//äåéñòâèÿ
$pvr['hp'] = rand(15,25);
/*//
$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
$pvr['di'] = 0;
$pvr['dc'] = count($pvr['data']['atgm']);
$pvr['rd'] = 0;
$pvr['redata'] = '';
while( $pvr['di'] < 4 ) {
if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) {
if( $pvr['rd'] < 3 ) {
$pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])];
$pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata'];
$pvr['rd']++;
}
}
$pvr['di']++;
}*/
//
$pvr['hp'] = rand(15,25);
if( $pvr['ijk'] == 1 ) {
$pvr['mgtype'] = 5;
@@ -85,7 +101,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/301.php
+22 -2
View File
@@ -41,12 +41,32 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];
/*//
$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
$pvr['di'] = 0;
$pvr['dc'] = count($pvr['data']['atgm']);
$pvr['rd'] = 0;
$pvr['redata'] = '';
while( $pvr['di'] < 4 ) {
if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) {
if( $pvr['rd'] < 3 ) {
$pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])];
$pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata'];
$pvr['rd']++;
}
}
$pvr['di']++;
}*/
//
$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata'];
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/33.php
+6 -3
View File
@@ -1,14 +1,17 @@
<?php
/** Ïðèåì: Ïîæèðàþùåå Ïëàìÿ [6]
* @var $this Priems
* @var $btl Battle
/**
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
if (!$id) {
exit();
}
/*
Ïðèåì: Ïîæèðàþùåå Ïëàìÿ [6]
*/
if (isset($pr_used_this) && isset($pr_moment)) {
//Êàæäûé õîä
_incl_data/class/priem/34.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Âñïûøêà [8]
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
*/
_incl_data/class/priem/42.php
+5 -1
View File
@@ -60,7 +60,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/56.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php
/**
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
_incl_data/class/priem/57.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php
/**
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
_incl_data/class/priem/58.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php
/**
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
_incl_data/class/priem/59.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php
/**
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
_incl_data/class/priem/60.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php
/**
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id int
* @var $pl array
*/
_incl_data/class/priem/67.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Âñïûøêà [9]
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
*/
_incl_data/class/priem/68.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Âñïûøêà [10]
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
*/
_incl_data/class/priem/69.php
+2 -2
View File
@@ -2,8 +2,8 @@
/**
* Ïðèåì: Âñïûøêà [11]
* @var $this Priems
* @var $btl Battle
* @var $this priems
* @var $btl battleClass
* @var $id
*/
_incl_data/class/priem/70.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/73.php
+1
View File
@@ -59,6 +59,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
_incl_data/class/priem/74.php
+1
View File
@@ -59,6 +59,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
_incl_data/class/priem/75.php
+1
View File
@@ -59,6 +59,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
_incl_data/class/priem/77.php
+1
View File
@@ -61,6 +61,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
_incl_data/class/priem/79.php
+1
View File
@@ -59,6 +59,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
//$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäà', 0 );
$pvr['promah_type'] = 0;
$pvr['promah'] = false;
$pvr['krit'] = false;
_incl_data/class/priem/81.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/82.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/83.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priem/84.php
+5 -1
View File
@@ -57,7 +57,11 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1');
//
$pvr['hp'] = floor($pvr['hp']);
/*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'âîäŕ', 0 );
$pvr['promah_type'] = $pvr['hp'][3];
$pvr['promah'] = $pvr['hp'][2];
$pvr['krit'] = $pvr['hp'][1];
$pvr['hp'] = $pvr['hp'][0];*/
$pvr['hpSee'] = '--';
$pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']);
$pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll'];
_incl_data/class/priems/curse_01.php
+46 -2
View File
@@ -1,8 +1,52 @@
<?php
<?
if( !defined('GAME') ) { die(); }
/*
Наложенное заклятие: Проклятье Древних
Зачарованный пояс имеет шанс временно понизить характиристики атаковавшего противника. Если противник бьет в пояс, 5% вероятности срабатывания проклятия.
Отнимает у противника 5 выносливости, 5 ловкости, 5 интуиции, 5 силы, 5 интеллекта на 5 разменов.
Шанс срабатывания: 5%
*/
*/
if($e['bm_a1']=='curse_01'){
if(rand(0,10000)<500){
//íàíîñèì óðîí ìàãè÷åñêèì êîëüöîì
//$hpmin = rand(5,10);
//$hpmin = $priem->testPower($this->stats[$this->uids[$uid1]],$this->stats[$this->uids[$uid2]],$hpmin,3,2);
//$hpmin = round($hpmin);
//if($hpmin < 0) { $hpmin = 0; }
//$hp2 = $this->stats[$this->uids[$uid2]]['hpNow'];
//
////ðàñ÷åò óðîíà ñòèõèé
//
//$hp2 -= $hpmin;
//if($hp2<0)
//{
// $hp2 = 0;
//}elseif($hp2>$this->stats[$this->uids[$uid2]]['hpNow'])
//{
// $hp2 = $this->stats[$this->uids[$uid2]]['hpNow'];
//}
//
//$this->takeExp($u->info['id'],$hpmin,$uid1,$uid2);
//
////îòíèìàåì ÍÐ
//$this->users[$this->uids[$uid2]]['hpNow'] = $hp2;
//$this->stats[$this->uids[$uid2]]['hpNow'] = $hp2;
//mysql_query('UPDATE `stats` SET `hpNow` = '.$hp2.' WHERE `id` = "'.$uid2.'" LIMIT 1');
//
////çàíîñèì â ëîã áîÿ
//$vLog = 'time1='.time().'||s1='.$this->users[$this->uids[$uid1]]['sex'].'||t1='.$this->users[$this->uids[$uid1]]['team'].'||login1='.$this->users[$this->uids[$uid1]]['login'].'||s2='.$this->users[$this->uids[$uid2]]['sex'].'||t2='.$this->users[$this->uids[$uid2]]['team'].'||login2='.$this->users[$this->uids[$uid2]]['login'].'';
//$mas1 = array('time'=>time(),'battle'=>$this->info['id'],'id_hod'=>($this->hodID),'text'=>'','vars'=>$vLog,'zona1'=>'','zonb1'=>'','zona2'=>'','zonb2'=>'','type'=>'1');
//if($hpmin>0)
//{
// $hpmin = '-'.$hpmin;
//}else{
// $hpmin = '--';
//}
//$mas1['text'] = '{tm1} {u2} ïîëó÷èë ïîâðåæäåíèå îò ìàãè÷åñêîãî ïðåäìåòà &quot;<b>'.$itm['name'].'</b>&quot;. <b title=Òèï&nbsp;óðîíà:&nbsp;õîëîä ><font color=#0000FF>'.$hpmin.'</font></b> ['.ceil($hp2).'/'.$this->stats[$this->uids[$uid2]]['hpAll'].']';
//$this->add_log($mas1);
}
}
?>
_incl_data/class/priems/itm286.end.php
+1
View File
@@ -12,6 +12,7 @@ if($e['bm_a1']=='itm286' && $end > 0)
//íàíîñèì óðîí ìàãè÷åñêèì êîëüöîì
$hpmin = rand(5,8);
$hpmin += round($this->stats[$this->uids[$uid1]]['mg1']*1.35);
//$hpmin = $priem->testPower($this->stats[$this->uids[$uid1]],$this->stats[$this->uids[$uid2]],$hpmin,1,2);
//
$hpmin = $priem->magatack($uid1,$uid2,$hpmin,'îãîíü',false);
$hpmin = $hpmin[0];
_incl_data/class/priems/itm347.end.php
+1
View File
@@ -12,6 +12,7 @@ if($e['bm_a1']=='itm347' && $end > 0)
//íàíîñèì óðîí ìàãè÷åñêèì êîëüöîì
$hpmin = rand(5,8);
$hpmin += round($this->stats[$this->uids[$uid1]]['mg1']*1.35);
//$hpmin = $priem->testPower($this->stats[$this->uids[$uid1]],$this->stats[$this->uids[$uid2]],$hpmin,1,2);
//
$hpmin = $priem->magatack($uid1,$uid2,$hpmin,'îãîíü',false);
$hpmin = $hpmin[0];
_incl_data/class/quest/dailyquest.php
+1 -1
View File
@@ -11,7 +11,7 @@
$txt .= '<br><b><font color=red>Âû óæå ïîëó÷èëè </b></font>';
*/
$txt = isset($txt) ?: '';
$test = mysql_fetch_array(mysql_query('SELECT * FROM `actions` WHERE `uid` = "'.$u->info['id'].'" AND `vars`= "day_quest" LIMIT 1'));
if (!isset($test['id']))
{