fix: 토너먼트 분노 공격 확률 오류 수정

hwe/func_tournament.php

@@ -1153,21 +1153,25 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
         ];
 
         //막판 분노
+        $factor1 = 1.0;
+        $factor2 = 1.0;
         $ratio = rand() % 300;
         if ($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
-            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor2 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical1 = 1;
             $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
             $log[] = "<S>●</> <Y>{$gen1['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
         $ratio = rand() % 300;
         if ($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
-            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor1 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical2 = 1;
-
             $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
             $log[] = "<S>●</> <Y>{$gen2['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
+        $damage1 *= $factor1;
+        $damage2 *= $factor2;
+        
         //1합 승부
         if ($phase == 1) {
 

hwe/j_select_npc.php

@@ -41,7 +41,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi
 
 $penalty = [];
 foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+    if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
         $penalty[$penaltyKey] = $penaltyValue['value'];
     }
 }

hwe/j_set_my_setting.php

@@ -88,7 +88,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi
 
 $penalty = [];
 foreach ($penaltyInfo as $penaltyKey => $penaltyValue) {
-    if ($penaltyValue['expire'] ?? 0 > TimeUtil::now()) {
+    if (($penaltyValue['expire'] ?? 0) > TimeUtil::now()) {
         $penalty[$penaltyKey] = $penaltyValue['value'];
     }
 }

hwe/sammo/API/General/Join.php

@@ -157,7 +157,7 @@ class Join extends \sammo\BaseAPI
 
         $penalty = [];
         foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+            if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
                 $penalty[$penaltyKey] = $penaltyValue['value'];
             }
         }

hwe/sammo/Command/Nation/che_초토화.php

@@ -162,7 +162,7 @@ class che_초토화 extends Command\NationCommand{
         $aux = $this->nation['aux'];
 
         if($destCity['level'] >= 8){
-            $aux[NationAuxKey::did_특성초토화->value] = $aux[NationAuxKey::did_특성초토화->value] ?? 0 + 1;
+            $aux[NationAuxKey::did_특성초토화->value] = ($aux[NationAuxKey::did_특성초토화->value] ?? 0) + 1;
         }
 
         $db->update('general', [

hwe/sammo/Constraint/AllowJoinDestNation.php

@@ -50,7 +50,7 @@ class AllowJoinDestNation extends Constraint{
             return false;
         }
 
-        if(($this->general['npc']??2 < 2) && \str_starts_with($this->destNation['name'], 'ⓤ')){
+        if((($this->general['npc']??2) < 2) && \str_starts_with($this->destNation['name'], 'ⓤ')){
             $this->reason = "유저장은 태수국에 임관할 수 없습니다.";
             return false;
         }

hwe/ts/PartialReservedCommand.vue

@@ -510,7 +510,7 @@ async function reloadCommandList() {
   const turnTime = parseTime(result.turnTime);
   let nextTurnTime = new Date(turnTime);
 
-  const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
+  const autorunLimitYearMonth = (result.autorun_limit ?? yearMonth) - 1;
   const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
 
   reservedCommandList.value = [];

hwe/ts/components/ChiefReservedCommand.vue

@@ -509,7 +509,7 @@ function updateCommandList() {
   const turnTime = parseTime(props.turnTime);
   let nextTurnTime = new Date(turnTime);
 
-  const autorunLimitYearMonth = autorun_limit.value ?? yearMonth - 1;
+  const autorunLimitYearMonth = (autorun_limit.value ?? yearMonth) - 1;
   const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
 
   for (const obj of props.turn) {

i_entrance/j_delete_me.php

@@ -42,7 +42,7 @@ if($userInfo['delete_after']){
 
 $penaltyList = Json::decode($userInfo['penalty']??'{}');
 foreach($penaltyList as $penaltyKey=>$penaltyValue){
-    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+    if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
         Json::die([
             'result'=>false,
             'reason'=>"징계가 남아있어 탈퇴할 수 없습니다."

oauth_kakao/j_login_oauth.php

@@ -133,7 +133,7 @@ $userInfo = $RootDB->queryFirstRow(
 if (!$userInfo) {
     if(!$oauthID){
         $me = $restAPI->meWithEmail();
-        if ($me['code']??0 < 0) {
+        if (($me['code']??0) < 0) {
             Json::die([
                 'result' => false,
                 'reqOTP' => false,