Mercurial > pyntnclick

annotate pyntnclick/gamescreen.py @ 680:c9562e24bfed pyntnclick

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't propogate clicks on the close button
author Neil Muller <neil@dip.sun.ac.za>
date Sun, 12 Feb 2012 23:10:00 +0200
parents fa168b5e2624
children 0749438e325e
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
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
5 import pygame.draw
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
6 from pygame import Rect, Surface
66
05346a412b55 A sprite cursor attempt
Stefano Rivera <stefano@rivera.za.net>
parents: 65
diff changeset
7 from pygame.color import Color
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
8 from pygame.locals import MOUSEBUTTONDOWN, MOUSEMOTION, KEYDOWN, K_ESCAPE
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
9
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
10 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
11 from pyntnclick.engine import Screen
553
ebb2efcb4ea7 Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 551
diff changeset
12 from pyntnclick.state import handle_result
678
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
13 from pyntnclick.widgets.base import Container, ModalStackContainer
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
14 from pyntnclick.widgets.text import TextButton, ModalWrappedTextLabel
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
15 from pyntnclick.widgets.imagebutton import ImageButtonWidget
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
16
576
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
17 # 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
18 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
19 constants = GameConstants()
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
20 SCREEN = constants.screen
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
21 LEAVE = constants.leave
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents: 553
diff changeset
22
201
9531a22721d1 Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents: 195
diff changeset
23
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
24 class InventorySlot(ImageButtonWidget):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
25 SELECTED_COLOR = Color("yellow")
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
26 SELECTED_WIDTH = 2
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
27
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
28 def __init__(self, rect, gd):
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
29 self.item = None
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
30 super(InventorySlot, self).__init__(rect, gd, None)
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
31 self.add_callback(MOUSEBUTTONDOWN, self.mouse_down)
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
32
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
33 def set_item(self, item):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
34 self.item = item
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
35
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
36 def draw(self, surface):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
37 if self.item:
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
38 surface.blit(self.item.get_inventory_image(), self.rect)
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
39 if self.selected:
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
40 pygame.draw.rect(surface, self.SELECTED_COLOR,
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
41 self.rect, self.SELECTED_WIDTH)
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
42
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
43 @property
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
44 def selected(self):
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
45 return self.parent.game.tool is self.item
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
46
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
47 def mouse_down(self, event, widget):
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
48 if event.button != 1 or not self.item:
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
49 return
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
50 if self.selected:
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
51 self.parent.select(None)
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
52 elif self.item.is_interactive(self.parent.game.tool):
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
53 result = self.item.interact(self.parent.game.tool)
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
54 handle_result(result, self.parent.state_widget)
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
55 else:
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
56 self.parent.select(self.item)
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
57
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
58
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
59 class UpDownButton(TextButton):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
60 # TextButton for now.
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
61 def __init__(self, rect, gd):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
62 super(UpDownButton, self).__init__(rect, gd, self.TEXT, padding=3)
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
63
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
64
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
65 class UpButton(UpDownButton):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
66 TEXT = 'UP'
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
67
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
68
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
69 class DownButton(UpDownButton):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
70 TEXT = 'DN'
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
71
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
72
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
73 class InventoryView(Container):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
74 MIN_UPDOWN_WIDTH = 16
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
75
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
76 def __init__(self, rect, gd, screen):
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
77 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
78 super(InventoryView, self).__init__(rect, gd)
407
c7a6846262e3 Fix cursor handling after message dismissal.
Jeremy Thurgood <firxen@gmail.com>
parents: 401
diff changeset
79 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
80 self.game = screen.game
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
81 self.state_widget = screen.state_widget
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
82
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
83 slots = (self.rect.width - self.MIN_UPDOWN_WIDTH) / self.bsize
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
84 self.slots = [self.add(self.make_slot(i)) for i in range(slots)]
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
85 self.inv_offset = 0
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
86
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
87 self.updown_width = self.rect.width - slots * self.bsize
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
88 ud_left = self.rect.right - self.updown_width
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
89 self.up_button = self.add(UpButton(Rect(
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
90 (ud_left, self.rect.top),
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
91 (self.updown_width, self.rect.height / 2)), gd))
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
92 self.up_button.add_callback(MOUSEBUTTONDOWN, self.up_callback)
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
93 self.down_button = self.add(DownButton(Rect(
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
94 (ud_left, self.rect.top + self.rect.height / 2),
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
95 (self.updown_width, self.rect.height / 2)), gd))
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
96 self.down_button.add_callback(MOUSEBUTTONDOWN, self.down_callback)
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
97
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
98 self.add_callback(MOUSEBUTTONDOWN, self.mouse_down)
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
99 self.update_slots()
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
100
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
101 def make_slot(self, slot):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
102 rect = Rect((self.rect.left + slot * self.bsize, self.rect.top),
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
103 (self.bsize, self.rect.height))
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
104 return InventorySlot(rect, self.gd)
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
105
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
106 def up_callback(self, event, widget):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
107 self.inv_offset = max(self.inv_offset - len(self.slots), 0)
677
a8c42709a689 Event-driven inventory management magic. No more inventory recreation every frame!
Jeremy Thurgood <firxen@gmail.com>
parents: 676
diff changeset
108 self.update_slots()
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
109
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
110 def down_callback(self, event, widget):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
111 self.inv_offset += len(self.slots)
677
a8c42709a689 Event-driven inventory management magic. No more inventory recreation every frame!
Jeremy Thurgood <firxen@gmail.com>
parents: 676
diff changeset
112 self.update_slots()
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
113
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
114 def update_slots(self):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
115 items = (self.slot_items + [None] * len(self.slots))[:len(self.slots)]
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
116 for item, slot in zip(items, self.slots):
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
117 slot.set_item(item)
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
118
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
119 if self.inv_offset <= 0:
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
120 self.up_button.disable()
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
121 else:
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
122 self.up_button.enable()
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
123
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
124 max_slot = (self.inv_offset + len(self.slots))
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
125 if max_slot >= len(self.game.inventory):
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
126 self.down_button.disable()
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
127 else:
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
128 self.down_button.enable()
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
129
652
Jeremy Thurgood <firxen@gmail.com>
parents: 651
diff changeset
130 def draw(self, surface):
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
131 super(InventoryView, self).draw(surface)
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
132
669
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
133 @property
562f8133bb07 Better inventory handling.
Jeremy Thurgood <firxen@gmail.com>
parents: 667
diff changeset
134 def slot_items(self):
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
135 return self.game.inventory[self.inv_offset:][:len(self.slots)]
26
0a68d137f509 Initial inventory palette thing.
Jeremy Thurgood <firxen@gmail.com>
parents: 24
diff changeset
136
650
7cc0da0a4633 Hook in the (still pretty useless) inventory widget.
Jeremy Thurgood <firxen@gmail.com>
parents: 647
diff changeset
137 def mouse_down(self, event, widget):
407
c7a6846262e3 Fix cursor handling after message dismissal.
Jeremy Thurgood <firxen@gmail.com>
parents: 401
diff changeset
138 if event.button != 1:
672
55d5d384fc16 Widget-based inventory view.
Jeremy Thurgood <firxen@gmail.com>
parents: 671
diff changeset
139 self.game.cancel_doodah(self.screen)
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
140
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
141 def select(self, tool):
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
142 self.game.set_tool(tool)
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
143
40
9fdbfbc02a60 Minor build script and inventory fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 36
diff changeset
144
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
145 class StateWidget(Container):
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
146
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
147 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
148 super(StateWidget, self).__init__(rect, gd)
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
149 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
150 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
151 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
152 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
153 self.add_callback(MOUSEMOTION, self.mouse_move)
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
154 self._message_queue = []
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
155
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
156 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
157 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
158 # 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
159 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
160 #self.animate()
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
161 # 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
162 # 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
163 # # 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
164 # 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
165 #else:
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
166 # 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
167 # 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
168 # with detail views
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
169 if self.game.current_detail:
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
170 self.game.current_detail.draw_description(surface)
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
171 else:
122204fb6eb1 Defer drawing description to StateWidget
Neil Muller <neil@dip.sun.ac.za>
parents: 650
diff changeset
172 self.game.current_scene.draw_description(surface)
515
fda2b3a2f2e9 Remove drawing logic from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 512
diff changeset
173
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
174 def queue_widget(self, widget):
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
175 self._message_queue.append(widget)
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
176
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
177 def mouse_down(self, event, widget):
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
178 if self.game.current_detail:
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
179 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
180 self.mouse_move(event, widget)
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
181 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
182 self.game.cancel_doodah(self.screen)
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
183 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
184 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
185 handle_result(result, self)
71
99c5506de7ea Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 70
diff changeset
186
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
187 def animate(self):
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
188 # XXX: if self.game.animate():
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
189 # queue a redraw
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
190 # self.invalidate()
120
48d24a48d0ce Enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents: 119
diff changeset
191 # 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
192 # 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
193 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
194 handle_result(result, self)
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
195 if self._message_queue:
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
196 # Only add a message if we're at the top
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
197 if self.screen.modal_magic.is_top(self.screen.inner_container):
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
198 widget = self._message_queue.pop(0)
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
199 self.screen.modal_magic.add(widget)
659
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
200 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
201 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
202 else:
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
203 self.game.current_scene.animate()
105
65976205fc2d Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents: 100
diff changeset
204
635
d9623d453fd9 Hook up events in StateWidget. (They still do nothing, though.)
Jeremy Thurgood <firxen@gmail.com>
parents: 634
diff changeset
205 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
206 if self.game.current_detail:
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
207 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
208 self.game.highlight_override = False
637
c27087877c84 Mouse events propagate! Crashes galore!
Jeremy Thurgood <firxen@gmail.com>
parents: 635
diff changeset
209 self.game.current_scene.mouse_move(event.pos)
c27087877c84 Mouse events propagate! Crashes galore!
Jeremy Thurgood <firxen@gmail.com>
parents: 635
diff changeset
210 self.game.old_pos = event.pos
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
211
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
212 def show_message(self, message):
133
0530547a131f Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents: 129
diff changeset
213 # Display the message as a modal dialog
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
214 # 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
215 # 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
216 # XXX: self.invalidate()
139
a5972444ad1e Improve cursor state handling, disable highlights on modal dialogs
Stefano Rivera <stefano@rivera.za.net>
parents: 137
diff changeset
217 # The cursor could have gone anywhere
632
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
218 # XXX: if self.subwidgets:
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
219 # 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
220 # else:
6ba418db1e84 XXX: now with even more bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 630
diff changeset
221 # self._mouse_move(mouse.get_pos())
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
222 rect = Rect((0, 0), (1, 1))
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
223 widget = ModalWrappedTextLabel(rect, self.gd, message,
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
224 max_width=self.gd.constants.screen[0] - 100)
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
225 widget.rect.center = self.rect.center
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
226 # We abuse animate so we can queue multiple results
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
227 # according
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
228 self.queue_widget(widget)
133
0530547a131f Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents: 129
diff changeset
229
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
230 def show_detail(self, detail):
384
56a05ae56574 Initial manual implementation.
Jeremy Thurgood <firxen@gmail.com>
parents: 358
diff changeset
231 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
232 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
233 self.add(self.detail)
646
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
234 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
235 # Centre the widget
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
236 detail_rect.center = self.rect.center
edcca10b8a53 Return of the centred detail views
Neil Muller <neil@dip.sun.ac.za>
parents: 645
diff changeset
237 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
238 self.game.do_enter_detail()
119
d5f7cccfdb6c Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents: 114
diff changeset
239
204
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
240 def clear_detail(self):
407d23635343 Add a close button to the detail view
Neil Muller <neil@dip.sun.ac.za>
parents: 201
diff changeset
241 """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
242 if self.game.current_detail is not None:
384
56a05ae56574 Initial manual implementation.
Jeremy Thurgood <firxen@gmail.com>
parents: 358
diff changeset
243 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
244 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
245 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
246 #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
247
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
248 def end_game(self):
654
335db68e0db4 Fix transition to end screen.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 652
diff changeset
249 self.screen.change_screen('end')
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
250
66
05346a412b55 A sprite cursor attempt
Stefano Rivera <stefano@rivera.za.net>
parents: 65
diff changeset
251
627
8ff93e53c882 XXX: this adds bugs.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 626
diff changeset
252 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
253 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
254 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
255 self.image_rect = None
187
fbfd8e748ac0 Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents: 167
diff changeset
256 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
257 self.game = screen.game
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
258 self.border_width = 5
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
259 self.border_color = (0, 0, 0)
217
146cec58ddd8 Highlight detailed view close button
Neil Muller <neil@dip.sun.ac.za>
parents: 210
diff changeset
260 # 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
261 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
262 text='Close')
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
263 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
264 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
265
643
e81df1abf3b5 Make detail windows display (not work, but display)
Neil Muller <neil@dip.sun.ac.za>
parents: 639
diff changeset
266 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
267 self.parent.clear_detail()
680
c9562e24bfed Don't propogate clicks on the close button
Neil Muller <neil@dip.sun.ac.za>
parents: 679
diff changeset
268 return True
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
269
443
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
270 def end_game(self):
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
271 self.parent.end_game()
3dab4984cbd7 Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents: 411
diff changeset
272
121
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
273 def set_image_rect(self, rect):
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
274 bw = self.border_width
2f672e98d488 Added border to DetailWindow.
Jeremy Thurgood <firxen@gmail.com>
parents: 120
diff changeset
275 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
276 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
277 self.close.rect.midbottom = rect.midbottom
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
278
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
279 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
280 # 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
281 # 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
282 # 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
283 # 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
284 self.game.current_detail.draw(
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
285 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
286 super(DetailWindow, self).draw(surface)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
287
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
288 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
289 self.mouse_move(event, widget)
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
290 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
291 self.game.cancel_doodah(self.screen)
397
b1dc0caec668 Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents: 384
diff changeset
292 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
293 result = self.game.interact_detail(
529
a6f9b6edb6c7 PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents: 528
diff changeset
294 self.global_to_local(event.pos))
397
b1dc0caec668 Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents: 384
diff changeset
295 handle_result(result, self)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
296
647
96daa4119745 Forward mouse_move events to detail windows as well.
Jeremy Thurgood <firxen@gmail.com>
parents: 646
diff changeset
297 def mouse_move(self, event, widget):
160
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
298 self._mouse_move(event.pos)
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
299
a5a7bb2b4b9b Fix mouse_move() handling after dismissing message.
Jeremy Thurgood <firxen@gmail.com>
parents: 147
diff changeset
300 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
301 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
302 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
303
679
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
304 def show_message(self, message):
fa168b5e2624 The return of the message dialog (and there was much rejoicing)
Neil Muller <neil@dip.sun.ac.za>
parents: 678
diff changeset
305 self.parent.show_message(message)
645
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
306 # self.invalidate()
4aae15dedc29 Pass click events on to detail window.
Jeremy Thurgood <firxen@gmail.com>
parents: 643
diff changeset
307
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
308
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
309 class ToolBar(Container):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
310 def __init__(self, rect, gd, screen):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
311 self.screen = screen
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
312 button_size = gd.constants.button_size
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
313
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
314 if not isinstance(rect, Rect):
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
315 rect = Rect(rect, (gd.constants.scene_size[0], button_size))
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
316 super(ToolBar, self).__init__(rect, gd)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
317
411
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
318 self.bg_color = (31, 31, 31)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
319 self.left = self.rect.left
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
320
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
321 self.menu_button = self.add_tool(
671
b27b5c6c54e8 Use constants for font location
Stefano Rivera <stefano@rivera.za.net>
parents: 669
diff changeset
322 0, TextButton, gd, "Menu", fontname=gd.constants.bold_font,
676
106efeae9745 Multiple inventory rows.
Jeremy Thurgood <firxen@gmail.com>
parents: 674
diff changeset
323 color="red", padding=1, border=0, bg_color="black")
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
324 self.menu_button.add_callback(MOUSEBUTTONDOWN, self.menu_callback)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
325
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
326 hand_image = gd.resource.get_image('items', 'hand.png')
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
327 self.hand_button = self.add_tool(
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
328 None, ImageButtonWidget, gd, hand_image)
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
329 self.hand_button.add_callback(MOUSEBUTTONDOWN, self.hand_callback)
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
330
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
331 self.inventory = self.add_tool(
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
332 self.rect.width - self.left, InventoryView, gd, screen)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
333
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
334 def add_tool(self, width, cls, *args, **kw):
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
335 rect = (self.left, self.rect.top)
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
336 if width is not None:
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
337 rect = Rect(rect, (width, self.rect.height))
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
338 tool = cls(rect, *args, **kw)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
339 self.add(tool)
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
340 self.left += tool.rect.width
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
341 return tool
411
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
342
0fc208423b98 Fixed inventory drawing.
Jeremy Thurgood <firxen@gmail.com>
parents: 407
diff changeset
343 def draw(self, surface):
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
344 bg = Surface(self.rect.size)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
345 bg.fill(self.bg_color)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
346 surface.blit(bg, self.rect)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
347 super(ToolBar, self).draw(surface)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
348
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
349 def hand_callback(self, event, widget):
674
94d3552bb4eb More neat, less crash.
Jeremy Thurgood <firxen@gmail.com>
parents: 673
diff changeset
350 self.inventory.select(None)
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
351
665
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
352 def menu_callback(self, event, widget):
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
353 self.screen.change_screen('menu')
12149ea1c18e Menu button.
Jeremy Thurgood <firxen@gmail.com>
parents: 659
diff changeset
354
74
75e1040a1121 Hacky "detail view" widget prototype.
Jeremy Thurgood <firxen@gmail.com>
parents: 73
diff changeset
355
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
356 class GameScreen(CursorScreen):
615
cb01c3a09ee1 GameScreen is grey
Stefano Rivera <stefano@rivera.za.net>
parents: 614
diff changeset
357
cb01c3a09ee1 GameScreen is grey
Stefano Rivera <stefano@rivera.za.net>
parents: 614
diff changeset
358 def setup(self):
658
2703924c8c70 Custom mouse cursors return
Stefano Rivera <stefano@rivera.za.net>
parents: 657
diff changeset
359 super(GameScreen, self).setup()
673
f67bc162d69e Working resume button
Stefano Rivera <stefano@rivera.za.net>
parents: 672
diff changeset
360 self.gd.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
361 self.create_initial_state = self.gd.initial_state
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
362 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
363 self.state_widget = None
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
364
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
365 def _clear_all(self):
618
1a8dceccd98e Use widget containers in _clear_all
Stefano Rivera <stefano@rivera.za.net>
parents: 616
diff changeset
366 for widget in self.container.children[:]:
1a8dceccd98e Use widget containers in _clear_all
Stefano Rivera <stefano@rivera.za.net>
parents: 616
diff changeset
367 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
368
619
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
369 def process_event(self, event_name, data):
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
370 if event_name == 'restart':
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
371 self.start_game()
677
a8c42709a689 Event-driven inventory management magic. No more inventory recreation every frame!
Jeremy Thurgood <firxen@gmail.com>
parents: 676
diff changeset
372 elif event_name == 'inventory':
a8c42709a689 Event-driven inventory management magic. No more inventory recreation every frame!
Jeremy Thurgood <firxen@gmail.com>
parents: 676
diff changeset
373 self.inventory.update_slots()
619
d9d1a9c4b833 Add ScreenEvents.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 618
diff changeset
374
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
375 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
376 self._clear_all()
678
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
377 self.modal_magic = self.container.add(
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
378 ModalStackContainer(self.container.rect.copy(), self.gd))
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
379 self.inner_container = self.modal_magic.add(
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
380 Container(self.container.rect.copy(), self.gd))
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
381 toolbar_height = self.gd.constants.button_size
634
b4007de091c5 Correct rect size for StateWidget
Stefano Rivera <stefano@rivera.za.net>
parents: 632
diff changeset
382 rect = Rect(0, 0, self.surface_size[0],
b4007de091c5 Correct rect size for StateWidget
Stefano Rivera <stefano@rivera.za.net>
parents: 632
diff changeset
383 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
384 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
385 self.state_widget = StateWidget(rect, self.gd, self)
678
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
386 self.inner_container.add(self.state_widget)
29
6322d92dc8f0 Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents: 28
diff changeset
387
657
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
388 self.toolbar = ToolBar((0, rect.height), self.gd, self)
0df0c81a3d8b Better inventory magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 656
diff changeset
389 self.inventory = self.toolbar.inventory
678
36d7f7e9650e Modal magic. (And yes, it is quite magical.)
Jeremy Thurgood <firxen@gmail.com>
parents: 677
diff changeset
390 self.inner_container.add(self.toolbar)
93
350ce4ebe122 Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 84
diff changeset
391
673
f67bc162d69e Working resume button
Stefano Rivera <stefano@rivera.za.net>
parents: 672
diff changeset
392 self.gd.running = True
34
e5c043aeed65 Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 29
diff changeset
393
659
363b603794f5 Re-add animations (and also fix some enter/leave event stuff)
Neil Muller <neil@dip.sun.ac.za>
parents: 658
diff changeset
394 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
395 """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
396 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
397 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
398
656
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
399 def key_pressed(self, event, widget):
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
400 if event.key == K_ESCAPE:
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
401 self.change_screen('menu')
59d16b45ee4c Handle ESC from game
Stefano Rivera <stefano@rivera.za.net>
parents: 654
diff changeset
402
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
403
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
404 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
405 """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
406
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
407 def setup(self):
625
85153f422522 Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents: 624
diff changeset
408 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
409
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
410 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
411 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
412
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
413
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
414 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
415 """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
416
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
417 def setup(self):
625
85153f422522 Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents: 624
diff changeset
418 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
419
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
420 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
421 surface.blit(self.background, (0, 0))