devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

토너먼트 나눗셈 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-05-02 16:20:36 +09:00
parent 016ca770f5
commit 8ebe81b89f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_tournament.php
+6 -6
View File
@@ -1018,26 +1018,26 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) {
$tDamage1 = $damage1; $tDamage2 = $damage2; $tDamage1 = $damage1; $tDamage2 = $damage2;
$tEnergy1 = $energy1; $tEnergy2 = $energy2; $tEnergy1 = $energy1; $tEnergy2 = $energy2;
if($energy1 <= 0 && $energy2 <= 0) { if($energy1 <= 0 && $energy2 <= 0) {
$r1 = $tEnergy1 / $tDamage1; $r1 = $tEnergy1 / Util::valueFit($tDamage1, 1);
$r2 = $tEnergy2 / $tDamage2; $r2 = $tEnergy2 / Util::valueFit($tDamage2, 1);
if($r1 > $r2) { if($r1 > $r2) {
$offset = Util::round($tEnergy2*$tDamage1/$tDamage2); $offset = Util::round($tEnergy2*$tDamage1/Util::valueFit($tDamage2,1));
$damage1 += $offset; $energy1 -= $offset; $damage1 += $offset; $energy1 -= $offset;
$damage2 += $tEnergy2; $energy2 = 0; $damage2 += $tEnergy2; $energy2 = 0;
} else { } else {
$offset = Util::round($tEnergy1*$tDamage2/$tDamage1); $offset = Util::round($tEnergy1*$tDamage2/Util::valueFit($tDamage1,1));
$damage2 += $offset; $energy2 -= $offset; $damage2 += $offset; $energy2 -= $offset;
$damage1 += $tEnergy1; $energy1 = 0; $damage1 += $tEnergy1; $energy1 = 0;
} }
} elseif($energy1 * $energy2 <= 0) { } elseif($energy1 * $energy2 <= 0) {
if($energy2 < 0) { if($energy2 < 0) {
$offset = Util::round($tEnergy2*$tDamage1/$tDamage2); $offset = Util::round($tEnergy2*$tDamage1/Util::valueFit($tDamage2,1));
$damage1 += $offset; $energy1 -= $offset; $damage1 += $offset; $energy1 -= $offset;
$damage2 += $tEnergy2; $energy2 = 0; $damage2 += $tEnergy2; $energy2 = 0;
} }
if($energy1 < 0) { if($energy1 < 0) {
$offset = Util::round($tEnergy1*$tDamage2/$tDamage1); $offset = Util::round($tEnergy1*$tDamage2/Util::valueFit($tDamage1,1));
$damage2 += $offset; $energy2 -= $offset; $damage2 += $offset; $energy2 -= $offset;
$damage1 += $tEnergy1; $energy1 = 0; $damage1 += $tEnergy1; $energy1 = 0;
} }