X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=f3d7e12ca4d9120372f208b6db9c74e74a02e7b7;hp=26b95804230b9f76877f5d41bfdf5ed841b1443f;hb=3ee9895b163809deadc02fc1a34bce265cc89d3a;hpb=16023be19df43f8b8acc4671e0fabdeffb0e720a diff --git a/bulletml/impl.py b/bulletml/impl.py index 26b9580..f3d7e12 100644 --- a/bulletml/impl.py +++ b/bulletml/impl.py @@ -61,9 +61,9 @@ class Action(object): self.previous_fire_direction = other.previous_fire_direction self.previous_fire_speed = other.previous_fire_speed - def step(self, owner, rank): + def step(self, owner, rank, created, sin=math.sin, cos=math.cos): """Advance by one frame.""" - created = [] + s_params = self.params if self.speed_frames > 0: self.speed_frames -= 1 @@ -86,11 +86,11 @@ class Action(object): owner.my += self.my if self.pc is None: - return created + return if self.wait_frames > 0: self.wait_frames -= 1 - return created + return while True: self.pc += 1 @@ -111,21 +111,21 @@ class Action(object): action = self.actions[self.pc] if isinstance(action, parser.Repeat): - repeat, (actions, params) = action(self.params, rank) + repeat, (actions, params) = action(s_params, rank) child = Action(owner, self, actions, params, rank, repeat) owner.replace(self, child) - created.extend(child.step(owner, rank)) + child.step(owner, rank, created, sin, cos) break elif isinstance(action, (parser.ActionDef, parser.ActionRef)): - actions, params = action(self.params, rank) + actions, params = action(s_params, rank) child = Action(owner, self, actions, params, rank) owner.replace(self, child) - created.extend(child.step(owner, rank)) + child.step(owner, rank, created, sin, cos) break elif isinstance(action, (parser.FireDef, parser.FireRef)): - direction, speed, actions, offset = action(self.params, rank) + direction, speed, actions, offset = action(s_params, rank) if direction: direction, type = direction if type == "aim" or type is None: @@ -145,9 +145,9 @@ class Action(object): elif type == "relative": # The reference Noiz implementation uses # prvFireSpeed here, but the standard is - # pretty clear -- "0 means that the direction - # of this fire and the direction of the bullet - # are the same". + # pretty clear -- "In case of the type is + # "relative", ... the speed is relative to the + # speed of this bullet." speed += owner.speed else: speed = 1 @@ -155,12 +155,12 @@ class Action(object): x, y = owner.x, owner.y if offset: - off_x, off_y = offset(self.params, rank) + off_x, off_y = offset(s_params, rank) if offset.type == "relative": - sin = math.sin(direction) - cos = math.cos(direction) - x += cos * off_x + sin * off_y - y += sin * off_x - cos * off_y + s = sin(direction) + c = cos(direction) + x += c * off_x + s * off_y + y += s * off_x - c * off_y else: x += off_x y += off_y @@ -170,7 +170,7 @@ class Action(object): created.append(bullet) elif isinstance(action, parser.ChangeSpeed): - frames, (speed, type) = action(self.params, rank) + frames, (speed, type) = action(s_params, rank) self.speed_frames = frames if type == "sequence": self.speed = speed @@ -180,32 +180,25 @@ class Action(object): self.speed = (speed - owner.speed) / frames elif isinstance(action, parser.ChangeDirection): - frames, (direction, type) = action(self.params, rank) + frames, (direction, type) = action(s_params, rank) self.direction_frames = frames self.aiming = False if type == "sequence": self.direction = direction else: if type == "absolute": - self.direction = ( - direction - owner.direction) % PI_2 + direction -= owner.direction elif type == "relative": - self.direction = direction + direction = direction else: self.aiming = True - self.direction = ( - direction - + owner.aim - - owner.direction) % PI_2 + direction += owner.aim - owner.direction - if self.direction > math.pi: - self.direction -= PI_2 - if self.direction < -math.pi: - self.direction += PI_2 - self.direction /= self.direction_frames + self.direction = ( + (direction + math.pi) % PI_2 - math.pi) / frames elif isinstance(action, parser.Accel): - frames, horizontal, vertical = action(self.params, rank) + frames, horizontal, vertical = action(s_params, rank) self.accel_frames = frames if horizontal: mx, type = horizontal @@ -224,16 +217,23 @@ class Action(object): elif type == "relative": self.my = my / frames + elif isinstance(action, parser.Tag): + owner.tags.add(action.tag) + + elif isinstance(action, parser.Untag): + try: + owner.tags.remove(action.tag) + except KeyError: + pass + elif isinstance(action, parser.Wait): - self.wait_frames = action(self.params, rank) + self.wait_frames = action(s_params, rank) break elif isinstance(action, parser.Vanish): owner.vanish() break - return created - class Bullet(object): """Simple bullet implementation. @@ -246,6 +246,7 @@ class Bullet(object): target - object with .x and .y fields for "aim" directions vanished - set to true by a action rank - game difficulty, 0 to 1, default 0.5 + tags - string tags set by the running actions Contructor Arguments: x, y, direction, speed, target, rank - same as the attributes @@ -266,6 +267,7 @@ class Bullet(object): self.vanished = False self.target = target self.rank = rank + self.tags = set() # New bullets reset the parent hierarchy. self._actions = [Action(self, None, action, params, rank) for action, params in actions] @@ -322,7 +324,7 @@ class Bullet(object): else: self._actions[idx] = new - def step(self): + def step(self, sin=math.sin, cos=math.cos): """Advance by one frame. This updates the position and velocity, and may also set the @@ -333,11 +335,11 @@ class Bullet(object): created = [] for action in self._actions: - created.extend(action.step(self, self.rank)) + action.step(self, self.rank, created, sin, cos) self.px = self.x self.py = self.y - self.x += self.mx + math.sin(self.direction) * self.speed - self.y += self.my - math.cos(self.direction) * self.speed + self.x += self.mx + sin(self.direction) * self.speed + self.y += self.my - cos(self.direction) * self.speed return created