Mercurial > boomslang

annotate pyntnclick/gamescreen.py @ 671:b27b5c6c54e8 pyntnclick

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use constants for font location
author Stefano Rivera <stefano@rivera.za.net>
date Sun, 12 Feb 2012 18:24:22 +0200
parents 562f8133bb07
children 55d5d384fc16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
41
ad6f56bfa8b7 Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents: 40
diff changeset
1 # gamescreen.py
24
9d5de13e2ac3 Add a game screen. So far, the game content looks a *lot* like the main menu.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
2 # Copyright Boomslang team, 2010 (see COPYING File)
9d5de13e2ac3 Add a game screen. So far, the game content looks a *lot* like the main menu.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
3 # Main menu for the game
9d5de13e2ac3 Add a game screen. So far, the game content looks a *lot* like the main menu.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
4
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
5 from pygame import Rect, Surface
66
05346a412b55 A sprite cursor attempt
Stefano Rivera <stefano@rivera.za.net>
parents: 65
diff changeset
6 from pygame.color import Color
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
7 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_ESCAPE
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
8
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
9 from pyntnclick.cursor import CursorScreen
600
fabce47e542f Stop using albow (at least for the menu). Breaks the world. Please fix it, kthx
Stefano Rivera <stefano@rivera.za.net>
parents: 599
diff changeset
10 from pyntnclick.engine import Screen
553
ebb2efcb4ea7 Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 551
diff changeset
11 from pyntnclick.state import handle_result
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
12 from pyntnclick.widgets.base import Widget, Container
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
13 from pyntnclick.widgets.text import TextButton
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
14 from pyntnclick.widgets.imagebutton import ImageButtonWidget
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
15
576
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
16 # XXX: Need a way to get at the constants.
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
17 from pyntnclick.constants import GameConstants
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
18 constants = GameConstants()
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
19 SCREEN = constants.screen
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
20 LEAVE = constants.leave
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
21
201
9531a22721d1 Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents: 195
diff changeset
22
613
44d4e3020874 Remove a lot of albow
Stefano Rivera <stefano@rivera.za.net>
parents: 603
diff changeset
23 class InventoryView(Widget):
667
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
24 MIN_UPDOWN_WIDTH = 16
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
25
40
9fdbfbc02a60 Minor build script and inventory fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 36
diff changeset
26 sel_color = Color("yellow")
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
27 sel_width = 2
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
28
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
29 def __init__(self, rect, gd, screen):
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
30 self.bsize = gd.constants.button_size
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
31 super(InventoryView, self).__init__(rect, gd)
407
c7a6846262e3 Fix cursor handling after message dismissal.
Jeremy Thurgood <firxen@gmail.com>
parents: 401
diff changeset
32 self.screen = screen
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
33 self.game = screen.game
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
34 self.state_widget = screen.state_widget
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
35
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
36 self.inv_slots = (self.rect.width - self.MIN_UPDOWN_WIDTH) / self.bsize
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
37 self.updown_width = self.rect.width - self.inv_slots * self.bsize
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
38 self.inv_offset = 0
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
39
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
40 self.add_callback(MOUSEBUTTONDOWN, self.mouse_down)
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
41 self.update_surface()
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
42
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
43 def update_surface(self):
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
44 self.surface = Surface(self.rect.size)
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
45 for slot in range(self.inv_slots):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
46 self.draw_slot_item(
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
47 self.surface, slot)
667
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
48 self.draw_updown(self.surface)
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
49
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
50 def draw(self, surface):
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
51 self.update_surface()
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
52 surface.blit(self.surface, self.rect)
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
53
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
54 @property
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
55 def slot_items(self):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
56 return self.game.inventory[self.inv_offset:][:self.inv_slots]
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
57
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
58 def draw_slot_item(self, surface, slot):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
59 if slot >= len(self.slot_items):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
60 return
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
61 item = self.slot_items[slot]
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
62 rect = Rect((slot * self.bsize, 0), (self.bsize, self.bsize))
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
63 surface.blit(item.get_inventory_image(), rect, None)
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
64
667
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
65 def draw_updown(self, surface):
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
66 rect = Rect((self.rect.width - self.updown_width, 0),
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
67 (self.updown_width, self.rect.height))
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
68 s = Surface(rect.size)
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
69 s.fill(Color("blue"))
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
70 surface.blit(s, rect)
c71530b8a19d More toolbar work.
Jeremy Thurgood <firxen@gmail.com>
parents: 665
diff changeset
71
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
72 def click_slot(self, slot, event):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
73 if slot >= len(self.slot_items):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
74 return
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
75 item = self.slot_items[slot]
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
76 if self.item_is_selected(item):
147
a039d3b81b3d Deselect tools and get to the Mess.
Jeremy Thurgood <firxen@gmail.com>
parents: 144
diff changeset
77 self.unselect()
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
78 elif item.is_interactive(self.game.tool):
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
79 result = item.interact(self.game.tool)
384
56a05ae56574 Initial manual implementation.
Jeremy Thurgood <firxen@gmail.com>
parents: 358
diff changeset
80 handle_result(result, self.state_widget)
147
a039d3b81b3d Deselect tools and get to the Mess.
Jeremy Thurgood <firxen@gmail.com>
parents: 144
diff changeset
81 else:
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
82 self.game.set_tool(item)
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
83
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
84 def mouse_down(self, event, widget):
407
c7a6846262e3 Fix cursor handling after message dismissal.
Jeremy Thurgood <firxen@gmail.com>
parents: 401
diff changeset
85 if event.button != 1:
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
86 return self.game.cancel_doodah(self.screen)
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
87 x, y = self.global_to_local(event.pos)
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
88 slot = x / self.bsize
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
89 self.click_slot(slot, event)
407
c7a6846262e3 Fix cursor handling after message dismissal.
Jeremy Thurgood <firxen@gmail.com>
parents: 401
diff changeset
90
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
91 def item_is_selected(self, item):
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
92 return self.game.tool is item
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
93
36
31a431f795e1 Add a hand button placeholder
Neil Muller <neil@dip.sun.ac.za>
parents: 35
diff changeset
94 def unselect(self):
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
95 self.game.set_tool(None)
24
9d5de13e2ac3 Add a game screen. So far, the game content looks a *lot* like the main menu.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
96
40
9fdbfbc02a60 Minor build script and inventory fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 36
diff changeset
97
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
98 class StateWidget(Container):
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
99
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
100 def __init__(self, rect, gd, screen):
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
101 super(StateWidget, self).__init__(rect, gd)
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
102 self.screen = screen
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
103 self.game = screen.game
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
104 self.detail = DetailWindow(rect, gd, screen)
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
105 self.add_callback(MOUSEBUTTONDOWN, self.mouse_down)
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
106 self.add_callback(MOUSEMOTION, self.mouse_move)
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
107
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
108 def draw(self, surface):
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
109 self.game.current_scene.draw(surface, self)
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
110 # Pass to container to draw children
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
111 super(StateWidget, self).draw(surface)
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
112 #self.animate()
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
113 # XXX: Work out if we still need this
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
114 # if self.game.previous_scene and self.game.do_check == LEAVE:
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
115 # # We still need to handle leave events, so still display the scene
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
116 # self.game.previous_scene.draw(surface, self)
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
117 #else:
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
118 # self.game.current_scene.draw(surface, self)
651
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
119 # We draw descriptions here, so we do the right thing
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
120 # with detail views
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
121 if self.game.current_detail:
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
122 self.game.current_detail.draw_description(surface)
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
123 else:
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
124 self.game.current_scene.draw_description(surface)
515
fda2b3a2f2e9 Remove drawing logic from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 512
diff changeset
125
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
126 def mouse_down(self, event, widget):
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
127 if self.game.current_detail:
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
128 return self.detail.mouse_down(event, widget)
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
129 self.mouse_move(event, widget)
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
130 if event.button != 1: # We have a right/middle click
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
131 self.game.cancel_doodah(self.screen)
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
132 else:
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
133 result = self.game.interact(event.pos)
201
9531a22721d1 Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents: 195
diff changeset
134 handle_result(result, self)
71
99c5506de7ea Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 70
diff changeset
135
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
136 def animate(self):
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
137 # XXX: if self.game.animate():
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
138 # queue a redraw
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
139 # self.invalidate()
120
48d24a48d0ce Enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents: 119
diff changeset
140 # We do this here so we can get enter and leave events regardless
48d24a48d0ce Enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents: 119
diff changeset
141 # of what happens
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
142 result = self.game.check_enter_leave(self.screen)
201
9531a22721d1 Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents: 195
diff changeset
143 handle_result(result, self)
659
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
144 if self.game.current_detail:
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
145 self.game.current_detail.animate()
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
146 else:
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
147 self.game.current_scene.animate()
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
148
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
149 def mouse_move(self, event, widget):
647
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
150 if self.game.current_detail:
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
151 return self.detail.mouse_move(event, widget)
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
152 self.game.highlight_override = False
637
c27087877c84 Mouse events propagate! Crashes galore!
Jeremy Thurgood <firxen@gmail.com>
parents: 635
diff changeset
153 self.game.current_scene.mouse_move(event.pos)
c27087877c84 Mouse events propagate! Crashes galore!
Jeremy Thurgood <firxen@gmail.com>
parents: 635
diff changeset
154 self.game.old_pos = event.pos
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
155
210
eb101b6fb3dd Transparent message dialogs.
Jeremy Thurgood <firxen@gmail.com>
parents: 204
diff changeset
156 def show_message(self, message, style=None):
133
0530547a131f Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents: 129
diff changeset
157 # Display the message as a modal dialog
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
158 print message
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
159 # XXX: MessageDialog(self.screen, message, 60, style=style).present()
133
0530547a131f Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents: 129
diff changeset
160 # queue a redraw to show updated state
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
161 # XXX: self.invalidate()
139
a5972444ad1e Improve cursor state handling, disable highlights on modal dialogs
Stefano Rivera <stefano@rivera.za.net>
parents: 137
diff changeset
162 # The cursor could have gone anywhere
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
163 # XXX: if self.subwidgets:
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
164 # self.subwidgets[0]._mouse_move(mouse.get_pos())
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
165 # else:
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
166 # self._mouse_move(mouse.get_pos())
133
0530547a131f Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents: 129
diff changeset
167
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
168 def show_detail(self, detail):
384
56a05ae56574 Initial manual implementation.
Jeremy Thurgood <firxen@gmail.com>
parents: 358
diff changeset
169 self.clear_detail()
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
170 detail_obj = self.game.set_current_detail(detail)
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
171 self.add(self.detail)
646
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
172 detail_rect = Rect((0, 0), detail_obj.get_detail_size())
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
173 # Centre the widget
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
174 detail_rect.center = self.rect.center
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
175 self.detail.set_image_rect(detail_rect)
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
176 self.game.do_enter_detail()
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
177
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
178 def clear_detail(self):
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
179 """Hide the detail view"""
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
180 if self.game.current_detail is not None:
384
56a05ae56574 Initial manual implementation.
Jeremy Thurgood <firxen@gmail.com>
parents: 358
diff changeset
181 self.remove(self.detail)
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
182 self.game.do_leave_detail()
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
183 self.game.set_current_detail(None)
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
184 #self._mouse_move(mouse.get_pos())
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
185
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
186 def end_game(self):
654
335db68e0db4 Fix transition to end screen.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 652
diff changeset
187 self.screen.change_screen('end')
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
188
66
05346a412b55 A sprite cursor attempt
Stefano Rivera <stefano@rivera.za.net>
parents: 65
diff changeset
189
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
190 class DetailWindow(Container):
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
191 def __init__(self, rect, gd, screen):
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
192 super(DetailWindow, self).__init__(rect, gd)
476
c72946d3a59a Some minor pylint driven style fixes
Neil Muller <neil@dip.sun.ac.za>
parents: 460
diff changeset
193 self.image_rect = None
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
194 self.screen = screen
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
195 self.game = screen.game
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
196 self.border_width = 5
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
197 self.border_color = (0, 0, 0)
217
146cec58ddd8 Highlight detailed view close button
Neil Muller <neil@dip.sun.ac.za>
parents: 210
diff changeset
198 # parent only gets set when we get added to the scene
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
199 self.close = TextButton(Rect(0, 0, 0, 0), self.gd,
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
200 text='Close')
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
201 self.close.add_callback('clicked', self.close_but)
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
202 self.add(self.close)
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
203
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
204 def close_but(self, ev, widget):
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
205 self.parent.clear_detail()
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
206
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
207 def end_game(self):
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
208 self.parent.end_game()
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
209
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
210 def set_image_rect(self, rect):
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
211 bw = self.border_width
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
212 self.image_rect = rect
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
213 self.rect = rect.inflate(bw * 2, bw * 2)
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
214 self.close.rect.midbottom = rect.midbottom
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
215
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
216 def draw(self, surface):
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
217 # scene_surface = self.get_root().surface.subsurface(self.parent.rect)
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
218 # overlay = scene_surface.convert_alpha()
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
219 # overlay.fill(Color(0, 0, 0, 191))
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
220 # scene_surface.blit(overlay, (0, 0))
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
221 self.game.current_detail.draw(
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
222 surface.subsurface(self.image_rect), self)
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
223 super(DetailWindow, self).draw(surface)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
224
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
225 def mouse_down(self, event, widget):
647
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
226 self.mouse_move(event, widget)
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
227 if event.button != 1: # We have a right/middle click
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
228 self.game.cancel_doodah(self.screen)
397
b1dc0caec668 Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents: 384
diff changeset
229 else:
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
230 result = self.game.interact_detail(
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
231 self.global_to_local(event.pos))
397
b1dc0caec668 Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents: 384
diff changeset
232 handle_result(result, self)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
233
647
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
234 def mouse_move(self, event, widget):
160
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
235 self._mouse_move(event.pos)
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
236
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
237 def _mouse_move(self, pos):
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
238 self.game.highlight_override = False
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
239 self.game.current_detail.mouse_move(self.global_to_local(pos))
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
240
210
eb101b6fb3dd Transparent message dialogs.
Jeremy Thurgood <firxen@gmail.com>
parents: 204
diff changeset
241 def show_message(self, message, style=None):
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
242 # self.parent.show_message(message, style)
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
243 # self.invalidate()
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
244 print message
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
245
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
246
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
247 class ToolBar(Container):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
248 def __init__(self, rect, gd, screen):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
249 self.screen = screen
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
250 button_size = gd.constants.button_size
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
251
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
252 if not isinstance(rect, Rect):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
253 rect = Rect(rect, (gd.constants.scene_size[0], button_size))
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
254 super(ToolBar, self).__init__(rect, gd)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
255
411
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
256 self.bg_color = (31, 31, 31)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
257 self.left = self.rect.left
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
258
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
259 self.menu_button = self.add_tool(
671
b27b5c6c54e8 Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents: 669
diff changeset
260 0, TextButton, gd, "Menu", fontname=gd.constants.bold_font,
b27b5c6c54e8 Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents: 669
diff changeset
261 color="red", padding=2, border=0)
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
262 self.menu_button.add_callback(MOUSEBUTTONDOWN, self.menu_callback)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
263
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
264 hand_image = gd.resource.get_image('items', 'hand.png')
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
265 self.hand_button = self.add_tool(
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
266 None, ImageButtonWidget, gd, hand_image)
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
267 self.hand_button.add_callback(MOUSEBUTTONDOWN, self.hand_callback)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
268
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
269 self.inventory = self.add_tool(
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
270 self.rect.width - self.left, InventoryView, gd, screen)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
271
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
272 def add_tool(self, width, cls, *args, **kw):
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
273 rect = (self.left, self.rect.top)
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
274 if width is not None:
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
275 rect = Rect(rect, (width, self.rect.height))
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
276 tool = cls(rect, *args, **kw)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
277 self.add(tool)
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
278 self.left += tool.rect.width
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
279 return tool
411
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
280
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
281 def draw(self, surface):
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
282 bg = Surface(self.rect.size)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
283 bg.fill(self.bg_color)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
284 surface.blit(bg, self.rect)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
285 super(ToolBar, self).draw(surface)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
286
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
287 def hand_callback(self, event, widget):
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
288 self.inventory.unselect()
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
289
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
290 def menu_callback(self, event, widget):
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
291 self.screen.change_screen('menu')
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
292
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
293
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
294 class GameScreen(CursorScreen):
615
cb01c3a09ee1 GameScreen is grey
Stefano Rivera <stefano@rivera.za.net>
parents: 614
diff changeset
295
cb01c3a09ee1 GameScreen is grey
Stefano Rivera <stefano@rivera.za.net>
parents: 614
diff changeset
296 def setup(self):
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
297 super(GameScreen, self).setup()
100
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
298 self.running = False
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
299 self.create_initial_state = self.gd.initial_state
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
300 self.container.add_callback(KEYDOWN, self.key_pressed)
659
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
301 self.state_widget = None
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
302
100
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
303 def _clear_all(self):
618
1a8dceccd98e Use widget containers in _clear_all
Stefano Rivera <stefano@rivera.za.net>
parents: 616
diff changeset
304 for widget in self.container.children[:]:
1a8dceccd98e Use widget containers in _clear_all
Stefano Rivera <stefano@rivera.za.net>
parents: 616
diff changeset
305 self.container.remove(widget)
100
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
306
619
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
307 def process_event(self, event_name, data):
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
308 if event_name == 'restart':
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
309 self.start_game()
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
310
100
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
311 def start_game(self):
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
312 self._clear_all()
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
313 toolbar_height = self.gd.constants.button_size
634
b4007de091c5 Correct rect size for StateWidget
Stefano Rivera <stefano@rivera.za.net>
parents: 632
diff changeset
314 rect = Rect(0, 0, self.surface_size[0],
b4007de091c5 Correct rect size for StateWidget
Stefano Rivera <stefano@rivera.za.net>
parents: 632
diff changeset
315 self.surface_size[1] - toolbar_height)
603
3ce19d33b51f Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents: 600
diff changeset
316 self.game = self.create_initial_state()
639
fdc63049b08c Add game_description to the widgets,, since it looks a useful thing to do
Neil Muller <neil@dip.sun.ac.za>
parents: 637
diff changeset
317 self.state_widget = StateWidget(rect, self.gd, self)
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
318 self.container.add(self.state_widget)
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
319
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
320 self.toolbar = ToolBar((0, rect.height), self.gd, self)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
321 self.inventory = self.toolbar.inventory
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
322 self.container.add(self.toolbar)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
323
100
b5b6cbf556e6 Make start new game start a new game. Add Resume to main menu
Neil Muller <neil@dip.sun.ac.za>
parents: 99
diff changeset
324 self.running = True
34
e5c043aeed65 Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
325
659
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
326 def animate(self):
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
327 """Animate the state widget"""
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
328 if self.state_widget:
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
329 self.state_widget.animate()
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
330
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
331 def key_pressed(self, event, widget):
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
332 if event.key == K_ESCAPE:
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
333 self.change_screen('menu')
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
334
599
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
335
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
336 class DefEndScreen(Screen):
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
337 """A placeholder 'Game Over' screen so people can get started easily"""
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
338
600
fabce47e542f Stop using albow (at least for the menu). Breaks the world. Please fix it, kthx
Stefano Rivera <stefano@rivera.za.net>
parents: 599
diff changeset
339 def setup(self):
625
85153f422522 Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents: 624
diff changeset
340 self.background = self.resource.get_image('pyntnclick/end.png')
599
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
341
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
342 def draw(self, surface):
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
343 surface.blit(self.background, (0, 0))
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
344
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
345
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
346 class DefMenuScreen(Screen):
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
347 """A placeholder Start screen so people can get started easily"""
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
348
600
fabce47e542f Stop using albow (at least for the menu). Breaks the world. Please fix it, kthx
Stefano Rivera <stefano@rivera.za.net>
parents: 599
diff changeset
349 def setup(self):
625
85153f422522 Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents: 624
diff changeset
350 self.background = self.resource.get_image('pyntnclick/start.png')
599
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
351
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
352 def draw(self, surface):
2d2ea51b73ad Move menu.py and endscreen.py to gamelib. Add default versions for new games
Neil Muller <neil@dip.sun.ac.za>
parents: 581
diff changeset
353 surface.blit(self.background, (0, 0))