| . |
- ".getLevel($l4, $nation['level'])." : ".($gen[$l4]['name']??'')." |
- ".getLevel($l3, $nation['level'])." : ".($gen[$l3]['name']??'')." |
- ".getLevel($l2, $nation['level'])." : ".($gen[$l2]['name']??'')." |
- ".getLevel($l1, $nation['level'])." : ".($gen[$l1]['name']??'')." |
+ ".getLevel($l4, $nationLevel)." : ".($gen[$l4]['name']??'')." |
+ ".getLevel($l3, $nationLevel)." : ".($gen[$l3]['name']??'')." |
+ ".getLevel($l2, $nationLevel)." : ".($gen[$l2]['name']??'')." |
+ ".getLevel($l1, $nationLevel)." : ".($gen[$l1]['name']??'')." |
. |
";
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 3098109b..8178f829 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -186,10 +186,28 @@ if($city['trade'] == 0) {
$city['trade'] = "- ";
}
-$query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc"; // 장수 목록
+$query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos from general where city='{$city['city']}' order by dedication desc"; // 장수 목록
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult);
+$generals = $db->query(
+ 'SELECT npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos from general where city=%i order by name',
+ $city['city']
+);
+
+$generalTurnList = [];
+
+foreach($db->queryAllLists(
+ 'SELECT general_id, turn_idx, action, arg FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+ Util::pickArrayFromArrayOfDictWithKey($generals, 'no')
+ ) as [$generalID, $turnIdx, $action, $arg]
+){
+ if(!key_exists($generalID, $generalTurnList)){
+ $generalTurnList[$generalID] = [];
+ }
+ $generalTurnList[$generalID][$turnIdx] = [$action, Json::decode($arg)];
+}
+
$nationname = [];
$nationlevel = [];
foreach(getAllNationStaticInfo() as $nation){
@@ -268,7 +286,7 @@ for($j=0; $j < $gencount; $j++) {
if($ourGeneral && !$isNPC){
$turnText = [];
- foreach(getTurn($general, 1) as $turnRawIdx=>$turn){
+ foreach(getGeneralTurnBrief($general, 1) as $turnRawIdx=>$turn){
$turnIdx = $turnRawIdx+1;
$turnText[] = "{$turnIdx} : $turn";
}
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index e7c136fb..ddf7e955 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -97,7 +97,24 @@ switch ($type) {
case 8: $orderSQL = "order by troop desc"; break;
}
-$generals = $db->query('SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,turn0,turn1,turn2,turn3,turn4 from general WHERE nation = %i %l', $me['nation'], $orderSQL);
+$generals = $db->query(
+ 'SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
+ $me['nation'],
+ $orderSQL
+);
+
+$generalTurnList = [];
+
+foreach($db->queryAllLists(
+ 'SELECT general_id, turn_idx, action, arg FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+ Util::pickArrayFromArrayOfDictWithKey($generals, 'no')
+ ) as [$generalID, $turnIdx, $action, $arg]
+){
+ if(!key_exists($generalID, $generalTurnList)){
+ $generalTurnList[$generalID] = [];
+ }
+ $generalTurnList[$generalID][$turnIdx] = [$action, Json::decode($arg)];
+}
foreach ($generals as &$general) {
$general['cityText'] = CityConst::byID($general['city'])->name;
@@ -157,13 +174,15 @@ foreach ($generals as &$general) {
if ($general['npc'] < 2) {
+ $generalObj = new General($general, null, 0, 0, false);
+ $turnBrief = getGeneralTurnBrief($genralObj, $generalTurnList[$general['no']]);
$turntext = [];
- $turn = getTurn($general, 1, 0);
+ $turn = getGeneralTurnBrief($general, 1, 0);
- for ($i=0; $i < 5; $i++) {
- $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 41);
- $k = $i+1;
- $turntext[] = " $k : $turn[$i]";
+ foreach($turnBrief as $turnIdx=>$text) {
+ $text = StringUtil::subStringForWidth($text, 0, 41);
+ $printIdx = $turnIdx+1;
+ $turntext[] = " $printIdx : $text";
}
$general['turntext'] = join("