diff --git a/twe/func.php b/twe/func.php index 66a9af85..0efe532d 100644 --- a/twe/func.php +++ b/twe/func.php @@ -758,7 +758,7 @@ function CoreCommandTable($connect) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); - $query = "select level,colset from nation where nation='{$me['nation']}'"; + $query = "select level,can_change_flag from nation where nation='{$me['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); @@ -832,7 +832,7 @@ function CoreCommandTable($connect) { addCommand("급습/1턴(전략{$term})", 78, $valid); commandGroup("", 1); commandGroup("====== 기 타 ======"); - if($nation['colset'] > 0) { + if($nation['can_change_flag'] > 0) { addCommand("국기 변경", 81, 1); } else { addCommand("국기 변경", 81, 0); diff --git a/twe/func_process_chief.php b/twe/func_process_chief.php index ea5be3d4..58ed001b 100644 --- a/twe/func_process_chief.php +++ b/twe/func_process_chief.php @@ -2244,7 +2244,7 @@ function process_81($connect, &$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,colset,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,can_change_flag,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); @@ -2258,7 +2258,7 @@ function process_81($connect, &$general) { $log[] = "●{$admin['month']}월:아국이 아닙니다. 국기변경 실패. <1>$date"; } elseif($general['level'] < 5) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 국기변경 실패. <1>$date"; - } elseif($nation['colset'] <= 0) { + } elseif($nation['can_change_flag'] <= 0) { $log[] = "●{$admin['month']}월:더이상 변경이 불가능합니다. 국기변경 실패. <1>$date"; } else { $log[] = "●{$admin['month']}월:국기를 변경합니다. <1>$date"; @@ -2284,7 +2284,7 @@ function process_81($connect, &$general) { addNationHistory($nation, "●{$admin['year']}년 {$admin['month']}월:{$general['name']}(이)가 국기를 변경"); //국기변경 - $query = "update nation set color='$color',colset=colset-1 where nation='{$nation['nation']}'"; + $query = "update nation set color='$color',can_change_flag=can_change_flag-1 where nation='{$nation['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 diff --git a/twe/schema.php b/twe/schema.php index 167e6692..9120ef19 100644 --- a/twe/schema.php +++ b/twe/schema.php @@ -181,7 +181,7 @@ $nation_schema = " create table nation ( nation int(6) not null auto_increment, `name` CHAR(64) NOT NULL COLLATE 'utf8_bin', - color char(10) not null, colset int(1) default 1, + color char(10) not null, can_change_flag int(1) default 1, onlinegen varchar(1024) default '', msg text default '', capital int(1) default 0, capset int(1) default 0,