From c23f5e5bb38802d0290fea0ea3fbbfb89fb86b17 Mon Sep 17 00:00:00 2001
From: Gnieark <rpasserieu@ch-boispetit.fr>
Date: Fri, 11 Dec 2015 12:57:48 +0100
Subject: [PATCH] awnser is no

---
 src/arenas/Battleship/js.js      | 32 +++++++++++++++++++++-----------
 src/arenas/Battleship/public.php |  4 ++--
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/arenas/Battleship/js.js b/src/arenas/Battleship/js.js
index 9f33363..400921a 100644
--- a/src/arenas/Battleship/js.js
+++ b/src/arenas/Battleship/js.js
@@ -20,22 +20,32 @@ function createElem(type,attributes)
     return elem;
 }
 
-function battleship(botsArray,bot1,bot2,gridWidth,gridHeight,nbShip1,nbShip2,nbShip3,nbShip4,nbShip5,nbShip6,xd_check){
-    
+function battleship(bot1,bot2,gridWidth,gridHeight,nbShip1,nbShip2,nbShip3,nbShip4,nbShip5,nbShip6,xd_check){
+   var  bot1IdName = bot1.split("-");
+   var  bot2IdName = bot2.split("-");
   document.getElementById('fightResult').innerHTML = '';
   //dessiner les deux grilles
-  tableAdv=createElem("table",{"id":"tblAdv","class":"battleshipGrid"});
-  tableMe=createElem("table",{"id":"tblAdv","class":"battleshipGrid"});
+  var tableAdv=createElem("table",{"id":"tblAdv","class":"battleshipGrid"});
+  var tableMe=createElem("table",{"id":"tblAdv","class":"battleshipGrid"});
   
-  for (i=0; i < gridHeight ; i++){
+  for (var i=0; i < gridHeight ; i++){
    //ligne de titre
-    
+   var trTitre1=createElem("tr");
+   var trTitre2=createElem("tr");
+   var tdTitre1=createElem("td",{"collspan":gridWidth});
+   var tdTitre2=createElem("td",{"collspan":gridWidth});
+   tdTitre1.innerHTML = bot1IdName[1];
+   tdTitre2.innerHTML = bot2IdName[1];
+   trTitre1.appendChild(tdTitre1);
+   tableAdv.appendChild(trTitre1);
+   trTitre2.appendChild(tdTitre2);
+   tableMe.appendChild(trTitre2);
    
-   trAdv=createElem("tr");
-   trMe=createElem("tr");
-   for (j=0; j < gridWidth ; j++){
-     tdAdv=createElem("td",{"id":"adv" + i +"-" + j,"class": "empty"});
-     tdMe=createElem("td",{"id":"me" + i +"-" + j,"class": "empty"});
+   var trAdv=createElem("tr");
+   var trMe=createElem("tr");
+   for (var j=0; j < gridWidth ; j++){
+     var tdAdv=createElem("td",{"id":"adv" + i +"-" + j,"class": "empty"});
+     var tdMe=createElem("td",{"id":"me" + i +"-" + j,"class": "empty"});
      trAdv.appendChild(tdAdv);
      trMe.appendChild(tdMe);
    }
diff --git a/src/arenas/Battleship/public.php b/src/arenas/Battleship/public.php
index c4c3e2d..2a42236 100644
--- a/src/arenas/Battleship/public.php
+++ b/src/arenas/Battleship/public.php
@@ -43,12 +43,12 @@ if(!$postParams){
                         $selected='selected="selected"';
                         else
                         $selected='';
-                        echo '<option value="'.$i.'" '.$selected.'>'.$bots[$i]['name'].'</option>';
+                        echo '<option value="'.$i."-"$bots[$i]['name'].'" '.$selected.'>'.$bots[$i]['name'].'</option>';
                     }
                     ?>
                 </select></em>
         </p>
         <!--  battleship(bot1,bot2,gridWidth,gridHeight,nbShip1,nbShip2,nbShip3,nbShip4,nbShip5,nbShip6,xd_check) -->
-	<p><label>&nbsp;</label><input type="button" value="<?php echo $lang['FIGHT']; ?>" onclick="battleship(<?php echo json_encode($bots); ?>,document.getElementById('bot1').value,document.getElementById('bot2').value,getElementById('width').value,getElementById('height').value,getElementById('ship1').value,getElementById('ship2').value,getElementById('ship3').value,getElementById('ship4').value,getElementById('ship5').value,getElementById('ship6').value,'<?php echo xd_check_input(2); ?>');"></p>
+	<p><label>&nbsp;</label><input type="button" value="<?php echo $lang['FIGHT']; ?>" onclick="battleship(document.getElementById('bot1').value,document.getElementById('bot2').value,getElementById('width').value,getElementById('height').value,getElementById('ship1').value,getElementById('ship2').value,getElementById('ship3').value,getElementById('ship4').value,getElementById('ship5').value,getElementById('ship6').value,'<?php echo xd_check_input(2); ?>');"></p>
     <div id="fightResult"></div>
 </article>
\ No newline at end of file