fix reveal. fix timer. TODO: new reveal check

apps/server/src/okey/okey_scoring.erl

@@ -324,6 +324,18 @@ gosterge_to_okey({Color, Value}) ->
        true -> {Color, Value + 1}
     end.
 
+check_win([TopRow, BottomRow], Gosterge) ->
+    FlatList = TopRow ++ [null | BottomRow],
+    Okey = gosterge_to_okey(Gosterge),
+    Normalized = [case E of
+                      Okey -> okey;
+                      false_okey -> okey;
+                       _ -> E
+                  end || E <- FlatList],
+    gas:info(?MODULE,"check_reveal/2 ~n    ~p ~p~n",[Normalized, Gosterge]),
+
+    ok.
+
 %% @spec check_reveal(TashPlaces, Gosterge) -> {RightReveal, WithPairs, SameColor}
 %% @end
 check_reveal([TopRow, BottomRow], Gosterge) ->
@@ -331,7 +343,7 @@ check_reveal([TopRow, BottomRow], Gosterge) ->
     Okey = gosterge_to_okey(Gosterge),
     Normalized = [case E of
                       Okey -> okey;
-                      false_okey -> Okey;
+                      false_okey -> okey;
                        _ -> E
                   end || E <- FlatList],
     gas:info(?MODULE,"check_reveal/2 ~n    ~p ~p~n",[Normalized, Gosterge]), 
@@ -521,10 +533,16 @@ b2c(2) -> blue;
 b2c(3) -> yellow;
 b2c(4) -> black.
 
+run_tests() -> [[F()||{_,F}<-Tests]||{Name,Tests}<-okey_scoring:test_test_()].
 
 %% Tests
 test_test_() ->
-    [{"is_pair",
+    [{"win_reveal",
+      [
+    ?_assertEqual({true,false,true},  check_reveal([[{1,3}, false_okey, {1,4}],[]],{1,3}))
+      ]
+     },
+     {"is_pair",
       [?_assertEqual(true,  is_pair([{1,3}, {1,3}])),
        ?_assertEqual(true,  is_pair([{4,13}, {4,13}])),
        ?_assertEqual(false, is_pair([{4,12}, {4,13}])),

apps/server/src/okey/okey_table.erl

@@ -1376,10 +1376,10 @@ create_game_paused_resume(UserId, GameId) ->
 create_okey_playing_tables(Num) ->
     #okey_playing_tables{num = Num}.
 
-tash_to_ext(false_okey) -> #'OkeyPiece'{color = 1, value = 0};
+tash_to_ext(false_okey) -> #'OkeyPiece'{color = 2, value = 0};
 tash_to_ext({Color, Value}) ->  #'OkeyPiece'{color = Color, value = Value}.
 
-ext_to_tash(#'OkeyPiece'{color = 1, value = 0}) -> false_okey;
+ext_to_tash(#'OkeyPiece'{color = 2, value = 0}) -> false_okey;
 ext_to_tash(#'OkeyPiece'{color = Color, value = Value}) -> {Color, Value}.
 
 %statename_to_api_string(state_wait) -> do_okey_ready;

apps/web/priv/static/app/js/okey/card.js

@@ -45,7 +45,7 @@ function CardScope(scope) {
         render: function() {
             null == this.value && null == this.color ? (this.$circle.hide(), this.$text.hide()) : 0 == this.value ? (this.$circle.hide(), 
             this.$text.show().attr({
-                fill: scope.CARD_COLORS[1],
+                fill: this.color,
                 "font-size": "26pt",
                 y: 42
             }).text("❦")) : (this.$circle.show().attr("fill", this.color), this.$text.show().attr("fill", this.color).text(this.value));

apps/web/priv/static/app/js/selector.js

@@ -164,7 +164,9 @@ var $ = function(_undefind)
             function tick() {
                 if (!el.paused) {
                     var cur = from + step;
-                    (to > from ? to >= cur : cur >= to) ? ($el.attr(property, cur), from = cur) : clearInterval(timer);
+                    (to > from ? to >= cur : cur >= to)
+                        ? ($el.attr(property, cur), from = cur)
+                        : clearInterval(el.timer);
                 }
             }
             var property = anims.attributeName, dur = anims.dur, to = parseInt(anims.to), $el = $(el), from = parseInt($el.attr(property)), step = (to - from) / (1e3 * dur / animDelay);

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

@@ -16,7 +16,7 @@
 		<string>ZapfDingbatsITC</string>
 	</array>
 	<key>length</key>
-	<integer>2878324</integer>
+	<integer>2878322</integer>
 	<key>version</key>
 	<integer>37</integer>
 </dict>