diff --git a/hwe/sammo/Command/Nation/che_발령.php b/hwe/sammo/Command/Nation/che_발령.php index 480848b2..7b3db4de 100644 --- a/hwe/sammo/Command/Nation/che_발령.php +++ b/hwe/sammo/Command/Nation/che_발령.php @@ -173,7 +173,10 @@ class che_발령 extends Command\NationCommand{ { $db = DB::db(); - $destRawGenerals = $db->query('SELECT no,name,officer_level,npc,gold,rice FROM general WHERE nation = %i ORDER BY npc,binary(name)',$this->generalObj->getNationID()); + $nationID = $this->generalObj->getNationID(); + + $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader'); + $destRawGenerals = $db->query('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)',$nationID); $destGeneralList = []; foreach($destRawGenerals as $destGeneral){ $nameColor = \sammo\getNameColor($destGeneral['npc']); @@ -186,13 +189,9 @@ class che_발령 extends Command\NationCommand{ $name = "*{$name}*"; } - $destGeneralList[] = [ - 'no'=>$destGeneral['no'], - 'color'=>$nameColor, - 'name'=>$name, - 'gold'=>$destGeneral['gold'], - 'rice'=>$destGeneral['rice'] - ]; + $destGeneral['name'] = $name; + $destGeneral['color'] = $nameColor; + $destGeneralList[] = $destGeneral; } ob_start(); ?> @@ -202,7 +201,10 @@ class che_발령 extends Command\NationCommand{ 목록을 선택하거나 도시를 클릭하세요.