From 3279713778ba6b86360c13b5d5276cd48230fd9f Mon Sep 17 00:00:00 2001 From: steev Date: Tue, 12 Dec 2023 21:12:37 +0100 Subject: [PATCH] simplyfied y world positioning --- Game_Client/Classes/Objects/World.py | 52 +++++++++--------- .../Objects/__pycache__/World.cpython-311.pyc | Bin 5362 -> 5391 bytes Game_Client/Classes/System/App.py | 2 +- .../System/__pycache__/App.cpython-311.pyc | Bin 6369 -> 6230 bytes 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Game_Client/Classes/Objects/World.py b/Game_Client/Classes/Objects/World.py index a1f3a58..4a82b34 100644 --- a/Game_Client/Classes/Objects/World.py +++ b/Game_Client/Classes/Objects/World.py @@ -3,11 +3,11 @@ from Classes.Objects.BoardField import BoardField class World(): __boardFields:list - __cardWidth:int = 200 - __cardHeight:int = 250 + __cardWidth:int = 150 + __cardHeight:int = 200 __cardOffset:int = 400 - def __init__(self, cardWidth:int=200, cardHeight:int=250, cardOffset:int=400): + def __init__(self, cardWidth:int=150, cardHeight:int=200, cardOffset:int=400): self.__boardFields = [] self.__cardWidth = cardWidth self.__cardHeight = cardHeight @@ -18,31 +18,33 @@ class World(): # TODO: rebuild these to use the BoardField Class and to append them to the __boardFields list # construct elements arround the playerfield # Todo add lifepoint label for player and enemy and make them scriptable - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), 15) - self.__boardFields.append(BoardField("EnemyDeck", "Enemy", "Deck", pVector, (self.__cardWidth, self.__cardHeight), (0,255,0))) - - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), (self.__cardHeight + 25)) - self.__boardFields.append(BoardField("EnemyGraveyard", "Enemy", "Grave", pVector, (self.__cardWidth, self.__cardHeight), (0,255,0))) + pRow1Height = ((2 * self.__cardHeight) + 60) + pRow2Height = ((2 * self.__cardHeight) + self.__cardHeight + 70) + eRow1Height = 15 + eRow2Height = (self.__cardHeight + 25) - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), ((2 * self.__cardHeight) + 60)) - self.__boardFields.append(BoardField("PlayerDeck", "Player", "Deck", pVector, (self.__cardWidth, self.__cardHeight), (255,0,0))) - - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), ((2 * self.__cardHeight) + self.__cardHeight + 70)) - self.__boardFields.append(BoardField("PlayerGraveyard", "Player", "Grave", pVector, (self.__cardWidth, self.__cardHeight), (255,0,0))) + + eDeckPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), 15) + eGravePos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), (self.__cardHeight + 25)) + pGravePos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), pRow1Height) + pDeckPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), pRow2Height) + + self.__boardFields.append(BoardField("EnemyDeck", "Enemy", "Deck", eDeckPos, (self.__cardWidth, self.__cardHeight), (0,255,0))) + self.__boardFields.append(BoardField("EnemyGraveyard", "Enemy", "Grave", eGravePos, (self.__cardWidth, self.__cardHeight), (0,255,0))) + self.__boardFields.append(BoardField("PlayerDeck", "Player", "Deck", pDeckPos, (self.__cardWidth, self.__cardHeight), (255,0,0))) + self.__boardFields.append(BoardField("PlayerGraveyard", "Player", "Grave", pGravePos, (self.__cardWidth, self.__cardHeight), (255,0,200))) for i in range(5): - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * i)), ((2 * self.__cardHeight) + 60)) - self.__boardFields.append(BoardField("PlayerMonsterField-"+str(i), "Player", "MonsterField",pVector,(self.__cardWidth, self.__cardHeight),(255,255,255))) - - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * i)), ((2 * self.__cardHeight) + self.__cardHeight + 70)) - self.__boardFields.append(BoardField("PlayerMonsterField-"+str(i), "Player", "EffectField", pVector, (self.__cardWidth, self.__cardHeight), (255,255,255))) - - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * (i+1)), 15), (self.__cardWidth, self.__cardHeight)) - self.__boardFields.append(BoardField("EnemyMonsterField-"+str(i), "Enemy", "MonsterField", pVector, (self.__cardWidth, self.__cardHeight), (255,255,255))) - - pVector = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * (i+1))), (self.__cardHeight + 25)) - self.__boardFields.append(BoardField("EnemySpellTrapField-"+str(i), "Enemy", "EffectField", pVector, (self.__cardWidth, self.__cardHeight), (255,255,255))) - + pMonsterPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * i)), pRow1Height) + pEffectPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * i)), pRow2Height) + eMonsterPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * (i+1)), eRow1Height)) + eEffectPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * (i+1))), eRow2Height) + + self.__boardFields.append(BoardField("PlayerMonsterField-"+str(i), "Player", "MonsterField", pMonsterPos, (self.__cardWidth, self.__cardHeight), (255,255,255))) + self.__boardFields.append(BoardField("PlayerEffectField-"+str(i), "Player", "EffectField", pEffectPos, (self.__cardWidth, self.__cardHeight), (255,255,255))) + self.__boardFields.append(BoardField("EnemyMonsterField-"+str(i), "Enemy", "MonsterField", eMonsterPos, (self.__cardWidth, self.__cardHeight), (255,255,255))) + self.__boardFields.append(BoardField("EnemySpellTrapField-"+str(i), "Enemy", "EffectField", eEffectPos, (self.__cardWidth, self.__cardHeight), (255,255,255))) + pass def getBoardFields(self) -> list: return self.__boardFields diff --git a/Game_Client/Classes/Objects/__pycache__/World.cpython-311.pyc b/Game_Client/Classes/Objects/__pycache__/World.cpython-311.pyc index e0a6152adfb3ad89309d5a6eaa0cf3c127d7b18b..c934dd5c73dc88099cf998fa6008563fe362bf48 100644 GIT binary patch literal 5391 zcmcgwU2GHC6`mQ7ow4IMKQ>8h{*uC$HEK`;bOm%9ei9N0kg#zevEwi@o=IZIv7MO- zkgTKTfrmWwA(d8zhn1R_r66ARF;5jM?MiO7mF}RCNJm0Ks``+(AhuG)OMA{8+p*1( zU4F#%_}p{u&v(u}_spF$^Ow3h7XxMKueap?x*6tQC=?4{U|t*r<_;q<5}RToSaT_M zhKq14!!dn~WV_8s{5_6g9>U)$5u3z@n4oN|{y{WwYoSc}P(h@6db;sbugeq$rFJZ>UD0s|tmS9X5verzC zw+6?HTLE*x=L}8Ejebj9JScY+ym}m zNn&BUL(BtqAZS+{(5eVXFlLlmAg1T~Tp}g)#b#vctRQdls+^ioJUF5rNdpiSHMK!` z+1q_0dPS8LHL7Z|d?VT;tJ7L08y!ri5@}f+?(T~snAn|4$Z0LworAwbBMLOmb`Mm}IFPW|cNha^Nhf25q2R)qS{Ve>c2WEv&rH7aebfFBI*~ zu~m3A?}*1$;R&z;@QqbgF@j$y8ir}1NKVNm)#mKwJ}&nGoEq+Xfby_}bPwX>VJTKv zxEbF_UmfW4qD=UVyJ3;jqi1RO`y+{tJy}McYA$WV{vaF&V@>E_b@B$ z_}>?uZxb^)=WAoo^^SPeF7+vr7tC+&tG3C$pAFUFebJe!th=6mG$v}vcT$)gaoDRj*L zU<~C<5AE$!VmIV@NR>=GWlh)RRBT>WD1gJ_VeY=-G;40X)lr&UF~W&f;W@tGwT4~F zq#;F7Xv*4Qy357lM2e4Op~;$ac47k3l){wSGHIcS+FcIPvEZX^p{$%r4J)y%H7)3( z*_G+Y&QC%jWY$~-#Ef#7rdw9_h0h+-5zA)fw4`8KVA_>fdQvuRs-^@ziVvG=vqPDi zorP4A3Wtk=T;791u}6^6ftNF?>6EFLD4Q*@Lblk?CO|=9H8{wXwHAwftz6zAmpW9; z2{8%WD#{LMQtmUMc3+4W8cv=pK<(r{)~QnfDDE7 zVl)AU3P9iVKlD$B*Q1cIIn*@1Fq}dxZ#a23(o{MWUWtx_Qyi|R|oHptsQvuN&XnQ z8ZoX;kg1e0HBYWAY+}0E%ROh9eSO>ylmhQOhdfZ|2D)B>L^^)Ab~9f?K8uj?m@z&> zGAaztvZrzMIC}=G9_|vw9H5v3$U6rq<{-r!tirq>T|4&ZYJQZAMvc)al1v-P&&fy* zkbcjeqe$l|(s_#1Pm%g5QhyZ^>F9bS8F9VFAv?{ZyfyXBi=Z5nS`$Br(h=| z`pJlXaEx3_=z*jWNG@M^>fih2p8Gx{cw$X6P7acxVg2MV84c@QVLb?5o6`LW!=G60 z|8c~~7>SPSk#YUxHT|GSVkr`w(F18CkbWI>I6}svdN`_gjqAZ{Fhlpx82*{%{%7t6 z!@cK;`=iJ1kG@Kh&ff3TeCIbezP+J$UdrDh;YpIv$j#5eL$|=s;F^ApZdpG!hSE(o ziq$o48hvyig+2lbeBBK4K%pDxdX=8D-^KIo-%NZvp?6-)PmxiXOwJPR7EGCA&*Gdu z?g9ezaib_{Y#6ICZi?zjP(2B%CrR}rsh;HadM3#T=uybrJRskIs0PS$+(iU9$591y zYy=yl9K}9Bv4P@xrm3E3s%QEYJ$?VMZ?uN}B5M4CR zlomLsOot+Cb4t46%@Lm{ctpQw0CET44xqM5h*6q=3$paZ`T8U zXA`w}L{_%`8pf;mehTlq^77Q7V}SdE`lnb1arHfq8EJgM=)uE3`)MyUf5^x&t1G=5?b zO_wOnWTd$i@@`R_or|RkJ$x#mYG%DC#?tAG7Sj@t42U9q{F=5zTHE>pqBJ8kKEjmK zNV<`n1@eHQCRmR+OmY+?m{Y0GfGm~$)|;9MkC)CjuQ&UbF09xH?}tn0{p&4(rHdEmn79LWROxdy=OR4;mrm@o|fx3tRx7|%P%@&*ZFKPYL#Ia?|G8jdqWZC*N zDcP~s?fT$D4tsEc0PbNI@TJ)Xx$M!$6lehz=mNulKm-DNDsu46g}avki}t;tBuh@$ zP8+8kQE%QG&b;~Fd&8MW{Mon%}%+5Q&tP`2YT!I9#<`Z0! z5Aq!0$pDdUt3(#=@q|2pzg2=ZnHwd3`xc7Be$K4FoDQpUe_Tn(ky0O4)s=*uRbbYM zLV}!3g8Ud!Y>FUr7ok<=gLcIMl8s41u#QP~COLv4lj@k{kwKE3@UK@KQHR{HY7aVP z*D49t%Z-XH%FFImA=m)C1NbK3T_yeq@QrdaVD_5!Kw3@6rdMLMB;Be&*R~1($ZRg( ziGWRkxSXBYdW!9y>h>#2JT{ZvTI2TK7>PzTC2Kk>gUxzmt^O8ob%~S%0J_1`gxKJ} z69uwPVq}>}z*%LP0|_Q7NjylEP%PU(!jY^jlZ|Svd4gd$^G_0nu=#4k%CidoF~=G)2`yT2@gO zLcNMMmrZ9vBdJ6@rARk=212Mz>Pf_vR5sL;2y2?6g+^}8Dv_)fVv}@bmP}ES;;DF6 zlJah=tt=xn?E;V$Qapa*j$nxG#ba+^-CBJ0G}djET68@Yk3ABP>EdxiJWk8k4vZ#| ziW5O-fIoA23RdYl$yVK)t?v|JChj zsKmonZ4tK0jfY^BTW&faN=IHol=iWz#!85q+)l1Z%-14k&v}!4bl+9|%HhX$U&RA1G!EaMppC6!)#kFB?H|sK>h8L72NUlsfW4G{_-D3SQ zUo`7KOoW#dl__;tJm@=KR%Pky$DU2r-HO7z*J>C_ry!+KSz>$EbXALGO-vmUv!O2< zg@lH6-oleP?_n^jN1e?dWo@GwC6TzHhBKCGf4%9*EX5#6GV8`cM_PT0rD9fQhG)L% z2xl@%N>*{fvs}%ztKn2kF>P8_1u(dAnROX!w8_Oa>nBI)_=N76G(3}c>WZQZaAbP1IPn~+d!Xq zTKAbTFl7X0=v-0{By~^P@TB)nP0#*mbFolIuT9V?$(Wj>$$2CBF%A9|v|r{wV3QBB z$p?{l4zbCH*yKY8Og=G5LpP03QlCiDc})*!x+iCNa(f|s9@;$raJ&$p2sTFJNh6-8 z<9`7FA9Di?z!e7I3IlMJ0l3NlT>Uu!a^N+U>p>+GP=We>o~fMRSmk{mH3Qv?kDh(+ zp;$OWM}u@aY)mI56#ouqCT~# z`<4vf(w%{#>xkic?Xm0BBiE_VW@&f-S6ZR_i-j*2^zNa;Z8{mFGif?+nOp+MoY>2c zA)a||9IF5?BhoVpA_WS3V-$Iya2x28=ZCih;})!dg`k4*@AGWUgg92UFy8<@7=0Ac zs|%n|vm({Uv#|H^47SPzQ2ityW$0rJeT<=>Vd!TV`k9|bKOUeHllu6i{%%k|Jw>M_ zdg>;P#EghWb7dPqd&F85Eo@?-&!X=8DpKhDBKl=i?;b3~XaFAE)WJTV;F+J#Fh2uD zpEC=9qR(T`g<6UjQif_dUCQacMZ>rFEWCk#+X|Pyc6{T|yNBtA0XlhDUPZ*<;TBxL z)?!wDum_qBRmtYmRLwgg?&7$Q?i>NK4lm`iP+Mh`sLjCnIra*DpJN-ah6AiE*L25} z?Cxg~t-Slzwst{(4c|oJ&9=#FG<8z3lfn7X;l zj=cnKb$+U0Yv=zZmi=h8Ur>JsmDyhUa?@4%a?`cDysfl^`RUKlb=P-K#fw&u-cv8b o4P2Vqbs*a|j^m1?afSVgq?^`W+d?-7*q$ZdVcYjVaf8kIBP85`y8r+H diff --git a/Game_Client/Classes/System/App.py b/Game_Client/Classes/System/App.py index 8e83619..6af8407 100644 --- a/Game_Client/Classes/System/App.py +++ b/Game_Client/Classes/System/App.py @@ -33,7 +33,7 @@ class App: # create sprite groups self.cards = pygame.sprite.Group() - testMonsterCard = MonsterCard(pygame.Vector2(500,500), "Assets/Cards/MonsterCards/testmonstercard/", self.__inputHandler) + testMonsterCard = MonsterCard(pygame.Vector2(500, 850), "Assets/Cards/MonsterCards/testmonstercard/", self.__inputHandler) self.cards.add(testMonsterCard) while self.__running: diff --git a/Game_Client/Classes/System/__pycache__/App.cpython-311.pyc b/Game_Client/Classes/System/__pycache__/App.cpython-311.pyc index 355ac301a3e78712e25756d3b0083ba112ee324c..460e4e36cf2e7e103b00941752ed2a25777ce4a9 100644 GIT binary patch delta 836 zcmZ`$T}YEr7(VBl-}gEFe%zn?%gp?po1jKNP)^Y@A{)*>A`=t$A=Bx`*94UfqpLuL z!F%CF39~ZEgc5IzpeUism_tf-l|&a_L>qbKRp-p~%3e6ndCvQHp7)&Hy05j;vMA;u zVwc}fDD%>q^o)g7MrM2(_{9FeIpE=n);GBxoX2|n`xqgAhi3hB?mb*wx>e!cu5c%s z0*NtoAE6*_W-7>#c(~-}|O_A|mkilM&b!aD4G{K@|!V(Nf zE-AtdYmZX<&5)7K=Ua}>aVu4eZLlkv#bXKCYe^|A$p-Cc49~ucF|%#-Ell>K$`OV# zwK~EKpMu|V=Y=^R>O>B$N2P(T6xSXYm{io1a4R@=Kdh*&ekI^jb4YBD{$J}JmG3Bm ziGr||A5y{{%3wG}NvGeZWJ%X#2n5|`*$ip;0PUFUX=KsXW+*(mwjrxtpi^d{x1 zG%~{wBFS^K(SrQv1cYU9RO(%F_ltRsjM-tKSSzNEKr%iF*0?N1DblHO1{8~W+0 zhl_?^yq#W~J`GOeO}>sOBw8VAY{y;j#puMh;lQ|p@4}L41>b=7LJRHzf8l4@%96xm wxCCx<$~HjWMJ=IFOyD5*%4pCx9#Gus5Y$^jjola*rqRim$@=&I6U{dL3xT}c3;+NC delta 955 zcmZ`$Ur1A76#u?EcdyfJcXQ6ot?AY2{4*6T42s63RT9RAq$!kXf3|XKI=k*6W5d-` z!4T^_^injJv@#)LRK8^iQ4zR}kz-I05#)okg+Y(qtISIBgYU;Vzw>?P{LVQaT0ghR zqcT|$;*as^B_~Tik>3+5@qGfJNBrG54gy|@zhDvANkeRr?8V{&yK4={jD@Fgr7B^v zq)e7Ldm%o2aSfpnyr0M+q_+~hqqoK)5*=2A#0cF&etZy35hq^+2pFKt;cL-V5y7

=k2#pkHi0O=>)5(rD%@Dec6LDk&=dA~O8PZ_{M{Ad*1}#|FPWagq3=^fC@4%%y(6FQ z!up=LMnB;;K#1<%{nCNDQG>+J34xxB)aD%-^EtT=m(%0m3V1FRe~KT@HvS7Hj7Cyg`&!>$6BFY0U|6?NFL7 z4PCy|d;3I^uFs-!xUOu*8hEbUNzrOA&LJAIN*$I%aY@rekwIVt42wT9wP9y;I5Ir# zo$)T4tVxq~VNb$jOPOp5#-3vAamJoD)<-Q7%QQQ~E*sgTkzJ4^jGZZCXATusd2za~ zDH@0brYB}5=3A0=hjWOk_2M@@Oa1Tq-wwPVh!1*_HqQo|Hn%?3SY|B`**SK8C~5A< zBC^4Yf0C$q7tEEcQk8<-Y&C>cN2qqbGrmXoq3XiN;6SMv9|v#gEFJ)zdREsdOj0!F z<2Z)5IAI@Ls{noQN&TAEi}}Bsun%Ho8GHsNHCj9bQOzjZhjCdJ{U3Ad{Mt5Au8Obn E8%A^oHvj+t