Mercurial > skaapsteker
annotate skaapsteker/sprites/player.py @ 315:0fc2b9d1a9cb
Recreate inventory image on scene changes
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 00:04:35 +0200 |
| parents | f29999d1bba6 |
| children | 0dc80b153580 |
| rev | line source |
|---|---|
| 90 | 1 """Class for dealing with the player""" |
| 2 | |
| 3 import pygame.transform | |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
4 import time |
| 90 | 5 |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
6 from ..sprites.base import find_sprite, TILE_SIZE, PC_LAYER, MONSTER_LAYER |
| 248 | 7 from ..physics import Sprite |
| 8 from ..constants import Layers | |
| 9 from ..data import get_files, load_image | |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
10 from ..engine import PlayerDied, ItemRepopulationEvent |
| 90 | 11 |
| 12 | |
| 13 class Player(Sprite): | |
| 14 | |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
90
diff
changeset
|
15 collision_layer = PC_LAYER |
|
100
3eafceff6293
Have monsters also collide with players as an interim solution while I relax, eat dinner and think about the best way to use the new collision layers.
Simon Cross <hodgestar@gmail.com>
parents:
97
diff
changeset
|
16 collides_with = set([MONSTER_LAYER]) |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
17 wants_updates = True |
|
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
90
diff
changeset
|
18 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
19 block = True |
|
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
20 |
| 266 | 21 _max_sprint_time = 2 |
| 22 | |
| 263 | 23 def __init__(self, the_world, soundsystem): |
| 90 | 24 Sprite.__init__(self) |
| 25 self.image = None | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
26 self.rect = None |
| 90 | 27 self._image_dict = {} |
| 263 | 28 self._soundsystem = soundsystem |
| 29 self._soundsystem.load_sound('yelp', 'sounds/yelp.ogg') | |
| 120 | 30 self._animation_frame = 0.0 |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
31 self._last_time = time.time() |
| 90 | 32 # State flags and such |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
33 self.attacking = 0 |
| 90 | 34 self.running = False |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
35 self.sprinting = 0 |
| 90 | 36 self.jumping = False |
| 37 self.flying = False | |
| 38 self._load_images() | |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
39 self.inventory_image = None |
| 90 | 40 # We muck with these in load for convience, so ensure they're right |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
41 self.the_world = the_world |
| 90 | 42 self.set_facing('left') |
| 43 self.set_image() | |
| 44 self.set_pos((0, 0)) | |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
45 self._collisions_seen = 0 |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
46 self._last_collide = [] |
| 90 | 47 self._layer = Layers.PLAYER |
| 48 | |
| 49 def set_image(self): | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
50 key = self._make_key(len(self.the_world.fox.tails)) |
| 120 | 51 images = self._image_dict[key] |
| 52 if self._animation_frame >= len(images): | |
| 53 self._animation_frame = 0.0 | |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
54 if self.rect: |
|
151
06be025c821c
Use midbottom, rather than bottomleft, when changing fox frames
Neil Muller <drnlmuller@gmail.com>
parents:
149
diff
changeset
|
55 cur_pos = self.collide_rect.midbottom |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
56 else: |
|
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
57 cur_pos = (0, 0) |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
58 # TODO: can save a lot of calculation here by caching collision rects |
|
149
5b4d73d301a1
Don't change image if it will introduce new collisions
Neil Muller <drnlmuller@gmail.com>
parents:
148
diff
changeset
|
59 cand_image = images[int(self._animation_frame)] |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
60 cand_collide_rect = cand_image.get_bounding_rect(1).inflate(-2,-2) |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
61 cand_rect = cand_image.get_rect() |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
62 cand_rect_offset = cand_rect.centerx - cand_collide_rect.centerx, cand_rect.bottom - cand_collide_rect.bottom |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
63 cand_rect.midbottom = cur_pos[0] + cand_rect_offset[0], cur_pos[1] + cand_rect_offset[1] |
|
151
06be025c821c
Use midbottom, rather than bottomleft, when changing fox frames
Neil Muller <drnlmuller@gmail.com>
parents:
149
diff
changeset
|
64 cand_collide_rect.midbottom = cur_pos |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
65 # We always allow the attacking animation frames |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
66 if not self.check_collide_rect(cand_collide_rect, cand_rect, cand_image) and not self.attacking: |
|
149
5b4d73d301a1
Don't change image if it will introduce new collisions
Neil Muller <drnlmuller@gmail.com>
parents:
148
diff
changeset
|
67 return |
|
172
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
68 self.image = cand_image |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
69 self.collide_rect = cand_collide_rect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
70 self.rect = cand_rect |
|
bf144d817113
if year in range(1980, 1990): continue # how can we sleep while the kitsune is stuck to the floor?
Simon Cross <hodgestar@gmail.com>
parents:
167
diff
changeset
|
71 self.rect_offset = cand_rect_offset |
|
144
6b488e1351a5
Buggy ground implementation. Make the world less bouncy
Neil Muller <drnlmuller@gmail.com>
parents:
122
diff
changeset
|
72 self.init_pos() |
| 90 | 73 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
74 def update(self): |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
75 self._touching_actionables = [] |
| 120 | 76 v_x, v_y = self.velocity |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
77 # Never animate slower than !7 fps, never faster than ~15 fps |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
78 if self.attacking > 0: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
79 if self._last_time: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
80 if time.time() - self._last_time > 0.15: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
81 self._animation_frame += 1 |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
82 self.attacking -= 1 |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
83 self._last_time = time.time() |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
84 else: |
|
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
85 self._last_time = time.time() |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
86 else: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
87 old_frame = self._animation_frame |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
88 self._animation_frame += abs(v_x) / 300 |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
89 time_diff = time.time() - self._last_time |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
90 if int(self._animation_frame) - int(old_frame) > 0: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
91 # Check time diff |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
92 if time_diff < 0.10: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
93 # Delay animation frame jump |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
94 self._animation_frame -= abs(v_x) / 300 |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
95 else: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
96 self._last_time = time.time() |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
97 elif time_diff > 0.20: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
98 # Force animation frame jump |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
99 self._animation_frame = old_frame + 1 |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
100 self._last_time = time.time() |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
101 if self.sprinting > 0: |
| 266 | 102 if (time.time() - self._sprint_start_time) > self._max_sprint_time: |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
103 self.sprinting = 0 |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
104 if abs(v_x) < 80: |
|
148
0474df61d5b1
Clamp very slow horizontal motion
Neil Muller <drnlmuller@gmail.com>
parents:
147
diff
changeset
|
105 # Clamp when we're not moving at least 5 pixel / s |
|
0474df61d5b1
Clamp very slow horizontal motion
Neil Muller <drnlmuller@gmail.com>
parents:
147
diff
changeset
|
106 self.velocity = (0, v_y) |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
107 if self.sprinting == 1: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
108 self.sprinting = 0 |
| 160 | 109 self.running = not self.on_solid # if you're not on something you can't stand |
| 120 | 110 else: |
|
176
57a78f19c673
Hack player.py to have platformer physics
Neil Muller <drnlmuller@gmail.com>
parents:
172
diff
changeset
|
111 self.velocity = (0, v_y) # Standard platformer physics |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
112 if self.sprinting > 0: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
113 self.sprinting = 1 |
| 120 | 114 self.running = True |
| 115 self.set_image() | |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
116 if self._collisions_seen > 2 * len(self._last_collide): |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
117 # Can we find a position "nearby" that reduces the collision |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
118 # surface |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
119 best_move = (0, 0) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
120 clip_area = 0 |
|
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
121 for obj in self._last_collide[:]: |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
122 if not obj.collide_rect.colliderect(self.collide_rect): |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
123 # Prune stale objects from the list |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
124 self._last_collide.remove(obj) |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
125 continue |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
126 clip = obj.collide_rect.clip(self.collide_rect) |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
127 clip_area += clip.width * clip.height |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
128 if (obj.floor or obj.block) and \ |
|
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
129 clip.width > TILE_SIZE[0] / 2 and \ |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
130 self.collide_rect.bottom < obj.collide_rect.top + TILE_SIZE[1] / 3: |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
131 delta = self.rect.bottom - self.collide_rect.bottom |
|
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
132 self.collide_rect.bottom = obj.collide_rect.top - 1 |
|
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
133 self.rect.bottom = self.collide_rect.bottom + delta |
|
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
134 self.init_pos() |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
135 return # Jump out of this case |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
136 min_area = clip_area |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
137 for attempt in [(0, 2), (2, 0), (-2, 0), (2, 2), (-2, 2)]: |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
138 clip_area = 0 |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
139 for obj in self._last_collide: |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
140 cand_rect = self.collide_rect.move(attempt) |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
141 clip = obj.collide_rect.clip(cand_rect) |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
142 clip_area += clip.width * clip.height |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
143 if clip_area < min_area: |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
144 min_area = clip_area |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
145 best_move = attempt |
|
253
dff6287b55b7
Prefer downward moves if all things are equal to reduce 'holding oneself against the wall in mid-air' options
Neil Muller <drnlmuller@gmail.com>
parents:
248
diff
changeset
|
146 elif clip_area == min_area and attempt[1] > best_move[1]: |
|
dff6287b55b7
Prefer downward moves if all things are equal to reduce 'holding oneself against the wall in mid-air' options
Neil Muller <drnlmuller@gmail.com>
parents:
248
diff
changeset
|
147 # Of equal choices, prefer that which moves us downwards |
|
dff6287b55b7
Prefer downward moves if all things are equal to reduce 'holding oneself against the wall in mid-air' options
Neil Muller <drnlmuller@gmail.com>
parents:
248
diff
changeset
|
148 best_move = attempt |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
149 self.collide_rect.move_ip(best_move) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
150 self.rect.move_ip(best_move) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
151 self.init_pos() |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
152 self._last_collide = [] |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
153 self._collisions_seen = 0 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
154 |
| 90 | 155 def set_facing(self, new_facing): |
| 156 self.facing = new_facing | |
| 157 | |
|
149
5b4d73d301a1
Don't change image if it will introduce new collisions
Neil Muller <drnlmuller@gmail.com>
parents:
148
diff
changeset
|
158 def collided(self, other): |
| 210 | 159 if self.attacking and hasattr(other, 'damage'): |
| 160 # FIXME: Check if we're facing the right way | |
| 161 other.damage(5) | |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
162 if other not in self._last_collide and (other.floor or other.block): |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
163 self._last_collide.append(other) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
164 self._collide_pos = self.collide_rect.midbottom |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
165 self._collisions_seen = 0 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
166 elif other in self._last_collide: |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
167 self._collisions_seen += 1 |
|
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
168 if hasattr(other, 'collided_player'): |
|
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
169 other.collided_player(self) |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
170 print 'Health', self.the_world.fox.cur_health |
|
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
171 |
| 209 | 172 |
|
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
173 def damage(self, damage): |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
174 self.the_world.fox.cur_health -= damage |
| 263 | 175 self._soundsystem.play_sound('yelp') |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
176 if self.the_world.fox.cur_health <= 0: |
|
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
177 PlayerDied.post() |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
178 |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
179 def restore(self): |
|
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
180 """Restore player to max health (for restarting levels, etc.)""" |
|
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
181 self.the_world.fox.cur_health = self.the_world.fox.max_health |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
182 |
| 90 | 183 def set_pos(self, pos): |
|
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
184 self.rect.midbottom = pos[0] * TILE_SIZE[0] + self.rect_offset[0], (pos[1] + 1) * TILE_SIZE[1] + self.rect_offset[1] |
| 272 | 185 self.collide_rect.midbottom = pos[0] * TILE_SIZE[0], (pos[1] + 1) * TILE_SIZE[1] |
| 90 | 186 |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
187 def action_left(self): |
| 115 | 188 if self.facing != 'left': |
| 189 self.facing = 'left' | |
| 190 self.set_image() | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
191 if self.sprinting > 0: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
192 self.sprinting = 1 |
| 266 | 193 self.deltav((-900.0, 0.0)) |
| 194 else: | |
| 195 self.deltav((-450.0, 0.0)) | |
| 196 | |
| 197 def action_double_left(self): | |
| 198 # FIXME: Tie this to the tails | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
199 if self.sprinting > 0: |
| 266 | 200 return |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
201 self.sprinting = 2 |
| 266 | 202 self._sprint_start_time = time.time() |
| 203 | |
| 204 def action_double_right(self): | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
205 if self.sprinting > 0: |
| 266 | 206 return |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
207 self.sprinting = 2 |
| 266 | 208 self._sprint_start_time = time.time() |
| 90 | 209 |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
210 def action_double_up(self): |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
211 pass |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
212 |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
213 def action_right(self): |
| 115 | 214 if self.facing != 'right': |
| 215 self.facing = 'right' | |
| 216 self.set_image() | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
217 if self.sprinting > 0: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
218 self.sprinting = 1 # Flag so stopping works |
| 266 | 219 self.deltav((900.0, 0.0)) |
| 220 else: | |
| 221 self.deltav((450.0, 0.0)) | |
| 222 | |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
223 |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
224 def action_up(self): |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
151
diff
changeset
|
225 if self.on_solid: |
|
177
88a78fb9fa82
Tweak some constants to make player motion more comfortable.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
226 self.deltav((0.0, -self.terminal_velocity[1])) |
|
152
60138b935bc0
Make enemies block by default, so we can jump off them
Neil Muller <drnlmuller@gmail.com>
parents:
151
diff
changeset
|
227 self.on_solid = False |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
228 |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
229 def action_down(self): |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
230 print self._touching_actionables |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
231 if self._touching_actionables: |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
232 self._touching_actionables[0].player_action(self) |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
233 elif self.the_world.fox.item is not None: |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
234 self.drop_item() |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
235 |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
236 |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
237 def action_fire1(self): |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
238 # FIXME: Use the correct tail properties for this |
|
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
239 if len(self.the_world.fox.tails) < 2: |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
240 # Only have a bite attack |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
241 print 'attacking' |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
242 self.attacking = 2 |
|
102
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
243 print "F1" |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
244 |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
245 def action_fire2(self): |
|
2e913a89e69d
Link up key presses to calls to action functions on player and to quitting level.
Simon Cross <hodgestar@gmail.com>
parents:
100
diff
changeset
|
246 print "F2" |
| 90 | 247 |
| 248 def _get_action(self): | |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
249 if self.attacking: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
250 return 'attacking' |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
251 if (self.sprinting > 0) and self.running: |
| 266 | 252 return 'sprinting' |
| 90 | 253 if self.running: |
| 254 return 'running' | |
| 255 if self.jumping: | |
| 256 return 'jumpin' | |
| 257 return 'standing' | |
| 258 | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
259 def _make_key(self, tails, action=None): |
| 90 | 260 if action is None: |
| 261 action = self._get_action() | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
262 if tails >= 4: |
| 90 | 263 tails = 4 |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
264 elif tails >= 2: |
| 90 | 265 tails = 2 |
| 266 return '%s %s %d' % (action, self.facing, tails) | |
| 267 | |
| 268 def _load_images(self): | |
| 158 | 269 for action in ['standing', 'running', 'jumping', 'attacking']: |
| 90 | 270 for tails in [0, 1, 2, 4]: |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
271 directory = 'sprites/kitsune_%s/kitsune_%s_%dtail' % (action, action, tails) |
| 90 | 272 for facing in ['left', 'right']: |
| 273 self.facing = facing | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
274 key = self._make_key(tails, action) |
| 90 | 275 self._image_dict[key] = [] |
| 276 for image_file in get_files(directory): | |
| 277 if image_file.startswith('.'): | |
| 278 # Skip extra junk for now | |
| 279 continue | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
280 image = load_image('%s/%s' % (directory, image_file)) |
| 266 | 281 if action == 'running': |
| 282 sprint_key = self._make_key(tails, 'sprinting') | |
| 283 if sprint_key not in self._image_dict: | |
| 284 self._image_dict[sprint_key] = [] | |
| 285 shockwave = load_image('sprites/kitsune_shockwave.png') | |
| 286 if facing == 'right': | |
| 287 shockwave = pygame.transform.flip(shockwave, True, False) | |
| 90 | 288 if facing == 'right': |
| 289 image = pygame.transform.flip(image, True, False) | |
| 290 self._image_dict[key].append(image) | |
| 266 | 291 if action == 'running': |
| 292 sprint_image = image.copy() | |
| 293 sprint_image.blit(shockwave, (0, 0)) | |
| 294 self._image_dict[sprint_key].append(sprint_image) | |
| 209 | 295 |
| 296 | |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
297 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
298 def discard_item(self): |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
299 self.the_world.fox.item = None |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
300 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
301 |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
302 def get_sprite(self): |
| 209 | 303 my_item = self.the_world.fox.item |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
304 if my_item is None: |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
305 return None |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
306 world_item = getattr(self.the_world.items, my_item) |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
307 world_item.level = self.the_world.fox.level |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
308 world_item.pos = [a/b for a, b in zip(self.rect.center, TILE_SIZE)] |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
309 sprite_dict = world_item.copy() |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
310 sprite_dict.pop('level') |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
311 sprite_dict['name'] = my_item |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
312 sprite_dict['world'] = self.the_world |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
313 return find_sprite(sprite_dict, 'items') |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
314 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
315 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
316 def drop_item(self): |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
317 sprite = self.get_sprite() |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
318 if sprite is None: |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
319 return |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
320 self.discard_item() |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
321 ItemRepopulationEvent.post(sprite) |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
322 |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
323 |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
324 def take_item(self, item): |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
325 self.take_item_by_name(item.name) |
| 314 | 326 # We create a scaled version of the image for the inventory display |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
327 item.kill() |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
328 print "took", item |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
329 self.make_inventory_image() |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
330 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
331 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
332 def make_inventory_image(self): |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
333 sprite = self.get_sprite() |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
334 if sprite is None: |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
335 self.inventory_image = None |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
336 image = sprite.image |
| 314 | 337 if image.get_width() > image.get_height(): |
| 338 new_width = 48 | |
| 339 new_height = int(image.get_height() * (48.0 / image.get_width())) | |
| 340 else: | |
| 341 new_height = 48 | |
| 342 new_width = int(image.get_width() * (48.0 / image.get_height())) | |
| 343 self.inventory_image = pygame.transform.scale(image, (new_width, new_height)) | |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
344 |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
345 |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
346 def take_item_by_name(self, item_name): |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
347 self.drop_item() |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
348 getattr(self.the_world.items, item_name).level = "_limbo" |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
349 self.the_world.fox.item = item_name |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
350 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
351 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
352 def has_item(self, item): |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
353 return self.the_world.fox.item == item |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
354 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
355 |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
356 def add_actionable(self, actionable): |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
357 self._touching_actionables.append(actionable) |