PyTouhou: pytouhou/game/player.pyx annotate

annotate pytouhou/game/player.pyx @ 502:3d3285918ba1

Disallow collection of items dropped by the other player in netplay, also fixes a longstanding bug where autocollection worked with those items.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Wed, 23 Oct 2013 18:24:08 +0200
parents	c9c2fb873dbd
children	292fea5c584e

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
472 8038f1957b71 Type bullettype, itemtype and lasertype a bit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 471 diff changeset	19 from pytouhou.game.bullettype cimport 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
472 8038f1957b71 Type bullettype, itemtype and lasertype a bit. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 471 diff changeset	21 from pytouhou.game.lasertype cimport LaserType
471 06f0eeb519bb Make Laser and Orb extension types, and use that where possible. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 468 diff changeset	22 from pytouhou.game.laser cimport 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
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	29 cdef class Player(Element):
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	30 def __init__(self, long number, anm, long character=0, long power=0,
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	31 long continues=0, long lives=2, long bombs=3, long score=0):
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	32 Element.__init__(self)
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	33
492 887de1309491 Add friendly fire in netplay. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 472 diff changeset	34 self.number = number
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	35 self.character = character # ReimuA/ReimuB/MarisaA/MarisaB/...
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	36
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	37 self.score = score
303 647bde10353d Add score/effective_score distinction and prepare for highscore handling. Thibaut Girka <thib@sitedethib.com> parents: 294 diff changeset	38 self.effective_score = score
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	39 self.lives = lives
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	40 self.bombs = bombs
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	41 self.continues = continues
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	42 self.power = power
465 5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	43
5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	44 self.continues_used = 0
5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	45 self.miss = 0
5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	46 self.bombs_used = 0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	47
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	48 self.graze = 0
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	49 self.points = 0
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	50
50 811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: diff changeset	51 self.x = 192.0
811cefefb5c8 Fix a few bugs and add support for a few instructions Thibaut Girka <thib@sitedethib.com> parents: diff changeset	52 self.y = 384.0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	53
191 d2b58a26c908 Set the correct invulnerability time. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 190 diff changeset	54 self.invulnerable_time = 240
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	55 self.touchable = True
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	56 self.focused = False
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	57
197 e1bc8c4cbb1a Do the right action when collecting an item. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 196 diff changeset	58 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	59
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	60 self._game = None
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	61 self.anm = anm
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	62
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	63 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	64 self.sht.diagonal_speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	65 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	66 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	67
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	68 self.fire_time = 0
142 c7f0fd9d2145 Simple collision detection Thibaut Girka <thib@sitedethib.com> parents: 130 diff changeset	69
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	70 self.direction = 0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	71
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	72 self.set_anim(0)
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	73
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	74 self.death_time = 0
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	75
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	76
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	77 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	78 self.sprite = Sprite()
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	79 self.anmrunner = ANMRunner(self.anm, index, self.sprite)
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	80
11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	81
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 465 diff changeset	82 cdef void 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	83 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	84
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	85
468 feecdb4a8928 Add “except ” to cdef void functions, and type some more. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 465 diff changeset	86 cdef void collide(self):
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	87 if not self.invulnerable_time and not self.death_time and self.touchable: # Border Between Life and Death
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	88 self.death_time = self._game.frame
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	89 self._game.new_effect((self.x, self.y), 17)
198 13918723d1bc Modify difficulty when it has to. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 197 diff changeset	90 self._game.modify_difficulty(-1600)
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	91 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	92 for i in xrange(16):
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	93 self._game.new_particle((self.x, self.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	94
86807b8a63bd Add collisions with enemies and items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 142 diff changeset	95
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	96 def start_focusing(self):
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	97 self.focused = True
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	98
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	99
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	100 def stop_focusing(self):
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	101 self.focused = False
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	102
eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	103
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	104 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	105 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	106
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	107 sht = self.focused_sht if self.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	108
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	109 # 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	110 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	111 for shot_power in sht.shots:
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	112 if self.power < shot_power:
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	113 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	114
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	115 bullets = self._game.players_bullets
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	116 lasers = self._game.players_lasers
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	117 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	118
343 94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	119 if self.fire_time % 5 == 0:
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	120 self.play_sound('plst00')
94fdb6c782c1 Implement sfx for player and enemies. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 339 diff changeset	121
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	122 for shot in sht.shots[power]:
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	123 origin = <Element>(self.orbs[shot.orb - 1] if shot.orb else self)
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	124 shot_type = <unsigned char>shot.type
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	125
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	126 if shot_type == 3:
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	127 if self.fire_time != 30:
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	128 continue
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	129
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	130 #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	131 # 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	132 # 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	133 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	134 if lasers[number] is not None:
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	135 continue
94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	136
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	137 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	138 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	139 continue
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	140
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	141 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	142 continue
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	143
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	144 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	145 break
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	146
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	147 x = origin.x + <double>shot.pos[0]
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	148 y = origin.y + <double>shot.pos[1]
235 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 #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	151 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	152 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	153 0, 0, 0, 0.)
294 94c636f8f863 Add player lasers for MarisaB. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 274 diff changeset	154 #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	155 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	156 #TODO: triple-check acceleration!
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	157 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	158 shot.angle, shot.speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	159 (-1, 0, 0, 0, 0.15, -pi/2., 0., 0.),
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	160 16, self, self._game, player=self.number,
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	161 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	162 else:
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	163 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	164 shot.angle, shot.speed,
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	165 (0, 0, 0, 0, 0., 0., 0., 0.),
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	166 0, self, self._game, player=self.number,
235 e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	167 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	168
e59bd7979ddc Do a little cleanup, and fix PCB SHT usage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 225 diff changeset	169
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	170 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	171 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	172
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	173 if self.death_time == 0 or self._game.frame - self.death_time > 60:
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	174 speed, diag_speed = self.speeds[2:] if self.focused else self.speeds[:2]
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	175 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	176 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	177 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	178 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	179 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	180 dx, dy = 0., 0.
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	181
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	182 if dx < 0 and self.direction != -1:
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	183 self.set_anim(1)
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	184 self.direction = -1
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	185 elif dx > 0 and self.direction != +1:
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	186 self.set_anim(3)
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	187 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	188 elif dx == 0 and self.direction != 0:
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	189 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	190 self.direction = 0
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	191
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	192 self.x += dx
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	193 self.y += dy
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	194
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	195 if self.x < 8.:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	196 self.x = 8.
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	197 if self.x > self._game.width - 8:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	198 self.x = self._game.width - 8.
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	199 if self.y < 16.:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	200 self.y = 16.
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	201 if self.y > self._game.height - 16:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	202 self.y = self._game.height -16.
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	203
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	204 if not self.focused and keystate & 4:
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	205 self.start_focusing()
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	206 elif self.focused and not keystate & 4:
206 eca53abdfeab Fix ReimuA, and refactor Player a bit. Thibaut Girka <thib@sitedethib.com> parents: 199 diff changeset	207 self.stop_focusing()
199 8ec34c56fed0 Implement orbs. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 198 diff changeset	208
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	209 if self.invulnerable_time > 0:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	210 self.invulnerable_time -= 1
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	211
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	212 m = self.invulnerable_time % 8
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	213 if m == 7 or self.invulnerable_time == 0:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	214 self.sprite.color = (255, 255, 255)
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	215 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	216 elif m == 1:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	217 self.sprite.color = (64, 64, 64)
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	218 self.sprite.changed = True
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	219
196 1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	220 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	221 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	222 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	223 self.fire()
1e501e3b6645 Add a subclass for each character, and implement player attacks. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 193 diff changeset	224 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	225
498 c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	226 if self.death_time == 0 or self.death_time < 6: #TODO: < or <=?
c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	227 if keystate & 2 and self.bombs and self.bomb_time == 0:
457 4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	228 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	229 self.bomb_time = 240
498 c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	230 self.bombs -= 1
c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	231 self.bombs_used += 1
c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	232 self.invulnerable_time = 240 #TODO: check the duration of bombs.
c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	233 self.death_time = 0 # Deathbomb.
457 4ccc47828002 Display the name of a spellcard and the face of its invoker. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 447 diff changeset	234 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	235 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	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._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	238
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	239 if self.death_time:
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	240 time = self._game.frame - self.death_time
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	241 if time == 6: # too late, you are dead :(
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	242 self.touchable = False
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	243 if self.power > 16:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	244 self.power -= 16
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 else:
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	246 self.power = 0
498 c9c2fb873dbd Actually consume a bomb when using it, make the player invulnerable for a certain time, and implement deathbomb. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 494 diff changeset	247 self.bombs = 3 #TODO: use the right default.
471 06f0eeb519bb Make Laser and Orb extension types, and use that where possible. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 468 diff changeset	248 self._game.cancel_player_lasers()
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	249
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	250 self.miss += 1
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	251 self.lives -= 1
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	252 if self.lives < 0:
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	253 #TODO: display a menu to ask the players if they want to continue.
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	254 if self.continues == 0:
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	255 raise GameOver
7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	256
465 5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	257 # Don’t decrement if it’s infinite.
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	258 if self.continues >= 0:
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	259 self.continues -= 1
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	260 self.continues_used += 1
465 5f5955635d2c Move continues to PlayerState, and make sure they aren’t reinitialized before each stage. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 457 diff changeset	261
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	262 for i in xrange(5):
502 3d3285918ba1 Disallow collection of items dropped by the other player in netplay, also fixes a longstanding bug where autocollection worked with those items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 498 diff changeset	263 self._game.drop_bonus(self.x, self.y, 4, player=self,
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	264 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	265 self._game.prng.rand_double() * 192 - 64))
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	266 self.score = 0
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	267 self.effective_score = 0
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	268 self.lives = 2 #TODO: use the right default.
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	269 self.bombs = 3 #TODO: use the right default.
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	270 self.power = 0
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	271
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	272 self.graze = 0
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	273 self.points = 0
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	274 else:
502 3d3285918ba1 Disallow collection of items dropped by the other player in netplay, also fixes a longstanding bug where autocollection worked with those items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 498 diff changeset	275 self._game.drop_bonus(self.x, self.y, 2, player=self,
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	276 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	277 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	278 for i in xrange(5):
502 3d3285918ba1 Disallow collection of items dropped by the other player in netplay, also fixes a longstanding bug where autocollection worked with those items. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 498 diff changeset	279 self._game.drop_bonus(self.x, self.y, 0, player=self,
339 7a05edbab88a Implement continues when the lives fall bellow 0. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 335 diff changeset	280 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	281 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	282
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	283 elif time == 7:
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	284 self.sprite.mirrored = False
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	285 self.sprite.blendfunc = 0
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	286 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	287 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	288 self.sprite.scale_in(26, 0., 2.5)
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	289
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	290 #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	291 elif time == 31:
78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	292 self._game.cancel_bullets()
78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	293
211 a765ef90c2b0 Make death animation closer to the original Thibaut Girka <thib@sitedethib.com> parents: 206 diff changeset	294 elif time == 32:
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	295 self.x = float(self._game.width) / 2. #TODO
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	296 self.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	297 self.direction = 0
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	298
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	299 self.sprite = Sprite()
430 c9433188ffdb Remove AnmWrapper, since ANMs are lists of entries now. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 390 diff changeset	300 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	301 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	302 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	303 self.sprite.fade(30, 255)
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	304 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	305 self.sprite.scale_in(30, 1., 1.)
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	306
211 a765ef90c2b0 Make death animation closer to the original Thibaut Girka <thib@sitedethib.com> parents: 206 diff changeset	307 elif time == 61: # respawned
494 6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	308 self.touchable = True
6be9c99a3a24 Merge PlayerState into Player, fix player respawn position. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 492 diff changeset	309 self.invulnerable_time = 240
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	310 self.sprite.blendfunc = 0
f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	311 self.sprite.changed = True
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	312
447 78e1c3864e73 Make pytouhou.game.game an extension type. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 445 diff changeset	313 elif time == 91: # start the bullet hell again
172 ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	314 self.death_time = 0
ea2ad94c33a0 Implement player death. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 158 diff changeset	315
304 f3099ebf4f61 Update attribute names to reflect the actual interface. Thibaut Girka <thib@sitedethib.com> parents: 303 diff changeset	316 self.anmrunner.run_frame()
130 11ab06f4c4c6 Introduce characters! Thibaut Girka <thib@sitedethib.com> parents: 57 diff changeset	317

Mercurial > touhou

annotate pytouhou/game/player.pyx @ 502:3d3285918ba1