Mercurial > skaapsteker
annotate skaapsteker/sprites/player.py @ 431:b753ea36909e
Fix the bug Anna found.
author | Jeremy Thurgood <firxen@gmail.com> |
---|---|
date | Sat, 09 Apr 2011 18:46:28 +0200 |
parents | 25efc74ac19c |
children | fe99a4e04b2b |
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 |
362 | 6 from ..sprites.base import find_sprite, Monster, TILE_SIZE, PC_LAYER, MONSTER_LAYER, PROJECTILE_LAYER |
366 | 7 from ..sprites.projectiles import Fireball, Lightning |
248 | 8 from ..physics import Sprite |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
9 from ..constants import Layers, FoxHud, DOUBLE_TAP_TIME, RECHARGE_TIME |
248 | 10 from ..data import get_files, load_image |
395 | 11 from ..engine import PlayerDied, AddSpriteEvent, OpenNotification |
90 | 12 |
408 | 13 from pygame.constants import BLEND_RGBA_MULT |
14 | |
90 | 15 class Player(Sprite): |
16 | |
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
90
diff
changeset
|
17 collision_layer = PC_LAYER |
362 | 18 collides_with = set([MONSTER_LAYER, PROJECTILE_LAYER]) |
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
19 wants_updates = True |
97
a1d95c6152a0
Shiny new collision detection. Read code for usage information.
Simon Cross <hodgestar@gmail.com>
parents:
90
diff
changeset
|
20 |
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
21 block = True |
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
22 |
266 | 23 |
263 | 24 def __init__(self, the_world, soundsystem): |
90 | 25 Sprite.__init__(self) |
26 self.image = None | |
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
27 self.rect = None |
90 | 28 self._image_dict = {} |
263 | 29 self._soundsystem = soundsystem |
30 self._soundsystem.load_sound('yelp', 'sounds/yelp.ogg') | |
120 | 31 self._animation_frame = 0.0 |
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
32 self._last_time = time.time() |
411 | 33 self._last_attacked = { |
34 'fireball': time.time(), | |
35 'lightning': time.time(), | |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
36 'shield': time.time(), |
411 | 37 } |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
38 self._inv_cache = {} # invisible fox image cache |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
39 self._shield_cache = {} # shielded fox image cache |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
40 self._shield_image = 0 # shield image |
90 | 41 # State flags and such |
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
42 self.attacking = 0 |
90 | 43 self.running = False |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
44 self.sprinting = 0 |
90 | 45 self.jumping = False |
408 | 46 self.flying = 0 |
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
47 self.prep_flight = 0.0 |
408 | 48 self.invisible = 0 |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
49 self.using_shield = 0 |
348 | 50 self.shape = 'fox' # Needed so load image does the right thing |
90 | 51 self._load_images() |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
52 self.inventory_image = None |
90 | 53 # 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
|
54 self.the_world = the_world |
348 | 55 self.shape = the_world.fox.shape |
335 | 56 self._me = the_world.fox |
90 | 57 self.set_facing('left') |
58 self.set_image() | |
59 self.set_pos((0, 0)) | |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
60 self._collisions_seen = 0 |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
61 self._last_collide = [] |
90 | 62 self._layer = Layers.PLAYER |
63 | |
64 def set_image(self): | |
335 | 65 key = self._make_key(len(self._me.tails)) |
120 | 66 images = self._image_dict[key] |
67 if self._animation_frame >= len(images): | |
68 self._animation_frame = 0.0 | |
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
69 if self.rect: |
151
06be025c821c
Use midbottom, rather than bottomleft, when changing fox frames
Neil Muller <drnlmuller@gmail.com>
parents:
149
diff
changeset
|
70 cur_pos = self.collide_rect.midbottom |
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
71 else: |
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
72 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
|
73 # 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
|
74 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
|
75 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
|
76 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
|
77 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
|
78 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
|
79 cand_collide_rect.midbottom = cur_pos |
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
80 # We always allow the attacking animation frames |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
81 if not self.check_collide_rect(cand_collide_rect, cand_rect, cand_image) and not self.attacking: |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
82 return False |
408 | 83 if self.invisible > 0: |
84 id_cand_image = id(cand_image) | |
85 if id_cand_image in self._inv_cache: | |
86 cand_image = self._inv_cache[id_cand_image] | |
87 else: | |
88 cand_image = cand_image.copy() | |
89 cand_image.fill((0, 0, 0, 140), None, BLEND_RGBA_MULT) | |
90 self._inv_cache[id_cand_image] = cand_image | |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
91 if self.using_shield > 0: |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
92 id_cand_image = id(cand_image) |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
93 if id_cand_image in self._shield_cache: |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
94 cand_image = self._shield_cache[id_cand_image] |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
95 else: |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
96 cand_image = cand_image.copy() |
427 | 97 cand_image.blit(self._shield_image, (0, 0), None) |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
98 self._shield_cache[id_cand_image] = cand_image |
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
|
99 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
|
100 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
|
101 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
|
102 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
|
103 self.init_pos() |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
104 return True |
90 | 105 |
429
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
106 def fix_bounds(self, bounds): |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
107 """Force the player back into the world.""" |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
108 if self.rect.bottom > bounds.bottom: |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
109 self.rect.bottom = bounds.bottom - TILE_SIZE[1] - 5 |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
110 elif self.rect.top < bounds.top: |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
111 self.rect.top = bounds.top + TILE_SIZE[1] + 10 |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
112 if self.rect.left < bounds.left: |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
113 self.rect.left = bounds.left + TILE_SIZE[0] |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
114 elif self.rect.right > bounds.right: |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
115 self.rect.right = bounds.left - TILE_SIZE[0] |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
116 # FIXME: Find clear tile |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
117 # Hack - bump vertical position up by 5 so we're not colliding |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
118 # with the floor when we come back |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
119 self.rect.bottom = self.rect.bottom - 5 |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
120 self.collide_rect.midbottom = self.rect.midbottom |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
121 self.init_pos() |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
122 self.set_image() |
8b047e74dfd1
Bump the player back into the world.
Neil Muller <drnlmuller@gmail.com>
parents:
427
diff
changeset
|
123 |
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
124 def update(self): |
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
125 self._touching_actionables = [] |
120 | 126 v_x, v_y = self.velocity |
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
127 # 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
|
128 if self.attacking > 0: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
129 if self._last_time: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
130 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
|
131 self._animation_frame += 1 |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
132 self.attacking -= 1 |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
133 self._last_time = time.time() |
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
134 else: |
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
135 self._last_time = time.time() |
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
136 else: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
137 old_frame = self._animation_frame |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
138 self._animation_frame += abs(v_x) / 300 |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
139 time_diff = time.time() - self._last_time |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
140 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
|
141 # Check time diff |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
142 if time_diff < 0.10: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
143 # Delay animation frame jump |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
144 self._animation_frame -= abs(v_x) / 300 |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
145 else: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
146 self._last_time = time.time() |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
147 elif time_diff > 0.20: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
148 # Force animation frame jump |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
149 self._animation_frame = old_frame + 1 |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
150 self._last_time = time.time() |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
151 now = time.time() |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
152 if self.sprinting > 0: |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
153 if (now - 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
|
154 self.sprinting = 0 |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
155 if self.flying > 0: |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
156 if (now - self._flight_start_time) > self._max_flight_time: |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
157 self.flying = 0 |
408 | 158 if self.invisible > 0: |
159 if (now - self._invisibility_start_time) > self._max_invisibility_time: | |
160 self.invisible = 0 | |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
161 if self.using_shield > 0: |
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
162 self.using_shield -= 1 |
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
163 if abs(v_x) < 80: |
148
0474df61d5b1
Clamp very slow horizontal motion
Neil Muller <drnlmuller@gmail.com>
parents:
147
diff
changeset
|
164 # 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
|
165 self.velocity = (0, v_y) |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
166 if self.sprinting == 1: |
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
167 self.sprinting = 0 |
160 | 168 self.running = not self.on_solid # if you're not on something you can't stand |
120 | 169 else: |
176
57a78f19c673
Hack player.py to have platformer physics
Neil Muller <drnlmuller@gmail.com>
parents:
172
diff
changeset
|
170 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
|
171 if self.sprinting > 0: |
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
172 self.sprinting = 1 |
120 | 173 self.running = True |
174 self.set_image() | |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
175 if self._collisions_seen > 2 * len(self._last_collide): |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
176 # 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
|
177 # surface |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
178 best_move = (0, 0) |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
179 clip_area = 0 |
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
180 for obj in self._last_collide[:]: |
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
181 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
|
182 # Prune stale objects from the list |
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
183 self._last_collide.remove(obj) |
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
184 continue |
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
185 clip = obj.collide_rect.clip(self.collide_rect) |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
186 clip_area += clip.width * clip.height |
398 | 187 if clip.width > TILE_SIZE[0] / 2 and \ |
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
188 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
|
189 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
|
190 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
|
191 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
|
192 self.init_pos() |
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
193 return # Jump out of this case |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
194 min_area = clip_area |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
195 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
|
196 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
|
197 for obj in self._last_collide: |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
198 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
|
199 clip = obj.collide_rect.clip(cand_rect) |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
200 clip_area += clip.width * clip.height |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
201 if clip_area < min_area: |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
202 min_area = clip_area |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
203 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
|
204 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
|
205 # 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
|
206 best_move = attempt |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
207 self.collide_rect.move_ip(best_move) |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
208 self.rect.move_ip(best_move) |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
209 self.init_pos() |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
210 self._last_collide = [] |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
211 self._collisions_seen = 0 |
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
212 |
90 | 213 def set_facing(self, new_facing): |
214 self.facing = new_facing | |
215 | |
149
5b4d73d301a1
Don't change image if it will introduce new collisions
Neil Muller <drnlmuller@gmail.com>
parents:
148
diff
changeset
|
216 def collided(self, other): |
210 | 217 if self.attacking and hasattr(other, 'damage'): |
218 # FIXME: Check if we're facing the right way | |
219 other.damage(5) | |
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
220 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
|
221 self._last_collide.append(other) |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
222 self._collide_pos = self.collide_rect.midbottom |
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
223 self._collisions_seen = 0 |
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
224 elif other in self._last_collide: |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
225 self._collisions_seen += 1 |
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
226 if hasattr(other, 'collided_player'): |
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
227 other.collided_player(self) |
209 | 228 |
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
229 def damage(self, damage): |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
230 if 'shield' in self._me.tails and self.check_fire_rate('shield'): |
427 | 231 print "Using shield" |
232 self.using_shield = 30 | |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
233 return |
335 | 234 self._me.cur_health -= damage |
263 | 235 self._soundsystem.play_sound('yelp') |
335 | 236 if self._me.cur_health <= 0: |
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
237 PlayerDied.post() |
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
238 |
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
239 def restore(self): |
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
240 """Restore player to max health (for restarting levels, etc.)""" |
335 | 241 self._me.cur_health = self._me.max_health |
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
242 |
90 | 243 def set_pos(self, pos): |
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
244 self.rect.midbottom = pos[0] * TILE_SIZE[0] + self.rect_offset[0], (pos[1] + 1) * TILE_SIZE[1] + self.rect_offset[1] |
272 | 245 self.collide_rect.midbottom = pos[0] * TILE_SIZE[0], (pos[1] + 1) * TILE_SIZE[1] |
90 | 246 |
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
|
247 def action_left(self): |
115 | 248 if self.facing != 'left': |
249 self.facing = 'left' | |
250 self.set_image() | |
348 | 251 if self.shape != 'fox': |
252 self.deltav((-300.0, 0.0)) | |
253 elif self.sprinting > 0: | |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
254 self.sprinting = 1 |
266 | 255 self.deltav((-900.0, 0.0)) |
256 else: | |
257 self.deltav((-450.0, 0.0)) | |
258 | |
259 def action_double_left(self): | |
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
260 if self.sprinting > 0 or self.flying > 0 or 'sprint' not in self._me.tails or self._me.shape != 'fox': |
266 | 261 return |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
262 self.sprinting = 2 |
391
d5381be5079f
Also set _max_sprint_time when sprinting left.
Simon Cross <hodgestar@gmail.com>
parents:
390
diff
changeset
|
263 self._max_sprint_time = float(len(self._me.tails)) / 4.0 |
266 | 264 self._sprint_start_time = time.time() |
265 | |
266 def action_double_right(self): | |
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
267 if self.sprinting > 0 or self.flying > 0 or 'sprint' not in self._me.tails or self._me.shape != 'fox': |
266 | 268 return |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
269 self.sprinting = 2 |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
270 self._max_sprint_time = float(len(self._me.tails)) / 4.0 |
266 | 271 self._sprint_start_time = time.time() |
90 | 272 |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
273 def action_double_up(self): |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
274 if self.flying > 0 or 'flight' not in self._me.tails or \ |
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
275 self.prep_flight - time.time() > 2.5 * DOUBLE_TAP_TIME \ |
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
276 or self._me.shape != 'fox': |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
277 return |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
278 self.flying = 1 |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
279 self._max_flight_time = float(len(self._me.tails)) |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
280 self._flight_start_time = time.time() |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
281 |
408 | 282 def action_invisible(self): |
283 if self.invisible > 0 or 'invisibility' not in self._me.tails: | |
284 return | |
285 self.invisible = 1 | |
286 self._max_invisibility_time = float(len(self._me.tails)) | |
287 self._invisibility_start_time = time.time() | |
288 | |
348 | 289 def action_transform(self): |
290 """Transform the fox""" | |
291 if not self.on_solid: | |
292 return | |
431 | 293 if 'shapeshift' not in self._me.tails: |
348 | 294 return |
295 if self.shape == 'fox': | |
296 # Become human | |
431 | 297 if self._me.has_fan: |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
298 self.shape = 'human_with_fan' |
348 | 299 else: |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
300 self.shape = 'human' |
348 | 301 else: |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
302 self.shape = 'fox' |
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
303 # Check the transformation is feasible |
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
304 if self.set_image(): |
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
305 # Transformation succeeded |
431 | 306 self._me.shape = self.shape |
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
307 else: |
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
308 # Back out of transformation |
431 | 309 self.shape = self._me.shape |
348 | 310 |
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
|
311 def action_right(self): |
115 | 312 if self.facing != 'right': |
313 self.facing = 'right' | |
314 self.set_image() | |
348 | 315 if self.shape != 'fox': |
316 self.deltav((300.0, 0.0)) | |
317 elif self.sprinting > 0: | |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
318 self.sprinting = 1 # Flag so stopping works |
266 | 319 self.deltav((900.0, 0.0)) |
320 else: | |
321 self.deltav((450.0, 0.0)) | |
322 | |
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
|
323 def action_up(self): |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
324 if self.flying: |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
325 self.deltav((0.0, -self.terminal_velocity[1] / 5.0)) |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
326 elif self.on_solid and self.shape == 'fox': |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
327 self.prep_flight = time.time() |
177
88a78fb9fa82
Tweak some constants to make player motion more comfortable.
Jeremy Thurgood <firxen@gmail.com>
parents:
176
diff
changeset
|
328 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
|
329 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
|
330 |
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
|
331 def action_down(self): |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
332 if self.flying: |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
333 return |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
334 #self.deltav((0.0, self.terminal_velocity[1] / 2.0)) |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
335 elif self._touching_actionables: |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
336 self._touching_actionables[0].player_action(self) |
359
eacb3e1bc1d1
Only drop items while standing on ground.
Jeremy Thurgood <firxen@gmail.com>
parents:
357
diff
changeset
|
337 elif self._me.item is not None and self.on_solid: |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
338 self.drop_item() |
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
339 |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
340 def _bite_attack(self): |
410
115e738e209c
Become visible when attacking. Enemies shouldn't attack invisible foxes.
Simon Cross <hodgestar@gmail.com>
parents:
408
diff
changeset
|
341 self.invisible = 0 |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
342 self.attacking = 2 |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
343 self._last_time = time.time() # Reset the animation clock |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
344 |
366 | 345 def _launch_projectile(self, cls): |
346 if self.facing == 'left': | |
347 pos = pygame.Rect(self.rect.midleft, (0, 0)) | |
348 else: | |
349 pos = pygame.Rect(self.rect.midright, (0, 0)) | |
350 projectile = cls(pos, direction=self.facing, hits=Monster) | |
351 AddSpriteEvent.post(projectile) | |
352 | |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
353 def _fireball_attack(self): |
411 | 354 if not self.check_fire_rate('fireball'): |
355 return | |
410
115e738e209c
Become visible when attacking. Enemies shouldn't attack invisible foxes.
Simon Cross <hodgestar@gmail.com>
parents:
408
diff
changeset
|
356 self.invisible = 0 |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
357 self.attacking = 2 |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
358 self._last_time = time.time() # Reset the animation clock |
366 | 359 self._launch_projectile(Fireball) |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
360 |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
361 def _lightning_attack(self): |
411 | 362 if not self.check_fire_rate('lightning'): |
363 return | |
410
115e738e209c
Become visible when attacking. Enemies shouldn't attack invisible foxes.
Simon Cross <hodgestar@gmail.com>
parents:
408
diff
changeset
|
364 self.invisible = 0 |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
365 self.attacking = 2 |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
366 self._last_time = time.time() # Reset the animation clock |
366 | 367 self._launch_projectile(Lightning) |
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
|
368 |
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
|
369 def action_fire1(self): |
411 | 370 if self._me.shape != 'fox': |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
371 return |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
372 if "fireball" not in self._me.tails: |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
373 self._bite_attack() |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
374 else: |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
375 self._fireball_attack() |
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
|
376 |
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
|
377 def action_fire2(self): |
411 | 378 if self._me.shape != 'fox': |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
379 return |
336
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
380 if "lightning" not in self._me.tails: |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
381 self._bite_attack() |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
382 else: |
c8fd82ff0c71
Hook up fire buttons to attack functions. Use correct check for tails. Add skeleton for projectiles.
Simon Cross <hodgestar@gmail.com>
parents:
335
diff
changeset
|
383 self._lightning_attack() |
90 | 384 |
411 | 385 def check_fire_rate(self, attack): |
386 if self.recharge_level(attack) < 1: | |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
387 return False |
411 | 388 self._last_attacked[attack] = time.time() |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
389 return True |
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
390 |
411 | 391 def recharge_level(self, attack): |
392 return min((time.time() - self._last_attacked[attack]) / RECHARGE_TIME, 1) | |
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
393 |
430
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
394 def discharge_level(self, tail): |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
395 if tail == 'invisibility' and hasattr(self, '_invisibility_start_time'): |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
396 start_time = self._invisibility_start_time |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
397 max_time = self._max_invisibility_time |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
398 elif tail == 'flight' and hasattr(self, '_flight_start_time'): |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
399 start_time = self._flight_start_time |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
400 max_time = self._max_flight_time |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
401 else: |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
402 return 0 |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
403 discharge = (time.time() - start_time) / max_time |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
404 if discharge > 1: |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
405 return 0 |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
406 return discharge |
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
407 |
90 | 408 def _get_action(self): |
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
409 if self.attacking: |
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
410 return 'attacking' |
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
411 if (self.sprinting > 0) and self.running: |
266 | 412 return 'sprinting' |
90 | 413 if self.running: |
414 return 'running' | |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
415 if self.flying: |
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
416 return 'running' |
90 | 417 if self.jumping: |
381
56f97d0c6a36
Add flying (max flight time is number of tails in seconds). Set max sprint time to number of tails over 4.0 is seconds.
Simon Cross <hodgestar@gmail.com>
parents:
366
diff
changeset
|
418 return 'jumping' |
90 | 419 return 'standing' |
420 | |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
421 def _make_key(self, tails, action=None): |
348 | 422 if self.shape != 'fox': |
423 # special logic for human shapes | |
424 if self.running: | |
425 return '%s_running_%s' % (self.shape, self.facing) | |
426 else: | |
427 return '%s_standing_%s' % (self.shape, self.facing) | |
90 | 428 if action is None: |
429 action = self._get_action() | |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
430 if tails >= 4: |
90 | 431 tails = 4 |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
432 elif tails >= 2: |
90 | 433 tails = 2 |
434 return '%s %s %d' % (action, self.facing, tails) | |
435 | |
436 def _load_images(self): | |
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
437 self._shield_image = load_image('sprites/kitsune_shield.png') |
158 | 438 for action in ['standing', 'running', 'jumping', 'attacking']: |
90 | 439 for tails in [0, 1, 2, 4]: |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
440 directory = 'sprites/kitsune_%s/kitsune_%s_%dtail' % (action, action, tails) |
90 | 441 for facing in ['left', 'right']: |
442 self.facing = facing | |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
443 key = self._make_key(tails, action) |
90 | 444 self._image_dict[key] = [] |
445 for image_file in get_files(directory): | |
446 if image_file.startswith('.'): | |
447 # Skip extra junk for now | |
448 continue | |
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
449 image = load_image('%s/%s' % (directory, image_file)) |
266 | 450 if action == 'running': |
451 sprint_key = self._make_key(tails, 'sprinting') | |
452 if sprint_key not in self._image_dict: | |
453 self._image_dict[sprint_key] = [] | |
454 shockwave = load_image('sprites/kitsune_shockwave.png') | |
455 if facing == 'right': | |
456 shockwave = pygame.transform.flip(shockwave, True, False) | |
90 | 457 if facing == 'right': |
458 image = pygame.transform.flip(image, True, False) | |
459 self._image_dict[key].append(image) | |
266 | 460 if action == 'running': |
461 sprint_image = image.copy() | |
462 sprint_image.blit(shockwave, (0, 0)) | |
463 self._image_dict[sprint_key].append(sprint_image) | |
348 | 464 for shape, name in [('human', 'disguise_'), ('human_with_fan', 'disguise-fan_')]: |
465 directory = 'sprites/kitsune_disguise' | |
466 for facing in ['left', 'right']: | |
467 key = '%s_running_%s' % (shape, facing) | |
468 standing_key = '%s_standing_%s' % (shape, facing) | |
469 self._image_dict[key] = [] | |
470 for image_file in get_files(directory): | |
471 if name not in image_file: | |
472 continue | |
473 image = load_image('%s/%s' % (directory, image_file)) | |
474 if facing == 'right': | |
475 image = pygame.transform.flip(image, True, False) | |
476 self._image_dict[key].append(image) | |
477 self._image_dict[standing_key] = [self._image_dict[key][0]] | |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
478 |
359
eacb3e1bc1d1
Only drop items while standing on ground.
Jeremy Thurgood <firxen@gmail.com>
parents:
357
diff
changeset
|
479 |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
480 def discard_item(self): |
335 | 481 self._me.item = None |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
482 |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
483 |
342 | 484 def get_tile_pos(self): |
485 return [a/b for a, b in zip(self.rect.center, TILE_SIZE)] | |
486 | |
355
5bdb4677510a
Have fireballs appear in the right place.
Simon Cross <hodgestar@gmail.com>
parents:
353
diff
changeset
|
487 def get_tile_for_pos(self, pos): |
5bdb4677510a
Have fireballs appear in the right place.
Simon Cross <hodgestar@gmail.com>
parents:
353
diff
changeset
|
488 return [a/b for a, b in zip(pos, TILE_SIZE)] |
5bdb4677510a
Have fireballs appear in the right place.
Simon Cross <hodgestar@gmail.com>
parents:
353
diff
changeset
|
489 |
332
971c1726c530
don't set position and level when creating a sprite just for the inventory image
Neil Muller <drnlmuller@gmail.com>
parents:
328
diff
changeset
|
490 def get_sprite(self, set_level): |
335 | 491 my_item = self._me.item |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
492 if my_item is None: |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
493 return None |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
494 world_item = getattr(self.the_world.items, my_item) |
332
971c1726c530
don't set position and level when creating a sprite just for the inventory image
Neil Muller <drnlmuller@gmail.com>
parents:
328
diff
changeset
|
495 if set_level: |
335 | 496 world_item.level = self._me.level |
342 | 497 world_item.pos = self.get_tile_pos() |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
498 sprite_dict = world_item.copy() |
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
499 sprite_dict.pop('level') |
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
500 sprite_dict['name'] = my_item |
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
501 sprite_dict['world'] = self.the_world |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
502 return find_sprite(sprite_dict, 'items') |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
503 |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
504 |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
505 def drop_item(self): |
332
971c1726c530
don't set position and level when creating a sprite just for the inventory image
Neil Muller <drnlmuller@gmail.com>
parents:
328
diff
changeset
|
506 sprite = self.get_sprite(True) |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
507 if sprite is None: |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
508 return |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
509 self.discard_item() |
339
a9d760134706
Rename ItemRepopulationEvent to AddSprite before repurposing it for fireballs.
Simon Cross <hodgestar@gmail.com>
parents:
336
diff
changeset
|
510 AddSpriteEvent.post(sprite) |
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
511 |
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
512 |
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
513 def take_item(self, item): |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
514 self.take_item_by_name(item.name) |
314 | 515 # We create a scaled version of the image for the inventory display |
335 | 516 item.remove() |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
517 |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
518 |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
519 def make_inventory_image(self): |
332
971c1726c530
don't set position and level when creating a sprite just for the inventory image
Neil Muller <drnlmuller@gmail.com>
parents:
328
diff
changeset
|
520 sprite = self.get_sprite(False) |
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
521 if sprite is None: |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
522 self.inventory_image = None |
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
523 image = sprite.image |
314 | 524 if image.get_width() > image.get_height(): |
357
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
525 new_width = FoxHud.INVENTORY_SIZE |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
526 new_height = int(image.get_height() * (float(FoxHud.INVENTORY_SIZE) / image.get_width())) |
314 | 527 else: |
357
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
528 new_height = FoxHud.INVENTORY_SIZE |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
529 new_width = int(image.get_width() * (float(FoxHud.INVENTORY_SIZE) / image.get_height())) |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
530 if image.get_width() <= FoxHud.INVENTORY_SIZE and image.get_height() <= FoxHud.INVENTORY_SIZE: |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
531 self.inventory_image = image |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
532 else: |
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
533 self.inventory_image = pygame.transform.smoothscale(image, (new_width, new_height)) |
332
971c1726c530
don't set position and level when creating a sprite just for the inventory image
Neil Muller <drnlmuller@gmail.com>
parents:
328
diff
changeset
|
534 sprite.kill() # ensure we don't leak into the scene at any point |
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
535 |
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
536 |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
537 def take_item_by_name(self, item_name): |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
538 self.drop_item() |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
539 getattr(self.the_world.items, item_name).level = "_limbo" |
335 | 540 self._me.item = item_name |
320
0dc80b153580
Refresh inventory image on all inventory changes
Neil Muller <drnlmuller@gmail.com>
parents:
315
diff
changeset
|
541 self.make_inventory_image() |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
542 |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
543 |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
544 def has_item(self, item): |
335 | 545 return self._me.item == item |
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
546 |
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
547 |
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
548 def add_actionable(self, actionable): |
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
549 self._touching_actionables.append(actionable) |
335 | 550 |
340 | 551 |
335 | 552 def eat_aburage(self): |
553 self._me.tofu += 1 | |
340 | 554 |
555 | |
556 def collect_scroll(self, scroll): | |
557 self._me.scrolls.append(scroll.text) | |
558 | |
395 | 559 |
560 def get_fan(self, fan): | |
561 if self.shape == 'fox': | |
562 OpenNotification.post("A fox cannot use a fan.") | |
563 return | |
564 fan.remove() | |
565 self._me.has_fan = True | |
566 self.shape = 'human_with_fan' | |
431 | 567 self._me.shape = self.shape |
395 | 568 self.set_image() |
569 |