From 5b6cfd651252ddceb65aaddfad8e66fa41f420f4 Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Wed, 2 Oct 2019 01:06:58 +0200 Subject: [PATCH] move ressources --- TetrArcade.py | 33 ++++++++++-------- icon48.png | Bin 0 -> 1429 bytes {images => res}/bg.jpg | Bin {images => res}/blue_mino.png | Bin {images => res}/cyan_mino.png | Bin {images => res}/green_mino.png | Bin {images => res}/held.png | Bin .../joystix monospace.ttf | Bin {images => res}/magenta_mino.png | Bin {images => res}/matrix.png | Bin {images => res}/next.png | Bin {images => res}/orange_mino.png | Bin {images => res}/red_mino.png | Bin {images => res}/yellow_mino.png | Bin 14 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 icon48.png rename {images => res}/bg.jpg (100%) rename {images => res}/blue_mino.png (100%) rename {images => res}/cyan_mino.png (100%) rename {images => res}/green_mino.png (100%) rename {images => res}/held.png (100%) rename joystix monospace.ttf => res/joystix monospace.ttf (100%) rename {images => res}/magenta_mino.png (100%) rename {images => res}/matrix.png (100%) rename {images => res}/next.png (100%) rename {images => res}/orange_mino.png (100%) rename {images => res}/red_mino.png (100%) rename {images => res}/yellow_mino.png (100%) diff --git a/TetrArcade.py b/TetrArcade.py index a94fab8..ae3ca35 100644 --- a/TetrArcade.py +++ b/TetrArcade.py @@ -39,18 +39,21 @@ NORMAL_ALPHA = 200 PRELOCKED_ALPHA = 100 GHOST_ALPHA = 30 MATRIX_BG_ALPHA = 100 +BAR_ALPHA = 75 # Sprites -WINDOW_BG_PATH = "images/bg.jpg" -MATRIX_SPRITE_PATH = "images/matrix.png" +WINDOW_BG_PATH = "res/bg.jpg" +MATRIX_BG_PATH = "res/matrix.png" +HELD_BG_PATH = "res/held.png" +NEXT_BG_PATH = "res/next.png" MINOES_SPRITES_PATHS = { - "orange": "images/orange_mino.png", - "blue": "images/blue_mino.png", - "yellow": "images/yellow_mino.png", - "cyan": "images/cyan_mino.png", - "green": "images/green_mino.png", - "red": "images/red_mino.png", - "magenta": "images/magenta_mino.png", + "orange": "res/orange_mino.png", + "blue": "res/blue_mino.png", + "yellow": "res/yellow_mino.png", + "cyan": "res/cyan_mino.png", + "green": "res/green_mino.png", + "red": "res/red_mino.png", + "magenta": "res/magenta_mino.png", } # User profile path @@ -68,7 +71,7 @@ CONF_PATH = os.path.join(USER_PROFILE_DIR, "TetrArcade.ini") # Text TEXT_COLOR = arcade.color.BUBBLES -FONT_NAME = "joystix monospace.ttf" +FONT_NAME = "res/joystix monospace.ttf" STATS_TEXT_MARGIN = 40 STATS_TEXT_SIZE = 14 STATS_TEXT_WIDTH = 150 @@ -160,12 +163,12 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window): arcade.set_background_color(BG_COLOR) self.set_minimum_size(WINDOW_MIN_WIDTH, WINDOW_MIN_HEIGHT) self.bg = arcade.Sprite(WINDOW_BG_PATH) - self.matrix_bg = arcade.Sprite(MATRIX_SPRITE_PATH) + self.matrix_bg = arcade.Sprite(MATRIX_BG_PATH) self.matrix_bg.alpha = MATRIX_BG_ALPHA - self.held_bg = arcade.Sprite("images/held.png") - self.held_bg.alpha = MATRIX_BG_ALPHA - self.next_bg = arcade.Sprite("images/next.png") - self.next_bg.alpha = MATRIX_BG_ALPHA + self.held_bg = arcade.Sprite(HELD_BG_PATH) + self.held_bg.alpha = BAR_ALPHA + self.next_bg = arcade.Sprite(NEXT_BG_PATH) + self.next_bg.alpha = BAR_ALPHA self.matrix.sprites = MatrixSprites(self.matrix) self.on_resize(self.init_width, self.init_height) diff --git a/icon48.png b/icon48.png new file mode 100644 index 0000000000000000000000000000000000000000..59727ec7f65923b3b18b58fe74bc5bda757dcee6 GIT binary patch literal 1429 zcmV;G1#0?Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1u98IK~!i%?ODr; zBt;aBdeN=mYau9&AmYF{pdx~b2<}|@3;u%t;=&(r<5qArD^U?du#pjlVH6Q$P;jFI zGIm#2rste{Z{*FGa?zCyMMIzN$hhw~H!?D-dS=%5eYwn-`+R9})xf@S)xf@S=^NPj zH9DKkTqJ&l^;Tb zYp)-bUw{0gtWP#tw??Z@&2$|TW;2`N(HC&N`SEdo|5gePj5-;-j3kzai}K=I&z3u1 zvH|m2*@UJ>=!%1U{oSMT^S8g3^}m}khmP%o2Yv)ltB9h>L_GCoeg;&)pxGCSL8uN% zWMqOs)!H}*{qm$dhEj{8I7+Ru3Hj&}YJfJH!!-_ZAA&Swz!ksNB6Y}S8pAi?{~)g? zS)A?u2%(P}wj}1yX^tUc3Djf>;(+2(G3C|*35k5`BC>7B=PGQX$w=yAu_*KTTutEW zM~I8Xkf8zWe84%{;?|%P)uAufS3Y8O2b2BmY%TkGy~dq@pK&8NnScrr zVbh{x(4&pOpd3SxnK`gjV*}I{Nw1+Hz~&nlcGBPx+HB4scW8jg3bjFuiaA7z*&NAE znOZzplw$}Ccaf;RTmzss+Bo=Gv%{H>I~#so;qTZ0gJ@vF0_SVFTGBl%8Vf}-XACuH z22I=*%GAsLDiL4byEp71d(&VKB|2ST_m} z2w&6+sD=;1mfwP0Gu8%a4(ePpI4KstwiaKbjDg69g|8@{E5V5?foRCNRcPhVLyi*R z$dzPbZ4$&R(jE|TJQbAHg!7Ag&CdcsU*tH$*!3GT5>8yZAjuHL1KCH!o$_p5V-L2~ zVLXqsS;ph+j2mmmR4gFd93Nx}Ry;2;21^nwP>+n0&9J3YrDg*N=Bth=Lp^|!8iK%G z=MvUn0^Z-VFFrl)|M|rdw1BU|TB8N2M19ByhX>{Q8_$({xBfCitq?&DH3wT`CXQZt zvfTOZw{r5})Ka~MWmrOOFp!8n_7c3g>+^uO{F_hi_J7~T2aDeUTizs-la`k8^~)1C zR^{yvu7$c2CN*&LqaXVFxB1iI*i=#K*n2$bI3K?^_;&erZpfUi3HTJ=(P<0YPGVsAYFl| zhivD^v<95KXf#~NjnCKV>8WPM){wgMG4GCv4J6j$I1m~*;-pjA%C+fw2TW=p&NjEZ z^7Xk=gD<|*x7cPoFDBjrpdk_J@P^sC^$+Fkib)OVi&Z){gnjiL?=G9+F=Awm*3t4W zjuSBb4gmSXkiM>-IsUXf6cYsaQXj(W1ov(1TN%rV4t{Z jVBffEVBfgp4V3a9FIRRE)XDKX00000NkvXXu0mjfT&%Om literal 0 HcmV?d00001 diff --git a/images/bg.jpg b/res/bg.jpg similarity index 100% rename from images/bg.jpg rename to res/bg.jpg diff --git a/images/blue_mino.png b/res/blue_mino.png similarity index 100% rename from images/blue_mino.png rename to res/blue_mino.png diff --git a/images/cyan_mino.png b/res/cyan_mino.png similarity index 100% rename from images/cyan_mino.png rename to res/cyan_mino.png diff --git a/images/green_mino.png b/res/green_mino.png similarity index 100% rename from images/green_mino.png rename to res/green_mino.png diff --git a/images/held.png b/res/held.png similarity index 100% rename from images/held.png rename to res/held.png diff --git a/joystix monospace.ttf b/res/joystix monospace.ttf similarity index 100% rename from joystix monospace.ttf rename to res/joystix monospace.ttf diff --git a/images/magenta_mino.png b/res/magenta_mino.png similarity index 100% rename from images/magenta_mino.png rename to res/magenta_mino.png diff --git a/images/matrix.png b/res/matrix.png similarity index 100% rename from images/matrix.png rename to res/matrix.png diff --git a/images/next.png b/res/next.png similarity index 100% rename from images/next.png rename to res/next.png diff --git a/images/orange_mino.png b/res/orange_mino.png similarity index 100% rename from images/orange_mino.png rename to res/orange_mino.png diff --git a/images/red_mino.png b/res/red_mino.png similarity index 100% rename from images/red_mino.png rename to res/red_mino.png diff --git a/images/yellow_mino.png b/res/yellow_mino.png similarity index 100% rename from images/yellow_mino.png rename to res/yellow_mino.png