From 086e61bb197df522204e93136109672a25cc9989 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 25 Apr 2020 04:55:59 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php          | 2 +-
 hwe/sammo/General.php | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index cb1b77c8..67b179e7 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -707,7 +707,7 @@ function generalInfo2(General $generalObj) {
     $general = $generalObj->getRaw();
 
     $winRate = round($generalObj->getRankVar('killnum')/max($generalObj->getRankVar('warnum'),1)*100, 2);
-    $killRate = round($generalObj->getRankVar('killcrew')/max($generalObj->getRankVar('deathcrew'),1)*100, 2);
+    $killRate = round($generalObj->getRankVar('killcrew')/max($generalObj->getRankVar('deathcrew')+$generalObj->getRankVar('killcrew'),1)*100, 2);
 
     $experienceBonus = $generalObj->onCalcStat($generalObj, 'experience', 10000) - 10000;
     if($experienceBonus > 0){
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index bdfbcd57..af1e0c25 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -579,10 +579,9 @@ class General implements iAction{
         $this->multiplyVar('dex4', 0.5);
         $this->multiplyVar('dex5', 0.5);
 
-        $this->setRankVar('firenum', 0);
-        $this->setRankVar('warnum', 0);
-        $this->setRankVar('killnum', 0);
-        $this->setRankVar('killcrew', 0);
+        foreach(array_keys(static::RANK_COLUMN) as $rankKey){
+            $this->setRankVar($rankKey, 0);
+        }
 
         $josaYi = JosaUtil::pick($generalName, '이');
         $logger->pushGlobalActionLog("{$generalName}</>{$josaYi} <R>은퇴</>하고 그 자손이 유지를 이어받았습니다.");