Skip to content
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

Jump to bottom

Enhanced the UI and added Keyboard Support for options #14

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Enhanced the UI and added Keyboard Support for options #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ecdf3d5
shifted horse and hurdle downwards
jriyyya Aug 8, 2023
f503ddf
Added option_button class
jriyyya Aug 13, 2023
95d325c
use the new option_button for options
jriyyya Aug 13, 2023
b50a106
Added keyboard support
jriyyya Aug 13, 2023
0b71861
Update sugargame to have keyboard keys press detection
jriyyya Sep 12, 2023
ddcb7cf
fix key events
Dimi20cen Sep 14, 2023
2200fc1
Merge pull request #1 from Dimi20cen/fix-key-events
jriyyya Sep 17, 2023
0469be9
Change divion operators to floor division
jriyyya Sep 17, 2023
e4f5e24
Add liscense in option_button.py
jriyyya Sep 17, 2023
8a006b1
change input parameter clr to color
jriyyya Sep 17, 2023
e797c16
remove redundant comment
jriyyya Sep 17, 2023
cb05ab4
Made option_button argument list more readable
jriyyya Sep 17, 2023
4eb4063
Improve readability of arguments in option_button
jriyyya Oct 1, 2023
ba76b93
Remove redundant comment
jriyyya Oct 1, 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
153 changes: 62 additions & 91 deletions math_hurdler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from fractions import Fraction
from question import Question
from objects.button import Button
from option_button import Option_Button
from sprites.horse import Horse
from sprites.sun import Sun

Expand All @@ -28,7 +29,6 @@ class Color:

class MathHurdler:
def __init__(self):
# Set up a clock for managing the frame rate.
self.clock = pygame.time.Clock()

self.x = -100
Expand Down Expand Up @@ -162,7 +162,6 @@ def load_highscore(self):
return 0
return 0

# The main game loop.

def run(self):

Expand All @@ -181,25 +180,11 @@ def run(self):

screen = pygame.display.get_surface()
screen_size = screen.get_size()
button_panel = pygame.Surface((screen_size[0] / 3, screen_size[1] / 7))
ground = pygame.image.load('./assets/images/ground.png')
ground = pygame.transform.scale(ground, (int(screen_size[0]), int(screen_size[1] / 3)))

self.buttons = [
Button(
str(self.question.choices[i]),
self.lg_font,
Color.BLACK,
button_panel.get_width() / 2,
button_panel.get_height() / 2,
Color.WHITE,
Color.BLACK,
-2
) for i in range(4)
]
ground = pygame.transform.scale(ground, (int(screen_size[0]), int(screen_size[1] // 3)))

grass = pygame.image.load('./assets/images/grass.png')
grass = pygame.transform.scale(grass, (int(screen_size[0]), int(screen_size[1] / 12)))
grass = pygame.transform.scale(grass, (int(screen_size[0]), int(screen_size[1] // 12)))
ground.blit(grass, (0,0))

points_label = self.lg_font.render('POINTS', 1, Color.BLACK)
Expand All @@ -208,20 +193,37 @@ def run(self):
sun.rect.topleft = (screen_size[0] - sun.image.get_width(), 0)

horse = Horse()
horse.rect.x = display_info.current_h / 3
horse.rect.x = display_info.current_h // 3
horse.rect.y = display_info.current_h - \
horse.image.get_height() - ground.get_height()

hurdle = pygame.image.load('./assets/images/hurdle.png')
hurdle = pygame.transform.scale(
hurdle,
(int(hurdle.get_height() / 3), int(hurdle.get_width() / 3)))
(int(hurdle.get_height() // 3), int(hurdle.get_width() // 3)))

hurdle_y = display_info.current_h - \
hurdle.get_height() - (2 * ground.get_height() / 3)
hurdle.get_height() - (2 * ground.get_height() // 3) + 70

self.buttons = []
button_width = 200
button_height = 80
buttons_x_padding = 50
buttons_y_padding = (ground.get_rect().height - grass.get_rect().height - button_height) // 4
buttons_gap = (screen_size[0] - (buttons_x_padding * 2 + button_width * 4)) // 3

for i, choice in enumerate(self.question.choices):
choice_text = self.lg_font.render(("A", "B", "C", "D")[i] + " " + str(choice), 1, Color.BLACK)
self.buttons.append(
Option_Button(
buttons_x_padding + button_width * i + buttons_gap * i,
screen_size[1] - button_height - buttons_y_padding,
button_width, button_height, choice_text, str(choice)
)
)

question_board = pygame.Surface(
(screen_size[0] / 3, screen_size[1] / 5))
(screen_size[0] // 3, screen_size[1] // 5))
question_board = question_board.convert()
question_board.fill(Color.WHITE)

Expand Down Expand Up @@ -259,21 +261,18 @@ def reset():
def generate_question():
next(self.question)

self.buttons[0].set_text(str(self.question.choices[0]))
self.buttons[1].set_text(str(self.question.choices[1]))
self.buttons[2].set_text(str(self.question.choices[2]))
self.buttons[3].set_text(str(self.question.choices[3]))

self.buttons[0].set_color(self.buttons[0].color, False)
self.buttons[1].set_color(self.buttons[0].color, False)
self.buttons[2].set_color(self.buttons[0].color, False)
self.buttons[3].set_color(self.buttons[0].color, False)
for i in range(4):
choice_text = self.lg_font.render(("A", "B", "C", "D")[i] + " " + str(self.question.choices[i]),
1, Color.BLACK)
self.buttons[i].set_text(choice_text)
self.buttons[i].value = str(self.question.choices[i])
self.buttons[i].set_color((255, 255, 255))

self.question_text_label = self.lg_font.render(
str(self.question), 1, Color.BLACK)
self.hurdle_number += 1
# start at vx=5 and accelerate towards vx=10
self.vx = 4 + (self.hurdle_number * 6) / (self.hurdle_number + 5)
self.vx = 4 + (self.hurdle_number * 6) // (self.hurdle_number + 5)
self.score_label = self.lg_font.render(
str(self.points), 1, Color.BLACK)
self.question_label = self.font.render(
Expand All @@ -287,12 +286,11 @@ def generate_question():

def set_answer(answer_index):
self.vx *= 2
# unselect the previous answer button
if self.last_answer_index >= 0:
self.buttons[self.last_answer_index].set_selected(False)

if answer_index >= 0:
self.last_answer = Fraction(self.buttons[answer_index].text)
self.last_answer = Fraction(self.buttons[answer_index].value)
self.buttons[answer_index].set_selected(True)
self.last_answer_index = answer_index
else:
Expand All @@ -313,14 +311,12 @@ def evaluate_answer(answer):
self.set_gameover(True)
if self.last_answer_index >= 0:
self.buttons[self.last_answer_index].set_color(
Color.RED, False)
Color.RED)

self.buttons[self.question.answer_index].set_color(
Color.GREEN, False)

Color.GREEN)

while self.running:
# Processing Gtk Events
while Gtk.events_pending():
Gtk.main_iteration()
if self.playing:
Expand All @@ -333,8 +329,14 @@ def evaluate_answer(answer):
elif event.type == pygame.KEYDOWN:
if event.key == pygame.K_p:
self.paused = not self.paused
elif event.key == pygame.K_c:
set_answer(self.question.answer_index)
elif event.key == pygame.K_a or event.key == pygame.K_1:
set_answer(0)
elif event.key == pygame.K_b or event.key == pygame.K_2:
set_answer(1)
elif event.key == pygame.K_c or event.key == pygame.K_3:
set_answer(2)
elif event.key == pygame.K_d or event.key == pygame.K_4:
set_answer(3)
elif event.type == pygame.MOUSEBUTTONDOWN:
if not self.gameover:
for i in range(0, 4):
Expand Down Expand Up @@ -365,9 +367,9 @@ def evaluate_answer(answer):

self.horse_change += 1

horse.rect.x = display_info.current_w / 3
horse.rect.x = display_info.current_w // 3
horse.rect.y = display_info.current_h - \
hurdle.get_height() - (3 * ground.get_height() / 4)
hurdle.get_height() - (3 * ground.get_height() // 4) + 70

# Check if hurdle and horse in same spot.
if horse.rect.colliderect(hurdle_rect):
Expand All @@ -379,7 +381,7 @@ def evaluate_answer(answer):
# if not gameover, jump the hurdle
if not self.gameover:
horse.set_horse(Horse.JUMP)
horse.rect.x = display_info.current_w / 3
horse.rect.x = display_info.current_w // 3
horse.rect.y = display_info.current_h \
- horse.image.get_height() \
- ground.get_height() \
Expand All @@ -392,68 +394,45 @@ def evaluate_answer(answer):
question_dirty = False

if self.gameover:
# spin the horse
self.save_highscore()
horse.set_horse(Horse.DEAD)

# Set the "sky" color to blue
screen.fill(background_color)

sun.rect.topleft = (screen_size[0] - sun.image.get_width(), 0)

screen.blit(
question_board,
(screen_size[0] / 4,
screen_size[1] / 5))
(screen_size[0] // 4,
screen_size[1] // 5))
question_board.blit(self.question_label, (10, 10))
question_board.blit(
self.question_text_label,
(10, self.question_label.get_height() + 10))

screen.blit(ground, (0, screen_size[1] - ground.get_height()))
button_panel_x = ground.get_width() / 4
button_panel_y = screen_size[1] - \
ground.get_height() + ground.get_height() / 3 + 10
screen.blit(button_panel, (button_panel_x, button_panel_y))

self.buttons[0].rect.x = button_panel_x
self.buttons[0].rect.y = button_panel_y
self.buttons[0].draw(screen)

self.buttons[1].rect.x = button_panel_x + \
self.buttons[0].image.get_width()
self.buttons[1].rect.y = button_panel_y
self.buttons[1].draw(screen)

self.buttons[2].rect.x = button_panel_x
self.buttons[2].rect.y = button_panel_y + \
self.buttons[0].image.get_height()
self.buttons[2].draw(screen)

self.buttons[3].rect.x = button_panel_x + \
self.buttons[2].image.get_width()
self.buttons[3].rect.y = button_panel_y + \
self.buttons[2].image.get_height()
self.buttons[3].draw(screen)

screen.blit(hurdle, (self.x, hurdle_y))

allsprites = pygame.sprite.RenderPlain(sun, horse)
allsprites.draw(screen)

for btn in self.buttons:
btn.draw()

screen.blit(
self.score_label,
(
sun.rect.x + sun.image.get_width() / 4,
sun.rect.y + sun.image.get_height() / 3
sun.rect.x + sun.image.get_width() // 4,
sun.rect.y + sun.image.get_height() // 3
)
)

screen.blit(
points_label,
(
sun.rect.x + sun.image.get_width() / 4,
sun.rect.y + sun.image.get_height() / 3
sun.rect.x + sun.image.get_width() // 4,
sun.rect.y + sun.image.get_height() // 3
+ self.score_label.get_height()
)
)
Expand All @@ -464,28 +443,25 @@ def evaluate_answer(answer):
screen.blit(
gameover_label,
(
(screen_size[0] - gameover_label.get_width()) / 2,
(screen_size[1] - gameover_label.get_height()) / 2,
(screen_size[0] - gameover_label.get_width()) // 2,
(screen_size[1] - gameover_label.get_height()) // 2,
)
)

# Draw the frame
pygame.display.flip()

if self.gameover:
pygame.time.delay(6000)
self.set_playing(False)
reset()

# Try to stay at 30 FPS
self.clock.tick(18)

else:
def start_game():
reset()
self.set_playing(True)

# in the menu
for event in pygame.event.get():
if event.type == pygame.QUIT:
pygame.quit()
Expand All @@ -506,7 +482,6 @@ def start_game():

self.horse_change += 1

# draw rainbow background fill
screen.fill(
(
math.floor(
Expand All @@ -521,33 +496,29 @@ def start_game():
)
)

# draw menu horse
horse.rect.x = (screen_size[0] - horse.image.get_width()) / 2
horse.rect.x = (screen_size[0] - horse.image.get_width()) // 2
horse.rect.y = (
screen_size[1] - horse.image.get_height()) / 2 + 200
screen_size[1] - horse.image.get_height()) // 2 + 200

menu_sprites = pygame.sprite.RenderPlain(horse)
menu_sprites.draw(screen)

# draw play button
play_button.rect.x = (
screen_size[0] - play_button.rect.width) / 2
screen_size[0] - play_button.rect.width) // 2
play_button.rect.y = (
screen_size[1] - play_button.rect.height) / 2
screen_size[1] - play_button.rect.height) // 2
play_button.draw(screen)

# draw menu label
screen.blit(
menu_label,
(
(screen_size[0] - menu_label.get_width()) / 2,
(screen_size[1] - menu_label.get_height()) / 2 - 200,
(screen_size[0] - menu_label.get_width()) // 2,
(screen_size[1] - menu_label.get_height()) // 2 - 200,
)
)

pygame.display.flip()

# Try to stay at 30 FPS
self.clock.tick(30)


Expand Down
1 change: 1 addition & 0 deletions math_hurdlerActivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def __init__(self, handle):
# Note that set_canvas implicitly calls read_file when
# resuming from the Journal.
self.set_canvas(self._pygamecanvas)
self._pygamecanvas.grab_focus()

# Start the game running (self.game.run is called when the
# activity constructor returns).
Expand Down
Loading