Skip to content

Explore state machine #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Explore state machine #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1004be0
Added controller rendering order
simonalanjones Sep 6, 2023
e79ce42
individual config files
simonalanjones Sep 10, 2023
793f3fa
YABU
simonalanjones Sep 12, 2023
6f6f699
first commit
simonalanjones Sep 24, 2023
70bc116
mvc controllers
simonalanjones Nov 4, 2023
3110a6c
parking current branch
simonalanjones Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions classes/Audio_controller.py
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions classes/Baseline_controller.py
View file
Open in desktop

This file was deleted.

93 changes: 1 addition & 92 deletions classes/Config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import os

base_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))


class Config:
config_values = {
"original_screen_size": (224, 256),
"larger_screen_size": (224 * 4, 256 * 4),
"bg_image_path": os.path.join("images", "invaders_moon_bg.png"),
"max_fps": 60,
"top_left": (0, 0),
"ui": {
Expand All @@ -20,7 +17,6 @@ class Config:
},
"shields": {
"positions": [(29, 191), (75, 191), (127, 191), (173, 191)],
"image": os.path.join("sprites", "player", "player-shield.png"),
},
"invaders": {
"spawn_rows": [120, 144, 160, 168, 168, 168, 176, 176, 176],
Expand All @@ -35,53 +31,12 @@ class Config:
"screen_right_limit": 200,
"horizontal_move": 2,
"vertical_move": 8,
"images": {
"small": [
os.path.join("sprites", "invader", "invader-small-frame1.png"),
os.path.join("sprites", "invader", "invader-small-frame2.png"),
],
"mid": [
os.path.join("sprites", "invader", "invader-mid-frame1.png"),
os.path.join("sprites", "invader", "invader-mid-frame2.png"),
],
"large": [
os.path.join("sprites", "invader", "invader-large-frame1.png"),
os.path.join("sprites", "invader", "invader-large-frame2.png"),
],
},
},
"bombs": {
"exploding_image": os.path.join(
"sprites", "invader_bomb", "bomb_exploding.png"
),
"images": {
"plunger": [
os.path.join("sprites", "invader_bomb", "plunger-frame1.png"),
os.path.join("sprites", "invader_bomb", "plunger-frame2.png"),
os.path.join("sprites", "invader_bomb", "plunger-frame3.png"),
os.path.join("sprites", "invader_bomb", "plunger-frame4.png"),
],
"squiggly": [
os.path.join("sprites", "invader_bomb", "squiggly-frame1.png"),
os.path.join("sprites", "invader_bomb", "squiggly-frame2.png"),
os.path.join("sprites", "invader_bomb", "squiggly-frame3.png"),
os.path.join("sprites", "invader_bomb", "squiggly-frame4.png"),
],
"rolling": [
os.path.join("sprites", "invader_bomb", "rolling-frame1.png"),
os.path.join("sprites", "invader_bomb", "rolling-frame2.png"),
os.path.join("sprites", "invader_bomb", "rolling-frame3.png"),
os.path.join("sprites", "invader_bomb", "rolling-frame4.png"),
],
},
"max_bombs": 1,
"grace_period": 60,
},
"mothership": {
"image_frame": os.path.join("sprites", "mothership", "mothership.png"),
"explode_frame": os.path.join(
"sprites", "mothership", "mothership-exploding.png"
),
# "cycles_with_explosion_frame": 60,
# "cycles_with_bonus_text": 60,
"cycles_until_spawn": 200,
Expand All @@ -107,59 +62,13 @@ class Config:
300,
],
},
"font_spritesheet_offsets": {
"A": [1, 1],
"B": [11, 1],
"C": [21, 1],
"D": [31, 1],
"E": [41, 1],
"F": [51, 1],
"G": [61, 1],
"H": [71, 1],
"I": [1, 11],
"J": [11, 11],
"K": [21, 11],
"L": [31, 11],
"M": [41, 11],
"N": [51, 11],
"O": [61, 11],
"P": [71, 11],
"Q": [1, 21],
"R": [11, 21],
"S": [21, 21],
"T": [31, 21],
"U": [41, 21],
"W": [51, 21],
"X": [61, 21],
"Y": [1, 31],
"Z": [11, 31],
"0": [21, 31],
"1": [31, 31],
"2": [41, 31],
"3": [51, 31],
"4": [61, 31],
"5": [71, 31],
"6": [1, 41],
"7": [11, 41],
"8": [21, 41],
"9": [31, 41],
"<": [41, 41],
">": [51, 41],
"=": [61, 41],
"*": [71, 41],
"?": [1, 51],
"-": [11, 51],
},
"audio": {
"mothership": "sounds/mothership.wav",
"mothership_bonus": "sounds/mothership_bonus.wav",
"player_explodes": "sounds/player_destroyed.wav",
},
}

@staticmethod
def get(key):
return Config.config_values.get(key)

@staticmethod
def get_file_path(key):
return os.path.join(base_directory, key)
7 changes: 0 additions & 7 deletions classes/Controller.py
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions classes/Debug.py
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions classes/Display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import pygame
from classes.config.Game_config import GameConfig


class Display:
def __init__(self):
config = GameConfig()
self.top_left = config.get("top_left")
self.original_screen_size = config.get("original_screen_size")
self.larger_screen_size = config.get("larger_screen_size")

_bg_image = pygame.image.load(config.get_file_path(config.get("bg_image_path")))
self.scaled_image = pygame.transform.scale(_bg_image, self.larger_screen_size)
self.window_surface = pygame.display.set_mode(self.larger_screen_size)

def update(self, surface_array):
clean_game_surface = pygame.Surface(self.original_screen_size, pygame.SRCALPHA)
for drawable_surface in surface_array:
# print(drawable_surface)
if isinstance(drawable_surface, pygame.sprite.Group):
# if isinstance(drawable_surface, pygame.Surface):
drawable_surface.draw(clean_game_surface)

# background image is drawn first
self.window_surface.blit(self.scaled_image, self.top_left)

# scale the playing surface up to target size on main window
self.window_surface.blit(
pygame.transform.scale(clean_game_surface, self.larger_screen_size),
self.top_left,
)
Loading