show score, fix enemy sequence

leafo · leafo · commit ae7eefbbc16a · 2013-04-28T17:50:10.000-07:00
diff --git a/enemies.moon b/enemies.moon
@@ -118,7 +118,7 @@ class Enemy extends Box
       spray_dir = thing.vel\normalized!
       world.particles\add Sparks spray_dir, world, thing\center!
 
-      @seq = Sequence ->
+      @damage_seq = Sequence ->
         @shake_time = 1
         @rand = math.random!
         tween @, 0.5, shake_time: 0
@@ -128,10 +128,11 @@ class Enemy extends Box
         sfx\play "enemy_hit"
       else
         sfx\play "enemy_die"
+        world.player.score += math.random 101, 127
 
   update: (dt, world) =>
     @vel\adjust unpack @accel * dt
-    @seq\update dt if @seq
+    @damage_seq\update dt if @damage_seq
     @move unpack @vel * dt
 
     @life > 0
@@ -141,8 +142,8 @@ class Enemy extends Box
 
     if t = @shake_time
       g.push!
-      g.translate 5 * t * math.sin(t*10 + @rand),
-        5 * t * math.cos(t*11 + @rand)
+      g.translate 5 * t * math.sin((t*10 + @rand)*5),
+        5 * t * math.cos((t*11 + @rand)*5)
 
       o = (1 - t) * 255
       g.setColor 255, o, o
@@ -239,6 +240,7 @@ class PathEnemy extends Enemy
 
   update: (dt, world) =>
     @world = world
+    @damage_seq\update dt if @damage_seq
     @seq\update(dt) and @life > 0
 
 nil
diff --git a/hud.moon b/hud.moon
@@ -77,6 +77,7 @@ class Hud extends Box
     @segment = world.platform\row!
     @progress = world\progress!
     @player_life = world.player\p_life!
+    @player_score = world.player.display_score
 
     @in_danger = world.active_block[@segment]
     @next_block = world.level[world\block_i! + 1] or {}
@@ -228,7 +229,7 @@ class Hud extends Box
     g.push!
     g.translate 100, 16
     g.scale 2
-    box_text "score: 0", 0, 0, false
+    box_text "score: #{f @player_score}", 0, 0, false
     g.pop!
 
 class TitleScreen
@@ -272,7 +273,7 @@ class TitleScreen
 class GameOver
   watch_class @
 
-  new: (player) =>
+  new: (@game) =>
     @viewport = EffectViewport scale: 3
 
   on_key: (key) =>
@@ -290,8 +291,8 @@ class GameOver
     g.push!
     g.translate 0, 10
     p "Game Over", 60, 40
-    p "Level Reached: #{0}", 60, 60
-    p "Score: #{0}", 60, 70
+    p "Level Reached: #{@game.current_level}", 60, 60
+    p "Score: #{f @game.player.score}", 60, 70
 
     p "Press enter to return to title", 60, 100
     p "Thanks for playing! &", 60, 110
diff --git a/main.moon b/main.moon
@@ -284,7 +284,7 @@ class Game
   goto_gameover: =>
     @seq = Sequence ->
       tween @, 1.0, shroud: 255
-      dispatch\push GameOver!
+      dispatch\push GameOver @
 
   on_key: (key, code) =>
     if key == "return"
diff --git a/player.moon b/player.moon
@@ -47,6 +47,8 @@ class Player extends Entity
   mover = make_mover "w", "s", "a", "d"
 
   life: 100
+  score: 0
+  display_score: 0
 
   w: 15
   h: 50
@@ -191,6 +193,9 @@ class Player extends Entity
     @anim\update dt
     @effects\update dt
 
+    @display_score = approach @display_score, @score,
+      dt * ((@score - @display_score) * 1.5 + 14)
+
     @zv += dt * @za
     @z += @zv * dt
     if @z < 0
