From 0f175ac4c641492ac32a9ed615cc3090a79d309c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 26 Aug 2018 23:16:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=B9=84=20=EC=88=9C=EC=84=9C?=
 =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EC=A0=95=EB=A0=AC=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/battle_simulator.php   |  2 +-
 hwe/j_simulate_battle.php  | 19 +++++++++++++++-
 hwe/js/battle_simulator.js | 44 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php
index bf7e742b..04497976 100644
--- a/hwe/battle_simulator.php
+++ b/hwe/battle_simulator.php
@@ -219,7 +219,7 @@ $startYear = $gameStor->getValue('startyear');
                 <div class="float-sm-left" style="line-height:25px;">수비자 설정</div>
                 <div class="float-sm-right btn-toolbar" role="toolbar">
                     <div class="btn-group btn-group-sm mr-2" role="group">
-                        <button type="button" class="btn btn-dark">수비 순서대로 정렬</button>
+                        <button type="button" class="btn btn-dark btn-reorder_defender">수비 순서대로 정렬</button>
                     </div>
                     <div class="btn-group btn-group-sm mr-2" role="group">
                         <input type="file" class="form_load_general_file" style="display: none;" />
diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php
index 6d2a8109..ba9881ac 100644
--- a/hwe/j_simulate_battle.php
+++ b/hwe/j_simulate_battle.php
@@ -16,7 +16,7 @@ if($query === null){
 }
 
 $action = Util::getReq('action');
-if($action === null || in_array($action, ['reorder', 'battle'])){
+if($action === null || !in_array($action, ['reorder', 'battle'])){
     Json::die([
         'result'=>false,
         'reason'=>'원하는 동작이 지정되지 않았습니다.'
@@ -241,6 +241,23 @@ if(!$v->validate()){
     ]);
 }
 
+if($action == 'reorder'){
+    usort($defenderGenerals, function($lhs, $rhs){
+        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    });
+
+    $order = [];
+    foreach($defenderGenerals as $defenderGeneral){
+        $order[] = $defenderGeneral['no'];
+    }
+    
+    Json::die([
+        'result'=>true,
+        'reason'=>'success',
+        'order'=>$order
+    ]);
+}
+
 Json::die([
     'result'=>true,
     'reason'=>'NYI'
diff --git a/hwe/js/battle_simulator.js b/hwe/js/battle_simulator.js
index c1a304c4..2a8ab2af 100644
--- a/hwe/js/battle_simulator.js
+++ b/hwe/js/battle_simulator.js
@@ -542,6 +542,46 @@ jQuery(function($){
         });
     }
 
+
+    var reorderDefender = function(defenderOrder){
+        $.each(defenderOrder, function(idx, generalNo){
+
+            if(!(generalNo in defenderNoList)){
+                //음..?
+                alert("{0}이 수비자 리스트에 없습니다. 버그인 듯 합니다.".format(generalNo));
+                return true;
+            }
+
+            var $defenderObj = defenderNoList[generalNo];
+            $defenderObj.detach();
+            $defenderColumn.append($defenderObj);
+        })
+    }
+
+    var requestReorderDefender = function(){
+        var data = extendAllDataForDB(exportAllData());
+        console.log(data);
+        $.ajax({
+            type:'post',
+            url:'j_simulate_battle.php',
+            dataType:'json',
+            data:{
+                action:'reorder',
+                query:JSON.stringify(data),
+            }
+        }).then(function(result){
+            console.log(result);
+            if(!result.result){
+                alert(result.reason);
+                return;
+            }
+            reorderDefender(result.order);
+            
+        }, function(result){
+            alert('재정렬 실패!');
+        });
+    }
+
     initBasicEvent();
     $attackerCard.append($generalForm.clone(true,true));
     addDefender();
@@ -549,4 +589,8 @@ jQuery(function($){
     $('.btn-begin_battle').click(function(){
         beginBattle();
     });
+
+    $('.btn-reorder_defender').click(function(){
+        requestReorderDefender();
+    })
 });
\ No newline at end of file