Mercurial > touhou
annotate pytouhou/game/bullet.py @ 252:b5c7369abd7c
Improve data reading perfs
| author | Thibaut Girka <thib@sitedethib.com> |
|---|---|
| date | Sun, 22 Jan 2012 15:54:51 +0100 |
| parents | cb329dca4758 |
| children | a0d6b1915591 |
| rev | line source |
|---|---|
| 84 | 1 # -*- encoding: utf-8 -*- |
| 2 ## | |
| 3 ## Copyright (C) 2011 Thibaut Girka <thib@sitedethib.com> | |
| 4 ## | |
| 5 ## This program is free software; you can redistribute it and/or modify | |
| 6 ## it under the terms of the GNU General Public License as published | |
| 7 ## by the Free Software Foundation; version 3 only. | |
| 8 ## | |
| 9 ## This program is distributed in the hope that it will be useful, | |
| 10 ## but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 ## GNU General Public License for more details. | |
| 13 ## | |
| 14 | |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
15 from math import cos, sin, atan2, pi |
| 84 | 16 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
17 from pytouhou.utils.interpolator import Interpolator |
| 84 | 18 from pytouhou.vm.anmrunner import ANMRunner |
| 19 from pytouhou.game.sprite import Sprite | |
| 20 | |
| 21 | |
|
236
741860192b56
Implement ANM0 interrupts
Thibaut Girka <thib@sitedethib.com>
parents:
232
diff
changeset
|
22 |
| 84 | 23 class Bullet(object): |
| 123 | 24 def __init__(self, pos, bullet_type, sprite_idx_offset, |
|
232
8843e26f80c3
Hopefully implement “accelerating” bullets
Thibaut Girka <thib@sitedethib.com>
parents:
220
diff
changeset
|
25 angle, speed, attributes, flags, target, game, |
|
220
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
26 player_bullet=False, damage=0, hitbox=None): |
|
151
5cf927cbd9c5
Merge GameState into Game. TODO: Merge PlayerState into Player
Thibaut Girka <thib@sitedethib.com>
parents:
149
diff
changeset
|
27 self._game = game |
| 84 | 28 self._sprite = None |
| 29 self._anmrunner = None | |
| 30 self._removed = False | |
| 31 self._launched = False | |
| 123 | 32 self._bullet_type = bullet_type |
| 84 | 33 |
|
220
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
34 if hitbox: |
|
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
35 self.hitbox_half_size = (hitbox[0] / 2., hitbox[1] / 2.) |
|
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
36 else: |
|
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
37 self.hitbox_half_size = (bullet_type.hitbox_size / 2., bullet_type.hitbox_size / 2.) |
|
142
c7f0fd9d2145
Simple collision detection
Thibaut Girka <thib@sitedethib.com>
parents:
127
diff
changeset
|
38 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
39 self.speed_interpolator = None |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
40 self.frame = 0 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
41 self.grazed = False |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
42 |
|
232
8843e26f80c3
Hopefully implement “accelerating” bullets
Thibaut Girka <thib@sitedethib.com>
parents:
220
diff
changeset
|
43 self.target = target |
| 84 | 44 |
| 45 self.sprite_idx_offset = sprite_idx_offset | |
| 46 | |
| 47 self.flags = flags | |
| 48 self.attributes = list(attributes) | |
| 49 | |
| 50 self.x, self.y = pos | |
| 51 self.angle = angle | |
| 52 self.speed = speed | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
53 dx, dy = cos(angle) * speed, sin(angle) * speed |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
54 self.delta = dx, dy |
| 84 | 55 |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
56 self.player_bullet = player_bullet |
|
220
0595315d3880
Fix SHT handling; change a few things to be closer to ZUN’s mind; and first stub of PCB support.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
163
diff
changeset
|
57 self.damage = damage |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
58 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
59 #TODO |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
60 if flags & 14: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
61 if flags & 2: |
| 123 | 62 index = bullet_type.launch_anim2_index |
| 63 launch_mult = bullet_type.launch_anim_penalties[0] | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
64 elif flags & 4: |
| 123 | 65 index = bullet_type.launch_anim4_index |
| 66 launch_mult = bullet_type.launch_anim_penalties[1] | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
67 else: |
| 123 | 68 index = bullet_type.launch_anim8_index |
| 69 launch_mult = bullet_type.launch_anim_penalties[2] | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
70 self.launch_delta = dx * launch_mult, dy * launch_mult |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
71 self._sprite = Sprite() |
| 123 | 72 self._anmrunner = ANMRunner(bullet_type.anm_wrapper, |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
73 index, self._sprite, |
| 123 | 74 bullet_type.launch_anim_offsets[sprite_idx_offset]) |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
75 self._anmrunner.run_frame() |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
76 else: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
77 self.launch() |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
78 |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
79 if self.player_bullet: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
80 self._sprite.angle = angle - pi |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
81 else: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
82 self._sprite.angle = angle |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
83 |
| 84 | 84 |
| 85 def is_visible(self, screen_width, screen_height): | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
86 tx, ty, tw, th = self._sprite.texcoords |
| 123 | 87 x, y = self.x, self.y |
| 84 | 88 |
| 89 max_x = tw / 2. | |
| 90 max_y = th / 2. | |
| 91 | |
| 123 | 92 if (max_x < x - screen_width |
| 93 or max_x < -x | |
| 94 or max_y < y - screen_height | |
| 95 or max_y < -y): | |
| 84 | 96 return False |
| 97 return True | |
| 98 | |
| 99 | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
100 def set_anim(self, sprite_idx_offset=None): |
|
107
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
101 if sprite_idx_offset is not None: |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
102 self.sprite_idx_offset = sprite_idx_offset |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
103 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
104 bt = self._bullet_type |
|
107
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
105 self._sprite = Sprite() |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
106 if self.player_bullet: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
107 self._sprite.angle = self.angle - pi |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
108 else: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
109 self._sprite.angle = self.angle |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
110 self._anmrunner = ANMRunner(bt.anm_wrapper, bt.anim_index, |
|
107
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
111 self._sprite, self.sprite_idx_offset) |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
112 self._anmrunner.run_frame() |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
113 |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
114 |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
115 def launch(self): |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
116 self._launched = True |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
117 self.set_anim() |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
118 if self.flags & 1: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
119 self.speed_interpolator = Interpolator((self.speed + 5.,), 0, |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
120 (self.speed,), 16) |
|
246
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
121 self.update = self.update_speed |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
122 else: |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
123 self.update = self.update_full |
|
107
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
124 |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
125 |
|
156
ebfd328e700c
Rename a few functions, move a few things around...
Thibaut Girka <thib@sitedethib.com>
parents:
152
diff
changeset
|
126 def collide(self): |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
127 self.cancel() |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
128 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
129 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
130 def cancel(self): |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
131 # Cancel animation |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
132 bt = self._bullet_type |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
133 self._sprite = Sprite() |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
134 if self.player_bullet: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
135 self._sprite.angle = self.angle - pi |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
136 else: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
137 self._sprite.angle = self.angle |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
138 self._anmrunner = ANMRunner(bt.anm_wrapper, bt.cancel_anim_index, |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
139 self._sprite, bt.launch_anim_offsets[self.sprite_idx_offset]) |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
140 self._anmrunner.run_frame() |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
141 self.delta = self.delta[0] / 2., self.delta[1] / 2. |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
142 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
143 # Change update method |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
144 self.update = self.update_cancel |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
145 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
146 # Do not use this one for collisions anymore |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
147 if self.player_bullet: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
148 self._game.players_bullets.remove(self) |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
149 else: |
|
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
150 self._game.bullets.remove(self) |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
151 self._game.cancelled_bullets.append(self) |
|
152
86807b8a63bd
Add collisions with enemies and items.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
151
diff
changeset
|
152 |
|
86807b8a63bd
Add collisions with enemies and items.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
151
diff
changeset
|
153 |
| 84 | 154 def update(self): |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
155 dx, dy = self.launch_delta |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
156 self.x += dx |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
157 self.y += dy |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
158 |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
159 if not self._anmrunner.run_frame(): |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
160 self.launch() |
| 84 | 161 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
162 |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
163 def update_cancel(self): |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
164 dx, dy = self.delta |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
165 self.x += dx |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
166 self.y += dy |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
167 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
168 if not self._anmrunner.run_frame(): |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
169 self._removed = True |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
170 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
171 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
172 def update_simple(self): |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
173 dx, dy = self.delta |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
174 self.x += dx |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
175 self.y += dy |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
176 |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
177 |
|
246
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
178 def update_speed(self): |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
179 if self.speed_interpolator: |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
180 self.speed_interpolator.update(self.frame) |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
181 self.speed, = self.speed_interpolator.values |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
182 dx, dy = cos(self.angle) * self.speed, sin(self.angle) * self.speed |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
183 self.x, self.y = self.x + dx, self.y + dy |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
184 self.frame += 1 |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
185 else: |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
186 self.update = self.update_full |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
187 self.update() |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
188 |
|
cb329dca4758
Use the correct behaviour for flag 1 in bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
236
diff
changeset
|
189 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
190 def update_full(self): |
|
120
4300a832f033
Small refactoring and massive performance improvement
Thibaut Girka <thib@sitedethib.com>
parents:
114
diff
changeset
|
191 sprite = self._sprite |
|
4300a832f033
Small refactoring and massive performance improvement
Thibaut Girka <thib@sitedethib.com>
parents:
114
diff
changeset
|
192 |
|
4300a832f033
Small refactoring and massive performance improvement
Thibaut Girka <thib@sitedethib.com>
parents:
114
diff
changeset
|
193 if self._anmrunner is not None and not self._anmrunner.run_frame(): |
|
4300a832f033
Small refactoring and massive performance improvement
Thibaut Girka <thib@sitedethib.com>
parents:
114
diff
changeset
|
194 self._anmrunner = None |
| 84 | 195 |
| 196 #TODO: flags | |
| 197 x, y = self.x, self.y | |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
198 dx, dy = self.delta |
| 84 | 199 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
200 if self.flags & 16: |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
201 length, angle = self.attributes[4:6] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
202 angle = self.angle if angle < -900.0 else angle #TODO: is that right? |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
203 dx, dy = dx + cos(angle) * length, dy + sin(angle) * length |
|
236
741860192b56
Implement ANM0 interrupts
Thibaut Girka <thib@sitedethib.com>
parents:
232
diff
changeset
|
204 self.speed = (dx ** 2 + dy ** 2) ** 0.5 |
|
145
30338dc33a7b
Fix bullet orientation in some cases (Meiling's last spellcard)
Thibaut Girka <thib@sitedethib.com>
parents:
142
diff
changeset
|
205 self.angle = sprite.angle = atan2(dy, dx) |
|
30338dc33a7b
Fix bullet orientation in some cases (Meiling's last spellcard)
Thibaut Girka <thib@sitedethib.com>
parents:
142
diff
changeset
|
206 if sprite.automatic_orientation: |
|
30338dc33a7b
Fix bullet orientation in some cases (Meiling's last spellcard)
Thibaut Girka <thib@sitedethib.com>
parents:
142
diff
changeset
|
207 sprite._changed = True |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
208 self.delta = dx, dy |
|
149
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
209 if self.frame == self.attributes[0]: #TODO: include last frame, or not? |
|
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
210 self.flags ^= 16 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
211 elif self.flags & 32: |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
212 #TODO: check |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
213 acceleration, angular_speed = self.attributes[4:6] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
214 self.speed += acceleration |
|
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
215 self.angle += angular_speed |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
216 dx, dy = cos(self.angle) * self.speed, sin(self.angle) * self.speed |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
217 self.delta = dx, dy |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
218 sprite.angle = self.angle |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
219 if sprite.automatic_orientation: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
220 sprite._changed = True |
|
149
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
221 if self.frame == self.attributes[0]: |
|
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
222 self.flags ^= 32 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
223 elif self.flags & 448: |
|
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
224 #TODO: check |
|
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
225 frame, count = self.attributes[0:2] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
226 angle, speed = self.attributes[4:6] |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
227 if self.frame % frame == 0: |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
228 count = count - 1 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
229 |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
230 if self.frame != 0: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
231 self.speed = speed |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
232 |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
233 if self.flags & 64: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
234 self.angle += angle |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
235 elif self.flags & 128: |
|
232
8843e26f80c3
Hopefully implement “accelerating” bullets
Thibaut Girka <thib@sitedethib.com>
parents:
220
diff
changeset
|
236 self.angle = atan2(self.target.y - y, self.target.x - x) + angle |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
237 elif self.flags & 256: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
238 self.angle = angle |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
239 |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
240 dx, dy = cos(self.angle) * speed, sin(self.angle) * speed |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
241 self.delta = dx, dy |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
242 sprite.angle = self.angle |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
243 if sprite.automatic_orientation: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
244 sprite._changed = True |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
245 |
| 127 | 246 if count >= 0: |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
247 self.speed_interpolator = Interpolator((self.speed,), self.frame, |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
248 (0.,), self.frame + frame - 1) |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
249 else: |
|
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
250 self.flags &= ~448 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
251 |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
252 self.attributes[1] = count |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
253 #TODO: other flags |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
254 elif not self.speed_interpolator and self._anmrunner is None: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
255 self.update = self.update_simple |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
256 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
257 if self.speed_interpolator: |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
258 self.speed_interpolator.update(self.frame) |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
259 self.speed, = self.speed_interpolator.values |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
260 dx, dy = cos(self.angle) * self.speed, sin(self.angle) * self.speed |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
261 self.delta = dx, dy |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
262 |
| 84 | 263 self.x, self.y = x + dx, y + dy |
| 264 | |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
265 self.frame += 1 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
266 |