Mercurial > pyntnclick
annotate pyntnclick/state.py @ 642:143c67501c79 pyntnclick
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
| author | Neil Muller <neil@dip.sun.ac.za> |
|---|---|
| date | Sun, 12 Feb 2012 01:41:41 +0200 |
| parents | e8daeb766939 |
| children | 1faced4e343a |
| rev | line source |
|---|---|
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
1 """Utilities and base classes for dealing with scenes.""" |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
2 |
|
498
168e9424fe91
Perform a deepcopy of INITIAL_DATA to allow mutable initial data to be used safely.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
484
diff
changeset
|
3 import copy |
|
168e9424fe91
Perform a deepcopy of INITIAL_DATA to allow mutable initial data to be used safely.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
484
diff
changeset
|
4 |
|
638
d1ec9e739e23
Make TextWidget work (probably)
Stefano Rivera <stefano@rivera.za.net>
parents:
636
diff
changeset
|
5 from widgets.text import TextWidget |
|
63
3087be3463e0
Some framework support for better message handling
Neil Muller <neil@dip.sun.ac.za>
parents:
56
diff
changeset
|
6 from pygame.rect import Rect |
|
68
158a13a48d48
Show interact rectangles when constants.DEBUG is True.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
65
diff
changeset
|
7 from pygame.color import Color |
|
158a13a48d48
Show interact rectangles when constants.DEBUG is True.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
65
diff
changeset
|
8 |
|
529
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
9 |
|
636
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
10 def frame_rect(surface, color, rect, thick = 1): |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
11 # FIXME: Stolen from albow |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
12 surface.fill(color, (rect.left, rect.top, rect.width, thick)) |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
13 surface.fill(color, (rect.left, rect.bottom - thick, rect.width, thick)) |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
14 surface.fill(color, (rect.left, rect.top, thick, rect.height)) |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
15 surface.fill(color, (rect.right - thick, rect.top, thick, rect.height)) |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
16 |
|
2748d3afcae5
Excise albow. Really.
Stefano Rivera <stefano@rivera.za.net>
parents:
625
diff
changeset
|
17 |
| 78 | 18 class Result(object): |
| 19 """Result of interacting with a thing""" | |
| 20 | |
|
529
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
21 def __init__(self, message=None, soundfile=None, detail_view=None, |
|
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
22 style=None, close_detail=False, end_game=False): |
| 78 | 23 self.message = message |
|
567
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
24 self.soundfile = soundfile |
|
133
0530547a131f
Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents:
132
diff
changeset
|
25 self.detail_view = detail_view |
|
210
eb101b6fb3dd
Transparent message dialogs.
Jeremy Thurgood <firxen@gmail.com>
parents:
201
diff
changeset
|
26 self.style = style |
|
403
df3216b369b1
Hook up navigation tab, Add won condition
Neil Muller <neil@dip.sun.ac.za>
parents:
397
diff
changeset
|
27 self.close_detail = close_detail |
|
443
3dab4984cbd7
Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents:
435
diff
changeset
|
28 self.end_game = end_game |
| 78 | 29 |
|
567
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
30 def play_sound(self, scene_widget): |
|
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
31 if self.soundfile: |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
32 sound = scene_widget.game.gd.sound.get_sound(self.soundfile) |
|
567
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
33 sound.play() |
|
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
34 |
|
133
0530547a131f
Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents:
132
diff
changeset
|
35 def process(self, scene_widget): |
|
126
f125bb60d7de
Move result handling to result object
Neil Muller <neil@dip.sun.ac.za>
parents:
125
diff
changeset
|
36 """Helper function to do the right thing with a result object""" |
|
567
b84534a1bd2e
Lazily load Result sounds.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
560
diff
changeset
|
37 self.play_sound(scene_widget) |
|
126
f125bb60d7de
Move result handling to result object
Neil Muller <neil@dip.sun.ac.za>
parents:
125
diff
changeset
|
38 if self.message: |
|
210
eb101b6fb3dd
Transparent message dialogs.
Jeremy Thurgood <firxen@gmail.com>
parents:
201
diff
changeset
|
39 scene_widget.show_message(self.message, self.style) |
|
133
0530547a131f
Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents:
132
diff
changeset
|
40 if self.detail_view: |
|
0530547a131f
Better map handling, detail_view stuff in Result.
Jeremy Thurgood <firxen@gmail.com>
parents:
132
diff
changeset
|
41 scene_widget.show_detail(self.detail_view) |
|
529
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
42 if (self.close_detail |
|
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
43 and hasattr(scene_widget, 'parent') |
|
a6f9b6edb6c7
PEP-8 gamescreen and state.
Jeremy Thurgood <firxen@gmail.com>
parents:
528
diff
changeset
|
44 and hasattr(scene_widget.parent, 'clear_detail')): |
|
403
df3216b369b1
Hook up navigation tab, Add won condition
Neil Muller <neil@dip.sun.ac.za>
parents:
397
diff
changeset
|
45 scene_widget.parent.clear_detail() |
|
443
3dab4984cbd7
Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents:
435
diff
changeset
|
46 if self.end_game: |
|
3dab4984cbd7
Redo way of reaching end screen
Neil Muller <neil@dip.sun.ac.za>
parents:
435
diff
changeset
|
47 scene_widget.end_game() |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
48 |
|
201
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
49 |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
50 def handle_result(result, scene_widget): |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
51 """Handle dealing with result or result sequences""" |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
52 if result: |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
53 if hasattr(result, 'process'): |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
54 result.process(scene_widget) |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
55 else: |
|
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
56 for res in result: |
|
362
4e939b3c73f8
Allow Nones in list of results
Neil Muller <neil@dip.sun.ac.za>
parents:
340
diff
changeset
|
57 if res: |
|
4e939b3c73f8
Allow Nones in list of results
Neil Muller <neil@dip.sun.ac.za>
parents:
340
diff
changeset
|
58 # List may contain None's |
|
4e939b3c73f8
Allow Nones in list of results
Neil Muller <neil@dip.sun.ac.za>
parents:
340
diff
changeset
|
59 res.process(scene_widget) |
|
201
9531a22721d1
Add support for lists of results
Neil Muller <neil@dip.sun.ac.za>
parents:
193
diff
changeset
|
60 |
|
313
40dd77f71e11
Computer typeface for JIM.
Jeremy Thurgood <firxen@gmail.com>
parents:
311
diff
changeset
|
61 |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
62 class Game(object): |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
63 """Complete game state. |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
64 |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
65 Game state consists of: |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
66 |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
67 * items |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
68 * scenes |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
69 """ |
|
560
28f03563f4db
Provide stubby access to sound and resource object from GameDescription on state and scene objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
554
diff
changeset
|
70 def __init__(self, gd): |
|
28f03563f4db
Provide stubby access to sound and resource object from GameDescription on state and scene objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
554
diff
changeset
|
71 # game description |
|
28f03563f4db
Provide stubby access to sound and resource object from GameDescription on state and scene objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
554
diff
changeset
|
72 self.gd = gd |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
73 # map of scene name -> Scene object |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
74 self.scenes = {} |
|
93
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
75 # map of detail view name -> DetailView object |
|
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
76 self.detail_views = {} |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
77 # map of item name -> Item object |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
78 self.items = {} |
|
33
f8e02d02c782
Convert inventory to list of item objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
32
diff
changeset
|
79 # list of item objects in inventory |
|
f8e02d02c782
Convert inventory to list of item objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
32
diff
changeset
|
80 self.inventory = [] |
| 73 | 81 # currently selected tool (item) |
| 82 self.tool = None | |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
83 # Global game data |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
84 self.data = {} |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
85 # current scene |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
86 self.current_scene = None |
|
93
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
87 # current detail view |
|
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
88 self.current_detail = None |
| 120 | 89 # scene we came from, for enter and leave processing |
| 90 self.previous_scene = None | |
| 91 # scene transion helpers | |
| 92 self.do_check = None | |
| 93 self.old_pos = None | |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
94 # current thing |
|
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
95 self.current_thing = None |
|
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
96 self.highlight_override = False |
|
553
ebb2efcb4ea7
Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
551
diff
changeset
|
97 # debug rects |
|
ebb2efcb4ea7
Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
551
diff
changeset
|
98 self.debug_rects = False |
|
ebb2efcb4ea7
Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
551
diff
changeset
|
99 |
|
ebb2efcb4ea7
Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
551
diff
changeset
|
100 def set_debug_rects(self, value=True): |
|
ebb2efcb4ea7
Create a re-usable main function.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
551
diff
changeset
|
101 self.debug_rects = value |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
102 |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
103 def add_scene(self, scene): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
104 scene.set_game(self) |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
105 self.scenes[scene.name] = scene |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
106 |
|
93
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
107 def add_detail_view(self, detail_view): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
108 detail_view.set_game(self) |
|
93
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
109 self.detail_views[detail_view.name] = detail_view |
|
350ce4ebe122
Detail view without any functionality.
Jeremy Thurgood <firxen@gmail.com>
parents:
88
diff
changeset
|
110 |
|
32
18cb1af411ef
Add helper for adding items. Give items names. Make things take a rectangle.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
30
diff
changeset
|
111 def add_item(self, item): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
112 item.set_game(self) |
| 35 | 113 self.items[item.name] = item |
|
32
18cb1af411ef
Add helper for adding items. Give items names. Make things take a rectangle.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
30
diff
changeset
|
114 |
|
612
cfc16ded7b34
Fix scene/screen confusion
Neil Muller <neil@dip.sun.ac.za>
parents:
608
diff
changeset
|
115 def load_scenes(self, modname): |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
116 mod = __import__("gamelib.scenes.%s" % (modname,), fromlist=[modname]) |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
117 for scene_cls in mod.SCENES: |
|
608
a25cd1c6335a
Pass screens through engine by name
Neil Muller <neil@dip.sun.ac.za>
parents:
603
diff
changeset
|
118 scene = scene_cls(self) |
|
a25cd1c6335a
Pass screens through engine by name
Neil Muller <neil@dip.sun.ac.za>
parents:
603
diff
changeset
|
119 self.add_scene(scene) |
|
119
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
120 if hasattr(mod, 'DETAIL_VIEWS'): |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
121 for scene_cls in mod.DETAIL_VIEWS: |
|
608
a25cd1c6335a
Pass screens through engine by name
Neil Muller <neil@dip.sun.ac.za>
parents:
603
diff
changeset
|
122 scene = scene_cls(self) |
|
a25cd1c6335a
Pass screens through engine by name
Neil Muller <neil@dip.sun.ac.za>
parents:
603
diff
changeset
|
123 self.add_detail_view(scene) |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
124 |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
125 def set_current_scene(self, name): |
| 120 | 126 old_scene = self.current_scene |
|
29
6322d92dc8f0
Add state widget for rendering state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
28
diff
changeset
|
127 self.current_scene = self.scenes[name] |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
128 self.current_thing = None |
| 120 | 129 if old_scene and old_scene != self.current_scene: |
| 130 self.previous_scene = old_scene | |
| 131 self.set_do_enter_leave() | |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
132 |
|
119
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
133 def set_current_detail(self, name): |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
134 self.current_thing = None |
|
119
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
135 if name is None: |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
136 self.current_detail = None |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
137 else: |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
138 self.current_detail = self.detail_views[name] |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
139 return self.current_detail |
|
119
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
140 |
|
30
daf9eecb670f
Add inventory manipulation methods.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
29
diff
changeset
|
141 def add_inventory_item(self, name): |
|
33
f8e02d02c782
Convert inventory to list of item objects.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
32
diff
changeset
|
142 self.inventory.append(self.items[name]) |
|
30
daf9eecb670f
Add inventory manipulation methods.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
29
diff
changeset
|
143 |
|
331
a1ffc919d0c1
Add is_in_inventory helper
Neil Muller <neil@dip.sun.ac.za>
parents:
326
diff
changeset
|
144 def is_in_inventory(self, name): |
|
340
185eca15a42a
Don't crash if the item doesn't exist
Neil Muller <neil@dip.sun.ac.za>
parents:
336
diff
changeset
|
145 if name in self.items: |
|
185eca15a42a
Don't crash if the item doesn't exist
Neil Muller <neil@dip.sun.ac.za>
parents:
336
diff
changeset
|
146 return self.items[name] in self.inventory |
|
185eca15a42a
Don't crash if the item doesn't exist
Neil Muller <neil@dip.sun.ac.za>
parents:
336
diff
changeset
|
147 return False |
|
331
a1ffc919d0c1
Add is_in_inventory helper
Neil Muller <neil@dip.sun.ac.za>
parents:
326
diff
changeset
|
148 |
|
30
daf9eecb670f
Add inventory manipulation methods.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
29
diff
changeset
|
149 def remove_inventory_item(self, name): |
|
34
e5c043aeed65
Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
33
diff
changeset
|
150 self.inventory.remove(self.items[name]) |
|
117
139864ce8bdb
removed items can't be the current tool
Neil Muller <neil@dip.sun.ac.za>
parents:
107
diff
changeset
|
151 # Unselect tool if it's removed |
|
139864ce8bdb
removed items can't be the current tool
Neil Muller <neil@dip.sun.ac.za>
parents:
107
diff
changeset
|
152 if self.tool == self.items[name]: |
|
139864ce8bdb
removed items can't be the current tool
Neil Muller <neil@dip.sun.ac.za>
parents:
107
diff
changeset
|
153 self.set_tool(None) |
|
30
daf9eecb670f
Add inventory manipulation methods.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
29
diff
changeset
|
154 |
|
305
75783238f73d
Make replace_inventory_item use names for consisency
Neil Muller <neil@dip.sun.ac.za>
parents:
282
diff
changeset
|
155 def replace_inventory_item(self, old_item_name, new_item_name): |
|
167
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
156 """Try to replace an item in the inventory with a new one""" |
|
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
157 try: |
|
305
75783238f73d
Make replace_inventory_item use names for consisency
Neil Muller <neil@dip.sun.ac.za>
parents:
282
diff
changeset
|
158 index = self.inventory.index(self.items[old_item_name]) |
|
75783238f73d
Make replace_inventory_item use names for consisency
Neil Muller <neil@dip.sun.ac.za>
parents:
282
diff
changeset
|
159 self.inventory[index] = self.items[new_item_name] |
|
75783238f73d
Make replace_inventory_item use names for consisency
Neil Muller <neil@dip.sun.ac.za>
parents:
282
diff
changeset
|
160 if self.tool == self.items[old_item_name]: |
|
75783238f73d
Make replace_inventory_item use names for consisency
Neil Muller <neil@dip.sun.ac.za>
parents:
282
diff
changeset
|
161 self.set_tool(self.items[new_item_name]) |
|
167
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
162 except ValueError: |
|
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
163 return False |
|
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
164 return True |
|
5845a3ed4dad
Inventory interaction can (surprisingly) affect the inventory
Neil Muller <neil@dip.sun.ac.za>
parents:
166
diff
changeset
|
165 |
| 73 | 166 def set_tool(self, item): |
| 167 self.tool = item | |
| 168 | |
| 169 def interact(self, pos): | |
| 78 | 170 return self.current_scene.interact(self.tool, pos) |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
171 |
|
119
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
172 def interact_detail(self, pos): |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
173 return self.current_detail.interact(self.tool, pos) |
|
d5f7cccfdb6c
Hook up "detail view" scenes.
Jeremy Thurgood <firxen@gmail.com>
parents:
117
diff
changeset
|
174 |
|
397
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
175 def cancel_doodah(self, screen): |
|
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
176 if self.tool: |
|
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
177 self.set_tool(None) |
|
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
178 elif self.current_detail: |
|
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
179 screen.state_widget.clear_detail() |
|
b1dc0caec668
Improved mouse handling edge cases.
Jeremy Thurgood <firxen@gmail.com>
parents:
384
diff
changeset
|
180 |
|
314
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
181 def do_enter_detail(self): |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
182 if self.current_detail: |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
183 self.current_detail.enter() |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
184 |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
185 def do_leave_detail(self): |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
186 if self.current_detail: |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
187 self.current_detail.leave() |
|
63e702d93e0e
Call detail enter and leave hooks
Neil Muller <neil@dip.sun.ac.za>
parents:
313
diff
changeset
|
188 |
|
105
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
189 def animate(self): |
| 120 | 190 if not self.do_check: |
| 191 return self.current_scene.animate() | |
| 192 | |
|
187
fbfd8e748ac0
Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
193 def check_enter_leave(self, screen): |
| 120 | 194 if not self.do_check: |
| 195 return None | |
|
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
567
diff
changeset
|
196 if self.do_check == self.gd.constants.leave: |
|
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
567
diff
changeset
|
197 self.do_check = self.gd.constants.enter |
| 120 | 198 if self.previous_scene: |
| 199 return self.previous_scene.leave() | |
| 200 return None | |
|
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
567
diff
changeset
|
201 elif self.do_check == self.gd.constants.enter: |
| 120 | 202 self.do_check = None |
| 203 # Fix descriptions, etc. | |
| 204 if self.old_pos: | |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
205 self.current_scene.update_current_thing(self.old_pos) |
| 120 | 206 return self.current_scene.enter() |
| 207 raise RuntimeError('invalid do_check value %s' % self.do_check) | |
|
105
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
208 |
| 120 | 209 def set_do_enter_leave(self): |
| 210 """Flag that we need to run the enter loop""" | |
|
576
1b1ab71535bd
Classify constants, which involves a whole bunch of XXX comments
Stefano Rivera <stefano@rivera.za.net>
parents:
567
diff
changeset
|
211 self.do_check = self.gd.constants.leave |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
212 |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
213 |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
214 class GameDeveloperGizmo(object): |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
215 """Base class for objects game developers see.""" |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
216 |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
217 def __init__(self): |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
218 """Set """ |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
219 self.game = None |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
220 self.gd = None |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
221 self.resource = None |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
222 self.sound = None |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
223 |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
224 def set_game(self, game): |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
225 self.game = game |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
226 self.gd = game.gd |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
227 self.resource = self.gd.resource |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
228 self.sound = self.gd.sound |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
229 self.setup() |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
230 |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
231 def setup(self): |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
232 """Game developers should override this to do their setup. |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
233 |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
234 It will be called after all the useful state functions have been |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
235 set. |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
236 """ |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
237 pass |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
238 |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
239 |
|
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
240 class StatefulGizmo(GameDeveloperGizmo): |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
241 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
242 # initial data (optional, defaults to none) |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
243 INITIAL_DATA = None |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
244 STATE_KEY = None |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
245 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
246 def __init__(self): |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
247 GameDeveloperGizmo.__init__(self) |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
248 self.state_key = self.STATE_KEY |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
249 self.state = None # set this with set_state if required |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
250 |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
251 def set_state(self, state): |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
252 """Set the state object and initialize if needed""" |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
253 self.state = state |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
254 if self.state_key not in self.state: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
255 self.state[self.state_key] = {} |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
256 if self.INITIAL_DATA: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
257 # deep copy of INITIAL_DATA allows lists, sets and |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
258 # other mutable types to safely be used in INITIAL_DATA |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
259 self.state[self.state_key].update( |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
260 copy.deepcopy(self.INITIAL_DATA)) |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
261 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
262 def set_data(self, key, value): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
263 if self.state: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
264 self.state[self.state_key][key] = value |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
265 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
266 def get_data(self, key): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
267 if self.state: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
268 return self.state[self.state_key].get(key, None) |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
269 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
270 |
|
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
271 class Scene(StatefulGizmo): |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
272 """Base class for scenes.""" |
|
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
273 |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
274 # sub-folder to look for resources in |
| 22 | 275 FOLDER = None |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
276 |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
277 # name of background image resource |
| 22 | 278 BACKGROUND = None |
| 279 | |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
280 # name of scene (optional, defaults to folder) |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
281 NAME = None |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
282 |
| 278 | 283 # Offset of the background image |
| 284 OFFSET = (0, 0) | |
| 285 | |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
286 def __init__(self, state): |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
287 StatefulGizmo.__init__(self) |
|
28
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
288 # scene name |
|
0f25f7b9b37a
Add loading of initial state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
23
diff
changeset
|
289 self.name = self.NAME if self.NAME is not None else self.FOLDER |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
290 self.state_key = self.name |
| 22 | 291 # map of thing names -> Thing objects |
| 292 self.things = {} | |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
293 self._background = None |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
294 |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
295 def set_game(self, game): |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
296 super(Scene, self).set_game(game) |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
297 self.set_state(game.data) |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
298 |
| 35 | 299 def add_item(self, item): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
300 self.game.add_item(item) |
| 35 | 301 |
|
39
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
302 def add_thing(self, thing): |
|
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
303 self.things[thing.name] = thing |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
304 thing.set_game(self.game) |
|
41
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
305 thing.set_scene(self) |
|
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
306 |
|
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
307 def remove_thing(self, thing): |
|
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
308 del self.things[thing.name] |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
309 if thing is self.game.current_thing: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
310 self.game.current_thing.leave() |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
311 self.game.current_thing = None |
|
39
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
312 |
|
319
fd849354be58
Mouse handling refactorings.
Jeremy Thurgood <firxen@gmail.com>
parents:
314
diff
changeset
|
313 def _get_description(self): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
314 text = (self.game.current_thing and |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
315 self.game.current_thing.get_description()) |
|
76
1a5fdc225939
Add description rendering to scene rendering.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
75
diff
changeset
|
316 if text is None: |
|
1a5fdc225939
Add description rendering to scene rendering.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
75
diff
changeset
|
317 return None |
| 640 | 318 label = TextWidget((10, 10), self.gd, text) |
|
642
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
319 #label.set_margin(5) |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
320 #label.border_width = 1 |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
321 #label.border_color = (0, 0, 0) |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
322 #label.bg_color = Color(210, 210, 210, 255) |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
323 #label.fg_color = (0, 0, 0) |
|
76
1a5fdc225939
Add description rendering to scene rendering.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
75
diff
changeset
|
324 return label |
|
1a5fdc225939
Add description rendering to scene rendering.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
75
diff
changeset
|
325 |
|
187
fbfd8e748ac0
Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
326 def draw_description(self, surface, screen): |
|
319
fd849354be58
Mouse handling refactorings.
Jeremy Thurgood <firxen@gmail.com>
parents:
314
diff
changeset
|
327 description = self._get_description() |
|
fd849354be58
Mouse handling refactorings.
Jeremy Thurgood <firxen@gmail.com>
parents:
314
diff
changeset
|
328 if description is not None: |
|
642
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
329 description.draw(surface) |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
330 #x, y, w, h = description.rect |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
331 #sub = screen.get_root().surface.subsurface( |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
332 # Rect(400 - w / 2, 5, w, h)) |
|
143c67501c79
Make descriptions work (kinda, sorta, maybe if you squint at it just right)
Neil Muller <neil@dip.sun.ac.za>
parents:
640
diff
changeset
|
333 #description.draw_all(sub) |
|
76
1a5fdc225939
Add description rendering to scene rendering.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
75
diff
changeset
|
334 |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
335 def _cache_background(self): |
|
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
336 if self.BACKGROUND and not self._background: |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
337 self._background = self.resource.get_image( |
|
625
85153f422522
Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents:
612
diff
changeset
|
338 self.FOLDER, self.BACKGROUND) |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
339 |
| 22 | 340 def draw_background(self, surface): |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
341 self._cache_background() |
|
130
11afefc4aeaf
InteractText for mocking up scenes. Allow backgrounds to be None. Mock up map.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
129
diff
changeset
|
342 if self._background is not None: |
| 278 | 343 surface.blit(self._background, self.OFFSET, None) |
|
130
11afefc4aeaf
InteractText for mocking up scenes. Allow backgrounds to be None. Mock up map.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
129
diff
changeset
|
344 else: |
|
11afefc4aeaf
InteractText for mocking up scenes. Allow backgrounds to be None. Mock up map.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
129
diff
changeset
|
345 surface.fill((200, 200, 200)) |
|
18
c9b124c2f5c6
Start of scene drawing framework.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
11
diff
changeset
|
346 |
|
23
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
347 def draw_things(self, surface): |
|
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
348 for thing in self.things.itervalues(): |
|
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
349 thing.draw(surface) |
|
18
c9b124c2f5c6
Start of scene drawing framework.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
11
diff
changeset
|
350 |
|
187
fbfd8e748ac0
Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
351 def draw(self, surface, screen): |
| 22 | 352 self.draw_background(surface) |
|
23
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
353 self.draw_things(surface) |
|
187
fbfd8e748ac0
Remove screen reference from State.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
354 self.draw_description(surface, screen) |
|
18
c9b124c2f5c6
Start of scene drawing framework.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
11
diff
changeset
|
355 |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
356 def interact(self, item, pos): |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
357 """Interact with a particular position. |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
358 |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
359 Item may be an item in the list of items or None for the hand. |
| 78 | 360 |
| 361 Returns a Result object to provide feedback to the player. | |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
362 """ |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
363 if self.game.current_thing is not None: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
364 return self.game.current_thing.interact(item) |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
365 |
|
105
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
366 def animate(self): |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
367 """Animate all the things in the scene. |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
368 |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
369 Return true if any of them need to queue a redraw""" |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
370 result = False |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
371 for thing in self.things.itervalues(): |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
372 if thing.animate(): |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
373 result = True |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
374 return result |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
375 |
| 120 | 376 def enter(self): |
| 377 return None | |
| 378 | |
| 379 def leave(self): | |
| 380 return None | |
| 381 | |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
382 def update_current_thing(self, pos): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
383 if self.game.current_thing is not None: |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
384 if not self.game.current_thing.contains(pos): |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
385 self.game.current_thing.leave() |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
386 self.game.current_thing = None |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
387 for thing in self.things.itervalues(): |
|
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
388 if thing.contains(pos): |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
389 thing.enter(self.game.tool) |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
390 self.game.current_thing = thing |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
391 break |
|
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
392 |
|
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
393 def mouse_move(self, pos): |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
394 """Call to check whether the cursor has entered / exited a thing. |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
395 |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
396 Item may be an item in the list of items or None for the hand. |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
397 """ |
|
324
3476e8f3b100
Fixed mouse and cursor handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
319
diff
changeset
|
398 self.update_current_thing(pos) |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
399 |
|
125
d3ca34a664fd
Some detail view and data cleanup.
Jeremy Thurgood <firxen@gmail.com>
parents:
124
diff
changeset
|
400 def get_detail_size(self): |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
401 self._cache_background() |
|
127
9646e7c8bb97
Size detail window based on the Scene background image.
Jeremy Thurgood <firxen@gmail.com>
parents:
126
diff
changeset
|
402 return self._background.get_size() |
|
125
d3ca34a664fd
Some detail view and data cleanup.
Jeremy Thurgood <firxen@gmail.com>
parents:
124
diff
changeset
|
403 |
|
595
59f1ee3f5632
Remove albow.resources in a few more places.
Jeremy Thurgood <firxen@gmail.com>
parents:
592
diff
changeset
|
404 def get_image(self, *image_name_fragments, **kw): |
|
625
85153f422522
Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents:
612
diff
changeset
|
405 return self.resource.get_image(*image_name_fragments, **kw) |
|
595
59f1ee3f5632
Remove albow.resources in a few more places.
Jeremy Thurgood <firxen@gmail.com>
parents:
592
diff
changeset
|
406 |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
407 |
|
488
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
408 class InteractiveMixin(object): |
|
519
8f3c82c685a4
Fix is_interactive() by adding tool param.
Jeremy Thurgood <firxen@gmail.com>
parents:
518
diff
changeset
|
409 def is_interactive(self, tool=None): |
|
488
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
410 return True |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
411 |
|
492
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
412 def interact(self, tool): |
|
519
8f3c82c685a4
Fix is_interactive() by adding tool param.
Jeremy Thurgood <firxen@gmail.com>
parents:
518
diff
changeset
|
413 if not self.is_interactive(tool): |
|
492
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
414 return None |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
415 if tool is None: |
|
488
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
416 return self.interact_without() |
|
492
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
417 handler = getattr(self, 'interact_with_' + tool.tool_name, None) |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
418 inverse_handler = self.get_inverse_interact(tool) |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
419 if handler is not None: |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
420 return handler(tool) |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
421 elif inverse_handler is not None: |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
422 return inverse_handler(self) |
|
488
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
423 else: |
|
492
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
424 return self.interact_default(tool) |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
425 |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
426 def get_inverse_interact(self, tool): |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
427 return None |
|
488
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
428 |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
429 def interact_without(self): |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
430 return self.interact_default(None) |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
431 |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
432 def interact_default(self, item=None): |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
433 return None |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
434 |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
435 |
|
d8087848722d
Factor Thing interactive stuff out into a mixing. (Items to follow.)
Jeremy Thurgood <firxen@gmail.com>
parents:
487
diff
changeset
|
436 class Thing(StatefulGizmo, InteractiveMixin): |
| 22 | 437 """Base class for things in a scene that you can interact with.""" |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
438 |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
439 # name of thing |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
440 NAME = None |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
441 |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
442 # sub-folder to look for resources in (defaults to scenes folder) |
|
41
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
443 FOLDER = None |
|
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
444 |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
445 # list of Interact objects |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
446 INTERACTS = {} |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
447 |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
448 # name first interact |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
449 INITIAL = None |
|
41
ad6f56bfa8b7
Cryo door, titanium leg and some interaction prototypes.
Jeremy Thurgood <firxen@gmail.com>
parents:
39
diff
changeset
|
450 |
|
68
158a13a48d48
Show interact rectangles when constants.DEBUG is True.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
65
diff
changeset
|
451 # Interact rectangle hi-light color (for debugging) |
|
158a13a48d48
Show interact rectangles when constants.DEBUG is True.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
65
diff
changeset
|
452 # (set to None to turn off) |
|
282
fe899fb63866
Add option for turning off debugging rects while debugging.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
280
diff
changeset
|
453 _interact_hilight_color = Color('red') |
|
68
158a13a48d48
Show interact rectangles when constants.DEBUG is True.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
65
diff
changeset
|
454 |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
455 def __init__(self): |
|
55
2e2f6ff54780
Part of the cryo door puzzle.
Jeremy Thurgood <firxen@gmail.com>
parents:
47
diff
changeset
|
456 StatefulGizmo.__init__(self) |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
457 # name of the thing |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
458 self.name = self.NAME |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
459 # folder for resource (None is overridden by scene folder) |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
460 self.folder = self.FOLDER |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
461 self.state_key = self.NAME |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
462 # interacts |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
463 self.interacts = self.INTERACTS |
|
39
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
464 # these are set by set_scene |
|
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
465 self.scene = None |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
466 self.current_interact = None |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
467 self.rect = None |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
468 self.orig_rect = None |
|
7
d7c9d8273d7f
Start of base classes for game state.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
diff
changeset
|
469 |
| 278 | 470 def _fix_rect(self): |
| 471 """Fix rects to compensate for scene offset""" | |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
472 # Offset logic is to always work with copies, to avoid |
|
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
473 # flying effects from multiple calls to _fix_rect |
|
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
474 # See footwork in draw |
| 278 | 475 if hasattr(self.rect, 'collidepoint'): |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
476 self.rect = self.rect.move(self.scene.OFFSET) |
| 278 | 477 else: |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
478 self.rect = [x.move(self.scene.OFFSET) for x in self.rect] |
| 278 | 479 |
|
39
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
480 def set_scene(self, scene): |
|
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
481 assert self.scene is None |
|
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
482 self.scene = scene |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
483 if self.folder is None: |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
484 self.folder = scene.FOLDER |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
485 self.game = scene.game |
|
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
486 self.set_state(self.game.data) |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
487 for interact in self.interacts.itervalues(): |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
488 interact.set_thing(self) |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
489 self.set_interact(self.INITIAL) |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
490 |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
491 def set_interact(self, name): |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
492 self.current_interact = self.interacts[name] |
|
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
493 self.rect = self.current_interact.interact_rect |
| 278 | 494 if self.scene: |
| 495 self._fix_rect() | |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
496 assert self.rect is not None, name |
|
39
088a101f5b94
Add an example Thing to cryo scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
35
diff
changeset
|
497 |
|
94
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
498 def contains(self, pos): |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
499 if hasattr(self.rect, 'collidepoint'): |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
500 return self.rect.collidepoint(pos) |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
501 else: |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
502 # FIXME: add sanity check |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
503 for rect in list(self.rect): |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
504 if rect.collidepoint(pos): |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
505 return True |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
506 return False |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
507 |
|
63
3087be3463e0
Some framework support for better message handling
Neil Muller <neil@dip.sun.ac.za>
parents:
56
diff
changeset
|
508 def get_description(self): |
|
3087be3463e0
Some framework support for better message handling
Neil Muller <neil@dip.sun.ac.za>
parents:
56
diff
changeset
|
509 return None |
|
3087be3463e0
Some framework support for better message handling
Neil Muller <neil@dip.sun.ac.za>
parents:
56
diff
changeset
|
510 |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
511 def enter(self, item): |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
512 """Called when the cursor enters the Thing.""" |
|
139
a5972444ad1e
Improve cursor state handling, disable highlights on modal dialogs
Stefano Rivera <stefano@rivera.za.net>
parents:
137
diff
changeset
|
513 pass |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
514 |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
515 def leave(self): |
|
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
516 """Called when the cursr leaves the Thing.""" |
|
139
a5972444ad1e
Improve cursor state handling, disable highlights on modal dialogs
Stefano Rivera <stefano@rivera.za.net>
parents:
137
diff
changeset
|
517 pass |
|
71
99c5506de7ea
Start of interact handling.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
68
diff
changeset
|
518 |
|
105
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
519 def animate(self): |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
520 return self.current_interact.animate() |
|
65976205fc2d
Rough Stab at basic animation support
Neil Muller <neil@dip.sun.ac.za>
parents:
101
diff
changeset
|
521 |
|
23
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
522 def draw(self, surface): |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
523 old_rect = self.current_interact.rect |
|
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
524 if old_rect: |
|
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
525 self.current_interact.rect = old_rect.move(self.scene.OFFSET) |
|
86
593bddfacf18
Refactor Things a bit to render images.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
79
diff
changeset
|
526 self.current_interact.draw(surface) |
|
280
d9b19449436f
The flying fish fix (take 1)
Neil Muller <neil@dip.sun.ac.za>
parents:
278
diff
changeset
|
527 self.current_interact.rect = old_rect |
|
603
3ce19d33b51f
Rename state to game to not cause confusion with the other state
Neil Muller <neil@dip.sun.ac.za>
parents:
595
diff
changeset
|
528 if self.game.debug_rects and self._interact_hilight_color: |
|
94
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
529 if hasattr(self.rect, 'collidepoint'): |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
530 frame_rect(surface, self._interact_hilight_color, |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
531 self.rect.inflate(1, 1), 1) |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
532 else: |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
533 for rect in self.rect: |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
534 frame_rect(surface, self._interact_hilight_color, |
|
ce23fad8ecb3
More complex shaped interactables
Neil Muller <neil@dip.sun.ac.za>
parents:
93
diff
changeset
|
535 rect.inflate(1, 1), 1) |
|
23
1e90a3e4618e
Add code for blitting Scene.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
22
diff
changeset
|
536 |
| 22 | 537 |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
538 class Item(GameDeveloperGizmo, InteractiveMixin): |
| 22 | 539 """Base class for inventory items.""" |
| 540 | |
| 35 | 541 # image for inventory |
| 542 INVENTORY_IMAGE = None | |
|
32
18cb1af411ef
Add helper for adding items. Give items names. Make things take a rectangle.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
30
diff
changeset
|
543 |
| 490 | 544 # name of item |
| 545 NAME = None | |
| 546 | |
|
336
72e4d0c5dfe9
Clean-up two old TODOs.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
331
diff
changeset
|
547 # name for interactions (i.e. def interact_with_<TOOL_NAME>) |
| 226 | 548 TOOL_NAME = None |
| 549 | |
|
336
72e4d0c5dfe9
Clean-up two old TODOs.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
331
diff
changeset
|
550 # set to instance of CursorSprite |
|
72e4d0c5dfe9
Clean-up two old TODOs.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
331
diff
changeset
|
551 CURSOR = None |
|
72e4d0c5dfe9
Clean-up two old TODOs.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
331
diff
changeset
|
552 |
|
487
efb34a6cd2a1
Make name param to an Item optional and use NAME if present.
Jeremy Thurgood <firxen@gmail.com>
parents:
484
diff
changeset
|
553 def __init__(self, name=None): |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
554 GameDeveloperGizmo.__init__(self) |
|
487
efb34a6cd2a1
Make name param to an Item optional and use NAME if present.
Jeremy Thurgood <firxen@gmail.com>
parents:
484
diff
changeset
|
555 self.name = self.NAME |
|
efb34a6cd2a1
Make name param to an Item optional and use NAME if present.
Jeremy Thurgood <firxen@gmail.com>
parents:
484
diff
changeset
|
556 if name is not None: |
|
efb34a6cd2a1
Make name param to an Item optional and use NAME if present.
Jeremy Thurgood <firxen@gmail.com>
parents:
484
diff
changeset
|
557 self.name = name |
|
193
738608e90e9c
CloneableItem tweaks and a usable laser welder. zOMG!
Jeremy Thurgood <firxen@gmail.com>
parents:
191
diff
changeset
|
558 self.tool_name = name |
| 226 | 559 if self.TOOL_NAME is not None: |
| 560 self.tool_name = self.TOOL_NAME | |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
561 self.inventory_image = None |
|
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
562 |
|
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
563 def _cache_inventory_image(self): |
|
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
564 if not self.inventory_image: |
|
592
4e9178215e75
Introduce .setup() for GameDeveloperGizmos.
Simon Cross <hodgestar+bzr@gmail.com>
parents:
588
diff
changeset
|
565 self.inventory_image = self.resource.get_image( |
|
625
85153f422522
Differently yuck get_image().
Jeremy Thurgood <firxen@gmail.com>
parents:
612
diff
changeset
|
566 'items', self.INVENTORY_IMAGE) |
| 22 | 567 |
|
34
e5c043aeed65
Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
33
diff
changeset
|
568 def get_inventory_image(self): |
|
526
a984cf27b527
Defer some resource loading until it's actually necessary.
Jeremy Thurgood <firxen@gmail.com>
parents:
520
diff
changeset
|
569 self._cache_inventory_image() |
|
34
e5c043aeed65
Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
33
diff
changeset
|
570 return self.inventory_image |
|
e5c043aeed65
Inventory and items. And stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
33
diff
changeset
|
571 |
|
492
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
572 def get_inverse_interact(self, tool): |
|
c1f4f9149349
Unify Thing and Item interaction handling.
Jeremy Thurgood <firxen@gmail.com>
parents:
491
diff
changeset
|
573 return getattr(tool, 'interact_with_' + self.tool_name, None) |
|
166
0db92b3b5833
Add inventory interactions
Neil Muller <neil@dip.sun.ac.za>
parents:
161
diff
changeset
|
574 |
|
519
8f3c82c685a4
Fix is_interactive() by adding tool param.
Jeremy Thurgood <firxen@gmail.com>
parents:
518
diff
changeset
|
575 def is_interactive(self, tool=None): |
|
8f3c82c685a4
Fix is_interactive() by adding tool param.
Jeremy Thurgood <firxen@gmail.com>
parents:
518
diff
changeset
|
576 if tool: |
|
8f3c82c685a4
Fix is_interactive() by adding tool param.
Jeremy Thurgood <firxen@gmail.com>
parents:
518
diff
changeset
|
577 return True |
| 512 | 578 return False |
| 579 | |
| 191 | 580 |
| 581 class CloneableItem(Item): | |
| 582 _counter = 0 | |
| 583 | |
|
252
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
584 @classmethod |
|
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
585 def _get_new_id(cls): |
|
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
586 cls._counter += 1 |
|
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
587 return cls._counter - 1 |
|
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
588 |
|
487
efb34a6cd2a1
Make name param to an Item optional and use NAME if present.
Jeremy Thurgood <firxen@gmail.com>
parents:
484
diff
changeset
|
589 def __init__(self, name=None): |
| 490 | 590 super(CloneableItem, self).__init__(name) |
|
252
dfc89bc64fdb
Start of walkthrough "unit test" and associated fixes and tweaks.
Jeremy Thurgood <firxen@gmail.com>
parents:
241
diff
changeset
|
591 my_count = self._get_new_id() |
| 490 | 592 self.name = "%s.%s" % (self.name, my_count) |