teakup

leafo · Aug 28, 2012 · 6b9590d · 6b9590d
1 parent a5f4502
commit 6b9590d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/enemy.moon b/enemy.moon
@@ -198,7 +198,7 @@ class BounceBullet extends Bullet
 -- charges
 class BlueSlime extends Enemy
   ox: -3, oy: -6
-  life: 21
+  life: 25
 
   blood_color: {65,141,255}
 
@@ -229,7 +229,7 @@ class BlueSlime extends Enemy
 class RedSlime extends Enemy
   ox: -3, oy: -6
   bullet_cls: Bullet
-  life: 31
+  life: 35
 
   blood_color: {255,200,200}
 
@@ -283,7 +283,7 @@ class BadRedSlime extends RedSlime
 
 
 class MadDog extends Enemy
-  life: 25
+  life: 35
 
   new: (...) =>
     super ...

diff --git a/img/floor9.png b/img/floor9.png
diff --git a/main.moon b/main.moon
@@ -155,12 +155,10 @@ class Game
     @effect = ViewportFade @viewport, "in"
 
   set_world: (world) =>
-    print "setting the world...."
     @world = world
     @player.world = @world
     @player.box.x, @player.box.y = unpack @world.start_pos
     world.entities\add @player
-    print "The world is now set!"
 
   draw: =>
     @viewport\apply!
@@ -190,19 +188,10 @@ class Game
   on_key: (key, code) =>
     switch key
       when "p"
-        @pause = not @pause
-      -- when " "
-      --   print "player is", @player.alive
-      --   for i, e in ipairs @world.entities
-      --     print i, e.__class.__name, e.alive
-
+        -- @pause = not @pause
       when "x"
         @player\attack!
 
-      when ";"
-        sfx\play "step"
-
-
 class Intro
   text: {
     "Slimes!\n\nthey're everywhere!"