closes #17, великое переименование классов для автозагрузчика, актуализация кода

_incl_data/class/priem/121.php

@@ -60,11 +60,7 @@ 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

@@ -60,11 +60,7 @@ 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

@@ -60,11 +60,7 @@ 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

@@ -60,11 +60,7 @@ 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/125.php

@@ -60,11 +60,7 @@ 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

@@ -59,11 +59,9 @@ 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

@@ -57,11 +57,7 @@ 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

@@ -57,11 +57,7 @@ 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,5 +1,5 @@
 <?php
-/**@var $this priems*/
+/**@var $this Priems*/
 if(!defined('GAME')) {
 	die();
 }

_incl_data/class/priem/244.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/25.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Öåëü {ñòèõèÿ}
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  * @var $pl
  */

_incl_data/class/priem/252.php

@@ -57,11 +57,7 @@ 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/26.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Öåëü {ñòèõèÿ}
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  * @var $pl
  */

_incl_data/class/priem/260.php

@@ -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[$u->info['id']]]['sex'], null);
+    $prv['text'] = $btl->addlt(1, 19, $btl->users[$btl->uids[$this->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,7 +1,7 @@
 <?php
 /**
  * Ïðèåì: Çàðÿä: Ïîðàæåíèå
- * @var battleClass $btl
+ * @var Battle $btl
  * @var $id
  * @var $pl
  */

_incl_data/class/priem/263.php

@@ -1,113 +1,74 @@
-<?
-if(!defined('GAME')) {
-	die();
+<?php /**@var $this Priems*/
+if (!defined('GAME')) {
+    die();
 }
 /*
 	Ïðèåì: Çàðÿä: Ñîáðàòü
 */
 $pvr = array();
-//$pvr['mg'] = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "'.$btl->users[$btl->uids[$this->ue['id']]]['id'].'" AND `v2` = "260" AND `user_use` = "'.$u->info['id'].'" ORDER BY `id` DESC LIMIT 1'));
-$pvr['mg'] = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "'.$btl->users[$btl->uids[$this->ue['id']]]['id'].'" AND `v2` = "260" ORDER BY `id` DESC LIMIT 1'));
-if( isset($pvr['mg']['id']) ) {	
-	//Äåéñòâèå ïðè êëèêå
-	//$pvr['hp'] = floor(144/3*$pvr['mg']['x']);
-	/*$pvr['hp'] = 1;*/
-			//
-	$pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
-			//
-	/**/	
-	if( $pvr['data']['add_mg2static_points'][0] < 1 ) {
-		echo '<font color=red><b>Ñòàòèêà íå ñîáðàëà äîñòàòî÷íîãî êîëè÷åñòâà çàðÿäîâ</b></font>';
-		$cup = true;
-	}else{
-		$prv['text'] = $btl->addlt(1 , 21 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL);
-		
-		//Öâåò ïðèåìàû
-		if( $pvr['promah'] == false ) {
-			if( $pvr['krit'] == false ) {
-				$prv['color2'] = '006699';
-				if(isset($btl->mcolor[$btl->mname['âîçäóõ']])) {
-					$prv['color2'] = $btl->mcolor[$btl->mname['âîçäóõ']];
-				}
-				$prv['color'] = '000000';
-				if(isset($btl->mncolor[$btl->mname['âîçäóõ']])) {
-					$prv['color'] = $btl->mncolor[$btl->mname['âîçäóõ']];
-				}
-			}else{
-				$prv['color2'] = 'FF0000';
-				$prv['color'] = 'FF0000';
-			}
-		}else{
-			$prv['color2'] = '909090';
-			$prv['color'] = '909090';
-		}
-		//Õèëÿåì ìàíó
-		$pvr['mp'] = $pvr['data']['add_mg2static_points'][0]*(3*$u->info['level']);
-		//
-		$pvr['mpSee'] = '';
-		$pvr['mpNow'] = floor($btl->stats[$btl->uids[$u->info['id']]]['mpNow']);
-		$pvr['mpAll'] = $btl->stats[$btl->uids[$u->info['id']]]['mpAll'];
-		
-		$pvr['mpTr'] = $pvr['mpNow'] + $pvr['mp'];
-		if( $pvr['mpTr'] > $pvr['mpAll'] ) {
-			$pvr['mp'] = $pvr['mp'] - ( $pvr['mpTr'] - $pvr['mpAll'] );
-		}
-		
-		$pvr['mpNow'] = floor($pvr['mpNow']+$pvr['mp']);
-		
-		if( $pvr['mp'] > 0 ) {
-			$pvr['mpSee'] = '+' . $pvr['mp'];
-		}else{
-			$pvr['mpSee'] = $pvr['mp'];
-		}
-		
-		if( $pvr['mpSee'] == '' || $pvr['mpSee'] == 0 ) {
-			$pvr['mpSee'] = '--';
-		}
-		$u->stats['mpNow'] = $pvr['mpNow'];	
-		$u->info['mpNow'] = $pvr['mpNow'];	
-		$btl->stats[$btl->uids[$u->info['id']]]['mpNow'] = $pvr['mpNow'];
-		$btl->users[$btl->uids[$u->info['id']]]['mpNow'] = $pvr['mpNow'];				
-		mysql_query('UPDATE `stats` SET `mpNow` = "'.$u->stats['mpNow'].'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1');
-		
-		//Óäàëÿåì 1 íåãàòèâíûé ýôôåêò
-		$pvr['no'] = ' AND `a`.`v2` != 201';
-		
-		$pvr['sp'] = mysql_query('SELECT `a`.* FROM `eff_users` AS `a` LEFT JOIN `priems` AS `b` ON `b`.`id` = `a`.`v2` WHERE `a`.`uid` = "'.$u->info['id'].'" AND `a`.`delete` = 0 AND `a`.`v1` = "priem" '.$pvr['no'].' AND `b`.`neg` > 0 LIMIT 1');
-		$pvr['pl'] = mysql_fetch_array($pvr['sp']);
-		$pvr['pl']['priem'] = mysql_fetch_array(mysql_query('SELECT * FROM `priems` WHERE `id` = "'.$pvr['pl']['v2'].'" LIMIT 1'));
-		if( isset($pvr['pl']['priem']) ) {
-			$btl->delPriem($pvr['pl'],$btl->users[$btl->uids[$u->info['id']]],100);		
-		}
-		
-		$prv['text2'] = '{tm1} '.$prv['text'].' ÷åðåç {u2}. <font Color='.$prv['color'].'><b>'.$pvr['mpSee'].'</b></font> ['.$pvr['mpNow'].'/'.$pvr['mpAll'].'] (ìàíà)';
-		
-		$btl->priemAddLog( $id, 1, 2, $u->info['id'], $this->ue['id'],
-			'<font color^^^^#'.$prv['color2'].'>Çàðÿä: Ñîáðàòü</font>',
-			$prv['text2'],
-			($btl->hodID + 1)
-		);
-		
-		//Äîáàâëÿåì ïðèåì
-		//$this->addEffPr($pl,$id);
-		//$this->addPriem($this->ue['id'],$pl['id'],'atgm='.($pvr['hp']/16).'',2,77,4,$u->info['id'],3,'îëåäåíåíèå',0,0,1);
-		
-		//Óäàëÿåì îëåäåíåíèå
-		$pvr['mg']['priem']['id'] = $pvr['mg']['id'];
-		//$btl->delPriem($pvr['mg'],$btl->users[$btl->uids[$this->ue['id']]],2);
-		
-		$pvr['edt'] = $u->lookStats($pvr['mg']['data']);	
-		$pvr['edt']['add_zm2proc'] = 0;
-		$pvr['edt']['add_mg2static_points'] = 0;
-		$pvr['edt'] = $u->impStats($pvr['edt']);
-		mysql_query('UPDATE `eff_users` SET `x` = 1, `data` = "'.$pvr['edt'].'" WHERE `id` = "'.$pvr['mg']['id'].'" LIMIT 1');
-		
-		//Îòíèìàåì òàêòèêè
-		//$this->mintr($pl);
-	}
-}else{
-	echo '<font color=red><b>Íà ïåðñîíàæå íåò Ñòàòèêè (Âàøåãî çàêëÿòèÿ)</b></font>';
-	$cup = true;
+$pvr['mg'] = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = ' . $btl->users[$btl->uids[$this->ue['id']]]['id'] . ' AND `v2` = 260 ORDER BY `id` DESC LIMIT 1'));
+if (!isset($pvr['mg']['id'])) {
+    echo '<b style="color: red">Íà ïåðñîíàæå íåò Ñòàòèêè</b>';
+    $cup = true;
+} else {
+    $pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
+    //
+    /**/
+    if ($pvr['data']['add_mg2static_points'] < 1) {
+        echo '<b style="color: red">Ñòàòèêà íå ñîáðàëà äîñòàòî÷íîãî êîëè÷åñòâà çàðÿäîâ</b>';
+        $cup = true;
+    } else {
+        $prv['text'] = $btl->addlt(1, 21, $btl->users[$btl->uids[$this->u->info['id']]]['sex'], NULL);
+
+        //Öâåò ïðèåìàû
+        $prv['color'] = $this->logColor[$this::AIR];
+
+        //Õèëÿåì ìàíó
+        $pvr['mp'] = $pvr['data']['add_mg2static_points'] * (3 * $this->u->info['level']);
+        //
+        $pvr['mpSee'] = '';
+        $pvr['mpNow'] = floor($btl->stats[$btl->uids[$this->u->info['id']]]['mpNow']);
+        $pvr['mpAll'] = $btl->stats[$btl->uids[$this->u->info['id']]]['mpAll'];
+
+        $pvr['mpTr'] = $pvr['mpNow'] + $pvr['mp'];
+        if ($pvr['mpTr'] > $pvr['mpAll']) {
+            $pvr['mp'] = $pvr['mp'] - ($pvr['mpTr'] - $pvr['mpAll']);
+        }
+
+        $pvr['mpNow'] = floor($pvr['mpNow'] + $pvr['mp']);
+
+        if ($pvr['mp'] > 0) {
+            $pvr['mpSee'] = '+' . $pvr['mp'];
+        } else {
+            $pvr['mpSee'] = $pvr['mp'];
+        }
+
+        if (empty($pvr['mpSee'])) {
+            $pvr['mpSee'] = '--';
+        }
+        $this->u->stats['mpNow'] = $pvr['mpNow'];
+        $this->u->info['mpNow'] = $pvr['mpNow'];
+        $btl->stats[$btl->uids[$this->u->info['id']]]['mpNow'] = $pvr['mpNow'];
+        $btl->users[$btl->uids[$this->u->info['id']]]['mpNow'] = $pvr['mpNow'];
+        mysql_query('UPDATE `stats` SET `mpNow` = ' . $this->u->stats['mpNow'] . ' WHERE `id` = ' . $this->u->info['id']);
+
+        //Óäàëÿåì 1 íåãàòèâíûé ýôôåêò
+        $pvr['sp'] = mysql_query('select * from eff_users left join priems on priems.id = v2 where `delete` = 0 and neg > 0 and v1 = \'priem\' and v2 != 201 and uid = ' . $this->u->info['id']);
+        $pvr['pl'] = mysql_fetch_array($pvr['sp']);
+        shuffle($pvr['pl']);
+        $pvr['pl'] = $pvr['pl'][0];
+        $pvr['pl']['priem'] = mysql_fetch_array(mysql_query('SELECT * FROM `priems` WHERE `id` = ' . $pvr['pl']['v2']));
+        if (isset($pvr['pl']['priem'])) {
+            $btl->delPriem($pvr['pl'], $btl->users[$btl->uids[$this->u->info['id']]], 100);
+        }
+
+        $prv['text2'] = '{tm1} ' . $prv['text'] . ' ÷åðåç {u2}. <font Color=' . $prv['color'] . '><b>' . $pvr['mpSee'] . '</b></font> [' . $pvr['mpNow'] . '/' . $pvr['mpAll'] . '] (ìàíà)';
+
+        $btl->priemAddLog($id, 1, 2, $this->u->info['id'], $this->ue['id'], '<font color^^^^#' . $prv['color'] . '>Çàðÿä: Ñîáðàòü</font>', $prv['text2'], ($btl->hodID + 1));
+
+        $pvr['mg']['priem']['id'] = $pvr['mg']['id'];
+        $pvr['edt'] = $this->changeStatsData($pvr['mg']['data'], ['add_mg2static_points' => 0]);
+        mysql_query('UPDATE `eff_users` SET `x` = 1, `data` = "' . $pvr['edt'] . '" WHERE `id` = ' . $pvr['mg']['id']);
+    }
 }
 unset($pvr);
-?>

_incl_data/class/priem/265.php

@@ -1,114 +1,74 @@
-<?
-if(!defined('GAME')) {
-	die();
+<?php
+/** Ïðèåì: Îëåäåíåíèå: Ðàçáèòü! (êàêîãî-òî õðåíà íåêîòîðûå ïðè¸ìû ïîëíîñòüþ óìèðàþò ïðè ïåðåíîñå â _cron_)
+ * @var $this Priems
+ * @var $btl Battle
+ * @var $id int
+ * @var $pl array
+ */
+if (!$id) {
+    exit();
 }
-/*
-	Ïðèåì: Îëåäåíåíèå: Ðàçáèòü!
-*/
+//$cup = $this->glaciationBreak($id, $pl, $btl);
+
 $pvr = array();
-$pvr['mg'] = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "'.$btl->users[$btl->uids[$this->ue['id']]]['id'].'" AND `bj` = "îëåäåíåíèå" AND `user_use` = "'.$u->info['id'].'" ORDER BY `id` DESC LIMIT 1'));
-if( isset($pvr['mg']['id']) ) {	
-	//Äåéñòâèå ïðè êëèêå
-	//$pvr['hp'] = floor(144/3*$pvr['mg']['x']);
-	$pvr['hp'] = 1;
-			//
-			$pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
-			$pvr['di'] = 0;
-			$pvr['dc'] = count($pvr['data']['atgm']);
-			$pvr['rd'] = 0;
-			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['rd']++;
-					}
-				}
-				$pvr['di']++;
-			}
-			//
-	
-	
-	//$pvr['hp'] = 444;
-	$pvr['hp'] = 100;
-	//$pvr['hp'] += floor($pvr['hp']/100*$u->stats['mg3']);//óìåëêè
-	//$pvr['hp'] += floor($pvr['hp']/100*($u->stats['s5']*0.15));//Èíòåëåêò , áûëî 0.33
-	//
-	if( $btl->stats[$btl->uids[$u->info['enemy']]]['hpNow'] < floor($btl->stats[$btl->uids[$this->ue['id']]]['hpAll']/100*33) ) {
-		//$pvr['hp'] = floor( $pvr['hp'] + ($pvr['hp']/100*(50*$pvr['mg']['x'])) );
-		$pvr['hp'] = 80;
-	}
-	$pvr['hp'] = $this->magatack( $u->info['id'], $this->ue['id'], $pvr['hp'], 'âîäà', 1 );
-	$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[$this->ue['id']]]['hpNow']);
-	$pvr['hpAll'] = $btl->stats[$btl->uids[$this->ue['id']]]['hpAll'];
-		
-	//Èñïîëüçóåì ïðîâåðêó íà óðîí ïðèåìîâ
-	$pvr['hp'] = $btl->testYronPriem( $u->info['id'], $this->ue['id'], 21, $pvr['hp'], 7, true );
-		
-	$pvr['hpSee'] = '-'.$pvr['hp'];
-	$pvr['hpNow'] -= $pvr['hp'];
-	$btl->priemYronSave($u->info['id'],$this->ue['id'],$pvr['hp'],0);
-		
-	if( $pvr['hpNow'] > $pvr['hpAll'] ) {
-		$pvr['hpNow'] = $pvr['hpAll'];
-	}elseif( $pvr['hpNow'] < 0 ) {
-		$pvr['hpNow'] = 0;
-	}
-		
-	$btl->stats[$btl->uids[$this->ue['id']]]['hpNow'] = $pvr['hpNow'];
-		
-	mysql_query('UPDATE `stats` SET `hpNow` = "'.$btl->stats[$btl->uids[$this->ue['id']]]['hpNow'].'" WHERE `id` = "'.$this->ue['id'].'" LIMIT 1');
-		
-	$prv['text'] = $btl->addlt(1 , 19 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL);
-	
-	//Öâåò ïðèåìà
-	if( $pvr['promah'] == false ) {
-		if( $pvr['krit'] == false ) {
-			$prv['color2'] = '006699';
-			if(isset($btl->mcolor[$btl->mname['âîäà']])) {
-				$prv['color2'] = $btl->mcolor[$btl->mname['âîäà']];
-			}
-			$prv['color'] = '000000';
-			if(isset($btl->mncolor[$btl->mname['âîäà']])) {
-				$prv['color'] = $btl->mncolor[$btl->mname['âîäà']];
-			}
-		}else{
-			$prv['color2'] = 'FF0000';
-			$prv['color'] = 'FF0000';
-		}
-	}else{
-		$prv['color2'] = '909090';
-		$prv['color'] = '909090';
-	}
-	
-	$prv['text2'] = '{tm1} '.$prv['text'].'. <font Color='.$prv['color'].'><b '.$btl->maginfoattack($u->info['id'],$this->ue['id'],3).'>'.$pvr['hpSee'].'</b></font> ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']';
-	if( $pvr['promah_type'] == 2 ) {
-		$prv['text'] = $btl->addlt(1 , 20 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL);
-		$prv['text2'] = '{tm1} '.$prv['text'].'. <font Color='.$prv['color'].'><b '.$btl->maginfoattack($u->info['id'],$this->ue['id'],3).'>--</b></font> ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']';
-	}
-	$btl->priemAddLog( $id, 1, 2, $u->info['id'], $u->info['enemy'],
-		'<font color^^^^#'.$prv['color2'].'>Îëåäåíåíèå: Ðàçáèòü!</font>',
-		$prv['text2'],
-		($btl->hodID + 1)
-	);
-	
-	//Äîáàâëÿåì ïðèåì
-	//$this->addEffPr($pl,$id);
-	//$this->addPriem($u->info['enemy'],$pl['id'],'atgm='.($pvr['hp']/16).'',2,77,4,$u->info['id'],3,'îëåäåíåíèå',0,0,1);
-	
-	//Óäàëÿåì îëåäåíåíèå
-	$pvr['mg']['priem']['id'] = $pvr['mg']['id'];
-	$btl->delPriem($pvr['mg'],$btl->users[$btl->uids[$this->ue['id']]],2);
-	
-	//Îòíèìàåì òàêòèêè
-	$this->mintr($pl);
-}else{
-	echo '<font color=red><b>Íà ïåðñîíàæå íåò îëåäåíåíèÿ (Âàøåãî çàêëÿòèÿ)</b></font>';
-	$cup = true;
+$pvr['mg'] = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "' . $btl->users[$btl->uids[$this->ue['id']]]['id'] . '" AND `bj` = "îëåäåíåíèå" AND `user_use` = "' . $this->u->info['id'] . '" ORDER BY `id` DESC LIMIT 1'));
+if (!isset($pvr['mg']['id'])) {
+    echo '<b style="color: red;">Íà ïåðñîíàæå íåò îëåäåíåíèÿ (Âàøåãî çàêëÿòèÿ)</b>';
+    $cup = true;
+} else {
+    //Äåéñòâèå ïðè êëèêå
+    $pvr['hp'] = 100;
+    if ($btl->stats[$btl->uids[$this->ue['id']]]['hpNow'] < floor($btl->stats[$btl->uids[$this->ue['id']]]['hpAll'] * 0.2)) {
+        $pvr['hp'] *= 1.5;
+    }
+    $pvr['hp'] = $this->magatack($this->u->info['id'], $this->ue['id'], $pvr['hp'], 'âîäà', 1);
+    $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[$this->ue['id']]]['hpNow']);
+    $pvr['hpAll'] = $btl->stats[$btl->uids[$this->ue['id']]]['hpAll'];
+
+    //Èñïîëüçóåì ïðîâåðêó íà óðîí ïðèåìîâ
+    $pvr['hp'] = $btl->testYronPriem($this->u->info['id'], $this->ue['id'], 21, $pvr['hp'], 7, true);
+
+    $pvr['hpSee'] = '-' . $pvr['hp'];
+    $pvr['hpNow'] -= $pvr['hp'];
+    $btl->priemYronSave($this->u->info['id'], $this->ue['id'], $pvr['hp'], 0);
+
+    if ($pvr['hpNow'] > $pvr['hpAll']) {
+        $pvr['hpNow'] = $pvr['hpAll'];
+    } elseif ($pvr['hpNow'] < 0) {
+        $pvr['hpNow'] = 0;
+    }
+
+    $btl->stats[$btl->uids[$this->ue['id']]]['hpNow'] = $pvr['hpNow'];
+
+    mysql_query('UPDATE `stats` SET `hpNow` = ' . $pvr['hpNow'] . ' WHERE `id` = ' . $this->ue['id']);
+
+    $prv['text'] = $btl->addlt(1, 19, $btl->users[$btl->uids[$this->u->info['id']]]['sex'], NULL);
+
+    //Öâåò ïðèåìà
+    if ($pvr['promah']) {
+        $prv['color'] = $this->logColor['miss'];
+    } elseif ($pvr['krit']) {
+        $prv['color'] = $this->logColor['crit'];
+    } else {
+        $prv['color'] = $this->logColor[$this::WATER];
+    }
+    $prv['text2'] = '{tm1} ' . $prv['text'] . '. <font Color=' . $prv['color'] . '><b ' . $btl->maginfoattack($this->u->info['id'], $this->ue['id'], 3) . '>' . $pvr['hpSee'] . '</b></font> [' . $pvr['hpNow'] . '/' . $pvr['hpAll'] . ']';
+    if ($pvr['promah_type'] == 2) {
+        $prv['text'] = $btl->addlt(1, 20, $btl->users[$btl->uids[$this->u->info['id']]]['sex'], NULL);
+        $prv['text2'] = '{tm1} ' . $prv['text'] . '. <font Color=' . $prv['color'] . '><b ' . $btl->maginfoattack($this->u->info['id'], $this->ue['id'], 3) . '>--</b></font> [' . $pvr['hpNow'] . '/' . $pvr['hpAll'] . ']';
+    }
+    $btl->priemAddLog($id, 1, 2, $this->u->info['id'], $this->u->info['enemy'], '<font color^^^^#' . $prv['color'] . '>Îëåäåíåíèå: Ðàçáèòü!</font>', $prv['text2'], ($btl->hodID + 1));
+
+    //Óäàëÿåì îëåäåíåíèå
+    $pvr['mg']['priem']['id'] = $pvr['mg']['id'];
+    $btl->delPriem($pvr['mg'], $btl->users[$btl->uids[$this->ue['id']]], 2);
+
+    //Îòíèìàåì òàêòèêè
+    $this->mintr($pl);
 }
 unset($pvr);
-?>

_incl_data/class/priem/267.php

@@ -1,11 +1,10 @@
-<?
+<?php
+/** @var $this Priems*/
 if(!defined('GAME')) {
 	die();
 }
-/*
-	Ïðèåì: Êðèñòàëëèçàöèÿ
-*/
-$pvr = array();
+/*	Ïðèåì: Êðèñòàëëèçàöèÿ */
+
 if( isset($pr_used_this) && isset($pr_moment) ) {
 	//Êàæäûé õîä
 	$fx_priem = function(  $id , $at , $uid, $j_id ) {
@@ -13,76 +12,5 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 	};
 	unset( $pr_used_this );
 }else{
-	//Äåéñòâèå ïðè êëèêå
-
-	$pvr['promah_type'] = 0;
-	$pvr['promah'] = false;
-	$pvr['krit'] = false;
-	$pvr['hp']   = $btl->stats[$btl->uids[$this->ue['id']]]['s1'];
-	if( $pvr['hp'] > 10*$u->info['level'] ) {
-		$pvr['hp'] = $u->info['level']*10;
-	}
-	$pvr['hpSee'] = '--';
-	$pvr['hpNow'] = floor($btl->stats[$btl->uids[$this->ue['id']]]['hpNow']);
-	$pvr['hpAll'] = $btl->stats[$btl->uids[$this->ue['id']]]['hpAll'];
-		
-	//Èñïîëüçóåì ïðîâåðêó íà óðîí ïðèåìîâ
-	$pvr['hp'] = $btl->testYronPriem( $u->info['id'], $this->ue['id'], 21, $pvr['hp'], 7, true );
-		
-	$pvr['hpSee'] = '-'.$pvr['hp'];
-	$pvr['hpNow'] -= $pvr['hp'];
-	$btl->priemYronSave($u->info['id'],$this->ue['id'],$pvr['hp'],0);
-		
-	if( $pvr['hpNow'] > $pvr['hpAll'] ) {
-		$pvr['hpNow'] = $pvr['hpAll'];
-	}elseif( $pvr['hpNow'] < 0 ) {
-		$pvr['hpNow'] = 0;
-	}
-		
-	$btl->stats[$btl->uids[$this->ue['id']]]['hpNow'] = $pvr['hpNow'];
-		
-	mysql_query('UPDATE `stats` SET `hpNow` = "'.$btl->stats[$btl->uids[$this->ue['id']]]['hpNow'].'" WHERE `id` = "'.$this->ue['id'].'" LIMIT 1');
-		
-	$prv['text'] = $btl->addlt(1 , 19 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL);
-	
-	//Öâåò ïðèåìà
-	if( $pvr['promah'] == false ) {
-		if( $pvr['krit'] == false ) {
-			$prv['color2'] = '006699';
-			if(isset($btl->mcolor[$btl->mname['âîäà']])) {
-				$prv['color2'] = $btl->mcolor[$btl->mname['âîäà']];
-			}
-			$prv['color'] = '000000';
-			if(isset($btl->mncolor[$btl->mname['âîäà']])) {
-				$prv['color'] = $btl->mncolor[$btl->mname['âîäà']];
-			}
-		}else{
-			$prv['color2'] = 'FF0000';
-			$prv['color'] = 'FF0000';
-		}
-	}else{
-		$prv['color2'] = '909090';
-		$prv['color'] = '909090';
-	}
-	
-	$prv['text2'] = '{tm1} '.$prv['text'].'. <font Color='.$prv['color'].'><b '.$btl->maginfoattack($u->info['id'],$this->ue['id'],3).'>'.$pvr['hpSee'].'</b></font> ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']';
-	if( $pvr['promah_type'] == 2 ) {
-		$prv['text'] = $btl->addlt(1 , 20 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL);
-		$prv['text2'] = '{tm1} '.$prv['text'].'. <font Color='.$prv['color'].'><b '.$btl->maginfoattack($u->info['id'],$this->ue['id'],3).'>--</b></font> ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']';
-	}
-	$btl->priemAddLog( $id, 1, 2, $u->info['id'], $this->ue['id'],
-		'<font color^^^^#'.$prv['color2'].'>Êðèñòàëëèçàöèÿ</font>',
-		$prv['text2'],
-		($btl->hodID + 1)
-	);
-	
-	//Äîáàâëÿåì ïðèåì
-	//$this->addEffPr($pl,$id);
-	$this->addPriem($this->ue['id'],268,'|add_s1=-'.$btl->stats[$btl->uids[$u->info['id']]]['mg3'].'|add_s2=-'.$btl->stats[$btl->uids[$u->info['id']]]['mg3'],2,77,3,$u->info['id'],3,'êðèñòàëëèçàöèÿ',0,0,1);
-	
-	//Îòíèìàåì òàêòèêè
-	//$this->mintr($pl);
+    $this->crystalize($id, $pl, $btl);
 }
-
-unset($pvr);
-?>

_incl_data/class/priem/27.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Öåëü {ñòèõèÿ}
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  * @var $pl
  */

_incl_data/class/priem/276.php

@@ -101,11 +101,9 @@ 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

@@ -145,8 +145,6 @@ 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,8 +2,8 @@
 
 /**
  * Ïðèåì: Öåëü {ñòèõèÿ}
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  * @var $pl
  */

_incl_data/class/priem/294.php

@@ -39,34 +39,12 @@ 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

@@ -39,34 +39,12 @@ 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

@@ -39,34 +39,12 @@ 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/299.php

@@ -41,32 +41,12 @@ 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/300.php

@@ -40,23 +40,7 @@ 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;
@@ -101,11 +85,7 @@ 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

@@ -41,32 +41,12 @@ 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

@@ -1,17 +1,14 @@
 <?php
 
-/**
- * @var $this priems
- * @var $btl battleClass
+/** Ïðèåì: Ïîæèðàþùåå Ïëàìÿ [6]
+ * @var $this Priems
+ * @var $btl Battle
  * @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,8 +2,8 @@
 
 /**
  * Ïðèåì: Âñïûøêà [8]
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  */
 

_incl_data/class/priem/42.php

@@ -60,11 +60,7 @@ 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

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/57.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/58.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/59.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/60.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id int
  * @var $pl array
  */

_incl_data/class/priem/67.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Âñïûøêà [9]
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  */
 

_incl_data/class/priem/68.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Âñïûøêà [10]
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  */
 

_incl_data/class/priem/69.php

@@ -2,8 +2,8 @@
 
 /**
  * Ïðèåì: Âñïûøêà [11]
- * @var $this priems
- * @var $btl battleClass
+ * @var $this Priems
+ * @var $btl Battle
  * @var $id
  */
 

_incl_data/class/priem/70.php

@@ -57,11 +57,7 @@ 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/71.php

@@ -57,11 +57,7 @@ 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/72.php

@@ -59,11 +59,7 @@ 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

@@ -59,7 +59,6 @@ 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

@@ -59,7 +59,6 @@ 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

@@ -59,7 +59,6 @@ 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

@@ -61,7 +61,6 @@ 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/78.php

@@ -56,7 +56,6 @@ 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

@@ -59,7 +59,6 @@ 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

@@ -57,11 +57,7 @@ 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

@@ -57,11 +57,7 @@ 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

@@ -57,11 +57,7 @@ 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

@@ -57,11 +57,7 @@ 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'];