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