From 45ed63ffe35344298b91c185af2629223a1b01cb Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Sep 2019 01:38:29 +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         | 19 +++++++++++++------
 hwe/func_command.php |  4 +++-
 hwe/func_npc.php     |  3 ---
 hwe/j_install.php    |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index bfee6aac..3a3f71f7 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1618,10 +1618,13 @@ function checkTurn() {
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
             PreprocessCommand($general['no']);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            
-            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) { processAI($general['no']); }    // npc AI 처리
+            $reduce_turn = false;
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
+                processAI($general['no']); 
+                $reduce_turn = true;
+            }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
             updateCommand($general['no']);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1733,12 +1736,16 @@ function checkTurn() {
             //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
             //if(PROCESS_LOG) pushProcessLog($processlog);
             
-            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            if($general['npc'] >= 2) { processAI($general['no']); }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
             PreprocessCommand($general['no']);
+            $reduce_turn = false;
+            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) { 
+                processAI($general['no']); 
+                $reduce_turn = true;
+            }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
             updateCommand($general['no']);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
diff --git a/hwe/func_command.php b/hwe/func_command.php
index 12874364..e44db0f2 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -483,7 +483,7 @@ function getCoreTurn($nation, $level) {
 }
 
 
-function processCommand($no) {
+function processCommand($no, $reduceTurn) {
     $session = Session::getInstance();
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -561,6 +561,8 @@ function processCommand($no) {
             $newKillturn = $general['killturn'] - 1;
         } elseif($command[0] == 0) {
             $newKillturn = $general['killturn'] - 1;
+        } elseif($reduceTurn = true){
+            $newKillturn = $general['killturn'] - 1;
         } else {
             $newKillturn = $killturn;
         }
diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 539360fc..eb0c335c 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -274,7 +274,6 @@ function processAI($no) {
     }
 
 
-
     $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
@@ -321,7 +320,6 @@ function processAI($no) {
     }
 
     $autorun_user = $admin['autorun_user'];
-    
     if($general['npc'] < 2){
         $autorun_limit_minutes = $autorun_user['limit_minutes']??0;
         if(!$autorun_limit_minutes){
@@ -343,7 +341,6 @@ function processAI($no) {
 
     $allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]);
 
-
     $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
diff --git a/hwe/j_install.php b/hwe/j_install.php
index 387617ab..6435427c 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -132,7 +132,7 @@ if($autorun_user_minutes < 0){
 
 $autorun_user = $autorun_user_minutes?[
     'limit_minutes'=>$autorun_user_minutes,
-    'option'=>$autorun_user_options
+    'options'=>$autorun_user_options
 ]:null;
 
 if($reserve_open){