Merge branch 'devel' into kvstorage_game

hwe/b_myBossInfo.php

@@ -144,14 +144,14 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) {
     echo "
             <select name=outlist size=1 style=color:white;background-color:black;>";
 
-    $query = "select no,name,level from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
+    $query = "select no,name,level,leader,power,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
     for($i=0; $i < $gencount; $i++) {
         $general = MYDB_fetch_array($result);
         echo "
-                <option value={$general['no']}>{$general['name']}</option>";
+                <option value={$general['no']}>{$general['name']} <small>({$general['leader']}/{$general['power']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
     }
 
     echo "

hwe/scenario/scenario_frame.json

@@ -3,15 +3,15 @@
     "life":0,
     "fiction":0,
     "nation":[
-        ["str:국가명", "#800000", "int:금", "int:쌀", "str:국가설명", "int:기술", "str:성향", "int:국가규모", 
-            ["str:소속도시"]
+        ["str:국가명", "RGB string:국가컬러", "int:금", "int:쌀", "str:국가설명", "int:기술", "str:성향", "int:국가규모(0:방랑군 ~ 6:황제)", 
+            ["str:소속도시(첫번째 도시가 수도)"]
         ]
     ],
     "diplomacy":[
-        ["int:국가", "int:국가", "int:외교종류", "int:기간"]
+        ["int:국가", "int:국가", "int:외교종류(0:전쟁, 1:선포, 7:불가침)", "int:기간(개월)"]
     ],
     "general":[
-        ["int:상성",       "str:장수명","int:금",  "int:쌀",    "str:도시(null:'랜덤)", "int:통", "int:무", "int:지", "int:관직", "int:생년", "int:몰년",    "str:내특",    "str:전특", "opt,str:대사"]
+        ["int?:상성(1~150, 999:영구재야, null:랜덤)", "str:장수명","int:전콘번호(-1:없음)", "int:소속국가(1부터, 0:재야)", "str?:도시(null:'랜덤)", "int:통", "int:무", "int:지", "int:관직(0:재야, 1:장수, 5~10:수뇌, 11:참모, 12:군주)", "int:생년", "int:몰년",  "str?:성격(null:랜덤)",    "str?:내특/전특(랜덤, 랜덤내특, 랜덤전특, null:미정)", "opt,str:대사"]
     ],
     "general_ex":[
     ],