Mercurial > pyntnclick

annotate pyntnclick/state.py @ 625:85153f422522 pyntnclick

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