Skip to content

Update lobby.py #2

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
yingren-wang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update lobby.py #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53168a2
Update lobby.py
yingren-wang Apr 12, 2019
45227b3
Update elevator.py
yingren-wang Apr 12, 2019
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
15 changes: 7 additions & 8 deletions elevator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
from build_stage import *
import dialogue_box

def elevator_level(player):

def elevator_level(player):
pygame.init()
font = pygame.font.SysFont("comicsansms", 50)
text = font.render("Hello, World", True, pygame.Color("red"))
elevator_tile = pygame.image.load("resources/tiles/elevator_tile.png")

playerpos = {
"xpix": (500 - player.get_width()) // 2,
"ypix": (500 - player.get_height()) // 2,
"xpix": 300,
"ypix": 300,
"x": 0,
"y": 0
}
Expand Down Expand Up @@ -39,11 +39,10 @@ def elevator_level(player):
[pygame.image.load("resources/sprites/elevator_buttons.png"), [4, 6]]
]


while 1:
display.fill(pygame.Color("black"))
build_stage(display, playerpos, stage, style, sprites)
display.blit(player, ((530 - elevator_tile.get_width()) // 2, (510 - elevator_tile.get_height()) // 2))
display.blit(player, ((550 - elevator_tile.get_width()) // 2, (550 - elevator_tile.get_height()) // 2))
dialogue_box.create_dialogue_box(display, "1: Lobby 2: Ice 3: Desert", False, False)
pygame.display.flip()
for event in pygame.event.get():
Expand All @@ -53,7 +52,7 @@ def elevator_level(player):
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_2:
next_level = "2"
elif event.key == pygame.K_3:
next_level = "3"
# elif event.key == pygame.K_3:
# next_level = "3"
if next_level is not None:
return next_level
return next_level
16 changes: 12 additions & 4 deletions lobby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def lobby_level(player):
"x": 0,
"y": 9
}
gloria_talked = False

while 1:
keys = {"w": 0, "a": 0, "s": 0, "d": 0}
Expand All @@ -91,7 +92,7 @@ def lobby_level(player):
display.blit(player, [playerpos["xpix"], playerpos["ypix"]])

# Gloria conversation
if (playerpos["x"] == 6 and playerpos["y"] == 6) or (playerpos["x"] == 6 and playerpos["y"] == 3) or (playerpos["x"] == 7 and playerpos["y"] == 6) or (playerpos["x"] == 7 and playerpos["y"] == 4):
if (playerpos["x"] == 6 and playerpos["y"] in [6, 3]) or (playerpos["x"] == 7 and playerpos["y"] in [6, 4]):
if gloria_speak:
by_letter = create_dialogue_box(display, ["Hi! My name is Gloria. Welcome to",
"Adtran! We've got a lot for you to get",
Expand All @@ -104,8 +105,14 @@ def lobby_level(player):
else:
gloria_speak = False
by_letter = [0, 0]


if playerpos["x"] in [14, 15] and playerpos["y"] == 2:
create_popup(display, "Press Spacebar to Enter Elevator")
if gloria_talked:
create_popup(display, "Press Spacebar to Enter Elevator")
else:
create_popup(display, "Adtran badge needed")

pygame.display.flip()
for event in pygame.event.get():
if event.type == pygame.QUIT:
Expand All @@ -120,10 +127,11 @@ def lobby_level(player):
keys["s"] = 1
elif event.key == pygame.K_d or event.key == pygame.K_RIGHT:
keys["d"] = 1
elif event.key == pygame.K_SPACE and playerpos["x"] in [14, 15] and playerpos["y"] == 2:
elif event.key == pygame.K_SPACE and playerpos["x"] in [14, 15] and playerpos["y"] == 2 and gloria_talked is True:
into_the_elevator = True
elif event.key == pygame.K_r and playerpos["x"] == 6 and playerpos["y"] == 6:
elif event.key == pygame.K_r and (playerpos["x"] == 6 and playerpos["y"] == 6) or (playerpos["x"] == 6 and playerpos["y"] == 3) or (playerpos["x"] == 7 and playerpos["y"] == 6) or (playerpos["x"] == 7 and playerpos["y"] == 4):
gloria_speak = True
gloria_talked = True
elif event.type == pygame.KEYUP:
if event.key == pygame.K_w or event.key == pygame.K_UP:
keys["w"] = 0
Expand Down