From 6b9590d70092763663a58000f85935fcb430f9a7 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Mon, 27 Aug 2012 17:09:18 -0700
Subject: [PATCH] teakup

---
 enemy.moon     |   6 +++---
 img/floor9.png | Bin 563 -> 554 bytes
 main.moon      |  13 +------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/enemy.moon b/enemy.moon
index 1106713..610de2c 100644
--- 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
index 71c2c1fdc30996ff0eb7d0b218f7f601560cde07..1307448d2c8a93b59db51af48044b50291b50ed2 100644
GIT binary patch
delta 457
zcmV;)0XF`#1gZp(Lk0#fejHEDkx49nph-kQRCwC$m_1IzKoEtWBc#-J<0BX@fE0o#
zEK$Z~>L5j23r-LTa|M1RL_vcf2cU3c*QthTqxHmzMB!P*yswG9tJrz-zX1p#gb+dq
zA%xhHFGK*~{^~~N%ayo$OQKNX&rZ)JiPN3+=hsKm-!uy8c>t)J3jXzUGL!j#awUT{
zz-C<_iBr@~wfzKuBu=Bcsqpi8H_Qmg7b4TiOzNiE5f1?4tlXxBRXs4xx9Mai9q(_g
zIm1}hgOR1@_4+s~x6z<$!C+EgzFf&>U9?2HYgY^WZqU^kj@kfzK}+H^(&4Vd-kMS0
z-uDHLvr>FdJJDLaE{;cOfP5i;qTAVKT>t<+-fvq`plg6-D)eRmm-kvs-Bif0AMo^2
zwj#mO>mlZVNPGG6qS)Jx2hj!efb*Aq%YxY3py4LIL!$g?(CxeLe0{%}3~48QKKzg;
zyIP-Hvpf;@YJjdHxUbcP5N{d*I?VM17~;Qx-VZ}v^Z&l62qE6&H0X>ta3~!@i8nhA
z>qzj85mG!Mgb+dqA%qY@2qA<JLI@#*kpIFjRaWg0;<vpa00000NkvXXu0mjf-ksgJ

delta 466
zcmV;@0WJQj1hWK?Lk0vHgOIq^kx49nsYygZRCwC$m^)6xKomu<Bc#-J<0Tk2fE0o#
zETxR;QU@twTd;yiF(nce9|=*=AjkqJ+}L%hM>WxSGD+t*in*tWGov`Z?>`0zA%qY@
z2qA>%lFvl|;Qs1HW{ahm@0vuR#Gjp>OA@C$>o0E)s?RhC>3IOCn+o>zcr=xN*<vZZ
zHo#_GAc<4dO||_5fFw?%x~cH{b=S`b$mb&C(NyZD+7S-`!>rt<g;qUK&A0JrDxUvu
ztr^2;)q{bi=iT*TR&Jxgtp&YFf!Sgyn|09=X|7Ezu)Be;GaR)6?1GlWY2=2x8}`}^
zy7s;;aF~^1d)kP0#k<AvC=HN*&qdsJwpkYdfX|QHRus53Kr<COGl0o^S4`bh$R{g2
zzm}~?(DZtUIUsVqe0fpe>G9gzj(gDs+yTe8pHEiaea(W{*`Q%2zC)tyY0&JO-+ceP
zs|;x;UEchVCw;BYtZAMIJ2il>2<~fjA;hajfE(uS1Q_C7K<9@c-~7KpFDgQaS2+zD
zBOFSHP~z2&!)_$l#t12%5JCtcgb+dqA%qY@2qA<JLdbvN4;|a^5hXc`;{X5v07*qo
IM6N<$f~#lUKmY&$

diff --git a/main.moon b/main.moon
index 7aea163..279aef1 100644
--- 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!"