Browse Source

simplify OkeyEnabled checking

Maxim Sokhatsky 10 years ago
parent
commit
2f954e97de

+ 5 - 4
apps/server/src/okey/okey_desk.erl

@@ -374,11 +374,12 @@ handle_player_action(PlayerId, {discard, Tash}, StateName,
                        _ ->
                            NextPlayerId = next_id(CurPlayerId),
 
-        #player{discarded = Discarded} = get_player(CurPlayerId, Players),
-        VisibleTower = lists:sublist([Tash|Discarded],3),
-        wf:info(?MODULE,"Looking for ~p in Discarded Tower for Player ~p",[Okey,VisibleTower]),
+%        #player{discarded = Discarded} = get_player(CurPlayerId, Players),
+%        VisibleTower = lists:sublist([Tash|Discarded],3),
+%        wf:info(?MODULE,"Looking for ~p in Discarded Tower for Player ~p",[Okey,VisibleTower]),
+%        EnableOkey = lists:any(fun(X)->X==Okey end,VisibleTower),
 
-        EnableOkey = lists:any(fun(X)->X==Okey end,VisibleTower),
+                            EnableOkey = Tash == Okey,
 
                            Events = [{next_player,NextPlayerId,EnableOkey} | Events1],
                            {ok, Events, ?STATE_TAKE,

+ 4 - 4
apps/web/priv/static/app/Kakaranet-Scene.svg

@@ -447,11 +447,11 @@
             <g id="You-Discard" transform="translate(800.000000, 393.000000)" fill="#D8D8D8" sketch:type="MSShapeGroup">
                 <rect id="You-Discard-Shape" x="0" y="0" width="38" height="60" rx="8"></rect>
             </g>
-            <g id="Alina-Discard" transform="translate(667.000000, 261.000000)" fill="#B5C6D8" sketch:type="MSShapeGroup">
-                <rect id="Shape" x="0" y="0" width="40" height="60" rx="8"></rect>
+            <g id="Alina-Discard" transform="translate(669.000000, 261.000000)" fill="#B5C6D8" sketch:type="MSShapeGroup">
+                <rect id="Shape" x="0" y="0" width="38" height="60" rx="8"></rect>
             </g>
-            <g id="Mustafa-Discard" transform="translate(373.000000, 261.000000)" fill="#B5C6D8" sketch:type="MSShapeGroup">
-                <rect id="Shape" x="0" y="0" width="40" height="60" rx="8"></rect>
+            <g id="Mustafa-Discard" transform="translate(370.000000, 261.000000)" fill="#B5C6D8" sketch:type="MSShapeGroup">
+                <rect id="Shape" x="0" y="0" width="38" height="60" rx="8"></rect>
             </g>
             <rect id="Left-Bar" opacity="0.64" fill="url(#linearGradient-3)" sketch:type="MSShapeGroup" x="3" y="91" width="213" height="456" rx="5"></rect>
             <g id="Have-8-Tashes" transform="translate(649.000000, 615.000000)">

BIN
apps/web/priv/static/doc/Kakaranet-Scene.sketch/Data


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

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