Mercurial > touhou
annotate pytouhou/game/bullet.pyx @ 430:c9433188ffdb
Remove AnmWrapper, since ANMs are lists of entries now.
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> |
|---|---|
| date | Sat, 03 Aug 2013 15:49:04 +0200 |
| parents | efae61ad6efe |
| children | 1222341ea22c |
| 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 | |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
22 LAUNCHING, LAUNCHED, CANCELLED = range(3) |
|
236
741860192b56
Implement ANM0 interrupts
Thibaut Girka <thib@sitedethib.com>
parents:
232
diff
changeset
|
23 |
|
257
9b699e8de4a7
Switch Bullet to Cython to improve performances.
Thibaut Girka <thib@sitedethib.com>
parents:
256
diff
changeset
|
24 cdef class Bullet(object): |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
25 cdef public unsigned int state, flags, frame, sprite_idx_offset |
|
257
9b699e8de4a7
Switch Bullet to Cython to improve performances.
Thibaut Girka <thib@sitedethib.com>
parents:
256
diff
changeset
|
26 cdef public double dx, dy, angle, speed #TODO |
|
9b699e8de4a7
Switch Bullet to Cython to improve performances.
Thibaut Girka <thib@sitedethib.com>
parents:
256
diff
changeset
|
27 cdef public object player_bullet, target |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
28 cdef public object _game, _bullet_type |
|
384
690b5faaa0e6
Make rendering of multiple-sprites elements work like single-sprites.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
355
diff
changeset
|
29 cdef public object sprite, anmrunner, removed, was_visible, objects |
|
390
b11953cf1d3b
Use only half-size hitboxes for player.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
388
diff
changeset
|
30 cdef public object attributes, damage, hitbox, speed_interpolator, grazed |
|
257
9b699e8de4a7
Switch Bullet to Cython to improve performances.
Thibaut Girka <thib@sitedethib.com>
parents:
256
diff
changeset
|
31 cdef public object x, y #TODO |
|
9b699e8de4a7
Switch Bullet to Cython to improve performances.
Thibaut Girka <thib@sitedethib.com>
parents:
256
diff
changeset
|
32 |
| 123 | 33 def __init__(self, pos, bullet_type, sprite_idx_offset, |
|
232
8843e26f80c3
Hopefully implement “accelerating” bullets
Thibaut Girka <thib@sitedethib.com>
parents:
220
diff
changeset
|
34 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
|
35 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
|
36 self._game = game |
| 123 | 37 self._bullet_type = bullet_type |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
38 self.state = LAUNCHING |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
39 self.sprite = None |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
40 self.anmrunner = None |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
41 self.removed = False |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
42 self.was_visible = True |
|
384
690b5faaa0e6
Make rendering of multiple-sprites elements work like single-sprites.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
355
diff
changeset
|
43 self.objects = [self] |
| 84 | 44 |
|
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
|
45 if hitbox: |
|
390
b11953cf1d3b
Use only half-size hitboxes for player.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
388
diff
changeset
|
46 self.hitbox = (hitbox[0], hitbox[1]) |
|
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
|
47 else: |
|
390
b11953cf1d3b
Use only half-size hitboxes for player.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
388
diff
changeset
|
48 self.hitbox = (bullet_type.hitbox_size, bullet_type.hitbox_size) |
|
142
c7f0fd9d2145
Simple collision detection
Thibaut Girka <thib@sitedethib.com>
parents:
127
diff
changeset
|
49 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
50 self.speed_interpolator = None |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
51 self.frame = 0 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
52 self.grazed = False |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
53 |
|
232
8843e26f80c3
Hopefully implement “accelerating” bullets
Thibaut Girka <thib@sitedethib.com>
parents:
220
diff
changeset
|
54 self.target = target |
| 84 | 55 |
| 56 self.sprite_idx_offset = sprite_idx_offset | |
| 57 | |
| 58 self.flags = flags | |
| 59 self.attributes = list(attributes) | |
| 60 | |
| 61 self.x, self.y = pos | |
| 62 self.angle = angle | |
| 63 self.speed = speed | |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
64 self.dx, self.dy = cos(angle) * speed, sin(angle) * speed |
| 84 | 65 |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
66 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
|
67 self.damage = damage |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
68 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
69 #TODO |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
70 if flags & 14: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
71 if flags & 2: |
| 123 | 72 index = bullet_type.launch_anim2_index |
| 73 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
|
74 elif flags & 4: |
| 123 | 75 index = bullet_type.launch_anim4_index |
| 76 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
|
77 else: |
| 123 | 78 index = bullet_type.launch_anim8_index |
| 79 launch_mult = bullet_type.launch_anim_penalties[2] | |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
80 self.dx, self.dy = self.dx * launch_mult, self.dy * launch_mult |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
81 self.sprite = Sprite() |
|
430
c9433188ffdb
Remove AnmWrapper, since ANMs are lists of entries now.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
417
diff
changeset
|
82 self.anmrunner = ANMRunner(bullet_type.anm, |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
83 index, self.sprite, |
| 123 | 84 bullet_type.launch_anim_offsets[sprite_idx_offset]) |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
85 self.anmrunner.run_frame() |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
86 else: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
87 self.launch() |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
88 |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
89 if self.player_bullet: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
90 self.sprite.angle = angle - pi |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
91 else: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
92 self.sprite.angle = angle |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
93 |
| 84 | 94 |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
95 cpdef is_visible(self, screen_width, screen_height): |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
96 tx, ty, tw, th = self.sprite.texcoords |
| 123 | 97 x, y = self.x, self.y |
| 84 | 98 |
| 99 max_x = tw / 2. | |
| 100 max_y = th / 2. | |
| 101 | |
| 123 | 102 if (max_x < x - screen_width |
| 103 or max_x < -x | |
| 104 or max_y < y - screen_height | |
| 105 or max_y < -y): | |
| 84 | 106 return False |
| 107 return True | |
| 108 | |
| 109 | |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
110 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
|
111 if sprite_idx_offset is not None: |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
112 self.sprite_idx_offset = sprite_idx_offset |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
113 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
114 bt = self._bullet_type |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
115 self.sprite = Sprite() |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
116 if self.player_bullet: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
117 self.sprite.angle = self.angle - pi |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
118 else: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
119 self.sprite.angle = self.angle |
|
430
c9433188ffdb
Remove AnmWrapper, since ANMs are lists of entries now.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
417
diff
changeset
|
120 self.anmrunner = ANMRunner(bt.anm, bt.anim_index, |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
121 self.sprite, self.sprite_idx_offset) |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
122 self.anmrunner.run_frame() |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
123 |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
124 |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
125 def launch(self): |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
126 self.state = LAUNCHED |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
127 self.frame = 0 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
128 self.set_anim() |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
129 self.dx, self.dy = cos(self.angle) * self.speed, sin(self.angle) * self.speed |
|
328
56523a16db1d
Fix some replay synchronization issues and update the TODO.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
314
diff
changeset
|
130 |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
131 if self.flags & 1: |
|
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
132 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
|
133 (self.speed,), 16) |
|
107
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
134 |
|
5d9052b9a4e8
(almost) implement Cirno's freezing spellcard
Thibaut Girka <thib@sitedethib.com>
parents:
106
diff
changeset
|
135 |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
136 def collide(self): |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
137 self.cancel() |
|
388
ac2891afb0bb
Make particles behave as in the original game.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
384
diff
changeset
|
138 self._game.new_particle((self.x, self.y), 10, 256) #TODO: find the real size. |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
139 |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
140 |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
141 def cancel(self): |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
142 # Cancel animation |
|
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
143 bt = self._bullet_type |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
144 self.sprite = Sprite() |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
145 if self.player_bullet: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
146 self.sprite.angle = self.angle - pi |
|
163
ee0bbde02c48
Implement player bullets in Bullet.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
161
diff
changeset
|
147 else: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
148 self.sprite.angle = self.angle |
|
430
c9433188ffdb
Remove AnmWrapper, since ANMs are lists of entries now.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
417
diff
changeset
|
149 self.anmrunner = ANMRunner(bt.anm, bt.cancel_anim_index, |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
150 self.sprite, bt.launch_anim_offsets[self.sprite_idx_offset]) |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
151 self.anmrunner.run_frame() |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
152 self.dx, self.dy = self.dx / 2., self.dy / 2. |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
153 |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
154 self.state = CANCELLED |
|
161
7e7368356445
Add bullet cancel anim support
Thibaut Girka <thib@sitedethib.com>
parents:
158
diff
changeset
|
155 |
|
152
86807b8a63bd
Add collisions with enemies and items.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
151
diff
changeset
|
156 |
|
417
efae61ad6efe
Remove the type of the self argument in extension types, as it clutters the code with useless information.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
390
diff
changeset
|
157 def update(self): |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
158 if self.anmrunner is not None and not self.anmrunner.run_frame(): |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
159 if self.state == LAUNCHING: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
160 #TODO: check if it doesn't skip a frame |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
161 self.launch() |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
162 elif self.state == CANCELLED: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
163 self.removed = True |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
164 else: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
165 self.anmrunner = None |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
166 |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
167 if self.state == LAUNCHING: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
168 pass |
|
335
2350147cf043
Fix bullet cancellation and removal
Thibaut Girka <thib@sitedethib.com>
parents:
328
diff
changeset
|
169 elif self.state == CANCELLED: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
170 pass |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
171 elif self.flags & 1: |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
172 # Initial speed burst |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
173 #TODO: use frame instead of interpolator? |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
174 if not self.speed_interpolator: |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
175 self.flags &= ~1 |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
176 elif self.flags & 16: |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
177 # Each frame, add a vector to the speed vector |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
178 length, angle = self.attributes[4:6] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
179 angle = self.angle if angle < -900.0 else angle #TODO: is that right? |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
180 self.dx += cos(angle) * length |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
181 self.dy += sin(angle) * length |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
182 self.speed = (self.dx ** 2 + self.dy ** 2) ** 0.5 |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
183 self.angle = self.sprite.angle = atan2(self.dy, self.dx) |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
184 if self.sprite.automatic_orientation: |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
185 self.sprite.changed = True |
|
149
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
186 if self.frame == self.attributes[0]: #TODO: include last frame, or not? |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
187 self.flags &= ~16 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
188 elif self.flags & 32: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
189 # Each frame, accelerate and rotate |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
190 #TODO: check |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
191 acceleration, angular_speed = self.attributes[4:6] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
192 self.speed += acceleration |
|
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
193 self.angle += angular_speed |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
194 self.dx = cos(self.angle) * self.speed |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
195 self.dy = sin(self.angle) * self.speed |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
196 self.sprite.angle = self.angle |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
197 if self.sprite.automatic_orientation: |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
198 self.sprite.changed = True |
|
149
3673d55a8448
Fix bullet flags 16 and 32 handling
Thibaut Girka <thib@sitedethib.com>
parents:
145
diff
changeset
|
199 if self.frame == self.attributes[0]: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
200 self.flags &= ~32 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
201 elif self.flags & 448: |
|
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
202 #TODO: check |
|
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
203 frame, count = self.attributes[0:2] |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
204 angle, speed = self.attributes[4:6] |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
205 if self.frame % frame == 0: |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
206 count = count - 1 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
207 |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
208 if self.frame != 0: |
|
314
0f88ae611d37
Fix Sakuya's daggers in stage 6.
Thibaut Girka <thib@sitedethib.com>
parents:
304
diff
changeset
|
209 self.speed = self.speed if speed < -900 else speed |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
210 |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
211 if self.flags & 64: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
212 self.angle += angle |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
213 elif self.flags & 128: |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
214 self.angle = atan2(self.target.y - self.y, |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
215 self.target.x - self.x) + angle |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
216 elif self.flags & 256: |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
217 self.angle = angle |
|
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
218 |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
219 self.dx = cos(self.angle) * self.speed |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
220 self.dy = sin(self.angle) * self.speed |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
221 self.sprite.angle = self.angle |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
222 if self.sprite.automatic_orientation: |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
223 self.sprite.changed = True |
|
122
174324a4da51
Add support for launch animations! (Warning: slow :()
Thibaut Girka <thib@sitedethib.com>
parents:
120
diff
changeset
|
224 |
| 127 | 225 if count >= 0: |
|
124
f06e96dbed4e
Fix a few things with special bullet flags
Thibaut Girka <thib@sitedethib.com>
parents:
123
diff
changeset
|
226 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
|
227 (0.,), self.frame + frame - 1) |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
228 else: |
|
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
229 self.flags &= ~448 |
|
88
2cc60137d368
Ugly implementation of three new attack flags.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
86
diff
changeset
|
230 |
|
89
1513f5626656
Fix attack flags implementation
Thibaut Girka <thib@sitedethib.com>
parents:
88
diff
changeset
|
231 self.attributes[1] = count |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
232 |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
233 # Common updates |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
234 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
235 if self.speed_interpolator: |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
236 self.speed_interpolator.update(self.frame) |
|
314
0f88ae611d37
Fix Sakuya's daggers in stage 6.
Thibaut Girka <thib@sitedethib.com>
parents:
304
diff
changeset
|
237 speed, = self.speed_interpolator.values |
|
0f88ae611d37
Fix Sakuya's daggers in stage 6.
Thibaut Girka <thib@sitedethib.com>
parents:
304
diff
changeset
|
238 self.dx = cos(self.angle) * speed |
|
0f88ae611d37
Fix Sakuya's daggers in stage 6.
Thibaut Girka <thib@sitedethib.com>
parents:
304
diff
changeset
|
239 self.dy = sin(self.angle) * speed |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
240 |
|
256
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
241 self.x += self.dx |
|
507dfd6efe0c
Refactor pytouhou.game.bullet.
Thibaut Girka <thib@sitedethib.com>
parents:
255
diff
changeset
|
242 self.y += self.dy |
| 84 | 243 |
|
86
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
244 self.frame += 1 |
|
a87a3c080585
Handle a few attack flags
Thibaut Girka <thib@sitedethib.com>
parents:
85
diff
changeset
|
245 |
|
258
620134bc51f4
Move bullet visibility check to Bullet to improve performance and prepare handling of flags 1024 and 2048.
Thibaut Girka <thib@sitedethib.com>
parents:
257
diff
changeset
|
246 # Filter out-of-screen bullets and handle special flags |
|
620134bc51f4
Move bullet visibility check to Bullet to improve performance and prepare handling of flags 1024 and 2048.
Thibaut Girka <thib@sitedethib.com>
parents:
257
diff
changeset
|
247 if self.flags & 448: |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
248 self.was_visible = False |
|
258
620134bc51f4
Move bullet visibility check to Bullet to improve performance and prepare handling of flags 1024 and 2048.
Thibaut Girka <thib@sitedethib.com>
parents:
257
diff
changeset
|
249 elif self.is_visible(self._game.width, self._game.height): |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
250 self.was_visible = True |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
251 elif self.was_visible: |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
252 self.removed = True |
|
260
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
253 if self.flags & (1024 | 2048) and self.attributes[0] > 0: |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
254 # Bounce! |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
255 if self.x < 0 or self.x > self._game.width: |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
256 self.angle = pi - self.angle |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
257 self.removed = False |
|
260
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
258 if self.y < 0 or ((self.flags & 1024) and self.y > self._game.height): |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
259 self.angle = -self.angle |
|
304
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
260 self.removed = False |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
261 self.sprite.angle = self.angle |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
262 if self.sprite.automatic_orientation: |
|
f3099ebf4f61
Update attribute names to reflect the actual interface.
Thibaut Girka <thib@sitedethib.com>
parents:
267
diff
changeset
|
263 self.sprite.changed = True |
|
260
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
264 self.dx = cos(self.angle) * self.speed |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
265 self.dy = sin(self.angle) * self.speed |
|
e22e0d73f614
Implement bullet flags 1024 and 2048 (bouncing bullet).
Thibaut Girka <thib@sitedethib.com>
parents:
258
diff
changeset
|
266 self.attributes[0] -= 1 |
|
258
620134bc51f4
Move bullet visibility check to Bullet to improve performance and prepare handling of flags 1024 and 2048.
Thibaut Girka <thib@sitedethib.com>
parents:
257
diff
changeset
|
267 |