diff --git a/twe/_simul.php b/twe/_simul.php
index 6a8800a1..af4fdab6 100644
--- a/twe/_simul.php
+++ b/twe/_simul.php
@@ -46,7 +46,7 @@ $rice = 0;
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "시뮬", 2);
+increaseRefresh("시뮬", 2);
$query = "select no,tournament,userlevel,con,turntime from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_bestGeneral.php b/twe/a_bestGeneral.php
index 7eeb8985..4219581c 100644
--- a/twe/a_bestGeneral.php
+++ b/twe/a_bestGeneral.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "명장일람", 2);
+increaseRefresh("명장일람", 2);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_emperior.php b/twe/a_emperior.php
index f4b2e857..a6b5c119 100644
--- a/twe/a_emperior.php
+++ b/twe/a_emperior.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "왕조일람", 2);
+increaseRefresh("왕조일람", 2);
?>
diff --git a/twe/a_emperior2.php b/twe/a_emperior2.php
index 3e85948f..bfc7ccff 100644
--- a/twe/a_emperior2.php
+++ b/twe/a_emperior2.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "왕조일람", 2);
+increaseRefresh("왕조일람", 2);
?>
diff --git a/twe/a_genList.php b/twe/a_genList.php
index 92154990..d57c771f 100644
--- a/twe/a_genList.php
+++ b/twe/a_genList.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "장수일람", 2);
+increaseRefresh("장수일람", 2);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_hallOfFame.php b/twe/a_hallOfFame.php
index d5f9cd0a..84839abe 100644
--- a/twe/a_hallOfFame.php
+++ b/twe/a_hallOfFame.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "명예의전당", 2);
+increaseRefresh("명예의전당", 2);
?>
diff --git a/twe/a_history.php b/twe/a_history.php
index 1b39c208..dd6dcb54 100644
--- a/twe/a_history.php
+++ b/twe/a_history.php
@@ -5,7 +5,7 @@ $yearmonth = $_POST['yearmonth'];
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "연감", 5);
+increaseRefresh("연감", 5);
$query = "select startyear,year,month,conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_kingdomList.php b/twe/a_kingdomList.php
index 63804a48..4a655850 100644
--- a/twe/a_kingdomList.php
+++ b/twe/a_kingdomList.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "세력일람", 2);
+increaseRefresh("세력일람", 2);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_npcList.php b/twe/a_npcList.php
index aaccd11a..2ec80267 100644
--- a/twe/a_npcList.php
+++ b/twe/a_npcList.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "빙의일람", 2);
+increaseRefresh("빙의일람", 2);
if($type == 0) {
$type = 1;
diff --git a/twe/a_status.php b/twe/a_status.php
index 3def8b11..72310f03 100644
--- a/twe/a_status.php
+++ b/twe/a_status.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "세력도", 2);
+increaseRefresh("세력도", 2);
checkTurn($connect);
$query = "select conlimit from game where no=1";
diff --git a/twe/a_traffic.php b/twe/a_traffic.php
index 4a714694..4fef4259 100644
--- a/twe/a_traffic.php
+++ b/twe/a_traffic.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "갱신정보", 2);
+increaseRefresh("갱신정보", 2);
$query = "select year,month,refresh,maxrefresh,maxonline from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/a_vote.php b/twe/a_vote.php
index 0201882d..9178ea45 100644
--- a/twe/a_vote.php
+++ b/twe/a_vote.php
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "설문조사", 1);
+increaseRefresh("설문조사", 1);
$query = "select no,userlevel,vote from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_auction.php b/twe/b_auction.php
index ee1467c8..324104eb 100644
--- a/twe/b_auction.php
+++ b/twe/b_auction.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "거래장", 2);
+increaseRefresh("거래장", 2);
$query = "select no,special,skin,userlevel,con,turntime from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_battleCenter.php b/twe/b_battleCenter.php
index 5dd8fff2..356597c6 100644
--- a/twe/b_battleCenter.php
+++ b/twe/b_battleCenter.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "감찰부", 2);
+increaseRefresh("감찰부", 2);
//전투 추진을 위해 갱신
checkTurn($connect);
diff --git a/twe/b_betting.php b/twe/b_betting.php
index 97fea639..3af3e0f5 100644
--- a/twe/b_betting.php
+++ b/twe/b_betting.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "베팅장", 1);
+increaseRefresh("베팅장", 1);
checkTurn($connect);
$query = "select no,tournament,userlevel,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$_SESSION['noMember']}'";
diff --git a/twe/b_chiefboard.php b/twe/b_chiefboard.php
index b41f333c..edaec88c 100644
--- a/twe/b_chiefboard.php
+++ b/twe/b_chiefboard.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "기밀실", 1);
+increaseRefresh("기밀실", 1);
$query = "select skin,no,nation,level from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_chiefcenter.php b/twe/b_chiefcenter.php
index 6f199876..1b4c5d9f 100644
--- a/twe/b_chiefcenter.php
+++ b/twe/b_chiefcenter.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "사령부", 1);
+increaseRefresh("사령부", 1);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_currentCity.php b/twe/b_currentCity.php
index 1f2d6fa0..1ad63e4f 100644
--- a/twe/b_currentCity.php
+++ b/twe/b_currentCity.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "현재도시", 1);
+increaseRefresh("현재도시", 1);
$query = "select skin,no,nation,userlevel,level,city from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_dipcenter.php b/twe/b_dipcenter.php
index 7a40630b..b3d1540b 100644
--- a/twe/b_dipcenter.php
+++ b/twe/b_dipcenter.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "내무부", 1);
+increaseRefresh("내무부", 1);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_diplomacy.php b/twe/b_diplomacy.php
index 8e0d1146..c7b06b2f 100644
--- a/twe/b_diplomacy.php
+++ b/twe/b_diplomacy.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "중원정보", 1);
+increaseRefresh("중원정보", 1);
$query = "select turnterm from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_genList.php b/twe/b_genList.php
index e9c99d42..0db8fae5 100644
--- a/twe/b_genList.php
+++ b/twe/b_genList.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "암행부", 2);
+increaseRefresh("암행부", 2);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_myBossInfo.php b/twe/b_myBossInfo.php
index 5e0f2478..b6bf3474 100644
--- a/twe/b_myBossInfo.php
+++ b/twe/b_myBossInfo.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "인사부", 1);
+increaseRefresh("인사부", 1);
//훼섭 추방을 위해 갱신
checkTurn($connect);
diff --git a/twe/b_myCityInfo.php b/twe/b_myCityInfo.php
index ac2b4a93..7d461e45 100644
--- a/twe/b_myCityInfo.php
+++ b/twe/b_myCityInfo.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "세력도시", 1);
+increaseRefresh("세력도시", 1);
$query = "select no,nation,level,skin from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_myGenInfo.php b/twe/b_myGenInfo.php
index cf4f64a9..754c5e5c 100644
--- a/twe/b_myGenInfo.php
+++ b/twe/b_myGenInfo.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "세력장수", 1);
+increaseRefresh("세력장수", 1);
$query = "select skin,no,nation,level from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_myKingdomInfo.php b/twe/b_myKingdomInfo.php
index 7c1694be..49ab1b4c 100644
--- a/twe/b_myKingdomInfo.php
+++ b/twe/b_myKingdomInfo.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "세력정보", 1);
+increaseRefresh("세력정보", 1);
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_myPage.php b/twe/b_myPage.php
index 0347de70..77b84c7f 100644
--- a/twe/b_myPage.php
+++ b/twe/b_myPage.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "내정보", 1);
+increaseRefresh("내정보", 1);
$query = "select myset from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_nationboard.php b/twe/b_nationboard.php
index 03c2376b..b8e272b7 100644
--- a/twe/b_nationboard.php
+++ b/twe/b_nationboard.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "회의실", 1);
+increaseRefresh("회의실", 1);
$query = "select skin,no,nation from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/b_nationrule.php b/twe/b_nationrule.php
index 04eb3ac8..67e1c839 100644
--- a/twe/b_nationrule.php
+++ b/twe/b_nationrule.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "국법", 1);
+increaseRefresh("국법", 1);
?>
diff --git a/twe/b_tournament.php b/twe/b_tournament.php
index 9c9ee7df..e7da3f13 100644
--- a/twe/b_tournament.php
+++ b/twe/b_tournament.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "토너먼트", 1);
+increaseRefresh("토너먼트", 1);
checkTurn($connect);
$query = "select no,tournament,userlevel,con,turntime from general where owner='{$_SESSION['noMember']}'";
diff --git a/twe/b_troop.php b/twe/b_troop.php
index 3c44e7f0..e6339b41 100644
--- a/twe/b_troop.php
+++ b/twe/b_troop.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "부대편성", 1);
+increaseRefresh("부대편성", 1);
$query = "select skin,no,nation,troop from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/c_auction.php b/twe/c_auction.php
index b771300e..ee9cc78e 100644
--- a/twe/c_auction.php
+++ b/twe/c_auction.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "입찰", 1);
+increaseRefresh("입찰", 1);
$query = "select turnterm from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/c_betting.php b/twe/c_betting.php
index 27e19374..f3ed364d 100644
--- a/twe/c_betting.php
+++ b/twe/c_betting.php
@@ -8,7 +8,7 @@ include "func.php";
//로그인 검사
CheckLogin();
$connect = dbConn();
-increaseRefresh($connect, "베팅", 1);
+increaseRefresh("베팅", 1);
$query = "select tournament,phase,tnmt_type,develcost from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/event_1.php b/twe/event_1.php
index 051aa854..a92a174d 100644
--- a/twe/event_1.php
+++ b/twe/event_1.php
@@ -73,7 +73,7 @@ $eachCount = MYDB_num_rows($result);
$eachCount = round($eachCount / 7) * 2;
for($i=0; $i < 7; $i++) {
- RegNation($connect, $name[$i], "800000", 999999, 999999, "중원의 부패를 물리쳐라! 이민족 침범!", 15000, $eachCount, "병가", 0);
+ RegNation($name[$i], "800000", 999999, 999999, "중원의 부패를 물리쳐라! 이민족 침범!", 15000, $eachCount, "병가", 0);
}
//////////////////////////외교//////////////////////////////////////////////////
diff --git a/twe/event_2.php b/twe/event_2.php
index 97b58dda..e33a5b3f 100644
--- a/twe/event_2.php
+++ b/twe/event_2.php
@@ -77,7 +77,7 @@ $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($con
$info = MYDB_fetch_array($result);
for($i=0; $i < 7; $i++) {
- RegNation($connect, $name[$i], "800000", 99999, 99999, "오랑캐여 일어서라! 오랑캐 궐기!", $info['tch']+500, $eachCount, "병가", 0);
+ RegNation($name[$i], "800000", 99999, 99999, "오랑캐여 일어서라! 오랑캐 궐기!", $info['tch']+500, $eachCount, "병가", 0);
}
//////////////////////////외교//////////////////////////////////////////////////
diff --git a/twe/func.php b/twe/func.php
index 8f712be4..28c0b836 100644
--- a/twe/func.php
+++ b/twe/func.php
@@ -1208,7 +1208,7 @@ function generalInfo2($connect, $no, $skin) {
";
}
-function pushTrickLog($connect, $log) {
+function pushTrickLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_tricklog.txt", "a");
@@ -1219,7 +1219,7 @@ function pushTrickLog($connect, $log) {
}
}
-function pushProcessLog($connect, $log) {
+function pushProcessLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
@@ -1243,7 +1243,7 @@ function pushStepLog($log) {
fclose($fp);
}
-function pushLockLog($connect, $log) {
+function pushLockLog($log) {
$size = count($log);
if($size > 0) {
$date = date('Y_m_d');
@@ -1255,7 +1255,7 @@ function pushLockLog($connect, $log) {
}
}
-function pushAdminLog($connect, $log) {
+function pushAdminLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_adminlog.txt", "a");
@@ -1266,7 +1266,7 @@ function pushAdminLog($connect, $log) {
}
}
-function pushAuctionLog($connect, $log) {
+function pushAuctionLog($log) {
$size = count($log);
if($size > 0) {
$fp = fopen("logs/_auctionlog.txt", "a");
@@ -1817,74 +1817,17 @@ function CutDay($date) {
return $date;
}
-
-function increaseRefreshEx($type, $cnt=1){
- $db = getDB();
-
- $db->query("update `game` set `refresh` = `refresh` + %i where `no` = 1", $cnt);
-
- $date = date('Y-m-d H:i:s');
- $generalID = getGeneralID();
- if($generalID !== NULL){
-
- $db->query("update `general` set `lastrefresh`= %s_date, `con` = `con`+%d_cnt, `connect`= `connect`+ %d_cnt, '\
- '`refcnt` = `refcnt` + %d_cnt, `refresh` = `refresh` + %d_cnt where `no` =%i_generalID",array(
- 'date'=>$date,
- 'cnt'=>$cnt,
- 'generalID'=>$generalID
- ));
- }
-
- $date = date('Y_m_d H:i:s');
- $date2 = substr($date, 0, 10);
- $online = getOnlineNum();
- $fp = fopen("logs/_{$date2}_refresh.txt", "a");
- $msg = _String::Fill2($date,20," ")._String::Fill2(getUserID(),13," ")._String::Fill2(getGeneralName(),13," ")._String::Fill2($_SESSION['p_ip'],16," ")._String::Fill2($type, 10, " ")." 동접자: {$online}";
- fwrite($fp, $msg."\n");
- fclose($fp);
-
- $proxy_headers = array(
- 'HTTP_VIA',
- 'HTTP_X_FORWARDED_FOR',
- 'HTTP_FORWARDED_FOR',
- 'HTTP_X_FORWARDED',
- 'HTTP_FORWARDED',
- 'HTTP_CLIENT_IP',
- 'HTTP_FORWARDED_FOR_IP',
- 'VIA',
- 'X_FORWARDED_FOR',
- 'FORWARDED_FOR',
- 'X_FORWARDED',
- 'FORWARDED',
- 'CLIENT_IP',
- 'FORWARDED_FOR_IP',
- 'HTTP_PROXY_CONNECTION'
- );
-
- $str = "";
- foreach($proxy_headers as $x) {
- if(isset($_SERVER[$x])) $str .= "//{$x}:{$_SERVER[$x]}";
- }
- if($str != "") {
- file_put_contents("logs/_{$date2}_ipcheck.txt",
- sprintf("ID:%s//name:%s//REMOTE_ADDR:%s%s\n",
- getUserID(), getGeneralName(),$_SERVER['REMOTE_ADDR'],$str), FILE_APPEND);
- }
-
-
-}
-
-function increaseRefresh($connect, $type="", $cnt=1) {
+function increaseRefresh($type="", $cnt=1) {
$date = date('Y-m-d H:i:s');
- $query = "update game set refresh=refresh+'$cnt' where no='1'";
- MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+ getDB()->query('UPDATE game set refresh=refresh+%i where `no`=1', $cnt);
if(!util::array_get($_SESSION['noMember'], null)) {
- $query = sprintf("update general set lastrefresh='%s',con=con+'%d',connect=connect+'%d',refcnt=refcnt+'%d',refresh=refresh+'%d' where owner='%d'",
- $date,$cnt,$cnt,$cnt,$cnt,$_SESSION['noMember']);
-
- MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+ getDB()->query('UPDATE general set `lastrefresh`=%s_date, `con`=`con`+%i_cnt, `connect`=`connect`+%i_cnt, refcnt=refcnt+%i_cnt, refresh=refresh+%i_cnt where `no`=%i_no',[
+ 'date'=>$date,
+ 'cnt'=>$cnt,
+ 'owner'->getGeneralID()
+ ]);
}
$date = date('Y_m_d H:i:s');
@@ -1924,17 +1867,13 @@ function increaseRefresh($connect, $type="", $cnt=1) {
}
}
-function updateTraffic($connect) {
+function updateTraffic() {
$online = getOnlineNum();
-
- $query = "select year,month,refresh,maxonline,maxrefresh from game where no='1'";
- $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
- $game = MYDB_fetch_array($result);
+ $db = getDB();
+ $game = $db->queryFirstRow('SELECT year,month,refresh,maxonline,maxrefresh from game where no=1');
//최다갱신자
- $query = "select name,refresh from general order by refresh desc limit 0,1";
- $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
- $user = MYDB_fetch_array($result);
+ $user = $db->queryFirstRow('select name,refresh from general order by refresh desc limit 1');
if($game['maxrefresh'] < $game['refresh']) {
$game['maxrefresh'] = $game['refresh'];
@@ -1942,11 +1881,13 @@ function updateTraffic($connect) {
if($game['maxonline'] < $online) {
$game['maxonline'] = $online;
}
- $query = "update game set refresh=0,maxrefresh={$game['maxrefresh']},maxonline={$game['maxonline']} where no='1'";
- MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+ $db->update('game',[
+ 'refresh'=>0,
+ 'maxrefresh'=>$game['maxrefresh'],
+ 'maxonline'=>$game['maxonline']
+ ], 'no=1');
- $query = "update general set refresh=0";
- MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+ $db->update('general', ['refresh'=>0]);
$date = date('Y-m-d H:i:s');
$fp = fopen("logs/_traffic.txt", "a");
@@ -2138,7 +2079,7 @@ function checkTurn($connect) {
}
$locklog[0] = "- checkTurn() : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
- pushLockLog($connect, $locklog);
+ pushLockLog($locklog);
// 파일락 해제
if(!flock($fp, LOCK_UN)) { return; }
@@ -2146,7 +2087,7 @@ function checkTurn($connect) {
//if(!@sem_release($sema)) { echo "치명적 에러! 유기체에게 문의하세요!"; exit(1); }
$locklog[0] = "- checkTurn() 입 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
- pushLockLog($connect, $locklog);
+ pushLockLog($locklog);
//if(STEP_LOG) delStepLog();
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', 진입');
@@ -2189,7 +2130,7 @@ function checkTurn($connect) {
$general = MYDB_fetch_array($result);
//if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이전 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
- //if(PROCESS_LOG) pushProcessLog($connect, $processlog);
+ //if(PROCESS_LOG) pushProcessLog($processlog);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
if($general['npc'] >= 2) { processAI($connect, $general['no']); } // npc AI 처리
@@ -2206,13 +2147,13 @@ function checkTurn($connect) {
// 트래픽 업데이트
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTraffic');
- updateTraffic($connect);
+ updateTraffic();
// 1달마다 처리하는 것들, 벌점 감소 및 건국,전턴,합병 -1, 군량 소모
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', preUpdateMonthly');
$result = preUpdateMonthly($connect);
if($result == false) {
$locklog[0] = "-- checkTurn() 오류출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
- pushLockLog($connect, $locklog);
+ pushLockLog($locklog);
// 잡금 해제
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', unlock');
@@ -2225,7 +2166,7 @@ function checkTurn($connect) {
$admin['year'] = $dt[0]; $admin['month'] = $dt[1];
$locklog[0] = "-- checkTurn() ".$admin['month']."월 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
- pushLockLog($connect, $locklog);
+ pushLockLog($locklog);
// 분기계산. 장수들 턴보다 먼저 있다면 먼저처리
if($admin['month'] == 1) {
// NPC 등장
@@ -2296,7 +2237,7 @@ function checkTurn($connect) {
$general = MYDB_fetch_array($result);
//if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
- //if(PROCESS_LOG) pushProcessLog($connect, $processlog);
+ //if(PROCESS_LOG) pushProcessLog($processlog);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
if($general['npc'] >= 2) { processAI($connect, $general['no']); } // npc AI 처리
@@ -2341,7 +2282,7 @@ function checkTurn($connect) {
unlock();
$locklog[0] = "- checkTurn() 출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
- pushLockLog($connect, $locklog);
+ pushLockLog($locklog);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', finish');
diff --git a/twe/func_auction.php b/twe/func_auction.php
index 56cb0d91..ccc767b6 100644
--- a/twe/func_auction.php
+++ b/twe/func_auction.php
@@ -163,7 +163,7 @@ function processAuction($connect) {
if($auction['stuff'] != 0) {
if($auction['no2'] == 0) {
$auctionLog[0] = "◆>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 판매 유찰> : {$auction['name1']}>(이)가 ".GetStuffName($auction['stuff']).">(을)를 판매, 그러나 입찰자 부재";
- pushAuctionLog($connect, $auctionLog);
+ pushAuctionLog($auctionLog);
} else {
$trader['no'] = 0;
$trader['name'] = 'ⓝ암시장상인';
@@ -218,7 +218,7 @@ function processAuction($connect) {
}
pushGenLog($trader, $traderLog);
pushGenLog($bidder, $bidderLog);
- pushAuctionLog($connect, $auctionLog);
+ pushAuctionLog($auctionLog);
}
} else {
// 쌀 처리
@@ -236,7 +236,7 @@ function processAuction($connect) {
$auctionLog[0] = "◆>{$admin['year']}년 {$admin['month']}월, {$auction['no']}번 구매> 유찰> : {$auction['name1']}>(이)가 쌀 {$auction['amount']}>(을)를 구매, 그러나 입찰자 부재";
}
pushGenLog($trader, $traderLog);
- pushAuctionLog($connect, $auctionLog);
+ pushAuctionLog($auctionLog);
}
} else {
if($auction['no1'] == 0) {
@@ -293,7 +293,7 @@ function processAuction($connect) {
}
pushGenLog($trader, $traderLog);
pushGenLog($bidder, $bidderLog);
- pushAuctionLog($connect, $auctionLog);
+ pushAuctionLog($auctionLog);
//구매거래
} else {
if($auction['amount'] > $bidder['rice'] - 1000) {
@@ -335,7 +335,7 @@ function processAuction($connect) {
}
pushGenLog($trader, $traderLog);
pushGenLog($bidder, $bidderLog);
- pushAuctionLog($connect, $auctionLog);
+ pushAuctionLog($auctionLog);
}
}
}
diff --git a/twe/func_npc.php b/twe/func_npc.php
index d769975b..9b708647 100644
--- a/twe/func_npc.php
+++ b/twe/func_npc.php
@@ -1018,27 +1018,39 @@ function processAI($connect, $no) {
//종전하기, 지급율
//$command = $fourth * 100000000 + $type * 100000 + $crew * 100 + 11;
-function RegNation($connect,
- $name, $color, $gold, $rice, $scoutmsg, $tech, $gencount, $type, $level) {
+function RegNation($name, $color, $gold, $rice, $scoutmsg, $tech, $gencount, $type, $level) {
$type = NationCharCall($type);
$totaltech = $tech * $gencount;
- @MYDB_query("
- insert into nation (
- name,color,gold,rice,bill,rate,scout,war,tricklimit,surlimit,
- scoutmsg,tech,totaltech,type,level,gennum
- ) values (
- '$name','$color','$gold','$rice','100','15','0','0','24','72',
- '$scoutmsg','$tech','$totaltech','$type','$level','$gencount'
- )", $connect
- ) or Error(__LINE__.MYDB_error($connect),"");
+ getDB()->insert('nation', [
+ 'name'=>$name,
+ 'color'=>$color,
+ 'gold'=>$gold,
+ 'rice'=>$rice,
+ 'bill'=>100,
+ 'rate'=>15,
+ 'scout'=>0,
+ 'war'=>0,
+ 'tricklimit'=>24,
+ 'surlimit'=>72,
+ 'scoutmsg'=>$scoutmsg,
+ 'tech'=>$tech,
+ 'totaltech'=>$totaltech,
+ 'type'=>$type,
+ 'level'=>$level,
+ 'gennum'=>$gencount
+ ]);
}
-function RegCity($connect, $nation, $name, $cap=0) {
+function RegCity($nation, $name, $cap=0) {
$city = CityCall($name);
- @MYDB_query("update city set nation='$nation' where city='$city'",$connect) or Error(__LINE__.MYDB_error($connect),"");
- if($cap > 0) {
- @MYDB_query("update nation set capital='$city' where nation='$nation'",$connect) or Error(__LINE__.MYDB_error($connect),"");
+ getDB()->update('city', [
+ 'nation'=>$nation,
+ 'city'=>$city
+ ]);
+
+ if($cap > 0){
+ getDB()->update('nation', ['capital'=>city], 'nation = %i', $nation);
}
refreshNationStaticInfo();
}
diff --git a/twe/func_process_chief.php b/twe/func_process_chief.php
index a2d8bf0b..8e5c4d1a 100644
--- a/twe/func_process_chief.php
+++ b/twe/func_process_chief.php
@@ -1275,7 +1275,7 @@ function process_71($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1385,7 +1385,7 @@ function process_72($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1511,7 +1511,7 @@ function process_73($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1649,7 +1649,7 @@ function process_74($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1770,7 +1770,7 @@ function process_75($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -1984,7 +1984,7 @@ function process_76($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -2107,7 +2107,7 @@ function process_77($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
@@ -2227,7 +2227,7 @@ function process_78($connect, &$general) {
// pushHistory($history);
// pushAllLog($alllog);
- pushTrickLog($connect, $tricklog);
+ pushTrickLog($tricklog);
pushGenLog($general, $log);
}
diff --git a/twe/func_time_event.php b/twe/func_time_event.php
index 85c67357..d65a5b82 100644
--- a/twe/func_time_event.php
+++ b/twe/func_time_event.php
@@ -110,7 +110,7 @@ function processGoldIncome($connect) {
$history[0] = "●>{$admin['year']}년 {$admin['month']}월:【지급】>봄이 되어 봉록에 따라 자금이 지급됩니다.";
pushHistory($history);
- pushAdminLog($connect, $adminLog);
+ pushAdminLog($adminLog);
}
function popIncrease($connect) {
@@ -402,7 +402,7 @@ function processRiceIncome($connect) {
$history[0] = "●>{$admin['year']}년 {$admin['month']}월:【지급】>가을이 되어 봉록에 따라 군량이 지급됩니다.";
pushHistory($history);
- pushAdminLog($connect, $adminLog);
+ pushAdminLog($adminLog);
}
function getRiceIncome($connect, $nationNo, $rate, $admin_rate, $type) {
diff --git a/twe/index.php b/twe/index.php
index bc7d61e9..69f4f48e 100644
--- a/twe/index.php
+++ b/twe/index.php
@@ -4,7 +4,7 @@ include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "메인", 2);
+increaseRefresh("메인", 2);
checkTurn($connect);
$db = getDB();
diff --git a/twe/j_msgsubmit.php b/twe/j_msgsubmit.php
index 34af8391..c2db0e7f 100644
--- a/twe/j_msgsubmit.php
+++ b/twe/j_msgsubmit.php
@@ -42,7 +42,7 @@ if(!isSigned()){
$db = getDB();
$connect = dbConn();
-increaseRefresh($connect, '서신전달', 1);
+increaseRefresh('서신전달', 1);
if(getBlockLevel() == 1 || getBlockLevel() == 3) {
returnJson([
diff --git a/twe/join_post.php b/twe/join_post.php
index e781f7da..190c22d7 100644
--- a/twe/join_post.php
+++ b/twe/join_post.php
@@ -255,7 +255,7 @@ if($id_num) {
pushAllLog($log);
$adminLog[0] = "가입 : {$name} // {$me['name']} // {$id} // ".getenv("REMOTE_ADDR");
- pushAdminLog($connect, $adminLog);
+ pushAdminLog($adminLog);
MYDB_close($connect);
diff --git a/twe/preprocessing.php b/twe/preprocessing.php
index 39d49dd3..804ed7f9 100644
--- a/twe/preprocessing.php
+++ b/twe/preprocessing.php
@@ -4,7 +4,7 @@ include "func.php";
//로그인 검사
CheckLogin(1);
$connect = dbConn();
-increaseRefresh($connect, "턴입력", 1);
+increaseRefresh("턴입력", 1);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/proc.php b/twe/proc.php
index 7d9408b6..2be24607 100644
--- a/twe/proc.php
+++ b/twe/proc.php
@@ -3,5 +3,5 @@ include "lib.php";
include "func.php";
$connect = dbConn();
-increaseRefresh($connect, "자동", 2);
+increaseRefresh("자동", 2);
checkTurn($connect);
diff --git a/twe/process_war.php b/twe/process_war.php
index 89d2b78c..d95f7b70 100644
--- a/twe/process_war.php
+++ b/twe/process_war.php
@@ -414,7 +414,7 @@ function processWar($connect, $general, $city) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$adminLog[0] = "성벽 쌀 소모 : $rice";
- pushAdminLog($connect, $adminLog);
+ pushAdminLog($adminLog);
//원래대로 스케일링
$city['def'] = round($city['def'] / 10);
diff --git a/twe/scenario_1.php b/twe/scenario_1.php
index 05079deb..a11ab79c 100644
--- a/twe/scenario_1.php
+++ b/twe/scenario_1.php
@@ -49,9 +49,9 @@ $img = $admin['img'];
//역사모드1 : 184년 황건적의 난
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "후한", "800000", 10000, 10000, "후한왕조", 1500, 47, "유가", 7);
+RegNation("후한", "800000", 10000, 10000, "후한왕조", 1500, 47, "유가", 7);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "황건적", "FFD700", 10000, 10000, "황건적", 500, 23, "태평도", 2);
+RegNation("황건적", "FFD700", 10000, 10000, "황건적", 500, 23, "태평도", 2);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -746,30 +746,30 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////장수 끝///////////////////////////////////////////////
//////////////////////////도시 소속/////////////////////////////////////////////
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양", 1);
-RegCity($connect, 1, "완");
-RegCity($connect, 2, "계교");
-RegCity($connect, 2, "진류");
-RegCity($connect, 2, "관도");
-RegCity($connect, 2, "정도");
-RegCity($connect, 2, "평원");
-RegCity($connect, 2, "업", 1);
-RegCity($connect, 2, "복양");
-RegCity($connect, 2, "패");
-RegCity($connect, 2, "허창");
-RegCity($connect, 2, "초");
+RegCity(1, "계");
+RegCity(1, "역경");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "호관");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "하내");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양", 1);
+RegCity(1, "완");
+RegCity(2, "계교");
+RegCity(2, "진류");
+RegCity(2, "관도");
+RegCity(2, "정도");
+RegCity(2, "평원");
+RegCity(2, "업", 1);
+RegCity(2, "복양");
+RegCity(2, "패");
+RegCity(2, "허창");
+RegCity(2, "초");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_10.php b/twe/scenario_10.php
index 3cd3508b..ff285f1e 100644
--- a/twe/scenario_10.php
+++ b/twe/scenario_10.php
@@ -48,15 +48,15 @@ $img = $admin['img'];
//역사모드10 : 225년 칠종칠금
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조비", "000080", 10000, 10000, "정권을 안정시킨 조비", 1000, 96, "병가", 6);
+RegNation("조비", "000080", 10000, 10000, "정권을 안정시킨 조비", 1000, 96, "병가", 6);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "국력을 축적하는 손권", 1000, 49, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "국력을 축적하는 손권", 1000, 49, "덕가", 4);
//////////////////////////국가3////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "남만 정벌에 나서는 유선", 1000, 55, "유가", 4);
+RegNation("유비", "008000", 10000, 10000, "남만 정벌에 나서는 유선", 1000, 55, "유가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "맹획", "A0522D", 10000, 10000, "유선에 반기를 든 맹획", 1000, 15, "도적", 1);
+RegNation("맹획", "A0522D", 10000, 10000, "유선에 반기를 든 맹획", 1000, 15, "도적", 1);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "공손공", "A0522D", 10000, 10000, "공손공", 1000, 6, "도적", 1);
+RegNation("공손공", "A0522D", 10000, 10000, "공손공", 1000, 6, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -805,73 +805,73 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유비 국가4 맹획 국가5 공손공
-RegCity($connect, 1, "합비");
-RegCity($connect, 1, "광릉");
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "북평");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "평원");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "업");
-RegCity($connect, 1, "북해");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "안정");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 1, "수춘");
-RegCity($connect, 1, "신야");
-RegCity($connect, 1, "양양");
-RegCity($connect, 1, "상용");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "적벽");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 2, "강하");
-RegCity($connect, 2, "장사");
-RegCity($connect, 2, "계양");
-RegCity($connect, 2, "강릉");
-RegCity($connect, 2, "무릉");
-RegCity($connect, 2, "영릉");
-RegCity($connect, 2, "이릉");
-RegCity($connect, 3, "한중");
-RegCity($connect, 3, "양평");
-RegCity($connect, 3, "하변");
-RegCity($connect, 3, "가맹");
-RegCity($connect, 3, "자동");
-RegCity($connect, 3, "면죽");
-RegCity($connect, 3, "성도", 1);
-RegCity($connect, 3, "덕양");
-RegCity($connect, 3, "영안");
-RegCity($connect, 3, "강주");
-RegCity($connect, 3, "주시");
-RegCity($connect, 3, "귀양");
-RegCity($connect, 4, "운남");
-RegCity($connect, 4, "건녕", 1);
-RegCity($connect, 4, "남만");
-RegCity($connect, 5, "안평", 1);
+RegCity(1, "합비");
+RegCity(1, "광릉");
+RegCity(1, "역경");
+RegCity(1, "계교");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(1, "서주");
+RegCity(1, "호관");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "계");
+RegCity(1, "북평");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "평원");
+RegCity(1, "하내");
+RegCity(1, "업");
+RegCity(1, "북해");
+RegCity(1, "복양");
+RegCity(1, "안정");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "하비");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "하비");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(1, "수춘");
+RegCity(1, "신야");
+RegCity(1, "양양");
+RegCity(1, "상용");
+RegCity(2, "건업", 1);
+RegCity(2, "파양");
+RegCity(2, "적벽");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(2, "강하");
+RegCity(2, "장사");
+RegCity(2, "계양");
+RegCity(2, "강릉");
+RegCity(2, "무릉");
+RegCity(2, "영릉");
+RegCity(2, "이릉");
+RegCity(3, "한중");
+RegCity(3, "양평");
+RegCity(3, "하변");
+RegCity(3, "가맹");
+RegCity(3, "자동");
+RegCity(3, "면죽");
+RegCity(3, "성도", 1);
+RegCity(3, "덕양");
+RegCity(3, "영안");
+RegCity(3, "강주");
+RegCity(3, "주시");
+RegCity(3, "귀양");
+RegCity(4, "운남");
+RegCity(4, "건녕", 1);
+RegCity(4, "남만");
+RegCity(5, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_11.php b/twe/scenario_11.php
index 1ced7d45..d9e1fea7 100644
--- a/twe/scenario_11.php
+++ b/twe/scenario_11.php
@@ -48,13 +48,13 @@ $img = $admin['img'];
//역사모드11 : 228년 출사표
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조예", "000080", 10000, 10000, "제갈량의 북벌에 맞서 사마의를 내세운 조예", 1000, 85, "병가", 6);
+RegNation("조예", "000080", 10000, 10000, "제갈량의 북벌에 맞서 사마의를 내세운 조예", 1000, 85, "병가", 6);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "국력을 축적하는 손권", 1000, 42, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "국력을 축적하는 손권", 1000, 42, "덕가", 4);
//////////////////////////국가3////////////////////////////////////////////////
-RegNation($connect, "유선", "008000", 10000, 10000, "출사표에 감복하여 북벌을 허락한 유선", 1000, 64, "유가", 4);
+RegNation("유선", "008000", 10000, 10000, "출사표에 감복하여 북벌을 허락한 유선", 1000, 64, "유가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "공손공", "A0522D", 10000, 10000, "공손공", 1000, 6, "도적", 1);
+RegNation("공손공", "A0522D", 10000, 10000, "공손공", 1000, 6, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -803,75 +803,75 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유비 국가4 공손공
-RegCity($connect, 1, "기산");
-RegCity($connect, 1, "합비");
-RegCity($connect, 1, "광릉");
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "북평");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "평원");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "업");
-RegCity($connect, 1, "북해");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "안정");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 1, "수춘");
-RegCity($connect, 1, "신야");
-RegCity($connect, 1, "양양");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "적벽");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 2, "강하");
-RegCity($connect, 2, "장사");
-RegCity($connect, 2, "계양");
-RegCity($connect, 2, "강릉");
-RegCity($connect, 2, "무릉");
-RegCity($connect, 2, "영릉");
-RegCity($connect, 2, "이릉");
-RegCity($connect, 3, "상용");
-RegCity($connect, 3, "가정");
-RegCity($connect, 3, "한중");
-RegCity($connect, 3, "양평");
-RegCity($connect, 3, "하변");
-RegCity($connect, 3, "가맹");
-RegCity($connect, 3, "자동");
-RegCity($connect, 3, "면죽");
-RegCity($connect, 3, "성도", 1);
-RegCity($connect, 3, "덕양");
-RegCity($connect, 3, "영안");
-RegCity($connect, 3, "강주");
-RegCity($connect, 3, "주시");
-RegCity($connect, 3, "귀양");
-RegCity($connect, 3, "운남");
-RegCity($connect, 3, "건녕");
-RegCity($connect, 3, "남만");
-RegCity($connect, 4, "안평", 1);
+RegCity(1, "기산");
+RegCity(1, "합비");
+RegCity(1, "광릉");
+RegCity(1, "역경");
+RegCity(1, "계교");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(1, "서주");
+RegCity(1, "호관");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "계");
+RegCity(1, "북평");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "평원");
+RegCity(1, "하내");
+RegCity(1, "업");
+RegCity(1, "북해");
+RegCity(1, "복양");
+RegCity(1, "안정");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "하비");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "하비");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(1, "수춘");
+RegCity(1, "신야");
+RegCity(1, "양양");
+RegCity(2, "건업", 1);
+RegCity(2, "파양");
+RegCity(2, "적벽");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(2, "강하");
+RegCity(2, "장사");
+RegCity(2, "계양");
+RegCity(2, "강릉");
+RegCity(2, "무릉");
+RegCity(2, "영릉");
+RegCity(2, "이릉");
+RegCity(3, "상용");
+RegCity(3, "가정");
+RegCity(3, "한중");
+RegCity(3, "양평");
+RegCity(3, "하변");
+RegCity(3, "가맹");
+RegCity(3, "자동");
+RegCity(3, "면죽");
+RegCity(3, "성도", 1);
+RegCity(3, "덕양");
+RegCity(3, "영안");
+RegCity(3, "강주");
+RegCity(3, "주시");
+RegCity(3, "귀양");
+RegCity(3, "운남");
+RegCity(3, "건녕");
+RegCity(3, "남만");
+RegCity(4, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_12.php b/twe/scenario_12.php
index 963d780e..88ecb205 100644
--- a/twe/scenario_12.php
+++ b/twe/scenario_12.php
@@ -51,31 +51,31 @@ $img = $admin['img'];
//국가8 장로 국가9 유우 국가10 공손도 국가11 장양 국가12 공주 국가13 장연
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "원소", "FFFF00", 10000, 10000, "4세 5공 명문 혈통 기주 패자 원소", 1000, 40, "법가", 2);
+RegNation("원소", "FFFF00", 10000, 10000, "4세 5공 명문 혈통 기주 패자 원소", 1000, 40, "법가", 2);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "공손찬", "FF00FF", 10000, 10000, "병주 패자 북평 태수 공손찬", 1000, 26, "병가", 3);
+RegNation("공손찬", "FF00FF", 10000, 10000, "병주 패자 북평 태수 공손찬", 1000, 26, "병가", 3);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "동탁", "A9A9A9", 10000, 10000, "천하 권력을 노리는 동탁", 1500, 25, "법가", 5);
+RegNation("동탁", "A9A9A9", 10000, 10000, "천하 권력을 노리는 동탁", 1500, 25, "법가", 5);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "원술", "FFC0CB", 10000, 10000, "4세 5공 명문 혈통 원소의 사촌 원술", 1000, 25, "병가", 2);
+RegNation("원술", "FFC0CB", 10000, 10000, "4세 5공 명문 혈통 원소의 사촌 원술", 1000, 25, "병가", 2);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "유언", "483D8B", 10000, 10000, "익주 주자사 유언", 1000, 10, "유가", 3);
+RegNation("유언", "483D8B", 10000, 10000, "익주 주자사 유언", 1000, 10, "유가", 3);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서량 태수 마등", 1000, 9, "병가", 3);
+RegNation("마등", "808000", 10000, 10000, "서량 태수 마등", 1000, 9, "병가", 3);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 10000, 10000, "강하팔준 명성의 유표", 1000, 9, "유가", 3);
+RegNation("유표", "E0FFFF", 10000, 10000, "강하팔준 명성의 유표", 1000, 9, "유가", 3);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "유우", "6495ED", 10000, 10000, "황실 혈통 유우", 1000, 4, "유가", 3);
+RegNation("유우", "6495ED", 10000, 10000, "황실 혈통 유우", 1000, 4, "유가", 3);
//////////////////////////국가10////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
+RegNation("공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
//////////////////////////국가11////////////////////////////////////////////////
-RegNation($connect, "장양", "483D8B", 10000, 10000, "장양", 1000, 3, "묵가", 3);
+RegNation("장양", "483D8B", 10000, 10000, "장양", 1000, 3, "묵가", 3);
//////////////////////////국가12////////////////////////////////////////////////
-RegNation($connect, "공주", "800080", 10000, 10000, "공주", 1000, 3, "도가", 3);
+RegNation("공주", "800080", 10000, 10000, "공주", 1000, 3, "도가", 3);
//////////////////////////국가13////////////////////////////////////////////////
-RegNation($connect, "장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
+RegNation("장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -1117,44 +1117,44 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 원소 국가2 공손찬 국가3 동탁 국가4 원술 국가5 유언 국가6 마등 국가7 유표
//국가8 장로 국가9 유우 국가10 공손도 국가11 장양 국가12 공주 국가13 장연
-RegCity($connect, 1, "업", 1);
-RegCity($connect, 12, "허창", 1);
-RegCity($connect, 4, "낙양");
-RegCity($connect, 3, "장안", 1);
-RegCity($connect, 5, "성도", 1);
-RegCity($connect, 7, "양양", 1);
+RegCity(1, "업", 1);
+RegCity(12, "허창", 1);
+RegCity(4, "낙양");
+RegCity(3, "장안", 1);
+RegCity(5, "성도", 1);
+RegCity(7, "양양", 1);
-RegCity($connect, 2, "북평", 1);
-RegCity($connect, 2, "남피");
-RegCity($connect, 4, "완", 1);
-RegCity($connect, 2, "서주");
+RegCity(2, "북평", 1);
+RegCity(2, "남피");
+RegCity(4, "완", 1);
+RegCity(2, "서주");
-RegCity($connect, 9, "계", 1);
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 6, "서량", 1);
-RegCity($connect, 11, "하내", 1);
-RegCity($connect, 8, "한중", 1);
-RegCity($connect, 5, "강주");
+RegCity(9, "계", 1);
+RegCity(1, "복양");
+RegCity(1, "진류");
+RegCity(6, "서량", 1);
+RegCity(11, "하내", 1);
+RegCity(8, "한중", 1);
+RegCity(5, "강주");
-RegCity($connect, 10, "안평", 1);
-RegCity($connect, 13, "진양", 1);
-RegCity($connect, 2, "평원");
-RegCity($connect, 2, "북해");
-RegCity($connect, 2, "패");
-RegCity($connect, 6, "천수");
-RegCity($connect, 3, "안정");
-RegCity($connect, 5, "자동");
-RegCity($connect, 7, "강하");
+RegCity(10, "안평", 1);
+RegCity(13, "진양", 1);
+RegCity(2, "평원");
+RegCity(2, "북해");
+RegCity(2, "패");
+RegCity(6, "천수");
+RegCity(3, "안정");
+RegCity(5, "자동");
+RegCity(7, "강하");
-RegCity($connect, 4, "호로");
-RegCity($connect, 2, "역경");
-RegCity($connect, 2, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 6, "적도");
-RegCity($connect, 5, "면죽");
-RegCity($connect, 7, "장판");
+RegCity(4, "호로");
+RegCity(2, "역경");
+RegCity(2, "계교");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(6, "적도");
+RegCity(5, "면죽");
+RegCity(7, "장판");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_2.php b/twe/scenario_2.php
index 28b71ca8..a389bd2b 100644
--- a/twe/scenario_2.php
+++ b/twe/scenario_2.php
@@ -52,45 +52,45 @@ $img = $admin['img'];
//국가15 장로 국가16 유비 국가17 공융 국가18 장연 국가19 공손도 국가20 공주
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "동탁", "A9A9A9", 10000, 10000, "천하 권력을 노리는 동탁", 1500, 32, "법가", 5);
+RegNation("동탁", "A9A9A9", 10000, 10000, "천하 권력을 노리는 동탁", 1500, 32, "법가", 5);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "원소", "FFFF00", 10000, 10000, "4세 5공 명문 혈통 반동탁연합 맹주 원소", 1000, 18, "법가", 2);
+RegNation("원소", "FFFF00", 10000, 10000, "4세 5공 명문 혈통 반동탁연합 맹주 원소", 1000, 18, "법가", 2);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 10000, 10000, "강하팔준 명성의 유표", 1000, 14, "유가", 3);
+RegNation("유표", "E0FFFF", 10000, 10000, "강하팔준 명성의 유표", 1000, 14, "유가", 3);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "반동탁연합 실세력 조조", 1000, 11, "병가", 2);
+RegNation("조조", "000080", 10000, 10000, "반동탁연합 실세력 조조", 1000, 11, "병가", 2);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "유언", "483D8B", 10000, 10000, "익주 주자사 유언", 1000, 11, "유가", 3);
+RegNation("유언", "483D8B", 10000, 10000, "익주 주자사 유언", 1000, 11, "유가", 3);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "원술", "FFC0CB", 10000, 10000, "4세 5공 명문 혈통 원소의 사촌 원술", 1000, 10, "병가", 2);
+RegNation("원술", "FFC0CB", 10000, 10000, "4세 5공 명문 혈통 원소의 사촌 원술", 1000, 10, "병가", 2);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "손견", "FF0000", 10000, 10000, "강동의 호랑이 손견", 1000, 8, "병가", 3);
+RegNation("손견", "FF0000", 10000, 10000, "강동의 호랑이 손견", 1000, 8, "병가", 3);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "도겸", "00FF00", 10000, 10000, "서주목 도겸", 1000, 8, "유가", 4);
+RegNation("도겸", "00FF00", 10000, 10000, "서주목 도겸", 1000, 8, "유가", 4);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "공손찬", "FF00FF", 10000, 10000, "북평 태수 공손찬", 1000, 7, "병가", 3);
+RegNation("공손찬", "FF00FF", 10000, 10000, "북평 태수 공손찬", 1000, 7, "병가", 3);
//////////////////////////국가10////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서량 태수 마등", 1000, 6, "병가", 3);
+RegNation("마등", "808000", 10000, 10000, "서량 태수 마등", 1000, 6, "병가", 3);
//////////////////////////국가11////////////////////////////////////////////////
-RegNation($connect, "한복", "A0522D", 10000, 10000, "기주목 한복", 1000, 6, "도가", 4);
+RegNation("한복", "A0522D", 10000, 10000, "기주목 한복", 1000, 6, "도가", 4);
//////////////////////////국가12////////////////////////////////////////////////
-RegNation($connect, "유우", "6495ED", 10000, 10000, "황실 혈통 유우", 1000, 4, "유가", 3);
+RegNation("유우", "6495ED", 10000, 10000, "황실 혈통 유우", 1000, 4, "유가", 3);
//////////////////////////국가13////////////////////////////////////////////////
-RegNation($connect, "유대", "800000", 10000, 10000, "황실 혈통 유대", 1000, 4, "유가", 3);
+RegNation("유대", "800000", 10000, 10000, "황실 혈통 유대", 1000, 4, "유가", 3);
//////////////////////////국가14////////////////////////////////////////////////
-RegNation($connect, "장양", "483D8B", 10000, 10000, "장양", 1000, 4, "묵가", 3);
+RegNation("장양", "483D8B", 10000, 10000, "장양", 1000, 4, "묵가", 3);
//////////////////////////국가15////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 4, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 4, "오두미도", 1);
//////////////////////////국가16////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "평원 현령 유비", 1000, 3, "덕가", 1);
+RegNation("유비", "008000", 10000, 10000, "평원 현령 유비", 1000, 3, "덕가", 1);
//////////////////////////국가17////////////////////////////////////////////////
-RegNation($connect, "공융", "800080", 10000, 10000, "북해 태수 공융", 1000, 3, "덕가", 3);
+RegNation("공융", "800080", 10000, 10000, "북해 태수 공융", 1000, 3, "덕가", 3);
//////////////////////////국가18////////////////////////////////////////////////
-RegNation($connect, "장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
+RegNation("장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
//////////////////////////국가19////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 10000, 10000, "공손도", 1000, 2, "도적", 1);
+RegNation("공손도", "A0522D", 10000, 10000, "공손도", 1000, 2, "도적", 1);
//////////////////////////국가20////////////////////////////////////////////////
-RegNation($connect, "공주", "800080", 10000, 10000, "공주", 1000, 2, "도가", 3);
+RegNation("공주", "800080", 10000, 10000, "공주", 1000, 2, "도가", 3);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -1651,42 +1651,42 @@ RegGenX( 22, "희지재",$img,1678, 0, "-", 24, 5, 86, 0, 157, 194, "
//국가1 동탁 국가2 원소 국가3 유표 국가4 조조 국가5 유언 국가6 원술 국가7 손견
//국가8 도겸 국가9 공손찬 국가10 마등 국가11 한복 국가12 유우 국가13 유대 국가14 장양
//국가15 장로 국가16 유비 국가17 공융 국가18 장연 국가19 공손도 국가20 공주
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "안정");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양", 1);
-RegCity($connect, 2, "남피", 1);
-RegCity($connect, 3, "양양", 1);
-RegCity($connect, 3, "강하");
-RegCity($connect, 3, "장판");
-RegCity($connect, 4, "진류", 1);
-RegCity($connect, 5, "면죽");
-RegCity($connect, 5, "자동");
-RegCity($connect, 5, "성도", 1);
-RegCity($connect, 5, "강주");
-RegCity($connect, 6, "완", 1);
-RegCity($connect, 7, "장사", 1);
-RegCity($connect, 8, "하비");
-RegCity($connect, 8, "서주", 1);
-RegCity($connect, 8, "패");
-RegCity($connect, 9, "북평", 1);
-RegCity($connect, 10, "서량", 1);
-RegCity($connect, 10, "천수");
-RegCity($connect, 11, "업", 1);
-RegCity($connect, 12, "계", 1);
-RegCity($connect, 13, "복양", 1);
-RegCity($connect, 14, "하내", 1);
-RegCity($connect, 15, "한중", 1);
-RegCity($connect, 16, "평원", 1);
-RegCity($connect, 17, "북해", 1);
-RegCity($connect, 18, "진양", 1);
-RegCity($connect, 19, "안평", 1);
-RegCity($connect, 20, "초", 1);
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "호로");
+RegCity(1, "호관");
+RegCity(1, "사수");
+RegCity(1, "안정");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양", 1);
+RegCity(2, "남피", 1);
+RegCity(3, "양양", 1);
+RegCity(3, "강하");
+RegCity(3, "장판");
+RegCity(4, "진류", 1);
+RegCity(5, "면죽");
+RegCity(5, "자동");
+RegCity(5, "성도", 1);
+RegCity(5, "강주");
+RegCity(6, "완", 1);
+RegCity(7, "장사", 1);
+RegCity(8, "하비");
+RegCity(8, "서주", 1);
+RegCity(8, "패");
+RegCity(9, "북평", 1);
+RegCity(10, "서량", 1);
+RegCity(10, "천수");
+RegCity(11, "업", 1);
+RegCity(12, "계", 1);
+RegCity(13, "복양", 1);
+RegCity(14, "하내", 1);
+RegCity(15, "한중", 1);
+RegCity(16, "평원", 1);
+RegCity(17, "북해", 1);
+RegCity(18, "진양", 1);
+RegCity(19, "안평", 1);
+RegCity(20, "초", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_21.php b/twe/scenario_21.php
index 68861dab..9a8a50f8 100644
--- a/twe/scenario_21.php
+++ b/twe/scenario_21.php
@@ -48,11 +48,11 @@ $img = $admin['img'];
//가상모드1 : 180년 영웅 집결
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "魏", "000080", 10000, 10000, "중원의 패자 조조", 0, 1, "병가", 7);
+RegNation("魏", "000080", 10000, 10000, "중원의 패자 조조", 0, 1, "병가", 7);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "吳", "FF0000", 10000, 10000, "강동의 패자 손견", 0, 1, "덕가", 7);
+RegNation("吳", "FF0000", 10000, 10000, "강동의 패자 손견", 0, 1, "덕가", 7);
//////////////////////////국가3////////////////////////////////////////////////
-RegNation($connect, "蜀", "008000", 10000, 10000, "익주의 패자 유비", 0, 1, "유가", 7);
+RegNation("蜀", "008000", 10000, 10000, "익주의 패자 유비", 0, 1, "유가", 7);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -761,9 +761,9 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손견 국가3 유비
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 3, "성도", 1);
+RegCity(1, "허창", 1);
+RegCity(2, "건업", 1);
+RegCity(3, "성도", 1);
//////////////////////////도시 끝///////////////////////////////////////////////
diff --git a/twe/scenario_24.php b/twe/scenario_24.php
index fede79fb..e102f321 100644
--- a/twe/scenario_24.php
+++ b/twe/scenario_24.php
@@ -47,9 +47,9 @@ $admin = MYDB_fetch_array($result);
//가상모드4 : 180년 결사항전
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "유저", "FF0000", 10000, 10000, "오랑캐를 막아내라", 0, 1, "유가", 7);
+RegNation("유저", "FF0000", 10000, 10000, "오랑캐를 막아내라", 0, 1, "유가", 7);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "오랑캐", "0000FF", 10000, 10000, "중원을 정복하라", 0, 1, "병가", 7);
+RegNation("오랑캐", "0000FF", 10000, 10000, "중원을 정복하라", 0, 1, "병가", 7);
$query = "update nation set scout=1 where nation='2'";
MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
@@ -235,8 +235,8 @@ for($k=0; $k <= 99; $k++) {
//////////////////////////장수 끝///////////////////////////////////////////////
//////////////////////////도시 소속/////////////////////////////////////////////
-RegCity($connect, 1, "업", 1);
-RegCity($connect, 2, "양양", 1);
+RegCity(1, "업", 1);
+RegCity(2, "양양", 1);
//////////////////////////도시 끝///////////////////////////////////////////////
diff --git a/twe/scenario_27.php b/twe/scenario_27.php
index 5d47ac4c..d9b36af7 100644
--- a/twe/scenario_27.php
+++ b/twe/scenario_27.php
@@ -48,11 +48,11 @@ $img = $admin['img'];
//가상모드7 : 180년 가요대잔치
/*
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "SM", "000080", 10000, 10000, "SM", 0, 1, "병가", 1);
+RegNation( "SM", "000080", 10000, 10000, "SM", 0, 1, "병가", 1);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "JYP", "FF0000", 10000, 10000, "JYP", 0, 1, "덕가", 1);
+RegNation("JYP", "FF0000", 10000, 10000, "JYP", 0, 1, "덕가", 1);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "YG", "008000", 10000, 10000, "YG", 0, 1, "유가", 1);
+RegNation( "YG", "008000", 10000, 10000, "YG", 0, 1, "유가", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -480,106 +480,106 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1395, 0, "
//////////////////////////장수 끝///////////////////////////////////////////////
//////////////////////////도시 소속/////////////////////////////////////////////
-//RegCity($connect, 0, "업");
-//RegCity($connect, 0, "허창");
-//RegCity($connect, 0, "-");
-//RegCity($connect, 0, "장안");
-//RegCity($connect, 0, "성도");
-//RegCity($connect, 0, "양양");
-//RegCity($connect, 0, "건업");
+//RegCity(0, "업");
+//RegCity(0, "허창");
+//RegCity(0, "-");
+//RegCity(0, "장안");
+//RegCity(0, "성도");
+//RegCity(0, "양양");
+//RegCity(0, "건업");
-//RegCity($connect, 0, "북평");
-//RegCity($connect, 0, "남피");
-//RegCity($connect, 0, "완");
-//RegCity($connect, 0, "수춘");
-//RegCity($connect, 0, "서주");
-//RegCity($connect, 0, "강릉");
-//RegCity($connect, 0, "장사");
-//RegCity($connect, 0, "시상");
-//RegCity($connect, 0, "위례");
+//RegCity(0, "북평");
+//RegCity(0, "남피");
+//RegCity(0, "완");
+//RegCity(0, "수춘");
+//RegCity(0, "서주");
+//RegCity(0, "강릉");
+//RegCity(0, "장사");
+//RegCity(0, "시상");
+//RegCity(0, "위례");
-//RegCity($connect, 0, "계");
-//RegCity($connect, 0, "복양");
-//RegCity($connect, 0, "진류");
-//RegCity($connect, 0, "여남");
-//RegCity($connect, 0, "하비");
-//RegCity($connect, 0, "서량");
-//RegCity($connect, 0, "하내");
-//RegCity($connect, 0, "한중");
-//RegCity($connect, 0, "상용");
-//RegCity($connect, 0, "덕양");
-//RegCity($connect, 0, "강주");
-//RegCity($connect, 0, "건녕");
-//RegCity($connect, 0, "남해");
-//RegCity($connect, 0, "계양");
-//RegCity($connect, 0, "오");
-//RegCity($connect, 0, "평양");
-//RegCity($connect, 0, "사비");
-//RegCity($connect, 0, "계림");
+//RegCity(0, "계");
+//RegCity(0, "복양");
+//RegCity(0, "진류");
+//RegCity(0, "여남");
+//RegCity(0, "하비");
+//RegCity(0, "서량");
+//RegCity(0, "하내");
+//RegCity(0, "한중");
+//RegCity(0, "상용");
+//RegCity(0, "덕양");
+//RegCity(0, "강주");
+//RegCity(0, "건녕");
+//RegCity(0, "남해");
+//RegCity(0, "계양");
+//RegCity(0, "오");
+//RegCity(0, "평양");
+//RegCity(0, "사비");
+//RegCity(0, "계림");
-//RegCity($connect, 0, "진양");
-//RegCity($connect, 0, "평원");
-//RegCity($connect, 0, "북해");
-//RegCity($connect, 0, "초");
-//RegCity($connect, 0, "패");
-//RegCity($connect, 0, "천수");
-//RegCity($connect, 0, "안정");
-//RegCity($connect, 0, "홍농");
-//RegCity($connect, 0, "하변");
-//RegCity($connect, 0, "자동");
-//RegCity($connect, 0, "영안");
-//RegCity($connect, 0, "귀양");
-//RegCity($connect, 0, "주시");
-//RegCity($connect, 0, "운남");
-//RegCity($connect, 0, "남영");
-//RegCity($connect, 0, "교지");
-//RegCity($connect, 0, "신야");
-//RegCity($connect, 0, "강하");
-//RegCity($connect, 0, "무릉");
-//RegCity($connect, 0, "영릉");
-//RegCity($connect, 0, "상동");
-//RegCity($connect, 0, "여강");
-//RegCity($connect, 0, "회계");
-//RegCity($connect, 0, "고창");
-//RegCity($connect, 0, "대");
-//RegCity($connect, 0, "안평");
-//RegCity($connect, 0, "졸본");
-//RegCity($connect, 0, "이도");
+//RegCity(0, "진양");
+//RegCity(0, "평원");
+//RegCity(0, "북해");
+//RegCity(0, "초");
+//RegCity(0, "패");
+//RegCity(0, "천수");
+//RegCity(0, "안정");
+//RegCity(0, "홍농");
+//RegCity(0, "하변");
+//RegCity(0, "자동");
+//RegCity(0, "영안");
+//RegCity(0, "귀양");
+//RegCity(0, "주시");
+//RegCity(0, "운남");
+//RegCity(0, "남영");
+//RegCity(0, "교지");
+//RegCity(0, "신야");
+//RegCity(0, "강하");
+//RegCity(0, "무릉");
+//RegCity(0, "영릉");
+//RegCity(0, "상동");
+//RegCity(0, "여강");
+//RegCity(0, "회계");
+//RegCity(0, "고창");
+//RegCity(0, "대");
+//RegCity(0, "안평");
+//RegCity(0, "졸본");
+//RegCity(0, "이도");
-//RegCity($connect, 0, "강");
-//RegCity($connect, 0, "저");
-//RegCity($connect, 0, "흉노");
-//RegCity($connect, 0, "남만");
-//RegCity($connect, 0, "산월");
-//RegCity($connect, 0, "오환");
-//RegCity($connect, 0, "왜");
+//RegCity(0, "강");
+//RegCity(0, "저");
+//RegCity(0, "흉노");
+//RegCity(0, "남만");
+//RegCity(0, "산월");
+//RegCity(0, "오환");
+//RegCity(0, "왜");
-//RegCity($connect, 0, "호관");
-//RegCity($connect, 0, "호로");
-//RegCity($connect, 0, "사곡");
-//RegCity($connect, 0, "함곡");
-//RegCity($connect, 0, "사수");
-//RegCity($connect, 0, "양평");
-//RegCity($connect, 0, "가맹");
-//RegCity($connect, 0, "역경");
-//RegCity($connect, 0, "계교");
-//RegCity($connect, 0, "동황");
-//RegCity($connect, 0, "관도");
-//RegCity($connect, 0, "정도");
-//RegCity($connect, 0, "합비");
-//RegCity($connect, 0, "광릉");
-//RegCity($connect, 0, "적도");
-//RegCity($connect, 0, "가정");
-//RegCity($connect, 0, "기산");
-//RegCity($connect, 0, "면죽");
-//RegCity($connect, 0, "이릉");
-//RegCity($connect, 0, "장판");
-//RegCity($connect, 0, "백랑");
+//RegCity(0, "호관");
+//RegCity(0, "호로");
+//RegCity(0, "사곡");
+//RegCity(0, "함곡");
+//RegCity(0, "사수");
+//RegCity(0, "양평");
+//RegCity(0, "가맹");
+//RegCity(0, "역경");
+//RegCity(0, "계교");
+//RegCity(0, "동황");
+//RegCity(0, "관도");
+//RegCity(0, "정도");
+//RegCity(0, "합비");
+//RegCity(0, "광릉");
+//RegCity(0, "적도");
+//RegCity(0, "가정");
+//RegCity(0, "기산");
+//RegCity(0, "면죽");
+//RegCity(0, "이릉");
+//RegCity(0, "장판");
+//RegCity(0, "백랑");
-//RegCity($connect, 0, "적벽");
-//RegCity($connect, 0, "파양");
-//RegCity($connect, 0, "탐라");
-//RegCity($connect, 0, "유구");
+//RegCity(0, "적벽");
+//RegCity(0, "파양");
+//RegCity(0, "탐라");
+//RegCity(0, "유구");
//////////////////////////도시 끝///////////////////////////////////////////////
diff --git a/twe/scenario_28.php b/twe/scenario_28.php
index 8c11bc0e..849b154f 100644
--- a/twe/scenario_28.php
+++ b/twe/scenario_28.php
@@ -48,11 +48,11 @@ $img = $admin['img'];
//가상모드8 : 180년 확산성 밀리언 아서
/*
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "SM", "000080", 10000, 10000, "SM", 0, 1, "병가", 1);
+RegNation( "SM", "000080", 10000, 10000, "SM", 0, 1, "병가", 1);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "JYP", "FF0000", 10000, 10000, "JYP", 0, 1, "덕가", 1);
+RegNation("JYP", "FF0000", 10000, 10000, "JYP", 0, 1, "덕가", 1);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "YG", "008000", 10000, 10000, "YG", 0, 1, "유가", 1);
+RegNation( "YG", "008000", 10000, 10000, "YG", 0, 1, "유가", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -309,106 +309,106 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,8229, 110, "지크
//////////////////////////장수 끝///////////////////////////////////////////////
//////////////////////////도시 소속/////////////////////////////////////////////
-//RegCity($connect, 0, "업");
-//RegCity($connect, 0, "허창");
-//RegCity($connect, 0, "-");
-//RegCity($connect, 0, "장안");
-//RegCity($connect, 0, "성도");
-//RegCity($connect, 0, "양양");
-//RegCity($connect, 0, "건업");
+//RegCity(0, "업");
+//RegCity(0, "허창");
+//RegCity(0, "-");
+//RegCity(0, "장안");
+//RegCity(0, "성도");
+//RegCity(0, "양양");
+//RegCity(0, "건업");
-//RegCity($connect, 0, "북평");
-//RegCity($connect, 0, "남피");
-//RegCity($connect, 0, "완");
-//RegCity($connect, 0, "수춘");
-//RegCity($connect, 0, "서주");
-//RegCity($connect, 0, "강릉");
-//RegCity($connect, 0, "장사");
-//RegCity($connect, 0, "시상");
-//RegCity($connect, 0, "위례");
+//RegCity(0, "북평");
+//RegCity(0, "남피");
+//RegCity(0, "완");
+//RegCity(0, "수춘");
+//RegCity(0, "서주");
+//RegCity(0, "강릉");
+//RegCity(0, "장사");
+//RegCity(0, "시상");
+//RegCity(0, "위례");
-//RegCity($connect, 0, "계");
-//RegCity($connect, 0, "복양");
-//RegCity($connect, 0, "진류");
-//RegCity($connect, 0, "여남");
-//RegCity($connect, 0, "하비");
-//RegCity($connect, 0, "서량");
-//RegCity($connect, 0, "하내");
-//RegCity($connect, 0, "한중");
-//RegCity($connect, 0, "상용");
-//RegCity($connect, 0, "덕양");
-//RegCity($connect, 0, "강주");
-//RegCity($connect, 0, "건녕");
-//RegCity($connect, 0, "남해");
-//RegCity($connect, 0, "계양");
-//RegCity($connect, 0, "오");
-//RegCity($connect, 0, "평양");
-//RegCity($connect, 0, "사비");
-//RegCity($connect, 0, "계림");
+//RegCity(0, "계");
+//RegCity(0, "복양");
+//RegCity(0, "진류");
+//RegCity(0, "여남");
+//RegCity(0, "하비");
+//RegCity(0, "서량");
+//RegCity(0, "하내");
+//RegCity(0, "한중");
+//RegCity(0, "상용");
+//RegCity(0, "덕양");
+//RegCity(0, "강주");
+//RegCity(0, "건녕");
+//RegCity(0, "남해");
+//RegCity(0, "계양");
+//RegCity(0, "오");
+//RegCity(0, "평양");
+//RegCity(0, "사비");
+//RegCity(0, "계림");
-//RegCity($connect, 0, "진양");
-//RegCity($connect, 0, "평원");
-//RegCity($connect, 0, "북해");
-//RegCity($connect, 0, "초");
-//RegCity($connect, 0, "패");
-//RegCity($connect, 0, "천수");
-//RegCity($connect, 0, "안정");
-//RegCity($connect, 0, "홍농");
-//RegCity($connect, 0, "하변");
-//RegCity($connect, 0, "자동");
-//RegCity($connect, 0, "영안");
-//RegCity($connect, 0, "귀양");
-//RegCity($connect, 0, "주시");
-//RegCity($connect, 0, "운남");
-//RegCity($connect, 0, "남영");
-//RegCity($connect, 0, "교지");
-//RegCity($connect, 0, "신야");
-//RegCity($connect, 0, "강하");
-//RegCity($connect, 0, "무릉");
-//RegCity($connect, 0, "영릉");
-//RegCity($connect, 0, "상동");
-//RegCity($connect, 0, "여강");
-//RegCity($connect, 0, "회계");
-//RegCity($connect, 0, "고창");
-//RegCity($connect, 0, "대");
-//RegCity($connect, 0, "안평");
-//RegCity($connect, 0, "졸본");
-//RegCity($connect, 0, "이도");
+//RegCity(0, "진양");
+//RegCity(0, "평원");
+//RegCity(0, "북해");
+//RegCity(0, "초");
+//RegCity(0, "패");
+//RegCity(0, "천수");
+//RegCity(0, "안정");
+//RegCity(0, "홍농");
+//RegCity(0, "하변");
+//RegCity(0, "자동");
+//RegCity(0, "영안");
+//RegCity(0, "귀양");
+//RegCity(0, "주시");
+//RegCity(0, "운남");
+//RegCity(0, "남영");
+//RegCity(0, "교지");
+//RegCity(0, "신야");
+//RegCity(0, "강하");
+//RegCity(0, "무릉");
+//RegCity(0, "영릉");
+//RegCity(0, "상동");
+//RegCity(0, "여강");
+//RegCity(0, "회계");
+//RegCity(0, "고창");
+//RegCity(0, "대");
+//RegCity(0, "안평");
+//RegCity(0, "졸본");
+//RegCity(0, "이도");
-//RegCity($connect, 0, "강");
-//RegCity($connect, 0, "저");
-//RegCity($connect, 0, "흉노");
-//RegCity($connect, 0, "남만");
-//RegCity($connect, 0, "산월");
-//RegCity($connect, 0, "오환");
-//RegCity($connect, 0, "왜");
+//RegCity(0, "강");
+//RegCity(0, "저");
+//RegCity(0, "흉노");
+//RegCity(0, "남만");
+//RegCity(0, "산월");
+//RegCity(0, "오환");
+//RegCity(0, "왜");
-//RegCity($connect, 0, "호관");
-//RegCity($connect, 0, "호로");
-//RegCity($connect, 0, "사곡");
-//RegCity($connect, 0, "함곡");
-//RegCity($connect, 0, "사수");
-//RegCity($connect, 0, "양평");
-//RegCity($connect, 0, "가맹");
-//RegCity($connect, 0, "역경");
-//RegCity($connect, 0, "계교");
-//RegCity($connect, 0, "동황");
-//RegCity($connect, 0, "관도");
-//RegCity($connect, 0, "정도");
-//RegCity($connect, 0, "합비");
-//RegCity($connect, 0, "광릉");
-//RegCity($connect, 0, "적도");
-//RegCity($connect, 0, "가정");
-//RegCity($connect, 0, "기산");
-//RegCity($connect, 0, "면죽");
-//RegCity($connect, 0, "이릉");
-//RegCity($connect, 0, "장판");
-//RegCity($connect, 0, "백랑");
+//RegCity(0, "호관");
+//RegCity(0, "호로");
+//RegCity(0, "사곡");
+//RegCity(0, "함곡");
+//RegCity(0, "사수");
+//RegCity(0, "양평");
+//RegCity(0, "가맹");
+//RegCity(0, "역경");
+//RegCity(0, "계교");
+//RegCity(0, "동황");
+//RegCity(0, "관도");
+//RegCity(0, "정도");
+//RegCity(0, "합비");
+//RegCity(0, "광릉");
+//RegCity(0, "적도");
+//RegCity(0, "가정");
+//RegCity(0, "기산");
+//RegCity(0, "면죽");
+//RegCity(0, "이릉");
+//RegCity(0, "장판");
+//RegCity(0, "백랑");
-//RegCity($connect, 0, "적벽");
-//RegCity($connect, 0, "파양");
-//RegCity($connect, 0, "탐라");
-//RegCity($connect, 0, "유구");
+//RegCity(0, "적벽");
+//RegCity(0, "파양");
+//RegCity(0, "탐라");
+//RegCity(0, "유구");
//////////////////////////도시 끝///////////////////////////////////////////////
diff --git a/twe/scenario_3.php b/twe/scenario_3.php
index f87a7414..92f55bda 100644
--- a/twe/scenario_3.php
+++ b/twe/scenario_3.php
@@ -48,47 +48,47 @@ $img = $admin['img'];
//역사모드3 : 194년 군웅할거
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 100000, 100000, "여포에게 본거지를 빼앗긴 위기의 조조", 1000, 27, "병가", 2);
+RegNation("조조", "000080", 100000, 100000, "여포에게 본거지를 빼앗긴 위기의 조조", 1000, 27, "병가", 2);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "원소", "FFFF00", 100000, 100000, "기주에서 세력을 넓이고 있는 원소", 1000, 27, "법가", 2);
+RegNation("원소", "FFFF00", 100000, 100000, "기주에서 세력을 넓이고 있는 원소", 1000, 27, "법가", 2);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 100000, 100000, "형주자사 유표", 1000, 18, "유가", 3);
+RegNation("유표", "E0FFFF", 100000, 100000, "형주자사 유표", 1000, 18, "유가", 3);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "유언", "483D8B", 100000, 100000, "익주자사 유언", 1000, 14, "유가", 3);
+RegNation("유언", "483D8B", 100000, 100000, "익주자사 유언", 1000, 14, "유가", 3);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "이각", "BA55D3", 100000, 100000, "황제를 등에 업은 동탁의 잔당세력", 1000, 14, "병가", 5);
+RegNation("이각", "BA55D3", 100000, 100000, "황제를 등에 업은 동탁의 잔당세력", 1000, 14, "병가", 5);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "원술", "FFC0CB", 100000, 100000, "회남지방에서 세력을 굳힌 원술", 1000, 11, "도가", 2);
+RegNation("원술", "FFC0CB", 100000, 100000, "회남지방에서 세력을 굳힌 원술", 1000, 11, "도가", 2);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 100000, 100000, "서량 태수 마등", 1000, 10, "병가", 3);
+RegNation("마등", "808000", 100000, 100000, "서량 태수 마등", 1000, 10, "병가", 3);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "여포", "A9A9A9", 100000, 100000, "조조의 본거지를 빼앗은 당대 최고의 맹장 여포", 1000, 9, "병가", 2);
+RegNation("여포", "A9A9A9", 100000, 100000, "조조의 본거지를 빼앗은 당대 최고의 맹장 여포", 1000, 9, "병가", 2);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "손견", "FF0000", 100000, 100000, "손견의 뒤를 이은 소패왕 손책", 1000, 8, "병가", 2);
+RegNation("손견", "FF0000", 100000, 100000, "손견의 뒤를 이은 소패왕 손책", 1000, 8, "병가", 2);
//////////////////////////국가10/////////////////////////////////////////////////
-RegNation($connect, "공손찬", "FF00FF", 100000, 100000, "북평 태수 공손찬", 1000, 7, "병가", 3);
+RegNation("공손찬", "FF00FF", 100000, 100000, "북평 태수 공손찬", 1000, 7, "병가", 3);
//////////////////////////국가11/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 100000, 100000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 100000, 100000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가12/////////////////////////////////////////////////
-RegNation($connect, "도겸", "00FF00", 100000, 100000, "소패를 유비에게 맡긴 서주목 도겸", 1000, 6, "유가", 4);
+RegNation("도겸", "00FF00", 100000, 100000, "소패를 유비에게 맡긴 서주목 도겸", 1000, 6, "유가", 4);
//////////////////////////국가13////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 100000, 100000, "도겸을 도우러 왔다가 소패에 머물게 된 유비", 1000, 5, "덕가", 2);
+RegNation("유비", "008000", 100000, 100000, "도겸을 도우러 왔다가 소패에 머물게 된 유비", 1000, 5, "덕가", 2);
//////////////////////////국가14/////////////////////////////////////////////////
-RegNation($connect, "유요", "808000", 100000, 100000, "건업 태수 유요", 1000, 5, "묵가", 3);
+RegNation("유요", "808000", 100000, 100000, "건업 태수 유요", 1000, 5, "묵가", 3);
//////////////////////////국가15/////////////////////////////////////////////////
-RegNation($connect, "장양", "483D8B", 100000, 100000, "장양", 1000, 4, "묵가", 3);
+RegNation("장양", "483D8B", 100000, 100000, "장양", 1000, 4, "묵가", 3);
//////////////////////////국가16/////////////////////////////////////////////////
-RegNation($connect, "왕랑", "87CEEB", 100000, 100000, "회계 태수 왕랑", 1000, 4, "덕가", 3);
+RegNation("왕랑", "87CEEB", 100000, 100000, "회계 태수 왕랑", 1000, 4, "덕가", 3);
//////////////////////////국가17/////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 100000, 100000, "공손도", 1000, 3, "도적", 1);
+RegNation("공손도", "A0522D", 100000, 100000, "공손도", 1000, 3, "도적", 1);
//////////////////////////국가18/////////////////////////////////////////////////
-RegNation($connect, "장연", "87CEEB", 100000, 100000, "장연", 1000, 3, "도가", 2);
+RegNation("장연", "87CEEB", 100000, 100000, "장연", 1000, 3, "도가", 2);
//////////////////////////국가19/////////////////////////////////////////////////
-RegNation($connect, "공융", "800080", 100000, 100000, "북해 태수 공융", 1000, 1, "덕가", 3);
+RegNation("공융", "800080", 100000, 100000, "북해 태수 공융", 1000, 1, "덕가", 3);
//////////////////////////국가20/////////////////////////////////////////////////
-RegNation($connect, "엄백호", "800080", 100000, 100000, "왕랑의 영원한 라이벌 엄백호", 1000, 2, "묵가", 1);
+RegNation("엄백호", "800080", 100000, 100000, "왕랑의 영원한 라이벌 엄백호", 1000, 2, "묵가", 1);
//////////////////////////국가21/////////////////////////////////////////////////
-RegNation($connect, "공주", "800080", 100000, 100000, "공주", 1000, 2, "도가", 3);
+RegNation("공주", "800080", 100000, 100000, "공주", 1000, 2, "도가", 3);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -1696,45 +1696,45 @@ RegGenX( 22, "희지재",$img,1678, 1, "-", 24, 5, 86, 0, 157, 194, "
//국가1 조조 국가2 원소 국가3 유표 국가4 유언 국가5 이각 국가6 원술 국가7 마등
//국가8 여포 국가9 손책 국가10 공손찬 국가11 장로 국가12 도겸 국가13 유비 국가14 유요
//국가15 장양 국가16 왕랑 국가17 공손도 국가18 장연 국가19 공융 국가20 엄백호 국가21 공주
-RegCity($connect, 1, "진류", 1);
-RegCity($connect, 1, "정도");
-RegCity($connect, 2, "남피");
-RegCity($connect, 2, "평원");
-RegCity($connect, 2, "업", 1);
-RegCity($connect, 3, "양양", 1);
-RegCity($connect, 3, "강하");
-RegCity($connect, 3, "강릉");
-RegCity($connect, 3, "장판");
-RegCity($connect, 4, "면죽");
-RegCity($connect, 4, "자동");
-RegCity($connect, 4, "성도", 1);
-RegCity($connect, 4, "강주");
-RegCity($connect, 5, "장안", 1);
-RegCity($connect, 5, "홍농");
-RegCity($connect, 5, "함곡");
-RegCity($connect, 6, "여남");
-RegCity($connect, 6, "수춘", 1);
-RegCity($connect, 7, "서량", 1);
-RegCity($connect, 7, "천수");
-RegCity($connect, 8, "복양", 1);
-RegCity($connect, 9, "여강", 1);
-RegCity($connect, 10, "계");
-RegCity($connect, 10, "역경");
-RegCity($connect, 10, "북평", 1);
-RegCity($connect, 11, "한중", 1);
-RegCity($connect, 11, "양평");
-RegCity($connect, 12, "서주", 1);
-RegCity($connect, 12, "하비");
-RegCity($connect, 13, "패", 1);
-RegCity($connect, 14, "건업", 1);
-RegCity($connect, 14, "합비");
-RegCity($connect, 15, "하내", 1);
-RegCity($connect, 16, "회계", 1);
-RegCity($connect, 17, "안평", 1);
-RegCity($connect, 18, "진양", 1);
-RegCity($connect, 19, "북해", 1);
-RegCity($connect, 20, "오", 1);
-RegCity($connect, 21, "초", 1);
+RegCity(1, "진류", 1);
+RegCity(1, "정도");
+RegCity(2, "남피");
+RegCity(2, "평원");
+RegCity(2, "업", 1);
+RegCity(3, "양양", 1);
+RegCity(3, "강하");
+RegCity(3, "강릉");
+RegCity(3, "장판");
+RegCity(4, "면죽");
+RegCity(4, "자동");
+RegCity(4, "성도", 1);
+RegCity(4, "강주");
+RegCity(5, "장안", 1);
+RegCity(5, "홍농");
+RegCity(5, "함곡");
+RegCity(6, "여남");
+RegCity(6, "수춘", 1);
+RegCity(7, "서량", 1);
+RegCity(7, "천수");
+RegCity(8, "복양", 1);
+RegCity(9, "여강", 1);
+RegCity(10, "계");
+RegCity(10, "역경");
+RegCity(10, "북평", 1);
+RegCity(11, "한중", 1);
+RegCity(11, "양평");
+RegCity(12, "서주", 1);
+RegCity(12, "하비");
+RegCity(13, "패", 1);
+RegCity(14, "건업", 1);
+RegCity(14, "합비");
+RegCity(15, "하내", 1);
+RegCity(16, "회계", 1);
+RegCity(17, "안평", 1);
+RegCity(18, "진양", 1);
+RegCity(19, "북해", 1);
+RegCity(20, "오", 1);
+RegCity(21, "초", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_4.php b/twe/scenario_4.php
index 14df0f2a..81baeb3b 100644
--- a/twe/scenario_4.php
+++ b/twe/scenario_4.php
@@ -48,35 +48,35 @@ $img = $admin['img'];
//역사모드4 : 196년 황제는 허도로
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "황제를 등에 업고 본격적으로 성장하는 조조", 1000, 37, "병가", 4);
+RegNation("조조", "000080", 10000, 10000, "황제를 등에 업고 본격적으로 성장하는 조조", 1000, 37, "병가", 4);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "원소", "FFFF00", 10000, 10000, "공손찬과 일전을 준비하는 원소", 1000, 29, "법가", 4);
+RegNation("원소", "FFFF00", 10000, 10000, "공손찬과 일전을 준비하는 원소", 1000, 29, "법가", 4);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "손책", "FF0000", 10000, 10000, "강동에서 세력을 떨치는 소패왕 손책", 1000, 22, "병가", 3);
+RegNation("손책", "FF0000", 10000, 10000, "강동에서 세력을 떨치는 소패왕 손책", 1000, 22, "병가", 3);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 10000, 10000, "형주에서 기반을 넓히는 강하팔준 형주자사 유표", 1000, 22, "유가", 4);
+RegNation("유표", "E0FFFF", 10000, 10000, "형주에서 기반을 넓히는 강하팔준 형주자사 유표", 1000, 22, "유가", 4);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "유장", "483D8B", 10000, 10000, "익주에서 세력을 굳히는 유언의 후계 유장", 1000, 19, "유가", 4);
+RegNation("유장", "483D8B", 10000, 10000, "익주에서 세력을 굳히는 유언의 후계 유장", 1000, 19, "유가", 4);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "원술", "FFC0CB", 10000, 10000, "회남지방에서 황제를 노리는 원술", 1000, 12, "도가", 7);
+RegNation("원술", "FFC0CB", 10000, 10000, "회남지방에서 황제를 노리는 원술", 1000, 12, "도가", 7);
//////////////////////////국가7////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "서주를 차지하고 여포를 소패에 내어준 유비", 1000, 11, "덕가", 3);
+RegNation("유비", "008000", 10000, 10000, "서주를 차지하고 여포를 소패에 내어준 유비", 1000, 11, "덕가", 3);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서북지방을 제패한 서량태수 마등", 1000, 11, "병가", 4);
+RegNation("마등", "808000", 10000, 10000, "서북지방을 제패한 서량태수 마등", 1000, 11, "병가", 4);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "여포", "A9A9A9", 10000, 10000, "조조에 패해 유비에게 의탁하게 된 맹장 여포", 1000, 9, "병가", 2);
+RegNation("여포", "A9A9A9", 10000, 10000, "조조에 패해 유비에게 의탁하게 된 맹장 여포", 1000, 9, "병가", 2);
//////////////////////////국가10/////////////////////////////////////////////////
-RegNation($connect, "이각", "BA55D3", 10000, 10000, "황제를 뺏기고 위기에 몰린 동탁의 잔당세력", 1000, 7, "병가", 5);
+RegNation("이각", "BA55D3", 10000, 10000, "황제를 뺏기고 위기에 몰린 동탁의 잔당세력", 1000, 7, "병가", 5);
//////////////////////////국가11/////////////////////////////////////////////////
-RegNation($connect, "공손찬", "FF00FF", 10000, 10000, "백마부대를 바탕으로 원소와 패자를 다투는 북평태수 공손찬", 1000, 7, "병가", 3);
+RegNation("공손찬", "FF00FF", 10000, 10000, "백마부대를 바탕으로 원소와 패자를 다투는 북평태수 공손찬", 1000, 7, "병가", 3);
//////////////////////////국가12/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가13/////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
+RegNation("공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
//////////////////////////국가14/////////////////////////////////////////////////
-RegNation($connect, "장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
+RegNation("장연", "87CEEB", 10000, 10000, "장연", 1000, 3, "도가", 2);
//////////////////////////국가15/////////////////////////////////////////////////
-RegNation($connect, "장양", "483D8B", 10000, 10000, "장양", 1000, 2, "묵가", 3);
+RegNation("장양", "483D8B", 10000, 10000, "장양", 1000, 2, "묵가", 3);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -1215,48 +1215,48 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//국가1 조조 국가2 원소 국가3 손책 국가4 유표 국가5 유장
//국가6 원술 국가7 유비 국가8 마등 국가9 여포 국가10 이각
//국가11 공손찬 국가12 장로 국가13 공손도 국가14 장연 국가15 장양
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 2, "남피");
-RegCity($connect, 2, "평원");
-RegCity($connect, 2, "업", 1);
-RegCity($connect, 3, "건업", 1);
-RegCity($connect, 3, "오");
-RegCity($connect, 3, "회계");
-RegCity($connect, 4, "강릉");
-RegCity($connect, 4, "무릉");
-RegCity($connect, 4, "신야");
-RegCity($connect, 4, "양양", 1);
-RegCity($connect, 4, "강하");
-RegCity($connect, 4, "장판");
-RegCity($connect, 5, "면죽");
-RegCity($connect, 5, "덕양");
-RegCity($connect, 5, "자동");
-RegCity($connect, 5, "성도", 1);
-RegCity($connect, 5, "강주");
-RegCity($connect, 6, "여남");
-RegCity($connect, 6, "수춘", 1);
-RegCity($connect, 6, "여강");
-RegCity($connect, 6, "합비");
-RegCity($connect, 7, "서주", 1);
-RegCity($connect, 7, "하비");
-RegCity($connect, 8, "서량", 1);
-RegCity($connect, 8, "천수");
-RegCity($connect, 9, "패", 1);
-RegCity($connect, 10, "장안", 1);
-RegCity($connect, 10, "홍농");
-RegCity($connect, 10, "함곡");
-RegCity($connect, 11, "계");
-RegCity($connect, 11, "역경");
-RegCity($connect, 11, "북평", 1);
-RegCity($connect, 12, "한중", 1);
-RegCity($connect, 12, "양평");
-RegCity($connect, 13, "안평", 1);
-RegCity($connect, 14, "진양", 1);
-RegCity($connect, 15, "하내", 1);
+RegCity(1, "호로");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "복양");
+RegCity(1, "허창", 1);
+RegCity(2, "남피");
+RegCity(2, "평원");
+RegCity(2, "업", 1);
+RegCity(3, "건업", 1);
+RegCity(3, "오");
+RegCity(3, "회계");
+RegCity(4, "강릉");
+RegCity(4, "무릉");
+RegCity(4, "신야");
+RegCity(4, "양양", 1);
+RegCity(4, "강하");
+RegCity(4, "장판");
+RegCity(5, "면죽");
+RegCity(5, "덕양");
+RegCity(5, "자동");
+RegCity(5, "성도", 1);
+RegCity(5, "강주");
+RegCity(6, "여남");
+RegCity(6, "수춘", 1);
+RegCity(6, "여강");
+RegCity(6, "합비");
+RegCity(7, "서주", 1);
+RegCity(7, "하비");
+RegCity(8, "서량", 1);
+RegCity(8, "천수");
+RegCity(9, "패", 1);
+RegCity(10, "장안", 1);
+RegCity(10, "홍농");
+RegCity(10, "함곡");
+RegCity(11, "계");
+RegCity(11, "역경");
+RegCity(11, "북평", 1);
+RegCity(12, "한중", 1);
+RegCity(12, "양평");
+RegCity(13, "안평", 1);
+RegCity(14, "진양", 1);
+RegCity(15, "하내", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_5.php b/twe/scenario_5.php
index 58570eeb..8313f8da 100644
--- a/twe/scenario_5.php
+++ b/twe/scenario_5.php
@@ -48,23 +48,23 @@ $img = $admin['img'];
//역사모드5 : 200년 관도대전
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "원소와의 운명의 한판을 준비하는 조조", 1000, 48, "병가", 5);
+RegNation("조조", "000080", 10000, 10000, "원소와의 운명의 한판을 준비하는 조조", 1000, 48, "병가", 5);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손책", "FF0000", 10000, 10000, "강동을 제패한 소패왕 손책", 1000, 37, "병가", 3);
+RegNation("손책", "FF0000", 10000, 10000, "강동을 제패한 소패왕 손책", 1000, 37, "병가", 3);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "원소", "FFFF00", 10000, 10000, "조조와 일생일대의 대전을 벌이는 원소", 1000, 29, "법가", 4);
+RegNation("원소", "FFFF00", 10000, 10000, "조조와 일생일대의 대전을 벌이는 원소", 1000, 29, "법가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 10000, 10000, "형주에 기반을 다진 강하팔준 형주자사 유표", 1000, 26, "유가", 4);
+RegNation("유표", "E0FFFF", 10000, 10000, "형주에 기반을 다진 강하팔준 형주자사 유표", 1000, 26, "유가", 4);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "유장", "483D8B", 10000, 10000, "익주에 세력을 굳힌 익주자사 유장", 1000, 21, "유가", 4);
+RegNation("유장", "483D8B", 10000, 10000, "익주에 세력을 굳힌 익주자사 유장", 1000, 21, "유가", 4);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서북지방을 제패한 서량태수 마등", 1000, 13, "병가", 4);
+RegNation("마등", "808000", 10000, 10000, "서북지방을 제패한 서량태수 마등", 1000, 13, "병가", 4);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가8////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "서주를 빼앗기고 형제들과 헤어져 방랑하는 유비", 1000, 5, "덕가", 0);
+RegNation("유비", "008000", 10000, 10000, "서주를 빼앗기고 형제들과 헤어져 방랑하는 유비", 1000, 5, "덕가", 0);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
+RegNation("공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -919,56 +919,56 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손책 국가3 원소 국가4 유표 국가5 유장
//국가6 마등 국가7 장로 국가8 유비 국가9 공손도
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "완");
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 3, "역경");
-RegCity($connect, 3, "계교");
-RegCity($connect, 3, "호관");
-RegCity($connect, 3, "관도");
-RegCity($connect, 3, "계");
-RegCity($connect, 3, "북평");
-RegCity($connect, 3, "진양");
-RegCity($connect, 3, "남피");
-RegCity($connect, 3, "평원");
-RegCity($connect, 3, "하내");
-RegCity($connect, 3, "업", 1);
-RegCity($connect, 3, "북해");
-RegCity($connect, 4, "신야");
-RegCity($connect, 4, "양양", 1);
-RegCity($connect, 4, "장판");
-RegCity($connect, 4, "강하");
-RegCity($connect, 4, "강릉");
-RegCity($connect, 4, "무릉");
-RegCity($connect, 4, "장사");
-RegCity($connect, 4, "영릉");
-RegCity($connect, 4, "계양");
-RegCity($connect, 5, "면죽");
-RegCity($connect, 5, "덕양");
-RegCity($connect, 5, "자동");
-RegCity($connect, 5, "성도", 1);
-RegCity($connect, 5, "강주");
-RegCity($connect, 6, "서량", 1);
-RegCity($connect, 6, "천수");
-RegCity($connect, 7, "한중", 1);
-RegCity($connect, 7, "양평");
-RegCity($connect, 9, "안평", 1);
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "정도");
+RegCity(1, "서주");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "허창", 1);
+RegCity(1, "완");
+RegCity(2, "파양");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(2, "건업", 1);
+RegCity(3, "역경");
+RegCity(3, "계교");
+RegCity(3, "호관");
+RegCity(3, "관도");
+RegCity(3, "계");
+RegCity(3, "북평");
+RegCity(3, "진양");
+RegCity(3, "남피");
+RegCity(3, "평원");
+RegCity(3, "하내");
+RegCity(3, "업", 1);
+RegCity(3, "북해");
+RegCity(4, "신야");
+RegCity(4, "양양", 1);
+RegCity(4, "장판");
+RegCity(4, "강하");
+RegCity(4, "강릉");
+RegCity(4, "무릉");
+RegCity(4, "장사");
+RegCity(4, "영릉");
+RegCity(4, "계양");
+RegCity(5, "면죽");
+RegCity(5, "덕양");
+RegCity(5, "자동");
+RegCity(5, "성도", 1);
+RegCity(5, "강주");
+RegCity(6, "서량", 1);
+RegCity(6, "천수");
+RegCity(7, "한중", 1);
+RegCity(7, "양평");
+RegCity(9, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_6.php b/twe/scenario_6.php
index cde3f363..f59fb2cb 100644
--- a/twe/scenario_6.php
+++ b/twe/scenario_6.php
@@ -48,25 +48,25 @@ $img = $admin['img'];
//역사모드6 : 202년 원가의 분열
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "관도대전에 승리하고 승리를 굳히려는 조조", 1000, 53, "병가", 5);
+RegNation("조조", "000080", 10000, 10000, "관도대전에 승리하고 승리를 굳히려는 조조", 1000, 53, "병가", 5);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "손책의 뒤를 이어 강동의 치세를 이어가는 손권", 1000, 41, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "손책의 뒤를 이어 강동의 치세를 이어가는 손권", 1000, 41, "덕가", 4);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "유표", "E0FFFF", 10000, 10000, "형주의 강하팔준 형주자사 유표", 1000, 28, "유가", 4);
+RegNation("유표", "E0FFFF", 10000, 10000, "형주의 강하팔준 형주자사 유표", 1000, 28, "유가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "유장", "483D8B", 10000, 10000, "익주에 만족하는 익주자사 유장", 1000, 21, "유가", 4);
+RegNation("유장", "483D8B", 10000, 10000, "익주에 만족하는 익주자사 유장", 1000, 21, "유가", 4);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서량태수 마등", 1000, 13, "병가", 4);
+RegNation("마등", "808000", 10000, 10000, "서량태수 마등", 1000, 13, "병가", 4);
//////////////////////////국가6////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "남쪽으로 도망쳐 유표에게 의탁하게 된 유비", 1000, 12, "유가", 2);
+RegNation("유비", "008000", 10000, 10000, "남쪽으로 도망쳐 유표에게 의탁하게 된 유비", 1000, 12, "유가", 2);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "원상", "FFFF00", 10000, 10000, "후계자가 된 원소의 셋째 아들 원상", 1000, 10, "병가", 4);
+RegNation("원상", "FFFF00", 10000, 10000, "후계자가 된 원소의 셋째 아들 원상", 1000, 10, "병가", 4);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "원담", "808000", 10000, 10000, "조조와 결탁해 형제와 싸우는 원소의 맏아들 원담", 1000, 7, "도가", 2);
+RegNation("원담", "808000", 10000, 10000, "조조와 결탁해 형제와 싸우는 원소의 맏아들 원담", 1000, 7, "도가", 2);
//////////////////////////국가10/////////////////////////////////////////////////
-RegNation($connect, "공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
+RegNation("공손도", "A0522D", 10000, 10000, "공손도", 1000, 3, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -963,58 +963,58 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유표 국가4 유장 국가5 마등
//국가6 유비 국가7 원상 국가8 장로 국가9 원담 국가10공손도
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 3, "양양", 1);
-RegCity($connect, 3, "장판");
-RegCity($connect, 3, "강하");
-RegCity($connect, 3, "강릉");
-RegCity($connect, 3, "무릉");
-RegCity($connect, 3, "장사");
-RegCity($connect, 3, "영릉");
-RegCity($connect, 3, "계양");
-RegCity($connect, 4, "면죽");
-RegCity($connect, 4, "덕양");
-RegCity($connect, 4, "강주");
-RegCity($connect, 4, "자동");
-RegCity($connect, 4, "성도", 1);
-RegCity($connect, 5, "서량", 1);
-RegCity($connect, 5, "천수");
-RegCity($connect, 6, "신야", 1);
-RegCity($connect, 7, "역경");
-RegCity($connect, 7, "호관");
-RegCity($connect, 7, "계");
-RegCity($connect, 7, "북평");
-RegCity($connect, 7, "진양");
-RegCity($connect, 7, "남피");
-RegCity($connect, 7, "하내");
-RegCity($connect, 7, "업", 1);
-RegCity($connect, 8, "한중", 1);
-RegCity($connect, 8, "양평");
-RegCity($connect, 9, "평원", 1);
-RegCity($connect, 9, "계교");
-RegCity($connect, 9, "북해");
-RegCity($connect, 10, "안평", 1);
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(1, "복양");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(2, "건업", 1);
+RegCity(2, "파양");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(3, "양양", 1);
+RegCity(3, "장판");
+RegCity(3, "강하");
+RegCity(3, "강릉");
+RegCity(3, "무릉");
+RegCity(3, "장사");
+RegCity(3, "영릉");
+RegCity(3, "계양");
+RegCity(4, "면죽");
+RegCity(4, "덕양");
+RegCity(4, "강주");
+RegCity(4, "자동");
+RegCity(4, "성도", 1);
+RegCity(5, "서량", 1);
+RegCity(5, "천수");
+RegCity(6, "신야", 1);
+RegCity(7, "역경");
+RegCity(7, "호관");
+RegCity(7, "계");
+RegCity(7, "북평");
+RegCity(7, "진양");
+RegCity(7, "남피");
+RegCity(7, "하내");
+RegCity(7, "업", 1);
+RegCity(8, "한중", 1);
+RegCity(8, "양평");
+RegCity(9, "평원", 1);
+RegCity(9, "계교");
+RegCity(9, "북해");
+RegCity(10, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_7.php b/twe/scenario_7.php
index e6d41915..597eb41d 100644
--- a/twe/scenario_7.php
+++ b/twe/scenario_7.php
@@ -48,27 +48,27 @@ $img = $admin['img'];
//역사모드7 : 207년 적벽대전
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "하북을 제패하고 대군을 이끌고 남하하는 조조", 1000, 73, "병가", 6);
+RegNation("조조", "000080", 10000, 10000, "하북을 제패하고 대군을 이끌고 남하하는 조조", 1000, 73, "병가", 6);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "조조의 남하에 유비와 불가침으로 맞서는 손권", 1000, 49, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "조조의 남하에 유비와 불가침으로 맞서는 손권", 1000, 49, "덕가", 4);
//////////////////////////국가3/////////////////////////////////////////////////
-RegNation($connect, "유장", "483D8B", 10000, 10000, "익주에 만족하는 익주자사 유장", 1000, 25, "유가", 4);
+RegNation("유장", "483D8B", 10000, 10000, "익주에 만족하는 익주자사 유장", 1000, 25, "유가", 4);
//////////////////////////국가4////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "공명의 영입과 손씨와의 불가침으로 반전을 꾀하는 유비", 1000, 18, "유가", 2);
+RegNation("유비", "008000", 10000, 10000, "공명의 영입과 손씨와의 불가침으로 반전을 꾀하는 유비", 1000, 18, "유가", 2);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "마등", "808000", 10000, 10000, "서량태수 마등", 1000, 13, "병가", 4);
+RegNation("마등", "808000", 10000, 10000, "서량태수 마등", 1000, 13, "병가", 4);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
+RegNation("장로", "20B2AA", 10000, 10000, "한중의 오두미도 장로", 1000, 7, "오두미도", 1);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "한현", "FF6347", 10000, 10000, "장사태수 한현", 1000, 4, "묵가", 2);
+RegNation("한현", "FF6347", 10000, 10000, "장사태수 한현", 1000, 4, "묵가", 2);
//////////////////////////국가8/////////////////////////////////////////////////
-RegNation($connect, "조범", "808000", 10000, 10000, "계양태수 조범", 1000, 3, "도가", 2);
+RegNation("조범", "808000", 10000, 10000, "계양태수 조범", 1000, 3, "도가", 2);
//////////////////////////국가9/////////////////////////////////////////////////
-RegNation($connect, "유도", "AFEEEE", 10000, 10000, "영릉태수 유도", 1000, 3, "덕가", 2);
+RegNation("유도", "AFEEEE", 10000, 10000, "영릉태수 유도", 1000, 3, "덕가", 2);
//////////////////////////국가10/////////////////////////////////////////////////
-RegNation($connect, "공손강", "A0522D", 10000, 10000, "공손강", 1000, 2, "도적", 1);
+RegNation("공손강", "A0522D", 10000, 10000, "공손강", 1000, 2, "도적", 1);
//////////////////////////국가11/////////////////////////////////////////////////
-RegNation($connect, "금선", "800080", 10000, 10000, "무릉태수 금선", 1000, 2, "도가", 2);
+RegNation("금선", "800080", 10000, 10000, "무릉태수 금선", 1000, 2, "도가", 2);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -1011,61 +1011,61 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유장 국가4 유비 국가5 마등
//국가6 장로 국가7 한현 국가8 조범 국가9 유도 국가10공손강 국가11 금선
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "북평");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "평원");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "업");
-RegCity($connect, 1, "북해");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 1, "수춘");
-RegCity($connect, 1, "신야");
-RegCity($connect, 1, "양양");
-RegCity($connect, 1, "강릉");
-RegCity($connect, 1, "장판");
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "적벽");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "시상");
-RegCity($connect, 3, "면죽");
-RegCity($connect, 3, "자동");
-RegCity($connect, 3, "성도", 1);
-RegCity($connect, 3, "강주");
-RegCity($connect, 4, "강하", 1);
-RegCity($connect, 5, "서량", 1);
-RegCity($connect, 5, "천수");
-RegCity($connect, 6, "한중", 1);
-RegCity($connect, 6, "양평");
-RegCity($connect, 7, "장사", 1);
-RegCity($connect, 8, "계양", 1);
-RegCity($connect, 9, "영릉", 1);
-RegCity($connect, 10, "안평", 1);
-RegCity($connect, 11, "무릉", 1);
+RegCity(1, "역경");
+RegCity(1, "계교");
+RegCity(1, "관도");
+RegCity(1, "호관");
+RegCity(1, "정도");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "서주");
+RegCity(1, "계");
+RegCity(1, "북평");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "평원");
+RegCity(1, "하내");
+RegCity(1, "업");
+RegCity(1, "북해");
+RegCity(1, "복양");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "하비");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(1, "수춘");
+RegCity(1, "신야");
+RegCity(1, "양양");
+RegCity(1, "강릉");
+RegCity(1, "장판");
+RegCity(2, "파양");
+RegCity(2, "적벽");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "건업", 1);
+RegCity(2, "시상");
+RegCity(3, "면죽");
+RegCity(3, "자동");
+RegCity(3, "성도", 1);
+RegCity(3, "강주");
+RegCity(4, "강하", 1);
+RegCity(5, "서량", 1);
+RegCity(5, "천수");
+RegCity(6, "한중", 1);
+RegCity(6, "양평");
+RegCity(7, "장사", 1);
+RegCity(8, "계양", 1);
+RegCity(9, "영릉", 1);
+RegCity(10, "안평", 1);
+RegCity(11, "무릉", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_8.php b/twe/scenario_8.php
index 82e2d201..089df161 100644
--- a/twe/scenario_8.php
+++ b/twe/scenario_8.php
@@ -48,19 +48,19 @@ $img = $admin['img'];
//역사모드8 : 213년 익주 공방전
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "강남 정벌에 실패한 뒤 한중을 노리는 조조", 1000, 78, "병가", 6);
+RegNation("조조", "000080", 10000, 10000, "강남 정벌에 실패한 뒤 한중을 노리는 조조", 1000, 78, "병가", 6);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "적벽대전을 대승으로 이끈 뒤 세력을 재정비하는 손권", 1000, 49, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "적벽대전을 대승으로 이끈 뒤 세력을 재정비하는 손권", 1000, 49, "덕가", 4);
//////////////////////////국가3////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "형주를 제패하고 익주를 노리는 유비", 1000, 43, "유가", 4);
+RegNation("유비", "008000", 10000, 10000, "형주를 제패하고 익주를 노리는 유비", 1000, 43, "유가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "유장", "483D8B", 10000, 10000, "장로를 막기 위해 유비를 끌어들인 유장", 1000, 24, "유가", 4);
+RegNation("유장", "483D8B", 10000, 10000, "장로를 막기 위해 유비를 끌어들인 유장", 1000, 24, "유가", 4);
//////////////////////////국가5/////////////////////////////////////////////////
-RegNation($connect, "장로", "20B2AA", 10000, 10000, "익주 진출에 실패하고 조조에게 위협받는 장로", 1000, 7, "오두미도", 2);
+RegNation("장로", "20B2AA", 10000, 10000, "익주 진출에 실패하고 조조에게 위협받는 장로", 1000, 7, "오두미도", 2);
//////////////////////////국가6/////////////////////////////////////////////////
-RegNation($connect, "마초", "808000", 10000, 10000, "서북지방을 잃고 장로에게 의탁중인 마초", 1000, 3, "병가", 0);
+RegNation("마초", "808000", 10000, 10000, "서북지방을 잃고 장로에게 의탁중인 마초", 1000, 3, "병가", 0);
//////////////////////////국가7/////////////////////////////////////////////////
-RegNation($connect, "공손공", "A0522D", 10000, 10000, "공손공", 1000, 1, "도적", 1);
+RegNation("공손공", "A0522D", 10000, 10000, "공손공", 1000, 1, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -863,61 +863,61 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유비 국가4 유장 국가5 장로
//국가6 마초 국가7 공손공
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "북평");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "평원");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "업");
-RegCity($connect, 1, "북해");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "안정");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 1, "수춘");
-RegCity($connect, 1, "신야");
-RegCity($connect, 1, "양양");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "적벽");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 3, "자동");
-RegCity($connect, 3, "강하");
-RegCity($connect, 3, "강릉", 1);
-RegCity($connect, 3, "무릉");
-RegCity($connect, 3, "장사");
-RegCity($connect, 3, "영릉");
-RegCity($connect, 3, "계양");
-RegCity($connect, 4, "성도", 1);
-RegCity($connect, 4, "면죽");
-RegCity($connect, 4, "덕양");
-RegCity($connect, 4, "영안");
-RegCity($connect, 4, "강주");
-RegCity($connect, 5, "한중", 1);
-RegCity($connect, 5, "양평");
-RegCity($connect, 7, "안평", 1);
+RegCity(1, "역경");
+RegCity(1, "계교");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(1, "서주");
+RegCity(1, "호관");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "계");
+RegCity(1, "북평");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "평원");
+RegCity(1, "하내");
+RegCity(1, "업");
+RegCity(1, "북해");
+RegCity(1, "복양");
+RegCity(1, "안정");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "하비");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(1, "수춘");
+RegCity(1, "신야");
+RegCity(1, "양양");
+RegCity(2, "건업", 1);
+RegCity(2, "파양");
+RegCity(2, "적벽");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(3, "자동");
+RegCity(3, "강하");
+RegCity(3, "강릉", 1);
+RegCity(3, "무릉");
+RegCity(3, "장사");
+RegCity(3, "영릉");
+RegCity(3, "계양");
+RegCity(4, "성도", 1);
+RegCity(4, "면죽");
+RegCity(4, "덕양");
+RegCity(4, "영안");
+RegCity(4, "강주");
+RegCity(5, "한중", 1);
+RegCity(5, "양평");
+RegCity(7, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/scenario_9.php b/twe/scenario_9.php
index 79cdfe3b..3f4039d0 100644
--- a/twe/scenario_9.php
+++ b/twe/scenario_9.php
@@ -48,13 +48,13 @@ $img = $admin['img'];
//역사모드9 : 219년 삼국정립
//////////////////////////국가1/////////////////////////////////////////////////
-RegNation($connect, "조조", "000080", 10000, 10000, "한중을 잃고 퇴각한 조조", 1000, 77, "병가", 6);
+RegNation("조조", "000080", 10000, 10000, "한중을 잃고 퇴각한 조조", 1000, 77, "병가", 6);
//////////////////////////국가2/////////////////////////////////////////////////
-RegNation($connect, "손권", "FF0000", 10000, 10000, "형주를 되돌려 받기 위해 고심하는 손권", 1000, 44, "덕가", 4);
+RegNation("손권", "FF0000", 10000, 10000, "형주를 되돌려 받기 위해 고심하는 손권", 1000, 44, "덕가", 4);
//////////////////////////국가3////////////////////////////////////////////////
-RegNation($connect, "유비", "008000", 10000, 10000, "한중왕에 오른 유비", 1000, 71, "유가", 4);
+RegNation("유비", "008000", 10000, 10000, "한중왕에 오른 유비", 1000, 71, "유가", 4);
//////////////////////////국가4/////////////////////////////////////////////////
-RegNation($connect, "공손공", "A0522D", 10000, 10000, "공손공", 1000, 4, "도적", 1);
+RegNation("공손공", "A0522D", 10000, 10000, "공손공", 1000, 4, "도적", 1);
//////////////////////////외교//////////////////////////////////////////////////
$query = "insert into diplomacy (me, you, state, term) values ('1', '2', '2', '0')";
@@ -781,68 +781,68 @@ RegGeneral($connect,1,0,$fiction,$turnterm,$startyear,$year,1678, 22, "희지
//////////////////////////도시 소속/////////////////////////////////////////////
//국가1 조조 국가2 손권 국가3 유비 국가4 공손공
-RegCity($connect, 1, "합비");
-RegCity($connect, 1, "광릉");
-RegCity($connect, 1, "역경");
-RegCity($connect, 1, "계교");
-RegCity($connect, 1, "관도");
-RegCity($connect, 1, "정도");
-RegCity($connect, 1, "서주");
-RegCity($connect, 1, "호관");
-RegCity($connect, 1, "호로");
-RegCity($connect, 1, "사곡");
-RegCity($connect, 1, "함곡");
-RegCity($connect, 1, "사수");
-RegCity($connect, 1, "계");
-RegCity($connect, 1, "북평");
-RegCity($connect, 1, "진양");
-RegCity($connect, 1, "남피");
-RegCity($connect, 1, "평원");
-RegCity($connect, 1, "하내");
-RegCity($connect, 1, "업");
-RegCity($connect, 1, "북해");
-RegCity($connect, 1, "복양");
-RegCity($connect, 1, "안정");
-RegCity($connect, 1, "장안");
-RegCity($connect, 1, "홍농");
-RegCity($connect, 1, "낙양");
-RegCity($connect, 1, "진류");
-RegCity($connect, 1, "패");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "허창", 1);
-RegCity($connect, 1, "초");
-RegCity($connect, 1, "하비");
-RegCity($connect, 1, "완");
-RegCity($connect, 1, "여남");
-RegCity($connect, 1, "수춘");
-RegCity($connect, 1, "신야");
-RegCity($connect, 1, "양양");
-RegCity($connect, 2, "건업", 1);
-RegCity($connect, 2, "파양");
-RegCity($connect, 2, "적벽");
-RegCity($connect, 2, "여강");
-RegCity($connect, 2, "오");
-RegCity($connect, 2, "회계");
-RegCity($connect, 2, "시상");
-RegCity($connect, 2, "강하");
-RegCity($connect, 2, "장사");
-RegCity($connect, 2, "계양");
-RegCity($connect, 3, "강릉");
-RegCity($connect, 3, "무릉");
-RegCity($connect, 3, "영릉");
-RegCity($connect, 3, "이릉");
-RegCity($connect, 3, "상용");
-RegCity($connect, 3, "한중");
-RegCity($connect, 3, "양평");
-RegCity($connect, 3, "하변");
-RegCity($connect, 3, "가맹");
-RegCity($connect, 3, "자동");
-RegCity($connect, 3, "면죽");
-RegCity($connect, 3, "성도", 1);
-RegCity($connect, 3, "덕양");
-RegCity($connect, 3, "영안");
-RegCity($connect, 3, "강주");
-RegCity($connect, 4, "안평", 1);
+RegCity(1, "합비");
+RegCity(1, "광릉");
+RegCity(1, "역경");
+RegCity(1, "계교");
+RegCity(1, "관도");
+RegCity(1, "정도");
+RegCity(1, "서주");
+RegCity(1, "호관");
+RegCity(1, "호로");
+RegCity(1, "사곡");
+RegCity(1, "함곡");
+RegCity(1, "사수");
+RegCity(1, "계");
+RegCity(1, "북평");
+RegCity(1, "진양");
+RegCity(1, "남피");
+RegCity(1, "평원");
+RegCity(1, "하내");
+RegCity(1, "업");
+RegCity(1, "북해");
+RegCity(1, "복양");
+RegCity(1, "안정");
+RegCity(1, "장안");
+RegCity(1, "홍농");
+RegCity(1, "낙양");
+RegCity(1, "진류");
+RegCity(1, "패");
+RegCity(1, "하비");
+RegCity(1, "허창", 1);
+RegCity(1, "초");
+RegCity(1, "하비");
+RegCity(1, "완");
+RegCity(1, "여남");
+RegCity(1, "수춘");
+RegCity(1, "신야");
+RegCity(1, "양양");
+RegCity(2, "건업", 1);
+RegCity(2, "파양");
+RegCity(2, "적벽");
+RegCity(2, "여강");
+RegCity(2, "오");
+RegCity(2, "회계");
+RegCity(2, "시상");
+RegCity(2, "강하");
+RegCity(2, "장사");
+RegCity(2, "계양");
+RegCity(3, "강릉");
+RegCity(3, "무릉");
+RegCity(3, "영릉");
+RegCity(3, "이릉");
+RegCity(3, "상용");
+RegCity(3, "한중");
+RegCity(3, "양평");
+RegCity(3, "하변");
+RegCity(3, "가맹");
+RegCity(3, "자동");
+RegCity(3, "면죽");
+RegCity(3, "성도", 1);
+RegCity(3, "덕양");
+RegCity(3, "영안");
+RegCity(3, "강주");
+RegCity(4, "안평", 1);
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80,def=def2*0.7,wall=wall2*0.7 where nation>0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/twe/select_npc_post.php b/twe/select_npc_post.php
index 7565fe04..a3964595 100644
--- a/twe/select_npc_post.php
+++ b/twe/select_npc_post.php
@@ -109,7 +109,7 @@ if($admin['npcmode'] != 1) {
pushAllLog($log);
$adminLog[0] = "가입 : {$me['name']} // {$id} // ".getenv("REMOTE_ADDR");
- pushAdminLog($connect, $adminLog);
+ pushAdminLog($adminLog);
MYDB_close($connect);
diff --git a/twe/turn.php b/twe/turn.php
index 909c1ad1..23a22120 100644
--- a/twe/turn.php
+++ b/twe/turn.php
@@ -6,7 +6,7 @@ include "func.php";
use utilphp\util as util;
CheckLogin(1);
$connect = dbConn();
-increaseRefresh($connect, "턴반복", 1);
+increaseRefresh("턴반복", 1);
$query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");