codemicro/birminghack-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'display'

Browse source
This commit is contained in:
akp 2025-03-23 11:59:18 +00:00
commit 30a927f69c
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
game/gameplay.py
View file

@ -29,7 +29,7 @@ class GamePlay:
self.tomato_button = components.SurfaceButton(resources.TUB_TOMATO_SPRITE)
self.lettuce_button = components.SurfaceButton(resources.TUB_LETTUCE_SPRITE)
self.top_button = components.SurfaceButton(resources.TUB_TOP_SPRITE)
#self.cheese_button = components.SurfaceButton(resources.TUB_CHEESE_SPRITE)
self.cheese_button = components.SurfaceButton(resources.TUB_CHEESE_SPRITE)
self.status = "Get Order"
self.newOrder = True
self.sandwichmade = False
@ -79,22 +79,22 @@ class GamePlay:
resources.TICKET_BOTTOM_SPRITE_3X ,
(975, picposition),
)
''' elif i == "Cheese":
elif i == "Cheese":
screen.blit(
resources.TICKET_CHEESE_SPRITE_3X ,
(975, picposition),
)'''
(985, picposition + 15),
)
picposition +=75
position += 75
def sandwich(self, screen):
fillings = ["Lettuce", "Ham", "Tomatoes"]
#fillings = ["Lettuce", "Ham", "Tomatoes", "Cheese"]
#fillings = ["Lettuce", "Ham", "Tomatoes"]
fillings = ["Lettuce", "Ham", "Tomatoes", "Cheese"]
amountOfFilling = random.randrange(1,6)
sandwich = ["Bread"]
for _ in range(amountOfFilling):
#filling = random.randrange(0,4)
filling = random.randrange(0,3)
filling = random.randrange(0,4)
#filling = random.randrange(0,3)
sandwich.append(fillings[filling])
sandwich.append("Bread")
self.correctsandwich = sandwich
@ -217,12 +217,13 @@ class GamePlay:
elif self.lettuce_button.blit_onto(self.surface, (500, 200)):
self.surface.blit(resources.SUB_LETTUCE_SPRITE_10X, (300 + variationlr, 300 + variationud))
self.madesandwich.append("Lettuce")
elif self.top_button.blit_onto(self.surface, (700, 200)):
elif self.cheese_button.blit_onto(self.surface, (700, 200)):
self.surface.blit(resources.SUB_CHEESE_SPRITE_10X, (330 + variationlr, 335 + variationud))
self.madesandwich.append("Cheese")
elif self.top_button.blit_onto(self.surface, (800, 200)):
self.surface.blit(resources.SUB_TOP_SPRITE_10X, (300 + variationlr, 300 + variationud))
self.madesandwich.append("Bread")
'''elif self.cheese_button.blit_onto(self.surface, (700, 200)):
self.surface.blit(resources.SUB_CHEESE_SPRITE_10X, (300 + variationlr, 300 + variationud))
self.madesandwich.append("Cheese")'''
self.sandwichmade == True

6
game/resources.py
View file

@ -49,10 +49,10 @@ TICKET_LETTUCE_SPRITE = pygame.image.load(RESOURCES_DIR / "sprites" / "ticket_le
TICKET_LETTUCE_SPRITE_3X = pygame.transform.scale_by(TICKET_LETTUCE_SPRITE, 2)
SUB_CHEESE_SPRITE = pygame.image.load(RESOURCES_DIR / "sprites" / "sub_cheese.png")
SUB_CHEESE_SPRITE_3X = pygame.transform.scale_by(SUB_LETTUCE_SPRITE, 3)
SUB_CHEESE_SPRITE_10X = pygame.transform.scale_by(SUB_LETTUCE_SPRITE, 10)
SUB_CHEESE_SPRITE_3X = pygame.transform.scale_by(SUB_CHEESE_SPRITE, 3)
SUB_CHEESE_SPRITE_10X = pygame.transform.scale_by(SUB_CHEESE_SPRITE, 6)
TUB_CHEESE_SPRITE = pygame.image.load(RESOURCES_DIR / "sprites" / "tub_cheese.png")
TUB_CHEESE_SPRITE_3X = pygame.transform.scale_by(TUB_LETTUCE_SPRITE, 3)
TUB_CHEESE_SPRITE_3X = pygame.transform.scale_by(TUB_CHEESE_SPRITE, 3)
TICKET_CHEESE_SPRITE = pygame.image.load(RESOURCES_DIR / "sprites" / "ticket_cheese.png")
TICKET_CHEESE_SPRITE_3X = pygame.transform.scale_by(TICKET_CHEESE_SPRITE, 2)