diff options
Diffstat (limited to 'run.py')
-rw-r--r-- | run.py | 24 |
1 files changed, 17 insertions, 7 deletions
@@ -1,6 +1,10 @@ | |||
1 | import sys | ||
2 | |||
3 | if getattr(sys, 'frozen', False): | ||
4 | os.chdir(sys._MEIPASS) | ||
5 | |||
1 | import pygame | 6 | import pygame |
2 | import pydub | 7 | import pydub |
3 | import sys | ||
4 | import helpers | 8 | import helpers |
5 | 9 | ||
6 | pygame.mixer.pre_init(frequency = 44100) | 10 | pygame.mixer.pre_init(frequency = 44100) |
@@ -13,6 +17,8 @@ background = pygame.Surface(screen.get_size()) | |||
13 | background = background.convert() | 17 | background = background.convert() |
14 | background.fill((250, 250, 250)) | 18 | background.fill((250, 250, 250)) |
15 | 19 | ||
20 | action_surface = pygame.Surface((600, 250)).convert() | ||
21 | action_surface.fill((0,0,0)) | ||
16 | helpers.parse_config() | 22 | helpers.parse_config() |
17 | 23 | ||
18 | for key_name in helpers.Mapping.KEYS: | 24 | for key_name in helpers.Mapping.KEYS: |
@@ -20,6 +26,8 @@ for key_name in helpers.Mapping.KEYS: | |||
20 | key.draw(background) | 26 | key.draw(background) |
21 | 27 | ||
22 | screen.blit(background, (0, 0)) | 28 | screen.blit(background, (0, 0)) |
29 | screen.blit(action_surface, (10, 330)) | ||
30 | |||
23 | pygame.display.flip() | 31 | pygame.display.flip() |
24 | 32 | ||
25 | contexts = [ | 33 | contexts = [ |
@@ -38,12 +46,14 @@ while 1: | |||
38 | sys.exit() | 46 | sys.exit() |
39 | 47 | ||
40 | if context == 'normal': | 48 | if context == 'normal': |
41 | if event.type == pygame.KEYDOWN and event.key in helpers.Mapping.KEYS: | 49 | if event.type == pygame.KEYDOWN: |
42 | helpers.Mapping.KEYS[event.key].do_actions() | 50 | key = helpers.Key.find_by_key_num(event.key) |
43 | if event.type == pygame.MOUSEBUTTONUP: | 51 | if key is not None: |
44 | for key in helpers.Mapping.KEYS: | 52 | key.do_actions() |
45 | if helpers.Mapping.KEYS[key].collidepoint(pygame.mouse.get_pos()): | 53 | elif event.type == pygame.MOUSEBUTTONUP: |
46 | helpers.Mapping.KEYS[key].do_actions() | 54 | key = helpers.Key.find_by_collidepoint(pygame.mouse.get_pos()) |
55 | if key is not None: | ||
56 | key.list_actions(action_surface) | ||
47 | 57 | ||
48 | pygame.display.flip() | 58 | pygame.display.flip() |
49 | 59 | ||