From 4d925b111d56474e01198eb3ae031720d72abd86 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 1 Feb 2018 00:45:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EA=B4=80,=20=EC=A0=84=EC=9F=81=20?=
 =?UTF-8?q?=EC=BC=AC/=EB=81=94=20=EC=A0=9C=ED=95=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/b_dipcenter.php   | 34 ++++++++++++++++------------------
 twe/c_dipcenter.php   |  8 ++++----
 twe/func_gamerule.php |  3 +--
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/twe/b_dipcenter.php b/twe/b_dipcenter.php
index 4c02e2e3..24568ea9 100644
--- a/twe/b_dipcenter.php
+++ b/twe/b_dipcenter.php
@@ -172,7 +172,7 @@ echo "
 </table>
 ";
 
-$query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,myset,scoutmsg,secretlimit from nation where nation='{$me['nation']}'";
+$query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,scoutmsg,secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $nation = MYDB_fetch_array($result);
 
@@ -259,27 +259,25 @@ echo "
                     <td align=right id=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read;?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['secretlimit']?>>년 <input type=<?=$btn;?> name=btn value=기밀권한></td>
                     <td align=right id=bg1>임관&전쟁 변경 가능</td>
-                    <td align=center><?=$nation['myset'];?> 회</td>
+                    <td align=center>무제한</td>
                 </tr>
                 <tr>
                     <td colspan=4 align=center>
 <?php
-if($nation['myset'] > 0) {
-    if($nation['scout'] == 0) {
-        echo "
-        <input type=$btn name=btn value='임관 금지'>";
-    } else {
-        echo "
-        <input type=$btn name=btn value='임관 허가'>";
-    }
-    
-    if($nation['war'] == 0) {
-        echo "
-        <input type=$btn name=btn value='전쟁 금지'>";
-    } else {
-        echo "
-        <input type=$btn name=btn value='전쟁 허가'>";
-    }
+if($nation['scout'] == 0) {
+    echo "
+    <input type=$btn name=btn value='임관 금지'>";
+} else {
+    echo "
+    <input type=$btn name=btn value='임관 허가'>";
+}
+
+if($nation['war'] == 0) {
+    echo "
+    <input type=$btn name=btn value='전쟁 금지'>";
+} else {
+    echo "
+    <input type=$btn name=btn value='전쟁 허가'>";
 }
 ?>
                     </td>
diff --git a/twe/c_dipcenter.php b/twe/c_dipcenter.php
index 84759dc1..695f52bb 100644
--- a/twe/c_dipcenter.php
+++ b/twe/c_dipcenter.php
@@ -44,16 +44,16 @@ if($btn == "국가방침") {
     $query = "update nation set secretlimit='$secretlimit' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "임관 금지") {
-    $query = "update nation set myset=myset-1,scout='1' where nation='{$me['nation']}' and myset>0";
+    $query = "update nation set scout='1' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "임관 허가") {
-    $query = "update nation set myset=myset-1,scout='0' where nation='{$me['nation']}' and myset>0";
+    $query = "update nation set scout='0' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "전쟁 금지") {
-    $query = "update nation set myset=myset-1,war='1' where nation='{$me['nation']}' and myset>0";
+    $query = "update nation set war='1' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "전쟁 허가") {
-    $query = "update nation set myset=myset-1,war='0' where nation='{$me['nation']}' and myset>0";
+    $query = "update nation set war='0' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 }
 
diff --git a/twe/func_gamerule.php b/twe/func_gamerule.php
index 2676585d..789340b8 100644
--- a/twe/func_gamerule.php
+++ b/twe/func_gamerule.php
@@ -994,8 +994,7 @@ function updateNationState($connect) {
         $gennum = $gencount;
         if($gencount < 10) $gencount = 10;
         //기술 및 변경횟수 업데이트
-        $myset = $nation['level'] + 1;
-        $query = "update nation set tech=totaltech/'$gencount',gennum='$gennum',myset='$myset' where nation='{$nation['nation']}'";
+        $query = "update nation set tech=totaltech/'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
     pushHistory($connect, $history);