diff options
| author | Pablo Moleri <pmoleri@gmail.com> | 2010-12-01 19:28:02 (GMT) |
|---|---|---|
| committer | Pablo Moleri <pmoleri@gmail.com> | 2010-12-01 19:28:02 (GMT) |
| commit | dfb0726f2c84a1f784c5be99dd739b332f38eae3 (patch) | |
| tree | d146ff59342f9795d2910a1eee4f58043f44e513 /Saludame.activity/kid_window.py | |
| parent | 485ee88731d9022db4dcea68daaedd9989c5527f (diff) | |
| parent | 96b5152672189e7c77d075ef975546b114b5ff51 (diff) | |
Merge branch 'master' of git.sugarlabs.org:saludame/mainline
Conflicts:
Saludame.activity/app_init.py
Saludame.activity/game_manager.py
Diffstat (limited to 'Saludame.activity/kid_window.py')
| -rw-r--r-- | Saludame.activity/kid_window.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Saludame.activity/kid_window.py b/Saludame.activity/kid_window.py index e08cf3b..cda1ef0 100644 --- a/Saludame.activity/kid_window.py +++ b/Saludame.activity/kid_window.py @@ -61,17 +61,18 @@ class KidWindow(Window): ##### Events ##### def add_social_event(self, event): self.social_event = event - self.external_character = ExternalCharacter(self.rect, pygame.Rect(700, 170, 1, 1), 1, self.windows_controller) + self.external_character = ExternalCharacter(self.rect, pygame.Rect(700, 170, 1, 1), 1, self.windows_controller, event) self.add_window(self.external_character) def remove_social_event(self): self.social_event = None - self.windows.remove(self.external_character) + if self.external_character: + self.remove_window(self.external_character) self.external_character = None ##### Kid ballon ##### def show_kid_balloon(self, message, time_span): - self.balloon = MessageBalloon(self.rect, pygame.Rect(580, 80, 1, 1), 1, self.windows_controller) + self.balloon = MessageBalloon(self.rect, pygame.Rect(80, 80, 1, 1), 1, self.windows_controller) self.balloon.set_text(message) self.balloon.set_time_span(time_span) self.add_window(self.balloon) @@ -110,9 +111,9 @@ class KidWindow(Window): return changes class ExternalCharacter(Window): - def __init__(self, container, rect, frame_rate, windows_controller): + def __init__(self, container, rect, frame_rate, windows_controller, event): - self.character = pygame.image.load("assets/characters/teacher.png").convert_alpha() + self.character = pygame.image.load(event.person_path).convert_alpha() rect.size = self.character.get_size() Window.__init__(self, container, rect, frame_rate, windows_controller, "external_character") @@ -120,11 +121,11 @@ class ExternalCharacter(Window): self.set_bg_image(self.character) self.visible = True - self.time_span = 100 # Hardcoded + self.time_span = event.message_time_span self.message_balloon = MessageBalloon(self.container, pygame.Rect(580, 80, 1, 1), 1, self.windows_controller) - self.message_balloon.set_text(u"DeberÃas ir al dentista....") # Hardcoded - self.message_balloon.set_time_span(self.time_span) # Mismo time_span que el character + self.message_balloon.set_text(event.person_message) + self.message_balloon.set_time_span(self.time_span) # same time_span as character self.bg1 = (self.windows_controller.screen.subsurface(self.rect).copy()) self.bg2 = (self.windows_controller.screen.subsurface(self.message_balloon.rect).copy()) @@ -171,7 +172,7 @@ class MessageBalloon(Window): self.visible = False def set_text(self, text): - self.text = utilities.TextBlock(self.rect, 140, 40, 1, text, 18, pygame.Color("black")) + self.text = utilities.TextBlock(self.rect, 35, 40, 1, text, 18, pygame.Color("black")) self.add_child(self.text) def set_time_span(self, time_span): @@ -188,3 +189,4 @@ class MessageBalloon(Window): screen.blit(self.bg, self.rect) return [self.rect] + |