From 386aaddae3aa1117c4a28740a61bc6acc91a5c4c Mon Sep 17 00:00:00 2001 From: steev Date: Tue, 12 Dec 2023 22:30:44 +0100 Subject: [PATCH] made progress on card resizing --- Game_Client/Assets/Arena/field.png | Bin 0 -> 612 bytes Game_Client/Classes/Objects/BoardField.py | 17 ++++++++++++----- Game_Client/Classes/Objects/World.py | 14 ++++++-------- .../__pycache__/BoardField.cpython-311.pyc | Bin 3629 -> 4232 bytes .../Objects/__pycache__/World.cpython-311.pyc | Bin 5391 -> 5354 bytes Game_Client/Classes/System/App.py | 8 +++++--- .../System/__pycache__/App.cpython-311.pyc | Bin 6230 -> 5645 bytes 7 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 Game_Client/Assets/Arena/field.png diff --git a/Game_Client/Assets/Arena/field.png b/Game_Client/Assets/Arena/field.png new file mode 100644 index 0000000000000000000000000000000000000000..472f0a12fdbcaa451d9a8e19d34e8284e4fb1d56 GIT binary patch literal 612 zcmeAS@N?(olHy`uVBq!ia0vp^(}4H{2OE&&YL!T3U|`brba4!+nDh3^Ma~un0oH?& zi+BE6Y&hGLRyG&c@kk-#(m}cX^?lmEFck=LN+$6DJCcFe0M*+}kbRul>1a o_c63aN9d4};)o;u<)`Ug-pZab=h|0sVCrG;boFyt=akR{0KU7UqyPW_ literal 0 HcmV?d00001 diff --git a/Game_Client/Classes/Objects/BoardField.py b/Game_Client/Classes/Objects/BoardField.py index fb336bd..8bb3e03 100644 --- a/Game_Client/Classes/Objects/BoardField.py +++ b/Game_Client/Classes/Objects/BoardField.py @@ -1,22 +1,26 @@ import pygame -class BoardField(): +class BoardField(pygame.sprite.Sprite): __name:str __side:str __type:str __pos:pygame.Vector2 __size:tuple __color:tuple = (255,255,255) - _rect:pygame.Rect + image:pygame.image + rect:pygame.rect - def __init__(self, name:str, side:str, type:str, pos:pygame.Vector2, size:tuple, color:tuple): + def __init__(self, name:str, side:str, type:str, pos:pygame.Vector2, size:tuple, color:tuple, imagePath:str="Assets/Arena/field.png"): + pygame.sprite.Sprite.__init__(self) self.__name = name self.__side = side self.__type = type self.__pos = pos self.__size = size self.__color = color - self.__rect = pygame.Rect(pos.x, pos.y, size[0], size[1]) + self.image = pygame.image.load(imagePath).convert_alpha() + self.rect = self.image.get_rect() + self.rect.center = self.__pos def getName(self) -> str: return self.__name @@ -37,7 +41,10 @@ class BoardField(): return self.__color def getRect(self) -> pygame.Rect: - return self.__rect + return self.rect + + def getImage(self) -> pygame.image: + return self.image def setName(self, name:str) -> str: self.__name = name diff --git a/Game_Client/Classes/Objects/World.py b/Game_Client/Classes/Objects/World.py index 4a82b34..9109bc4 100644 --- a/Game_Client/Classes/Objects/World.py +++ b/Game_Client/Classes/Objects/World.py @@ -15,17 +15,15 @@ class World(): self.buildGameWorld() def buildGameWorld(self): - # 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 - pRow1Height = ((2 * self.__cardHeight) + 60) - pRow2Height = ((2 * self.__cardHeight) + self.__cardHeight + 70) - eRow1Height = 15 - eRow2Height = (self.__cardHeight + 25) + eRow1Height = 105 + eRow2Height = (self.__cardHeight + 110) + pRow1Height = ((2 * self.__cardHeight) + 145) + pRow2Height = ((2 * self.__cardHeight) + self.__cardHeight + 150) - - eDeckPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), 15) - eGravePos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), (self.__cardHeight + 25)) + eDeckPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), eRow1Height) + eGravePos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 0)), eRow2Height) pGravePos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), pRow1Height) pDeckPos = pygame.Vector2((self.__cardOffset + ((self.__cardWidth + 10) * 5)), pRow2Height) diff --git a/Game_Client/Classes/Objects/__pycache__/BoardField.cpython-311.pyc b/Game_Client/Classes/Objects/__pycache__/BoardField.cpython-311.pyc index 1481fa3ee8dd3a9c03e8d162c8e9e9acd56137b9..f4e31120ff5bb51f601ad035591c1d02f13f2bc2 100644 GIT binary patch literal 4232 zcmbtX&2JM&6d&7bd-LIZ+K%G{NI(g7Lqh>kwTME~6w;_o!y`& z^}$FSI7Dg>k;owjpJ)+1^w>lHfLVVj5fUsBFP|i)lVhQau+jEGTcC@(Ien z1W&CCdXkU@LHUVN0}HZ7T+r5SYtWT#nTVO>&}$R3j;kG-Pwm7L!qcTS*igH*pxT3{ zSM%NOQu`kG7dq5_&|WqCKw9Xu=?LhMO-Dg@fo@m@+5?bwLmC7f1KnfOgP?nbcAw)b zG~$r<3u!$9NQWQ|3t!0tNgW0s5k6b|5%5u$|IL0#>QU$nh^WXHNj(NWCL*->5%7cR zDBju$v;D(-imO*MT2?iCm3>B0a;dwTOQdI1x5!v2Xl75-#6n(gnYXGXe9!+w^qgLe z0A^p)taLt`=cYe%H?^pl64%nki|CZDYleP$ifg&l>D%PvWFfa`O2Rcscq0i1d}I@X zRn7EU3$=-bZlsJmY1v6SFqJJmds$JEM#IoSrCzR=d4nP=vd5VHwB8yXR`e8^A~`xm zFF2>USkVWrUeHAeT(GX`2Uqv67ywrXXB_tKL+vCVGxB< zU$w}V>U23&S7{(x=5{%Qn7bbjTdKvc+jpPPyTf5>9b*3d@wT`IKsg()rvyjT=fTTey=l3sr!ORL=^EFQx}j&czS_*P`R zyi$#v*^ZpqiCo@_T&_l@wj)zwLO8ZQyAwXS6+T%FC$_^02-|8y$2Knzu`S0c;@*Qx z$RXE^Wu8md>l{L&MgLGPAEAbpfURqu@c~dzJmMV!jeyf>!U!J)G=q3Wb4c21UqdQv z*&r15s02%_*4@AMeMOG*<6vLWc*0}V&N!yJP0wTVa+@aEFm(AF1P);kVTw9E$ly(E zjc$V^JN7yT5uxY_x4{4sc_Xi{_BQ7hB8sXZwW}3*@Q{&;K6D$Vw>poF*BvRz#$G2< zq*nC2+aPuNG#wUAE#(O5Me6&7RIJEDhlv(xrsm{s;}q@ZXmNM6B%5e9y@Fmkq-omb zT1->ipU~;(j#~&PY0BFKL=}5MITz8QXODtF&(c}tj2+a$oL*bPEBaS#oI0&A;&d^N zAgjsBeAt=7y|@ zqk~$|$q)&ed_bd!%aTr$34SjQ(i+M0X{!hx19 zwPhkThs%%c0>c3>Hh)gJcATK2waEz?23tGV5l)f1ogC{xqvX^Zcn&Q|-xi6uiLV9v z0#p>UT~Y4l)#WVFor?19aw=<&_;iDt-HMXRjOEV9zRHRYd zRcW*awNn)-in}UBYi-?YLlr5EyDEiurFQ@LE(6$@7O0#S=vSXWzeRsPDu_Qcfhu2q zW#MdIU^j?){6ic4y9~$;0*4)nZv-~GXtlT-h$SO#L&7+QhBwA&XxI%fG`JDn6b=s3 zU?ad_d}Dm`6vYT?SOPkf0lYOd2OF4GT34(!5=0#9r;jQgcgl{>5k*^|sK*!bMXPl#@#~P$ qPN#ncuqoYG$Nmw+|Gq>?nEW5?AXh~I literal 3629 zcmbtWO>7fK6rS~tf3WlK*a?n7NmJUosHg=|wFsd?S|U*t+6H<^Ep6S*fExI zeJ~OS4je0yLk>Aq6a)tjJ#avrdvv5qjaKTZm*(awJ#lHjH@oYfbt;uG_P%-V&D;6j zym{~0KlS&=8OEO*H|1|(#{M9|AKYVh-vV=w2_}pZTVNqJ%S7ll6XyL8V~_B-W5E!{ zJj?MN66Y2@t)BWkVOJQmlVq@E3!y7anvx6SG?q0NYH_CK!b=f<8`yEJi-HRiCn5_m zNmA6aJ_+4w1DjFp zJE3wh0XaqI(8ye5A*aP5+`?feey&nb;(Sq-gfncl1EEE2WBZ!j_VYRflVEuJO2rFlkpP)}#~Gri)Sk9x)Sd z;@N!;a*x%F8neK;qZWdMjPfKCQY#y491^{$M=cD=&u3PPKti^=quTFtj4idWYkVo@ z>%q5fvKAJ`L4Sck3bm#CKzP(fVV15fG8PPXV$LaYZ-+e2B@{WJD8ChfDne5PqY@xa zWO?-(-4p+U!e-objMYHwDW16~LMKaC6`es15E&#gL}ZxA2#8GplkRx&>CCD86{#%XRQC2fNS$q`Gk5siL|{sdLmBs#V_8Ujzo)Z5T;H7j@yLVZB;p}T89f$FBDH!b1ec~*G$-Cb-Vi|P^;{S(MlQ7R2?v=j= zJ_tRJA`C*4ZXCAibt3x!#4&Yx?FD!lB_0GM9R*|GfHJgF|9ATZtPJlad}q@E>h84wHT%*?Sa{ zr+XWAyVRQ6O`)rvUdb!^r{a4>jj+e7o|K1Iq&o&<^*#|@V=vhdK5++a1hs^etp#V46YyNgl3X&1%IxTf7A;<={Y0q^@n7+pR^;XqHJcsd=L z{l$my_3)i|7n1LU{(0(5ofrUni^o@wu&-im2gl{08rg>t!4EmVt@vTa$4TD%ke5`|Jx$DMF>Ww|8X3QuE2Wr<7^ zd4ouf$WbCXcitoJ1d)?OJ|IHgD*7X;&VW30b4&l!C{9`;RCM+vB2e%6Y$pcl7wQ*o zUD$((58XZ1;N$pi@$v1%Q2k>4;;oC@qf_q8W!I0;QZ`8RTj`A+2i^BVIKYV}!?fv6n(rVnvY2))+^J)c-fO}lv!32S*uXqE z|9DO_L8A9Lso&kaqNgB%MRr{;Wj9x75l8tCq8pP=8PpD?s+&XSiKCvS^Xf(Hw43s0 k)GTz=n(U82nxF|9LL|AnVlK;?YQpjxU;UJ?xA!97d9;-%G9(pG9$62y-4(C)i8ypQb>Zt zQl2dN1=Xoz2_6D39iy`cS2i#&(V>GK!k|;9es9;J)gH{}{eIuy`@TQ(-jlX(p7q+Y zf&|;g&HMh!s`a7Y=BBUnD*S@Jp3^zY2eMT>lqcCBw|q6H@anvlWfCaMJz6(a;h{E6 zwT*49L%~EhFo7G!D5bD&WaO}os5zw6PU6~o(-MlrDnb}AADpB~_#8|kDLc)QQZ57f z*f^eVoq3H>RCk$wedb@8{ctfOFIPfy!#ZppWh$XTUjuykoEi)-%aMMo351b|zMVB1* z$Jb~di=_|wnzqcQN}qgTmA+SYOKayLU-OpPEMh2L^;CiHfQTvy2H)*#$3rr#m9Qnw zOY}%wK&+9H56{7)E8&JfWS{)S8K6$qlG6%&FT~SC8%#KDiOW(c$@1s_GSA+f;qy~| Zm$(A!PU>WuCilrv{E*tu{}f77{RT+4ydMAn delta 892 zcmZvaO-vI(6vt;jx-H!s%2 zNaW-P@1Qr2%FTp>o(wTDXyT!p>;Z{)Q%{&+B6x9TAq|R?>~G%t&-?GpV5EqAGO^Cofu?s5x$jX}7%zMIb$rE6}-^U5CG|z-Bu4L+L*A<+E@-W9WdJq*1R%gFQ5+nm=Pg;PFt6IIa(Uo}f%mm%~)AyXvBp+|2?US^6Xvli_HIwp&F cwqSRXA$X{tINQc$Hqk-+VA|Gy7QA2m0jYPo9&dCdS^q7iXPFCQFVT#=~xq-)zt!QEm`vU&S6WN3( zH!$<_r7&kRfvhR21PTivgjt}%i8X8p;mI+)oYtN->{*;3Eg+C32%#AmK-R(7@yMb= zFwq6VFymQj*yDvJ_wgx8vn^v}U|0>r5WvXLvwH$#4+jv>1o=u{1SSJ@j#dp*mMBat zg?;igeq&ioGbDieZ>2B8ZC^ zlJg5HCqEWwQn>+C)WC29~dMjcM9qqBE)P->d%MEGyIhNO@4KGO>ZqU3aZF5E1<^uzdq|0PpAsu!X#t#e}vM!Sy zgk%gqFt97SFy2ttSzf!Sc47UJ`W+gV)SW&su&Dw?wGGzWuCiTezs7z?-X(3H4-BlD zE|YtOq}+feurW9=x-#ymx?&%&!ex!;6&;%!R(5-|_UrG`zi8!s#maky>l*JHItJHu zY%b~8>OG+DJoI`hF6gch%f*VL6h%^9^;p01!{&9Hj_7t-2&?D6PI92 cnY>)Qz&@OjQS1W)cJd=w{0k1*B1NDr00c12KL7v# delta 1199 zcmZ`%UrbY17(eGiZ~4g29+Tp1wale^!Bul&s|mRZWlsfet#1|0xbKmvAwIcE40epvP!+{F9JE%;*j znC@nhO|Y1Q`>?@aDxQPlFL;)LPz5`ui1&@UMAk8Bm5DKeTuMQ0frh!9PL zFzpb<+eAfz-65-vj&9NX;R%H z1mGH3TjO1GC%;>x-e*3>ERyKgwljc*7*^h*T}rTgskR@n;5%HsUH{*R5F`L^)od1O zw9=V{TDs)`aj{(ut)Owo`@6yC;B17f+jGq9ar~&P#%|O6zG+r-g5mdQSf~U$D-PHF zFP~W}xqmqXP5?(Ko~hW+J*S_b=Q(YXqYf`u{NOH)i$P&>EGkBFy2;VtL^!7#j|9(z zb4BAqT%_rW)kNgj(XbE?iz0O(wos(_^u%}^_Zh!yxJ0@(1F~jY9#~7ADiz;%XN}df z)4vYRpOlRU^T2}FjIGd&>rL(ZqfiB$ISPL+&f4trA7^ZBvaRigL$bLPn@a_Tnkb$! zAw4xKsf*%e)1H(H^z~7gZ9-R*e*x!g5(pV{+QAqdvY!nPk(d%6#!GPi+Qo7RH}NI^|w?XlLugc`GP5M1tmfsHKB@d z{m@Uj)bk&J1$N$hGR1kf%pMo;30haHTJU zJTme~s9QnZ8FWlW$Np`9bR-=Z$^=4kAS4CG6gndk5)>q)k+89$+GxA;dvT!hGkqI* z9r8|isd51N@MdKT{1P|rT82Yd+O?z;d&$${RFxSH;-9MiG1lma@wWH~^VPZ9ApHXM mRM?5wEOAAmp|2;xN5wPvlsV@1L%2H+-Y?YxzWxEW;Pf@w-am=}