diff --git a/gfx/snake_banner.png b/gfx/snake_banner.png deleted file mode 100644 index 20b2a03..0000000 Binary files a/gfx/snake_banner.png and /dev/null differ diff --git a/main.py b/main.py index 093d8d2..3a57fa3 100644 --- a/main.py +++ b/main.py @@ -1,10 +1,12 @@ import pygame import time import controls +from screens.startscreen import StartScreen from tilemap.playground import PlayGround class Snake: def __init__(self): + self.STATES = {"starting": 0, "playing": 1, "pausing": 2, "ending": 3, "setting": 4, "highscore": 5} self.running = True self.numplayers: int = 1 self.playground: PlayGround = None @@ -13,9 +15,11 @@ class Snake: self.windowed: bool = True self.width: int = 800 self.height: int =600 + self.startscreen = None self.icon = pygame.image.load("snake.webp") pygame.display.set_icon(self.icon) + self.set_state("starting") self.set_windowed(self.width, self.height) # self.set_fullscreen(self.width, self.height) @@ -23,12 +27,27 @@ class Snake: def mainloop(self): while self.running: - self.screen.fill((100, 200, 200)) + match self.state: + case 0: + self.startscreen = StartScreen(self) + case 1: + pass + case 2: + pass + case 3: + pass + case 4: + pass + case 5: + pass pygame.display.flip() time.sleep(5) self.running = False pygame.quit() + def set_state(self, state: str) -> None: + self.state = self.STATES[state] + def set_windowed(self, width:int, height: int) -> None: self.screen = pygame.display.set_mode((width, height)) self.windowed = True @@ -38,6 +57,9 @@ class Snake: self.screen = pygame.display.set_mode((width, height), flags=pygame.FULLSCREEN) self.windowed = False + def get_width(self) -> int: + return self.width + @property def numplayers(self) -> int: return self._numplayers diff --git a/fonts/1001fonts-fun-blob-eula.txt b/resources/fonts/1001fonts-fun-blob-eula.txt similarity index 100% rename from fonts/1001fonts-fun-blob-eula.txt rename to resources/fonts/1001fonts-fun-blob-eula.txt diff --git a/fonts/Chewy Noodles.otf b/resources/fonts/Chewy Noodles.otf similarity index 100% rename from fonts/Chewy Noodles.otf rename to resources/fonts/Chewy Noodles.otf diff --git a/fonts/FunBlob.otf b/resources/fonts/FunBlob.otf similarity index 100% rename from fonts/FunBlob.otf rename to resources/fonts/FunBlob.otf diff --git a/fonts/FunBlob.ttf b/resources/fonts/FunBlob.ttf similarity index 100% rename from fonts/FunBlob.ttf rename to resources/fonts/FunBlob.ttf diff --git a/fonts/Ghostmeat Back.otf b/resources/fonts/Ghostmeat Back.otf similarity index 100% rename from fonts/Ghostmeat Back.otf rename to resources/fonts/Ghostmeat Back.otf diff --git a/fonts/Ghostmeat Front.otf b/resources/fonts/Ghostmeat Front.otf similarity index 100% rename from fonts/Ghostmeat Front.otf rename to resources/fonts/Ghostmeat Front.otf diff --git a/fonts/Ghostmeat.otf b/resources/fonts/Ghostmeat.otf similarity index 100% rename from fonts/Ghostmeat.otf rename to resources/fonts/Ghostmeat.otf diff --git a/fonts/Read me!.txt b/resources/fonts/Read me!.txt similarity index 100% rename from fonts/Read me!.txt rename to resources/fonts/Read me!.txt diff --git a/fonts/Readme.txt b/resources/fonts/Readme.txt similarity index 100% rename from fonts/Readme.txt rename to resources/fonts/Readme.txt diff --git a/fonts/Teenage Popular.otf b/resources/fonts/Teenage Popular.otf similarity index 100% rename from fonts/Teenage Popular.otf rename to resources/fonts/Teenage Popular.otf diff --git a/fonts/Teenage Popular.png b/resources/fonts/Teenage Popular.png similarity index 100% rename from fonts/Teenage Popular.png rename to resources/fonts/Teenage Popular.png diff --git a/fonts/license.txt b/resources/fonts/license.txt similarity index 100% rename from fonts/license.txt rename to resources/fonts/license.txt diff --git a/gfx/LoseScreen.png b/resources/gfx/LoseScreen.png similarity index 100% rename from gfx/LoseScreen.png rename to resources/gfx/LoseScreen.png diff --git a/gfx/StartScreen.png b/resources/gfx/StartScreen.png similarity index 100% rename from gfx/StartScreen.png rename to resources/gfx/StartScreen.png diff --git a/gfx/Textures.png b/resources/gfx/Textures.png similarity index 100% rename from gfx/Textures.png rename to resources/gfx/Textures.png diff --git a/gfx/Vignette.png b/resources/gfx/Vignette.png similarity index 100% rename from gfx/Vignette.png rename to resources/gfx/Vignette.png diff --git a/gfx/WinScreen.png b/resources/gfx/WinScreen.png similarity index 100% rename from gfx/WinScreen.png rename to resources/gfx/WinScreen.png diff --git a/resources/gfx/snake_banner.png b/resources/gfx/snake_banner.png new file mode 100644 index 0000000..a2c82f1 Binary files /dev/null and b/resources/gfx/snake_banner.png differ diff --git a/gfx/snake_banner.webp b/resources/gfx/snake_banner.webp similarity index 100% rename from gfx/snake_banner.webp rename to resources/gfx/snake_banner.webp diff --git a/gfx/snake_intro_1.webp b/resources/gfx/snake_intro_1.webp similarity index 100% rename from gfx/snake_intro_1.webp rename to resources/gfx/snake_intro_1.webp diff --git a/gfx/snake_intro_2.webp b/resources/gfx/snake_intro_2.webp similarity index 100% rename from gfx/snake_intro_2.webp rename to resources/gfx/snake_intro_2.webp diff --git a/screens/startscreen.py b/screens/startscreen.py index fa7ac6a..ce3e3c5 100644 --- a/screens/startscreen.py +++ b/screens/startscreen.py @@ -1,5 +1,11 @@ import pygame class StartScreen: - def __init__(self): - pass \ No newline at end of file + def __init__(self, parent): + self.parent = parent + self.banner = pygame.image.load("resources/gfx/snake_banner.png") + self.banner_width = int(self.parent.get_width()) + self.banner = pygame.transform.smoothscale(self.banner, (self.banner_width, int(self.banner_width*0.4))) + + self.parent.screen.blit(self.banner, (0, 0)) + \ No newline at end of file