# HG changeset patch # User Jeremy Thurgood # Date 1378057998 -7200 # Node ID 8bf0459ebc56879acd860c021f19f831f53aeece # Parent a99ac95a294054b0f132b10f614234c3d2c1606a Clean up a few things. diff -r a99ac95a2940 -r 8bf0459ebc56 nagslang/protagonist.py --- a/nagslang/protagonist.py Sun Sep 01 19:31:39 2013 +0200 +++ b/nagslang/protagonist.py Sun Sep 01 19:53:18 2013 +0200 @@ -1,4 +1,3 @@ -import pygame import pymunk import pymunk.pygame_util @@ -29,25 +28,25 @@ self.go_human() def _setup_physics(self, position): - self.body = pymunk.Body(10, 10000) - self.body.position = position - self.body.velocity_func = self.velocity_func + self._body = pymunk.Body(10, 10000) + self._body.position = position + self._body.velocity_func = self.velocity_func - self.shape = pymunk.Circle(self.body, 30) + self.shape = pymunk.Circle(self._body, 30) self.shape.elasticity = 1.0 self.shape.friction = 10.0 + def _get_image(self, name, *transforms): + return resources.get_image('creatures', name, transforms=transforms) + def _setup_renderers(self): self._renderers = { self.HUMAN_FORM: FacingImageRenderer( - resources.get_image( - 'creatures', 'werewolf_1.png', transforms=(BLUE,)), - resources.get_image( - 'creatures', 'werewolf_1.png', transforms=(FLIP_H, BLUE))), + self._get_image('werewolf_1.png', BLUE), + self._get_image('werewolf_1.png', BLUE, FLIP_H)), self.WOLF_FORM: FacingImageRenderer( - resources.get_image('creatures', 'werewolf_1.png'), - resources.get_image( - 'creatures', 'werewolf_1.png', transforms=(FLIP_H,))), + self._get_image('werewolf_1.png'), + self._get_image('werewolf_1.png', FLIP_H)), } @classmethod @@ -63,20 +62,18 @@ def go_werewolf(self): self.form = self.WOLF_FORM - self.body.mass = 100 - self.body.moment = 10000 - self.body.velocity_limit = 1000 - self.shape.color = pygame.color.THECOLORS['red'] + self._body.mass = 100 + self._body.moment = 10000 + self._body.velocity_limit = 1000 self.impulse_factor = 4000 self.damping = 0.9 self.renderer = self._renderers[self.form] def go_human(self): self.form = self.HUMAN_FORM - self.body.mass = 10 - self.body.moment = 1000 - self.body.velocity_limit = 1000 - self.shape.color = pygame.color.THECOLORS['blue'] + self._body.mass = 10 + self._body.moment = 1000 + self._body.velocity_limit = 1000 self.impulse_factor = 500 self.damping = 0.8 self.renderer = self._renderers[self.form] @@ -85,8 +82,8 @@ if (dx, dy) == (0, 0): return vec = pymunk.Vec2d((dx, dy)) - self.body.angle = vec.angle - self.body.apply_impulse( + self._body.angle = vec.angle + self._body.apply_impulse( (dx * self.impulse_factor, dy * self.impulse_factor)) def toggle_form(self):