Added table card display. TODO: debug wrong target ids, debug on card…

… droppable

GameServer.cpp

@@ -82,6 +82,7 @@ GameServer::GameServer(){
             int attache = data["attachTo"];
             if(attache<0){//new card TODO check permissions!!!
                 tableBaseCards.push_back(card);
+                cout<<"Card played as action root."<<endl;
             }else{//TODO check permissions!!! FIXME
                 if(attache<0||attache>=turnTable.size()) return;
                 turnTable[attache]->getAppliedCards().push_back(card);
@@ -270,8 +271,11 @@ void GameServer::nextTurn(int pid){
 void GameServer::updateTurnTable(){//turning tables
    Message m;
    m.name="updateTurnTable";
-   for(auto& card : turnTable){
+   m.data = json::array();
+   for(auto& card : tableBaseCards){
         m.data.push_back(card->jsonify());
+        cout<<"TableCard "<<card->getName()<<endl;
    }
+   cout<<"Sending cards: "<<m.data<<endl;
    broadcast(m);
 }

cards/BaseCard.cpp

@@ -6,7 +6,10 @@ using namespace nlohmann;
 json BaseCard::jsonify(){
     json o;
     o["name"] = this->getName();
+    o["attached"] = json::array();
+    o["id"] = this->getCUID();
     for(auto& card : this->getAppliedCards()){
         o["attached"].push_back(card->jsonify());
     }
+    return o;
 }

cards/Targetable.cpp

@@ -8,7 +8,10 @@ json Targetable::jsonify(){
     o["name"] = this->getName();
     o["from"] = from;
     o["to"] = to;
+    o["attached"] = json::array();
+    o["id"] = this->getCUID();
     for(auto& card : this->getAppliedCards()){
         o["attached"].push_back(card->jsonify());
     }
+    return o;
 }

main.cpp

@@ -13,7 +13,7 @@ using namespace seasocks;
 using namespace nlohmann;
 
 int main() {
-    Server server(make_shared<PrintfLogger>());
+    Server server(make_shared<PrintfLogger>(PrintfLogger::Level::INFO));
     shared_ptr<GameServer> game = make_shared<GameServer>();
     server.addWebSocketHandler("/ws", game);
     volatile bool running = true;

web/scriptindex.js

@@ -92,6 +92,7 @@ function handleAction(cardId,onCardId){
   var targetable = checkTargetable(myCards[cardId]);
   if(targetable){
     $("#chosePlayerModal").modal('show');
+    $('#chosePlayerModal').modal({backdrop: 'static', keyboard: false})
     for(var i=0;i<player.length;i++){
       var p = player[i];
       $("#player"+i).click(function(){
@@ -102,7 +103,7 @@ function handleAction(cardId,onCardId){
     }
   }
   else{
-    socket.emit('playCard',{id:cardId,attachTo:onCardId})
+    socket.emit('playCard',{id:parseInt(cardId),attachTo:parseInt(onCardId)})
   }
 }
 
@@ -156,15 +157,15 @@ function showMe(){
     $("#me").html(innerMe);
 }
 
-socket.on('turningTableAction',function(cards){
-  for(var i;i<cards.length;i++){
-    var parent = $("#gameAreaUl");
-    handleCard(cards[i],parent)
-
-
+socket.on('updateTurnTable',function(cards){
+console.log('turntable',cards);
+$("#gameArea").html("");
+  for(var i=0;i<cards.length;i++){
+    var parent = $("#gameArea");
+    handleCard(cards[i],parent);
   }
 
-})
+});
 //test
 var test1 = {
   name: "pustak",
@@ -197,9 +198,10 @@ var test5 = {
 //end test
 
 function handleCard(card,parent){
+    console.log(card);
   var innerCard = '';
 
-  if(card.from === undefined){
+  if(true || card.from === undefined){
     innerCard = "<div class='tableContainerClass' id = 'tableContainer"+card.id+"'><img class='tableCardClass' id='tableCard"+card.id+"'src='/cards/"+card.name+".jpg'></div>"
   }
 

web/styleindex.css

@@ -76,7 +76,7 @@ html, body{
   background-color: blue;
 }
 #chat{
-  background-color: green;
+  background-color: lightgreen;
   height:26vh;
 }