X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Fdnd.js;h=f17a2e5120a8cc932b56345699d300bdbaa27d64;hb=92011f35879da5026a15f8eb733b4f32c1131c41;hp=7e784faedbb9f3cf8936f9525137b06c26afde3d;hpb=2c0198da4ffa1cbc3b5cd4bf6f5f8edc45f7e670;p=brisk.git

diff --git a/web/briskin5/dnd.js b/web/briskin5/dnd.js
index 7e784fa..f17a2e5 100644
--- a/web/briskin5/dnd.js
+++ b/web/briskin5/dnd.js
@@ -46,24 +46,14 @@ var cards_we_n;
 var takes_we_n;
 
 /* width of images */
-/*
-var cards_width = 55 + 2;
-var cards_width_d2 =  27;
-*/
+var cards_width = 65;
+var cards_width_d2 =  Math.ceil(cards_width / 2);
 
 /* height of images */
-/*
-var cards_height = 101 + 2;
-var cards_height_d2 =   51;
-*/
+var cards_height = 111;
+var cards_height_d2 =  Math.ceil(cards_height / 2);
 
-/* width of images */
-var cards_width = 75;
-var cards_width_d2 =  37;
-
-/* height of images */
-var cards_height = 121;
-var cards_height_d2 =   61;
+console.log('G_deck: ' + g_deck);
 
 /* width of hands area */
 var hands_width = 400;
@@ -102,7 +92,7 @@ function cards_dispose_so(car_n, tak_n)
     if (tak_n > 0) {
 	delta = 80;
 	$("takes").style.left = 200 + 400 - 90 + ((90 - cards_width) /  2);
-	$("takes").style.top  = 475 + (125 - cards_height)/2;
+	$("takes").style.top  = 475 + (126 - cards_height)/2;
 	$("takes").style.zIndex = 1;
 	$("takes").style.visibility = "visible";
     }
@@ -123,7 +113,7 @@ function cards_dispose_so(car_n, tak_n)
 
     for (i = 0 ; i < car_n ; i++) {
 	$("card" + cards_pos[i]).style.left = start + (i * inter);
-	$("card" + cards_pos[i]).style.top  = 475 + (125 - cards_height)/2;
+	$("card" + cards_pos[i]).style.top  = 475 + (126 - cards_height)/2;
 	$("card" + cards_pos[i]).style.zIndex = CARD_HAND - i;
 	$("card" + cards_pos[i]).style.visibility = "visible";
     }
@@ -140,7 +130,7 @@ function cards_dispose_ne(car_n, tak_n) {
     if (tak_n > 0) {
 	delta = 80;
 	$("takes_ne").style.left = 800 - cards_width - 400 + 90 - ((90 - cards_width) /  2);
-	$("takes_ne").style.top  = (125 - cards_height)/2;
+	$("takes_ne").style.top  = (126 - cards_height)/2;
 	$("takes_ne").style.zIndex = 1;
 	$("takes_ne").style.visibility = "visible";
     }
@@ -179,7 +169,7 @@ function cards_dispose_nw(car_n, tak_n) {
     if (tak_n > 0) {
 	delta = 80;
 	$("takes_nw").style.left = 400 - cards_width - 400 + 90 - ((90 - cards_width) /  2);
-	$("takes_nw").style.top  = (125 - cards_height)/2;
+	$("takes_nw").style.top  = (126 - cards_height)/2;
 	$("takes_nw").style.zIndex = 1;
 	$("takes_nw").style.visibility = "visible";
     }
@@ -217,7 +207,7 @@ function cards_dispose_nw(car_n, tak_n) {
 function cards_dispose_ea(car_n, tak_n) {
     if (tak_n > 0) {
 	delta = 80;
-	$("takes_ea").style.left = 675 + (125 - cards_height)/2;
+	$("takes_ea").style.left = 675 + (126 - cards_height)/2;
 	$("takes_ea").style.top  = 125 + ((90 - cards_width) /  2);
 	$("takes_ea").style.zIndex = 1;
 	$("takes_ea").style.visibility = "visible";
@@ -239,7 +229,7 @@ function cards_dispose_ea(car_n, tak_n) {
     list = "LIST: ";
     // console.log(car_n);
     for (i = 0 ; i < car_n ; i++) {
-	$("card_ea" + cards_ea_pos[i]).style.left = 675 + (125 - cards_height)/2;
+	$("card_ea" + cards_ea_pos[i]).style.left = 675 + (126 - cards_height)/2;
 	$("card_ea" + cards_ea_pos[i]).style.top  = start + (i * inter);
 	$("card_ea" + cards_ea_pos[i]).style.zIndex = CARD_HAND - i;
 	$("card_ea" + cards_ea_pos[i]).style.visibility = "visible";
@@ -421,70 +411,74 @@ function card_mouseup_cb(o) {
 }
 
 /* CARD_SEND */
-function card_send_so(id,card,free,ct)
+function card_send_so(id, card, free, ct)
 {
     var img = $("card"+id);
-    img.src = getcard(-1,0);
+    img.setAttribute('data-card-id', getcard(-1,0));
     img.briskid = card;
 
     img.style.left = 400 - cards_width_d2;
     img.style.top  = 300 - cards_height_d2;
     img.style.zIndex = 100;
 
-    var movimg = new slowimg(img,400 - cards_width / 2,475 + (125 - cards_height)/2,25,free,"cards_dispose_so("+ct+", 0)",getcard(card,0));
+    var movimg = new slowimg(img, 400 - cards_width / 2,475 + (125 - cards_height)/2, 25,
+                             free, "cards_dispose_so(" + ct + ", 0)", getcard(card, 0));
     movimg.settime(G_send_time);
     movimg.start(gst);
 }
 
-function card_send_ea(id,card,free,ct)
+function card_send_ea(id, card, free, ct)
 {
     var img = $("card_ea"+id);
-    img.src = getcard(card,1);
+    img.setAttribute('data-card-id', getcard(card, 1));
     img.briskid = card;
 
     img.style.left = 400 - cards_height_d2;
     img.style.top  = 300 - cards_width_d2;
     img.style.zIndex = 100;
 
-    var movimg = new slowimg(img,686,296,25,free,"cards_dispose_ea("+ct+", 0);",getcard(card,1));
+    var movimg = new slowimg(img, 686, 296, 25,
+                             free, "cards_dispose_ea(" + ct + ", 0);", getcard(card, 1));
     movimg.settime(G_send_time);
     movimg.start(gst);
 }
 
-function card_send_ne(id,card,free,ct)
+function card_send_ne(id, card, free, ct)
 {
     var img = $("card_ne"+id);
-    img.src = getcard(card,2);
+    img.setAttribute('data-card-id', getcard(card, 2));
     img.briskid = card;
 
     img.style.left = 400 - cards_width_d2;
     img.style.top  = 300 - cards_height_d2;
     img.style.zIndex = 100;
 
-    var movimg = new slowimg(img,571,11,25,free,"cards_dispose_ne("+ct+", 0);",getcard(card,2));
+    var movimg = new slowimg(img, 571, 11, 25,
+                             free, "cards_dispose_ne(" + ct + ", 0);", getcard(card, 2));
     movimg.settime(G_send_time);
     movimg.start(gst);
 }
 
-function card_send_nw(id,card,free,ct)
+function card_send_nw(id, card, free, ct)
 {
     var img = $("card_nw"+id);
-    img.src = getcard(card,3);
+    img.setAttribute('data-card-id', getcard(card, 3));
     img.briskid = card;
 
     img.style.left = 400 - cards_width_d2;
     img.style.top  = 300 - cards_height_d2;
     img.style.zIndex = 100;
 
-    var movimg = new slowimg(img,171,11,25,free,"cards_dispose_nw("+ct+", 0);",getcard(card,3));
+    var movimg = new slowimg(img, 171, 11, 25,
+                             free, "cards_dispose_nw(" + ct + ", 0);", getcard(card, 3));
     movimg.settime(G_send_time);
     movimg.start(gst);
 }
 
-function card_send_we(id,card,free,ct)
+function card_send_we(id, card, free, ct)
 {
     var img = $("card_we"+id);
-    img.src = getcard(card,4);
+    img.setAttribute('data-card-id', getcard(card, 4));
     img.briskid = card;
 
     if (id < 0 || id > 39)
@@ -493,7 +487,8 @@ function card_send_we(id,card,free,ct)
     img.style.left = 400 - cards_height_d2;
     img.style.top  = 300 - cards_width_d2;
     img.style.zIndex = 100;
-    var movimg = new slowimg(img,11,296,25,free,"cards_dispose_we("+ct+", 0);",getcard(card,4));
+    var movimg = new slowimg(img, 11, 296, 25,
+                             free,"cards_dispose_we(" + ct + ", 0);", getcard(card, 4));
     movimg.settime(G_send_time);
     movimg.start(gst);
 }
@@ -502,27 +497,27 @@ var card_send_arr = new Array(card_send_so, card_send_ea,
 			      card_send_ne, card_send_nw,
 			      card_send_we);
 
-function card_send(player_pos,id,card,free,ct)
+function card_send(player_pos, id, card, free, ct)
 {
     var idx = (player_pos - table_pos + PLAYERS_N) % PLAYERS_N;
 
     card_send_arr[idx](id,card,free,ct);
 }
 
-function getcard(card,pos_id)
+function getcard(card, pos_id)
 {
     if (card < 0)
-	return ("img/cover"+sux[pos_id]+".png");
+	return ("cover" + sux[pos_id]);
     else if (card < 10)
-	return ("img/0"+card+sux[pos_id]+".png");
+	return ("0" + card+sux[pos_id]);
     else
-	return ("img/"+card+sux[pos_id]+".png");
+	return ("" + card + sux[pos_id]);
 }
 
-function card_setours(zer,uno,due,tre,qua,cin,sei,set)
+function card_setours(zer, uno, due, tre, qua, cin, sei, set)
 {
     var i;
-    var arg = new Array(zer,uno,due,tre,qua,cin,sei,set);
+    var arg = new Array(zer, uno, due, tre, qua, cin, sei, set);
 
     for (i = 0 ; i < CARD_HAND ; i++) {
         var id = (arg[i] < 10 ? '0' + arg[i] : '' + arg[i]);
@@ -543,7 +538,7 @@ function card_postplay_ea(card_pos)
 {
     var img = $("card_ea"+card_pos);
 
-    img.className = "";
+    // img.className = "";
     for (i = 0 ; i < cards_ea_n ; i++) {
 	if (cards_ea_pos[i] == card_pos) {
 	    for (e = i ; e < cards_ea_n-1 ; e++) {
@@ -579,8 +574,7 @@ function card_postplay_ne(obj,card_pos)
 {
     var img = $("card_ne"+card_pos);
 
-    img.className = "";
-
+    // img.className = "";
     for (i = 0 ; i < cards_ne_n ; i++) {
 	if (cards_ne_pos[i] == card_pos) {
 	    for (e = i ; e < cards_ne_n-1 ; e++) {
@@ -614,7 +608,7 @@ function card_postplay_nw(card_pos)
 {
     var img = $("card_nw"+card_pos);
 
-    img.className = "";
+    // img.className = "";
     for (i = 0 ; i < cards_nw_n ; i++) {
 	if (cards_nw_pos[i] == card_pos) {
 	    for (e = i ; e < cards_nw_n-1 ; e++) {
@@ -648,7 +642,7 @@ function card_postplay_we(card_pos)
 {
     var img = $("card_we"+card_pos);
 
-    img.className = "";
+    // img.className = "";
     for (i = 0 ; i < cards_we_n ; i++) {
 	if (cards_we_pos[i] == card_pos) {
 	    for (e = i ; e < cards_we_n-1 ; e++) {
@@ -705,7 +699,7 @@ function card_place_so(card_pos, card_idx, x, y)
     img.style.left = x;
     img.style.top  = y;
     img.style.visibility  = "visible";
-    img.src = getcard(card_idx,0);
+    img.setAttribute('data-card-id', getcard(card_idx, 0));
 }
 
 /* CARD_PLACE_EA */
@@ -718,7 +712,7 @@ function card_place_ea(card_pos, card_idx, x, y)
     img.style.left = 500 + ((y-250) * (125 - cards_height) / (200 - cards_height));
     img.style.top  = 450 - cards_width - (x - 300);
     img.style.visibility  = "visible";
-    img.src = getcard(card_idx,1);
+    img.setAttribute('data-card-id', getcard(card_idx, 1));
 }
 
 /* CARD_PLACE_NE */
@@ -731,7 +725,7 @@ function card_place_ne(card_pos, card_idx, x, y)
     img.style.left = 600 - cards_width - (x - 300);
     img.style.top  = 250 - cards_height - ((y-250) * (125 - cards_height) / (200 - cards_height));
     img.style.visibility  = "visible";
-    img.src = getcard(card_idx,2);
+    img.setAttribute('data-card-id', getcard(card_idx, 2));
 }
 
 /* CARD_PLACE_NW */
@@ -744,7 +738,7 @@ function card_place_nw(card_pos, card_idx, x, y)
     img.style.left = 400 - cards_width - (x - 300);
     img.style.top  = 250 - cards_height - ((y-250) * (125 - cards_height) / (200 - cards_height));
     img.style.visibility  = "visible";
-    img.src = getcard(card_idx,3);
+    img.setAttribute('data-card-id', getcard(card_idx, 3));
 }
 
 /* CARD_PLACE_WE */
@@ -757,7 +751,7 @@ function card_place_we(card_pos, card_idx, x, y)
     img.style.left = 300 - cards_height - ((y-250) * (125 - cards_height) / (200 - cards_height));
     img.style.top  = 250 + x - 300;
     img.style.visibility  = "visible";
-    img.src = getcard(card_idx,4);
+    img.setAttribute('data-card-id', getcard(card_idx, 4));
 }
 
 var card_place_arr = new Array( card_place_so, card_place_ea, card_place_ne, card_place_nw, card_place_we );