PyTouhou: pytouhou/game/enemy.pyx annotate

annotate pytouhou/game/enemy.pyx @ 490:1b532e7dd521

Decrease PBG3 loading time by improving lzss and bitstream integration.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Fri, 04 Oct 2013 14:28:49 +0200
parents	2f53be1b2f60
children	887de1309491

rev	line source
52 ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	1 # -- encoding: utf-8 --
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	2 ##
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	3 ## Copyright (C) 2011 Thibaut Girka <thib@sitedethib.com>
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	4 ##
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	5 ## This program is free software; you can redistribute it and/or modify
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	6 ## it under the terms of the GNU General Public License as published
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	7 ## by the Free Software Foundation; version 3 only.
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	8 ##
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	9 ## This program is distributed in the hope that it will be useful,
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	10 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	11 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	12 ## GNU General Public License for more details.
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	13 ##
ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	14
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	15 from libc.math cimport cos, sin, atan2, M_PI as pi
52 ab826bc29aa2 Add some documentation, GPLv3 headers, README and COPYING file. Thibaut Girka <thib@sitedethib.com> parents: 50 diff changeset	16
69 a142e57218a0 Refactor. Move VMs to pytouhou.vm. Thibaut Girka <thib@sitedethib.com> parents: 68 diff changeset	17 from pytouhou.vm.anmrunner import ANMRunner
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	18 from pytouhou.game.sprite import Sprite
448 3bc37791f0a2 Make Bullet.state an enum. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	19 from pytouhou.game.bullet cimport Bullet, LAUNCHED
471 06f0eeb519bb Make Laser and Orb extension types, and use that where possible. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 468 diff changeset	20 from pytouhou.game.laser cimport Laser, PlayerLaser
443 cae83b963695 Make pytouhou.game.effect an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 441 diff changeset	21 from pytouhou.game.effect cimport Effect
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	22
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	23
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	24 cdef class Enemy(Element):
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 443 diff changeset	25 def __init__(self, pos, long life, long _type, long bonus_dropped, long die_score, anms, Game game):
440 b9d2db93972f Add a base Element class for every object in pytouhou.game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 437 diff changeset	26 Element.__init__(self)
b9d2db93972f Add a base Element class for every object in pytouhou.game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 437 diff changeset	27
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	28 self._game = game
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 408 diff changeset	29 self._anms = anms
49 cbe1cb50f2fd Refactor ECLRunner/EnemyManager so that all VM stuff goes to ECLRunner Thibaut Girka <thib@sitedethib.com> parents: 48 diff changeset	30 self._type = _type
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	31
316 f0be7ea62330 Fix a bug with ECL instruction 96, and fix overall ECL handling. Thibaut Girka <thib@sitedethib.com> parents: 311 diff changeset	32 self.process = None
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	33 self.visible = True
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	34 self.was_visible = False
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	35 self.bonus_dropped = bonus_dropped
319 9a4119e2cc74 Use Enemy.die_score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 318 diff changeset	36 self.die_score = die_score
49 cbe1cb50f2fd Refactor ECLRunner/EnemyManager so that all VM stuff goes to ECLRunner Thibaut Girka <thib@sitedethib.com> parents: 48 diff changeset	37
cbe1cb50f2fd Refactor ECLRunner/EnemyManager so that all VM stuff goes to ECLRunner Thibaut Girka <thib@sitedethib.com> parents: 48 diff changeset	38 self.frame = 0
cbe1cb50f2fd Refactor ECLRunner/EnemyManager so that all VM stuff goes to ECLRunner Thibaut Girka <thib@sitedethib.com> parents: 48 diff changeset	39
270 7a9135b88853 Partially fix some of Flandre's spellcards. Thibaut Girka <thib@sitedethib.com> parents: 268 diff changeset	40 self.x, self.y, self.z = pos
209 005ea47e11e0 Create enemy with negative life as it should be. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 207 diff changeset	41 self.life = 1 if life < 0 else life
67 e2cb9d434dc2 Add support for a few opcodes. Thibaut Girka <thib@sitedethib.com> parents: 62 diff changeset	42 self.touchable = True
210 f5be441d2c42 Implement collidable boolean of enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 209 diff changeset	43 self.collidable = True
67 e2cb9d434dc2 Add support for a few opcodes. Thibaut Girka <thib@sitedethib.com> parents: 62 diff changeset	44 self.damageable = True
e2cb9d434dc2 Add support for a few opcodes. Thibaut Girka <thib@sitedethib.com> parents: 62 diff changeset	45 self.death_flags = 0
177 6e8653ff2b23 Fix boss mode and don’t suicide the boss when she just want to kill the other enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 173 diff changeset	46 self.boss = False
182 20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	47 self.difficulty_coeffs = (-.5, .5, 0, 0, 0, 0)
79 ffe2c2b9912c Handle a few more ECL instructions. Prepare for bullet handling \o/ Thibaut Girka <thib@sitedethib.com> parents: 75 diff changeset	48 self.extended_bullet_attributes = (0, 0, 0, 0, 0., 0., 0., 0.)
274 f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	49 self.current_laser_id = 0
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	50 self.laser_by_id = {}
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	51 self.bullet_attributes = None
36 f46c18872796 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 34 diff changeset	52 self.bullet_launch_offset = (0, 0)
268 dd621ad72beb Fix callback handling and damage dealing. Thibaut Girka <thib@sitedethib.com> parents: 253 diff changeset	53 self.death_callback = -1
307 5930b33a0370 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 304 diff changeset	54 self.boss_callback = -1
268 dd621ad72beb Fix callback handling and damage dealing. Thibaut Girka <thib@sitedethib.com> parents: 253 diff changeset	55 self.low_life_callback = -1
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	56 self.low_life_trigger = -1
268 dd621ad72beb Fix callback handling and damage dealing. Thibaut Girka <thib@sitedethib.com> parents: 253 diff changeset	57 self.timeout = -1
dd621ad72beb Fix callback handling and damage dealing. Thibaut Girka <thib@sitedethib.com> parents: 253 diff changeset	58 self.timeout_callback = -1
350 b3049fb5c448 Fix remaining lives display issue Thibaut Girka <thib@sitedethib.com> parents: 346 diff changeset	59 self.remaining_lives = 0
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	60
75 b3bd421bb895 Handle a few more ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 73 diff changeset	61 self.automatic_orientation = False
b3bd421bb895 Handle a few more ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 73 diff changeset	62
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	63 self.bullet_launch_interval = 0
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	64 self.bullet_launch_timer = 0
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	65 self.delay_attack = False
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	66
167 e483b5a7e84b Fix default death animation. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 166 diff changeset	67 self.death_anim = 0
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	68 self.movement_dependant_sprites = None
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	69 self.direction = 0
20 6ebf9539c077 Handle more enemies types and movements Thibaut Girka <thib@sitedethib.com> parents: 18 diff changeset	70 self.interpolator = None #TODO
57 694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	71 self.speed_interpolator = None
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	72 self.update_mode = 0
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	73 self.angle = 0.
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	74 self.speed = 0.
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	75 self.rotation_speed = 0.
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	76 self.acceleration = 0.
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	77
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	78 self.hitbox_half_size[:] = [0, 0]
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	79 self.screen_box = None
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	80
242 1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	81 self.aux_anm = 8 * [None]
1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	82
1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	83
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	84 property objects:
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	85 def __get__(self):
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	86 return [self] + [anm for anm in self.aux_anm if anm is not None]
242 1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	87
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	88
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	89 cpdef play_sound(self, index):
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	90 name = {
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	91 5: 'power0',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	92 6: 'power1',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	93 7: 'tan00',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	94 8: 'tan01',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	95 9: 'tan02',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	96 14: 'cat00',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	97 16: 'lazer00',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	98 17: 'lazer01',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	99 18: 'enep01',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	100 22: 'tan00', #XXX
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	101 24: 'tan02', #XXX
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	102 25: 'kira00',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	103 26: 'kira01',
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	104 27: 'kira02'
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	105 }[index]
379 e0e284fcb288 Make a sound when an enemy is hit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 366 diff changeset	106 self._game.sfx_player.play('%s.wav' % name)
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	107
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	108
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	109 cpdef set_hitbox(self, double width, double height):
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	110 self.hitbox_half_size[:] = [width / 2, height / 2]
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	111
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	112
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	113 cpdef set_bullet_attributes(self, type_, anim, sprite_idx_offset,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	114 bullets_per_shot, number_of_shots, speed, speed2,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	115 launch_angle, angle, flags):
182 20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	116
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	117 # Apply difficulty-specific modifiers
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	118 speed_a, speed_b, nb_a, nb_b, shots_a, shots_b = self.difficulty_coeffs
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	119 diff_coeff = self._game.difficulty / 32.
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	120
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	121 speed += speed_a * (1. - diff_coeff) + speed_b * diff_coeff
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	122 speed2 += (speed_a * (1. - diff_coeff) + speed_b * diff_coeff) / 2.
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	123 bullets_per_shot += int(nb_a * (1. - diff_coeff) + nb_b * diff_coeff)
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	124 number_of_shots += int(shots_a * (1. - diff_coeff) + shots_b * diff_coeff)
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	125
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	126 self.bullet_attributes = (type_, anim, sprite_idx_offset, bullets_per_shot,
79 ffe2c2b9912c Handle a few more ECL instructions. Prepare for bullet handling \o/ Thibaut Girka <thib@sitedethib.com> parents: 75 diff changeset	127 number_of_shots, speed, speed2, launch_angle,
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	128 angle, flags)
8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	129 if not self.delay_attack:
57 694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	130 self.fire()
694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	131
694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	132
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	133 cpdef set_bullet_launch_interval(self, long value, unsigned long start=0):
182 20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	134 # Apply difficulty-specific modifiers:
329 1bb78c469f64 Fix difficulty influence on bullet launch interval, and fix instruction 77's rand usage Thibaut Girka <thib@sitedethib.com> parents: 328 diff changeset	135 #TODO: check every value possible! Look around 102h.exe@0x408720
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	136 value -= value * (<long>self._game.difficulty - 16) // 80
182 20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	137
329 1bb78c469f64 Fix difficulty influence on bullet launch interval, and fix instruction 77's rand usage Thibaut Girka <thib@sitedethib.com> parents: 328 diff changeset	138 self.bullet_launch_interval = value
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	139 self.bullet_launch_timer = start % value if value > 0 else 0
182 20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	140
20843875ad8f (Hopefully) use difficulty as it should. Thibaut Girka <thib@sitedethib.com> parents: 181 diff changeset	141
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	142 cpdef fire(self, offset=None, bullet_attributes=None, launch_pos=None):
123 d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	143 (type_, type_idx, sprite_idx_offset, bullets_per_shot, number_of_shots,
207 709f42eaa55e Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 202 diff changeset	144 speed, speed2, launch_angle, angle, flags) = bullet_attributes or self.bullet_attributes
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	145
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	146 bullet_type = self._game.bullet_types[type_idx]
123 d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	147
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	148 if launch_pos is None:
207 709f42eaa55e Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 202 diff changeset	149 ox, oy = offset or self.bullet_launch_offset
709f42eaa55e Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 202 diff changeset	150 launch_pos = self.x + ox, self.y + oy
109 e93a7ed4f203 Implement bullet_launch_offset thing Thibaut Girka <thib@sitedethib.com> parents: 108 diff changeset	151
270 7a9135b88853 Partially fix some of Flandre's spellcards. Thibaut Girka <thib@sitedethib.com> parents: 268 diff changeset	152 if speed < 0.3 and speed != 0.0:
253 ea4832f843aa Fix initial bullet speed Thibaut Girka <thib@sitedethib.com> parents: 251 diff changeset	153 speed = 0.3
104 6c59d0eeb5fa Implement ECL instruction 75 in the same exact way as 102h.exe Thibaut Girka <thib@sitedethib.com> parents: 103 diff changeset	154 if speed2 < 0.3:
6c59d0eeb5fa Implement ECL instruction 75 in the same exact way as 102h.exe Thibaut Girka <thib@sitedethib.com> parents: 103 diff changeset	155 speed2 = 0.3
6c59d0eeb5fa Implement ECL instruction 75 in the same exact way as 102h.exe Thibaut Girka <thib@sitedethib.com> parents: 103 diff changeset	156
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	157 self.bullet_launch_timer = 0
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	158
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	159 player = self.select_player()
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	160
79 ffe2c2b9912c Handle a few more ECL instructions. Prepare for bullet handling \o/ Thibaut Girka <thib@sitedethib.com> parents: 75 diff changeset	161 if type_ in (67, 69, 71):
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	162 launch_angle += self.get_player_angle(launch_pos, player)
247 fb3a263213d1 Fix instruction 70 to always fire to the right. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 242 diff changeset	163 if type_ == 71 and bullets_per_shot % 2 or type_ in (69, 70) and not bullets_per_shot % 2:
79 ffe2c2b9912c Handle a few more ECL instructions. Prepare for bullet handling \o/ Thibaut Girka <thib@sitedethib.com> parents: 75 diff changeset	164 launch_angle += pi / bullets_per_shot
104 6c59d0eeb5fa Implement ECL instruction 75 in the same exact way as 102h.exe Thibaut Girka <thib@sitedethib.com> parents: 103 diff changeset	165 if type_ != 75:
6c59d0eeb5fa Implement ECL instruction 75 in the same exact way as 102h.exe Thibaut Girka <thib@sitedethib.com> parents: 103 diff changeset	166 launch_angle -= angle * (bullets_per_shot - 1) / 2.
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	167
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	168 bullets = self._game.bullets
5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	169 nb_bullets_max = self._game.nb_bullets_max
106 c7847bfed427 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 105 diff changeset	170
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	171 for shot_nb in xrange(number_of_shots):
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	172 shot_speed = speed if shot_nb == 0 else speed + (speed2 - speed) * float(shot_nb) / float(number_of_shots)
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	173 bullet_angle = launch_angle
311 550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	174 if type_ in (69, 70, 71, 74):
550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	175 launch_angle += angle
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	176 for bullet_nb in xrange(bullets_per_shot):
143 ea21bb37febe Add max bullets limit Thibaut Girka <thib@sitedethib.com> parents: 135 diff changeset	177 if nb_bullets_max is not None and len(bullets) == nb_bullets_max:
ea21bb37febe Add max bullets limit Thibaut Girka <thib@sitedethib.com> parents: 135 diff changeset	178 break
ea21bb37febe Add max bullets limit Thibaut Girka <thib@sitedethib.com> parents: 135 diff changeset	179
135 c53d91300c1c Implement instruction 74. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 134 diff changeset	180 if type_ == 75: # 102h.exe@0x4138cf
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	181 bullet_angle = self._game.prng.rand_double() * (launch_angle - angle) + angle
135 c53d91300c1c Implement instruction 74. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 134 diff changeset	182 if type_ in (74, 75): # 102h.exe@0x4138cf
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	183 shot_speed = self._game.prng.rand_double() * (speed - speed2) + speed2
123 d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	184 bullets.append(Bullet(launch_pos, bullet_type, sprite_idx_offset,
106 c7847bfed427 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 105 diff changeset	185 bullet_angle, shot_speed,
c7847bfed427 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 105 diff changeset	186 self.extended_bullet_attributes,
151 5cf927cbd9c5 Merge GameState into Game. TODO: Merge PlayerState into Player Thibaut Girka <thib@sitedethib.com> parents: 143 diff changeset	187 flags, player, self._game))
311 550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	188
550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	189 if type_ in (69, 70, 71, 74):
550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	190 bullet_angle += 2. * pi / bullets_per_shot
550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	191 else:
550ec10cccbc Fix angle between salves of circle-distributed bullets. Thibaut Girka <thib@sitedethib.com> parents: 309 diff changeset	192 bullet_angle += angle
48 8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	193
8353c33d53d4 Support a few more instructions Thibaut Girka <thib@sitedethib.com> parents: 46 diff changeset	194
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	195 cpdef new_laser(self, variant, laser_type, sprite_idx_offset, angle, speed,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	196 start_offset, end_offset, max_length, width,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	197 start_duration, duration, end_duration,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	198 grazing_delay, grazing_extra_duration, unknown,
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	199 offset=None):
309 14c9aca8e274 Implement Remilia's laser webs. Thibaut Girka <thib@sitedethib.com> parents: 307 diff changeset	200 ox, oy = offset or self.bullet_launch_offset
277 219edad0f395 Fix initial laser offset. Thibaut Girka <thib@sitedethib.com> parents: 274 diff changeset	201 launch_pos = self.x + ox, self.y + oy
274 f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	202 if variant == 86:
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	203 angle += self.get_player_angle(launch_pos)
274 f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	204 laser = Laser(launch_pos, self._game.laser_types[laser_type],
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	205 sprite_idx_offset, angle, speed,
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	206 start_offset, end_offset, max_length, width,
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	207 start_duration, duration, end_duration, grazing_delay,
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	208 grazing_extra_duration, self._game)
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	209 self._game.lasers.append(laser)
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	210 self.laser_by_id[self.current_laser_id] = laser
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	211
f037bca24f2d Partially implement lasers. Thibaut Girka <thib@sitedethib.com> parents: 270 diff changeset	212
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	213 cpdef Player select_player(self, list players=None):
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	214 if players is None:
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	215 players = self._game.players
486 2f53be1b2f60 Merge netplay branch. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 479 471 diff changeset	216 return min(players, key=self.select_player_key)
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	217
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	218
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	219 cpdef double get_player_angle(self, tuple pos=None, Player player=None):
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	220 cdef double x, y
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	221 if player is None:
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	222 player = self.select_player()
132 fba45c37ec99 Fix initial angle of bullets with bullet_launch_offset enabled. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 130 diff changeset	223 x, y = pos or (self.x, self.y)
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	224 return atan2(player.state.y - y, player.state.x - x)
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	225
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	226
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	227 cpdef set_anim(self, index):
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 408 diff changeset	228 entry = 0 if index in self._anms[0].scripts else 1
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	229 self.sprite = Sprite()
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 408 diff changeset	230 self.anmrunner = ANMRunner(self._anms[entry], index, self.sprite)
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	231
444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	232
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	233 cdef void die_anim(self):
248 77b83064b57e Use the correct animation for player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 247 diff changeset	234 anim = {0: 3, 1: 4, 2: 5}[self.death_anim % 256] # The TB is wanted, if index isn’t in these values the original game crashs.
77b83064b57e Use the correct animation for player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 247 diff changeset	235 self._game.new_effect((self.x, self.y), anim)
379 e0e284fcb288 Make a sound when an enemy is hit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 366 diff changeset	236 self._game.sfx_player.play('enep00.wav')
190 dbe6b7b2d3fc Fix a few things about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 184 diff changeset	237
dbe6b7b2d3fc Fix a few things about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 184 diff changeset	238
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	239 cdef void drop_particles(self, long number, long color):
190 dbe6b7b2d3fc Fix a few things about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 184 diff changeset	240 if color == 0:
dbe6b7b2d3fc Fix a few things about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 184 diff changeset	241 if self._game.stage in [1, 2, 7]:
dbe6b7b2d3fc Fix a few things about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 184 diff changeset	242 color = 3
388 ac2891afb0bb Make particles behave as in the original game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 384 diff changeset	243 color += 9
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	244 for i in xrange(number):
388 ac2891afb0bb Make particles behave as in the original game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 384 diff changeset	245 self._game.new_particle((self.x, self.y), color, 256) #TODO: find the real size.
154 364935f6e313 Implement enemy killing. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 152 diff changeset	246
364935f6e313 Implement enemy killing. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 152 diff changeset	247
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	248 cpdef set_aux_anm(self, long number, long index):
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 408 diff changeset	249 entry = 0 if index in self._anms[0].scripts else 1
c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 408 diff changeset	250 self.aux_anm[number] = Effect((self.x, self.y), index, self._anms[entry])
242 1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	251
1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	252
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	253 cpdef set_pos(self, x, y, z):
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	254 self.x, self.y = x, y
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	255 self.update_mode = 1
437 d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	256 self.interpolator = Interpolator((x, y), self._game.frame)
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	257
444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	258
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	259 cpdef move_to(self, duration, x, y, z, formula):
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	260 frame = self._game.frame
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	261 self.speed_interpolator = None
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	262 self.update_mode = 1
437 d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	263 self.interpolator = Interpolator((self.x, self.y), frame,
d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	264 (x, y), frame + duration - 1,
d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	265 formula)
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	266
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	267 self.angle = atan2(y - self.y, x - self.x)
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	268
75 b3bd421bb895 Handle a few more ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 73 diff changeset	269
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	270 cpdef stop_in(self, duration, formula):
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	271 frame = self._game.frame
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	272 self.interpolator = None
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	273 self.update_mode = 1
437 d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	274 self.speed_interpolator = Interpolator((self.speed,), frame,
d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	275 (0.,), frame + duration - 1,
d778db08190f Make Interpolator an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	276 formula)
75 b3bd421bb895 Handle a few more ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 73 diff changeset	277
57 694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	278
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 443 diff changeset	279 cdef bint is_visible(self, long screen_width, long screen_height):
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	280 cdef double tw, th
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	281
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	282 if self.sprite is not None:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	283 if self.sprite.corner_relative_placement:
73 e4af16a019d3 Do not remove enemies as soon as they lose their animation (Daiyousei...) Thibaut Girka <thib@sitedethib.com> parents: 72 diff changeset	284 raise Exception #TODO
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	285 _, _, tw, th = self.sprite.texcoords
73 e4af16a019d3 Do not remove enemies as soon as they lose their animation (Daiyousei...) Thibaut Girka <thib@sitedethib.com> parents: 72 diff changeset	286 else:
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	287 tw, th = 0, 0
29 afa91be769ae Don't lose time updating off-screen enemies' sprites Thibaut Girka <thib@sitedethib.com> parents: 23 diff changeset	288
123 d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	289 x, y = self.x, self.y
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	290 max_x = tw / 2
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	291 max_y = th / 2
29 afa91be769ae Don't lose time updating off-screen enemies' sprites Thibaut Girka <thib@sitedethib.com> parents: 23 diff changeset	292
123 d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	293 if (max_x < x - screen_width
d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	294 or max_x < -x
d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	295 or max_y < y - screen_height
d1c82d43bbf3 Various optimizations Thibaut Girka <thib@sitedethib.com> parents: 120 diff changeset	296 or max_y < -y):
23 444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	297 return False
444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	298 return True
444ac7bca7bc Refacto ECL stuff, add support for a few instructions, and add some culling Thibaut Girka <thib@sitedethib.com> parents: 22 diff changeset	299
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	300
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	301 cdef void check_collisions(self):
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	302 cdef Bullet bullet
feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	303 cdef Player player
471 06f0eeb519bb Make Laser and Orb extension types, and use that where possible. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 468 diff changeset	304 cdef PlayerLaser laser
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	305 cdef long damages
471 06f0eeb519bb Make Laser and Orb extension types, and use that where possible. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 468 diff changeset	306 cdef double half_size[2], phalf_size
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	307
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	308 # Check for collisions
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	309 ex, ey = self.x, self.y
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	310 ehalf_size_x = self.hitbox_half_size[0]
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	311 ehalf_size_y = self.hitbox_half_size[1]
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	312 ex1, ex2 = ex - ehalf_size_x, ex + ehalf_size_x
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	313 ey1, ey2 = ey - ehalf_size_y, ey + ehalf_size_y
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	314
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	315 damages = 0
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	316
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	317 # Check for enemy-bullet collisions
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	318 for bullet in self._game.players_bullets:
335 2350147cf043 Fix bullet cancellation and removal Thibaut Girka <thib@sitedethib.com> parents: 329 diff changeset	319 if bullet.state != LAUNCHED:
2350147cf043 Fix bullet cancellation and removal Thibaut Girka <thib@sitedethib.com> parents: 329 diff changeset	320 continue
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	321 half_size[0] = bullet.hitbox[0]
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	322 half_size[1] = bullet.hitbox[1]
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	323 bx, by = bullet.x, bullet.y
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: 212 diff changeset	324 bx1, bx2 = bx - half_size[0], bx + half_size[0]
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: 212 diff changeset	325 by1, by2 = by - half_size[1], by + half_size[1]
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	326
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	327 if not (bx2 < ex1 or bx1 > ex2
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	328 or by2 < ey1 or by1 > ey2):
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	329 bullet.collide()
408 c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	330 damages += bullet.damage
379 e0e284fcb288 Make a sound when an enemy is hit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 366 diff changeset	331 self._game.sfx_player.play('damage00.wav')
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	332
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	333 # Check for enemy-laser collisions
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	334 for laser in self._game.players_lasers:
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	335 if not laser:
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	336 continue
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	337
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	338 half_size[0] = laser.hitbox[0]
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	339 half_size[1] = laser.hitbox[1]
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	340 lx, ly = laser.x, laser.y * 2.
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	341 lx1, lx2 = lx - half_size[0], lx + half_size[0]
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	342
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	343 if not (lx2 < ex1 or lx1 > ex2
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	344 or ly < ey1):
408 c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	345 damages += laser.damage
379 e0e284fcb288 Make a sound when an enemy is hit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 366 diff changeset	346 self._game.sfx_player.play('damage00.wav')
328 56523a16db1d Fix some replay synchronization issues and update the TODO. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 320 diff changeset	347 self.drop_particles(1, 1) #TODO: don’t call each frame.
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 282 diff changeset	348
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	349 # Check for enemy-player collisions
212 78e9957ad344 Hopefully fix enemy-player collision Thibaut Girka <thib@sitedethib.com> parents: 210 diff changeset	350 ex1, ex2 = ex - ehalf_size_x * 2. / 3., ex + ehalf_size_x * 2. / 3.
78e9957ad344 Hopefully fix enemy-player collision Thibaut Girka <thib@sitedethib.com> parents: 210 diff changeset	351 ey1, ey2 = ey - ehalf_size_y * 2. / 3., ey + ehalf_size_y * 2. / 3.
210 f5be441d2c42 Implement collidable boolean of enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 209 diff changeset	352 if self.collidable:
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	353 for player in self._game.players:
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	354 px, py = player.state.x, player.state.y
390 b11953cf1d3b Use only half-size hitboxes for player. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 388 diff changeset	355 phalf_size = player.sht.hitbox
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	356 px1, px2 = px - phalf_size, px + phalf_size
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	357 py1, py2 = py - phalf_size, py + phalf_size
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	358
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	359 #TODO: box-box or point-in-box?
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	360 if not (ex2 < px1 or ex1 > px2 or ey2 < py1 or ey1 > py2):
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	361 if not self.boss:
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	362 damages += 10
212 78e9957ad344 Hopefully fix enemy-player collision Thibaut Girka <thib@sitedethib.com> parents: 210 diff changeset	363 player.collide()
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	364
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	365 # Adjust damages
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	366 damages = min(70, damages)
300 da53bc29b94a Add the game interface. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 294 diff changeset	367 score = (damages // 5) * 10
da53bc29b94a Add the game interface. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 294 diff changeset	368 self._game.players[0].state.score += score #TODO: better distribution amongst the players.
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	369
408 c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	370 if self.damageable:
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	371 if self._game.spellcard is not None:
408 c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	372 #TODO: there is a division by 3, somewhere... where is it?
c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	373 if damages <= 7:
c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	374 damages = 1 if damages else 0
c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	375 else:
c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	376 damages //= 7
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	377
408 c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	378 # Apply damages
c689ff1743bf Do the correct score calculation even when the enemy isn’t damageable. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	379 self.life -= damages
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	380
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	381
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	382 cdef void handle_callbacks(self):
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	383 #TODO: implement missing callbacks and clean up!
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	384 if self.life <= 0 and self.touchable:
354 89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	385 self.timeout = -1 #TODO: not really true, the timeout is frozen
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	386 self.timeout_callback = -1
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	387 death_flags = self.death_flags & 7
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	388
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	389 self.die_anim()
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	390
319 9a4119e2cc74 Use Enemy.die_score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 318 diff changeset	391 #TODO: verify if the score is added with all the different flags.
9a4119e2cc74 Use Enemy.die_score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 318 diff changeset	392 self._game.players[0].state.score += self.die_score #TODO: better distribution amongst the players.
9a4119e2cc74 Use Enemy.die_score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 318 diff changeset	393
320 1a4ffdda8735 Cancel the bullets when a boss is killed and transfer them to the score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 319 diff changeset	394 #TODO: verify if that should really be there.
1a4ffdda8735 Cancel the bullets when a boss is killed and transfer them to the score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 319 diff changeset	395 if self.boss:
1a4ffdda8735 Cancel the bullets when a boss is killed and transfer them to the score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 319 diff changeset	396 self._game.change_bullets_into_bonus()
1a4ffdda8735 Cancel the bullets when a boss is killed and transfer them to the score. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 319 diff changeset	397
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	398 if death_flags < 4:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	399 if self.bonus_dropped > -1:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	400 self.drop_particles(7, 0)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	401 self._game.drop_bonus(self.x, self.y, self.bonus_dropped)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	402 elif self.bonus_dropped == -1:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	403 if self._game.deaths_count % 3 == 0:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	404 self.drop_particles(10, 0)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	405 self._game.drop_bonus(self.x, self.y, self._game.bonus_list[self._game.next_bonus])
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	406 self._game.next_bonus = (self._game.next_bonus + 1) % 32
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	407 else:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	408 self.drop_particles(4, 0)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	409 self._game.deaths_count += 1
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	410 else:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	411 self.drop_particles(4, 0)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	412
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	413 if death_flags == 0:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	414 self.removed = True
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	415 return
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	416
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	417 if death_flags == 1:
357 26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	418 if self.boss:
26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	419 self.boss = False #TODO: really?
26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	420 self._game.boss = None
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	421 self.touchable = False
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	422 elif death_flags == 2:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	423 pass # Just that?
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	424 elif death_flags == 3:
357 26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	425 if self.boss:
26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	426 self.boss = False #TODO: really?
26f78fc7acea Fix Koakuma Thibaut Girka <thib@sitedethib.com> parents: 354 diff changeset	427 self._game.boss = None
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	428 self.damageable = False
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	429 self.life = 1
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	430 self.death_flags = 0
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	431
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	432 if death_flags != 0 and self.death_callback > -1:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	433 self.process.switch_to_sub(self.death_callback)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	434 self.death_callback = -1
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	435 elif self.life <= self.low_life_trigger and self.low_life_callback > -1:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	436 self.process.switch_to_sub(self.low_life_callback)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	437 self.low_life_callback = -1
354 89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	438 self.low_life_trigger = -1
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	439 self.timeout_callback = -1
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	440 elif self.timeout != -1 and self.frame == self.timeout:
366 7dc012f631dc Fix Rumia on timeout Thibaut Girka <thib@sitedethib.com> parents: 358 diff changeset	441 self.frame = 0
354 89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	442 self.timeout = -1
358 488c094ed51d Make bosses clean their mess when timeouting Thibaut Girka <thib@sitedethib.com> parents: 357 diff changeset	443 self._game.kill_enemies()
488c094ed51d Make bosses clean their mess when timeouting Thibaut Girka <thib@sitedethib.com> parents: 357 diff changeset	444 self._game.cancel_bullets()
354 89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	445
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	446 if self.low_life_trigger > 0:
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	447 self.life = self.low_life_trigger
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	448 self.low_life_trigger = -1
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	449
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	450 if self.timeout_callback > -1:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	451 self.process.switch_to_sub(self.timeout_callback)
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	452 self.timeout_callback = -1
354 89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	453 #TODO: this is only done under certain (unknown) conditions!
89ee09453906 Fix callbacks Thibaut Girka <thib@sitedethib.com> parents: 350 diff changeset	454 # but it shouldn't hurt anyway, as the only option left is to crash!
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	455 elif self.death_callback > -1:
366 7dc012f631dc Fix Rumia on timeout Thibaut Girka <thib@sitedethib.com> parents: 358 diff changeset	456 self.life = 0 #TODO: do this next frame? Bypass self.touchable?
318 1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	457 else:
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	458 raise Exception('What the hell, man!')
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	459
1366cefd0334 Move callbacks handling inside Enemy. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 316 diff changeset	460
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	461 cdef void update(self):
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	462 cdef double x, y, speed
e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	463
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 448 diff changeset	464 if self.process is not None:
316 f0be7ea62330 Fix a bug with ECL instruction 96, and fix overall ECL handling. Thibaut Girka <thib@sitedethib.com> parents: 311 diff changeset	465 self.process.run_iteration()
f0be7ea62330 Fix a bug with ECL instruction 96, and fix overall ECL handling. Thibaut Girka <thib@sitedethib.com> parents: 311 diff changeset	466
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	467 x, y = self.x, self.y
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	468
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	469 if self.update_mode == 1:
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	470 speed = 0.
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	471 if self.interpolator:
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	472 self.interpolator.update(self._game.frame)
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	473 x, y = self.interpolator.values
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	474 if self.speed_interpolator:
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	475 self.speed_interpolator.update(self._game.frame)
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	476 speed, = self.speed_interpolator.values
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	477 else:
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	478 speed = self.speed
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	479 self.speed += self.acceleration
4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	480 self.angle += self.rotation_speed
57 694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	481
251 4b549894ef6b Change position/speed interpoletor handling to match the original game more closely. Thibaut Girka <thib@sitedethib.com> parents: 248 diff changeset	482 dx, dy = cos(self.angle) * speed, sin(self.angle) * speed
49 cbe1cb50f2fd Refactor ECLRunner/EnemyManager so that all VM stuff goes to ECLRunner Thibaut Girka <thib@sitedethib.com> parents: 48 diff changeset	483 if self._type & 2:
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	484 x -= dx
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	485 else:
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	486 x += dx
bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	487 y += dy
bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	488
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	489 if self.movement_dependant_sprites is not None:
57 694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	490 #TODO: is that really how it works? Almost.
694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	491 # Sprite determination is done only once per changement, and is
694f25881d0f Fix move_to interpolation, add support for a few ANM and ECL instructions Thibaut Girka <thib@sitedethib.com> parents: 56 diff changeset	492 # superseeded by ins_97.
62 1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	493 end_left, end_right, left, right = self.movement_dependant_sprites
1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	494 if x < self.x and self.direction != -1:
1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	495 self.set_anim(left)
22 fa87db09fc3a Fix Rumia's animations Thibaut Girka <thib@sitedethib.com> parents: 21 diff changeset	496 self.direction = -1
62 1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	497 elif x > self.x and self.direction != +1:
1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	498 self.set_anim(right)
22 fa87db09fc3a Fix Rumia's animations Thibaut Girka <thib@sitedethib.com> parents: 21 diff changeset	499 self.direction = +1
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	500 elif x == self.x and self.direction != 0:
62 1f591adcea04 Fix animation determination (ins_98 stuff) and some interpolation functions Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	501 self.set_anim({-1: end_left, +1: end_right}[self.direction])
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	502 self.direction = 0
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	503
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	504
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	505 if self.screen_box is not None:
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	506 xmin, ymin, xmax, ymax = self.screen_box
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	507 x = max(xmin, min(x, xmax))
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	508 y = max(ymin, min(y, ymax))
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	509
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: 49 diff changeset	510
21 bf225780973f Small refactoring, and Rumia \o/ Thibaut Girka <thib@sitedethib.com> parents: 20 diff changeset	511 self.x, self.y = x, y
69 a142e57218a0 Refactor. Move VMs to pytouhou.vm. Thibaut Girka <thib@sitedethib.com> parents: 68 diff changeset	512
a142e57218a0 Refactor. Move VMs to pytouhou.vm. Thibaut Girka <thib@sitedethib.com> parents: 68 diff changeset	513 #TODO
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	514 if self.anmrunner is not None and not self.anmrunner.run_frame():
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	515 self.anmrunner = None
69 a142e57218a0 Refactor. Move VMs to pytouhou.vm. Thibaut Girka <thib@sitedethib.com> parents: 68 diff changeset	516
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	517 if self.sprite is not None and self.visible:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	518 if self.sprite.removed:
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	519 self.sprite = None
69 a142e57218a0 Refactor. Move VMs to pytouhou.vm. Thibaut Girka <thib@sitedethib.com> parents: 68 diff changeset	520 else:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	521 self.sprite.update_orientation(self.angle,
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 300 diff changeset	522 self.automatic_orientation)
36 f46c18872796 Minor refactoring Thibaut Girka <thib@sitedethib.com> parents: 34 diff changeset	523
83 fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	524
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	525 if self.bullet_launch_interval != 0:
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	526 self.bullet_launch_timer += 1
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	527 if self.bullet_launch_timer == self.bullet_launch_interval:
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	528 self.fire()
fc0294c745b6 Basic bullet handling! Clean up as soon as possible :p Thibaut Girka <thib@sitedethib.com> parents: 79 diff changeset	529
202 d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	530 # Check collisions
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	531 if self.touchable:
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	532 self.check_collisions()
d348892ef012 Handle enemy collisions and damages in a way closer to the original game. Thibaut Girka <thib@sitedethib.com> parents: 197 diff changeset	533
242 1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	534 for anm in self.aux_anm:
441 e8dc95a2a287 Make pytouhou.game.enemy an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	535 if anm is not None:
282 dbb1a86c0235 Rename Animations to ANM0 and prepare AnmWrapper for dialogs and interface. Thibaut Girka <thib@sitedethib.com> parents: 277 diff changeset	536 anm.x, anm.y = self.x, self.y
242 1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	537 anm.update()
1d3c8c7473a2 Implement auxiliary animations of enemies like magic circles, and interruptions from ecl. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 234 diff changeset	538
328 56523a16db1d Fix some replay synchronization issues and update the TODO. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 320 diff changeset	539 self.handle_callbacks()
56523a16db1d Fix some replay synchronization issues and update the TODO. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 320 diff changeset	540
18 ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	541 self.frame += 1
ca26a84916cb Add preliminary ECL viewer/interpreter. Thibaut Girka <thib@sitedethib.com> parents: diff changeset	542
486 2f53be1b2f60 Merge netplay branch. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 479 471 diff changeset	543
2f53be1b2f60 Merge netplay branch. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 479 471 diff changeset	544 def select_player_key(self, p):
2f53be1b2f60 Merge netplay branch. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 479 471 diff changeset	545 return ((p.x - self.x) 2 + (p.y - self.y) 2, p.state.character)

Mercurial > touhou

annotate pytouhou/game/enemy.pyx @ 490:1b532e7dd521