Refactored the game to use classes

KeithGalli · KeithGalli · commit e2b3e26527ff · 2020-03-14T00:10:00.000-04:00
diff --git a/refactored/color.py b/refactored/color.py
@@ -0,0 +1,5 @@
+class Color:
+	RED = (255,0,0)
+	BLUE = (0,0,255)
+	YELLOW = (255,255,0)
+	BLACK = (0,0,0)
diff --git a/refactored/game.py b/refactored/game.py
@@ -0,0 +1,80 @@
+from color import Color
+from player import BasePlayer, Enemy
+import random
+import pygame
+
+class Screen:
+	def __init__(self, width=800, height=600, background_color=Color.BLACK, font_type="monospace", font_size=35, clock_tick=30):
+		self.width = width
+		self.height = height
+		self.background_color = background_color
+		self.screen = pygame.display.set_mode((width, height))
+		self.font = pygame.font.SysFont(font_type, font_size)
+		self.clock = pygame.time.Clock()
+		self.clock_tick = clock_tick
+
+	def refresh_background(self):
+		self.screen.fill(self.background_color)
+
+	def draw_score_label(self, score, color=Color.YELLOW):
+		text = f"Score: {score}"
+		label = self.font.render(text, 1, color)
+		self.screen.blit(label, (self.width-200, self.height-40))
+
+	def draw_enemies(self, enemy_list):
+		for enemy in enemy_list:
+			enemy.draw(self.screen)
+
+	def draw_player(self, player):
+		player.draw(self.screen)
+
+	def update_screen(self, enemy_list, player, score):
+		self.refresh_background()
+		self.draw_enemies(enemy_list)
+		self.draw_player(player)
+		self.draw_score_label(score)
+
+		self.clock.tick(self.clock_tick)
+		pygame.display.update()
+
+class Game:
+	def __init__(self, speed=10, score=0, max_enemies=10, delay=0.1):
+		self.speed = speed
+		self.score = score
+		self.max_enemies = max_enemies
+		self.delay = delay
+
+		self.enemy_list = []
+
+	def set_level(self):
+		if self.score < 20:
+			self.speed = 5
+		elif self.score < 40:
+			self.speed = 8
+		elif self.score < 60:
+			self.speed = 12
+		else:
+			self.speed = 15
+
+	def drop_enemies(self, screen_width):
+		delay = random.random()
+		if len(self.enemy_list) < self.max_enemies and delay < self.delay:
+			random_x = random.randint(0, screen_width-Enemy.size)
+			new_enemy = Enemy(random_x, 0)
+			self.enemy_list.append(new_enemy)
+
+	def update_enemy_positions(self, screen_height):
+		updated_enemy_list = []
+		for enemy in self.enemy_list:
+			if enemy.y >= 0 and enemy.y < screen_height:
+				enemy.y += self.speed
+				updated_enemy_list.append(enemy)
+			else: # Enemy is no longer on screen, increase score
+				self.score += 1
+		self.enemy_list = updated_enemy_list
+
+	def collision_check(self, player):
+		for enemy in self.enemy_list:
+			if enemy.detect_collision(player):
+				return True
+		return False
diff --git a/refactored/main.py b/refactored/main.py
@@ -0,0 +1,35 @@
+import pygame
+from player import HumanPlayer
+from game import Screen, Game
+
+def main():
+	pygame.init()
+	
+	screen = Screen(height=1000)
+	player = HumanPlayer(screen.width/2, screen.height-2*HumanPlayer.size)
+	game = Game()
+	
+	game_over = False
+	while not game_over:
+		for event in pygame.event.get():
+			if event.type == pygame.QUIT:
+				sys.exit()
+			if event.type == pygame.KEYDOWN:
+				if event.key == pygame.K_LEFT:
+					player.x -= player.size
+				elif event.key == pygame.K_RIGHT:
+					player.x += player.size
+
+		game.drop_enemies(screen.width)
+		game.update_enemy_positions(screen.height)
+		game.set_level()
+
+		screen.update_screen(game.enemy_list, player, game.score)
+
+		if game.collision_check(player):
+			game_over = True
+			break
+
+
+if __name__ == '__main__':
+	main()
diff --git a/refactored/player.py b/refactored/player.py
@@ -0,0 +1,28 @@
+from color import Color
+import pygame
+
+class BasePlayer:
+	def __init__(self, x, y, size=50, color=Color.RED):
+		self.x = x
+		self.y = y
+		self.size = size
+		self.color = color
+
+	def draw(self, screen):
+		pygame.draw.rect(screen, self.color, (self.x, self.y, self.size, self.size))
+
+	def detect_collision(self, other):
+		if (other.x >= self.x and other.x < (self.x + self.size)) or (self.x >= other.x and self.x < (other.x + other.size)):
+			if (other.y >= self.y and other.y < (self.y + self.size)) or (self.y >= other.y and self.y < (other.y + other.size)):
+				return True
+		return False
+
+class Enemy(BasePlayer):
+	size = 50
+	def __init__(self, x, y):
+		super().__init__(x, y, size=self.size, color=Color.BLUE)
+
+class HumanPlayer(BasePlayer):
+	size = 75
+	def __init__(self, x, y):
+		super().__init__(x, y, size=self.size, color=Color.RED)
