Mercurial > skaapsteker
annotate skaapsteker/sprites/player.py @ 435:b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
| author | Simon Cross <hodgestar@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 19:15:37 +0200 |
| parents | fe99a4e04b2b |
| children | 8ee16cec0f9f |
| 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 |
|
433
fe99a4e04b2b
Make recharge time depend on the number of tails.
Simon Cross <hodgestar@gmail.com>
parents:
431
diff
changeset
|
9 from ..constants import Layers, FoxHud, DOUBLE_TAP_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() |
|
433
fe99a4e04b2b
Make recharge time depend on the number of tails.
Simon Cross <hodgestar@gmail.com>
parents:
431
diff
changeset
|
33 self._recharge_timers = { |
|
435
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
34 'fireball': [ time.time(), lambda : 2.0 / len(self._me.tails) ], |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
35 'lightning': [ time.time(), lambda : 2.0 / len(self._me.tails) ], |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
36 'shield': [ time.time(), lambda : 16.0 / len(self._me.tails) ], |
| 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: |
|
435
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
162 if (now - self._shield_start_time) > 1.0: |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
163 self.using_shield = 0 |
|
167
f7fb2ee24c70
Twiddle player animation behaviour
Neil Muller <drnlmuller@gmail.com>
parents:
160
diff
changeset
|
164 if abs(v_x) < 80: |
|
148
0474df61d5b1
Clamp very slow horizontal motion
Neil Muller <drnlmuller@gmail.com>
parents:
147
diff
changeset
|
165 # 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
|
166 self.velocity = (0, v_y) |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
167 if self.sprinting == 1: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
168 self.sprinting = 0 |
| 160 | 169 self.running = not self.on_solid # if you're not on something you can't stand |
| 120 | 170 else: |
|
176
57a78f19c673
Hack player.py to have platformer physics
Neil Muller <drnlmuller@gmail.com>
parents:
172
diff
changeset
|
171 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
|
172 if self.sprinting > 0: |
|
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
173 self.sprinting = 1 |
| 120 | 174 self.running = True |
| 175 self.set_image() | |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
176 if self._collisions_seen > 2 * len(self._last_collide): |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
177 # 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
|
178 # surface |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
179 best_move = (0, 0) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
180 clip_area = 0 |
|
200
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
181 for obj in self._last_collide[:]: |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
182 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
|
183 # Prune stale objects from the list |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
184 self._last_collide.remove(obj) |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
185 continue |
|
188
30a5f7cf670a
Hack'ish logic to move out of colliding with floors better
Neil Muller <drnlmuller@gmail.com>
parents:
187
diff
changeset
|
186 clip = obj.collide_rect.clip(self.collide_rect) |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
187 clip_area += clip.width * clip.height |
| 398 | 188 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
|
189 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
|
190 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
|
191 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
|
192 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
|
193 self.init_pos() |
|
4e3f9cb49489
Fix bug in jump to tile top logic
Neil Muller <drnlmuller@gmail.com>
parents:
192
diff
changeset
|
194 return # Jump out of this case |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
195 min_area = clip_area |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
196 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
|
197 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
|
198 for obj in self._last_collide: |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
199 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
|
200 clip = obj.collide_rect.clip(cand_rect) |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
201 clip_area += clip.width * clip.height |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
202 if clip_area < min_area: |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
203 min_area = clip_area |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
204 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
|
205 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
|
206 # 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
|
207 best_move = attempt |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
208 self.collide_rect.move_ip(best_move) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
209 self.rect.move_ip(best_move) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
210 self.init_pos() |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
211 self._last_collide = [] |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
212 self._collisions_seen = 0 |
|
116
69a97094417a
Hook up per-tick sprite animations.
Simon Cross <hodgestar@gmail.com>
parents:
115
diff
changeset
|
213 |
| 90 | 214 def set_facing(self, new_facing): |
| 215 self.facing = new_facing | |
| 216 | |
|
149
5b4d73d301a1
Don't change image if it will introduce new collisions
Neil Muller <drnlmuller@gmail.com>
parents:
148
diff
changeset
|
217 def collided(self, other): |
| 210 | 218 if self.attacking and hasattr(other, 'damage'): |
| 219 # FIXME: Check if we're facing the right way | |
| 220 other.damage(5) | |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
221 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
|
222 self._last_collide.append(other) |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
223 self._collide_pos = self.collide_rect.midbottom |
|
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
224 self._collisions_seen = 0 |
|
271
56a529a69e97
Only backout / move-off "solid" collisions
Neil Muller <drnlmuller@gmail.com>
parents:
269
diff
changeset
|
225 elif other in self._last_collide: |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
226 self._collisions_seen += 1 |
|
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
227 if hasattr(other, 'collided_player'): |
|
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
228 other.collided_player(self) |
| 209 | 229 |
|
208
c72d9bf911fb
Add start of player damage
Neil Muller <drnlmuller@gmail.com>
parents:
206
diff
changeset
|
230 def damage(self, damage): |
|
435
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
231 if self.using_shield > 0: |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
232 "Shield on." |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
233 return |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
234 elif 'shield' in self._me.tails and self.check_fire_rate('shield'): |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
235 print "Activating shield." |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
236 self._shield_start_time = time.time() |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
237 self.using_shield = 1 |
|
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
238 return |
| 335 | 239 self._me.cur_health -= damage |
| 263 | 240 self._soundsystem.play_sound('yelp') |
| 335 | 241 if self._me.cur_health <= 0: |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
242 PlayerDied.post() |
|
187
92ab784ecf5a
Repel fx from longstanding collisions
Neil Muller <drnlmuller@gmail.com>
parents:
177
diff
changeset
|
243 |
|
244
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
244 def restore(self): |
|
5bbf90e6a94b
Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents:
212
diff
changeset
|
245 """Restore player to max health (for restarting levels, etc.)""" |
| 335 | 246 self._me.cur_health = self._me.max_health |
|
122
51bcc909873d
Saner, buggier collision rectangles
Neil Muller <drnlmuller@gmail.com>
parents:
120
diff
changeset
|
247 |
| 90 | 248 def set_pos(self, pos): |
|
202
a11325bc5ff0
Sprite refactoring stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
200
diff
changeset
|
249 self.rect.midbottom = pos[0] * TILE_SIZE[0] + self.rect_offset[0], (pos[1] + 1) * TILE_SIZE[1] + self.rect_offset[1] |
| 272 | 250 self.collide_rect.midbottom = pos[0] * TILE_SIZE[0], (pos[1] + 1) * TILE_SIZE[1] |
| 90 | 251 |
|
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
|
252 def action_left(self): |
| 115 | 253 if self.facing != 'left': |
| 254 self.facing = 'left' | |
| 255 self.set_image() | |
| 348 | 256 if self.shape != 'fox': |
| 257 self.deltav((-300.0, 0.0)) | |
| 258 elif self.sprinting > 0: | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
259 self.sprinting = 1 |
| 266 | 260 self.deltav((-900.0, 0.0)) |
| 261 else: | |
| 262 self.deltav((-450.0, 0.0)) | |
| 263 | |
| 264 def action_double_left(self): | |
|
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
265 if self.sprinting > 0 or self.flying > 0 or 'sprint' not in self._me.tails or self._me.shape != 'fox': |
| 266 | 266 return |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
267 self.sprinting = 2 |
|
391
d5381be5079f
Also set _max_sprint_time when sprinting left.
Simon Cross <hodgestar@gmail.com>
parents:
390
diff
changeset
|
268 self._max_sprint_time = float(len(self._me.tails)) / 4.0 |
| 266 | 269 self._sprint_start_time = time.time() |
| 270 | |
| 271 def action_double_right(self): | |
|
396
dc534c2c475c
Fix up various power activation checks.
Simon Cross <hodgestar@gmail.com>
parents:
395
diff
changeset
|
272 if self.sprinting > 0 or self.flying > 0 or 'sprint' not in self._me.tails or self._me.shape != 'fox': |
| 266 | 273 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
|
274 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
|
275 self._max_sprint_time = float(len(self._me.tails)) / 4.0 |
| 266 | 276 self._sprint_start_time = time.time() |
| 90 | 277 |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
278 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
|
279 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
|
280 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
|
281 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
|
282 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
|
283 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
|
284 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
|
285 self._flight_start_time = time.time() |
|
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
286 |
| 408 | 287 def action_invisible(self): |
| 288 if self.invisible > 0 or 'invisibility' not in self._me.tails: | |
| 289 return | |
| 290 self.invisible = 1 | |
| 291 self._max_invisibility_time = float(len(self._me.tails)) | |
| 292 self._invisibility_start_time = time.time() | |
| 293 | |
| 348 | 294 def action_transform(self): |
| 295 """Transform the fox""" | |
| 296 if not self.on_solid: | |
| 297 return | |
| 431 | 298 if 'shapeshift' not in self._me.tails: |
| 348 | 299 return |
| 300 if self.shape == 'fox': | |
| 301 # Become human | |
| 431 | 302 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
|
303 self.shape = 'human_with_fan' |
| 348 | 304 else: |
|
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
305 self.shape = 'human' |
| 348 | 306 else: |
|
353
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
307 self.shape = 'fox' |
|
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
308 # 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
|
309 if self.set_image(): |
|
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
310 # Transformation succeeded |
| 431 | 311 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
|
312 else: |
|
3ac03073218f
Don't allow tranformations if they'll get us stuck
Neil Muller <drnlmuller@gmail.com>
parents:
348
diff
changeset
|
313 # Back out of transformation |
| 431 | 314 self.shape = self._me.shape |
| 348 | 315 |
|
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
|
316 def action_right(self): |
| 115 | 317 if self.facing != 'right': |
| 318 self.facing = 'right' | |
| 319 self.set_image() | |
| 348 | 320 if self.shape != 'fox': |
| 321 self.deltav((300.0, 0.0)) | |
| 322 elif self.sprinting > 0: | |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
323 self.sprinting = 1 # Flag so stopping works |
| 266 | 324 self.deltav((900.0, 0.0)) |
| 325 else: | |
| 326 self.deltav((450.0, 0.0)) | |
| 327 | |
|
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
|
328 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
|
329 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
|
330 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
|
331 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
|
332 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
|
333 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
|
334 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
|
335 |
|
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
|
336 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
|
337 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
|
338 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
|
339 #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
|
340 elif self._touching_actionables: |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
341 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
|
342 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
|
343 self.drop_item() |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
344 |
|
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
|
345 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
|
346 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
|
347 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
|
348 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
|
349 |
| 366 | 350 def _launch_projectile(self, cls): |
| 351 if self.facing == 'left': | |
| 352 pos = pygame.Rect(self.rect.midleft, (0, 0)) | |
| 353 else: | |
| 354 pos = pygame.Rect(self.rect.midright, (0, 0)) | |
| 355 projectile = cls(pos, direction=self.facing, hits=Monster) | |
| 356 AddSpriteEvent.post(projectile) | |
| 357 | |
|
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
|
358 def _fireball_attack(self): |
| 411 | 359 if not self.check_fire_rate('fireball'): |
| 360 return | |
|
410
115e738e209c
Become visible when attacking. Enemies shouldn't attack invisible foxes.
Simon Cross <hodgestar@gmail.com>
parents:
408
diff
changeset
|
361 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
|
362 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
|
363 self._last_time = time.time() # Reset the animation clock |
| 366 | 364 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
|
365 |
|
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 def _lightning_attack(self): |
| 411 | 367 if not self.check_fire_rate('lightning'): |
| 368 return | |
|
410
115e738e209c
Become visible when attacking. Enemies shouldn't attack invisible foxes.
Simon Cross <hodgestar@gmail.com>
parents:
408
diff
changeset
|
369 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
|
370 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
|
371 self._last_time = time.time() # Reset the animation clock |
| 366 | 372 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
|
373 |
|
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
|
374 def action_fire1(self): |
| 411 | 375 if self._me.shape != 'fox': |
|
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
376 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
|
377 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
|
378 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
|
379 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
|
380 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
|
381 |
|
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
|
382 def action_fire2(self): |
| 411 | 383 if self._me.shape != 'fox': |
|
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
384 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
|
385 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
|
386 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
|
387 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
|
388 self._lightning_attack() |
| 90 | 389 |
| 411 | 390 def check_fire_rate(self, attack): |
| 391 if self.recharge_level(attack) < 1: | |
|
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
392 return False |
|
435
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
393 self._recharge_timers[attack][0] = time.time() |
|
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
394 return True |
|
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
395 |
| 411 | 396 def recharge_level(self, attack): |
|
435
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
397 recharge_time = self._recharge_timers[attack][1]() |
|
b6fdaf8e453c
Make shield last for one second. Separate out recharge times to allow the shield to take longer to recharge.
Simon Cross <hodgestar@gmail.com>
parents:
433
diff
changeset
|
398 return min((time.time() - self._recharge_timers[attack][0]) / recharge_time, 1) |
|
390
93f13f7d97f2
Initial fire rate-limiting
Stefano Rivera <stefano@rivera.za.net>
parents:
381
diff
changeset
|
399 |
|
430
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
400 def discharge_level(self, tail): |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
401 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
|
402 start_time = self._invisibility_start_time |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
403 max_time = self._max_invisibility_time |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
404 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
|
405 start_time = self._flight_start_time |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
406 max_time = self._max_flight_time |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
407 else: |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
408 return 0 |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
409 discharge = (time.time() - start_time) / max_time |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
410 if discharge > 1: |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
411 return 0 |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
412 return discharge |
|
25efc74ac19c
Hook up flight and invisibility discharge
Stefano Rivera <stefano@rivera.za.net>
parents:
429
diff
changeset
|
413 |
| 90 | 414 def _get_action(self): |
|
204
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
415 if self.attacking: |
|
0f9715a2f07b
Make fire 1 do the attacking animation
Neil Muller <drnlmuller@gmail.com>
parents:
203
diff
changeset
|
416 return 'attacking' |
|
269
c24588c7ba09
Make sprinting single use after double tap
Neil Muller <drnlmuller@gmail.com>
parents:
266
diff
changeset
|
417 if (self.sprinting > 0) and self.running: |
| 266 | 418 return 'sprinting' |
| 90 | 419 if self.running: |
| 420 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
|
421 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
|
422 return 'running' |
| 90 | 423 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
|
424 return 'jumping' |
| 90 | 425 return 'standing' |
| 426 | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
427 def _make_key(self, tails, action=None): |
| 348 | 428 if self.shape != 'fox': |
| 429 # special logic for human shapes | |
| 430 if self.running: | |
| 431 return '%s_running_%s' % (self.shape, self.facing) | |
| 432 else: | |
| 433 return '%s_standing_%s' % (self.shape, self.facing) | |
| 90 | 434 if action is None: |
| 435 action = self._get_action() | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
436 if tails >= 4: |
| 90 | 437 tails = 4 |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
438 elif tails >= 2: |
| 90 | 439 tails = 2 |
| 440 return '%s %s %d' % (action, self.facing, tails) | |
| 441 | |
| 442 def _load_images(self): | |
|
426
29e376484f31
Start of shield for player.
Simon Cross <hodgestar@gmail.com>
parents:
411
diff
changeset
|
443 self._shield_image = load_image('sprites/kitsune_shield.png') |
| 158 | 444 for action in ['standing', 'running', 'jumping', 'attacking']: |
| 90 | 445 for tails in [0, 1, 2, 4]: |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
446 directory = 'sprites/kitsune_%s/kitsune_%s_%dtail' % (action, action, tails) |
| 90 | 447 for facing in ['left', 'right']: |
| 448 self.facing = facing | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
449 key = self._make_key(tails, action) |
| 90 | 450 self._image_dict[key] = [] |
| 451 for image_file in get_files(directory): | |
| 452 if image_file.startswith('.'): | |
| 453 # Skip extra junk for now | |
| 454 continue | |
|
206
e2acf4663065
Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents:
204
diff
changeset
|
455 image = load_image('%s/%s' % (directory, image_file)) |
| 266 | 456 if action == 'running': |
| 457 sprint_key = self._make_key(tails, 'sprinting') | |
| 458 if sprint_key not in self._image_dict: | |
| 459 self._image_dict[sprint_key] = [] | |
| 460 shockwave = load_image('sprites/kitsune_shockwave.png') | |
| 461 if facing == 'right': | |
| 462 shockwave = pygame.transform.flip(shockwave, True, False) | |
| 90 | 463 if facing == 'right': |
| 464 image = pygame.transform.flip(image, True, False) | |
| 465 self._image_dict[key].append(image) | |
| 266 | 466 if action == 'running': |
| 467 sprint_image = image.copy() | |
| 468 sprint_image.blit(shockwave, (0, 0)) | |
| 469 self._image_dict[sprint_key].append(sprint_image) | |
| 348 | 470 for shape, name in [('human', 'disguise_'), ('human_with_fan', 'disguise-fan_')]: |
| 471 directory = 'sprites/kitsune_disguise' | |
| 472 for facing in ['left', 'right']: | |
| 473 key = '%s_running_%s' % (shape, facing) | |
| 474 standing_key = '%s_standing_%s' % (shape, facing) | |
| 475 self._image_dict[key] = [] | |
| 476 for image_file in get_files(directory): | |
| 477 if name not in image_file: | |
| 478 continue | |
| 479 image = load_image('%s/%s' % (directory, image_file)) | |
| 480 if facing == 'right': | |
| 481 image = pygame.transform.flip(image, True, False) | |
| 482 self._image_dict[key].append(image) | |
| 483 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
|
484 |
|
359
eacb3e1bc1d1
Only drop items while standing on ground.
Jeremy Thurgood <firxen@gmail.com>
parents:
357
diff
changeset
|
485 |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
486 def discard_item(self): |
| 335 | 487 self._me.item = None |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
488 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
489 |
| 342 | 490 def get_tile_pos(self): |
| 491 return [a/b for a, b in zip(self.rect.center, TILE_SIZE)] | |
| 492 | |
|
355
5bdb4677510a
Have fireballs appear in the right place.
Simon Cross <hodgestar@gmail.com>
parents:
353
diff
changeset
|
493 def get_tile_for_pos(self, pos): |
|
5bdb4677510a
Have fireballs appear in the right place.
Simon Cross <hodgestar@gmail.com>
parents:
353
diff
changeset
|
494 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
|
495 |
|
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
|
496 def get_sprite(self, set_level): |
| 335 | 497 my_item = self._me.item |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
498 if my_item is None: |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
499 return None |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
500 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
|
501 if set_level: |
| 335 | 502 world_item.level = self._me.level |
| 342 | 503 world_item.pos = self.get_tile_pos() |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
504 sprite_dict = world_item.copy() |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
505 sprite_dict.pop('level') |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
506 sprite_dict['name'] = my_item |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
507 sprite_dict['world'] = self.the_world |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
508 return find_sprite(sprite_dict, 'items') |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
509 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
510 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
511 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
|
512 sprite = self.get_sprite(True) |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
513 if sprite is None: |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
514 return |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
515 self.discard_item() |
|
339
a9d760134706
Rename ItemRepopulationEvent to AddSprite before repurposing it for fireballs.
Simon Cross <hodgestar@gmail.com>
parents:
336
diff
changeset
|
516 AddSpriteEvent.post(sprite) |
|
290
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
517 |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
518 |
|
c68f2f3efc7f
Item dropping and swapping.
Jeremy Thurgood <firxen@gmail.com>
parents:
284
diff
changeset
|
519 def take_item(self, item): |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
520 self.take_item_by_name(item.name) |
| 314 | 521 # We create a scaled version of the image for the inventory display |
| 335 | 522 item.remove() |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
523 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
524 |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
525 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
|
526 sprite = self.get_sprite(False) |
|
315
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
527 if sprite is None: |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
528 self.inventory_image = None |
|
0fc2b9d1a9cb
Recreate inventory image on scene changes
Neil Muller <drnlmuller@gmail.com>
parents:
314
diff
changeset
|
529 image = sprite.image |
| 314 | 530 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
|
531 new_width = FoxHud.INVENTORY_SIZE |
|
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
532 new_height = int(image.get_height() * (float(FoxHud.INVENTORY_SIZE) / image.get_width())) |
| 314 | 533 else: |
|
357
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
534 new_height = FoxHud.INVENTORY_SIZE |
|
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
535 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
|
536 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
|
537 self.inventory_image = image |
|
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
538 else: |
|
742731e6e6fd
Centre small inventory items rather than resizing
Stefano Rivera <stefano@rivera.za.net>
parents:
355
diff
changeset
|
539 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
|
540 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
|
541 |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
542 |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
543 def take_item_by_name(self, item_name): |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
544 self.drop_item() |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
545 getattr(self.the_world.items, item_name).level = "_limbo" |
| 335 | 546 self._me.item = item_name |
|
320
0dc80b153580
Refresh inventory image on all inventory changes
Neil Muller <drnlmuller@gmail.com>
parents:
315
diff
changeset
|
547 self.make_inventory_image() |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
548 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
549 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
550 def has_item(self, item): |
| 335 | 551 return self._me.item == item |
|
296
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
552 |
|
15b2be883a40
Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents:
290
diff
changeset
|
553 |
|
273
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
554 def add_actionable(self, actionable): |
|
95e2ef31e714
Hit "down" to interact with things.
Jeremy Thurgood <firxen@gmail.com>
parents:
272
diff
changeset
|
555 self._touching_actionables.append(actionable) |
| 335 | 556 |
| 340 | 557 |
| 335 | 558 def eat_aburage(self): |
| 559 self._me.tofu += 1 | |
| 340 | 560 |
| 561 | |
| 562 def collect_scroll(self, scroll): | |
| 563 self._me.scrolls.append(scroll.text) | |
| 564 | |
| 395 | 565 |
| 566 def get_fan(self, fan): | |
| 567 if self.shape == 'fox': | |
| 568 OpenNotification.post("A fox cannot use a fan.") | |
| 569 return | |
| 570 fan.remove() | |
| 571 self._me.has_fan = True | |
| 572 self.shape = 'human_with_fan' | |
| 431 | 573 self._me.shape = self.shape |
| 395 | 574 self.set_image() |
| 575 |