From: Skullheadx <94652084+Skullheadx@users.noreply.github.com> Date: Fri, 25 Nov 2022 18:17:58 +0000 (-0500) Subject: logo added X-Git-Url: http://git.skullheadx.com/index.css?a=commitdiff_plain;h=e5dda8936a005622fd6b5d83f3ac8726b0abf7a2;p=word-hunt.git logo added --- diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc index e54377f..8274f66 100644 Binary files a/Main/__pycache__/game.cpython-310.pyc and b/Main/__pycache__/game.cpython-310.pyc differ diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc index 800458e..524abc3 100644 Binary files a/Main/__pycache__/setup.cpython-310.pyc and b/Main/__pycache__/setup.cpython-310.pyc differ diff --git a/Main/colour_palette.pdf b/Main/assets/colour_palette.pdf similarity index 100% rename from Main/colour_palette.pdf rename to Main/assets/colour_palette.pdf diff --git a/Main/assets/logo.png b/Main/assets/logo.png new file mode 100644 index 0000000..851a8ca Binary files /dev/null and b/Main/assets/logo.png differ diff --git a/Main/background.py b/Main/background.py new file mode 100644 index 0000000..a823a90 --- /dev/null +++ b/Main/background.py @@ -0,0 +1,17 @@ +import pygame + +from setup import * + + +class Background: + background = pygame.Surface(dimensions) + + + def __init__(self): + pass + + def update(self, delta): + pass + + def draw(self, surf): + pass \ No newline at end of file diff --git a/Main/game.py b/Main/game.py index c71c26f..d1454d5 100644 --- a/Main/game.py +++ b/Main/game.py @@ -49,7 +49,7 @@ class Game: self.word_connector = WordConnector() self.bg_colour = Colour.LIGHT_GRAY self.unknown_word_display = UnknownWordDisplay((SCREEN_WIDTH*2/3-UnknownWordDisplay.inset,self.board.position.y),self.word_frequency) - self.timer = Timer(self.unknown_word_display.position +pygame.Vector2(0,self.unknown_word_display.get_rect().height)) + self.timer = Timer(self.unknown_word_display.position +pygame.Vector2(0,self.unknown_word_display.get_rect().height-self.unknown_word_display.inset + self.word_disp_separation_distance/2)) def update(self, delta): self.word += self.board.update(delta, self.bg_colour, self.points) self.word_connector.update(self.board.grid.last_selected, self.colour_converter[self.bg_colour]) diff --git a/Main/main.py b/Main/main.py index a3eac68..a41195d 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{12}.txt" +puzzle = f"puzzles/PuzzlePack{4}/puzzle{13}.txt" print(puzzle) scene = Game(puzzle) diff --git a/Main/setup.py b/Main/setup.py index 6f7e4e1..4d782e5 100644 --- a/Main/setup.py +++ b/Main/setup.py @@ -16,6 +16,7 @@ center = pygame.Vector2(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2) screen = pygame.display.set_mode(dimensions) pygame.display.set_caption("Word Hunt") +pygame.display.set_icon(pygame.image.load("assets/logo.png")) clock = pygame.time.Clock() fps = 60