Merge remote-tracking branch 'origin/dev-battle-fighterclass' into dev-battle-fighterclass
This commit is contained in:
commit
1a05960ddc
@ -1293,11 +1293,11 @@ JS;
|
|||||||
/** 4: Приемы защиты; 8,9: Прочие приемы; */
|
/** 4: Приемы защиты; 8,9: Прочие приемы; */
|
||||||
$j = 0;
|
$j = 0;
|
||||||
foreach ($this->stats[$this->uids[$u2]]['u_priem'] as $priem) {
|
foreach ($this->stats[$this->uids[$u2]]['u_priem'] as $priem) {
|
||||||
if ($priem[2] < 1 || !in_array($priem[4], [4, 8, 9]) || !file_exists("priem/$priem[1].php")) {
|
if ($priem[2] < 1 || !in_array($priem[4], [4, 8, 9]) || !file_exists("Priem/$priem[1].php")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$pr_momental_this = $u2;
|
$pr_momental_this = $u2;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_moment)) {
|
if (isset($fx_moment)) {
|
||||||
$yron = $fx_moment($u2, $u1, $j, $yron, $profil, $inlog);
|
$yron = $fx_moment($u2, $u1, $j, $yron, $profil, $inlog);
|
||||||
unset($fx_moment);
|
unset($fx_moment);
|
||||||
@ -1307,7 +1307,7 @@ JS;
|
|||||||
|
|
||||||
$j = 0;
|
$j = 0;
|
||||||
foreach ($this->stats[$this->uids[$u1]]['u_priem'] as $priem) {
|
foreach ($this->stats[$this->uids[$u1]]['u_priem'] as $priem) {
|
||||||
if ($priem[2] < 1 || $priem[4] != 5 && $priem[7] != 5 || !file_exists("priem/$priem[1].php")) {
|
if ($priem[2] < 1 || $priem[4] != 5 && $priem[7] != 5 || !file_exists("Priem/$priem[1].php")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($priem[4] == 5) {
|
if ($priem[4] == 5) {
|
||||||
@ -1315,7 +1315,7 @@ JS;
|
|||||||
} elseif ($priem[7] == 5) { // влияет на урон от моментальных приемов
|
} elseif ($priem[7] == 5) { // влияет на урон от моментальных приемов
|
||||||
$pr_momental_this_seven = $u1;
|
$pr_momental_this_seven = $u1;
|
||||||
}
|
}
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_moment)) {
|
if (isset($fx_moment)) {
|
||||||
$yron = $fx_moment($u1, $u2, $j, $yron, $profil, $inlog);
|
$yron = $fx_moment($u1, $u2, $j, $yron, $profil, $inlog);
|
||||||
unset($fx_moment);
|
unset($fx_moment);
|
||||||
@ -2890,7 +2890,7 @@ JS;
|
|||||||
if (
|
if (
|
||||||
empty($priem[2]) ||
|
empty($priem[2]) ||
|
||||||
!in_array($priem[5], [1, 2, 3, 4, 5]) ||
|
!in_array($priem[5], [1, 2, 3, 4, 5]) ||
|
||||||
!file_exists("priem/$priem[1].php") ||
|
!file_exists("Priem/$priem[1].php") ||
|
||||||
$priem[5] == 1 && empty($this->stats[$this->uids[$u2]]['nopryh'])
|
$priem[5] == 1 && empty($this->stats[$this->uids[$u2]]['nopryh'])
|
||||||
) {
|
) {
|
||||||
continue;
|
continue;
|
||||||
@ -2898,7 +2898,7 @@ JS;
|
|||||||
|
|
||||||
$pr_used_this = $u1;
|
$pr_used_this = $u1;
|
||||||
$pr_moment = true;
|
$pr_moment = true;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_priem)) {
|
if (isset($fx_priem)) {
|
||||||
$fx_priem($id, $at, $u1, $j);
|
$fx_priem($id, $at, $u1, $j);
|
||||||
unset($fx_priem);
|
unset($fx_priem);
|
||||||
@ -3575,10 +3575,10 @@ JS;
|
|||||||
in_array($priem[1], [213, 220, 237, 286, 287, 288]) ||
|
in_array($priem[1], [213, 220, 237, 286, 287, 288]) ||
|
||||||
in_array($priem[4], [2, 3, 4, 5, 8, 9]) && $priem[2] > 0 ||
|
in_array($priem[4], [2, 3, 4, 5, 8, 9]) && $priem[2] > 0 ||
|
||||||
$priem[4] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
$priem[4] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
||||||
file_exists("priem/$priem[1].php")
|
file_exists("Priem/$priem[1].php")
|
||||||
) {
|
) {
|
||||||
$pr_used_this = $u1;
|
$pr_used_this = $u1;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_priem)) {
|
if (isset($fx_priem)) {
|
||||||
$at = $fx_priem($id, $at, $u1, $j);
|
$at = $fx_priem($id, $at, $u1, $j);
|
||||||
unset($fx_priem);
|
unset($fx_priem);
|
||||||
@ -3653,10 +3653,10 @@ JS;
|
|||||||
if ((
|
if ((
|
||||||
in_array($priem[4], [2, 3, 4, 5]) && $priem[2] > 0 ||
|
in_array($priem[4], [2, 3, 4, 5]) && $priem[2] > 0 ||
|
||||||
$priem[4] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
$priem[4] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
||||||
file_exists("priem/$priem[1].php")
|
file_exists("Priem/$priem[1].php")
|
||||||
) {
|
) {
|
||||||
$pr_used_this = $u1;
|
$pr_used_this = $u1;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_priem)) {
|
if (isset($fx_priem)) {
|
||||||
$at = $fx_priem($id, $at, $u1, $j);
|
$at = $fx_priem($id, $at, $u1, $j);
|
||||||
unset($fx_priem);
|
unset($fx_priem);
|
||||||
@ -3670,9 +3670,9 @@ JS;
|
|||||||
|
|
||||||
$j = 0;
|
$j = 0;
|
||||||
foreach ($this->stats[$this->uids[$u2]]['u_priem'] as $priem) {
|
foreach ($this->stats[$this->uids[$u2]]['u_priem'] as $priem) {
|
||||||
if (in_array($priem[4], [8, 9]) && $priem[2] > 0 && file_exists("priem/$priem[1].php")) {
|
if (in_array($priem[4], [8, 9]) && $priem[2] > 0 && file_exists("Priem/$priem[1].php")) {
|
||||||
$pr_used_this = $u2;
|
$pr_used_this = $u2;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_priem)) {
|
if (isset($fx_priem)) {
|
||||||
$at = $fx_priem($id, $at, $u2, $j);
|
$at = $fx_priem($id, $at, $u2, $j);
|
||||||
unset($fx_priem);
|
unset($fx_priem);
|
||||||
@ -4752,10 +4752,10 @@ JS;
|
|||||||
if ((
|
if ((
|
||||||
in_array($priem[6], [2, 3, 4, 5]) && $priem[2] > 0 ||
|
in_array($priem[6], [2, 3, 4, 5]) && $priem[2] > 0 ||
|
||||||
$priem[6] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
$priem[6] == 1 && $priem[2] > 0 && empty($this->stats[$this->uids[$u2]]['nopryh'])) &&
|
||||||
file_exists("priem/$priem[1].php")
|
file_exists("Priem/$priem[1].php")
|
||||||
) {
|
) {
|
||||||
$pr_used_this = $u1;
|
$pr_used_this = $u1;
|
||||||
require_once "priem/$priem[1].php";
|
require_once "Priem/$priem[1].php";
|
||||||
if (isset($fx_priem)) {
|
if (isset($fx_priem)) {
|
||||||
$fx_priem($id, $at, $u1, $j);
|
$fx_priem($id, $at, $u1, $j);
|
||||||
unset($fx_priem);
|
unset($fx_priem);
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user