changeset 342:8f578fe33fe7

Immolation fox.
author Simon Cross <hodgestar@gmail.com>
date Sat, 09 Apr 2011 13:04:25 +0200
parents 9a0f0ea687da
children 2258c2a6dbae
files skaapsteker/sprites/base.py skaapsteker/sprites/player.py skaapsteker/sprites/projectiles.py
diffstat 3 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/base.py	Sat Apr 09 12:56:52 2011 +0200
+++ b/skaapsteker/sprites/base.py	Sat Apr 09 13:04:25 2011 +0200
@@ -32,6 +32,8 @@
         self.setup_image_data(pos)
         self.setup(**opts)
 
+    def setup(self):
+        pass
 
     def setup_image_data(self, pos):
         self.image = data.load_image(self.image_dir + self.image_file)
@@ -91,6 +93,9 @@
         self._update_image()
         self.setup(**opts)
 
+    def setup(self):
+        pass
+
     def _update_image(self, force=False):
         if self.facing:
             images = self._animations[self._animation][self.facing]
--- a/skaapsteker/sprites/player.py	Sat Apr 09 12:56:52 2011 +0200
+++ b/skaapsteker/sprites/player.py	Sat Apr 09 13:04:25 2011 +0200
@@ -4,6 +4,7 @@
 import time
 
 from ..sprites.base import find_sprite, TILE_SIZE, PC_LAYER, MONSTER_LAYER
+from ..sprites.projectiles import Fireball
 from ..physics import Sprite
 from ..constants import Layers
 from ..data import get_files, load_image
@@ -243,7 +244,7 @@
         print 'ninja fireball attack attack attack'
         self.attacking = 2
         self._last_time = time.time() # Reset the animation clock
-        #FireProjectile.push()
+        AddSpriteEvent.post(Fireball(self.get_tile_pos()))
 
     def _lightning_attack(self):
         print 'thunderbolts and lightning'
@@ -316,6 +317,9 @@
         self._me.item = None
 
 
+    def get_tile_pos(self):
+        return [a/b for a, b in zip(self.rect.center, TILE_SIZE)]
+
     def get_sprite(self, set_level):
         my_item = self._me.item
         if my_item is None:
@@ -323,7 +327,7 @@
         world_item = getattr(self.the_world.items, my_item)
         if set_level:
             world_item.level = self._me.level
-            world_item.pos = [a/b for a, b in zip(self.rect.center, TILE_SIZE)]
+            world_item.pos = self.get_tile_pos()
         sprite_dict = world_item.copy()
         sprite_dict.pop('level')
         sprite_dict['name'] = my_item
--- a/skaapsteker/sprites/projectiles.py	Sat Apr 09 12:56:52 2011 +0200
+++ b/skaapsteker/sprites/projectiles.py	Sat Apr 09 13:04:25 2011 +0200
@@ -1,12 +1,12 @@
 """Things people throw at each other."""
 
-from .sprites import Projectile
+from .base import Projectile
 
 class Fireball(Projectile):
 
     gravitates = True
 
-    image_dir = 'sprites/fireball'
+    image_dir = 'sprites/attacks/fireball'
     animation_regexes = [
         ("raining_death", r"^fireball-\d+.png$"),
     ]