From 2aa94c2858ad81d6fc345382ece97ec73186f615 Mon Sep 17 00:00:00 2001
From: skomoroh <skomoroh@efabe8c0-fbe8-4139-b769-b5e6d273206e>
Date: Fri, 18 May 2007 21:24:17 +0000
Subject: [PATCH] * improved the mahjongg games + added `shuffle' icons

git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@167 efabe8c0-fbe8-4139-b769-b5e6d273206e
---
 .../toolbar/bluecurve/large/shuffle.gif       | Bin 0 -> 915 bytes
 .../toolbar/bluecurve/small/shuffle.gif       | Bin 0 -> 506 bytes
 data/images/toolbar/crystal/large/shuffle.gif | Bin 0 -> 1573 bytes
 data/images/toolbar/crystal/small/shuffle.gif | Bin 0 -> 1205 bytes
 pysollib/app.py                               |   2 ++
 pysollib/game.py                              |   8 ++++---
 pysollib/games/mahjongg/mahjongg.py           |  21 ++++++++++++------
 7 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 data/images/toolbar/bluecurve/large/shuffle.gif
 create mode 100644 data/images/toolbar/bluecurve/small/shuffle.gif
 create mode 100644 data/images/toolbar/crystal/large/shuffle.gif
 create mode 100644 data/images/toolbar/crystal/small/shuffle.gif

diff --git a/data/images/toolbar/bluecurve/large/shuffle.gif b/data/images/toolbar/bluecurve/large/shuffle.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ad0e5e30346dae5531183e41d18a50b95862e5f6
GIT binary patch
literal 915
zcmZ?wbhEHbRA5kGIK}`1H*enj`t|G7sZ(FReEIb0(_OoE)z#H)-MY1^s;aB2Ywg;#
zOP4MU3JTh^X;W!wsgsk_qD6~ZTU%XSUEjWad-v|$xpU{vnl<auqen-N9`*9_Vq#+Y
z^y$;pt5+XBeAv{~)YjH!WMp*d(xtO!&z?GU>fphHMMXubs;cwm&AWB$*518)^YZeP
zl$7}R_>LVrwr}4)EiJ88t5%&nd2-UENtKnAfq{WhQBk$EwTBKJ;^N}+^Yi27<z-`I
zv$C=h5)$(D_1(5@+sc(IdwY9jWo2VyV|VV{nU$55nwsk7=4NMSCnY6iW@aWTDq2=n
zW@>6GCMK4Ylq4r7H*w;`(9qETg8(T0WMSlDsAtdt#RMo$7})<c)HgM^w6?W(bk;NU
zFm&~|F)%VQGWSiG!N9`G#y)*U|ExLl7PR)ZEaKpt-`%s2i<@UU1Mh4;eu2$`Lc(h%
za*K$H^)QRGN=Wi>arKBX@<~Z|G4P0rO2`}(Wt3IArz|R~tg5Dd>9WQ(xoeuTca@b@
zKB#Ex=+2apc>C_2(q}!rxC0-idI;|p<WpME(fFX1TT(K_$6{ipTUR$n=9LQxkK3BX
zEu79ZOk@sJX0Xx=$#~w-)+Q@m@ued{VF?$vV%d)yKRFNZGC7#<d@b<scweL<&y<Qp
z1vU;=@g|l?18<K;rrC!|y8|B2S)iz_BvqhL+ITauiJ`_Ifq`QJ&&T@`0uLQuxNu2o
zb?NL-cyhRrnLkbPr}tyWmVA!9FFRNgS=oeg^<^BH78XsK*Q=m0<9m{0i-2>&j0H=W
z8k<?1%~srVFnIf{Lefhjz;RJ?yGW&=!iI%QN|$hLC~P?MVZ)Y}9L_cFuN;(|*=B2n
zFc`i)z}T$nV|28jZ?OxfsLxHg{*4PdC#x@%Nif*J#5qNhTkuV;Q_2YzR=y;Ok5wE8
z7+BQ4Fg38*Ul3?yb?3P_TS&m*z=68UGK{WznY<qvn4MgTJw=2(Hh5{Q<6&wLG1O>a
m(O#u#?pqq<voJ}sd&3K*p35sXcr)uCsu1e6u@mB8um%9^!ngMT

literal 0
HcmV?d00001

diff --git a/data/images/toolbar/bluecurve/small/shuffle.gif b/data/images/toolbar/bluecurve/small/shuffle.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e863e0f99a47b4ab22eb4fc6d6a281ab1d17e82
GIT binary patch
literal 506
zcmZ?wbhEHblwgox_{snR+}zxJe0)MeLJ|@ZGBPsC%F3FWnudmkHa0d+PEH;k9zH%k
zVPRpBk&y`r38|^6Sy@@d#l_Xt)s2mfEiEnG-QANXPo6z{_PlxX7A;z|diCnHYu9ex
zym|NT-A9fbId$sPrAwFY+`04Q$&)v4-hBD;1#BnP2*sZ)j0_BF3_2haL4IOj`|mKh
zz(Yr>|HP7_7Y}u&vM@JYs4x;2ILEm8qJjeF$xF@$H27`@yb$hCS>@TZba7{h*3v!6
zMvfi*3e4it%1UAqm8#;x@(OI?9^!0DDy_;Yol_O%nB3$zIa#Dtr%s>Q%ERg=#3v>u
ztgu8yR#<9@vOG6ifwPc^l$3a<Ah#rg)U5UFaxOyr63bMTS(W8jg%y>v<@o%ZWr~!R
z$+HTu2=*u`$ltl=EWjZpr#xM}OjKA&Q9)9S>zy-`Nx=ulmV>;a1~oUXFKk$^%>1K-
zVd1hzv-o9sB05|g=C$)HI9I)JSS~DNAY<k7;YDIovmS4SY$k)&fz!Ow3_2bgKA&V2
e=Mv({IIw`Rfs;#Q%^v0hB2AZ;2h0ZslQjUER*we&

literal 0
HcmV?d00001

diff --git a/data/images/toolbar/crystal/large/shuffle.gif b/data/images/toolbar/crystal/large/shuffle.gif
new file mode 100644
index 0000000000000000000000000000000000000000..305acf802ef09c557e4f4083a19940ff4cccb3c1
GIT binary patch
literal 1573
zcmeIxZ%-Nr0D$pB5ReJt)lzp=dZ0yR3pHr)Pb~$cC%ZHkq)HdoQlyS5F$7u1CQDd_
zdODg?OIK!DXVe;(nQAOs$l?nlXl=_nrmSNtF^14eopHpm#H6OF+djhH@Ana&<Y{^b
zsjX{+0T_4z09jdC8jaTN@=p5wJT`AFm0XI1>jm{zn{9Y(0+nHUy}>^_>+$$vYjK0o
zsFtZA2nx*2X%LOcV#)06s8yP1JQfNs$%HbWZ_H-2<965B#H7V)HEK*C1Dp-br8ZNj
z2#v&|Dom|KwFZ?z#1~CWP8$qH2aa2<)^sL~icv&_M50j|jmG2g=9WShy%j@ME{EIe
z9rg{6u~}?~%{3he*i3f2#i0_btOnb}^fV9R#gl7BwNbzmc--D_G~%%0ySuw4t;L0V
z$XR3vg!o)OR*!9_)8R<Oje7#KvxpcO9-c5@27e&n_4pVxhE}U*fh;b>jm6_4o=7Yd
zV+dw6nM@j!-Q<||2XLFqWVO)9v}i1r$z&WBd@Y&OWBT}7T#IOTc6Vg;$ZRO27ORt~
z<k;AxMyBDixE8HNz!j)enz^N=P&m94iA3XZM2M(R)#S7vq=763%b+sG*Vg!Kek2yN
zTX3;JjLEQcI*rsLT8&=F6Z(cHJZ@iVb2FJr`2(|F&#)ddq%#@Z?shpm2BWE7AXcI3
zz5o5k0-Tp50u9&$-Uj~h?-Ky^HL#acq%bEAWSye%%OB2gq%v%yHdvzUb(GkJb*tsu
z?khPrNUc53WRI_-D1R#P+stRzM6Gz~%X_2!jL%W>^GBgfTT%TDoI2JSMG6Sbimi_A
zzW2X^KiW7s1dO5uM~}PZb+%{t%>wV%>eKJn`}R$Wi|$oOl8*ets7n!*91b38JOb3-
ztx9eUlxFL;hVDpJ#EP@uD1YC+FrQmaD3aYyT+W5aIZ*iuC)HnETnvr_LPI~PwlZAZ
z{seaql@ZNU_^(DLNml1=C_Dy7J9CkYTriNle533<l*8PIM_5&)BY)@s3dSa$$*d~n
zGquI!D)6;DziKgOz>#-XQ8z^izezDycfpyTe&9$CVGS=oSbsQ}zr3G>7sLn;D7ofJ
z^8#7=q()xYCT{~6H<uGc7QGn`eu!-M1{uX2=KJK{a&zdUbsUxwkKGN*ar5I5N^al$
zpOpP4TKojMW~B1eh4XSQKrdOGXJ*HK+~6>wat;FWfT6zPgGDO~bg)IZcqO|BppZW)
z?8YHgLidQ=I#lMA@ViEwV7pG|%t63K8M|j|#Y-IAN+|Nm+Gpg_bMJC5mDF@3<Rnsa
zrISFOH!s0PB{$fLkrad3{XAdDy7#e!klpj$Y3d<o0h|R5Qnv|Ty#A7=T%@-=zV7JM
z-S&Q+Upf=Si?|KFB=FPHZmpDcMtYi3@#@}!?Hr<^9&k!BiZ>K3FoD=i3Mm07F({!(
zP9C_!Mhd%op=(M988USoB{S$F^Ga6DMM>h@U(QmTM5k_Mim<;0zF(L_U0ygy=gc=z
z=lTX;uz&Uw9ssv0-U>1x>LAkN1IJ}0^bH-U0D1M^rK>ga?!~<0<D=62=XJfKjkgBc
zvWRC2LgZ4k(>wupcU^ZjwY7(%oU>1sWrXYou9Q-JdW8a$)|nZ^HU;1RRoyYt2%gwk
mjB@E0*Qt5?R=Y$^+U1#GUNtilcq+fdlxH&^%oQ_%qkjX}XFDhW

literal 0
HcmV?d00001

diff --git a/data/images/toolbar/crystal/small/shuffle.gif b/data/images/toolbar/crystal/small/shuffle.gif
new file mode 100644
index 0000000000000000000000000000000000000000..245971af6c4ba80eb4c423ee45c52bde335aeeb6
GIT binary patch
literal 1205
zcmZ?wbhEHb6k`x$c+S9Js9~rftKsYF9}yI#t)Lz56rSLnXr^iA>+J94;L}{u(OlV?
zn3Ariq!;5JlOB|jA6r<OQc;uJ(A_ezv$6l|l}iapsggpHT8diw%KE`}!J&?!u^w@m
zp;_f=Rjt)s-K~@QyQfX;n|bEah5oK-j;4+>A~J5qZXxy|&W6qv>D9XrAG&q_?xma8
zH|^Nj(>7_wj0JP&FI~Q7y|tG0veoPEJbJKt<K}5o=gnWVeAetm^A;>yvSQ83^_zAa
z*nj!fjlRA<Qw>vh6Zb8<cAdI#Zsx3o?R7n6sg?0w2@DJjOINL1vuVrL-MbH+I&u8m
znbeeYb1m~|x9DrPZ>0xkDu^q{$;c(8rmx+yZR?&ryAB;ZaN_ut+c(2PqSFG?qg<oT
zU%Rq+`D$@N@r>-;V`tA?ym4*s(Ib;5&Q=sxbTDzqjn1#muAA69qcFZ$N?0nlsA&K3
zW7DV4SCdgQ*ETOqC@oDcpE7Coo+F1_syYo-4fBeN=Pg{`)jXjxvnDklO-5KcDJ89`
zyuCKR@#vY;)j9Rz0^%30U%mbCzN?Wd9}l0Odth(-<b_LD$;!%}xqR{6hYuAQHIDj@
z3JMB=KB2ScEMBs5ZHRwZZed|TNy(8jr%qoy|LED%|Ns9VK7BGHB#ViWDJ(c@(X!R6
zHf(zK^7+Tlp8~vslatamY}>wV-@b>>o_zWC_1CXoGiNSzv2lrsN!$ta{rR)EAKY89
zZsYwYk0$g?H&Qj4GjB;%RxKL~o0p@njke9qnKNI%dz%+iz|O+1s;FwLZd}*YIDOi@
z(7=e^jw#80DIDw^@?!F;(y9`I5<r&>3846sg^`QlKZ6c1!2olF7y|>xKZgIDG8O_3
z4UJ4}0x>%#I50A^3#bHaXkc`1<CU>#5O6%y#3`Z`vE#>krZyfavw{~79x`_bD7j70
zIC$X*r-)|AnuLpoj&=(eB%Kf_EJ$P!G0wQMq44ohZW+sxHxDizKHlHz(8M9>w4`IA
zGUEge&qXOGxzv2;@YFD+I*LeeE%8~Xw4rONcEqL($&IcG0(!A~YJMJI<vD0jarB3T
z^Rk|q#<CZdWG+nOo!y#y!sO#awUe_23Lc%9>Abvet~K|^jBk!={qt;Ve*KvEnLR+k
zv6*9)oYRT`Aua(PS)q;<9!jnaV!THtw@wrn>rJw#V#!QcB4DoKyXedMNlU$Fa7^BK
zVo9d(az7T^)c-82+?R?@cXL@O=rv^-*J6%IRg)i2?hRUY<zkDt>6|7ntyxzbo3&O8
z9PyH!{^dfK^g4l0T#_4ngt{d>PfR+d!`;frEIVVzqobPI7Z$ZEXzlsvrYn8p&;{Kc
zPYyNd1=biI)KmX($(woKf^tEj|9_O+v=6Lsko8nyRc<mkEO1z5@==N6GgJPvurOEy
E0HT(6SpWb4

literal 0
HcmV?d00001

diff --git a/pysollib/app.py b/pysollib/app.py
index cfd69187..02a3a214 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -801,6 +801,8 @@ class Application:
         del self.opt.recent_gameid[self.opt.num_recent_games:]
         self.menubar.updateRecentGamesMenu(self.opt.recent_gameid)
         self.menubar.updateFavoriteGamesMenu()
+        # hide/show "Shuffle" button
+        self.toolbar.config('shuffle', self.game.canShuffle())
         # delete intro progress bar
         if self.intro.progress:
             self.intro.progress.destroy()
diff --git a/pysollib/game.py b/pysollib/game.py
index abaaaf78..0f8ffa77 100644
--- a/pysollib/game.py
+++ b/pysollib/game.py
@@ -361,6 +361,7 @@ class Game:
             autoplay_moves = 0,         # number of moves
             quickplay_moves = 0,        # number of quickplay moves
             goto_bookmark_moves = 0,    # number of goto bookmark
+            shuffle_moves = 0,          # number of shuffles (Mahjongg)
             demo_updated = 0,           # did this game already update the demo stats ?
             update_time = time.time(),  # for updateTime()
             elapsed_time = 0.0,
@@ -1618,10 +1619,11 @@ class Game:
             # sorry, you lose
             return won, 0, self.U_LOST
         if (self.stats.undo_moves == 0 and
-              self.stats.goto_bookmark_moves == 0 and
+            self.stats.goto_bookmark_moves == 0 and
 ###              self.stats.quickplay_moves == 0 and
-              self.stats.highlight_piles == 0 and
-              self.stats.highlight_cards == 0):
+            self.stats.highlight_piles == 0 and
+            self.stats.highlight_cards == 0 and
+            self.stats.shuffle_moves == 0):
             # perfect !
             return won, 2, self.U_PERFECT
         return won, 1, self.U_WON
diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py
index dabd9042..43685e15 100644
--- a/pysollib/games/mahjongg/mahjongg.py
+++ b/pysollib/games/mahjongg/mahjongg.py
@@ -43,7 +43,7 @@ from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint
 from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage
 from pysollib.pysoltk import bind, EVENT_HANDLED, ANCHOR_NW
 from pysollib.pysoltk import MfxMessageDialog
-from pysollib.settings import TOOLKIT
+from pysollib.settings import TOOLKIT, DEBUG
 
 
 def factorial(x):
@@ -557,6 +557,7 @@ class AbstractMahjonggGame(Game):
 
 
     def _shuffleHook1(self, cards):
+        # old version; it generate a very easy layouts
         old_cards = cards[:]
         rows = self.s.rows
 
@@ -703,16 +704,16 @@ class AbstractMahjonggGame(Game):
                 if time.time() - start_time > max_time:
                     return None
 
+                # select two suitable stacks
                 while True:
-                    # create uniq pair
+                    # create a uniq pair
                     r1 = self.random.randrange(0, len(suitable_stacks))
-                    r2 = self.random.randrange(0, len(suitable_stacks)-1)
-                    if r2 >= r1:
-                        r2 += 1
+                    r2 = self.random.randrange(0, len(suitable_stacks))
+                    if r1 == r2:
+                        continue
                     if (r1, r2) not in old_pairs and (r2, r1) not in old_pairs:
                         old_pairs.append((r1, r2))
                         break
-                # select two suitable stacks
                 s1 = suitable_stacks[r1]
                 s2 = suitable_stacks[r2]
                 # check if s1 don't block s2
@@ -739,6 +740,8 @@ class AbstractMahjonggGame(Game):
 
         while True:
             ret = create_solvable(cards[:], new_cards)
+            if DEBUG:
+                print 'create_solvable time:', time.time() - start_time
             if ret:
                 ret.reverse()
                 return ret
@@ -788,9 +791,13 @@ a solvable configuration.'''),
                                  bitmap='warning')
             self.leaveState(old_state)
             ##self.finishMove()
-            self.moves.current = []     # hack
+            # hack
+            am = self.moves.current[0]
+            am.undo(self)               # restore random
+            self.moves.current = []
             return
 
+        self.stats.shuffle_moves += 1
         # move new_cards to talon
         for c in new_cards:
             for r in rows: