From 8efa3c70ab1695c575de47d84c094ad2882abe40 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 2 May 2019 03:09:01 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=B9=84=20=EB=81=94=20=ED=8C=A8?=
 =?UTF-8?q?=EB=84=90=ED=8B=B0=20=EC=82=AD=EC=A0=9C,=20=EB=82=B4=EC=A0=95?=
 =?UTF-8?q?=20100%=20=EC=B4=88=EA=B3=BC=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_myPage.php     | 18 ++++--------------
 hwe/func_process.php |  6 ------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index e72171e4..a1a8683d 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -46,20 +46,10 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
         $submit = 'hidden';
     }
 
-    if($mode == 0){
-        $db->update('general', [
-            'myset'=>$db->sqleval('myset-1'),
-            'mode'=>$mode,
-            'train'=>max(0, $me['train'] - 3),
-            'atmos'=>max(0, $me['atmos'] - 3),
-        ], 'owner=%i AND mode!=%i', $userID, $mode);
-    }
-    else{
-        $db->update('general', [
-            'myset'=>$db->sqleval('myset-1'),
-            'mode'=>$mode
-        ], 'owner=%i AND mode!=%i', $userID, $mode);
-    }
+    $db->update('general', [
+        'myset'=>$db->sqleval('myset-1'),
+        'mode'=>$mode
+    ], 'owner=%i AND mode!=%i', $userID, $mode);
 
     if($db->affectedRows()){
         $me['myset'] -= 1;
diff --git a/hwe/func_process.php b/hwe/func_process.php
index 20e4f07f..0af41093 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -224,8 +224,6 @@ function process_1(&$general, $type) {
         $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. $dtype 실패. <1>$date</>";
     } elseif($general['gold'] < $admin['develcost']) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($city["$stype"] >= $city["$stype"."2"]) {
-        $log[] = "<C>●</>{$admin['month']}월:{$dtype}{$btype} 충분합니다. $dtype 실패. <1>$date</>";
     } else {
         // 민심 50 이하이면 50과 같게
         if($city['rate'] < GameConst::$develrate) { $city['rate'] = GameConst::$develrate; }
@@ -533,8 +531,6 @@ function process_5(&$general, $type) {
         $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. $dtype 실패. <1>$date</>";
     } elseif($general['gold'] < $admin['develcost']) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($city["$stype"] >= $city["$stype"."2"]) {
-        $log[] = "<C>●</>{$admin['month']}월:{$dtype}는 충분합니다. $dtype 실패. <1>$date</>";
     } else {
         // 민심 50 이하이면 50과 같게
         if($city['rate'] < GameConst::$develrate) { $city['rate'] = GameConst::$develrate; }
@@ -653,8 +649,6 @@ function process_7(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 정착 장려 실패. <1>$date</>";
     } elseif($general['rice'] < $admin['develcost'] * 2) {
         $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. 정착 장려 실패. <1>$date</>";
-    } elseif($city['pop'] >= $city['pop2']) {
-        $log[] = "<C>●</>{$admin['month']}월:이미 포화상태입니다. 정착 장려 실패. <1>$date</>";
     } else {
         $score = getGeneralLeadership($general, true, true, true);
         $score = $score * (100 + $general['explevel']/5)/100;