PyTouhou: pytouhou/game/player.pyx annotate

annotate pytouhou/game/player.pyx @ 459:6e733ed817bd

Move every rendering function from gamerunner to gamerenderer.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Fri, 06 Sep 2013 22:35:54 +0200
parents	4ccc47828002
children	5f5955635d2c

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
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	15 from libc.math cimport 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
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	17 from pytouhou.game.sprite cimport Sprite
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	18 from pytouhou.vm.anmrunner import ANMRunner
196 1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	19 from pytouhou.game.bullettype import BulletType
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	20 from pytouhou.game.bullet cimport Bullet
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	21 from pytouhou.game.lasertype import LaserType
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	22 from pytouhou.game.laser import PlayerLaser
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	23
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	24
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	25 class GameOver(Exception):
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	26 pass
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	27
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	28
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	29 cdef class PlayerState:
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	30 def __init__(self, long character=0, long score=0, long power=0, long lives=2, long bombs=3):
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	31 self.character = character # ReimuA/ReimuB/MarisaA/MarisaB/...
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	32
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	33 self.score = score
303 647bde10353d Add score/effective_score distinction and prepare for highscore handling. Thibaut Girka <thib@sitedethib.com> parents: 294 diff changeset	34 self.effective_score = score
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	35 self.lives = lives
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	36 self.bombs = bombs
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	37 self.power = power
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	38
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	39 self.graze = 0
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	40 self.points = 0
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	41
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: diff changeset	42 self.x = 192.0
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: diff changeset	43 self.y = 384.0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	44
191 d2b58a26c908 Set the correct invulnerability time. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 190 diff changeset	45 self.invulnerable_time = 240
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	46 self.touchable = True
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	47 self.focused = False
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	48
197 e1bc8c4cbb1a Do the right action when collecting an item. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 196 diff changeset	49 self.power_bonus = 0 # Never goes over 30.
e1bc8c4cbb1a Do the right action when collecting an item. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 196 diff changeset	50
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	51
331 1b4f04b08729 Add the story mode. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 328 diff changeset	52 def copy(self):
1b4f04b08729 Add the story mode. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 328 diff changeset	53 return PlayerState(self.character, self.score,
1b4f04b08729 Add the story mode. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 328 diff changeset	54 self.power, self.lives, self.bombs)
1b4f04b08729 Add the story mode. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 328 diff changeset	55
1b4f04b08729 Add the story mode. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 328 diff changeset	56
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	57 cdef class Player(Element):
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	58 def __init__(self, PlayerState state, Game game, anm):
440 b9d2db93972f Add a base Element class for every object in pytouhou.game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	59 Element.__init__(self)
b9d2db93972f Add a base Element class for every object in pytouhou.game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 433 diff changeset	60
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	61 self._game = game
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	62 self.anm = anm
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	63
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	64 self.speeds = (self.sht.horizontal_vertical_speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	65 self.sht.diagonal_speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	66 self.sht.horizontal_vertical_focused_speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	67 self.sht.diagonal_focused_speed)
196 1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	68
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	69 self.fire_time = 0
142 c7f0fd9d2145 Simple collision detection Thibaut Girka <thib@sitedethib.com> parents: 130 diff changeset	70
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	71 self.state = state
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	72 self.direction = 0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	73
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	74 self.set_anim(0)
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	75
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	76 self.death_time = 0
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	77
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	78
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	79 cdef void set_anim(self, index):
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	80 self.sprite = Sprite()
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	81 self.anmrunner = ANMRunner(self.anm, index, self.sprite)
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	82
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	83
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	84 cpdef play_sound(self, str name):
379 e0e284fcb288 Make a sound when an enemy is hit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 343 diff changeset	85 self._game.sfx_player.play('%s.wav' % name)
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	86
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	87
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	88 cpdef collide(self):
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	89 if not self.state.invulnerable_time and not self.death_time and self.state.touchable: # Border Between Life and Death
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	90 self.death_time = self._game.frame
248 77b83064b57e Use the correct animation for player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 236 diff changeset	91 self._game.new_effect((self.state.x, self.state.y), 17)
198 13918723d1bc Modify difficulty when it has to. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 197 diff changeset	92 self._game.modify_difficulty(-1600)
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	93 self.play_sound('pldead00')
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	94 for i in xrange(16):
388 ac2891afb0bb Make particles behave as in the original game. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 386 diff changeset	95 self._game.new_particle((self.state.x, self.state.y), 11, 256) #TODO: find the real size and range.
152 86807b8a63bd Add collisions with enemies and items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 142 diff changeset	96
86807b8a63bd Add collisions with enemies and items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 142 diff changeset	97
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	98 def start_focusing(self):
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	99 self.state.focused = True
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	100
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	101
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	102 def stop_focusing(self):
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	103 self.state.focused = False
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	104
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	105
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	106 cdef void fire(self):
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	107 cdef double x, y
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	108 cdef long shot_power
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	109
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	110 sht = self.focused_sht if self.state.focused else self.sht
444 f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	111
f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	112 # Don’t use min() since sht.shots could be an empty dict.
f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	113 power = 999
f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	114 for shot_power in sht.shots:
f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	115 if self.state.power < shot_power:
f26c8ab57257 Use a simple for loop to determine the power level of the player; fixes a traceback when the SHT has no shot at all. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 440 diff changeset	116 power = power if power < shot_power else shot_power
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	117
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	118 bullets = self._game.players_bullets
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	119 lasers = self._game.players_lasers
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	120 nb_bullets_max = self._game.nb_bullets_max
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	121
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	122 if self.fire_time % 5 == 0:
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	123 self.play_sound('plst00')
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	124
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	125 for shot in sht.shots[power]:
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	126 origin = self.orbs[shot.orb - 1] if shot.orb else self.state
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	127 shot_type = <unsigned char>shot.type
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	128
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	129 if shot_type == 3:
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	130 if self.fire_time != 30:
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	131 continue
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	132
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	133 #TODO: number can do very surprising things, like removing any
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	134 # bullet creation from enemies with 3. For now, crash when not
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	135 # an actual laser number.
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	136 number = <long>shot.delay
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	137 if lasers[number] is not None:
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	138 continue
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	139
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	140 laser_type = LaserType(self.anm, shot.sprite % 256, 68)
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	141 lasers[number] = PlayerLaser(laser_type, 0, shot.hitbox, shot.damage, shot.angle, shot.speed, shot.interval, origin)
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	142 continue
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	143
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	144 if (self.fire_time + shot.delay) % shot.interval != 0:
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	145 continue
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	146
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	147 if nb_bullets_max != 0 and len(bullets) == nb_bullets_max:
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	148 break
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	149
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	150 x = origin.x + shot.pos[0]
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	151 y = origin.y + shot.pos[1]
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	152
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	153 #TODO: find a better way to do that.
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	154 bullet_type = BulletType(self.anm, shot.sprite % 256,
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	155 shot.sprite % 256 + 32, #TODO: find the real cancel anim
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	156 0, 0, 0, 0.)
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	157 #TODO: Type 1 (homing bullets)
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	158 if shot_type == 2:
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	159 #TODO: triple-check acceleration!
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	160 bullets.append(Bullet((x, y), bullet_type, 0,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	161 shot.angle, shot.speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	162 (-1, 0, 0, 0, 0.15, -pi/2., 0., 0.),
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	163 16, self, self._game, player_bullet=True,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	164 damage=shot.damage, hitbox=shot.hitbox))
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	165 else:
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	166 bullets.append(Bullet((x, y), bullet_type, 0,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	167 shot.angle, shot.speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	168 (0, 0, 0, 0, 0., 0., 0., 0.),
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	169 0, self, self._game, player_bullet=True,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	170 damage=shot.damage, hitbox=shot.hitbox))
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	171
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	172
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	173 cpdef update(self, long keystate):
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	174 cdef double dx, dy
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	175
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	176 if self.death_time == 0 or self._game.frame - self.death_time > 60:
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: 211 diff changeset	177 speed, diag_speed = self.speeds[2:] if self.state.focused else self.speeds[:2]
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	178 try:
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	179 dx, dy = {16: (0., -speed), 32: (0., speed), 64: (-speed, 0.), 128: (speed, 0.),
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: 211 diff changeset	180 16\|64: (-diag_speed, -diag_speed), 16\|128: (diag_speed, -diag_speed),
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: 211 diff changeset	181 32\|64: (-diag_speed, diag_speed), 32\|128: (diag_speed, diag_speed)}[keystate & (16\|32\|64\|128)]
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	182 except KeyError:
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	183 dx, dy = 0., 0.
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	184
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	185 if dx < 0 and self.direction != -1:
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	186 self.set_anim(1)
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	187 self.direction = -1
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	188 elif dx > 0 and self.direction != +1:
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	189 self.set_anim(3)
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	190 self.direction = +1
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	191 elif dx == 0 and self.direction != 0:
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	192 self.set_anim({-1: 2, +1: 4}[self.direction])
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	193 self.direction = 0
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	194
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	195 self.state.x += dx
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	196 self.state.y += dy
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	197
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	198 #XXX
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	199 self.x = self.state.x
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	200 self.y = self.state.y
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	201
380 c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	202 if self.state.x < 8.:
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	203 self.state.x = 8.
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	204 if self.state.x > self._game.width - 8:
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	205 self.state.x = self._game.width - 8.
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	206 if self.state.y < 16.:
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	207 self.state.y = 16.
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	208 if self.state.y > self._game.height - 16:
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	209 self.state.y = self._game.height -16.
c25530efea3b Replace player position in game zone right after its move; fix shots offsets at boundaries. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 379 diff changeset	210
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	211 if not self.state.focused and keystate & 4:
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	212 self.start_focusing()
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	213 elif self.state.focused and not keystate & 4:
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	214 self.stop_focusing()
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	215
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	216 if self.state.invulnerable_time > 0:
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	217 self.state.invulnerable_time -= 1
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	218
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	219 m = self.state.invulnerable_time % 8
328 56523a16db1d Fix some replay synchronization issues and update the TODO. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 304 diff changeset	220 if m == 7 or self.state.invulnerable_time == 0:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	221 self.sprite.color = (255, 255, 255)
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	222 self.sprite.changed = True
328 56523a16db1d Fix some replay synchronization issues and update the TODO. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 304 diff changeset	223 elif m == 1:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	224 self.sprite.color = (64, 64, 64)
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	225 self.sprite.changed = True
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	226
196 1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	227 if keystate & 1 and self.fire_time == 0:
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	228 self.fire_time = 30
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	229 if self.fire_time > 0:
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	230 self.fire()
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	231 self.fire_time -= 1
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	232
457 4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	233 if keystate & 2 and self.bomb_time == 0:
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	234 self._game.set_player_bomb()
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	235 self.bomb_time = 240
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	236 if self.bomb_time > 0:
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	237 self.bomb_time -= 1
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	238 if self.bomb_time == 0:
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	239 self._game.unset_player_bomb()
4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	240
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	241 if self.death_time:
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	242 time = self._game.frame - self.death_time
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	243 if time == 6: # too late, you are dead :(
175 5dc243bcf312 Don’t collect the items you drop while dying… Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 173 diff changeset	244 self.state.touchable = False
184 54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	245 if self.state.power > 16:
54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	246 self.state.power -= 16
54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	247 else:
54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	248 self.state.power = 0
386 dc6ed7b1c6de Cancel player lasers when she dies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 384 diff changeset	249 for laser in self._game.players_lasers:
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	250 if laser is not None:
386 dc6ed7b1c6de Cancel player lasers when she dies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 384 diff changeset	251 laser.cancel()
184 54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	252
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	253 self.state.lives -= 1
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	254 if self.state.lives < 0:
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	255 #TODO: display a menu to ask the players if they want to continue.
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	256 self._game.continues -= 1
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	257 if self._game.continues < 0:
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	258 raise GameOver
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	259
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	260 for i in xrange(5):
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	261 self._game.drop_bonus(self.state.x, self.state.y, 4,
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	262 end_pos=(self._game.prng.rand_double() * 288 + 48,
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	263 self._game.prng.rand_double() * 192 - 64))
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	264 self.state.score = 0
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	265 self.state.effective_score = 0
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	266 self.state.lives = 2 #TODO: use the right default.
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	267 self.state.bombs = 3 #TODO: use the right default.
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	268 self.state.power = 0
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	269
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	270 self.state.graze = 0
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	271 self.state.points = 0
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	272 else:
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	273 self._game.drop_bonus(self.state.x, self.state.y, 2,
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	274 end_pos=(self._game.prng.rand_double() * 288 + 48, # 102h.exe@0x41f3dc
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	275 self._game.prng.rand_double() * 192 - 64)) # @0x41f3
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	276 for i in xrange(5):
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	277 self._game.drop_bonus(self.state.x, self.state.y, 0,
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	278 end_pos=(self._game.prng.rand_double() * 288 + 48,
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	279 self._game.prng.rand_double() * 192 - 64))
184 54eb6b254b7b When touched, drop the items at the right place, and add precisions about particles. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 181 diff changeset	280
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	281 elif time == 7:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	282 self.sprite.mirrored = False
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	283 self.sprite.blendfunc = 0
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	284 self.sprite.rescale = 0.75, 1.5
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	285 self.sprite.fade(26, 96)
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	286 self.sprite.scale_in(26, 0., 2.5)
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	287
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	288 #TODO: the next two branches could be happening at the same frame.
78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	289 elif time == 31:
78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	290 self._game.cancel_bullets()
78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	291
211 a765ef90c2b0 Make death animation closer to the original Thibaut Girka <thib@sitedethib.com> parents: 206 diff changeset	292 elif time == 32:
225 2d35565b5608 Move game size in the game's definition, and don't keep changing the window's size. Thibaut Girka <thib@sitedethib.com> parents: 220 diff changeset	293 self.state.x = float(self._game.width) / 2. #TODO
2d35565b5608 Move game size in the game's definition, and don't keep changing the window's size. Thibaut Girka <thib@sitedethib.com> parents: 220 diff changeset	294 self.state.y = float(self._game.width) #TODO
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	295 self.direction = 0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	296
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	297 self.sprite = Sprite()
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	298 self.anmrunner = ANMRunner(self.anm, 0, self.sprite)
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	299 self.sprite.alpha = 128
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	300 self.sprite.rescale = 0., 2.5
b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	301 self.sprite.fade(30, 255)
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	302 self.sprite.blendfunc = 1
445 b0abb05811f7 Make pytouhou.game.player an extension type, and move the GameOver exception there since it makes more sense. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 444 diff changeset	303 self.sprite.scale_in(30, 1., 1.)
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	304
211 a765ef90c2b0 Make death animation closer to the original Thibaut Girka <thib@sitedethib.com> parents: 206 diff changeset	305 elif time == 61: # respawned
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	306 self.state.touchable = True
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	307 self.state.invulnerable_time = 240
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	308 self.sprite.blendfunc = 0
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	309 self.sprite.changed = True
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	310
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	311 elif time == 91: # start the bullet hell again
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	312 self.death_time = 0
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	313
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	314 self.anmrunner.run_frame()
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	315

Mercurial > touhou

annotate pytouhou/game/player.pyx @ 459:6e733ed817bd