From 90dafbd0d5dea575d54ccd35afcf1ed79a691fa9 Mon Sep 17 00:00:00 2001 From: Skullheadx <94652084+Skullheadx@users.noreply.github.com> Date: Wed, 23 Nov 2022 19:16:12 -0500 Subject: [PATCH] small adjustments --- Main/__pycache__/board.cpython-310.pyc | Bin 3317 -> 3318 bytes Main/__pycache__/game.cpython-310.pyc | Bin 2596 -> 2573 bytes Main/__pycache__/tile.cpython-310.pyc | Bin 2403 -> 2399 bytes ...310.pyc => word_connector.cpython-310.pyc} | Bin 1891 -> 1883 bytes Main/board.py | 4 ++-- Main/game.py | 6 ++---- Main/main.py | 2 +- Main/tile.py | 4 ++-- Main/{effects.py => word_connector.py} | 2 -- 9 files changed, 7 insertions(+), 11 deletions(-) rename Main/__pycache__/{effects.cpython-310.pyc => word_connector.cpython-310.pyc} (61%) rename Main/{effects.py => word_connector.py} (99%) diff --git a/Main/__pycache__/board.cpython-310.pyc b/Main/__pycache__/board.cpython-310.pyc index 66e22b6db405d927f5ed1921c9df9f2bbd5c3cff..8f37252d064ad83dc1306458531ecbebef240ac0 100644 GIT binary patch delta 334 zcmew=`Aw2HpO=@5fq{YH+O)c4%Z zQ7J4n3|V|43=5gW8B$n#85c4!GNdpBGib8;X)@m8P0BAyNiB*mN=(TtE!Jcza$;a$ zxW!tYnNpHb#K^$FkPh-31H*&;nvA!&lJZMR@^f=i(@He?i)<$+az{ynoO+8TDJQd} u$OhylHV`2OA{-~*=C)*%m@LX;EN=l801+M_!V5&mfe5fCZ6~Mm^Z@|eD@tYn delta 321 zcmew+`BjoPpO=@5fq{YH$E3PsyN$ey*bJGY*i%@dI8s=nI8)eC*jpH)xKcP$I9nK^ zxKp@NxLX*acv5&$cv~2vcvJX-88rDPKVZ{h zU&5Eg&&{xqNt_{trI&Fb6C*TXbKeBO-|>IQUE#Y7E4l2W(n9;MQk9Kh=B-Z5WzY5 j4!0$v*kmytV|h!EfD?%D1QFgKLJmYIf(X0G89aReB^pMl diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc index e5e35fe1aca44bb307a817afcd67d6ef00bd5415..e1d42ecda27c91cf132299bd4ede3f6058475007 100644 GIT binary patch delta 455 zcmZ1?(ksH7&&$ijz`(!|J+m%(=0sjuaXSVEh7^Vr#vFza5Y3dsn9CH!#5mDbQqr9v zg*An(g&~ElnJJ1rg*})-lj9{w^Te93jAoOI7+-L6NHdg(r|^m}r0`8nWO8TZpS+T3 z8>86d1m*~)m#mw&GN&;z3Qv|{Rby1!?97_LC~L^Tz))nsz`$^et+XH|u_U#~3?!lk zB1|VAVAE#Qnf!)Lf=vk|pgNh0-O<_z#MA&0njk_8M3^uzFlaIrnS%^sO-aouNh|_+ z3qlBhRDk@YJ-Lnj5L1!lWG@aAA+V(^DMg9pw^)*LGE0g~CQslH6VeAM)&>!#P%|g* z;E-i>o_vkN-B$-B4zm9ii(7tPNs&5;4|2sVR`(!RSHB{6kOSBvU44A~!;9QNvc@37 z6-3yB2pbRqa!Zlllw{_l7BPd=f}B~z Y0%C#OGx<5EE+5Ee91J{+ASlEP0CquO1ONa4 delta 456 zcmeAbSt7!l&&$ijz`($;dP-gLf{DDc!fp%<3@HpLj5!QZj42E$OgT&;6CEYhQW#QL zbJ%k^qBs~C+!<2XQrKG5Ai`ww0XA($?a6Q0B-j)|0xFZa*d476K}>ZJp#dT^L4+{_1A``0kr~J!)|Awo zlEfmA#~_3NNQEr}1B345HughIFIgvhahM2!EoDh5N-V#{l9ZEKQe-@N0*9E89!Rkk zh%kYgIe7<%ETik>YaH$#+8}X|{kK@$^7BfH)IfZYD{is62f4cX6@kL<7F(pNkB@(N zkt;~n2t>Gm2s;pA4I*qOr*bMXa!zjNR2R|Yy2V{knVy)Nst0mQ5y*(e2G(6fQNyBfrEjAiH8vcg_r^H5n|2& diff --git a/Main/__pycache__/tile.cpython-310.pyc b/Main/__pycache__/tile.cpython-310.pyc index 4524937525081e782100adf2b4caeaae06919073..590779ff1db69cd5ada86530996312de18c9fb88 100644 GIT binary patch delta 627 zcmaDXbYF-!pO=@5fq{X6d3s&)l!?4IB|;e(7+$i12o4az4575k>cc?OmEph%8Ga_uQ5JRrkaf>M)9ioh20 zg800}8AX|S+3|_F`K5U!MKT}*bwC8zJ}{v)xt;ZbyB^3S4unZX`XE&ZgV>TwOY+mw ziVQ%)Sd9Tms8629_R2qsHz~g;CABENC^03ow73ZDO2%7k$*FlIsYRNC2wQHkq!cBV z-(o2OxfcpQ(?NrCSPYa)fEL94|2{e#)=}4{kIq^HJQMna*L(7v?vWF zY%DqaVnB+DEJ50gK!h2HkOdK-fGQFM*~8+NpH~9$k}^m}8${@W2#_<1)Ils05CIM- z1fewfF^97)$edfO#i=Ew1x3u*RDrDEu*uC&Da}c>V`N}pC}v||VBlcjU=m^i0H;oU Ax&QzG delta 630 zcmcaF^jL^DpO=@5fq{V`wy7?8>O|g~G64(>3@=$h1P6%VXJBAR2Pt4+kaO7hZwaF? zF9QQZ5lHwJW9BW!td$H!3X``oy=CJAiE~e0!R%}VS5hR-z`&r%QY6d3z;KH-B{ioc zu}A`>4kTWr0Ahg&#mTZPDQaL7L_vaLAOfUjB_mibiqhpQ(_KMs)?_aN>)-|%&JvWG zTv7zKmV`N}pC}v||VBlcjU=m^i E05uza*Z=?k diff --git a/Main/__pycache__/effects.cpython-310.pyc b/Main/__pycache__/word_connector.cpython-310.pyc similarity index 61% rename from Main/__pycache__/effects.cpython-310.pyc rename to Main/__pycache__/word_connector.cpython-310.pyc index a2370f37780e93b1ff30040cf2b0da602495cd95..4d258cd58aa32ffcfa0bff51e65c819f64fe547d 100644 GIT binary patch delta 158 zcmaFNcbktlpO=@5fq{V`dS+d6%S2vTLp25lh7^Vr#vFza5Y3dsn9CH!#K_>zkiwk8 z(!!9!(##aaoWdH+pvm?Uq;q1*ZAOR54vhLT<@rS^@yYpld8x@I`9*pKmA5$J<1_Oz zOXA}tCbuxAGsG&1D8E^X*^Ze}eR3q*B1V?Uf7qm%{WMu7%duN>u`w_(a4_&N H3NZly0%ayO delta 166 zcmcc3_n412pO=@5fq{XcySXlT>O@{yD?J7Vh7^Vr#vFzy5Y3ds7y_c1bC`0OqnH^P z+!<0>QdnCUQdparqF7QGgBdj0UV=>Un;3nY(Q>jmqrPZrT3TvyNwHo*i*_{_Y_ zlK6P3$xV#ujB=Y_G3qihDsGlwwqs`0oE*-!h>>mbFE(j*P1YiD1_p-766}^d91IK$ M91I*xJd8q20LCXJb^rhX diff --git a/Main/board.py b/Main/board.py index c8578d4..b6dad49 100644 --- a/Main/board.py +++ b/Main/board.py @@ -48,7 +48,7 @@ class Grid: class Board: text_font = pygame.font.Font("font/Silkscreen-Regular.ttf", 20) - inset = 15 + inset = 20 edge_radius = 25 border_width = 8 @@ -87,7 +87,7 @@ class Board: self.grid.draw(surf) surf.blit(self.points_display, self.points_display.get_rect( - bottomleft=self.grid.position + pygame.Vector2(0, -Tile.separation_distance))) + bottomleft=self.grid.position + pygame.Vector2(0, -0.5 * ( self.inset)))) # print(self.position+pygame.Vector2(2 * Tile.side_length + Tile.separation_distance * 3/ 2), center) # diff --git a/Main/game.py b/Main/game.py index a048a2b..3eca2f2 100644 --- a/Main/game.py +++ b/Main/game.py @@ -1,9 +1,7 @@ -import pygame.draw - from setup import * from tile import Tile from board import Board -from effects import WordConnector +from word_connector import WordConnector class Game: @@ -34,7 +32,7 @@ class Game: self.seen = set() self.points = 0 self.title = self.title_font.render("Word Hunt", True, Colour.BLACK) - self.board = Board(pygame.Vector2(SCREEN_WIDTH / 3, SCREEN_HEIGHT / 2), length, width, self.letters) + self.board = Board(pygame.Vector2(SCREEN_WIDTH / 2, SCREEN_HEIGHT *3/5), length, width, self.letters) self.word = "" self.word_display = self.font.render(self.word, True, Colour.BLACK, Colour.LIGHT_GRAY) diff --git a/Main/main.py b/Main/main.py index f431dff..ba48ecb 100644 --- a/Main/main.py +++ b/Main/main.py @@ -1,7 +1,7 @@ from setup import * from game import Game -puzzle = f"puzzles/PuzzlePack{4}/puzzle{3}.txt" +puzzle = f"puzzles/PuzzlePack{4}/puzzle{4}.txt" print(puzzle) scene = Game(puzzle) diff --git a/Main/tile.py b/Main/tile.py index e65568d..6a61090 100644 --- a/Main/tile.py +++ b/Main/tile.py @@ -3,11 +3,11 @@ import pygame.mouse from setup import * class Tile: - side_length = 80 + side_length = 85 bezel = 5 cutoff = 8 edge_radius = 15 - separation_distance = 7.5 + separation_distance = 10 font = pygame.font.Font("font/Silkscreen-Regular.ttf", 40) diff --git a/Main/effects.py b/Main/word_connector.py similarity index 99% rename from Main/effects.py rename to Main/word_connector.py index 96a37f9..678fe5f 100644 --- a/Main/effects.py +++ b/Main/word_connector.py @@ -1,5 +1,3 @@ -import pygame - from setup import * from tile import Tile -- 2.54.0