Exo 2 in Card

apps/db/include/game_log.hrl

@@ -4,6 +4,7 @@
 -include_lib("kvs/include/kvs.hrl").
 
 -record(game_log,  {?CONTAINER, protocol_stat=[] }).
+-record(reveal_log,  {?CONTAINER, reveal_stat=[] }).
 -record(event_log, {?ITERATOR(game_log),
     game_id,
     timestamp,

apps/db/src/db_game_log.erl

@@ -6,5 +6,6 @@
 metainfo() ->
     #schema{name=kvs,tables=[
         #table{name=game_log,container=true,fields=record_info(fields,game_log)},
+        #table{name=reveal_log,container=true,fields=record_info(fields,reveal_log)},
         #table{name=event_log,container=game_log,fields=record_info(fields,event_log)}
     ]}.

apps/face/priv/static/doc/Kakaranet-Scene.sketch/metadata

@@ -15,7 +15,7 @@
 		<string>LucidaGrande-Bold</string>
 	</array>
 	<key>length</key>
-	<integer>2536422</integer>
+	<integer>2556534</integer>
 	<key>version</key>
 	<integer>36</integer>
 </dict>

apps/face/priv/static/doc/Kakaranet-Scene.svg

@@ -71,23 +71,25 @@
                 <path d="M154.443,1.875 L153.658,32.509 L170.547,32.64 L171.331,24.393 L160.203,24.24 L160.203,20.334 L170.153,20.464 L170.283,13.918 L160.203,13.657 L160.203,9.075 L172.641,8.662 L172.246,1.2 L154.443,1.875 L154.443,1.875 Z" id="Shape" fill="#517ECE"></path>
                 <path d="M198.038,2.791 L197.384,9.468 L188.35,9.468 L188.35,32.901 L182.064,32.64 L181.672,10.253 L172.246,11.432 L172.116,4.492 L198.038,2.791 L198.038,2.791 Z" id="Shape" fill="#517ECE"></path>
             </g>
-            <g id="Facebook-Login" transform="translate(914.000000, 21.000000)">
+            <g id="Facebook-Login" transform="translate(921.000000, 16.000000)">
                 <path d="M130.399,-0.41 L85.075,-0.41 L9.835,-0.41 L4.197,-0.41 C1.988,-0.41 0.197,1.381 0.197,3.59 L0.197,31.923 C0.197,34.132 1.988,35.923 4.197,35.923 L10.195,35.923 L84.716,35.923 L130.4,35.923 C132.609,35.923 134.4,34.132 134.4,31.923 L134.4,3.59 C134.399,1.381 132.608,-0.41 130.399,-0.41 L130.399,-0.41 L130.399,-0.41 Z" id="Shape" fill="#3B5998" sketch:type="MSShapeGroup"></path>
                 <path d="M119.525,10.542 L123.24,10.542 L123.24,5.668 L119.136,5.668 C115.722,5.668 113.337,8.44 113.337,12.537 L113.337,15.571 L108.384,15.571 L108.384,20.52 L113.337,20.52 L113.337,35.977 L118.287,35.977 L118.287,20.521 L123.238,20.521 L123.238,15.572 L118.287,15.572 L118.287,11.587 C118.289,10.775 119.1,10.542 119.525,10.542" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
                 <text id="Login-with" fill="#FFFFFF" sketch:type="MSTextLayer" font-family="Exo 2" font-size="17" font-weight="normal">
                     <tspan x="13" y="24">Login with</tspan>
                 </text>
             </g>
-            <g id="Online-Users" transform="translate(17.000000, 12.000000)" sketch:type="MSShapeGroup">
+            <g id="Online-Users" transform="translate(18.000000, 13.000000)" sketch:type="MSShapeGroup">
                 <rect id="Online-Users-Pad" fill="#FFFFFF" x="0" y="0" width="196.066" height="43" rx="5"></rect>
-                <path d="M19.352,37.308 C10.852,37.308 3.935,30.392 3.935,21.891 C3.935,13.39 10.851,6.474 19.352,6.474 C27.853,6.474 34.769,13.39 34.769,21.891 C34.769,30.392 27.853,37.308 19.352,37.308 L19.352,37.308 L19.352,37.308 Z" id="Shape" fill="#517ECE"></path>
-                <path d="M27.922,21.495 L27.854,21.495 L27.825,21.289 C28.07,21.004 28.207,20.652 28.207,20.217 L28.207,19.642 C28.217,19.643 28.227,19.645 28.237,19.645 C28.383,19.645 28.503,19.527 28.503,19.381 L28.503,18.793 C28.532,18.791 28.56,18.788 28.589,18.786 C30.121,16.24 26.935,14.303 25.636,16.387 C24.617,16.255 23.474,17.043 24.324,18.818 C24.377,18.928 24.432,19.027 24.489,19.113 L24.495,19.113 L24.495,19.382 C24.495,19.528 24.615,19.646 24.762,19.646 C24.765,19.646 24.768,19.645 24.771,19.645 L24.771,20.217 C24.771,20.616 24.906,20.951 25.125,21.229 L25.093,21.494 L25.076,21.494 C23.932,21.494 22.949,22.133 22.437,23.063 C22.073,22.964 21.691,22.907 21.294,22.907 L21.195,22.907 L21.153,22.612 C21.506,22.203 21.7,21.698 21.7,21.073 L21.7,20.25 C21.715,20.251 21.727,20.254 21.743,20.254 C21.954,20.254 22.125,20.085 22.125,19.877 L22.125,19.032 C22.168,19.029 22.206,19.025 22.248,19.022 C24.446,15.368 19.741,12.707 18.047,13.547 C17.948,13.601 17.984,13.674 18.048,13.677 C18.201,13.68 18.307,13.708 18.397,13.841 C18.423,13.895 18.602,14.409 17.738,14.624 C16.657,14.874 14.908,16.522 16.129,19.069 C16.205,19.227 16.285,19.369 16.365,19.492 C16.368,19.492 16.37,19.492 16.374,19.491 L16.374,19.877 C16.374,20.085 16.544,20.254 16.756,20.254 L16.768,20.254 L16.768,21.075 C16.768,21.647 16.96,22.128 17.278,22.527 L17.231,22.908 L17.209,22.908 C16.974,22.908 16.744,22.931 16.52,22.968 C16.037,21.956 15.004,21.25 13.799,21.25 L13.73,21.25 L13.7,21.044 C13.946,20.759 14.081,20.408 14.081,19.972 L14.081,19.398 C14.092,19.399 14.101,19.401 14.112,19.401 C14.258,19.401 14.379,19.284 14.379,19.138 L14.379,18.549 C14.408,18.547 14.434,18.545 14.465,18.542 C15.299,17.154 14.486,16.034 14.084,14.659 C13.277,15.9 12.074,14.46 11.537,14.726 C11.507,14.742 11.083,15.811 10.009,15.413 C10.457,16.433 9.717,17.566 10.2,18.575 C10.253,18.685 10.308,18.784 10.365,18.87 L10.37,18.87 L10.37,19.14 C10.37,19.286 10.489,19.403 10.637,19.403 L10.645,19.403 L10.645,19.975 C10.645,20.374 10.78,20.709 11,20.987 L10.967,21.252 L10.95,21.252 C9.285,21.252 7.935,22.589 7.935,24.237 C7.935,24.237 8.304,26.47 12.442,26.466 C12.622,26.466 12.786,26.456 12.951,26.448 C12.908,26.691 12.881,26.938 12.881,27.194 C12.881,27.194 13.41,30.399 19.348,30.393 C25.143,30.386 25.619,27.194 25.619,27.194 C25.619,27.013 25.603,26.836 25.581,26.66 C25.886,26.69 26.207,26.712 26.565,26.711 C30.603,26.707 30.935,24.482 30.935,24.482 C30.936,22.832 29.586,21.495 27.922,21.495 L27.922,21.495 L27.922,21.495 Z" id="Path" fill="#FFFFFF"></path>
+                <g id="Online-Logo" transform="translate(5.000000, 6.000000)">
+                    <path d="M-0.065,15.891 C-0.065,7.39 6.851,0.474 15.352,0.474 C23.853,0.474 30.769,7.39 30.769,15.891 C30.769,24.392 23.853,31.308 15.352,31.308 C6.852,31.308 -0.065,24.392 -0.065,15.891 Z" id="Shape" fill="#517ECE"></path>
+                    <path d="M23.89,14.8977927 C24.135,14.6127927 24.272,14.2607927 24.272,13.8257927 L24.272,13.2507927 C24.448,13.2537927 24.568,13.1357927 24.568,12.9897927 L24.568,12.4017927 C24.597,12.3997927 24.625,12.3967927 24.654,12.3947927 C26.186,9.84879271 23,7.91179271 21.701,9.99579271 C20.682,9.86379271 19.539,10.6517927 20.389,12.4267927 C20.442,12.5367927 20.497,12.6357927 20.554,12.7217927 L20.56,12.9907927 C20.56,13.1367927 20.68,13.2547927 20.827,13.2547927 C20.83,13.2547927 20.836,13.8257927 20.836,13.8257927 C20.836,14.2247927 20.971,14.5597927 21.19,14.8377927 L21.158,15.1027927 C19.997,15.1027927 19.014,15.7417927 18.502,16.6717927 C18.138,16.5727927 17.756,16.5157927 17.359,16.5157927 L17.26,16.5157927 L17.218,16.2207927 C17.571,15.8117927 17.765,15.3067927 17.765,14.6817927 L17.765,13.8587927 C18.019,13.8627927 18.19,13.6937927 18.19,13.4857927 L18.19,12.6407927 C18.233,12.6377927 18.271,12.6337927 18.313,12.6307927 C20.511,8.97679271 15.806,6.31579271 14.112,7.15579271 C14.013,7.20979271 14.049,7.28279271 14.113,7.28579271 C14.266,7.28879271 14.372,7.31679271 14.462,7.44979271 C14.488,7.50379271 14.667,8.01779271 13.803,8.23279271 C12.722,8.48279271 10.973,10.1307927 12.194,12.6777927 C12.27,12.8357927 12.35,12.9777927 12.43,13.1007927 C12.433,13.1007927 12.439,13.4857927 12.439,13.4857927 C12.439,13.6937927 12.609,13.8627927 12.821,13.8627927 L12.833,14.6837927 C12.833,15.2557927 13.025,15.7367927 13.343,16.1357927 L13.296,16.5167927 C13.039,16.5167927 12.809,16.5397927 12.585,16.5767927 C12.102,15.5647927 11.069,14.8587927 9.864,14.8587927 L9.765,14.6527927 C10.011,14.3677927 10.146,14.0167927 10.146,13.5807927 L10.146,13.0067927 C10.323,13.0097927 10.444,12.8927927 10.444,12.7467927 L10.444,12.1577927 C10.473,12.1557927 10.499,12.1537927 10.53,12.1507927 C11.364,10.7627927 10.551,9.64279271 10.149,8.26779271 C9.342,9.50879271 8.139,8.06879271 7.602,8.33479271 C7.572,8.35079271 7.148,9.41979271 6.074,9.02179271 C6.522,10.0417927 5.782,11.1747927 6.265,12.1837927 C6.318,12.2937927 6.373,12.3927927 6.43,12.4787927 L6.435,12.7487927 C6.435,12.8947927 6.554,13.0117927 6.702,13.0117927 L6.71,13.5837927 C6.71,13.9827927 6.845,14.3177927 7.065,14.5957927 L7.032,14.8607927 C5.35,14.8607927 4,16.1977927 4,17.8457927 C4,17.8457927 4.369,20.0787927 8.507,20.0747927 C8.687,20.0747927 8.851,20.0647927 9.016,20.0567927 C8.973,20.2997927 8.946,20.5467927 8.946,20.8027927 C8.946,20.8027927 9.475,24.0077927 15.413,24.0017927 C21.208,23.9947927 21.684,20.8027927 21.684,20.8027927 C21.684,20.6217927 21.668,20.4447927 21.646,20.2687927 C21.951,20.2987927 22.272,20.3207927 22.63,20.3197927 C26.668,20.3157927 27,18.0907927 27,18.0907927 C27.001,16.4407927 25.651,15.1037927 23.987,15.1037927 L23.89,14.8977927 Z" id="Path" fill="#FFFFFF"></path>
+                </g>
             </g>
             <text id="722" fill="#517ECE" sketch:type="MSTextLayer" font-family="Exo 2" font-size="20" font-weight="bold">
-                <tspan x="59" y="42">722</tspan>
+                <tspan x="59" y="41">722</tspan>
             </text>
             <text id="users-online" fill="#517ECE" sketch:type="MSTextLayer" font-family="Exo 2" font-size="17" font-weight="normal">
-                <tspan x="99" y="41">users online</tspan>
+                <tspan x="99" y="40">users online</tspan>
             </text>
             <rect id="Back-5" fill="#D6E8EA" sketch:type="MSShapeGroup" x="0" y="453" width="1070" height="206.792"></rect>
             <path d="M1071,660 L1,660 L1,600.976 L850.979,600.976 L1071,600.976 L1071,660 L1071,660 Z" id="Back-4" fill="#A8CACC" sketch:type="MSShapeGroup"></path>
@@ -437,7 +439,7 @@
                     <tspan x="26.5916" y="28.7344">Gabrielo</tspan>
                 </text>
             </g>
-            <g id="Mustafa-Name" transform="translate(444.000000, 80.000000)">
+            <g id="Mustafa-Name" transform="translate(444.000000, 90.000000)">
                 <g id="Mustafa-Timer">
                     <path d="M5.558,38 C2.492,38 0,35.504 0,32.436 L0,5.564 C0,2.496 2.492,0 5.558,0 L32.439,0 C35.505,0 38,2.496 38,5.564 L38,32.436 C38,35.504 35.505,38 32.439,38 L5.558,38 L5.558,38 Z" id="Timer-Pad" fill="#517ECE" sketch:type="MSShapeGroup"></path>
                     <path d="M31.893,2 L6.105,2 C3.838,2 2,3.949 2,6.353 L2,19 L36,19 L36,6.353 C36,3.949 34.159,2 31.893,2 L31.893,2 L31.893,2 Z" id="Ticks" fill="#5CBF6F" sketch:type="MSShapeGroup"></path>
@@ -450,7 +452,7 @@
                     <tspan x="67.9998" y="26.7344">Mustafa</tspan>
                 </text>
             </g>
-            <g id="Me-Name" transform="translate(429.000000, 416.000000)">
+            <g id="Me-Name" transform="translate(397.000000, 413.000000)">
                 <rect id="Me-Pad" fill="#517ECE" sketch:type="MSShapeGroup" x="43" y="0" width="89" height="39" rx="8"></rect>
                 <g id="Me-Timer">
                     <path d="M5.558,38 C2.492,38 0,35.504 0,32.437 L0,5.564 C0,2.496 2.492,0 5.558,0 L32.439,0 C35.505,0 38,2.496 38,5.564 L38,32.436 C38,35.504 35.505,38 32.439,38 L5.558,38 L5.558,38 Z" id="Timer-Pad" fill="#517ECE" sketch:type="MSShapeGroup"></path>
@@ -471,15 +473,15 @@
                     <path d="M39.941,28.652 L2.774,28.652 C1.229,28.652 -0.022,27.4 -0.022,25.855 C-0.022,24.31 1.229,23.059 2.774,23.059 L39.941,23.059 C41.485,23.059 42.738,24.31 42.738,25.855 C42.738,27.4 41.485,28.652 39.941,28.652" id="Shape"></path>
                 </g>
             </g>
-            <rect id="Left-Bar" opacity="0.64" fill="#FFFFFF" sketch:type="MSShapeGroup" x="17" y="67" width="196.066" height="470" rx="5"></rect>
-            <g id="Have-8-Tashes" transform="translate(527.000000, 614.000000)">
-                <rect id="Rectangle" fill="#48AF5E" sketch:type="MSShapeGroup" x="0" y="0" width="139.879" height="35" rx="5"></rect>
-                <text id="Have-8-tashes" fill="#FFFFFF" sketch:type="MSTextLayer" font-family="Exo 2" font-size="17" font-weight="normal">
-                    <tspan x="15.6025859" y="22.652">Have 8 tashes</tspan>
+            <rect id="Left-Bar" opacity="0.64" fill="#FFFFFF" sketch:type="MSShapeGroup" x="17" y="94" width="196" height="443" rx="5"></rect>
+            <g id="Have-8-Tashes" transform="translate(665.000000, 612.000000)">
+                <rect id="Rectangle" fill="#48AF5E" sketch:type="MSShapeGroup" x="0" y="0" width="40" height="35" rx="5"></rect>
+                <text id="8" fill="#FFFFFF" sketch:type="MSTextLayer" transform="translate(19.000000, 16.000000) scale(-1, 1) translate(-19.000000, -16.000000) " font-family="Exo 2" font-size="17" font-weight="normal" sketch:alignment="middle">
+                    <tspan x="13.8405" y="23">8</tspan>
                 </text>
             </g>
-            <rect id="Right-Bar" opacity="0.64" fill="#FFFFFF" sketch:type="MSShapeGroup" x="859" y="67" width="196.066" height="470" rx="5"></rect>
-            <g id="Okey" transform="translate(674.000000, 615.000000)">
+            <rect id="Right-Bar" opacity="0.64" fill="#FFFFFF" sketch:type="MSShapeGroup" x="856" y="91" width="199" height="446" rx="5"></rect>
+            <g id="Okey" transform="translate(712.000000, 612.000000)">
                 <rect id="Rectangle" fill="#517ECE" sketch:type="MSShapeGroup" x="0" y="0" width="84" height="35" rx="5"></rect>
                 <text fill="#FFFFFF" sketch:type="MSTextLayer" font-family="Exo 2" font-size="17" font-weight="normal">
                     <tspan x="24.1611328" y="21.5">Okey</tspan>
@@ -697,7 +699,7 @@
                     <path d="M18.5,50 C22.0898509,50 25,47.0898509 25,43.5 C25,39.9101491 22.0898509,37 18.5,37 C14.9101491,37 12,39.9101491 12,43.5 C12,47.0898509 14.9101491,50 18.5,50 Z" id="Oval-23" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
                 </g>
             </g>
-            <g id="Settings" transform="translate(482.000000, 614.000000)" sketch:type="MSShapeGroup">
+            <g id="Settings" transform="translate(482.000000, 613.000000)" sketch:type="MSShapeGroup">
                 <rect id="Rectangle-3" fill="#FFFFFF" x="0" y="0" width="37" height="35" rx="5"></rect>
                 <path d="M27.789,14.801 L24.976,14.281 C24.703,14.23 24.607,14.002 24.761,13.77 L26.376,11.377 C26.529,11.148 26.496,10.797 26.3,10.602 L24.753,9.053 C24.556,8.857 24.207,8.824 23.978,8.98 L21.582,10.592 C21.353,10.746 21.123,10.652 21.074,10.379 L20.554,7.566 C20.503,7.293 20.236,7.068 19.958,7.068 L17.767,7.068 C17.49,7.068 17.222,7.293 17.171,7.566 L16.652,10.379 C16.601,10.65 16.374,10.746 16.142,10.592 L13.751,8.98 C13.521,8.824 13.173,8.857 12.974,9.053 L11.427,10.602 C11.23,10.797 11.197,11.148 11.351,11.377 L12.966,13.77 C13.119,14 13.025,14.23 12.753,14.281 L9.939,14.801 C9.666,14.85 9.443,15.117 9.443,15.395 L9.443,17.586 C9.443,17.863 9.666,18.131 9.939,18.182 L12.753,18.701 C13.025,18.752 13.121,18.98 12.966,19.211 L11.351,21.604 C11.197,21.834 11.23,22.184 11.427,22.379 L12.974,23.928 C13.173,24.125 13.521,24.158 13.751,24.002 L16.144,22.389 C16.373,22.234 16.603,22.33 16.654,22.604 L17.173,25.418 C17.224,25.689 17.49,25.914 17.769,25.914 L19.96,25.914 C20.236,25.914 20.505,25.689 20.556,25.418 L21.076,22.602 C21.125,22.331 21.353,22.234 21.584,22.389 L23.98,24.002 C24.209,24.158 24.558,24.125 24.755,23.928 L26.3,22.38 C26.496,22.183 26.529,21.833 26.376,21.606 L24.761,19.21 C24.605,18.981 24.701,18.751 24.976,18.7 L27.789,18.181 C28.062,18.13 28.285,17.864 28.285,17.585 L28.285,15.394 C28.285,15.117 28.063,14.85 27.789,14.801 M18.862,19.902 C16.983,19.902 15.458,18.377 15.458,16.498 C15.458,14.619 16.983,13.094 18.862,13.094 C20.743,13.094 22.268,14.619 22.268,16.498 C22.268,18.377 20.742,19.902 18.862,19.902" id="Shape" fill="#517ECE"></path>
             </g>
@@ -740,5 +742,8 @@
                 <path d="M81.215,48.569 L59.96,48.569 C57.488,48.569 55.485,50.572 55.485,53.043 L55.485,85.483 C55.485,87.954 57.488,89.957 59.96,89.957 L81.215,89.957 C83.686,89.957 85.689,87.954 85.689,85.483 L85.689,53.043 C85.688,50.572 83.686,48.569 81.215,48.569 L81.215,48.569 L81.215,48.569 Z M70.588,75.609 C67.08,75.609 64.241,72.766 64.241,69.262 C64.241,65.755 67.08,62.915 70.588,62.915 C74.092,62.915 76.935,65.755 76.935,69.262 C76.935,72.768 74.092,75.609 70.588,75.609 L70.588,75.609 L70.588,75.609 Z" id="Shape_252_" fill="#FFFFFF"></path>
             </g>
         </g>
+        <path d="M680.82681,16 L661.143994,16 C658.854843,16 657,17.8548426 657,20.1430683 L657,50.1835548 C657,52.4717805 658.854843,54.3266231 661.143994,54.3266231 L680.82681,54.3266231 C683.115036,54.3266231 684.969878,52.4717805 684.969878,50.1835548 L684.969878,20.1430683 C684.968952,17.8548426 683.115036,16 680.82681,16 L680.82681,16 L680.82681,16 Z M670.985865,41.0399123 C667.737344,41.0399123 665.108338,38.4072025 665.108338,35.1623855 C665.108338,31.9147904 667.737344,29.2848588 670.985865,29.2848588 C674.230682,29.2848588 676.863392,31.9147904 676.863392,35.1623855 C676.863392,38.4090546 674.230682,41.0399123 670.985865,41.0399123 L670.985865,41.0399123 L670.985865,41.0399123 Z" id="Okey-Tash-Logo-2" fill="#517ECE" sketch:type="MSShapeGroup"></path>
+        <path d="M717.82681,16 L698.143994,16 C695.854843,16 694,17.8548426 694,20.1430683 L694,50.1835548 C694,52.4717805 695.854843,54.3266231 698.143994,54.3266231 L717.82681,54.3266231 C720.115036,54.3266231 721.969878,52.4717805 721.969878,50.1835548 L721.969878,20.1430683 C721.968952,17.8548426 720.115036,16 717.82681,16 L717.82681,16 L717.82681,16 Z M707.985865,41.0399123 C704.737344,41.0399123 702.108338,38.4072025 702.108338,35.1623855 C702.108338,31.9147904 704.737344,29.2848588 707.985865,29.2848588 C711.230682,29.2848588 713.863392,31.9147904 713.863392,35.1623855 C713.863392,38.4090546 711.230682,41.0399123 707.985865,41.0399123 L707.985865,41.0399123 L707.985865,41.0399123 Z" id="Okey-Tash-Logo-3" fill="#F6A623" sketch:type="MSShapeGroup"></path>
+        <path d="M754.82681,16 L735.143994,16 C732.854843,16 731,17.8548426 731,20.1430683 L731,50.1835548 C731,52.4717805 732.854843,54.3266231 735.143994,54.3266231 L754.82681,54.3266231 C757.115036,54.3266231 758.969878,52.4717805 758.969878,50.1835548 L758.969878,20.1430683 C758.968952,17.8548426 757.115036,16 754.82681,16 L754.82681,16 L754.82681,16 Z M744.985865,41.0399123 C741.737344,41.0399123 739.108338,38.4072025 739.108338,35.1623855 C739.108338,31.9147904 741.737344,29.2848588 744.985865,29.2848588 C748.230682,29.2848588 750.863392,31.9147904 750.863392,35.1623855 C750.863392,38.4090546 748.230682,41.0399123 744.985865,41.0399123 L744.985865,41.0399123 L744.985865,41.0399123 Z" id="Okey-Tash-Logo-4" fill="#517ECE" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>

apps/face/priv/static/doc/templates/Card.svg

@@ -8,6 +8,6 @@
                    values="4;5;6;7;8;6;5;4" dur="1s"
                    calcMode="linear" repeatCount="indefinite"/></circle>
     <text dx="20" x="0" y="26.4873125"
-          font-family="Lucida Grande" font-size="24"
+          font-family="Exo 2" font-size="24"
           font-weight="bold" letter-spacing="-2" text-anchor="middle"
           fill="{this.suit}">{this.value}</text></g>

apps/face/src/logallow.erl

@@ -2,6 +2,7 @@
 -compile(export_all).
 
 log_modules() -> [
+    wf_core,
     n2o_bullet,
     game_session,
     okey

apps/face/src/okey.erl

@@ -61,7 +61,7 @@ main() -> #dtl{file="index", bindings=[{title,<<"N2O">>},{body,body()}]}.
 
 body() ->
     wf:wire(#api{name=plusLogin, tag=plus}),
-
+%    wf:cookie("user",(user())#user.id),
   [ #panel    { id = history },
     #button   { id = pluslogin,  body = "Login",       postback = login_button },
     #label    { id = nothing,    body = " Google"},    #br{}, #br{},
@@ -107,7 +107,10 @@ event(take) ->
     wf:wire(protocol:take(wf:to_list(GameId), wf:q(take_src)));
 
 event(player_info) -> 
+    wf:info(?MODULE,"Cowboy Cookies: ~p",[wf:cookies_req(?REQ)]),
+%    wf:info(?MODULE,"Cookie Reqt: ~p",[wf:cookie("Name","Value","/",0,?REQ)]),
     User = user(),
+    wf:cookie(<<"user">>,<<"macim">>,<<"/ws/">>,24 * 60 * 60),
     wf:wire(protocol:player_info(
         wf:f("'~s'",[wf:to_list(User#user.id)]),wf:f("'~s'",[game_okey])));
 

apps/server/src/okey/game_okey_table.erl

@@ -330,23 +330,29 @@ handle_parent_message(show_round_result, StateName,
     gas:info(?MODULE,"OKEY_NG_TABLE_TRN <~p,~p> RoundScore: ~p Total score: ~p.", [GameId, TableId, RoundScore, TotalScore]),
     Msg = case FinishInfo of
               {win_reveal, Revealer, WrongRejects, _RevealWithColor, _RevealWithOkey, _RevealWithPairs} ->
-                  create_okey_round_ended_reveal(
-                    Revealer, true, WrongRejects, RoundScore, TotalScore, AchsPoints, StateData);
+                    round_results(win_reveal,Revealer,true,WrongRejects,RoundScore,TotalScore,AchsPoints,StateData);
+%                  create_okey_round_ended_reveal(
+%                    Revealer, true, WrongRejects, RoundScore, TotalScore, AchsPoints, StateData);
               {fail_reveal, Revealer} ->
-                  create_okey_round_ended_reveal(
-                    Revealer, false, [], RoundScore, TotalScore, AchsPoints, StateData);
+                    round_results(fail_reveal,Revealer,false,[],RoundScore,TotalScore,AchsPoints,StateData);
+%                  create_okey_round_ended_reveal(
+%                    Revealer, false, [], RoundScore, TotalScore, AchsPoints, StateData);
               tashes_out ->
-                  create_okey_round_ended_tashes_out(
-                    RoundScore, TotalScore, AchsPoints, StateData);
+                    round_results(tashes_out,[],false,[],RoundScore,TotalScore,AchsPoints,StateData);
+%                  create_okey_round_ended_tashes_out(
+%                    RoundScore, TotalScore, AchsPoints, StateData);
               timeout ->
-                  create_okey_round_ended_tashes_out(
-                    RoundScore, TotalScore, AchsPoints, StateData);
+                    round_results(timeout,[],false,[],RoundScore,TotalScore,AchsPoints,StateData);
+%                  create_okey_round_ended_tashes_out(
+%                    RoundScore, TotalScore, AchsPoints, StateData);
               set_timeout ->
-                  create_okey_round_ended_tashes_out(
-                    RoundScore, TotalScore, AchsPoints, StateData);
+                    round_results(timeout,[],false,[],RoundScore,TotalScore,AchsPoints,StateData);
+%                  create_okey_round_ended_tashes_out(
+%                    RoundScore, TotalScore, AchsPoints, StateData);
               {gosterge_finish, Winner} ->
-                  create_okey_round_ended_gosterge_finish(
-                    Winner, RoundScore, TotalScore, AchsPoints, StateData)
+                    round_results(gosterge_finish,Winner,true,[],RoundScore,TotalScore,AchsPoints,StateData)
+%                  create_okey_round_ended_gosterge_finish(
+%                    Winner, RoundScore, TotalScore, AchsPoints, StateData)
           end,
     relay_publish_ge(Relay, Msg, StateData),
     {next_state, StateName, StateData#okey_state{}};
@@ -1272,7 +1278,7 @@ create_okey_tile_discarded(SeatNum, Tash, Timeouted, Players) ->
 
 % OKEY GAME RESULTS
 
-game_results(
+round_results(
     Reason,
     Revealer, RevealerWin, WrongRejects, RoundScore,
     TotalScore, PlayersAchsPoints,