From 69881973a42f2ae37ccd01d7f0d790bdb161dd56 Mon Sep 17 00:00:00 2001 From: steev Date: Mon, 15 Jan 2024 10:43:56 +0100 Subject: [PATCH] fixed missing serverWorld issue and added status to login response --- .../Game/__pycache__/Player.cpython-312.pyc | Bin 3265 -> 3276 bytes Game Server/Classes/System/GameManager.py | 2 +- .../Classes/System/Network/NetworkManger.py | 3 +- .../__pycache__/GameManager.cpython-312.pyc | Bin 4476 -> 4910 bytes Game Server/log/fiarrhfr.log | 29 ++++++++++++++++++ Game_Client/Classes/Game/Events/Login.py | 3 +- .../__pycache__/GameStart.cpython-311.pyc | Bin 1181 -> 1260 bytes .../Events/__pycache__/Login.cpython-311.pyc | Bin 1261 -> 1372 bytes .../__pycache__/PlaceCard.cpython-311.pyc | Bin 1947 -> 1974 bytes .../Game/__pycache__/Player.cpython-311.pyc | Bin 2761 -> 2815 bytes .../__pycache__/EventHandler.cpython-311.pyc | Bin 2899 -> 2599 bytes .../System/__pycache__/App.cpython-311.pyc | Bin 9730 -> 8434 bytes 12 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 Game Server/log/fiarrhfr.log diff --git a/Game Server/Classes/Game/__pycache__/Player.cpython-312.pyc b/Game Server/Classes/Game/__pycache__/Player.cpython-312.pyc index 2da2dbac598e88b67ae05002c0423b4ca7d6b69f..db7e217a25b1d1e45a231a7e98e943c9e36a7278 100644 GIT binary patch delta 172 zcmX>oc}9}=G%qg~0}zybS&}Ngk#`T1g1@s>OlWaxQE^OgNos0Yj7w^9c1eCgOhIKy zMt+_`{^Wa1-i+LnwV2;C3Qd+`nZhVKc|A)Ln*`91BKgUu*<2=9vuZL*PhQG8hf!{_ z6I(N*;^bp&WsEA5ZP{BG)h8cfpUbEjc~Fw~G%qg~0}!a$&r6lu$h(J0)Wz8r70*@L}>QDgF1 z_PLDOle0N)GU`v>!zDF2p0kP3c=998n~Y{a{w+q9&C|Kn8Tr^u7!^J-0Er?opi=U*Cn0uhH@k^*+a@3`EhIESYDtsOh)WTwno3}q?vi-pOElh+ zI$Ae*BZx{EMryGVlvJ%$1QMd;7x0o7UTUQx)+!Q_=mQlmZu@|QcwolvDq$YZ`R2@b zzH@di`)|*W{efR)*$2q@{qH+QF?27`%D@Y_n+c1HMQc8vQ}f#=nSG{bl?C7?(4h^I zl-(E>i8Y4}Ob%E5ZTKfC7B4ZD*Im$=A7B$hKuEp@>1Vz@$o?-Lpm7+&DIwZ20m|@0 z1%MLkr6~>FKEV|{^fuc`COSuLiL*Jg4gV!6EN4DPJ>+mwhzq1DXLeHEOC_Gb*kQhl zY+eVt5CumXVsy_DZNV07Zeb7rB-)HF9$nGBMDrMtkCD2{Gv7_iiMnrtwFNWL2nuH3 zGfzp;bGmWx0DUl{M6C zDwmowkeV*21uKQDbZ$ui998HcY!cv&PmP?_&?7i!WQ({>?3X%`NY%JZx?tgyI5@;FqBP;jjc7Xe zN#1EoP7$5An_VW8R|*CyINX9!#Gi@N?bD>5!_OJkTN93lxOWH_?~DC2qzXcLq&k z&TU<-#$PO-tqb7T;DM6Zv@7=dwOUutrdcu9Gc~pMu5?Sf9eC{Fl#aRtl-|vS%EEfK zruN;HZ^^fVwXQ@nLKs~gkAqUIwd|?KK`44N@Ks>L+FY(gm%kg>RbJjxMytx`u5#+P zma+OMX|R3<;#uFTae51W8J>tu`k5WScXFKHY44gG;de&($#ML>?*hDtp+5_cYrzYpOIo|n%Lpkb1VUZaNo0US1C&#$rm3NC3%y6p`_xR~m6kZXj5k__VFD|d-4IqyDg`L r*C}NNw}%qZDGEc>1c~`a9LwhQD;eVrbP1mi#e)S12c7_G8>IgL6k|~j delta 1125 zcmah|OK1~87@pbP*-bW^q)lv_Ceid|nzcnmMJ$T8m|9;gDn97JhSgnb)@EB~Q)^1& z;~*62K^Z~ngDMINf*{4S2z^T-*ZD89G zP8d0xnC=95?B3?>VS1_G$ZlsPYUOx4W|vNTV?2me3HxYPh|y?JZORPl!vn@> +10:40:46,774 root INFO new length of user dictionary: 1 +10:40:46,774 root INFO connected users 1 +10:40:46,775 root INFO confirming login for user +10:40:46,775 root INFO incommingevent {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +10:40:46,775 root INFO Received message from ('127.0.0.1', 51297): {"event": "login", "username": "player", "deck": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +10:41:00,103 root INFO Connected with ('127.0.0.1', 51299) +10:41:00,103 root INFO starting client handler thread for client at address ('127.0.0.1', 51299) +10:41:00,104 root INFO decoded message {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +10:41:00,104 root INFO user in message None +10:41:00,104 root INFO user logging in +10:41:00,104 root INFO task passed off to gameManager +10:41:00,104 root INFO creating user with id: > +10:41:00,104 root INFO new length of user dictionary: 2 +10:41:00,105 root INFO 2 players have join game starts +10:41:28,589 root INFO Connection with ('127.0.0.1', 51297) closed. diff --git a/Game_Client/Classes/Game/Events/Login.py b/Game_Client/Classes/Game/Events/Login.py index 365406f..0a5717a 100644 --- a/Game_Client/Classes/Game/Events/Login.py +++ b/Game_Client/Classes/Game/Events/Login.py @@ -1,12 +1,11 @@ import json import pygame -from Classes.System.Network.TCPClient import TCPClient from Classes.Game.World import World from Classes.Game.Player import Player # event the client sends to let the server know it logged in -def Login(tcpClient:TCPClient): +def Login(tcpClient): payload = { "event":"login", "username": "player", diff --git a/Game_Client/Classes/Game/Events/__pycache__/GameStart.cpython-311.pyc b/Game_Client/Classes/Game/Events/__pycache__/GameStart.cpython-311.pyc index 16e73909a3208f572a2e389dab7abdc0c6c70625..cd2564979f9b6631fa8aa92ef1a3bf45cd597f39 100644 GIT binary patch delta 512 zcmbQs`G!+{IWI340}wQSUy@qG#K7#Om7M3Wk6vki%P40

a)&fNMW1HT*Cx3g%zd}nO+9utcD9rUce~N7(V#`qaGvM zKq zk3?u(C-WkWsI&&pCHsn5arJF1wsLN@*W@#kOZ`fPt37yo=g)$KQOQ|dNM6YfzUf-AoPWRFbD%bStJfL6ab|fZruO? delta 418 zcmaFEIhRv?IWI340}!a$&r7XiVqka-;=lk{2FUpwHBsGHD1|GPEsZOMyM-l+D}^zb zL6c`Y8YJ@VqI$4ChIfWGO|w2Wt8P+o6V5IHkY}EsfKy-PDXh~*U2{- z^?-65Oom>X>_zNAtwkIlf)hl5tSjOM61P}0^HNePZm}dM7Nrz}R4G8fFF$9in9$WdsTS2$`e zfYAqLkR(LOXP~hRn%qT#ljkt6VO%`flO@)#mT^Mp2L@KgTE+z_5PF9Uggy}lp)bTi NB_Lc}WRW<~Z~(XzWS;;4 diff --git a/Game_Client/Classes/Game/Events/__pycache__/Login.cpython-311.pyc b/Game_Client/Classes/Game/Events/__pycache__/Login.cpython-311.pyc index a50672ee97e3317bab2fbeb6d9226ac19f3d1825..448498cf6b2e097298ecc95202e4a2b8dad9a317 100644 GIT binary patch literal 1372 zcmds1&1(}u6rag{MjO*FXtgawXoWr4Ye7VWRMLt>u@)gLlqEBbF`M0WXH$(t2~x0l z(OZisgd$bxKj6WGe?lTb!h%rn)LWppg5aCUM_VlZ0nWa>c{B6o{oc&`O+LnAXArcv zzdz6)5rls6L9fYO<6s_)O+*mEHp+B*oWU@T*pZ@?kuaZ=Y`Lgp6tLxWlu?O7HKI~! zRVLcHoY4thLWaK2L#7QJD)(LACSa&{Y^zNDEbfBwjsr{ZJGc%CfH8^W0AL#v`JMC( zS5OV+|85n$15tMSk$74Fs-#23c5`_rR6T)ZT;AtCzW)CzLkbnTMx7wkON{!CRivRz zXtn@1E;H&7BN9e~te3R&+)4ASvh7-g0R>PZak!kkVlKlzW-bMku9@?c6#~~Yy>jrt zbrLR^w;en0(3N}1l$nC)E1gJY(zY0*Ow5@#cm~Y8#V>!>D~F1({6PTWchBZPRngwy zSZj2$HCU(%X=`#^Z6i?CRC@p^=U%2?q~FXnNcP8Y+)Dow7Xr zUW44yEV%5sql=%E~K7X!ZBu{vSJwFe{i!vH? z9+A%xjEFzX9Y;WQ>*>e&rkJ?>yOepZ1GT*XbKH?FgMun(=Qf@+wehXR@7hdVoB657 zHk^h&)zqizJ=xP^uj8-c@71kGwV_(-)6M4e+?TO$qhF^QJ zL__%@bNS;d=Qs_AyA+w_w3!uu13s@sIC5g)*og#TfWG-`AhP}pWrGdkREPT2qDx9P zz2;wpIbJCC98_Dv7`M>bs`y$cRux|hP1jFK3tg(8l(w$n$u{b%Q3WsJt?4%6eT{bd Ie`}H7A47I49{>OV literal 1261 zcmds0OKTKC5bmD$#;oQAMv~|rlE5C^qX7{WRtXVVLlO~|fiUcJmUVj`bk9atA}k`9 zi;$Z+h=>P8y!t~XlEcs-2%d5q$So(Ud)?sr_yg9|R9AOZS65Yk{h?SKK|qT)-jL54 zLf_?NKrmNyyavN7EqHk%w_1vgC zzD*G54(J6RucLC|NQSSKu_$a*SF5x|!UQJfgNRWd6l;}wUBW~mX~cbN1FMAk!hk`C z|M(^dNDup36ViBxedD$M6z`z7u>L3Q;P(*a(`h7`FeGEvgh``jD->3&jxAq4l0HoK z=RXx?U6^DWx-Og!CoJ>=A`G82+R%K1lh7|~%!2ZT9eZ6Gc|MnrD3wm`RIj@CVF!2D z6GFD#TZFfhD0c6Kv=x%gjq0+y48b=0x8_!<$2s9@&AlxTq^`erqb9rL@vP3 zmq7H;x3Tlt)ND4^P8H|2an8ySh~9EOip;YwYR_tWO9#fxp)r#V_!zcAvH{`TYmy;WVr%mkKCQxP5l_@u5Avzw*UiNbQBMPH{Ip zaOMu3xpcs}j+{lXu?g5x9udYv9!cDGoAL%rKiged@A8BMl^RJNMXX&pePc`(D<%eR z@}?^4%`y3;#N?2n{|1=}7IjA|-;YQgt?D^(t_6|bq2xNd1WvM0{t`s4V~jI&rl-CP s6?^K-(3NzUGc=zLbA}evVa^>J&+e_{2!`Lql#Va%&*un+e+rfE4=`sMy8r+H diff --git a/Game_Client/Classes/Game/Events/__pycache__/PlaceCard.cpython-311.pyc b/Game_Client/Classes/Game/Events/__pycache__/PlaceCard.cpython-311.pyc index f7eca6e1d3464d73aac0a1910f23dfafce4a5ad5..82f310179c22ddd4f38e82d224b5b06d897fa171 100644 GIT binary patch delta 503 zcmZutJ4*vW5WdIeE{Pte5|bz*i4S}WlAXb6df_T*m739RF zjCbYqLJughUI0N{TDE71h+Cr}sswJmjy96>Ru!A83Clck)UCT7!u! zf?g6~2w@n&MPVGAO0gKYBASKQY?lfawb?i%lKhq2%W-}gTHO6lX#zNG5+RVoPYl$4 z^dg(iDYa3QO+yXoE|Tg}hlJ~EEY3%@oeVxvs73fq)%BRr_o(GLY(Cf^=wnmBU~vRo fvm4GFJN8M5F0(oQpskvwJmO2gFu^~y7D4tG#8Z3) delta 465 zcmZvXKT88K7{)L6C)Yom6??Wt6xynV4t@Z&sL+BqC~>(=v<&q5ewsp1UnUB z!cvoU45I2WDjU%_K>^c~7mxlHkEG*#Uo3bNox4v*I{`M+%_7J(_+@X+yL*3yw)RjY^f0NK0e@ zOx}k+Fz5_O5i7%Ys&2DI9GZhdnt$sL$maLPdi}qoJb37$#3arHHA(x;i|%?Mabzeh zz?pP1Y3eHT-Pm diff --git a/Game_Client/Classes/Game/__pycache__/Player.cpython-311.pyc b/Game_Client/Classes/Game/__pycache__/Player.cpython-311.pyc index 81c3a644fd50532d6fc7a6864074b10fe649fa97..3a363f148ecbcd5ba5a8ed7d84b5d9ea8cdf63a3 100644 GIT binary patch delta 987 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 P^lw~|`5*tO%A$V&q670K delta 2170 zcmd5-T}&fY6u!5ewln=1y8Y#6XbX}R1fg5%x&cDBq0zXDZ2XNTU>0bNEl_Y~#HFyZ z>ONr7MB+&_F+S9d!BrB2R+D|;0iWD#BAISx18zd1?u+_FbsvmRo|$gDYTOs)fisye z_nz~8=bp)&GxKZwjbZ*{hr>$Hc6UBXd73`wr_J7>p}x^)q?9O)J|(A8^P`EBG$j|` zH(#R78r6vRZv$pR-XlvSqiJ<3P-rpwmSt1bK}bfU>XtMljcW!%*72?wN}1|fwpCYz zB$=csXAz%}4VRBV-s zi`d_mJ6j_uus9nY27Mg7&Ne}r4?@_*!(&#TA!&mjSU0N=Aqt>i^=m|;5h;OlbzO!+ z9gK7L!$})wC^&K1ddI_6MFhf5Uqyv{c-!i-X8soAwTxA(h za{4)3r#CeSVI+MKp~I*X?m~x8bZZJunj3#Lt0fhK+TQYPYEqsRBcca)qV~BEodmMB ze)!Bb2xVJhc>@z)Ap2IrIr8=$HgKH{D8cYoN5Aaea&IL|k<)7A^wp=;$IsrFcu7gm zD6?~lc&;?DpiV55*qqAd6gIcZ+W)I|`TvLyK)ZZkPwd%}OOatUGJG|uj*Q=!Oe>kJ zGWW6~EtDp6>SV6OE~@OJ!Y+Q#yYksG@o;Usc4zUF{YlDiV$0)SfhNeRacrmfspFQ3 z-g<}k!!_2cH~dAu7fNmqy#zg6m`#wemGkB$Gkj?E0e{40;0V0nX+Mt5YR6Zs+md-o z>med~<^GCCLu3T1yCrkw&jMd~-ZZ_nYRrEJecm7KVi*Z}H;Kog%eP1S!Rmj6_Q4bW z2KVpSeAq24@d^8+n|r8Cy5YQkkaiX~{ZRw;K)K%kLB@WfuI<8qt&K;M-_DHK;jaU~RoUm9OL zI!5sr{Vb^-3;VVsIuc;E1J*N)WxL%q60>Z_OlKIFZ#qTK!q-im^()Ad90(W4ZbN8= z$@43Ci7{Y=EFA<%Xr+00S7@OzxFU?z_i9h8&k7@_XHqv!L({X9Q{pjru(`|Crv)c8 zXh-;jV3w)oZ|Wi@tf&SVhzFuHR-6w!PaCruIi^7;!XNCw%xvC~XO06zz>#ZDTi RZ=d`-mUaK_dqnl5e*$n&;B5c^