diff --git a/hwe/_admin5.php b/hwe/_admin5.php index 3bb69c5e..c73b8b81 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -157,7 +157,7 @@ SELECT A.power, A.color, A.tech, - A.sabotagelimit, + A.strategic_cmd_limit, A.gold, A.rice, COUNT(B.nation) AS gennum, @@ -231,7 +231,7 @@ for($i=0; $i < $nationCount; $i++) {  {$gen['cnt']}   {$city['cnt']}   {$nation['tech']}  -  {$nation['sabotagelimit']}  +  {$nation['strategic_cmd_limit']}   {$nation['gold']}   {$nation['rice']}   {$gen['avgg']}  diff --git a/hwe/func.old.php b/hwe/func.old.php index b8a273c7..2c43abc9 100644 --- a/hwe/func.old.php +++ b/hwe/func.old.php @@ -266,7 +266,7 @@ function myNationInfo() { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); - $query = "select nation,name,color,power,msg,gold,rice,bill,rate,scout,war,sabotagelimit,surlimit,tech,level,type from nation where nation='{$me['nation']}'"; + $query = "select nation,name,color,power,msg,gold,rice,bill,rate,scout,war,strategic_cmd_limit,surlimit,tech,level,type from nation where nation='{$me['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); @@ -346,14 +346,14 @@ function myNationInfo() { $nation['tech'] = "$techCall / {$nation['tech']}"; if($me['nation']==0){ - $nation['sabotagelimit'] = "해당 없음"; + $nation['strategic_cmd_limit'] = "해당 없음"; $nation['surlimit'] = "해당 없음"; $nation['scout'] = "해당 없음"; $nation['war'] = "해당 없음"; $nation['power'] = "해당 없음"; } else { - if($nation['sabotagelimit'] != 0) { $nation['sabotagelimit'] = "{$nation['sabotagelimit']}턴"; } - else { $nation['sabotagelimit'] = "가 능"; } + if($nation['strategic_cmd_limit'] != 0) { $nation['strategic_cmd_limit'] = "{$nation['strategic_cmd_limit']}턴"; } + else { $nation['strategic_cmd_limit'] = "가 능"; } if($nation['surlimit'] != 0) { $nation['surlimit'] = "{$nation['surlimit']}턴"; } else { $nation['surlimit'] = "가 능"; } @@ -384,7 +384,7 @@ function myNationInfo() { 전 략 - {$nation['sabotagelimit']} + {$nation['strategic_cmd_limit']} 외 교 {$nation['surlimit']} diff --git a/hwe/func.php b/hwe/func.php index 86cd7096..fe0e3589 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -263,7 +263,7 @@ function myNationInfo() { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); - $query = "select nation,name,color,power,msg,gold,rice,bill,rate,scout,war,sabotagelimit,surlimit,tech,level,type from nation where nation='{$me['nation']}'"; + $query = "select nation,name,color,power,msg,gold,rice,bill,rate,scout,war,strategic_cmd_limit,surlimit,tech,level,type from nation where nation='{$me['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); @@ -343,14 +343,14 @@ function myNationInfo() { $nation['tech'] = "$techCall / {$nation['tech']}"; if($me['nation']==0){ - $nation['sabotagelimit'] = "해당 없음"; + $nation['strategic_cmd_limit'] = "해당 없음"; $nation['surlimit'] = "해당 없음"; $nation['scout'] = "해당 없음"; $nation['war'] = "해당 없음"; $nation['power'] = "해당 없음"; } else { - if($nation['sabotagelimit'] != 0) { $nation['sabotagelimit'] = "{$nation['sabotagelimit']}턴"; } - else { $nation['sabotagelimit'] = "가 능"; } + if($nation['strategic_cmd_limit'] != 0) { $nation['strategic_cmd_limit'] = "{$nation['strategic_cmd_limit']}턴"; } + else { $nation['strategic_cmd_limit'] = "가 능"; } if($nation['surlimit'] != 0) { $nation['surlimit'] = "{$nation['surlimit']}턴"; } else { $nation['surlimit'] = "가 능"; } @@ -381,7 +381,7 @@ function myNationInfo() { 전 략 - {$nation['sabotagelimit']} + {$nation['strategic_cmd_limit']} 외 교 {$nation['surlimit']} diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 0790f614..056bd3e7 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -404,7 +404,7 @@ function preUpdateMonthly() { //건국제한, 전략제한, 외교제한-1 $query = "update general set makelimit=makelimit-1 where makelimit>'0'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update nation set sabotagelimit=sabotagelimit-1 where sabotagelimit>'0'"; + $query = "update nation set strategic_cmd_limit=strategic_cmd_limit-1 where strategic_cmd_limit>'0'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $query = "update nation set surlimit=surlimit-1 where surlimit>'0'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/func_process.old.php b/hwe/func_process.old.php index 79ca10b7..da574a9f 100644 --- a/hwe/func_process.old.php +++ b/hwe/func_process.old.php @@ -1272,7 +1272,7 @@ function process_16(&$general) { $admin = $gameStor->getValues(['startyear', 'year', 'month']); - $query = "select nation,war,sabotagelimit,tech from nation where nation='{$general['nation']}'"; + $query = "select nation,war,strategic_cmd_limit,tech from nation where nation='{$general['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = MYDB_fetch_array($result); @@ -1287,7 +1287,7 @@ function process_16(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $destcity = MYDB_fetch_array($result); - $query = "select nation,sabotagelimit,tech from nation where nation='{$destcity['nation']}'"; + $query = "select nation,strategic_cmd_limit,tech from nation where nation='{$destcity['nation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $dnation = MYDB_fetch_array($result); diff --git a/hwe/func_process_chief.old.php b/hwe/func_process_chief.old.php index f2e45c26..d1a5b821 100644 --- a/hwe/func_process_chief.old.php +++ b/hwe/func_process_chief.old.php @@ -1281,7 +1281,7 @@ function process_71(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1314,7 +1314,7 @@ function process_71(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 필사즉생 실패. <1>$date"; } elseif($dipCount == 0) { $log[] = "●{$admin['month']}월:전쟁중이 아닙니다. 필사즉생 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 필사즉생 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:필사즉생 수행중... ({$term}/{$term2}) <1>$date"; @@ -1357,7 +1357,7 @@ function process_71(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1389,7 +1389,7 @@ function process_72(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1429,7 +1429,7 @@ function process_72(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 백성동원 실패. <1>$date"; } elseif($dipCount == 0) { $log[] = "●{$admin['month']}월:전쟁중이 아닙니다. 백성동원 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 백성동원 실패. <1>$date"; } elseif($destcity['nation'] != $general['nation']) { $log[] = "●{$admin['month']}월:아국 도시만 가능합니다. 백성동원 실패. <1>$date"; @@ -1474,7 +1474,7 @@ function process_72(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1506,7 +1506,7 @@ function process_73(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1554,7 +1554,7 @@ function process_73(&$general) { $log[] = "●{$admin['month']}월:대상도시가 아국입니다. 수몰 실패. <1>$date"; } elseif($dip['state'] > 0) { $log[] = "●{$admin['month']}월:전쟁중인 상대국에만 가능합니다. 수몰 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 수몰 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:수몰 수행중... ({$term}/{$term2}) <1>$date"; @@ -1607,7 +1607,7 @@ function process_73(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1639,7 +1639,7 @@ function process_74(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1687,7 +1687,7 @@ function process_74(&$general) { $log[] = "●{$admin['month']}월:대상도시가 아국입니다. 허보 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 허보 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 허보 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:허보 수행중... ({$term}/{$term2}) <1>$date"; @@ -1753,7 +1753,7 @@ function process_74(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1785,7 +1785,7 @@ function process_75(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1827,7 +1827,7 @@ function process_75(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 피장파장 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 피장파장 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 피장파장 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:피장파장 수행중... ({$term}/{$term2}) <1>$date"; @@ -1872,7 +1872,7 @@ function process_75(&$general) { pushNationHistory($destnation, "●{$admin['year']}년 {$admin['month']}월:{$nation['name']}의 {$general['name']}{$josaYi} 아국에 피장파장을 발동"); //전략기한+60 - $query = "update nation set sabotagelimit=sabotagelimit+60 where nation='{$destnation['nation']}'"; + $query = "update nation set strategic_cmd_limit=strategic_cmd_limit+60 where nation='{$destnation['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 국가보정 @@ -1881,7 +1881,7 @@ function process_75(&$general) { //전략기한, 최소72 if($term3 < 72) { $term3 = 72; } - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1913,7 +1913,7 @@ function process_76(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1942,7 +1942,7 @@ function process_76(&$general) { $log[] = "●{$admin['month']}월:아국이 아닙니다. 의병모집 실패. <1>$date"; } elseif($general['level'] < 5) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 의병모집 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 의병모집 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:의병모집 수행중... ({$term}/{$term2}) <1>$date"; @@ -2090,7 +2090,7 @@ function process_76(&$general) { //전략기한 $db->update('nation', [ - 'sabotagelimit'=>$term3, + 'strategic_cmd_limit'=>$term3, 'gennum'=>$db->sqleval('gennum + %i', $addGenCount), ], 'nation=%i', $general['nation']); @@ -2123,7 +2123,7 @@ function process_77(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -2163,7 +2163,7 @@ function process_77(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 이호경식 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 이호경식 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 이호경식 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:이호경식 수행중... ({$term}/{$term2}) <1>$date"; @@ -2221,7 +2221,7 @@ function process_77(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -2253,7 +2253,7 @@ function process_78(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -2295,7 +2295,7 @@ function process_78(&$general) { $log[] = "●{$admin['month']}월:선포중인 상대국에만 가능합니다. 급습 실패. <1>$date"; } elseif($dip['term'] < 12) { $log[] = "●{$admin['month']}월:선포 12개월 이상인 상대국에만 가능합니다. 급습 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 급습 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:급습 수행중... ({$term}/{$term2}) <1>$date"; @@ -2348,7 +2348,7 @@ function process_78(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -2379,7 +2379,7 @@ function process_81(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,can_change_flag,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,can_change_flag,name,type,strategic_cmd_limit,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); diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 6ebf1ca7..e4998241 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -1,77 +1,6 @@ get(); - - $log = []; - $alllog = []; - $history = []; - $youlog = []; - $date = substr($general['turntime'],11,5); - - $query = "select gold,rice,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); - - $command = DecodeCommand($nation["l{$general['level']}turn0"]); - $who = $command[2]; - $where = $command[1]; - - $admin = $gameStor->getValues(['year','month']); - - $query = "select nation,supply from city where city='{$general['city']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $city = MYDB_fetch_array($result); - - $query = "select no,name,nation,level from general where no='$who'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $you = MYDB_fetch_array($result); - - $query = "select name,nation,supply from city where city='$where'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $destcity = MYDB_fetch_array($result); - - if(!$you) { - $log[] = "●{$admin['month']}월:없는 장수입니다. 발령 실패. <1>$date"; - } elseif($general['no'] == $who) { - $log[] = "●{$admin['month']}월:자기 자신입니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($general['level'] < 5) { - $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($city['nation'] != $general['nation']) { - $log[] = "●{$admin['month']}월:아국이 아닙니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($destcity['supply'] == 0) { - $log[] = "●{$admin['month']}월:고립된 도시입니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($city['supply'] == 0) { - $log[] = "●{$admin['month']}월:고립된 도시입니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($destcity['nation'] != $general['nation']) { - $log[] = "●{$admin['month']}월:아국 도시가 아닙니다. {$you['name']} 발령 실패. <1>$date"; - } elseif($general['nation'] != $you['nation']) { - $log[] = "●{$admin['month']}월:아국 장수가 아닙니다. {$you['name']} 발령 실패. <1>$date"; - } else { - $josaUl = JosaUtil::pick($you['name'], '을'); - $josaRo = JosaUtil::pick($destcity['name'], '로'); - $log[] = "●{$admin['month']}월:{$you['name']}{$josaUl} {$destcity['name']}{$josaRo} 발령했습니다. <1>$date"; - $youlog[] = "●{$general['name']}에 의해 {$destcity['name']}{$josaRo} 발령됐습니다. <1>$date"; - - // 발령 - $query = "update general set city='$where' where no='{$you['no']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - - // 경험치 상승 - $query = "update general set resturn='SUCCESS' where no='{$general['no']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - -// $log = checkAbility($general, $log); - } - - pushGenLog($general, $log); - pushGenLog($you, $youlog); -} - - function process_51(&$general) { $db = DB::db(); @@ -1066,7 +995,7 @@ function process_71(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1099,7 +1028,7 @@ function process_71(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 필사즉생 실패. <1>$date"; } elseif($dipCount == 0) { $log[] = "●{$admin['month']}월:전쟁중이 아닙니다. 필사즉생 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 필사즉생 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:필사즉생 수행중... ({$term}/{$term2}) <1>$date"; @@ -1142,7 +1071,7 @@ function process_71(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1174,7 +1103,7 @@ function process_72(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1214,7 +1143,7 @@ function process_72(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 백성동원 실패. <1>$date"; } elseif($dipCount == 0) { $log[] = "●{$admin['month']}월:전쟁중이 아닙니다. 백성동원 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 백성동원 실패. <1>$date"; } elseif($destcity['nation'] != $general['nation']) { $log[] = "●{$admin['month']}월:아국 도시만 가능합니다. 백성동원 실패. <1>$date"; @@ -1259,7 +1188,7 @@ function process_72(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1291,7 +1220,7 @@ function process_73(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1339,7 +1268,7 @@ function process_73(&$general) { $log[] = "●{$admin['month']}월:대상도시가 아국입니다. 수몰 실패. <1>$date"; } elseif($dip['state'] > 0) { $log[] = "●{$admin['month']}월:전쟁중인 상대국에만 가능합니다. 수몰 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 수몰 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:수몰 수행중... ({$term}/{$term2}) <1>$date"; @@ -1392,7 +1321,7 @@ function process_73(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1424,7 +1353,7 @@ function process_74(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1472,7 +1401,7 @@ function process_74(&$general) { $log[] = "●{$admin['month']}월:대상도시가 아국입니다. 허보 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 허보 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 허보 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:허보 수행중... ({$term}/{$term2}) <1>$date"; @@ -1538,7 +1467,7 @@ function process_74(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1570,7 +1499,7 @@ function process_75(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1612,7 +1541,7 @@ function process_75(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 피장파장 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 피장파장 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 피장파장 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:피장파장 수행중... ({$term}/{$term2}) <1>$date"; @@ -1657,7 +1586,7 @@ function process_75(&$general) { pushNationHistory($destnation, "●{$admin['year']}년 {$admin['month']}월:{$nation['name']}의 {$general['name']}{$josaYi} 아국에 피장파장을 발동"); //전략기한+60 - $query = "update nation set sabotagelimit=sabotagelimit+60 where nation='{$destnation['nation']}'"; + $query = "update nation set strategic_cmd_limit=strategic_cmd_limit+60 where nation='{$destnation['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 국가보정 @@ -1666,7 +1595,7 @@ function process_75(&$general) { //전략기한, 최소72 if($term3 < 72) { $term3 = 72; } - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -1698,7 +1627,7 @@ function process_76(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1727,7 +1656,7 @@ function process_76(&$general) { $log[] = "●{$admin['month']}월:아국이 아닙니다. 의병모집 실패. <1>$date"; } elseif($general['level'] < 5) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 의병모집 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 의병모집 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:의병모집 수행중... ({$term}/{$term2}) <1>$date"; @@ -1875,7 +1804,7 @@ function process_76(&$general) { //전략기한 $db->update('nation', [ - 'sabotagelimit'=>$term3, + 'strategic_cmd_limit'=>$term3, 'gennum'=>$db->sqleval('gennum + %i', $addGenCount), ], 'nation=%i', $general['nation']); @@ -1908,7 +1837,7 @@ function process_77(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -1948,7 +1877,7 @@ function process_77(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 이호경식 실패. <1>$date"; } elseif($dip['state'] > 1) { $log[] = "●{$admin['month']}월:선포,전쟁중인 상대국에만 가능합니다. 이호경식 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 이호경식 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:이호경식 수행중... ({$term}/{$term2}) <1>$date"; @@ -2006,7 +1935,7 @@ function process_77(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -2038,7 +1967,7 @@ function process_78(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,name,type,strategic_cmd_limit,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); @@ -2080,7 +2009,7 @@ function process_78(&$general) { $log[] = "●{$admin['month']}월:선포중인 상대국에만 가능합니다. 급습 실패. <1>$date"; } elseif($dip['term'] < 12) { $log[] = "●{$admin['month']}월:선포 12개월 이상인 상대국에만 가능합니다. 급습 실패. <1>$date"; - } elseif($nation['sabotagelimit'] > 0) { + } elseif($nation['strategic_cmd_limit'] > 0) { $log[] = "●{$admin['month']}월:전략기한이 남았습니다. 급습 실패. <1>$date"; } elseif($term < $term2) { $log[] = "●{$admin['month']}월:급습 수행중... ({$term}/{$term2}) <1>$date"; @@ -2133,7 +2062,7 @@ function process_78(&$general) { if($nation['type'] == 12) { $term3 = $term3 * 2; } //전략기한 - $query = "update nation set sabotagelimit={$term3} where nation='{$general['nation']}'"; + $query = "update nation set strategic_cmd_limit={$term3} where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //경험치, 공헌치 @@ -2164,7 +2093,7 @@ function process_81(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $city = MYDB_fetch_array($result); - $query = "select nation,can_change_flag,name,type,sabotagelimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'"; + $query = "select nation,can_change_flag,name,type,strategic_cmd_limit,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); diff --git a/hwe/func_process_personnel.old.php b/hwe/func_process_personnel.old.php index f2753864..b4116df5 100644 --- a/hwe/func_process_personnel.old.php +++ b/hwe/func_process_personnel.old.php @@ -894,7 +894,7 @@ function process_55(&$general) { 'rice'=>GameConst::$baserice, 'rate'=>20, 'bill'=>100, - 'sabotagelimit'=>36, + 'strategic_cmd_limit'=>36, 'surlimit'=>72, 'type'=>0, 'gennum'=>1 diff --git a/hwe/processing.php b/hwe/processing.php index 84ecf97e..4268ca9b 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -692,7 +692,7 @@ function command_25($turn, $command) { $joinedNations = Json::decode($me['nations']); - $query = "select nation,name,color,scout,scoutmsg,sabotagelimit,gennum from nation order by gennum"; + $query = "select nation,name,color,scout,scoutmsg,strategic_cmd_limit,gennum from nation order by gennum"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $count = MYDB_num_rows($result); diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php index 5a282950..4e7662a2 100644 --- a/hwe/sammo/Command/General/che_거병.php +++ b/hwe/sammo/Command/General/che_거병.php @@ -117,7 +117,7 @@ class che_거병 extends Command\GeneralCommand{ 'rice'=>GameConst::$baserice, 'rate'=>20, 'bill'=>100, - 'sabotagelimit'=>12, + 'strategic_cmd_limit'=>12, 'surlimit'=>72, 'type'=>0, 'gennum'=>1 diff --git a/hwe/sammo/Constraint/AllowStrategicCommand.php b/hwe/sammo/Constraint/AllowStrategicCommand.php new file mode 100644 index 00000000..122b0e00 --- /dev/null +++ b/hwe/sammo/Constraint/AllowStrategicCommand.php @@ -0,0 +1,32 @@ +nation)){ + if(!$throwExeception){return false; } + throw new \InvalidArgumentException("require war in nation"); + } + + return true; + } + + public function test():bool{ + $this->checkInputValues(); + $this->tested = true; + + if($this->nation['war'] == 0){ + return true; + } + + $this->reason = "현재 전쟁 금지입니다."; + return false; + } +} \ No newline at end of file diff --git a/hwe/sammo/Scenario/Nation.php b/hwe/sammo/Scenario/Nation.php index cf31fb01..169a1862 100644 --- a/hwe/sammo/Scenario/Nation.php +++ b/hwe/sammo/Scenario/Nation.php @@ -93,7 +93,7 @@ class Nation{ 'rate'=>15, 'scout'=>0, 'war'=>0, - 'sabotagelimit'=>24, + 'strategic_cmd_limit'=>24, 'surlimit'=>72, 'scoutmsg'=>$this->infoText, 'tech'=>$this->tech, diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index eb2efdf9..4137a402 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -180,7 +180,7 @@ CREATE TABLE `nation` ( `l5set` INT(1) NULL DEFAULT '0', `scout` INT(1) NULL DEFAULT '0', `war` INT(1) NULL DEFAULT '0', - `sabotagelimit` INT(4) NULL DEFAULT '36', + `strategic_cmd_limit` INT(4) NULL DEFAULT '36', `surlimit` INT(4) NULL DEFAULT '72', `scoutmsg` TEXT NULL DEFAULT '', `tech` float NULL DEFAULT '0',