changeset 69:f06d25049298

replace Shadow with Oni
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Thu, 02 Jan 2014 18:54:40 +0100
parents 706a364d795a
children 66147d435194
files fujo/level.py fujo/mobs.py fujo/monsters.png fujo/resources.py
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/fujo/level.py	Wed Jan 01 22:36:23 2014 +0100
+++ b/fujo/level.py	Thu Jan 02 18:54:40 2014 +0100
@@ -14,11 +14,12 @@
     ((1, 22), (5, 7)), ((7, 22), (5, 7)), ((15, 22), (5, 7)),
 ]
 MONSTERS = [
+    [mobs.Oni],
     [mobs.Bat, mobs.Martian],
     [mobs.Bat, mobs.Martian, mobs.Kappa, mobs.Tanuki],
     [mobs.Martian, mobs.Kappa, mobs.Tanuki, mobs.Tengu],
-    [mobs.Kappa, mobs.Tengu, mobs.Tanuki, mobs.Shadow],
-    [mobs.Ghost, mobs.Tengu, mobs.Shadow],
+    [mobs.Kappa, mobs.Tengu, mobs.Tanuki, mobs.Oni],
+    [mobs.Ghost, mobs.Tengu, mobs.Oni],
 ]
 
 
--- a/fujo/mobs.py	Wed Jan 01 22:36:23 2014 +0100
+++ b/fujo/mobs.py	Thu Jan 02 18:54:40 2014 +0100
@@ -263,7 +263,7 @@
             return
         super(Tanuki, self).wound(damage)
 
-class Shadow(Monster):
+class Oni(Monster):
     looks = 7
 
 
@@ -495,4 +495,4 @@
         self.climb = True
 
 
-MONSTERS = [Martian, Tengu, Kappa, Bat, Ghost, Tanuki, Shadow]
+MONSTERS = [Martian, Tengu, Kappa, Bat, Ghost, Tanuki, Oni]
Binary file fujo/monsters.png has changed
--- a/fujo/resources.py	Wed Jan 01 22:36:23 2014 +0100
+++ b/fujo/resources.py	Thu Jan 02 18:54:40 2014 +0100
@@ -67,7 +67,6 @@
         for i in range(4):
             # Make the ghosts translucent
             self.monsters[i * 8 + 5].set_alpha(125)
-            self.monsters[i * 8 + 7].set_alpha(125)
             # Make the jellies translucent
             self.monsters[i * 8 + 0].set_alpha(200)
             self.monsters[i * 8 + 1].set_alpha(200)