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