male skins. game_info moved to bert

apps/server/include/basic_types.hrl

@@ -15,6 +15,7 @@
     skill :: integer(),
     score :: integer(),
     avatar_url :: string(),
-    robot = false :: boolean() }).
+    robot = false :: boolean(),
+    sex }).
 
 -endif.

apps/server/src/auth/auth_server.erl

@@ -13,10 +13,11 @@
 -define(SERVER, ?MODULE).
 
 -define(SPARE_LOGINS, [
-    #'PlayerInfo'{name = <<"Albert">>, surname= <<"Einstein">>, login = <<"quantum">>, robot = true },
-    #'PlayerInfo'{name = <<"Marie">>, surname= <<"Curie">>, login = <<"radio">>, robot = true },
-    #'PlayerInfo'{name = <<"Ilya">>, surname = <<"Prigogine">>, login = <<"synergetics">>, robot = true},
-    #'PlayerInfo'{name = <<"Mother">>, surname = <<"Teresa">>, login = <<"peace">>, robot = true}]).
+    #'PlayerInfo'{name = <<"Hürrem">>, sex = female, surname = <<"Sultan">>, login = <<"peace">>, robot = true},
+    #'PlayerInfo'{name = <<"Albert">>, sex = male, surname= <<"Einstein">>, login = <<"quantum">>, robot = true },
+    #'PlayerInfo'{name = <<"Marie">>, sex = female, surname= <<"Curie">>, login = <<"radio">>, robot = true },
+    #'PlayerInfo'{name = <<"Ilya">>, sex = male, surname = <<"Prigogine">>, login = <<"synergetics">>, robot = true}
+    ]).
 
 -record(state, {spare = ?SPARE_LOGINS,tokens}).
 

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

@@ -174,11 +174,14 @@ function removeOnlineUser(name) { shiftTranslate(name,-1).remove(); }
 
 function createChat(chatName) {
     var html = '<g xmlns="http://www.w3.org/2000/svg" id="'+chatName+'" y="0" clip-path="url(#myClip3)" transform="translate(1.000000, 107.000000)"></g>';
-    document.getElementById("Page-1").appendChild(svg(html));
+    var settings = document.getElementById("Settings");
+    document.getElementById("Kakaranet-12-maxim").insertBefore(svg(html),settings);
     document.getElementById(chatName).style.display = 'none';
 }
 
 function openChat(evt) {
+    if (leftFlag) $("#Left-Menu").trigger("click");
+
     document.getElementById("Online-List").style.display = 'none';
     document.getElementById("onlineChatEdit").style.display = '';
     var name = evt.target.getAttribute("xmlns:data");

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

@@ -71,6 +71,7 @@ function PostLoad()
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var playersPositions = scope.playersPositions;
         scope.user = document.user;
+        var players = dec(e.raw).value[0][3][0].value[0][1];
 
         //$overlay.hide(); // give user an ability to see results
 
@@ -80,22 +81,22 @@ function PostLoad()
             scope.playersRightHandsMap = {};
             scope.playersLeftHandsMap = {};
 
-            for (var playerInfo, players = e.detail.players, i = 0; i < players.length; i++) 
-                if (playerInfo = players[i].PlayerInfo, playerInfo[0] == scope.user)
-            {
-                playersPositions = playersPositions[i];
-                break;
+            for (var i = 0; i < players.length; i++) {
+                var playerName = players[i].value[0][1].value;
+                if (playerName == scope.user) { playersPositions = playersPositions[i]; break; }
             }
+
             for (var playerInfo, i = 0, l = players.length; l > i; i++) {
-                playerInfo = players[i].PlayerInfo;
-                scope.playersMap[playerInfo[0]] = scope.playersMap[playerInfo[0]] || new scope.Player({
+                playerInfo = players[i].value[0];
+                scope.playersMap[playerInfo[1].value] = scope.playersMap[playerInfo[1].value] || new scope.Player({
                     position: playersPositions[i],
-                    name: [ playerInfo[2], playerInfo[3] ].join(" ")
+                    sex: playerInfo[12].value,
+                    name: [ playerInfo[3].value, playerInfo[4].value ].join(" ")
                 });
-                var prevPlayer = i == players.length - 1 ? players[0] : players[i + 1];
+                var prevPlayer = i == players.length - 1 ? players[0].value[0][1].value : players[i + 1].value[0][1].value;
                 for (var prop in scope.playersLeftHandsMap) scope.playersLeftHandsMap[prop].clear();
-                scope.playersLeftHandsMap[prevPlayer.PlayerInfo[0]] = scope.playersRightHandsMap[playerInfo[0]] = new scope.Hand("#" + [ "Player", playersPositions[i], "Hand" ].join("-")), 
-                "Me" == playersPositions[i] && scope.playersRightHandsMap[playerInfo[0]].$el.droppable({
+                scope.playersLeftHandsMap[prevPlayer] = scope.playersRightHandsMap[playerInfo[1].value] = new scope.Hand("#" + [ "Player", playersPositions[i], "Hand" ].join("-")), 
+                "Me" == playersPositions[i] && scope.playersRightHandsMap[playerInfo[1].value].$el.droppable({
                     accept: function() {
                         return playerTurn && scope.deck.length() > 14;
                     },
@@ -334,24 +335,38 @@ function initOkeyScene(x)
 function SetupLeftMenu() 
 {
     $("#Left-Menu").css("cursor", "pointer").on("click", function() {
-        leftFlag ? (    $("#Tournaments").transform({ to: "10 575", from: "44 465" }),
-                        $("#Promos").transform({ to: "10 575", from: "122 538" }),
-                        leftFlag = !1
-                ) : (   $("#Tournaments").transform({ from: "10 575", to: "44 465" }),
-                        $("#Promos").transform({ from: "10 575", to: "122 538" }),
-                        leftFlag = !0 );
+        if (leftFlag) { 
+            if (currentChat != null)
+                $("#OnlineChatEditor")[0].firstElementChild.style.display = "";
+            $("#Tournaments").transform({ to: "10 575", from: "44 465" }),
+            $("#Promos").transform({ to: "10 575", from: "122 538" }),
+            leftFlag = !1
+        } else {
+            if ($("#OnlineChatEditor")[0].firstElementChild.style.display != "none") 
+                $("#OnlineChatEditor")[0].firstElementChild.style.display = "none";
+            $("#Tournaments").transform({ from: "10 575", to: "44 465" }),
+            $("#Promos").transform({ from: "10 575", to: "122 538" }),
+            leftFlag = !0 
+        }
     });
 }
 
 function SetupRightMenu() 
 {
     $("#Right-Menu").css("cursor", "pointer").on("click", function() {
-        rightFlag ? (   $("#Play").transform({to: "975 575", from: "946, 461"}),
-                        $("#Create").transform({to: "975 575",from: "864 526"}),
-                        rightFlag = !1
-                ) : (   $("#Play").transform({from: "975 575",to: "946, 461"}),
-                        $("#Create").transform({from: "975 575",to: "864 526"}),
-                        rightFlag = !0 );
+
+        if (rightFlag) {
+            $("#GameChatEditor")[0].firstElementChild.style.display = "";
+            $("#Play").transform({to: "975 575", from: "946, 461"});
+            $("#Create").transform({to: "975 575",from: "864 526"});
+            rightFlag = !1;
+        } else {
+            if ($("#GameChatEditor")[0].firstElementChild.style.display != "none")
+                $("#GameChatEditor")[0].firstElementChild.style.display = "none";
+            $("#Play").transform({from: "975 575",to: "946, 461"});
+            $("#Create").transform({from: "975 575",to: "864 526"});
+            rightFlag = !0;
+        }
     });
 }
 

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

@@ -112,7 +112,7 @@ function OkeyApiProviderScope(scope) {
             return msg;
         },
         emitEvent: function(raw,msg) {
-            //console.log(String(dec(raw)));
+            console.log(String(dec(raw)));
             for (var event, i = eventMap.length, obj; i--; ) {
                 event = eventMap[i];
                 found = (event == msg[0] || msg[event] != null);

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

@@ -6,7 +6,9 @@ function PlayerScope(scope) {
         this.name = options.name;
         this.position = options.position;
         this.noSkin = options.noSkin;
-        this.skin = options.skin || scope.SKIN_NAMES[$.rand(0, scope.SKIN_NAMES.length - 1)];
+        this.sex = options.sex;
+        var skins = this.sex == "female" ? scope.FEMALE_SKINS : scope.MALE_SKINS;
+        this.skin = options.skin || skins[$.rand(0, skins.length - 1)];
         this.$el = $("#Player-" + this.position);
         this.elements = {
             $timer: "#Timer",

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

@@ -9,9 +9,10 @@ var scope = {
     CARD_SOURCE: "svg/Card.svg",
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",
     CARD_COLORS: [ "#CE290F", "#3B5998", "#48AF5E", "#F8E81C" ],
-    SKIN_NAMES: [ "Alina", "Gabrielo", "Mustafa" ],
+    MALE_SKINS: [ "Gabrielo", "Mustafa" ],
+    FEMALE_SKINS: [ "Alina" ],
     paused: false,
-    version: 1406201405
+    version: 1806201401
 };
 
 var $ = function(_undefind)

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

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