From 42579810a2849b53b4f11d67d98e2b757ac91e04 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 9 Jun 2022 01:30:08 +0900
Subject: [PATCH] =?UTF-8?q?game:=20NPC=EC=9D=98=20=EC=9D=B4=ED=9B=84=20?=
 =?UTF-8?q?=EC=9E=84=EA=B4=80=20=ED=99=95=EB=A5=A0=EC=9D=84=20=EB=82=AE?=
 =?UTF-8?q?=EC=B6=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GeneralAI.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 770c5006..9c972ad1 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -3310,7 +3310,11 @@ class GeneralAI
         }
 
         if ($this->rng->nextBool(0.3)) {
-            if ($env['startyear'] + 3 > $env['year']) {
+            if ($general->getVar('affinity') == 999) {
+                return null;
+            }
+
+            if ($env['year'] < $env['startyear'] + 3) {
                 //초기 임관 기간에서는 국가가 적을수록 임관 시도가 적음
                 $nationCnt = $db->queryFirstField('SELECT count(nation) FROM nation');
                 $notFullNationCnt = $db->queryFirstField('SELECT count(nation) FROM nation WHERE gennum < %i', GameConst::$initialNationGenLimit);
@@ -3322,9 +3326,11 @@ class GeneralAI
                     return null;
                 }
             }
-
-            if ($general->getVar('affinity') == 999) {
-                return null;
+            else{
+                //임관 기간이 끝나면 고정 확률로 낮춤 0.3 * 0.5 = 0.15
+                if ($this->rng->nextBool()){
+                    return null;
+                }
             }
 
             //랜임 커맨드 입력.