From 9b7464ab6971232c9e71a355d92b1c5342c6717f Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 11 May 2022 01:35:21 +0900
Subject: [PATCH] =?UTF-8?q?game:=20=ED=95=84=EC=82=B4=20=EC=A0=84=ED=88=AC?=
 =?UTF-8?q?=20=ED=8A=B9=EA=B8=B0=EA=B0=80=20'=ED=95=AD=EC=83=81=20?=
 =?UTF-8?q?=EC=B5=9C=EB=8C=80=20=ED=95=84=EC=82=B4=20=EB=8C=80=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EA=B3=84=EC=88=98'=EB=A5=BC=20=EA=B0=96=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=20-=201.3=20~=202.0=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=202.0=20=EA=B3=A0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionSpecialWar/che_필살.php | 10 +++++++++-
 hwe/sammo/WarUnit.php                   |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/ActionSpecialWar/che_필살.php b/hwe/sammo/ActionSpecialWar/che_필살.php
index 68ce99e5..c52bdadb 100644
--- a/hwe/sammo/ActionSpecialWar/che_필살.php
+++ b/hwe/sammo/ActionSpecialWar/che_필살.php
@@ -1,17 +1,20 @@
 <?php
 namespace sammo\ActionSpecialWar;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
 use \sammo\SpecialityHelper;
 use \sammo\WarUnit;
 use sammo\WarUnitTriggerCaller;
 use sammo\WarUnitTrigger\che_필살강화_회피불가;
+use sammo\WarUnitTrigger\WarActivateSkills;
 
 class che_필살 extends \sammo\BaseSpecial{
 
     protected $id = 71;
     protected $name = '필살';
-    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가';
+    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 항상 최대';
 
     static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
     static $selectWeight = 1;
@@ -25,6 +28,11 @@ class che_필살 extends \sammo\BaseSpecial{
         if($statName === 'warCriticalRatio'){
             return $value + 0.30;
         }
+        if($statName === 'criticalDamageRange'){
+            [, $rangeMax] = $value;
+            return [$rangeMax, $rangeMax];
+        }
+
         return $value;
     }
 
diff --git a/hwe/sammo/WarUnit.php b/hwe/sammo/WarUnit.php
index ee2e1720..42fe682b 100644
--- a/hwe/sammo/WarUnit.php
+++ b/hwe/sammo/WarUnit.php
@@ -436,8 +436,14 @@ class WarUnit
 
     function criticalDamage(): float
     {
+        $range = [1.3, 2.0];
+
+        if($this instanceof WarUnitGeneral){
+            $general = $this->general;
+            $range = $general->onCalcStat($general, 'criticalDamageRange', $range);
+        }
         //전특, 병종에 따라 필살 데미지가 달라질지도 모르므로 static 함수는 아닌 것으로
-        return Util::randRange(1.3, 2.0);
+        return Util::randRange(...$range);
     }
 
     function applyDB(\MeekroDB $db): bool