player takes damage/dies, and hits enemies

leafo · leafo · commit eb648ff2b530 · 2012-04-22T09:45:49.000-07:00
diff --git a/enemy.moon b/enemy.moon
@@ -162,7 +162,7 @@ class Enemy extends Entity
     @box\move unpack @velocity * dt
     v = @world.viewport
 
-    if @health < 0 and #@effects == 0
+    if @health <= 0 and #@effects == 0
       return false
 
     -- make it follow!
@@ -174,20 +174,22 @@ class Enemy extends Entity
     -- are they in the world?
     @box\above_of v or v\touches_box @box
 
+  die: =>
+    @health = 0 if @health > 0
+    @velocity[2] /= 2
+    @effects\add effects.Death 1.0
+
+    cx, cy = @box\center!
+    emitters.Explosion\add w, cx, cy
+    @death_emitter = with emitters.PourSmoke\add @world, cx, cy
+      .attach = self
+
   take_hit: (bullet) =>
     emitters.HitEnemy\add @world, bullet.x, bullet.y
 
     @health -= bullet.damage
-    if @health < 0
-      @velocity[2] /= 2
-      @effects\add effects.Death 1.0
-
-      cx, cy = @box\center!
-      emitters.Explosion\add w, cx, cy
-      @death_emitter = with emitters.PourSmoke\add w, cx, cy
-        .attach = self
-
-      -- boost score!
+    if @health <= 0
+      @die!
       game.hud.score += 44
     else
       @effects\add effects.Flash 0.1
diff --git a/main.moon b/main.moon
@@ -87,14 +87,9 @@ class Game
     @world\draw!
     @player\draw!
 
-    -- g.print tostring(timer.getFPS!), 2, 2
-
-    -- if Emitter.emitter_list
-    --   g.print tostring(#Emitter.emitter_list), 2, 12
-    --   g.print tostring(#Emitter.draw_list), 2, 22
+    g.print tostring(timer.getFPS!), 2, 12
 
     @hud\draw!
-
     @viewport\pop!
 
 snapper = nil
@@ -108,12 +103,14 @@ love.load = ->
   g.setFont font
 
   love.mousepressed = (x,y, button) ->
-    x, y = viewport\unproject x, y
+    x, y = game.viewport\unproject x, y
     -- emitters.PourSmoke\add w, x, y
 
   love.keypressed = (key, code) ->
     switch key
       when "escape" then os.exit!
+      when "d"
+        game.player\die!
       when "x" -- cool
         if snapper
           slow_mode = false
diff --git a/particle.moon b/particle.moon
@@ -217,3 +217,20 @@ class Explosion extends Emitter
   default_particle: particles.Explosion
   amount: 1
 
+class BigExplosion extends Emitter
+  default_particle: particles.Explosion
+  amount: 4
+
+  spawn: (...) =>
+    @x += math.random -2,2
+    @y += math.random -2,2
+    super ...
+
+class RadialSpark extends Emitter
+  default_particle: particles.Spark
+  amount: 20
+  rate: 0.03
+  vel: 100
+  ay: 500
+  fan: 2*math.pi
+
diff --git a/player.moon b/player.moon
@@ -13,6 +13,21 @@ dampen = (val, speed, dt) ->
   else
     val
 
+-- love it!
+join = (objs) ->
+  {
+    all: (fn) ->
+      yes = true
+      for o in *objs
+        yes = fn o
+        break if not yes
+      yes
+
+    set: (key, value) ->
+      for o in *objs
+        o[key] = value
+  }
+
 class Player extends Entity
   watch_class self
 
@@ -38,6 +53,7 @@ class Player extends Entity
   }
 
   cell_id: 0
+  max_health: 100
 
   new: (...) =>
     super ...
@@ -49,10 +65,13 @@ class Player extends Entity
     @cur_point = 1
 
     @movement_lock = 0
+    @health = @max_health
 
   draw: =>
     @bullets\draw!
 
+    return if @health <= 0 and #@effects == 0
+
     @effects\apply ->
       @sprite\draw_cell @cell_id, @box.x - @ox, @box.y - @oy
 
@@ -69,21 +88,69 @@ class Player extends Entity
     @cur_point += 1
     @cur_point = 1  if @cur_point > #@shoot_points
 
+  take_hit: (damage) =>
+    return if @health <= 0 -- already dead
+
+    @health = math.max 0, @health - damage
+
+    if @health <= 0
+      @die!
+      -- goto gameover
+    else
+      @movement_lock = 0.1
+      @effects\add effects.Flash 0.2
+      @world.viewport\shake!
+
+  die: =>
+    @health = 0 if @health > 0
+
+    @movement_lock = nil -- STOP!!
+    @effects\add effects.Death 1.0
+
+    cx, cy = @box\center!
+
+    @death_emitters = join {
+      emitters.PourSmoke\add @world, cx, cy
+      emitters.RadialSpark\add @world, cx, cy
+      emitters.BigExplosion\add @world, cx, cy
+    }
+
+    @death_emitters.set "attach", self
+
   update: (dt) =>
     @bullets\update dt, @world
+    @effects\update dt
 
-    -- see if enemies are hit
-    for e in *@world.enemies
-      if e.alive
-        for b in *@bullets
-          if b.alive and e.health > 0 and b\touches_box e.box
-            e\take_hit b
-            b.alive = false
 
-    @effects\update dt
+    if @death_emitters
+      cx, cy = @box\center!
+      running = @death_emitters.all (e) ->
+        if e.attach == self
+          e.x = cx
+          e.y = cy
+          true
+      @death_emitters = nil if not running
+
+    -- collide
+    if @health > 0
+      for e in *@world.enemies
+        if e.alive and e.health > 0
+
+          -- see if a bullet is hitting enemy
+          for b in *@bullets
+            if b.alive and b\touches_box e.box
+              e\take_hit b
+              b.alive = false
+
+          -- see if we are hitting enemy
+          if @movement_lock == 0 and @box\touches_box e.box
+            @take_hit 80
+            @velocity = e.box\vector_to(@box)\normalized! * 100
+            e\die!
 
     -- movement
-    @movement_lock = math.max 0, @movement_lock - dt
+    if @movement_lock != nil
+      @movement_lock = math.max 0, @movement_lock - dt
 
     if @movement_lock == 0
       move = movement_vector(@speed) * dt * @accel
@@ -106,15 +173,14 @@ class Player extends Entity
 
     cx, cy = @fit_move unpack @velocity * dt
     if cx -- hit a wall
-      @movement_lock = 0.1
-      @effects\add effects.Flash 0.2
-      @world.viewport\shake!
+      @take_hit 5
       @velocity[1] = -@velocity[1]
 
-    -- see if we are shooting
-    if keyboard.isDown @controls.shoot
-      t = timer.getTime!
-      if t - @last_shot > @fire_rate
-        @shoot!
-        @last_shot = t
+    if @movement_lock == 0
+      -- see if we are shooting
+      if keyboard.isDown @controls.shoot
+        t = timer.getTime!
+        if t - @last_shot > @fire_rate
+          @shoot!
+          @last_shot = t
 
diff --git a/ui.moon b/ui.moon
@@ -4,11 +4,28 @@ import timer, keyboard from love
 
 export *
 
+class Dispatch -- this holds the stack of stuff
+  nil
+
 class TitleScreen
   nil
 
 class GameOver
-  nil
+  high_scores: {
+    1000, 10000, 50000, 100000, 250000, 500000, 1000000
+  }
+
+  new: =>
+    @sort_scores!
+
+  sort_scores: =>
+    table.sort @high_scores
+
+  add_score: (score) =>
+    table.insert @high_scores, scores
+    @sort_scores!
+
+  draw_high_scores: =>
 
 class Pause
   nil
@@ -25,7 +42,9 @@ class HorizBar
     g.rectangle "line", x, y, @w, @h
 
     g.setColor @color
-    g.rectangle "fill", x + @padding, y + @padding, @w - @padding*2, @h - @padding*2
+    w = @value * (@w - @padding*2)
+
+    g.rectangle "fill", x + @padding, y + @padding, w, @h - @padding*2
     g.pop!
 
     g.setColor 255,255,255,255
@@ -46,5 +65,6 @@ class Hud
     if @display_score < @score
       @display_score += dt * math.max 200, @score - @display_score
       @display_score = math.min @display_score, @score
-
+    
+    @health_bar.value = @player.health / @player.max_health
 
