From 4eac86da58026d324137940b8a5bc526bca34e35 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 10 May 2023 00:39:10 +0900
Subject: [PATCH] =?UTF-8?q?game:=20=EC=A0=80=EC=A7=80=EC=8B=9C=20=EC=8C=80?=
 =?UTF-8?q?=EC=9D=84=20=EC=86=8C=EB=AA=A8=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EC=98=A4=EB=A5=B4=EB=8A=94=20?=
 =?UTF-8?q?=EC=88=99=EB=A0=A8=20=EB=8C=80=EB=B9=84=200.25=EB=B0=B0=20-=20?=
 =?UTF-8?q?=EC=A6=89,=20=EC=9D=BC=EB=B0=98=20=EA=B3=B5=EA=B2=A9=EB=A0=A5?=
 =?UTF-8?q?=20=EB=8C=80=EB=B9=84=200.9=20*=200.25=EB=A7=8C=ED=81=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/WarUnitGeneral.php              | 15 +++++++++++----
 hwe/sammo/WarUnitTrigger/che_저지발동.php | 11 +++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/hwe/sammo/WarUnitGeneral.php b/hwe/sammo/WarUnitGeneral.php
index a44c3ac3..c9bb5e16 100644
--- a/hwe/sammo/WarUnitGeneral.php
+++ b/hwe/sammo/WarUnitGeneral.php
@@ -262,11 +262,8 @@ class WarUnitGeneral extends WarUnit
         return $general->getVar('crew');
     }
 
-    function increaseKilled(int $damage): int
+    function calcRiceConsumption(int $damage): float
     {
-        $general = $this->general;
-        $this->addLevelExp($damage / 50);
-
         $rice = $damage / 100;
         if (!$this->isAttacker) {
             $rice *= 0.8;
@@ -279,6 +276,16 @@ class WarUnitGeneral extends WarUnit
         $rice *= getTechCost($this->getNationVar('tech'));
         $rice = $this->general->onCalcStat($this->general, 'killRice', $rice);
 
+        return $rice;
+    }
+
+    function increaseKilled(int $damage): int
+    {
+        $general = $this->general;
+        $this->addLevelExp($damage / 50);
+
+        $rice = $this->calcRiceConsumption($damage);
+
         $general->increaseVarWithLimit('rice', -$rice, 0);
 
         $addDex = $damage;
diff --git a/hwe/sammo/WarUnitTrigger/che_저지발동.php b/hwe/sammo/WarUnitTrigger/che_저지발동.php
index 70c6d119..4e3a717a 100644
--- a/hwe/sammo/WarUnitTrigger/che_저지발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_저지발동.php
@@ -9,6 +9,8 @@ use sammo\Util;
 use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
+use function sammo\getTechCost;
+
 class che_저지발동 extends BaseWarUnitTrigger{
     protected $priority = ObjectTrigger::PRIORITY_POST; //최우선 순위
 
@@ -25,10 +27,15 @@ class che_저지발동 extends BaseWarUnitTrigger{
         $self->getLogger()->pushGeneralBattleDetailLog("상대를 <C>저지</>했다!", ActionLogger::PLAIN);
         $oppose->getLogger()->pushGeneralBattleDetailLog("저지</>당했다!", ActionLogger::PLAIN);
 
+        $calcDamage = $oppose->getWarPower() * 0.9;
+
         $self->getGeneral()->addDex($oppose->getCrewType(), $oppose->getWarPower() * 0.9);
-        $self->getGeneral()->addDex($self->getCrewType(), $self->getWarPower() * 0.9);
+        $self->getGeneral()->addDex($self->getCrewType(), $calcDamage);
         if($self instanceof WarUnitGeneral){
-            $self->addLevelExp($self->getWarPower() * 0.9 / 50);
+            $self->addLevelExp($calcDamage / 50);
+            $rice = $self->calcRiceConsumption($calcDamage);
+            $rice *= 0.25;
+            $self->getGeneral()->increaseVarWithLimit('rice', -$rice, 0);
         }
 
         $self->setWarPowerMultiply(0);