From 7c7615954425c613e9ae8a391490308f4384a503 Mon Sep 17 00:00:00 2001 From: Christian Bobe Date: Sat, 13 Jul 2024 11:04:40 +0200 Subject: [PATCH] Added git-hash for better debugging Added more pacman models Tried to animate them :D --- main.py | 34 +++++++-- models/pacman_1.png | Bin 681 -> 644 bytes models/pacman_1.svg | 106 +++++++++++++++++++++++++---- models/pacman_1_1.png | Bin 0 -> 718 bytes models/pacman_1_1.svg | 155 ++++++++++++++++++++++++++++++++++++++++++ models/pacman_1_2.png | Bin 0 -> 718 bytes models/pacman_1_2.svg | 155 ++++++++++++++++++++++++++++++++++++++++++ models/pacman_1_3.png | Bin 0 -> 710 bytes models/pacman_1_3.svg | 155 ++++++++++++++++++++++++++++++++++++++++++ models/pacman_1_4.png | Bin 0 -> 720 bytes models/pacman_1_4.svg | 155 ++++++++++++++++++++++++++++++++++++++++++ models/pacman_1_5.png | Bin 0 -> 645 bytes models/pacman_1_5.svg | 155 ++++++++++++++++++++++++++++++++++++++++++ 13 files changed, 897 insertions(+), 18 deletions(-) create mode 100644 models/pacman_1_1.png create mode 100644 models/pacman_1_1.svg create mode 100644 models/pacman_1_2.png create mode 100644 models/pacman_1_2.svg create mode 100644 models/pacman_1_3.png create mode 100644 models/pacman_1_3.svg create mode 100644 models/pacman_1_4.png create mode 100644 models/pacman_1_4.svg create mode 100644 models/pacman_1_5.png create mode 100644 models/pacman_1_5.svg diff --git a/main.py b/main.py index 0b959da..9a3aa78 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,6 @@ import pygame +import subprocess + pygame.init() @@ -36,14 +38,22 @@ pacman_posy = 0 pacman_movespeed = 5 pacman_startpoint = {0,0} pacman_size = 26 +pacman_animation = list() +pacman_animation.append(pygame.image.load("models/pacman_1_1.png")) +pacman_animation.append(pygame.image.load("models/pacman_1_2.png")) +pacman_animation.append(pygame.image.load("models/pacman_1_3.png")) +pacman_animation.append(pygame.image.load("models/pacman_1_4.png")) +pacman_animation.append(pygame.image.load("models/pacman_1_5.png")) + +#TODO Pacman Animation has to been added #Labels - +short_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip() +hash_label = font1.render(F"git-hash: {short_hash}", 1, SCHWARZ) #Movement movedirection = {"up":False, "down":False, "left":False, "right":False} - map1 = list() movement_map = list() @@ -79,6 +89,8 @@ print(F"Center correction: {movement_map_center}") pacman_posx += movement_map[0]["x"]+movement_map_center pacman_posy += movement_map[0]["y"]+movement_map_center +count = 0 +count2 = 0 while(gamestate==True): MAINSCREEN.fill(WEISS) @@ -128,8 +140,15 @@ while(gamestate==True): pacman_posx -= pacman_movespeed + #print(pacman_animation) - MAINSCREEN.blit(pacman, (pacman_posx,pacman_posy)) + MAINSCREEN.blit(pacman_animation[count], (pacman_posx,pacman_posy)) + print(count2) + + count += 1 + + if count == 5: count = 0 + for row in map1: #print(row) MAINSCREEN.blit(row["object"], (row["x"],row["y"])) @@ -138,7 +157,10 @@ while(gamestate==True): if(movedirection[item]==True): print(F"Pacman-Position: x:{pacman_posx} y:{pacman_posy}") - + #Adds visual character for vaild movementpath (DEBUG ONLY) + for coord in movement_map: + tmp = font1.render("X", 1, ROT) + MAINSCREEN.blit(tmp, (coord["x"], coord["y"])) pacman_pos_label = font1.render(F"x:{pacman_posx} y:{pacman_posy}", 1, SCHWARZ) @@ -146,9 +168,13 @@ while(gamestate==True): MAINSCREEN.blit(pacman_pos_label, (CENTER_X,MAINSCREEN_SIZE[1]-40)) MAINSCREEN.blit(fps_label, (CENTER_X - 150,MAINSCREEN_SIZE[1]-40)) + MAINSCREEN.blit(hash_label, (10, MAINSCREEN_SIZE[1]-40)) pygame.display.flip() clock.tick(60) + count2 += 1 + if(count2 == 60): + count2 = 0 \ No newline at end of file diff --git a/models/pacman_1.png b/models/pacman_1.png index eac5a7ec3455c739b995cc527244ee26b1178958..9febe77e560443180a4cbb40b02aec92fdf30158 100644 GIT binary patch delta 596 zcmV-a0;~P01%w45iBL{Q4GJ0x0000DNk~Le0000Q0000Q2nGNE0I5n$&XFNKe-TMU zK~zYIz1G1?6mb;5@$dWD1_qX{5s0mHi7diP?J-Jg@gga-ZQj#eJ#>(w`VY*YgCyA| z9s}F9ur3{36o~=}#Zy#XLdgW75d;sd`+FT`*DY$--PrNLzzlEZedhND-uy&WDH@}Z z6By}2Gz2sPfox_4_=d_9RwwCCe|#=hMhZgl@L4cJ2yMmRWGCKZj925$muwEQ?k+v*Xm-ZqcGKR`5|E)0!F{8(O~TqtoBTO=( zK~!jg?U=u76JZ#~KhG<1)@-766BQioC|EIc5nC|E{sA^=#-gbIfp%~Zi#07B3pGZm zt_|%V3J!{spxrF~0Eg^`ypKatO9;(f%=?rp+y@Tsxa0eMKisePPE?h?EEG=TWD?OF za2y!v?AZpsqq2_IHOkd5{ex_ge?3Ji`SalB5H7{cdWV-g%shJ=Y;*(AE3#P1K;scG z1IU1R3i<@HvlJ`MKx2$Wx5#oKi{}N(#UXPyX=ScaUTF-O6C3w$ZLyT0MJ<2?z!
  • SYA|}s>0ILDC*xc_&pJY;uz&-^+Vv?e;(RrMExA$ zB>)7^1B2Y&B3-(17VkfswzN27{ho1nKVew_z#*<$S2*CZbqPYwy21e`txHh*4hI~w zE}=a~GsOWBv&JBJ>jDS-v@QXDSQj|pn{~;4bU0M%)+LCnTUR(}y|gX?d2QX`DAl%5 zHVixJOs{@5%m;SnT8>-Te>_yCTI(6Q9Wgn?t868~Drw*Q + inkscape:current-layer="layer1" + showgrid="false"> + + + + + + + id="defs1"> + + + + + - + + + diff --git a/models/pacman_1_1.png b/models/pacman_1_1.png new file mode 100644 index 0000000000000000000000000000000000000000..63bbbe382df1c3ba1fc2fcc1db8784aa7ab5293c GIT binary patch literal 718 zcmV;<0x|uGP)u?od5s;8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10$WK$ zK~zYIwbsu|ltCQF@%MMw-Ka2ggGy3w{elRBJPH|!mq5WEd5R9|>cN8))_)KlqD;wF ziAaicv(RqgqD5IqY>^`lU&${aF2OgN`nPFbf%=64JqN=1# zZ~bA6R3lme8~}=wHFLl`Dq~n3p*1v;N3{7SR^#!~T z>jGK;S-1PS@9;hfMfq@Kui`bgz~4@DaLFCIQ}4&}80A!kqk!u#Ao?Rw-m?SFm%{$M z3F6)wS|7xmW@g1m;tX#H0Vv#+Du4S418>1jKI*gaFhWhmr#L z90Mbezdi9>C?m!-pbea<>u)GU?G%}OlZ{0&l+qZAB&JSnXATg6FIYVRAliTKDAs<+ zG7tg!@a-Jn!rfm09;~g(Qs;{xqgcAuT1y__%oc$tqW6ePH!VZ+ZjC%Z$tHmasy7k; zLz-4DPB*A<6UZAxZeagBC$K&OAR4S&0P;40Ir#*HLBqs-;pMx*YG?*Hv;}B+;=nZM zB=Cyg+n&*Of5Cyq*!mCQmPM2)4E+X`aE=fFA3_<(J_GS5IfRmtr-s1rEXsHel`u_% z9}|0>;UZvjfGCD52?C%gG!5FDbw;Fz#!w^$0pM@X>J%z3*{zqH+Z5CsT*7*5fr%_2 z<5+JMb)m)oAt14;3o3ygV4ZW=nz4v<6a8AbdWUd7ZryG;hS;kJXEQ{?U@p@<_-?IA zcgRVw_8?-a5h_rMfudy1T=EK|c7(w2Y`Sj#0@9?`rWYT@R{#J207*qoM6N<$g0#sy Ax&QzG literal 0 HcmV?d00001 diff --git a/models/pacman_1_1.svg b/models/pacman_1_1.svg new file mode 100644 index 0000000..cf11226 --- /dev/null +++ b/models/pacman_1_1.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/models/pacman_1_2.png b/models/pacman_1_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c609e71f0a7073f32d1f9977f7db260c1c4ae68f GIT binary patch literal 718 zcmV;<0x|uGP)u?od5s;8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10$WK$ zK~zYIwU$pvR8bU%zjK)hipsPIC6zXn(VtDZj4~28fr2`@YNewREu^S+(W+cTNRo}x zCJ5}!7*hl-9F$0dkco&8%vDM?Br!ph&@}h77^j&^XGWX%gA4cFbMNna_q@lsS5%dp z8u0DGNE4#ID9~~kOfSOm+;8$*&#`iWuKSaPfd)Ih z5bp!J0Lg1V{{`N}pt1yNwkuw93(9)%2NElT?)b{EjG!DVa2IgnDa5{}`dc@^=~^h? zG)~gnO!vKbdYbuTCrLu9f&f%(&h$Tjhr3f?wGNYbNYJ+~9r9#m#ruG|RY3rn4?=Y* z%*DY7l&nvU3rC1^9XJc=)D5-OqV@%ae3R8lG1SuTL{q6#+v@@ZK(Jf`5FI+T7i*_o zfMk?N?lf52=#u?3$Q6>*aAxG42RKng^EuEkND#j>ksa^=)&FV!0W_2{4^G1JrN#qP ztie1EJVqr*?9&r2kN?cKzyNuw>atoy*@);q%C{Y5&{vXgfoPz02H3p@*x&jHGJ)tM zN|bLz>2VgbL8BD+he#^{yhd~iOxU0jaRCD01rDLo1spJteBcr&OY+Fj8Ja~IbCD9E zWB6^V))~$L)&+=SxRgQwbU3d-2a1jn>8IU^W(=eI{fNDaaI!#11k6SJ!!MT$ zt_(^m(6S3LO$hZURY2uZWPYhdP#dN*G@Hxj7lE + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/models/pacman_1_3.png b/models/pacman_1_3.png new file mode 100644 index 0000000000000000000000000000000000000000..76984d8e8cb8df83a3de8eea1920ef0043aef1e4 GIT binary patch literal 710 zcmV;%0y+JOP)u?od5s;8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10#ivu zK~zYIwU*CIR8bViKj%6VRFusGk)+NlGKf~qGDvA~6Djy3SFQXpE?P)G|ATT7AxSn# zn?SH>5^EJWD3T@>Q!XMXQK%^zikcv5q0BukW~R|-#+i8U3m5LY-}BDr-Sgf%Tv1g@ zYNYc3Mp_XK0sDZuoRb7TqB4cmN&2I2N~Mvaph)`>FoOt9rJv-Fo?zty;k)zYfo}DA zAw2|y0ogQt@;kgrL2WfO>`}bt2KWc)jjR<1-R|^bxsP(J%w52>SxEiJ&UbHv(?Qs~ zV}^{kjsCH8KFn;`NrqTO5P+JUh56TCaOXK#ZN#iS;9lpJyyYoGrH6pViXZ@OhoRmF z@6%ues<&p>g`=do3Y>v_=|;PPsC`N~@1!y*h9KS1M7DHl2VH;w2$m}VqNAq{V(n`e zAO&S;Fj(8-Dg>a4lLk2MI!Fk4fO;1Z%b*LuBM(sHP|}|Wi>M}mIc#Q@@Wki5=>azB zszvn)WDe1JlmtGW(GguO7HqONRIDVhfZBH`tB7ppn+>e*1b<63(lLc|A4CTDfU=Cp z3Sw8VvVt)$J*dPHbqZ7k1P}tCO{nDBfSxyynQ#bFLh{hi7h6J^c99aNXZ&rp*BQ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/models/pacman_1_4.png b/models/pacman_1_4.png new file mode 100644 index 0000000000000000000000000000000000000000..72670f69eb39a691affadd968bf76dda4a13fdbc GIT binary patch literal 720 zcmV;>0x$iEP)u?od5s;8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10$oW& zK~zYIwboCFl~owW@y~O*Hz*iwCJ05HU1dj3B3bPK$T0H_5rqo#y`Fh4a3@!}EQg=Y7v} zPLxt~)$#F%rPwLTC^lisk~53TN_;Mt)Al!h=@urI1x<}TK{_Nn-Th5&>T5Y(v+u*N zRt7pTS*Ljz`w({wKYNWI7TCO=tq&CSbc~?`CZ-mb2fa5wB>PzL)C#lUoiA9pUXAa+ zmlsFaFmP6@zRUg(n(b-nmP}fvdxF5mb)E6mKY9OKa@i&=e(Iy~yW3W+Gpl(R+j@e) zuE!Z3CjAe3RZ(BqR1T&Q+x=`A{Dq5VE%*%E=cV zk@JszfOOQdHOYBLUmtJBUp++@Y)fFa3qfIA6m&238T| z2Cia`xJaH?(wxW_iFvI&=eNgxb?{)O>I|3gP>+!7_*wD0h$f|pKO`+V)=B;rQM2Kv z0Vl?r23@HsF(XQ^f8GE_swLj8d{9cY?2D=$$(402UQM(<=@GID#b?Rn^aaJ4K2m1v zJ$1h7b;-+a=DDUSk~b;@>}`BcIlktYh@WDG*D6cRwofo5Hgzgv^j$H*xB_ z+nLLQ+L{`BP^6v0sA3B?FFCVI*Nl=+o1DJTEzCcIdd@vHYw-;L0000 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/models/pacman_1_5.png b/models/pacman_1_5.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed8785ae7dc082699bffc9d8e91d80b7a46f37a GIT binary patch literal 645 zcmV;00($+4P)u?od5s;8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10uo6? zK~zYIy_UgiQ$Y}izghDH1+9r7mbSTx6~vP{3RVogh%Ge6o;*59Qt==K?X5u#h`fT}!H^vfFKHCbYo6r!gN5ClVZPnjWp+hX@zs3# zAV!7}O#(eYU)@p$KBDpzt4mDg-}{A;mY`hfD3}?96aFjN)Jv>fV&eXb_CU9@4!E7&_PPv0NtU3pvM4PRMn2i8sPJP0DUsRdPu<)aO-U~f=Ut5 zpf^u}jR5|o2-F^dnGOgNAlkmSd1A;G)=-uMf`X{X_~Hkz))_7UHUx-bxZ)uI#`AAM z=R1xOnPV)!(gXnzo9bu^mFMiyi;ZCul*v`GP6{Y>0J4mAhB%Y|@h1rI-uUPsFvq`D z42#GODqjYF{V#yuck9;ZVZ>fVIMpVk2<9@G#W#O5wgxqnOC3PWFhUZg59qC1%Jo)6 f?Go9-nqQcoj^M5iB6Ora00000NkvXXu0mjf$fg-W literal 0 HcmV?d00001 diff --git a/models/pacman_1_5.svg b/models/pacman_1_5.svg new file mode 100644 index 0000000..8361fb8 --- /dev/null +++ b/models/pacman_1_5.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +