From e1e56743ad2c39e24ba4a41680242532c7b22c62 Mon Sep 17 00:00:00 2001 From: Omardyab Date: Thu, 26 Aug 2021 02:07:25 +0300 Subject: [PATCH 1/4] feat: running on vs code (tests and game) on Omar's device --- .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 182 bytes .../pyladder/__pycache__/score.cpython-39.pyc | Bin 0 -> 4288 bytes pyladder/pyladder/pyladder.py | 103 +++++++++--------- .../tests/__pycache__/__init__.cpython-39.pyc | Bin 0 -> 158 bytes .../test_pyladder.cpython-39-pytest-5.4.3.pyc | Bin 0 -> 5606 bytes 5 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 pyladder/pyladder/__pycache__/__init__.cpython-39.pyc create mode 100644 pyladder/pyladder/__pycache__/score.cpython-39.pyc create mode 100644 pyladder/tests/__pycache__/__init__.cpython-39.pyc create mode 100644 pyladder/tests/__pycache__/test_pyladder.cpython-39-pytest-5.4.3.pyc diff --git a/pyladder/pyladder/__pycache__/__init__.cpython-39.pyc b/pyladder/pyladder/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..38572cabf7dce34de2d30d08c6c9dcd4a6924657 GIT binary patch literal 182 zcmYe~<>g`kg3eiLiDE$dF^Gc<7=auIATH(r5-AK(3@MDk44O<;tOk09dIo-)jJLSs z>=A?!NYB`_;wXU6u}fv|*iFswk{2rRNRKdi~Ti8IM~ z#;IB6;S7>NF~&Hnxbjc1)8B*)I~Z)bEr#nn$Dn}BK!MR z`Ro9{W^I@4zHjOsYITxF3rkDO^*C-O@iMg<&E3|1eXm(rI_T_;m#UMcmC4fTWNB@( zRAZ@O^M4+GT-3KwHc{etu!v-n+Ee5Rwa^tRp(pf(fiM*2g!v&0m?1~ZP#6e(p(j*A zSEz-~kQ$>jFcfP}@GBhywGq(BQcYuLq4Hg*OdSaE`zFqIDb_J!{w;%THBja;N#%G($ zce?w{U;a$ zpS3!BB}^D!1T4EY_FMR;E(CS~U&DPHxTDdB+gvtL;=chYBKDp#=MxL-s@_)S3}Nl~ zaO!*l&4IQt(yFAPIndsN=0e*UY1`yMbD_Np&4+d{((Y0K&4-pi3!(jLr2Ud|&_ZZ$ zLd!$@!$|u*6`SJ_VGyjBbA^Pp)Eq2g7%k@)~9J`Q_ys3p@mYO*)|^TcW{ZJ z8N4`yknth|PX%kR!#K@&g|WimwHn-DG#KAz{0Mkr_w{}~x%0#^d6<3AbPqce_q}>2 ze$X^e-EWF4`@P~21 zzcp|GGtDi2un#z3%3j~)M5K~c)vQ{{s@1Go%c@#g^=&d2c#`Kz-p)QyXP? zmkFL3&^2@~^+dmsdf5ud>ELdgb<8~=pszM+eYH|8XYpm&HDy0?g{&-L34P&Uq`1X$05F(^~=j1$&7znjpWdDevJ|FJYd-xYr!XWfEItVmbnh?nLSa! zh0$6(hJm%fledRE?;+RfA>-*G)9Lx-_5zeJwak2Ki^q4!|1s2F&sUiO z^(erO*rBkOPZ5u}o`XFv{ryq@w?_T5Q~E9PFcvAW^etp#@6XF>7PnhHJQiEu#HMP! zk4+_y%Pl#8%i4Sc|9op}OX^1po88WysV9f+deZ84;>90!4;OE~vAuY~tfAk4)AmQD z&F=oeVbU~LOC9mylv{TE%S}ZJp|r|H)%|8AtCI zaP-d6B?&eg!S)_s5rvPGFJ?!|$@i7}hs~JXyL`X0boXE{Qder@<*LX|rBWHMuVlm5 ztK(&PuZf&$b#1)9#>4yemGP>)-+9pv%Hd&{ng*wmNBUS+z*5RVIwD@%RbadUjjua=ywr zu(LHdizUv2*vrD#LCzF~$Ey)X!Ew`EMAv9)6rf{sE5ixghbZv|fTs&`s{io)yPidc zjF3eBC4s7y%u=52E7L?Shu87$zTu~$xx)Agg`kg3eiLi6Hthh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6vRKO;XkRX;yB zu_&c7F-hOVz)(LeGcPfxpeR2pHMvATpwcHXB_*{;zo0S)!YD~CE-BWJkI&4@EQycT XE2zB1VUwGmQks)$2QvIK5HkP(Dm5kf literal 0 HcmV?d00001 diff --git a/pyladder/tests/__pycache__/test_pyladder.cpython-39-pytest-5.4.3.pyc b/pyladder/tests/__pycache__/test_pyladder.cpython-39-pytest-5.4.3.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b8939d6213ba6d911bfb4da57460c95d2921cd21 GIT binary patch literal 5606 zcmeHLTaVku73T0FQkT`8mK{IG^kpDpm(^o5=vBu zT-#buFLlvpqbQ0#7=`yO`XBujd})C`DL-MK@|{CTOKmsK7U_$N3ecH3oTC})JKuL^ zNN-`G^pC&4?kyEH?O)oNj}HG`e4{_XNKJ}BYYT4muAyr}>zZv#(1;!sx^~;I zg1)q#>Q}U(PX9I0I|6+pwlV4?#<6%TehG6m6Mb*5CXQBK zd!s+ts7330d+XHQszr*huj#3Qfi}$6QPqngU&S1-Q;X>0POZpsY3bemAoio!^;Ej- z?t4MtD!;Gx!*1VGepd-t#t#GPK07J?8FQF_gd?uUngE&W9<^%8LwTQ&HPWESzzWbcxLo4b6HlV z5xD;X$AG4oZ;7MOM-=4A>z7ENNr~4l^ZI34ACXRCN^z`rG|;_5@=YonwGbCET1pmj z)GvVkCcf6tW(lmc6hH^RJ43YNTga0lk&Y%>*gVz3b}dRBZ$CZ+IUl7Z&<>pNrTb{a z;@BjGY@gU9n_Yy$+r=!a8H{vN(v7y+A2c^k9Qs`o%ctaTo-F1> z*M#c$^3JH-E_A~Oo!&h~EK&{`6i`i-$dt)cVA6uu@B2NOR;Q}D8-_vHR|^zDBpg-M z73#lA<|>(QlUanxYicX+Y~-D{^P1YpMlylD)n?gePO~}ZZOwVxbKWk?GBYc%PaZs%WG*SuVuONAINL9H6|iLUcWQIrc3Cvywqjt zG2xhN*T{XD%qwKRMTVKkBwQ!=I+^c~A;GHelKCE)*T}pVDP-jLpyP729^U*G12-Fu6)%sV2?2 zNrvi2zA$X58eKk2o-9X%hJ~Rd4`GjOZx<#xaSL zg``Z9b-MF?$f=;c@mHLR>{x}JZb+4 zc4_e?GG}s9X7yxik=XJnc^m#*O6HXF6r)*69^)7zjeJ6)KLft!rGn12nQmGP^uMR# zfFmdseU6wleTf9JTS}Ir!Sc_vzMn zF5*|2rjwamYJKHC?DTG)0?);O{1+eiF+B+%Rd3>jz+vpG^-sdyh0s<%p{$+9*tI$Q z=uHDnObGt`41%{_cm&_aKN!=&>h^^Qnwoe)a{n6@(N`H=n#P?$d*F2f*XuZb@imzCGg!EHZO3hxXi(Ea8Nbi~%$<cubj{6PsMWIr zAzpITmH$w6V!RxiT}tiAHBNQvOy5QEJGpjs>eeINfzL0Y_)%HW6A+)T740E>+~7S? vQIS_va1?1qQC1b*U+(C_hZue=cYfRr Date: Thu, 26 Aug 2021 02:22:16 +0300 Subject: [PATCH 2/4] feat: Running on vs code (tests and game) new bug fixed --- pyladder/pyladder/pyladder.py | 99 ++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/pyladder/pyladder/pyladder.py b/pyladder/pyladder/pyladder.py index 43cbc94..4349d38 100644 --- a/pyladder/pyladder/pyladder.py +++ b/pyladder/pyladder/pyladder.py @@ -403,8 +403,8 @@ def playing(btn1): comp_y_c = 606 - 25 game_layout.blit(red_token, (comp_x_c, comp_y_c)) game_layout.blit(blue_token, (player1_x_c, player1_y_c)) - player1_score = 0 - computer_score = 0 + player1_score = 92 + computer_score = 90 rounds = 1 while True: up=False @@ -425,58 +425,59 @@ def playing(btn1): # print(btn1) if btn1: - if button("Click to Roll", mouse[0], mouse[1], 50, 138, 350, 50, green_color, light_green_color, 40, btn1): - if rounds == 1: - player1_score, up, down, six = turn(player1_score, up, down,rounds) - # tempx,tempy=player1_x_c, player1_y_c - player1_x_c, player1_y_c = moving(player1_score) - if not six: - rounds += 1 - if player1_score == 100: - time = pygame.time.get_ticks() - while pygame.time.get_ticks() - time < 2500: - display_text("Congratulations You WON !", 700, 50, 60) - pygame.mixer.music.pause() - while pygame.time.get_ticks() - time < 500: - game_layout.blit(wins_player, (-5, height / 2 +70)) - game_layout.blit(loss_computer, (width - 120, height / 2+70)) + if computer_score ==100 or player1_score==100: + if button("Back", mouse[0], mouse[1], width / 2 - 120, 680, 200, 70, (168, 50, 50,1), (168, 55, 50,50), 60, 2): + menu() + else: + if button("Click to Roll", mouse[0], mouse[1], 50, 138, 350, 50, green_color, light_green_color, 40, btn1): + if rounds == 1: + player1_score, up, down, six = turn(player1_score, up, down,rounds) + # tempx,tempy=player1_x_c, player1_y_c + player1_x_c, player1_y_c = moving(player1_score) + if not six: + rounds += 1 + if player1_score == 100: + time = pygame.time.get_ticks() + while pygame.time.get_ticks() - time < 2500: + display_text("Congratulations You WON !", 700, 50, 60) + pygame.mixer.music.pause() + while pygame.time.get_ticks() - time < 500: + game_layout.blit(wins_player, (-5, height / 2 +70)) + game_layout.blit(loss_computer, (width - 120, height / 2+70)) + pygame.display.update() + pygame.mixer.Sound.play(win_sound) + pygame.mixer.music.unpause() pygame.display.update() - pygame.mixer.Sound.play(win_sound) - pygame.mixer.music.unpause() - pygame.display.update() - if button("Back", mouse[0], mouse[1], width / 2 - 120, 680, 200, 70, (168, 50, 50,1), (168, 55, 50,50), 60, 2): - menu() - - - + break game_layout.blit(red_token, (comp_x_c ,comp_y_c )) if btn1 == 10: game_layout.blit(blue_token, (player1_x_c + 2, player1_y_c)) - - button("Computer", mouse[0], mouse[1], 1050, 138, 220, 50, green_color, light_green_color, 40,btn1) - if rounds == 2: - computer_score, up, down, six = turn(computer_score, up, down,rounds) - comp_x_c, comp_y_c = moving(computer_score) - if not six: - rounds += 1 - if btn1 == 10: - rounds = 1 - # computer_score == 100 - if computer_score == 100: - time_clock = pygame.time.get_ticks() - while pygame.time.get_ticks() - time_clock < 500: - display_text("Computer Won !", 1066, 50, 60) - pygame.mixer.music.pause() - while pygame.time.get_ticks() - time_clock < 2500: - game_layout.blit(wins_computer, (width - 250, height / 2 + 70)) - game_layout.blit(loss_player, (-5, height / 2 +70)) + if computer_score ==100 or player1_score==100: + if button("Back", mouse[0], mouse[1], width / 2 - 120, 680, 200, 70, (168, 50, 50,1), (168, 55, 50,50), 60, 2): + menu() + else: + button("Computer", mouse[0], mouse[1], 1050, 138, 220, 50, green_color, light_green_color, 40,btn1) + if rounds == 2: + computer_score, up, down, six = turn(computer_score, up, down,rounds) + comp_x_c, comp_y_c = moving(computer_score) + if not six: + rounds += 1 + if btn1 == 10: + rounds = 1 + if computer_score == 100: + time_clock = pygame.time.get_ticks() + while pygame.time.get_ticks() - time_clock < 500: + display_text("Computer Won !", 1066, 50, 60) + pygame.mixer.music.pause() + while pygame.time.get_ticks() - time_clock < 2500: + game_layout.blit(wins_computer, (width - 250, height / 2 + 70)) + game_layout.blit(loss_player, (-5, height / 2 +70)) + pygame.display.update() + pygame.mixer.Sound.play(lose_sound) + pygame.mixer.music.unpause() pygame.display.update() - pygame.mixer.Sound.play(lose_sound) - pygame.mixer.music.unpause() - pygame.display.update() - if button("Back", mouse[0], mouse[1], width / 2 - 120, 680, 200, 70, (168, 50, 50,1), (168, 55, 50,50), 60, 2): - menu() - + break + clock.tick() pygame.display.update() From 6e983d85f6ddac2657b5b0101893fd3f3932a85a Mon Sep 17 00:00:00 2001 From: Omardyab Date: Thu, 26 Aug 2021 02:22:21 +0300 Subject: [PATCH 3/4] feat: Running on vs code (tests and game) new bug fixed --- pyladder/pyladder/pyladder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyladder/pyladder/pyladder.py b/pyladder/pyladder/pyladder.py index 4349d38..d9412d2 100644 --- a/pyladder/pyladder/pyladder.py +++ b/pyladder/pyladder/pyladder.py @@ -403,8 +403,8 @@ def playing(btn1): comp_y_c = 606 - 25 game_layout.blit(red_token, (comp_x_c, comp_y_c)) game_layout.blit(blue_token, (player1_x_c, player1_y_c)) - player1_score = 92 - computer_score = 90 + player1_score = 0 + computer_score = 0 rounds = 1 while True: up=False From 3ebf50bfba63602d70bfcf5161185be29f093aaf Mon Sep 17 00:00:00 2001 From: Omardyab Date: Thu, 26 Aug 2021 02:47:25 +0300 Subject: [PATCH 4/4] feat: Running on vs code (tests and game) new bug fixed --- pyladder/pyladder/pyladder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyladder/pyladder/pyladder.py b/pyladder/pyladder/pyladder.py index d9412d2..8b33edc 100644 --- a/pyladder/pyladder/pyladder.py +++ b/pyladder/pyladder/pyladder.py @@ -494,7 +494,7 @@ def math(rounds): ["./pyladder/assets/question/q4.png", '225'], ["./pyladder/assets/question/q5.jpg", '9'], ["./pyladder/assets/question/q6.png", '86'], - ["./pyladder/assets/question/q7.png", '23'], + ["./pyladder/assets/question/q7.png", '13'], ["./pyladder/assets/question/q8.jpg", '6'], ["./pyladder/assets/question/q9.jpg", '12'], ["./pyladder/assets/question/q10.jpg", '5'],