From ba442b1457d1d20fa81792819b15cbe403fa98ee Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 26 Apr 2020 00:15:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=A0=EC=A0=84=ED=8F=AC=EA=B3=A0=20?=
 =?UTF-8?q?=EC=B5=9C=EC=A2=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GeneralAI.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 89358e8e..623690d8 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -1547,6 +1547,10 @@ class GeneralAI
             return null;
         }
 
+        if($this->frontCities){
+            return null;
+        }
+
         $nation = $this->nation;
         $nationID = $nation['nation'];
 
@@ -1578,25 +1582,15 @@ class GeneralAI
         $avgGold /= $genCnt;
         $avgRice /= $genCnt;
 
-        $trialProp = $avgGold / max($this->nationPolicy->reqNPCWarGold, 1000);
-        $trialProp += $avgRice / max($this->nationPolicy->reqNPCWarRice, 1000);
+        $trialProp = $avgGold / max($this->nationPolicy->reqNPCWarGold, 2000);
+        $trialProp += $avgRice / max($this->nationPolicy->reqNPCWarRice, 2000);
 
         $devRate = $this->calcNationDevelopedRate();
 
         $trialProp += ($devRate['pop'] + $devRate['all']) / 2;
 
         $trialProp /= 4;
-        $trialProp = $trialProp**8;
-
-        LogText('선전포고', [
-            'avgGold'=>$avgGold,
-            'reqGold'=>$this->nationPolicy->reqNPCWarGold,
-            'avgRice'=>$avgRice,
-            'reqRice'=>$this->nationPolicy->reqNPCWarRice,
-            'cnt'=>$genCnt,
-            'devRate'=>$devRate,
-            'prop'=>$trialProp
-        ]);
+        $trialProp = $trialProp**6;
 
         if(!Util::randBool($trialProp)){
             return null;